diff --git a/game-e3/catalog.xml b/game-e3/catalog.xml
new file mode 100644
index 000000000..93cda3505
--- /dev/null
+++ b/game-e3/catalog.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog
+    PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
+    "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+    <rewriteURI
+        uriStartString="config:///core/"
+        rewritePrefix="../core/res/" />
+    <rewriteURI
+        uriStartString="config:///game/"
+        rewritePrefix="../res/e3a/" />
+    <rewriteURI
+        uriStartString="config:///default/"
+        rewritePrefix="../res/" />
+</catalog>
diff --git a/game-e3/config.xml b/game-e3/config.xml
new file mode 100644
index 000000000..5b3ea01bc
--- /dev/null
+++ b/game-e3/config.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0"?>
+<eressea xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="config:///default/directions.xml"/>
+
+  <xi:include href="config:///core/messages.xml"/>
+
+  <xi:include href="config:///core/de/strings.xml"/>
+  <xi:include href="config:///core/en/strings.xml"/>
+
+  <xi:include href="config:///core/common/items.xml"/>
+  <xi:include href="config:///core/common/herbs.xml" />
+  <xi:include href="config:///core/spoils.xml"/>
+  <xi:include href="config:///core/prefixes.xml"/>
+  <xi:include href="config:///core/common/buildings.xml"/>
+  <xi:include href="config:///core/equipment.xml"/>
+
+  <xi:include href="config:///game/ships.xml"/>
+  <xi:include href="config:///game/shipnames.xml"/>
+  <xi:include href="config:///game/terrains.xml"/>
+  <xi:include href="config:///core/calendar.xml"/>
+  <xi:include href="config:///game/items.xml" />
+  <xi:include href="config:///game/strings.xml"/>
+  <xi:include href="config:///game/messages.xml"/>
+  <xi:include href="config:///game/races.xml"/>
+  <xi:include href="config:///game/buildings.xml"/>
+  <xi:include href="config:///game/equipment.xml"/>
+  <xi:include href="config:///game/spells.xml"/>
+  <xi:include href="config:///game/luxuries.xml" />
+  <xi:include href="config:///game/weapons.xml" />
+  <xi:include href="config:///game/armor.xml" />
+  <xi:include href="config:///game/resources.xml" />
+
+  <calendar name="thirdage" newyear="month_1" start="1"/>
+
+  <equipment>
+    <set name="first_unit">
+      <item name="conquesttoken" amount="1"/>
+      <item name="log" amount="10"/>
+      <item name="stone" amount="10"/>
+      <item name="money" amount="5000"/>
+    </set>
+  </equipment>
+
+  <xi:include href="config:///default/names-undead.xml"/>
+  <xi:include href="config:///default/names-skeletons.xml"/>
+  <xi:include href="config:///default/names-zombies.xml"/>
+  <xi:include href="config:///default/names-ghouls.xml"/>
+  <xi:include href="config:///default/names-dragons.xml"/>
+
+  <game name="E4">
+    <!-- Game specific settings -->
+    <param name="database.gameid" value="7"></param>
+
+    <order name="BELAGERE" disable="yes"/>
+    <order name="BEKLAUEN" disable="yes"/>
+    <order name="GM" disable="yes"/>
+    <order name="KAUFEN" disable="yes"/>
+    <order name="LEHREN" disable="yes"/>
+    <order name="SABOTIEREN" disable="yes"/>
+    <order name="SPIONIEREN" disable="yes"/>
+    <order name="TREIBEN" disable="yes"/>
+    <order name="UNTERHALTEN" disable="yes"/>
+    <order name="VERKAUFEN" disable="yes"/>
+
+    <skill name="armorer" enable="true"/>
+    <skill name="bow" enable="true"/>
+    <skill name="building" enable="true"/>
+    <skill name="cartmaking" enable="true"/>
+    <skill name="catapult" enable="true"/>
+    <skill name="crossbow" enable="true"/>
+    <skill name="forestry" enable="true"/>
+    <skill name="magic" enable="true"/>
+    <skill name="melee" enable="true"/>
+    <skill name="mining" enable="true"/>
+    <skill name="polearm" enable="true"/>
+    <skill name="quarrying" enable="true"/>
+    <skill name="riding" enable="true"/>
+    <skill name="roadwork" enable="true"/>
+    <skill name="sailing" enable="true"/>
+    <skill name="shipcraft" enable="true"/>
+    <skill name="stamina" enable="true"/>
+    <skill name="tactics" enable="true"/>
+    <skill name="training" enable="true"/>
+    <skill name="unarmed" enable="true"/>
+    <skill name="weaponsmithing" enable="true"/>
+
+    <skill name="herbalism" enable="false"/>
+
+    <skill name="alchemy" enable="false"/>
+    <skill name="entertainment" enable="false"/>
+    <skill name="espionage" enable="false"/>
+    <skill name="perception" enable="false"/>
+    <skill name="stealth" enable="false"/>
+    <skill name="taxation" enable="false"/>
+    <skill name="trade" enable="false"/>
+
+    <param name="NewbieImmunity" value="9"/> <!-- ends after turn 9 -->
+    <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="0"/>
+    <param name="world.era" value="3"/>
+    <param name="rules.migrants" 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.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.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"/>
+  </game>
+  <rules>
+    <function name="wage" value="minimum_wage"/>
+  </rules>
+  <strings>
+    <string name="mailto">
+      <text locale="de">eressea-server@eressea.de</text>
+      <text locale="en">eressea-server@eressea.de</text>
+    </string>
+    <string name="newbie_info_1">
+      <text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
+      ERESSEA 4 BEFEHLE an eressea-server@eressea.de zu senden.</text>
+      <text locale="en">Remember to send your orders to
+      eressea-server@eressea.de with the subject ERESSEA 4 ORDERS.</text>
+    </string>
+    <string name="mailcmd">
+      <text locale="de">ERESSEA 4 BEFEHLE</text>
+      <text locale="en">ERESSEA 4 ORDERS</text>
+    </string>
+  </strings>
+</eressea>
diff --git a/game-e3/eressea.ini b/game-e3/eressea.ini
index efc181a02..ddae64c0e 100644
--- a/game-e3/eressea.ini
+++ b/game-e3/eressea.ini
@@ -1,6 +1,5 @@
 [eressea]
 base = .
-load = setup.lua
 report = reports
 verbose = 0
 lomem = 0