diff --git a/techs/megapack/factions/egypt/units/spearman/images/tech_cancel.bmp b/techs/megapack/factions/egypt/cancel.bmp
similarity index 100%
rename from techs/megapack/factions/egypt/units/spearman/images/tech_cancel.bmp
rename to techs/megapack/factions/egypt/cancel.bmp
diff --git a/techs/megapack/factions/egypt/empty.bmp b/techs/megapack/factions/egypt/empty.bmp
new file mode 100644
index 00000000..7ad4bc5c
Binary files /dev/null and b/techs/megapack/factions/egypt/empty.bmp differ
diff --git a/techs/megapack/factions/egypt/units/air_pyramid/air_pyramid.xml b/techs/megapack/factions/egypt/units/air_pyramid/air_pyramid.xml
index baf26100..fea3d76a 100644
--- a/techs/megapack/factions/egypt/units/air_pyramid/air_pyramid.xml
+++ b/techs/megapack/factions/egypt/units/air_pyramid/air_pyramid.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/anubis_warrior/anubis_warrior.xml b/techs/megapack/factions/egypt/units/anubis_warrior/anubis_warrior.xml
index 872dc329..877285a8 100644
--- a/techs/megapack/factions/egypt/units/anubis_warrior/anubis_warrior.xml
+++ b/techs/megapack/factions/egypt/units/anubis_warrior/anubis_warrior.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/chicken/chicken.xml b/techs/megapack/factions/egypt/units/chicken/chicken.xml
index 157e52f6..ca3ce6cd 100644
--- a/techs/megapack/factions/egypt/units/chicken/chicken.xml
+++ b/techs/megapack/factions/egypt/units/chicken/chicken.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/desert_camp/desert_camp.xml b/techs/megapack/factions/egypt/units/desert_camp/desert_camp.xml
index 179bc114..dff7f4a7 100644
--- a/techs/megapack/factions/egypt/units/desert_camp/desert_camp.xml
+++ b/techs/megapack/factions/egypt/units/desert_camp/desert_camp.xml
@@ -35,7 +35,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/farm/farm.xml b/techs/megapack/factions/egypt/units/farm/farm.xml
index d2edb38b..2dcd637e 100644
--- a/techs/megapack/factions/egypt/units/farm/farm.xml
+++ b/techs/megapack/factions/egypt/units/farm/farm.xml
@@ -40,7 +40,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/ibis/ibis.xml b/techs/megapack/factions/egypt/units/ibis/ibis.xml
index 23318871..d4cdd2df 100644
--- a/techs/megapack/factions/egypt/units/ibis/ibis.xml
+++ b/techs/megapack/factions/egypt/units/ibis/ibis.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/mummy/mummy.xml b/techs/megapack/factions/egypt/units/mummy/mummy.xml
index ee9a835c..243930ff 100644
--- a/techs/megapack/factions/egypt/units/mummy/mummy.xml
+++ b/techs/megapack/factions/egypt/units/mummy/mummy.xml
@@ -26,7 +26,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/obelisk/obelisk.xml b/techs/megapack/factions/egypt/units/obelisk/obelisk.xml
index 96fa3d2d..b8f7342a 100644
--- a/techs/megapack/factions/egypt/units/obelisk/obelisk.xml
+++ b/techs/megapack/factions/egypt/units/obelisk/obelisk.xml
@@ -38,7 +38,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/priest/priest.xml b/techs/megapack/factions/egypt/units/priest/priest.xml
index 1f1fca97..2b8311fd 100644
--- a/techs/megapack/factions/egypt/units/priest/priest.xml
+++ b/techs/megapack/factions/egypt/units/priest/priest.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/pyramid/pyramid.xml b/techs/megapack/factions/egypt/units/pyramid/pyramid.xml
index 99618163..46160df9 100644
--- a/techs/megapack/factions/egypt/units/pyramid/pyramid.xml
+++ b/techs/megapack/factions/egypt/units/pyramid/pyramid.xml
@@ -42,7 +42,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/scarab/scarab.xml b/techs/megapack/factions/egypt/units/scarab/scarab.xml
index b753b384..4b7bee37 100644
--- a/techs/megapack/factions/egypt/units/scarab/scarab.xml
+++ b/techs/megapack/factions/egypt/units/scarab/scarab.xml
@@ -35,7 +35,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/slave/slave.xml b/techs/megapack/factions/egypt/units/slave/slave.xml
index a1db10d7..dded3067 100644
--- a/techs/megapack/factions/egypt/units/slave/slave.xml
+++ b/techs/megapack/factions/egypt/units/slave/slave.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/snake/snake.xml b/techs/megapack/factions/egypt/units/snake/snake.xml
index 4590ffda..054d7cb6 100644
--- a/techs/megapack/factions/egypt/units/snake/snake.xml
+++ b/techs/megapack/factions/egypt/units/snake/snake.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/spearman/spearman.xml b/techs/megapack/factions/egypt/units/spearman/spearman.xml
index 12fa69e0..73af67d8 100644
--- a/techs/megapack/factions/egypt/units/spearman/spearman.xml
+++ b/techs/megapack/factions/egypt/units/spearman/spearman.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/spearthrower/spearthrower.xml b/techs/megapack/factions/egypt/units/spearthrower/spearthrower.xml
index b3ff5c8a..68c5baaa 100644
--- a/techs/megapack/factions/egypt/units/spearthrower/spearthrower.xml
+++ b/techs/megapack/factions/egypt/units/spearthrower/spearthrower.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/sphinx/sphinx.xml b/techs/megapack/factions/egypt/units/sphinx/sphinx.xml
index 27b0535a..f4caee12 100644
--- a/techs/megapack/factions/egypt/units/sphinx/sphinx.xml
+++ b/techs/megapack/factions/egypt/units/sphinx/sphinx.xml
@@ -40,7 +40,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/units/temple/temple.xml b/techs/megapack/factions/egypt/units/temple/temple.xml
index c831e9dd..b1a3f6ec 100644
--- a/techs/megapack/factions/egypt/units/temple/temple.xml
+++ b/techs/megapack/factions/egypt/units/temple/temple.xml
@@ -40,7 +40,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/upgrades/power_of_ra/power_of_ra.xml b/techs/megapack/factions/egypt/upgrades/power_of_ra/power_of_ra.xml
index a5e5cac3..682ed0bb 100644
--- a/techs/megapack/factions/egypt/upgrades/power_of_ra/power_of_ra.xml
+++ b/techs/megapack/factions/egypt/upgrades/power_of_ra/power_of_ra.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/upgrades/spear_weapons/spear_weapons.xml b/techs/megapack/factions/egypt/upgrades/spear_weapons/spear_weapons.xml
index 5bfe9283..b12d6420 100644
--- a/techs/megapack/factions/egypt/upgrades/spear_weapons/spear_weapons.xml
+++ b/techs/megapack/factions/egypt/upgrades/spear_weapons/spear_weapons.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/upgrades/speedup_priest_production/speedup_priest_production.xml b/techs/megapack/factions/egypt/upgrades/speedup_priest_production/speedup_priest_production.xml
index 695085da..685cf671 100644
--- a/techs/megapack/factions/egypt/upgrades/speedup_priest_production/speedup_priest_production.xml
+++ b/techs/megapack/factions/egypt/upgrades/speedup_priest_production/speedup_priest_production.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/upgrades/summon_ibis/summon_ibis.xml b/techs/megapack/factions/egypt/upgrades/summon_ibis/summon_ibis.xml
index a22a5d5b..f851d7a9 100644
--- a/techs/megapack/factions/egypt/upgrades/summon_ibis/summon_ibis.xml
+++ b/techs/megapack/factions/egypt/upgrades/summon_ibis/summon_ibis.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/egypt/upgrades/summon_scarab/summon_scarab.xml b/techs/megapack/factions/egypt/upgrades/summon_scarab/summon_scarab.xml
index 72561286..5e906eb4 100644
--- a/techs/megapack/factions/egypt/upgrades/summon_scarab/summon_scarab.xml
+++ b/techs/megapack/factions/egypt/upgrades/summon_scarab/summon_scarab.xml
@@ -2,7 +2,7 @@
-
+ />
diff --git a/techs/megapack/factions/egypt/upgrades/spear_weapons/images/upgrade_cancel.bmp b/techs/megapack/factions/indian/cancel.bmp
similarity index 100%
rename from techs/megapack/factions/egypt/upgrades/spear_weapons/images/upgrade_cancel.bmp
rename to techs/megapack/factions/indian/cancel.bmp
diff --git a/techs/megapack/factions/indian/empty.bmp b/techs/megapack/factions/indian/empty.bmp
new file mode 100644
index 00000000..d74efd02
Binary files /dev/null and b/techs/megapack/factions/indian/empty.bmp differ
diff --git a/techs/megapack/factions/indian/units/archer/archer.xml b/techs/megapack/factions/indian/units/archer/archer.xml
index 06100dd5..3acecae2 100644
--- a/techs/megapack/factions/indian/units/archer/archer.xml
+++ b/techs/megapack/factions/indian/units/archer/archer.xml
@@ -36,7 +36,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/axe_indian/axe_indian.xml b/techs/megapack/factions/indian/units/axe_indian/axe_indian.xml
index 103bccf2..9be0a044 100644
--- a/techs/megapack/factions/indian/units/axe_indian/axe_indian.xml
+++ b/techs/megapack/factions/indian/units/axe_indian/axe_indian.xml
@@ -35,7 +35,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/axe_thrower/axe_thrower.xml b/techs/megapack/factions/indian/units/axe_thrower/axe_thrower.xml
index df5673ff..addc8f9d 100644
--- a/techs/megapack/factions/indian/units/axe_thrower/axe_thrower.xml
+++ b/techs/megapack/factions/indian/units/axe_thrower/axe_thrower.xml
@@ -35,7 +35,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/beehive/beehive.xml b/techs/megapack/factions/indian/units/beehive/beehive.xml
index e3a92edb..4060ba74 100644
--- a/techs/megapack/factions/indian/units/beehive/beehive.xml
+++ b/techs/megapack/factions/indian/units/beehive/beehive.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/big_tent/big_tent.xml b/techs/megapack/factions/indian/units/big_tent/big_tent.xml
index 454e16d9..2929b8bc 100644
--- a/techs/megapack/factions/indian/units/big_tent/big_tent.xml
+++ b/techs/megapack/factions/indian/units/big_tent/big_tent.xml
@@ -40,7 +40,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/bull/bull.xml b/techs/megapack/factions/indian/units/bull/bull.xml
index 17504eb3..39faa052 100644
--- a/techs/megapack/factions/indian/units/bull/bull.xml
+++ b/techs/megapack/factions/indian/units/bull/bull.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/campfire/campfire.xml b/techs/megapack/factions/indian/units/campfire/campfire.xml
index 10fa64a6..2bb4517f 100644
--- a/techs/megapack/factions/indian/units/campfire/campfire.xml
+++ b/techs/megapack/factions/indian/units/campfire/campfire.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/fire_archer/fire_archer.xml b/techs/megapack/factions/indian/units/fire_archer/fire_archer.xml
index 66363ad0..637fdd7d 100644
--- a/techs/megapack/factions/indian/units/fire_archer/fire_archer.xml
+++ b/techs/megapack/factions/indian/units/fire_archer/fire_archer.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/fire_archer/images/tech_cancel.bmp b/techs/megapack/factions/indian/units/fire_archer/images/tech_cancel.bmp
deleted file mode 100644
index 5e844cf9..00000000
Binary files a/techs/megapack/factions/indian/units/fire_archer/images/tech_cancel.bmp and /dev/null differ
diff --git a/techs/megapack/factions/indian/units/fire_golem/fire_golem.xml b/techs/megapack/factions/indian/units/fire_golem/fire_golem.xml
index 96800a42..b34d087c 100644
--- a/techs/megapack/factions/indian/units/fire_golem/fire_golem.xml
+++ b/techs/megapack/factions/indian/units/fire_golem/fire_golem.xml
@@ -35,7 +35,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/horse_farm/horse_farm.xml b/techs/megapack/factions/indian/units/horse_farm/horse_farm.xml
index 5ff44a25..71314d59 100644
--- a/techs/megapack/factions/indian/units/horse_farm/horse_farm.xml
+++ b/techs/megapack/factions/indian/units/horse_farm/horse_farm.xml
@@ -35,7 +35,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/horseman/horseman.xml b/techs/megapack/factions/indian/units/horseman/horseman.xml
index 74eb3c00..e4a107ca 100644
--- a/techs/megapack/factions/indian/units/horseman/horseman.xml
+++ b/techs/megapack/factions/indian/units/horseman/horseman.xml
@@ -36,7 +36,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/main_teepee/main_teepee.xml b/techs/megapack/factions/indian/units/main_teepee/main_teepee.xml
index 51c6b295..2d821de6 100644
--- a/techs/megapack/factions/indian/units/main_teepee/main_teepee.xml
+++ b/techs/megapack/factions/indian/units/main_teepee/main_teepee.xml
@@ -40,7 +40,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/reed/reed.xml b/techs/megapack/factions/indian/units/reed/reed.xml
index b580c80a..56aca0f3 100644
--- a/techs/megapack/factions/indian/units/reed/reed.xml
+++ b/techs/megapack/factions/indian/units/reed/reed.xml
@@ -36,7 +36,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/round_tent/round_tent.xml b/techs/megapack/factions/indian/units/round_tent/round_tent.xml
index cd618fe6..6b5bd10b 100644
--- a/techs/megapack/factions/indian/units/round_tent/round_tent.xml
+++ b/techs/megapack/factions/indian/units/round_tent/round_tent.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/shaman/shaman.xml b/techs/megapack/factions/indian/units/shaman/shaman.xml
index 7fa2a31c..b21e3005 100644
--- a/techs/megapack/factions/indian/units/shaman/shaman.xml
+++ b/techs/megapack/factions/indian/units/shaman/shaman.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/spearman/spearman.xml b/techs/megapack/factions/indian/units/spearman/spearman.xml
index e6b87cbe..86936e3f 100644
--- a/techs/megapack/factions/indian/units/spearman/spearman.xml
+++ b/techs/megapack/factions/indian/units/spearman/spearman.xml
@@ -35,7 +35,7 @@
-
+
@@ -107,7 +107,12 @@
-
+
+
+
+
+
+
diff --git a/techs/megapack/factions/indian/units/stickfighter/stickfighter.xml b/techs/megapack/factions/indian/units/stickfighter/stickfighter.xml
index e737525c..f86e5baa 100644
--- a/techs/megapack/factions/indian/units/stickfighter/stickfighter.xml
+++ b/techs/megapack/factions/indian/units/stickfighter/stickfighter.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/tent/tent.xml b/techs/megapack/factions/indian/units/tent/tent.xml
index 84147827..9ae94755 100644
--- a/techs/megapack/factions/indian/units/tent/tent.xml
+++ b/techs/megapack/factions/indian/units/tent/tent.xml
@@ -36,7 +36,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/thunderbird/thunderbird.xml b/techs/megapack/factions/indian/units/thunderbird/thunderbird.xml
index 85a0a154..ed79d715 100644
--- a/techs/megapack/factions/indian/units/thunderbird/thunderbird.xml
+++ b/techs/megapack/factions/indian/units/thunderbird/thunderbird.xml
@@ -34,7 +34,7 @@
-
+
@@ -100,7 +100,12 @@
-
+
+
+
+
+
+
diff --git a/techs/megapack/factions/indian/units/totem/totem.xml b/techs/megapack/factions/indian/units/totem/totem.xml
index 2bc31dcf..803fb654 100644
--- a/techs/megapack/factions/indian/units/totem/totem.xml
+++ b/techs/megapack/factions/indian/units/totem/totem.xml
@@ -39,7 +39,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/worker/worker.xml b/techs/megapack/factions/indian/units/worker/worker.xml
index 9a5857c0..18cec014 100644
--- a/techs/megapack/factions/indian/units/worker/worker.xml
+++ b/techs/megapack/factions/indian/units/worker/worker.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/techs/megapack/factions/indian/upgrades/advanced_iron/advanced_iron.xml b/techs/megapack/factions/indian/upgrades/advanced_iron/advanced_iron.xml
index 4adc8d6e..463c310e 100644
--- a/techs/megapack/factions/indian/upgrades/advanced_iron/advanced_iron.xml
+++ b/techs/megapack/factions/indian/upgrades/advanced_iron/advanced_iron.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/indian/upgrades/bull_food/bull_food.xml b/techs/megapack/factions/indian/upgrades/bull_food/bull_food.xml
index c09cd649..8a48b0a2 100644
--- a/techs/megapack/factions/indian/upgrades/bull_food/bull_food.xml
+++ b/techs/megapack/factions/indian/upgrades/bull_food/bull_food.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/indian/upgrades/iron/iron.xml b/techs/megapack/factions/indian/upgrades/iron/iron.xml
index 55318521..10933ca5 100644
--- a/techs/megapack/factions/indian/upgrades/iron/iron.xml
+++ b/techs/megapack/factions/indian/upgrades/iron/iron.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/indian/upgrades/petroleum/petroleum.xml b/techs/megapack/factions/indian/upgrades/petroleum/petroleum.xml
index 0ae1ac75..e2b64239 100644
--- a/techs/megapack/factions/indian/upgrades/petroleum/petroleum.xml
+++ b/techs/megapack/factions/indian/upgrades/petroleum/petroleum.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/indian/upgrades/stables/images/tech_upgrade_cancel.bmp b/techs/megapack/factions/indian/upgrades/stables/images/tech_upgrade_cancel.bmp
deleted file mode 100644
index 5e844cf9..00000000
Binary files a/techs/megapack/factions/indian/upgrades/stables/images/tech_upgrade_cancel.bmp and /dev/null differ
diff --git a/techs/megapack/factions/indian/upgrades/stables/stables.xml b/techs/megapack/factions/indian/upgrades/stables/stables.xml
index a4b86088..a9a53df0 100644
--- a/techs/megapack/factions/indian/upgrades/stables/stables.xml
+++ b/techs/megapack/factions/indian/upgrades/stables/stables.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/indian/upgrades/training_field/training_field.xml b/techs/megapack/factions/indian/upgrades/training_field/training_field.xml
index 7c7eb41d..aae786ee 100644
--- a/techs/megapack/factions/indian/upgrades/training_field/training_field.xml
+++ b/techs/megapack/factions/indian/upgrades/training_field/training_field.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/archmage/images/magic_cancel.bmp b/techs/megapack/factions/magic/cancel.bmp
similarity index 100%
rename from techs/megapack/factions/magic/units/archmage/images/magic_cancel.bmp
rename to techs/megapack/factions/magic/cancel.bmp
diff --git a/techs/megapack/factions/magic/empty.bmp b/techs/megapack/factions/magic/empty.bmp
new file mode 100644
index 00000000..2b20f705
Binary files /dev/null and b/techs/megapack/factions/magic/empty.bmp differ
diff --git a/techs/megapack/factions/magic/units/archmage/archmage.xml b/techs/megapack/factions/magic/units/archmage/archmage.xml
index f369701b..f894a6ce 100644
--- a/techs/megapack/factions/magic/units/archmage/archmage.xml
+++ b/techs/megapack/factions/magic/units/archmage/archmage.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/archmage_tower/archmage_tower.xml b/techs/megapack/factions/magic/units/archmage_tower/archmage_tower.xml
index 45bf14e5..b3c7b133 100644
--- a/techs/megapack/factions/magic/units/archmage_tower/archmage_tower.xml
+++ b/techs/megapack/factions/magic/units/archmage_tower/archmage_tower.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/battlemage/battlemage.xml b/techs/megapack/factions/magic/units/battlemage/battlemage.xml
index 4cab871a..c4a4847a 100644
--- a/techs/megapack/factions/magic/units/battlemage/battlemage.xml
+++ b/techs/megapack/factions/magic/units/battlemage/battlemage.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/behemoth/behemoth.xml b/techs/megapack/factions/magic/units/behemoth/behemoth.xml
index a9cbc6fc..84983422 100644
--- a/techs/megapack/factions/magic/units/behemoth/behemoth.xml
+++ b/techs/megapack/factions/magic/units/behemoth/behemoth.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/daemon/daemon.xml b/techs/megapack/factions/magic/units/daemon/daemon.xml
index 103b6265..9124d978 100644
--- a/techs/megapack/factions/magic/units/daemon/daemon.xml
+++ b/techs/megapack/factions/magic/units/daemon/daemon.xml
@@ -26,7 +26,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/dragon/dragon.xml b/techs/megapack/factions/magic/units/dragon/dragon.xml
index 898e9d47..ea845fdc 100644
--- a/techs/megapack/factions/magic/units/dragon/dragon.xml
+++ b/techs/megapack/factions/magic/units/dragon/dragon.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/dragon_rider/dragon_rider.xml b/techs/megapack/factions/magic/units/dragon_rider/dragon_rider.xml
index f44327ee..e5a48ecb 100644
--- a/techs/megapack/factions/magic/units/dragon_rider/dragon_rider.xml
+++ b/techs/megapack/factions/magic/units/dragon_rider/dragon_rider.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/energy_source/energy_source.xml b/techs/megapack/factions/magic/units/energy_source/energy_source.xml
index 497f418d..fd570620 100644
--- a/techs/megapack/factions/magic/units/energy_source/energy_source.xml
+++ b/techs/megapack/factions/magic/units/energy_source/energy_source.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/evil_dragon/evil_dragon.xml b/techs/megapack/factions/magic/units/evil_dragon/evil_dragon.xml
index 736ae69e..61163b88 100644
--- a/techs/megapack/factions/magic/units/evil_dragon/evil_dragon.xml
+++ b/techs/megapack/factions/magic/units/evil_dragon/evil_dragon.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/ghost_armor/ghost_armor.xml b/techs/megapack/factions/magic/units/ghost_armor/ghost_armor.xml
index ec53774d..bea71b94 100644
--- a/techs/megapack/factions/magic/units/ghost_armor/ghost_armor.xml
+++ b/techs/megapack/factions/magic/units/ghost_armor/ghost_armor.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/golem/golem.xml b/techs/megapack/factions/magic/units/golem/golem.xml
index 20a42a6a..ec83e88a 100644
--- a/techs/megapack/factions/magic/units/golem/golem.xml
+++ b/techs/megapack/factions/magic/units/golem/golem.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/initiate/initiate.xml b/techs/megapack/factions/magic/units/initiate/initiate.xml
index 7afdec1e..9163ee01 100644
--- a/techs/megapack/factions/magic/units/initiate/initiate.xml
+++ b/techs/megapack/factions/magic/units/initiate/initiate.xml
@@ -26,7 +26,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/library/library.xml b/techs/megapack/factions/magic/units/library/library.xml
index e06e12ab..3e16ea03 100644
--- a/techs/megapack/factions/magic/units/library/library.xml
+++ b/techs/megapack/factions/magic/units/library/library.xml
@@ -36,7 +36,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/mage_tower/mage_tower.xml b/techs/megapack/factions/magic/units/mage_tower/mage_tower.xml
index b0abb37f..593a257e 100644
--- a/techs/megapack/factions/magic/units/mage_tower/mage_tower.xml
+++ b/techs/megapack/factions/magic/units/mage_tower/mage_tower.xml
@@ -41,7 +41,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/power_golem/power_golem.xml b/techs/megapack/factions/magic/units/power_golem/power_golem.xml
index 8aefa19b..cdce9562 100644
--- a/techs/megapack/factions/magic/units/power_golem/power_golem.xml
+++ b/techs/megapack/factions/magic/units/power_golem/power_golem.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/summoner/summoner.xml b/techs/megapack/factions/magic/units/summoner/summoner.xml
index 1c998727..ea23e866 100644
--- a/techs/megapack/factions/magic/units/summoner/summoner.xml
+++ b/techs/megapack/factions/magic/units/summoner/summoner.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/summoner_guild/summoner_guild.xml b/techs/megapack/factions/magic/units/summoner_guild/summoner_guild.xml
index df251ee1..f272b608 100644
--- a/techs/megapack/factions/magic/units/summoner_guild/summoner_guild.xml
+++ b/techs/megapack/factions/magic/units/summoner_guild/summoner_guild.xml
@@ -39,7 +39,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/tower_of_souls/tower_of_souls.xml b/techs/megapack/factions/magic/units/tower_of_souls/tower_of_souls.xml
index 70cc1c05..181146bf 100644
--- a/techs/megapack/factions/magic/units/tower_of_souls/tower_of_souls.xml
+++ b/techs/megapack/factions/magic/units/tower_of_souls/tower_of_souls.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/magic/units/wicker_behemoth/wicker_behemoth.xml b/techs/megapack/factions/magic/units/wicker_behemoth/wicker_behemoth.xml
index fe5ce8bc..08b24951 100644
--- a/techs/megapack/factions/magic/units/wicker_behemoth/wicker_behemoth.xml
+++ b/techs/megapack/factions/magic/units/wicker_behemoth/wicker_behemoth.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/magic/upgrades/ancient_summoning/ancient_summoning.xml b/techs/megapack/factions/magic/upgrades/ancient_summoning/ancient_summoning.xml
index 70a38b37..81addad2 100644
--- a/techs/megapack/factions/magic/upgrades/ancient_summoning/ancient_summoning.xml
+++ b/techs/megapack/factions/magic/upgrades/ancient_summoning/ancient_summoning.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/magic/upgrades/ancient_summoning/images/magic_upgrade_cancel.bmp b/techs/megapack/factions/magic/upgrades/ancient_summoning/images/magic_upgrade_cancel.bmp
deleted file mode 100644
index ef455a91..00000000
Binary files a/techs/megapack/factions/magic/upgrades/ancient_summoning/images/magic_upgrade_cancel.bmp and /dev/null differ
diff --git a/techs/megapack/factions/magic/upgrades/dragon_call/dragon_call.xml b/techs/megapack/factions/magic/upgrades/dragon_call/dragon_call.xml
index 2f580fef..9f220cb0 100644
--- a/techs/megapack/factions/magic/upgrades/dragon_call/dragon_call.xml
+++ b/techs/megapack/factions/magic/upgrades/dragon_call/dragon_call.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/magic/upgrades/energy_compression/energy_compression.xml b/techs/megapack/factions/magic/upgrades/energy_compression/energy_compression.xml
index cc9e7b51..965f02b5 100644
--- a/techs/megapack/factions/magic/upgrades/energy_compression/energy_compression.xml
+++ b/techs/megapack/factions/magic/upgrades/energy_compression/energy_compression.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/magic/upgrades/energy_sharpening/energy_sharpening.xml b/techs/megapack/factions/magic/upgrades/energy_sharpening/energy_sharpening.xml
index 1b0c8731..dc72ef9c 100644
--- a/techs/megapack/factions/magic/upgrades/energy_sharpening/energy_sharpening.xml
+++ b/techs/megapack/factions/magic/upgrades/energy_sharpening/energy_sharpening.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/magic/upgrades/faster_movement/faster_movement.xml b/techs/megapack/factions/magic/upgrades/faster_movement/faster_movement.xml
index a112d5bf..c6979e79 100644
--- a/techs/megapack/factions/magic/upgrades/faster_movement/faster_movement.xml
+++ b/techs/megapack/factions/magic/upgrades/faster_movement/faster_movement.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/magic/upgrades/golem_power/golem_power.xml b/techs/megapack/factions/magic/upgrades/golem_power/golem_power.xml
index 1823a072..ac60c865 100644
--- a/techs/megapack/factions/magic/upgrades/golem_power/golem_power.xml
+++ b/techs/megapack/factions/magic/upgrades/golem_power/golem_power.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/magic/upgrades/hell_gate/hell_gate.xml b/techs/megapack/factions/magic/upgrades/hell_gate/hell_gate.xml
index 26ad8874..0e48965b 100644
--- a/techs/megapack/factions/magic/upgrades/hell_gate/hell_gate.xml
+++ b/techs/megapack/factions/magic/upgrades/hell_gate/hell_gate.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/archer/images/tech_cancel.bmp b/techs/megapack/factions/norsemen/cancel.bmp
similarity index 100%
rename from techs/megapack/factions/norsemen/units/archer/images/tech_cancel.bmp
rename to techs/megapack/factions/norsemen/cancel.bmp
diff --git a/techs/megapack/factions/norsemen/empty.bmp b/techs/megapack/factions/norsemen/empty.bmp
new file mode 100644
index 00000000..0f9188ea
Binary files /dev/null and b/techs/megapack/factions/norsemen/empty.bmp differ
diff --git a/techs/megapack/factions/norsemen/units/archer/archer.xml b/techs/megapack/factions/norsemen/units/archer/archer.xml
index 1d3c4eec..febbc69b 100644
--- a/techs/megapack/factions/norsemen/units/archer/archer.xml
+++ b/techs/megapack/factions/norsemen/units/archer/archer.xml
@@ -23,7 +23,8 @@
-
+
+
@@ -33,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/axe_thrower/axe_thrower.xml b/techs/megapack/factions/norsemen/units/axe_thrower/axe_thrower.xml
index 611794d9..e1735388 100644
--- a/techs/megapack/factions/norsemen/units/axe_thrower/axe_thrower.xml
+++ b/techs/megapack/factions/norsemen/units/axe_thrower/axe_thrower.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/battleaxe/battleaxe.xml b/techs/megapack/factions/norsemen/units/battleaxe/battleaxe.xml
index 5a5fc64f..ea5c7aef 100644
--- a/techs/megapack/factions/norsemen/units/battleaxe/battleaxe.xml
+++ b/techs/megapack/factions/norsemen/units/battleaxe/battleaxe.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/battleaxe_berserk/battleaxe_berserk.xml b/techs/megapack/factions/norsemen/units/battleaxe_berserk/battleaxe_berserk.xml
index 868c15c3..b0783969 100644
--- a/techs/megapack/factions/norsemen/units/battleaxe_berserk/battleaxe_berserk.xml
+++ b/techs/megapack/factions/norsemen/units/battleaxe_berserk/battleaxe_berserk.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/blacksmith/blacksmith.xml b/techs/megapack/factions/norsemen/units/blacksmith/blacksmith.xml
index c1f0392a..5a90838d 100644
--- a/techs/megapack/factions/norsemen/units/blacksmith/blacksmith.xml
+++ b/techs/megapack/factions/norsemen/units/blacksmith/blacksmith.xml
@@ -39,7 +39,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/bone_tent/bone_tent.xml b/techs/megapack/factions/norsemen/units/bone_tent/bone_tent.xml
index 466878ea..71241696 100644
--- a/techs/megapack/factions/norsemen/units/bone_tent/bone_tent.xml
+++ b/techs/megapack/factions/norsemen/units/bone_tent/bone_tent.xml
@@ -39,7 +39,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/castle/castle.xml b/techs/megapack/factions/norsemen/units/castle/castle.xml
index d7d35f0d..125e1da0 100644
--- a/techs/megapack/factions/norsemen/units/castle/castle.xml
+++ b/techs/megapack/factions/norsemen/units/castle/castle.xml
@@ -41,7 +41,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/cow/cow.xml b/techs/megapack/factions/norsemen/units/cow/cow.xml
index a5d4549d..724abb02 100644
--- a/techs/megapack/factions/norsemen/units/cow/cow.xml
+++ b/techs/megapack/factions/norsemen/units/cow/cow.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/crossbow/crossbow.xml b/techs/megapack/factions/norsemen/units/crossbow/crossbow.xml
index 7e7d1291..eb7e8797 100644
--- a/techs/megapack/factions/norsemen/units/crossbow/crossbow.xml
+++ b/techs/megapack/factions/norsemen/units/crossbow/crossbow.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/cudgel_lady/cudgel_lady.xml b/techs/megapack/factions/norsemen/units/cudgel_lady/cudgel_lady.xml
index 97226e86..6efb4fd6 100644
--- a/techs/megapack/factions/norsemen/units/cudgel_lady/cudgel_lady.xml
+++ b/techs/megapack/factions/norsemen/units/cudgel_lady/cudgel_lady.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/farm/farm.xml b/techs/megapack/factions/norsemen/units/farm/farm.xml
index c81f1914..6f6090c4 100644
--- a/techs/megapack/factions/norsemen/units/farm/farm.xml
+++ b/techs/megapack/factions/norsemen/units/farm/farm.xml
@@ -48,7 +48,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/flying_valkyrie/flying_valkyrie.xml b/techs/megapack/factions/norsemen/units/flying_valkyrie/flying_valkyrie.xml
index 00199c53..cb30678b 100644
--- a/techs/megapack/factions/norsemen/units/flying_valkyrie/flying_valkyrie.xml
+++ b/techs/megapack/factions/norsemen/units/flying_valkyrie/flying_valkyrie.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/house/house.xml b/techs/megapack/factions/norsemen/units/house/house.xml
index a64943d4..e6e4e952 100644
--- a/techs/megapack/factions/norsemen/units/house/house.xml
+++ b/techs/megapack/factions/norsemen/units/house/house.xml
@@ -40,7 +40,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/mead_bar/mead_bar.xml b/techs/megapack/factions/norsemen/units/mead_bar/mead_bar.xml
index 9c1f7d4c..90f36153 100644
--- a/techs/megapack/factions/norsemen/units/mead_bar/mead_bar.xml
+++ b/techs/megapack/factions/norsemen/units/mead_bar/mead_bar.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/mistletoe_tree/mistletoe_tree.xml b/techs/megapack/factions/norsemen/units/mistletoe_tree/mistletoe_tree.xml
index c0bf52e1..e5e530e9 100644
--- a/techs/megapack/factions/norsemen/units/mistletoe_tree/mistletoe_tree.xml
+++ b/techs/megapack/factions/norsemen/units/mistletoe_tree/mistletoe_tree.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/spearman/spearman.xml b/techs/megapack/factions/norsemen/units/spearman/spearman.xml
index 76ef69d0..c89ce02d 100644
--- a/techs/megapack/factions/norsemen/units/spearman/spearman.xml
+++ b/techs/megapack/factions/norsemen/units/spearman/spearman.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/spearman_berserk/spearman_berserk.xml b/techs/megapack/factions/norsemen/units/spearman_berserk/spearman_berserk.xml
index 0268246e..b04c04ad 100644
--- a/techs/megapack/factions/norsemen/units/spearman_berserk/spearman_berserk.xml
+++ b/techs/megapack/factions/norsemen/units/spearman_berserk/spearman_berserk.xml
@@ -35,7 +35,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/swordman/swordman.xml b/techs/megapack/factions/norsemen/units/swordman/swordman.xml
index 3e396402..b11bce97 100644
--- a/techs/megapack/factions/norsemen/units/swordman/swordman.xml
+++ b/techs/megapack/factions/norsemen/units/swordman/swordman.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/swordman_berserk/swordman_berserk.xml b/techs/megapack/factions/norsemen/units/swordman_berserk/swordman_berserk.xml
index d2d57eec..8babb035 100644
--- a/techs/megapack/factions/norsemen/units/swordman_berserk/swordman_berserk.xml
+++ b/techs/megapack/factions/norsemen/units/swordman_berserk/swordman_berserk.xml
@@ -38,7 +38,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/thor/thor.xml b/techs/megapack/factions/norsemen/units/thor/thor.xml
index 890e3b37..eb1b3df1 100644
--- a/techs/megapack/factions/norsemen/units/thor/thor.xml
+++ b/techs/megapack/factions/norsemen/units/thor/thor.xml
@@ -37,7 +37,7 @@
-
+
@@ -157,7 +157,12 @@
-
+
+
+
+
+
+
diff --git a/techs/megapack/factions/norsemen/units/thor_totem/thor_totem.xml b/techs/megapack/factions/norsemen/units/thor_totem/thor_totem.xml
index 6e4a02ab..8363a77f 100644
--- a/techs/megapack/factions/norsemen/units/thor_totem/thor_totem.xml
+++ b/techs/megapack/factions/norsemen/units/thor_totem/thor_totem.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/thrall/thrall.xml b/techs/megapack/factions/norsemen/units/thrall/thrall.xml
index cb439bf5..b024d186 100644
--- a/techs/megapack/factions/norsemen/units/thrall/thrall.xml
+++ b/techs/megapack/factions/norsemen/units/thrall/thrall.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/valhalla/valhalla.xml b/techs/megapack/factions/norsemen/units/valhalla/valhalla.xml
index 61911de6..e0a92097 100644
--- a/techs/megapack/factions/norsemen/units/valhalla/valhalla.xml
+++ b/techs/megapack/factions/norsemen/units/valhalla/valhalla.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/units/valkyrie/valkyrie.xml b/techs/megapack/factions/norsemen/units/valkyrie/valkyrie.xml
index cd3fc547..9e3dcfa2 100644
--- a/techs/megapack/factions/norsemen/units/valkyrie/valkyrie.xml
+++ b/techs/megapack/factions/norsemen/units/valkyrie/valkyrie.xml
@@ -34,7 +34,7 @@
-
+
@@ -211,7 +211,8 @@
-
+
+
diff --git a/techs/megapack/factions/norsemen/units/wild_sow/wild_sow.xml b/techs/megapack/factions/norsemen/units/wild_sow/wild_sow.xml
index c6e96dea..7ec82d9c 100644
--- a/techs/megapack/factions/norsemen/units/wild_sow/wild_sow.xml
+++ b/techs/megapack/factions/norsemen/units/wild_sow/wild_sow.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/upgrades/advanced_iron/advanced_iron.xml b/techs/megapack/factions/norsemen/upgrades/advanced_iron/advanced_iron.xml
index 7514e8ed..79d062e4 100644
--- a/techs/megapack/factions/norsemen/upgrades/advanced_iron/advanced_iron.xml
+++ b/techs/megapack/factions/norsemen/upgrades/advanced_iron/advanced_iron.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/upgrades/advanced_iron/images/tech_upgrade_cancel.bmp b/techs/megapack/factions/norsemen/upgrades/advanced_iron/images/tech_upgrade_cancel.bmp
deleted file mode 100644
index db7cce17..00000000
Binary files a/techs/megapack/factions/norsemen/upgrades/advanced_iron/images/tech_upgrade_cancel.bmp and /dev/null differ
diff --git a/techs/megapack/factions/norsemen/upgrades/arrow/arrow.xml b/techs/megapack/factions/norsemen/upgrades/arrow/arrow.xml
index 7dc7a17e..619ffe70 100644
--- a/techs/megapack/factions/norsemen/upgrades/arrow/arrow.xml
+++ b/techs/megapack/factions/norsemen/upgrades/arrow/arrow.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/upgrades/holy_valkyrie/holy_valkyrie.xml b/techs/megapack/factions/norsemen/upgrades/holy_valkyrie/holy_valkyrie.xml
index 602d6e82..af6c70db 100644
--- a/techs/megapack/factions/norsemen/upgrades/holy_valkyrie/holy_valkyrie.xml
+++ b/techs/megapack/factions/norsemen/upgrades/holy_valkyrie/holy_valkyrie.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/upgrades/iron/iron.xml b/techs/megapack/factions/norsemen/upgrades/iron/iron.xml
index fa3b1c5c..d4323e8c 100644
--- a/techs/megapack/factions/norsemen/upgrades/iron/iron.xml
+++ b/techs/megapack/factions/norsemen/upgrades/iron/iron.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/upgrades/mead/mead.xml b/techs/megapack/factions/norsemen/upgrades/mead/mead.xml
index 5af28ff1..c08a9517 100644
--- a/techs/megapack/factions/norsemen/upgrades/mead/mead.xml
+++ b/techs/megapack/factions/norsemen/upgrades/mead/mead.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/norsemen/upgrades/root/root.xml b/techs/megapack/factions/norsemen/upgrades/root/root.xml
index 1774aed9..c8d58ac7 100644
--- a/techs/megapack/factions/norsemen/upgrades/root/root.xml
+++ b/techs/megapack/factions/norsemen/upgrades/root/root.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/genie/images/tech_cancel.bmp b/techs/megapack/factions/persian/cancel.bmp
similarity index 100%
rename from techs/megapack/factions/persian/units/genie/images/tech_cancel.bmp
rename to techs/megapack/factions/persian/cancel.bmp
diff --git a/techs/megapack/factions/persian/empty.bmp b/techs/megapack/factions/persian/empty.bmp
new file mode 100644
index 00000000..bbd80576
Binary files /dev/null and b/techs/megapack/factions/persian/empty.bmp differ
diff --git a/techs/megapack/factions/persian/units/blacksmith/blacksmith.xml b/techs/megapack/factions/persian/units/blacksmith/blacksmith.xml
index 0bf507ed..e1736d90 100644
--- a/techs/megapack/factions/persian/units/blacksmith/blacksmith.xml
+++ b/techs/megapack/factions/persian/units/blacksmith/blacksmith.xml
@@ -38,7 +38,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/elephant/elephant.xml b/techs/megapack/factions/persian/units/elephant/elephant.xml
index ef3ea4b7..88492acf 100644
--- a/techs/megapack/factions/persian/units/elephant/elephant.xml
+++ b/techs/megapack/factions/persian/units/elephant/elephant.xml
@@ -36,7 +36,7 @@
-
+
@@ -209,7 +209,8 @@
-
+
+
@@ -218,7 +219,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/elephant_cage/elephant_cage.xml b/techs/megapack/factions/persian/units/elephant_cage/elephant_cage.xml
index 71b7b14c..0d9cdec2 100644
--- a/techs/megapack/factions/persian/units/elephant_cage/elephant_cage.xml
+++ b/techs/megapack/factions/persian/units/elephant_cage/elephant_cage.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/fakir/fakir.xml b/techs/megapack/factions/persian/units/fakir/fakir.xml
index 7a843fe5..6d37efdd 100644
--- a/techs/megapack/factions/persian/units/fakir/fakir.xml
+++ b/techs/megapack/factions/persian/units/fakir/fakir.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/farm/farm.xml b/techs/megapack/factions/persian/units/farm/farm.xml
index e6062ef6..ed8936b1 100644
--- a/techs/megapack/factions/persian/units/farm/farm.xml
+++ b/techs/megapack/factions/persian/units/farm/farm.xml
@@ -40,7 +40,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/flying_carpet/flying_carpet.xml b/techs/megapack/factions/persian/units/flying_carpet/flying_carpet.xml
index 3f3755e0..d7571d9e 100644
--- a/techs/megapack/factions/persian/units/flying_carpet/flying_carpet.xml
+++ b/techs/megapack/factions/persian/units/flying_carpet/flying_carpet.xml
@@ -38,7 +38,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/genie/genie.xml b/techs/megapack/factions/persian/units/genie/genie.xml
index a0329ba8..2c3fa310 100644
--- a/techs/megapack/factions/persian/units/genie/genie.xml
+++ b/techs/megapack/factions/persian/units/genie/genie.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/house/house.xml b/techs/megapack/factions/persian/units/house/house.xml
index 365884c3..444ffc55 100644
--- a/techs/megapack/factions/persian/units/house/house.xml
+++ b/techs/megapack/factions/persian/units/house/house.xml
@@ -35,7 +35,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/magician/magician.xml b/techs/megapack/factions/persian/units/magician/magician.xml
index 7226f936..31fdef01 100644
--- a/techs/megapack/factions/persian/units/magician/magician.xml
+++ b/techs/megapack/factions/persian/units/magician/magician.xml
@@ -35,7 +35,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/minaret/minaret.xml b/techs/megapack/factions/persian/units/minaret/minaret.xml
index 44370722..5c28c5f1 100644
--- a/techs/megapack/factions/persian/units/minaret/minaret.xml
+++ b/techs/megapack/factions/persian/units/minaret/minaret.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/palace/palace.xml b/techs/megapack/factions/persian/units/palace/palace.xml
index 5fe206b2..095818ca 100644
--- a/techs/megapack/factions/persian/units/palace/palace.xml
+++ b/techs/megapack/factions/persian/units/palace/palace.xml
@@ -41,7 +41,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/princess/princess.xml b/techs/megapack/factions/persian/units/princess/princess.xml
index 52a7eed1..c66440c9 100644
--- a/techs/megapack/factions/persian/units/princess/princess.xml
+++ b/techs/megapack/factions/persian/units/princess/princess.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/sheep/sheep.xml b/techs/megapack/factions/persian/units/sheep/sheep.xml
index 9f16af89..0935fde3 100644
--- a/techs/megapack/factions/persian/units/sheep/sheep.xml
+++ b/techs/megapack/factions/persian/units/sheep/sheep.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/snake_basket/snake_basket.xml b/techs/megapack/factions/persian/units/snake_basket/snake_basket.xml
index 509b0dfc..e47b52c7 100644
--- a/techs/megapack/factions/persian/units/snake_basket/snake_basket.xml
+++ b/techs/megapack/factions/persian/units/snake_basket/snake_basket.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/stickfighter/stickfighter.xml b/techs/megapack/factions/persian/units/stickfighter/stickfighter.xml
index 0c534d45..07107132 100644
--- a/techs/megapack/factions/persian/units/stickfighter/stickfighter.xml
+++ b/techs/megapack/factions/persian/units/stickfighter/stickfighter.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/swordman/swordman.xml b/techs/megapack/factions/persian/units/swordman/swordman.xml
index 6714e63a..9b5e09b2 100644
--- a/techs/megapack/factions/persian/units/swordman/swordman.xml
+++ b/techs/megapack/factions/persian/units/swordman/swordman.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/temple/temple.xml b/techs/megapack/factions/persian/units/temple/temple.xml
index c70b3e67..6d84850e 100644
--- a/techs/megapack/factions/persian/units/temple/temple.xml
+++ b/techs/megapack/factions/persian/units/temple/temple.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/tent/tent.xml b/techs/megapack/factions/persian/units/tent/tent.xml
index e18fd750..4b613359 100644
--- a/techs/megapack/factions/persian/units/tent/tent.xml
+++ b/techs/megapack/factions/persian/units/tent/tent.xml
@@ -42,7 +42,7 @@
-
+
diff --git a/techs/megapack/factions/persian/units/worker/worker.xml b/techs/megapack/factions/persian/units/worker/worker.xml
index 2c439d09..45f97f0e 100644
--- a/techs/megapack/factions/persian/units/worker/worker.xml
+++ b/techs/megapack/factions/persian/units/worker/worker.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/techs/megapack/factions/persian/upgrades/corn_and_wicker/corn_and_wicker.xml b/techs/megapack/factions/persian/upgrades/corn_and_wicker/corn_and_wicker.xml
index da5e39f6..dd6e3dcc 100644
--- a/techs/megapack/factions/persian/upgrades/corn_and_wicker/corn_and_wicker.xml
+++ b/techs/megapack/factions/persian/upgrades/corn_and_wicker/corn_and_wicker.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/persian/upgrades/corn_and_wicker/images/tech_upgrade_cancel.bmp b/techs/megapack/factions/persian/upgrades/corn_and_wicker/images/tech_upgrade_cancel.bmp
deleted file mode 100644
index 5e844cf9..00000000
Binary files a/techs/megapack/factions/persian/upgrades/corn_and_wicker/images/tech_upgrade_cancel.bmp and /dev/null differ
diff --git a/techs/megapack/factions/persian/upgrades/magic_level_1/magic_level_1.xml b/techs/megapack/factions/persian/upgrades/magic_level_1/magic_level_1.xml
index db13a7a8..2d8dd27e 100644
--- a/techs/megapack/factions/persian/upgrades/magic_level_1/magic_level_1.xml
+++ b/techs/megapack/factions/persian/upgrades/magic_level_1/magic_level_1.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/persian/upgrades/magic_level_2/magic_level_2.xml b/techs/megapack/factions/persian/upgrades/magic_level_2/magic_level_2.xml
index 7e560f86..4b9039f7 100644
--- a/techs/megapack/factions/persian/upgrades/magic_level_2/magic_level_2.xml
+++ b/techs/megapack/factions/persian/upgrades/magic_level_2/magic_level_2.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/persian/upgrades/nails/nails.xml b/techs/megapack/factions/persian/upgrades/nails/nails.xml
index 665e6deb..1f43d9e6 100644
--- a/techs/megapack/factions/persian/upgrades/nails/nails.xml
+++ b/techs/megapack/factions/persian/upgrades/nails/nails.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/persian/upgrades/shield/shield.xml b/techs/megapack/factions/persian/upgrades/shield/shield.xml
index 6bd4ac74..e0419901 100644
--- a/techs/megapack/factions/persian/upgrades/shield/shield.xml
+++ b/techs/megapack/factions/persian/upgrades/shield/shield.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/persian/upgrades/weapons/weapons.xml b/techs/megapack/factions/persian/upgrades/weapons/weapons.xml
index 92aeda90..cc7e54b9 100644
--- a/techs/megapack/factions/persian/upgrades/weapons/weapons.xml
+++ b/techs/megapack/factions/persian/upgrades/weapons/weapons.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/archer/images/tech_cancel.bmp b/techs/megapack/factions/romans/cancel.bmp
similarity index 100%
rename from techs/megapack/factions/romans/units/archer/images/tech_cancel.bmp
rename to techs/megapack/factions/romans/cancel.bmp
diff --git a/techs/megapack/factions/romans/empty.bmp b/techs/megapack/factions/romans/empty.bmp
new file mode 100644
index 00000000..529ae74b
Binary files /dev/null and b/techs/megapack/factions/romans/empty.bmp differ
diff --git a/techs/megapack/factions/romans/units/archer/archer.xml b/techs/megapack/factions/romans/units/archer/archer.xml
index 57014dc2..87370c7d 100644
--- a/techs/megapack/factions/romans/units/archer/archer.xml
+++ b/techs/megapack/factions/romans/units/archer/archer.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/axe_man/axe_man.xml b/techs/megapack/factions/romans/units/axe_man/axe_man.xml
index 521ac0b6..0644b8aa 100644
--- a/techs/megapack/factions/romans/units/axe_man/axe_man.xml
+++ b/techs/megapack/factions/romans/units/axe_man/axe_man.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/ballista/ballista.xml b/techs/megapack/factions/romans/units/ballista/ballista.xml
index d8fb34c4..41c4ba81 100644
--- a/techs/megapack/factions/romans/units/ballista/ballista.xml
+++ b/techs/megapack/factions/romans/units/ballista/ballista.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/battering_ram/battering_ram.xml b/techs/megapack/factions/romans/units/battering_ram/battering_ram.xml
index a0c11e9b..342209d1 100644
--- a/techs/megapack/factions/romans/units/battering_ram/battering_ram.xml
+++ b/techs/megapack/factions/romans/units/battering_ram/battering_ram.xml
@@ -40,7 +40,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/blacksmith_shop/blacksmith_shop.xml b/techs/megapack/factions/romans/units/blacksmith_shop/blacksmith_shop.xml
index 44dbf59e..95916b41 100644
--- a/techs/megapack/factions/romans/units/blacksmith_shop/blacksmith_shop.xml
+++ b/techs/megapack/factions/romans/units/blacksmith_shop/blacksmith_shop.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/catapult/catapult.xml b/techs/megapack/factions/romans/units/catapult/catapult.xml
index 65cab4b5..fd751eba 100644
--- a/techs/megapack/factions/romans/units/catapult/catapult.xml
+++ b/techs/megapack/factions/romans/units/catapult/catapult.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/cavalry/cavalry.xml b/techs/megapack/factions/romans/units/cavalry/cavalry.xml
index b70cf0c7..17f441a9 100644
--- a/techs/megapack/factions/romans/units/cavalry/cavalry.xml
+++ b/techs/megapack/factions/romans/units/cavalry/cavalry.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/cow/cow.xml b/techs/megapack/factions/romans/units/cow/cow.xml
index d1181a49..f44cc64d 100644
--- a/techs/megapack/factions/romans/units/cow/cow.xml
+++ b/techs/megapack/factions/romans/units/cow/cow.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/eagle_pillar/eagle_pillar.xml b/techs/megapack/factions/romans/units/eagle_pillar/eagle_pillar.xml
index ed246334..e9d6cf47 100644
--- a/techs/megapack/factions/romans/units/eagle_pillar/eagle_pillar.xml
+++ b/techs/megapack/factions/romans/units/eagle_pillar/eagle_pillar.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/fire_archer/fire_archer.xml b/techs/megapack/factions/romans/units/fire_archer/fire_archer.xml
index d6777307..3645e2d5 100644
--- a/techs/megapack/factions/romans/units/fire_archer/fire_archer.xml
+++ b/techs/megapack/factions/romans/units/fire_archer/fire_archer.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/fire_archer/images/tech_cancel.bmp b/techs/megapack/factions/romans/units/fire_archer/images/tech_cancel.bmp
deleted file mode 100644
index 874ec366..00000000
Binary files a/techs/megapack/factions/romans/units/fire_archer/images/tech_cancel.bmp and /dev/null differ
diff --git a/techs/megapack/factions/romans/units/forum/forum.xml b/techs/megapack/factions/romans/units/forum/forum.xml
index 4ee53002..bd033d33 100644
--- a/techs/megapack/factions/romans/units/forum/forum.xml
+++ b/techs/megapack/factions/romans/units/forum/forum.xml
@@ -48,7 +48,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/general/general.xml b/techs/megapack/factions/romans/units/general/general.xml
index 7db00474..54fa64f6 100644
--- a/techs/megapack/factions/romans/units/general/general.xml
+++ b/techs/megapack/factions/romans/units/general/general.xml
@@ -36,7 +36,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/gladiator/gladiator.xml b/techs/megapack/factions/romans/units/gladiator/gladiator.xml
index dcc8f547..65ce626a 100644
--- a/techs/megapack/factions/romans/units/gladiator/gladiator.xml
+++ b/techs/megapack/factions/romans/units/gladiator/gladiator.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/gladiator_school/gladiator_school.xml b/techs/megapack/factions/romans/units/gladiator_school/gladiator_school.xml
index 7c6a4b39..1ac84f4a 100644
--- a/techs/megapack/factions/romans/units/gladiator_school/gladiator_school.xml
+++ b/techs/megapack/factions/romans/units/gladiator_school/gladiator_school.xml
@@ -35,7 +35,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/guard/guard.xml b/techs/megapack/factions/romans/units/guard/guard.xml
index ee4681f2..9924462c 100644
--- a/techs/megapack/factions/romans/units/guard/guard.xml
+++ b/techs/megapack/factions/romans/units/guard/guard.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/guard_tower/guard_tower.xml b/techs/megapack/factions/romans/units/guard_tower/guard_tower.xml
index d5d2e470..614581ed 100644
--- a/techs/megapack/factions/romans/units/guard_tower/guard_tower.xml
+++ b/techs/megapack/factions/romans/units/guard_tower/guard_tower.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/military_camp/military_camp.xml b/techs/megapack/factions/romans/units/military_camp/military_camp.xml
index 47c322a9..c76009ec 100644
--- a/techs/megapack/factions/romans/units/military_camp/military_camp.xml
+++ b/techs/megapack/factions/romans/units/military_camp/military_camp.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/slave/slave.xml b/techs/megapack/factions/romans/units/slave/slave.xml
index af492e3a..3e563427 100644
--- a/techs/megapack/factions/romans/units/slave/slave.xml
+++ b/techs/megapack/factions/romans/units/slave/slave.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/spearman/spearman.xml b/techs/megapack/factions/romans/units/spearman/spearman.xml
index 6271093b..4f84e941 100644
--- a/techs/megapack/factions/romans/units/spearman/spearman.xml
+++ b/techs/megapack/factions/romans/units/spearman/spearman.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/swordsman/swordsman.xml b/techs/megapack/factions/romans/units/swordsman/swordsman.xml
index b38a68ff..cf5ff9e8 100644
--- a/techs/megapack/factions/romans/units/swordsman/swordsman.xml
+++ b/techs/megapack/factions/romans/units/swordsman/swordsman.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/temple/temple.xml b/techs/megapack/factions/romans/units/temple/temple.xml
index 819583ca..0f9c887c 100644
--- a/techs/megapack/factions/romans/units/temple/temple.xml
+++ b/techs/megapack/factions/romans/units/temple/temple.xml
@@ -39,7 +39,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/training_camp/training_camp.xml b/techs/megapack/factions/romans/units/training_camp/training_camp.xml
index 3eb3fc19..069e74d7 100644
--- a/techs/megapack/factions/romans/units/training_camp/training_camp.xml
+++ b/techs/megapack/factions/romans/units/training_camp/training_camp.xml
@@ -41,7 +41,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/tribune/tribune.xml b/techs/megapack/factions/romans/units/tribune/tribune.xml
index de7d05d4..61d228d9 100644
--- a/techs/megapack/factions/romans/units/tribune/tribune.xml
+++ b/techs/megapack/factions/romans/units/tribune/tribune.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/turtle_formation/turtle_formation.xml b/techs/megapack/factions/romans/units/turtle_formation/turtle_formation.xml
index cb867091..1c75734d 100644
--- a/techs/megapack/factions/romans/units/turtle_formation/turtle_formation.xml
+++ b/techs/megapack/factions/romans/units/turtle_formation/turtle_formation.xml
@@ -35,7 +35,7 @@
-
+
diff --git a/techs/megapack/factions/romans/units/wartime_mechanic/wartime_mechanic.xml b/techs/megapack/factions/romans/units/wartime_mechanic/wartime_mechanic.xml
index 7480013f..f6e318dc 100644
--- a/techs/megapack/factions/romans/units/wartime_mechanic/wartime_mechanic.xml
+++ b/techs/megapack/factions/romans/units/wartime_mechanic/wartime_mechanic.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/techs/megapack/factions/romans/upgrades/advanced_architecture/advanced_architecture.xml b/techs/megapack/factions/romans/upgrades/advanced_architecture/advanced_architecture.xml
index fe8e09cb..1ebb4d35 100644
--- a/techs/megapack/factions/romans/upgrades/advanced_architecture/advanced_architecture.xml
+++ b/techs/megapack/factions/romans/upgrades/advanced_architecture/advanced_architecture.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/romans/upgrades/bless_of_minerva/bless_of_minerva.xml b/techs/megapack/factions/romans/upgrades/bless_of_minerva/bless_of_minerva.xml
index bc45bb5b..fcb724fa 100644
--- a/techs/megapack/factions/romans/upgrades/bless_of_minerva/bless_of_minerva.xml
+++ b/techs/megapack/factions/romans/upgrades/bless_of_minerva/bless_of_minerva.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/romans/upgrades/enlarge_shields/enlarge_shields.xml b/techs/megapack/factions/romans/upgrades/enlarge_shields/enlarge_shields.xml
index 0623ef0a..5815b950 100644
--- a/techs/megapack/factions/romans/upgrades/enlarge_shields/enlarge_shields.xml
+++ b/techs/megapack/factions/romans/upgrades/enlarge_shields/enlarge_shields.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/romans/upgrades/formations/formations.xml b/techs/megapack/factions/romans/upgrades/formations/formations.xml
index 588485d3..9bb7ed4e 100644
--- a/techs/megapack/factions/romans/upgrades/formations/formations.xml
+++ b/techs/megapack/factions/romans/upgrades/formations/formations.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/romans/upgrades/jupiter/jupiter.xml b/techs/megapack/factions/romans/upgrades/jupiter/jupiter.xml
index 49a8979f..68d5daea 100644
--- a/techs/megapack/factions/romans/upgrades/jupiter/jupiter.xml
+++ b/techs/megapack/factions/romans/upgrades/jupiter/jupiter.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/romans/upgrades/reinforce_armor/reinforce_armor.xml b/techs/megapack/factions/romans/upgrades/reinforce_armor/reinforce_armor.xml
index d95a6367..41c67a94 100644
--- a/techs/megapack/factions/romans/upgrades/reinforce_armor/reinforce_armor.xml
+++ b/techs/megapack/factions/romans/upgrades/reinforce_armor/reinforce_armor.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/romans/upgrades/sharpen_points/sharpen_points.xml b/techs/megapack/factions/romans/upgrades/sharpen_points/sharpen_points.xml
index 5f5d2144..ade96107 100644
--- a/techs/megapack/factions/romans/upgrades/sharpen_points/sharpen_points.xml
+++ b/techs/megapack/factions/romans/upgrades/sharpen_points/sharpen_points.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/romans/upgrades/sign_of_mars/sign_of_mars.xml b/techs/megapack/factions/romans/upgrades/sign_of_mars/sign_of_mars.xml
index 17bc1563..91ac07d3 100644
--- a/techs/megapack/factions/romans/upgrades/sign_of_mars/sign_of_mars.xml
+++ b/techs/megapack/factions/romans/upgrades/sign_of_mars/sign_of_mars.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/romans/upgrades/strengthen_swords/strengthen_swords.xml b/techs/megapack/factions/romans/upgrades/strengthen_swords/strengthen_swords.xml
index efe9e53e..e7e00c02 100644
--- a/techs/megapack/factions/romans/upgrades/strengthen_swords/strengthen_swords.xml
+++ b/techs/megapack/factions/romans/upgrades/strengthen_swords/strengthen_swords.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/romans/upgrades/training_field/training_field.xml b/techs/megapack/factions/romans/upgrades/training_field/training_field.xml
index c5b38628..7c853588 100644
--- a/techs/megapack/factions/romans/upgrades/training_field/training_field.xml
+++ b/techs/megapack/factions/romans/upgrades/training_field/training_field.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/indian/units/archer/images/tech_cancel.bmp b/techs/megapack/factions/tech/cancel.bmp
similarity index 100%
rename from techs/megapack/factions/indian/units/archer/images/tech_cancel.bmp
rename to techs/megapack/factions/tech/cancel.bmp
diff --git a/techs/megapack/factions/tech/empty.bmp b/techs/megapack/factions/tech/empty.bmp
new file mode 100644
index 00000000..d74efd02
Binary files /dev/null and b/techs/megapack/factions/tech/empty.bmp differ
diff --git a/techs/megapack/factions/tech/units/aerodrome/aerodrome.xml b/techs/megapack/factions/tech/units/aerodrome/aerodrome.xml
index 80f9b956..e6e606cf 100644
--- a/techs/megapack/factions/tech/units/aerodrome/aerodrome.xml
+++ b/techs/megapack/factions/tech/units/aerodrome/aerodrome.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/air_ballista/air_ballista.xml b/techs/megapack/factions/tech/units/air_ballista/air_ballista.xml
index 1979a621..5d17508c 100644
--- a/techs/megapack/factions/tech/units/air_ballista/air_ballista.xml
+++ b/techs/megapack/factions/tech/units/air_ballista/air_ballista.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/airship/airship.xml b/techs/megapack/factions/tech/units/airship/airship.xml
index 835cbf4d..9cdbdbb7 100644
--- a/techs/megapack/factions/tech/units/airship/airship.xml
+++ b/techs/megapack/factions/tech/units/airship/airship.xml
@@ -38,7 +38,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/archer/archer.xml b/techs/megapack/factions/tech/units/archer/archer.xml
index 532f556f..ce33d5c0 100644
--- a/techs/megapack/factions/tech/units/archer/archer.xml
+++ b/techs/megapack/factions/tech/units/archer/archer.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/archer/images/tech_cancel.bmp b/techs/megapack/factions/tech/units/archer/images/tech_cancel.bmp
deleted file mode 100644
index 5e844cf9..00000000
Binary files a/techs/megapack/factions/tech/units/archer/images/tech_cancel.bmp and /dev/null differ
diff --git a/techs/megapack/factions/tech/units/barracks/barracks.xml b/techs/megapack/factions/tech/units/barracks/barracks.xml
index cba4c72c..ab9bd276 100644
--- a/techs/megapack/factions/tech/units/barracks/barracks.xml
+++ b/techs/megapack/factions/tech/units/barracks/barracks.xml
@@ -38,7 +38,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/battle_machine/battle_machine.xml b/techs/megapack/factions/tech/units/battle_machine/battle_machine.xml
index 888b684c..2c07d9a1 100644
--- a/techs/megapack/factions/tech/units/battle_machine/battle_machine.xml
+++ b/techs/megapack/factions/tech/units/battle_machine/battle_machine.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/blacksmith/blacksmith.xml b/techs/megapack/factions/tech/units/blacksmith/blacksmith.xml
index 437867c0..73f4e2e3 100644
--- a/techs/megapack/factions/tech/units/blacksmith/blacksmith.xml
+++ b/techs/megapack/factions/tech/units/blacksmith/blacksmith.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/castle/castle.xml b/techs/megapack/factions/tech/units/castle/castle.xml
index c7e2c139..baaa4515 100644
--- a/techs/megapack/factions/tech/units/castle/castle.xml
+++ b/techs/megapack/factions/tech/units/castle/castle.xml
@@ -41,7 +41,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/catapult/catapult.xml b/techs/megapack/factions/tech/units/catapult/catapult.xml
index dac6b749..bc62f2c9 100644
--- a/techs/megapack/factions/tech/units/catapult/catapult.xml
+++ b/techs/megapack/factions/tech/units/catapult/catapult.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/cow/cow.xml b/techs/megapack/factions/tech/units/cow/cow.xml
index a5d4549d..724abb02 100644
--- a/techs/megapack/factions/tech/units/cow/cow.xml
+++ b/techs/megapack/factions/tech/units/cow/cow.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/defense_tower/defense_tower.xml b/techs/megapack/factions/tech/units/defense_tower/defense_tower.xml
index 9554bc66..f313607e 100644
--- a/techs/megapack/factions/tech/units/defense_tower/defense_tower.xml
+++ b/techs/megapack/factions/tech/units/defense_tower/defense_tower.xml
@@ -35,7 +35,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/farm/farm.xml b/techs/megapack/factions/tech/units/farm/farm.xml
index 9feb6109..a6cb5da4 100644
--- a/techs/megapack/factions/tech/units/farm/farm.xml
+++ b/techs/megapack/factions/tech/units/farm/farm.xml
@@ -41,7 +41,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/guard/guard.xml b/techs/megapack/factions/tech/units/guard/guard.xml
index 80e82bc2..42f42a58 100644
--- a/techs/megapack/factions/tech/units/guard/guard.xml
+++ b/techs/megapack/factions/tech/units/guard/guard.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/horseman/horseman.xml b/techs/megapack/factions/tech/units/horseman/horseman.xml
index f14e0e66..e0ac8377 100644
--- a/techs/megapack/factions/tech/units/horseman/horseman.xml
+++ b/techs/megapack/factions/tech/units/horseman/horseman.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/ornithopter/ornithopter.xml b/techs/megapack/factions/tech/units/ornithopter/ornithopter.xml
index c2b17de6..9e3fa96f 100644
--- a/techs/megapack/factions/tech/units/ornithopter/ornithopter.xml
+++ b/techs/megapack/factions/tech/units/ornithopter/ornithopter.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/pig/pig.xml b/techs/megapack/factions/tech/units/pig/pig.xml
index 4337b282..eeeb54f8 100644
--- a/techs/megapack/factions/tech/units/pig/pig.xml
+++ b/techs/megapack/factions/tech/units/pig/pig.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/swordman/swordman.xml b/techs/megapack/factions/tech/units/swordman/swordman.xml
index 9c69caf4..9fe76050 100644
--- a/techs/megapack/factions/tech/units/swordman/swordman.xml
+++ b/techs/megapack/factions/tech/units/swordman/swordman.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/technician/technician.xml b/techs/megapack/factions/tech/units/technician/technician.xml
index ada85f6e..29925f1e 100644
--- a/techs/megapack/factions/tech/units/technician/technician.xml
+++ b/techs/megapack/factions/tech/units/technician/technician.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/technodrome/technodrome.xml b/techs/megapack/factions/tech/units/technodrome/technodrome.xml
index bbec5fee..a2b08b01 100644
--- a/techs/megapack/factions/tech/units/technodrome/technodrome.xml
+++ b/techs/megapack/factions/tech/units/technodrome/technodrome.xml
@@ -39,7 +39,7 @@
-
+
diff --git a/techs/megapack/factions/tech/units/worker/worker.xml b/techs/megapack/factions/tech/units/worker/worker.xml
index edbd2369..e6b66536 100644
--- a/techs/megapack/factions/tech/units/worker/worker.xml
+++ b/techs/megapack/factions/tech/units/worker/worker.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/techs/megapack/factions/tech/upgrades/advanced_architecture/advanced_architecture.xml b/techs/megapack/factions/tech/upgrades/advanced_architecture/advanced_architecture.xml
index 235b5594..bb483de9 100644
--- a/techs/megapack/factions/tech/upgrades/advanced_architecture/advanced_architecture.xml
+++ b/techs/megapack/factions/tech/upgrades/advanced_architecture/advanced_architecture.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/tech/upgrades/advanced_architecture/images/tech_upgrade_cancel.bmp b/techs/megapack/factions/tech/upgrades/advanced_architecture/images/tech_upgrade_cancel.bmp
deleted file mode 100644
index 5e844cf9..00000000
Binary files a/techs/megapack/factions/tech/upgrades/advanced_architecture/images/tech_upgrade_cancel.bmp and /dev/null differ
diff --git a/techs/megapack/factions/tech/upgrades/blade_weapons/blade_weapons.xml b/techs/megapack/factions/tech/upgrades/blade_weapons/blade_weapons.xml
index 91b1f5df..a462f31d 100644
--- a/techs/megapack/factions/tech/upgrades/blade_weapons/blade_weapons.xml
+++ b/techs/megapack/factions/tech/upgrades/blade_weapons/blade_weapons.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/tech/upgrades/piercing_weapons/piercing_weapons.xml b/techs/megapack/factions/tech/upgrades/piercing_weapons/piercing_weapons.xml
index f2654524..edd887d4 100644
--- a/techs/megapack/factions/tech/upgrades/piercing_weapons/piercing_weapons.xml
+++ b/techs/megapack/factions/tech/upgrades/piercing_weapons/piercing_weapons.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/tech/upgrades/robotics/robotics.xml b/techs/megapack/factions/tech/upgrades/robotics/robotics.xml
index 7d53e42f..cd74b92e 100644
--- a/techs/megapack/factions/tech/upgrades/robotics/robotics.xml
+++ b/techs/megapack/factions/tech/upgrades/robotics/robotics.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/tech/upgrades/shield_level_1/shield_level_1.xml b/techs/megapack/factions/tech/upgrades/shield_level_1/shield_level_1.xml
index 515b139a..1a16e07c 100644
--- a/techs/megapack/factions/tech/upgrades/shield_level_1/shield_level_1.xml
+++ b/techs/megapack/factions/tech/upgrades/shield_level_1/shield_level_1.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/tech/upgrades/shield_level_2/shield_level_2.xml b/techs/megapack/factions/tech/upgrades/shield_level_2/shield_level_2.xml
index c64e1470..1e85ed7d 100644
--- a/techs/megapack/factions/tech/upgrades/shield_level_2/shield_level_2.xml
+++ b/techs/megapack/factions/tech/upgrades/shield_level_2/shield_level_2.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/tech/upgrades/stables/stables.xml b/techs/megapack/factions/tech/upgrades/stables/stables.xml
index f00d99c2..a9a53df0 100644
--- a/techs/megapack/factions/tech/upgrades/stables/stables.xml
+++ b/techs/megapack/factions/tech/upgrades/stables/stables.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/techs/megapack/factions/tech/upgrades/training_field/training_field.xml b/techs/megapack/factions/tech/upgrades/training_field/training_field.xml
index 1568cdb6..95e2823b 100644
--- a/techs/megapack/factions/tech/upgrades/training_field/training_field.xml
+++ b/techs/megapack/factions/tech/upgrades/training_field/training_field.xml
@@ -2,7 +2,7 @@
-
+