diff --git a/res/de/strings.xml b/res/de/strings.xml
index 7c93018cb..14a8c764f 100644
--- a/res/de/strings.xml
+++ b/res/de/strings.xml
@@ -4318,10 +4318,6 @@
       <text locale="de">Erwecke Ents</text>
       <text locale="en">Awakening Of The Ents</text>
     </string>
-    <string name="gwyrrdfamiliar">
-      <text locale="de">Vertrauten binden</text>
-      <text locale="en">Bind Familiar</text>
-    </string>
     <string name="blessstonecircle">
       <text locale="de">Segne Steinkreis</text>
       <text locale="en">Bless Stone Circle</text>
@@ -5735,15 +5731,6 @@
         cause, but after a while they will sink back
         into their slumber.</text>
     </string>
-    <string name="gwyrrdfamiliar">
-      <text locale="de">Einem erfahrenen Druidem wird
-        irgendwann auf seinen Wanderungen ein
-        ungewöhnliches Exemplar einer Gattung begegnen,
-        welches sich dem Druiden anschließen wird.</text>
-      <text locale="en">Once during his travels, the seasoned
-        druid will meet an extraordinary creature of its
-        species that will join him.</text>
-    </string>
     <string name="blessstonecircle">
       <text locale="de">Dieses Ritual segnet einen Steinkreis,
         der zuvor aus Steinen und etwas Holz gebaut
@@ -6404,15 +6391,6 @@
       be packed to the brim and even the beggars will not go
       hungry.</text>
     </string>
-    <string name="illaunfamiliar">
-      <text locale="de">Einem erfahrenen Magier wird
-      irgendwann auf seinen Wanderungen ein ungewöhnliches
-      Exemplar einer Gattung begegnen, welches sich dem Magier
-      anschließen wird. </text>
-      <text locale="en">Once during his travels, the seasoned
-      magician will meet an extraordinary creature of its species
-      that will join him. </text>
-    </string>
     <string name="mindblast">
       <text locale="de">Mit diesem Zauber greift der Magier
       direkt den Geist seiner Gegner an. Ein Schlag aus
diff --git a/res/spellbooks/cerddor.xml b/res/spellbooks/cerddor.xml
index 3d558e6d7..50e1dbf0c 100644
--- a/res/spellbooks/cerddor.xml
+++ b/res/spellbooks/cerddor.xml
@@ -1,5 +1,7 @@
-<entry spell="create_roi" level="6" index="132">
-<entry spell="earn_silver#cerddor" level="1" index="159">
-<entry spell="create_aots" level="6" index="127">
-<entry spell="create_roqf" level="11" index="63">
-<entry spell="blabbermouth" level="4" index="115">
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="cerddor">
+    <entry spell="create_roi" level="6" />
+    <entry spell="earn_silver#cerddor" level="1" />
+    <entry spell="create_aots" level="6" />
+    <entry spell="create_roqf" level="11" />
+</spellbook>
diff --git a/res/spellbooks/draig.xml b/res/spellbooks/draig.xml
index 1300a08b1..592516d75 100644
--- a/res/spellbooks/draig.xml
+++ b/res/spellbooks/draig.xml
@@ -1,5 +1,8 @@
-<entry spell="create_roi" level="6" index="130">
-<entry spell="earn_silver#draig" level="1" index="159">
-<entry spell="create_aots" level="6" index="125">
-<entry spell="create_firesword" level="12" index="148">
-<entry spell="create_trollbelt" level="9" index="48">
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="draig">
+    <entry spell="create_roi" level="6" />
+    <entry spell="earn_silver#draig" level="1" />
+    <entry spell="create_aots" level="6" />
+    <entry spell="create_firesword" level="12" />
+    <entry spell="create_trollbelt" level="9" />
+</spellbook>
diff --git a/res/spellbooks/gray.xml b/res/spellbooks/gray.xml
index 9c3b9b797..6ce74e537 100644
--- a/res/spellbooks/gray.xml
+++ b/res/spellbooks/gray.xml
@@ -1,4 +1,7 @@
-<entry spell="create_runesword" level="6" index="135">
-<entry spell="create_chastitybelt" level="7" index="134">
-<entry spell="create_focus" level="9" index="2">
-<entry spell="create_ror" level="9" index="3">
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="gray">
+    <entry spell="create_runesword" level="6" />
+    <entry spell="create_chastitybelt" level="7" />
+    <entry spell="create_focus" level="9" />
+    <entry spell="create_ror" level="9" />
+</spellbook>
diff --git a/res/spellbooks/gwyrrd.xml b/res/spellbooks/gwyrrd.xml
index f2db419eb..264bc53e4 100644
--- a/res/spellbooks/gwyrrd.xml
+++ b/res/spellbooks/gwyrrd.xml
@@ -1,4 +1,7 @@
-<entry spell="create_roi" level="6" index="129">
-<entry spell="earn_silver#gwyrrd" level="1" index="159">
-<entry spell="create_aots" level="6" index="124">
-<entry spell="create_magicherbbag" level="5" index="165">
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="gwyrrd">
+    <entry spell="create_roi" level="6" />
+    <entry spell="earn_silver#gwyrrd" level="1" />
+    <entry spell="create_aots" level="6" />
+    <entry spell="create_magicherbbag" level="5" />
+</spellbook>
diff --git a/res/spellbooks/illaun.xml b/res/spellbooks/illaun.xml
index f6238ccb5..259fe68d8 100644
--- a/res/spellbooks/illaun.xml
+++ b/res/spellbooks/illaun.xml
@@ -1,6 +1,8 @@
-<entry spell="create_roi" level="6" index="131">
-<entry spell="earn_silver#illaun" level="1" index="159">
-<entry spell="create_aots" level="6" index="126">
-<entry spell="create_dreameye" level="14" index="149">
-<entry spell="create_invisibility_sphere" level="13" index="178">
-<entry spell="readmind" level="7" index="114">
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="illaun">
+    <entry spell="create_roi" level="6" />
+    <entry spell="earn_silver#illaun" level="1" />
+    <entry spell="create_aots" level="6" />
+    <entry spell="create_dreameye" level="14" />
+    <entry spell="create_invisibility_sphere" level="13" />
+</spellbook>
diff --git a/res/spellbooks/tybied.xml b/res/spellbooks/tybied.xml
index 5ed41e431..2965ec782 100644
--- a/res/spellbooks/tybied.xml
+++ b/res/spellbooks/tybied.xml
@@ -1,6 +1,9 @@
-<entry spell="create_roi" level="6" index="133">
-<entry spell="earn_silver#tybied" level="1" index="159">
-<entry spell="create_aots" level="6" index="128">
-<entry spell="create_antimagic" level="7" index="38">
-<entry spell="create_rop" level="9" index="1">
-<entry spell="create_bagofholding" level="10" index="155">
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<spellbook name="cerddor">
+    <entry spell="create_roi" level="6" />
+    <entry spell="earn_silver#tybied" level="1" />
+    <entry spell="create_aots" level="6" />
+    <entry spell="create_antimagic" level="7" />
+    <entry spell="create_rop" level="9" />
+    <entry spell="create_bagofholding" level="10" />
+</spellbook>
diff --git a/res/spells.xml b/res/spells.xml
index 246e1f6d5..b7866e016 100644
--- a/res/spells.xml
+++ b/res/spells.xml
@@ -8,26 +8,27 @@
   <xi:include href="spellbooks/cerddor.xml"/>
   <xi:include href="spellbooks/tybied.xml"/>
 
-  <!-- draig spells -->
-  <spell name="create_roi" type="draig" ship="true" rank="5" level="6" index="130">
+  <!-- shared spells -->
+  <spell name="create_roi" ship="true" rank="5" index="130">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="money" amount="3000" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
+  <spell name="create_aots" ship="true" rank="5" index="125">
+    <function name="cast" value="lua_castspell"/>
+    <resource name="aura" amount="50" cost="fixed"/>
+    <resource name="money" amount="3000" cost="fixed"/>
+    <resource name="permaura" amount="1" cost="fixed"/>
+  </spell>
+
+  <!-- draig spells -->
   <spell name="earn_silver#draig" type="draig" ship="true" variable="true" rank="5" level="1" index="159">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_aots" type="draig" ship="true" rank="5" level="6" index="125">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="create_firesword" type="draig" ship="true" rank="5" level="12" index="148">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="100" cost="fixed"/>
@@ -43,25 +44,11 @@
   </spell>
 
   <!-- gwyrrd spells -->
-  <spell name="create_roi" type="gwyrrd" ship="true" rank="5" level="6" index="129">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="earn_silver#gwyrrd" type="gwyrrd" ship="true" variable="true" rank="5" level="1" index="159">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_aots" type="gwyrrd" ship="true" rank="5" level="6" index="124">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="create_magicherbbag" type="gwyrrd" ship="true" rank="5" level="5" index="165">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="30" cost="fixed"/>
@@ -70,25 +57,11 @@
   </spell>
 
   <!-- illaun spells -->
-  <spell name="create_roi" type="illaun" ship="true" rank="5" level="6" index="131">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="earn_silver#illaun" type="illaun" ship="true" variable="true" rank="5" level="1" index="159">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_aots" type="illaun" ship="true" rank="5" level="6" index="126">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="create_dreameye" type="illaun" ship="true" rank="5" level="14" index="149">
     <function name="cast" value="lua_castspell"/>
     <resource name="dragonhead" amount="1" cost="fixed"/>
@@ -103,25 +76,11 @@
   </spell>
 
   <!-- cerddor spells -->
-  <spell name="create_roi" type="cerddor" ship="true" rank="5" level="6" index="132">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="earn_silver#cerddor" type="cerddor" ship="true" variable="true" rank="5" level="1" index="159">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_aots" type="cerddor" ship="true" rank="5" level="6" index="127">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="create_roqf" type="cerddor" ship="true" rank="5" level="11" index="63">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="20" cost="fixed"/>
@@ -129,38 +88,12 @@
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="blabbermouth" parameters="u" type="cerddor" ship="false" los="true" rank="5" level="4" index="115">
-    <function name="cast" value="cast_babbler"/>
-    <resource name="aura" amount="10" cost="fixed"/>
-    <!-- missing syntactical info: ONETARGET | UNITSPELL -->
-  </spell>
-
-  <spell name="readmind" parameters="u" type="illaun" ship="false" rank="5" level="7" index="114">
-    <function name="cast" value="cast_readmind"/>
-    <resource name="aura" amount="20" cost="fixed"/>
-    <!-- missing syntactical info: ONETARGET | UNITSPELL -->
-  </spell>
-
   <!-- tybied spells -->
-  <spell name="create_roi" type="tybied" ship="true" rank="5" level="6" index="133">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="earn_silver#tybied" type="tybied" ship="true" variable="true" rank="5" level="1" index="159">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_aots" type="tybied" ship="true" rank="5" level="6" index="128">
-    <function name="cast" value="lua_castspell"/>
-    <resource name="aura" amount="50" cost="fixed"/>
-    <resource name="money" amount="3000" cost="fixed"/>
-    <resource name="permaura" amount="1" cost="fixed"/>
-  </spell>
-
   <spell name="create_antimagic" type="tybied" ship="true" rank="5" level="7" index="38">
     <function name="cast" value="lua_castspell"/>
     <resource name="aura" amount="50" cost="fixed"/>