diff --git a/conf/e2/config.json b/conf/e2/config.json
index 67ae85bce..5828ca261 100644
--- a/conf/e2/config.json
+++ b/conf/e2/config.json
@@ -3,6 +3,8 @@
 		"keywords.json"
 	],
     "settings": {
+        "game.id": 2,
+        "game.name": "Eressea",
         "NewbieImmunity": 8,
         "modules.wormholes": 1,
         "entertain.base": 0,
@@ -27,8 +29,6 @@
         "rules.guard.guard_number_stop_prob": 0.001,
         "rules.guard.castle_stop_prob": 0.05,
         "rules.guard.region_type_stop_prob": 0.05,
-        "rules.economy.repopulate_maximum": 500,
-        "game.id": 2,
-        "game.name": "Eressea"
+        "rules.economy.repopulate_maximum": 500
     }
 }
diff --git a/conf/e3/config.json b/conf/e3/config.json
index b2acffcb3..fede39d1e 100644
--- a/conf/e3/config.json
+++ b/conf/e3/config.json
@@ -1,5 +1,77 @@
 {
 	"include": [
 		"keywords.json"
-	]
+	],
+    "settings": {
+        "game.id": 3,
+        "game.name": "E3",
+        "database.gameid": 7,
+        "NewbieImmunity": 4,
+        "modules.astralspace": 0,
+        "modules.wormholes": 0,
+        "modules.markets": 1,
+        "magic.regeneration": 0.75,
+        "magic.power": 0.5,
+        "resource.factor": 0.25,
+        "skills.cost.tactics": 500,
+        "entertain.base": 0,
+        "entertain.perlevel": 20,
+        "nmr.timeout": 5,
+        "nmr.removenewbie": 0,
+        "GiveRestriction": 3,
+        "hunger.long": 0,
+        "hunger.demon.skill": 1,
+        "hunger.damage": "1d9+9",
+        "hunger.demons": 1,
+        "init_spells": 0,
+        "recruit.allow_merge": 1,
+        "study.expensivemigrants": 1,
+        "study.speedup": 2,
+        "world.era": 3,
+        "seed.population.min": 8,
+        "seed.population.max": 8,
+        "rules.migrants": 0,
+        "rules.reserve.twophase": 1,
+        "rules.owners.force_leave": 0,
+        "rules.monsters.attack_chance": 0.0,
+        "rules.transfermen": 0,
+        "rules.stealth.faction": 1,
+        "rules.stealth.anon_battle": 0,
+        "rules.check_overload": 0,
+        "rules.combat.goblinbonus": 3,
+        "rules.ship.damage_drift": 0.00,
+        "rules.alliances": 1,
+        "rules.combat.herospeed": 3,
+        "rules.combat.demon_vampire": 5,
+        "rules.combat.skill_bonus": 0,
+        "rules.combat.nat_armor": 1,
+        "rules.items.loot_divisor": 2,
+        "rules.items.give_divisor": 2,
+        "rules.move.owner_leave": 1,
+        "rules.region_owners": 1,
+        "rules.cavalry.skill": 2,
+        "rules.cavalry.mode": 1,
+        "rules.magic.multipotion": 1,
+        "rules.magic.wol_effect": 5,
+        "rules.magic.factionlist": 1,
+        "rules.magic.wol_type": 2,
+        "rules.magic.blessed_harvest": 1,
+        "rules.magic.elfpower": 1,
+        "rules.magic.playerschools": "gwyrrd illaun draig cerddor",
+        "rules.build.other_buildings": 1,
+        "rules.economy.taxation": 1,
+        "rules.economy.food": 2,
+        "rules.economy.wages": 1,
+        "rules.economy.roqf": 5,
+        "rules.economy.herbrot": 0,
+        "rules.region_owner_pay_building": "market harbour lighthouse",
+        "rules.dwarf_castles": 1,
+        "rules.limit.faction": 250,
+        "rules.economy.grow": 1,
+        "rules.tactics.formula": 1,
+        "rules.help.mask": "fight guard money give",
+        "movement.shipspeed.skillbonus": 6,
+        "alliance.auto": "fight",
+        "alliance.restricted": "fight"
+    }
 }
diff --git a/conf/e3/config.xml b/conf/e3/config.xml
index 31d9b31a7..a1dff207a 100644
--- a/conf/e3/config.xml
+++ b/conf/e3/config.xml
@@ -46,8 +46,6 @@
 
   <game name="E3">
     <!-- Game specific settings -->
-    <param name="database.gameid" value="7"></param>
-
     <order name="besiege" disable="yes"/>
     <order name="steal" disable="yes"/>
     <order name="buy" disable="yes"/>
@@ -89,82 +87,6 @@
     <skill name="stealth" enable="false"/>
     <skill name="taxation" enable="false"/>
     <skill name="trade" enable="false"/>
-
-    <param name="NewbieImmunity" value="4"/>-
-    <param name="modules.astralspace" value="0"/>
-    <param name="modules.wormholes" value="0"/>
-    <param name="modules.markets" value="1"/>
-
-    <!-- resource limitations -->
-    <param name="magic.regeneration" value="0.75"/>
-    <param name="magic.power" value="0.5"/>
-    <param name="resource.factor" value="0.25"/>
-
-    <param name="skills.cost.tactics" value="500"/>
-    <param name="entertain.base" value="0"/>
-    <param name="entertain.perlevel" value="20"/>
-    <param name="nmr.timeout" value="5"/>
-    <param name="nmr.removenewbie" value="0"/>
-    <param name="GiveRestriction" value="3"/>
-    <param name="hunger.long" value="0"/>
-    <param name="hunger.demon.skill" value="1"/>
-    <param name="hunger.damage" value="1d9+9"/>
-    <param name="hunger.demons" value="1"/>
-    <param name="init_spells" value="0"/>
-    <param name="recruit.allow_merge" value="1"/>
-    <param name="study.expensivemigrants" value="1"/>
-    <param name="study.speedup" value="2"/>
-    <param name="world.era" value="3"/>
-    <param name="seed.population.min" value="8"/>
-    <param name="seed.population.max" value="8"/>
-    <param name="rules.migrants" value="0"/>
-    <param name="rules.reserve.twophase" value="1"/>
-    <param name="rules.owners.force_leave" value="0"/>
-    <param name="rules.monsters.attack_chance" value="0.0"/>
-    <param name="rules.transfermen" value="0"/>
-    <param name="rules.stealth.faction" value="1"/>
-    <param name="rules.stealth.anon_battle" value="0"/>
-    <param name="rules.check_overload" value="0"/>
-    <param name="rules.combat.goblinbonus" value="3"/>
-    <param name="rules.ship.damage_drift" value="0.00"/> <!-- percent damage from drifting-->
-    <param name="rules.alliances" value="1"/>
-    <param name="rules.combat.herospeed" value="3"/>
-    <param name="rules.combat.demon_vampire" value="5"/> <!-- regen 1 hp per X points of damage done -->
-    <param name="rules.combat.skill_bonus" value="0"/>
-    <param name="rules.combat.nat_armor" value="1"/>
-    <!--param name="rules.combat.loot" value="5"/--> <!-- only self + others - keeploot -->
-    <param name="rules.items.loot_divisor" value="2"/> <!-- damage skims off 1/2 of goods transfers -->
-    <param name="rules.items.give_divisor" value="2"/> <!-- corruption skims off 1/2 of goods transfers -->
-    <param name="rules.move.owner_leave" value="1"/> <!-- owner must leave before moving -->
-    <param name="rules.region_owners" value="1"/>
-    <param name="rules.cavalry.skill" value="2"/>
-    <param name="rules.cavalry.mode" value="1"/>
-    <param name="rules.magic.multipotion" value="1"/>
-    <param name="rules.magic.wol_effect" value="5"/>
-    <param name="rules.magic.factionlist" value="1"/>
-    <param name="rules.magic.wol_type" value="2"/>
-    <param name="rules.magic.blessed_harvest" value="1"/>
-    <param name="rules.magic.elfpower" value="1"/> <!-- elves get ring-of-power bonus in a forest -->
-    <param name="rules.magic.playerschools" value="gwyrrd illaun draig cerddor"/>
-    <param name="rules.build.other_buildings" value="1"/>
-    <param name="rules.economy.taxation" value="1"/>
-    <param name="rules.economy.food" value="2"/>
-    <param name="rules.economy.wages" value="1"/>
-    <param name="rules.economy.roqf" value="5"/>
-    <param name="rules.economy.herbrot" value="0"/>
-    <param name="rules.region_owner_pay_building" value="market harbour lighthouse"/>
-    <param name="rules.dwarf_castles" value="1"/>
-    <!-- param name="rules.nmr.destroy" value="1"/ -->
-    <param name="rules.limit.faction" value="250"/>
-    <!--param name="rules.give" value="15"/ --> <!-- self + peasants + herbs + lux - goods -->
-    <param name="rules.economy.grow" value="1"/>
-    <param name="rules.tactics.formula" value="1"/> <!-- 10% per skilldiff -->
-    <param name="rules.help.mask" value="fight guard money give"/>
-    <param name="movement.shipspeed.skillbonus" value="6"/>
-    <param name="alliance.auto" value="fight"/>
-    <param name="alliance.restricted" value="fight"/>
-    <param name="game.id" value="3"/>
-    <param name="game.name" value="E3"/>
   </game>
   <rules>
     <function name="wage" value="minimum_wage"/>
diff --git a/conf/e4/config.json b/conf/e4/config.json
index b2acffcb3..020ebafc1 100644
--- a/conf/e4/config.json
+++ b/conf/e4/config.json
@@ -1,5 +1,74 @@
 {
 	"include": [
 		"keywords.json"
-	]
+	],
+    "settings": {
+        "game.id": 4,
+        "game.name": "Deveron",
+        "database.gameid": 7,
+        "NewbieImmunity": 4,
+        "modules.astralspace": 0,
+        "modules.wormholes": 0,
+        "modules.markets": 1,
+        "magic.regeneration": 0.75,
+        "magic.power": 0.5,
+        "resource.factor": 0.25,
+        "skills.cost.tactics": 500,
+        "entertain.base": 0,
+        "entertain.perlevel": 20,
+        "nmr.timeout": 5,
+        "nmr.removenewbie": 0,
+        "GiveRestriction": 3,
+        "hunger.long": 0,
+        "hunger.demon.skill": 1,
+        "hunger.damage": "1d9+9",
+        "hunger.demons": 1,
+        "init_spells": 0,
+        "recruit.allow_merge": 1,
+        "study.expensivemigrants": 1,
+        "study.speedup": 2,
+        "world.era": 3,
+        "rules.migrants": 0,
+        "rules.reserve.twophase": 1,
+        "rules.owners.force_leave": 0,
+        "rules.transfermen": 0,
+        "rules.stealth.faction": 1,
+        "rules.stealth.anon_battle": 0,
+        "rules.check_overload": 0,
+        "rules.combat.goblinbonus": 3,
+        "rules.ship.damage_drift": 0.00,
+        "rules.alliances": 1,
+        "rules.combat.herospeed": 3,
+        "rules.combat.demon_vampire": 5,
+        "rules.combat.skill_bonus": 0,
+        "rules.combat.nat_armor": 1,
+        "rules.items.loot_divisor": 2,
+        "rules.items.give_divisor": 2,
+        "rules.move.owner_leave": 1,
+        "rules.region_owners": 1,
+        "rules.cavalry.skill": 2,
+        "rules.cavalry.mode": 1,
+        "rules.magic.multipotion": 1,
+        "rules.magic.wol_effect": 5,
+        "rules.magic.factionlist": 1,
+        "rules.magic.wol_type": 2,
+        "rules.magic.blessed_harvest": 1,
+        "rules.magic.elfpower": 1,
+        "rules.magic.playerschools": "gwyrrd illaun draig cerddor",
+        "rules.build.other_buildings": 1,
+        "rules.economy.taxation": 1,
+        "rules.economy.food": 2,
+        "rules.economy.wages": 1,
+        "rules.economy.roqf": 5,
+        "rules.economy.herbrot": 0,
+        "rules.region_owner_pay_building": "market harbour lighthouse",
+        "rules.dwarf_castles": 1,
+        "rules.limit.faction": 250,
+        "rules.economy.grow": 1,
+        "rules.tactics.formula": 1,
+        "rules.help.mask": "fight guard money give",
+        "movement.shipspeed.skillbonus": 6,
+        "alliance.auto": "fight",
+        "alliance.restricted": "fight"
+    }
 }
diff --git a/conf/e4/config.xml b/conf/e4/config.xml
index c8d6b21a3..8e0fad67c 100644
--- a/conf/e4/config.xml
+++ b/conf/e4/config.xml
@@ -45,9 +45,6 @@
   <xi:include href="config://default/names-dragons.xml"/>
 
   <game name="Deveron">
-    <!-- Game specific settings -->
-    <param name="database.gameid" value="7"></param>
-
     <order name="besiege" disable="yes"/>
     <order name="steal" disable="yes"/>
     <order name="buy" disable="yes"/>
@@ -89,79 +86,6 @@
     <skill name="stealth" enable="false"/>
     <skill name="taxation" enable="false"/>
     <skill name="trade" enable="false"/>
-
-    <param name="NewbieImmunity" value="4"/>
-    <param name="modules.astralspace" value="0"/>
-    <param name="modules.wormholes" value="0"/>
-    <param name="modules.markets" value="1"/>
-
-    <!-- resource limitations -->
-    <param name="magic.regeneration" value="0.75"/>
-    <param name="magic.power" value="0.5"/>
-    <param name="resource.factor" value="0.25"/>
-
-    <param name="skills.cost.tactics" value="500"/>
-    <param name="entertain.base" value="0"/>
-    <param name="entertain.perlevel" value="20"/>
-    <param name="nmr.timeout" value="5"/>
-    <param name="nmr.removenewbie" value="0"/>
-    <param name="GiveRestriction" value="3"/>
-    <param name="hunger.long" value="0"/>
-    <param name="hunger.demon.skill" value="1"/>
-    <param name="hunger.damage" value="1d9+9"/>
-    <param name="hunger.demons" value="1"/>
-    <param name="init_spells" value="0"/>
-    <param name="recruit.allow_merge" value="1"/>
-    <param name="study.expensivemigrants" value="1"/>
-    <param name="study.speedup" value="2"/>
-    <param name="world.era" value="3"/>
-    <param name="rules.migrants" value="0"/>
-    <param name="rules.reserve.twophase" value="1"/>
-    <param name="rules.owners.force_leave" value="0"/>
-    <param name="rules.transfermen" value="0"/>
-    <param name="rules.stealth.faction" value="1"/>
-    <param name="rules.stealth.anon_battle" value="0"/>
-    <param name="rules.check_overload" value="0"/>
-    <param name="rules.combat.goblinbonus" value="3"/>
-    <param name="rules.ship.damage_drift" value="0.00"/> <!-- percent damage from drifting-->
-    <param name="rules.alliances" value="1"/>
-    <param name="rules.combat.herospeed" value="3"/>
-    <param name="rules.combat.demon_vampire" value="5"/> <!-- regen 1 hp per X points of damage done -->
-    <param name="rules.combat.skill_bonus" value="0"/>
-    <param name="rules.combat.nat_armor" value="1"/>
-    <!--param name="rules.combat.loot" value="5"/--> <!-- only self + others - keeploot -->
-    <param name="rules.items.loot_divisor" value="2"/> <!-- damage skims off 1/2 of goods transfers -->
-    <param name="rules.items.give_divisor" value="2"/> <!-- corruption skims off 1/2 of goods transfers -->
-    <param name="rules.move.owner_leave" value="1"/> <!-- owner must leave before moving -->
-    <param name="rules.region_owners" value="1"/>
-    <param name="rules.cavalry.skill" value="2"/>
-    <param name="rules.cavalry.mode" value="1"/>
-    <param name="rules.magic.multipotion" value="1"/>
-    <param name="rules.magic.wol_effect" value="5"/>
-    <param name="rules.magic.factionlist" value="1"/>
-    <param name="rules.magic.wol_type" value="2"/>
-    <param name="rules.magic.blessed_harvest" value="1"/>
-    <param name="rules.magic.elfpower" value="1"/> <!-- elves get ring-of-power bonus in a forest -->
-    <param name="rules.magic.playerschools" value="gwyrrd illaun draig cerddor"/>
-    <param name="rules.build.other_buildings" value="1"/>
-    <param name="rules.economy.taxation" value="1"/>
-    <param name="rules.economy.food" value="2"/>
-    <param name="rules.economy.wages" value="1"/>
-    <param name="rules.economy.roqf" value="5"/>
-    <param name="rules.economy.herbrot" value="0"/>
-    <param name="rules.region_owner_pay_building" value="market harbour lighthouse"/>
-    <param name="rules.dwarf_castles" value="1"/>
-    <!-- param name="rules.nmr.destroy" value="1"/ -->
-    <param name="rules.limit.faction" value="250"/>
-    <!--param name="rules.give" value="15"/ --> <!-- self + peasants + herbs + lux - goods -->
-    <param name="rules.economy.grow" value="1"/>
-    <param name="rules.tactics.formula" value="1"/> <!-- 10% per skilldiff -->
-    <param name="rules.help.mask" value="fight guard money give"/>
-    <param name="movement.shipspeed.skillbonus" value="6"/>
-    <param name="alliance.auto" value="fight"/>
-    <param name="alliance.restricted" value="fight"/>
-    <param name="game.id" value="4"/>
-    <param name="game.name" value="Deveron"/>
   </game>
   <rules>
     <function name="wage" value="minimum_wage"/>