diff --git a/support_files/definitions/brazil/cup_supercup_brazil_intercontinental.xml b/support_files/definitions/brazil/cup_supercup_brazil_intercontinental.xml
index 29569b2f..acb450db 100644
--- a/support_files/definitions/brazil/cup_supercup_brazil_intercontinental.xml
+++ b/support_files/definitions/brazil/cup_supercup_brazil_intercontinental.xml
@@ -22,7 +22,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>italy1 germany1 england1 france1 spain1_short
+	  <choose_team_sid>italy1 germany1 england1 france1 spain1
 	    russia1_short netherlands1_short portugal1_short</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <randomly>1</randomly>
diff --git a/support_files/definitions/europe/cup_europe_champ_league.xml b/support_files/definitions/europe/cup_europe_champ_league.xml
index ab46d616..385bac5a 100644
--- a/support_files/definitions/europe/cup_europe_champ_league.xml
+++ b/support_files/definitions/europe/cup_europe_champ_league.xml
@@ -92,7 +92,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>spain1_short</choose_team_sid>
+	  <choose_team_sid>spain1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
diff --git a/support_files/definitions/europe/cup_europe_cwc.xml b/support_files/definitions/europe/cup_europe_cwc.xml
index 1e794eaa..c020a2cb 100644
--- a/support_files/definitions/europe/cup_europe_cwc.xml
+++ b/support_files/definitions/europe/cup_europe_cwc.xml
@@ -91,7 +91,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>spain1_short</choose_team_sid>
+	  <choose_team_sid>spain1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
diff --git a/support_files/definitions/europe/cup_europe_uefa.xml b/support_files/definitions/europe/cup_europe_uefa.xml
index 0a684b9a..760dba58 100644
--- a/support_files/definitions/europe/cup_europe_uefa.xml
+++ b/support_files/definitions/europe/cup_europe_uefa.xml
@@ -29,7 +29,7 @@
 	<choose_team>
 	  <choose_team_sid>england1 france1 germany1 greece1_short
 	    italy1 netherlands1_short portugal1_short russia1_short
-	    scotland1 spain1_short switzerland1_short turkey1_short
+	    scotland1 spain1 switzerland1_short turkey1_short
 	    ukraine1_short belgium1 czech1_short
 	    denmark1_short</choose_team_sid>
 	  <number_of_teams>29</number_of_teams>
diff --git a/support_files/definitions/ireland/cup_ireland_cl.xml b/support_files/definitions/ireland/cup_ireland_cl.xml
index b47b37fd..2da93ef7 100644
--- a/support_files/definitions/ireland/cup_ireland_cl.xml
+++ b/support_files/definitions/ireland/cup_ireland_cl.xml
@@ -91,7 +91,7 @@
         </choose_team>
 
         <choose_team>
-          <choose_team_sid>spain1_short</choose_team_sid>
+          <choose_team_sid>spain1</choose_team_sid>
           <number_of_teams>1</number_of_teams>
           <randomly>1</randomly>
           <generate>1</generate>
diff --git a/support_files/definitions/ireland/cup_ireland_uefa.xml b/support_files/definitions/ireland/cup_ireland_uefa.xml
index 72d3f70c..daf77ff2 100644
--- a/support_files/definitions/ireland/cup_ireland_uefa.xml
+++ b/support_files/definitions/ireland/cup_ireland_uefa.xml
@@ -27,7 +27,7 @@
         <choose_team>
           <choose_team_sid>england1 france1 germany1 greece1_short
             italy1 netherlands1_short portugal1_short russia1_short
-            scotland1 spain1_short switzerland1_short turkey1_short
+            scotland1 spain1 switzerland1_short turkey1_short
             ukraine1_short belgium1 czech1_short
             denmark1_short</choose_team_sid>
           <number_of_teams>31</number_of_teams>
diff --git a/support_files/definitions/spain/country_spain.xml b/support_files/definitions/spain/country_spain.xml
new file mode 100644
index 00000000..d520fa86
--- /dev/null
+++ b/support_files/definitions/spain/country_spain.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<country>
+  <name>Spain</name>
+  <symbol>flag_spain.png</symbol>
+  <sid>spain</sid>
+  <leagues>
+    <league>spain1</league>
+    <league>spain2</league>
+    <league>spain3a</league>
+    <league>spain3b</league>
+    <league>spain3c</league>
+    <league>spain3d</league>
+  </leagues>
+
+  <cups>
+    <cup>spain_cdr</cup>
+    <cup>spain_rfef</cup>
+    <cup>europe_uefa</cup>
+    <cup>europe_cwc</cup>
+    <cup>europe_champ_league</cup>
+    <cup>supercup_europe_uefa</cup>
+    <cup>supercup_europe_intercontinental</cup>
+    <cup>spain_prom_games_1</cup>
+    <cup>spain_prom_games_2</cup>
+    <cup>spain_prom_games_3</cup>
+    <cup>spain_prom_games_4</cup>
+  </cups>
+
+</country>
diff --git a/support_files/definitions/spain/cup_spain_cdr.xml b/support_files/definitions/spain/cup_spain_cdr.xml
new file mode 100644
index 00000000..8cb59feb
--- /dev/null
+++ b/support_files/definitions/spain/cup_spain_cdr.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+  <name>Copa del Rey</name>
+  <short_name>Copa del Rey</short_name>
+  <symbol>flag_spain.png</symbol>
+  <sid>spain_cdr</sid>
+  <last_week>44</last_week>
+  <week_gap>4</week_gap>
+  <property>national</property>
+
+  <cup_rounds>
+    <cup_round>
+<!--      <byes>1</byes> -->
+      <byes>1</byes>
+      <home_away>0</home_away>
+      <choose_teams>
+        <choose_team>
+          <choose_team_sid>spain_rfef</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>1</start_idx>
+          <end_idx>1</end_idx>
+        </choose_team>
+<!--        <choose_team> -->
+<!--          <choose_team_sid>spain_rfef</choose_team_sid> -->
+<!--          <number_of_teams>1</number_of_teams> -->
+<!--          <start_idx>1</start_idx> -->
+<!--          <end_idx>1</end_idx> -->
+<!--        </choose_team> -->
+        <choose_team>
+          <choose_team_sid>spain2</choose_team_sid>
+          <number_of_teams>18</number_of_teams>
+          <start_idx>1</start_idx>
+          <end_idx>18</end_idx>
+        </choose_team>
+      </choose_teams>
+    </cup_round>
+
+    <cup_round>
+      <choose_teams>
+        <choose_team>
+          <choose_team_sid>spain1</choose_team_sid>
+        </choose_team>
+      </choose_teams>
+    </cup_round>
+
+    <cup_round>
+    </cup_round>
+
+    <cup_round>
+    </cup_round>
+
+    <cup_round>
+    </cup_round>
+
+    <cup_round>
+      <home_away>0</home_away>
+      <neutral>1</neutral>
+    </cup_round>
+  </cup_rounds>
+</cup>
diff --git a/support_files/definitions/spain/cup_spain_prom_games_1.xml b/support_files/definitions/spain/cup_spain_prom_games_1.xml
new file mode 100644
index 00000000..18cb2b16
--- /dev/null
+++ b/support_files/definitions/spain/cup_spain_prom_games_1.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+  <name>Liguilla de ascenso I</name>
+  <short_name>Lig. de asc. I</short_name>
+  <symbol>flag_spain.png</symbol>
+  <sid>spain_prom_games_1</sid>
+  <add_week>1000</add_week>
+  <property>national</property>
+  <property>highlight2</property>
+
+  <cup_rounds>
+    <cup_round>
+      <number_of_groups>1</number_of_groups>
+      <number_of_advance>1</number_of_advance>
+      <choose_teams>
+        <choose_team>
+          <choose_team_sid>spain3a</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>1</start_idx>
+          <end_idx>1</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3a</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>2</start_idx>
+          <end_idx>2</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3a</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>3</start_idx>
+          <end_idx>3</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3a</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>4</start_idx>
+          <end_idx>4</end_idx>
+        </choose_team>
+      </choose_teams>
+    </cup_round>
+  </cup_rounds>
+</cup>
diff --git a/support_files/definitions/spain/cup_spain_prom_games_2.xml b/support_files/definitions/spain/cup_spain_prom_games_2.xml
new file mode 100644
index 00000000..510069bd
--- /dev/null
+++ b/support_files/definitions/spain/cup_spain_prom_games_2.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+  <name>Liguilla de ascenso II</name>
+  <short_name>Lig. de asc. II</short_name>
+  <symbol>flag_spain.png</symbol>
+  <sid>spain_prom_games_2</sid>
+  <add_week>1000</add_week>
+  <property>national</property>
+  <property>highlight2</property>
+
+  <cup_rounds>
+    <cup_round>
+      <number_of_groups>1</number_of_groups>
+      <number_of_advance>1</number_of_advance>
+      <choose_teams>
+        <choose_team>
+          <choose_team_sid>spain3b</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>1</start_idx>
+          <end_idx>1</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3b</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>2</start_idx>
+          <end_idx>2</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3b</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>3</start_idx>
+          <end_idx>3</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3b</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>4</start_idx>
+          <end_idx>4</end_idx>
+        </choose_team>
+      </choose_teams>
+    </cup_round>
+  </cup_rounds>
+</cup>
diff --git a/support_files/definitions/spain/cup_spain_prom_games_3.xml b/support_files/definitions/spain/cup_spain_prom_games_3.xml
new file mode 100644
index 00000000..ddda80da
--- /dev/null
+++ b/support_files/definitions/spain/cup_spain_prom_games_3.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+  <name>Liguilla de ascenso III</name>
+  <short_name>Lig. de asc. III</short_name>
+  <symbol>flag_spain.png</symbol>
+  <sid>spain_prom_games_3</sid>
+  <add_week>1000</add_week>
+  <property>national</property>
+  <property>highlight2</property>
+
+  <cup_rounds>
+    <cup_round>
+      <number_of_groups>1</number_of_groups>
+      <number_of_advance>1</number_of_advance>
+      <choose_teams>
+        <choose_team>
+          <choose_team_sid>spain3c</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>1</start_idx>
+          <end_idx>1</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3c</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>2</start_idx>
+          <end_idx>2</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3c</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>3</start_idx>
+          <end_idx>3</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3c</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>4</start_idx>
+          <end_idx>4</end_idx>
+        </choose_team>
+      </choose_teams>
+    </cup_round>
+  </cup_rounds>
+</cup>
diff --git a/support_files/definitions/spain/cup_spain_prom_games_4.xml b/support_files/definitions/spain/cup_spain_prom_games_4.xml
new file mode 100644
index 00000000..fb2f99c9
--- /dev/null
+++ b/support_files/definitions/spain/cup_spain_prom_games_4.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+  <name>Liguilla de ascenso IV</name>
+  <short_name>Lig. de asc. IV</short_name>
+  <symbol>flag_spain.png</symbol>
+  <sid>spain_prom_games_4</sid>
+  <add_week>1000</add_week>
+  <property>national</property>
+  <property>highlight2</property>
+
+  <cup_rounds>
+    <cup_round>
+      <number_of_groups>1</number_of_groups>
+      <number_of_advance>1</number_of_advance>
+      <choose_teams>
+        <choose_team>
+          <choose_team_sid>spain3d</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>1</start_idx>
+          <end_idx>1</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3d</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>2</start_idx>
+          <end_idx>2</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3d</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>3</start_idx>
+          <end_idx>3</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3d</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>4</start_idx>
+          <end_idx>4</end_idx>
+        </choose_team>
+      </choose_teams>
+    </cup_round>
+  </cup_rounds>
+</cup>
diff --git a/support_files/definitions/spain/cup_spain_rfef.xml b/support_files/definitions/spain/cup_spain_rfef.xml
new file mode 100644
index 00000000..0b9bff54
--- /dev/null
+++ b/support_files/definitions/spain/cup_spain_rfef.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+  <name>Copa RFEF</name>
+  <short_name>Copa RFEF</short_name>
+  <symbol>flag_spain.png</symbol>
+  <sid>spain_rfef</sid>
+  <last_week>36</last_week>
+  <week_gap>3</week_gap>
+  <property>national</property>
+
+  <cup_rounds>
+    <cup_round>
+      <choose_teams>
+        <choose_team>
+          <choose_team_sid>spain2</choose_team_sid>
+          <number_of_teams>4</number_of_teams>
+          <start_idx>19</start_idx>
+          <end_idx>22</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3a</choose_team_sid>
+          <number_of_teams>15</number_of_teams>
+          <start_idx>1</start_idx>
+          <end_idx>15</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3b</choose_team_sid>
+          <number_of_teams>15</number_of_teams>
+          <start_idx>1</start_idx>
+          <end_idx>15</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3c</choose_team_sid>
+          <number_of_teams>15</number_of_teams>
+          <start_idx>1</start_idx>
+          <end_idx>15</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>spain3d</choose_team_sid>
+          <number_of_teams>15</number_of_teams>
+          <start_idx>1</start_idx>
+          <end_idx>15</end_idx>
+        </choose_team>
+      </choose_teams>
+    </cup_round>
+
+    <cup_round>
+    </cup_round>
+
+    <cup_round>
+    </cup_round>
+
+    <cup_round>
+    </cup_round>
+
+    <cup_round>
+    </cup_round>
+
+    <cup_round>
+      <home_away>0</home_away>
+      <neutral>1</neutral>
+    </cup_round>
+  </cup_rounds>
+</cup>
diff --git a/support_files/definitions/spain/league_spain1.xml b/support_files/definitions/spain/league_spain1.xml
new file mode 100644
index 00000000..0c91d04c
--- /dev/null
+++ b/support_files/definitions/spain/league_spain1.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+
+  <sid>spain1</sid>
+  <name>Primera División</name>
+  <short_name>1ª Div.</short_name>
+  <symbol>flag_spain.png</symbol>
+  <first_week>1</first_week>
+  <week_gap>1</week_gap>
+  <average_skill>8000</average_skill>
+  <!-- <names_file>spain</names_file> -->
+  <layer>1</layer>
+
+  <prom_rel>
+    <prom_rel_element>
+      <rank_start>18</rank_start>
+      <rank_end>20</rank_end>
+      <dest_sid>spain2</dest_sid>
+      <prom_rel_type>relegation</prom_rel_type>
+    </prom_rel_element>
+  </prom_rel>
+
+  <teams>
+    <team>
+      <team_name>Alavés</team_name>
+    </team>
+    <team>
+      <team_name>At. Madrid</team_name>
+    </team>
+    <team>
+      <team_name>Athletic</team_name>
+    </team>
+    <team>
+      <team_name>Barcelona</team_name>
+    </team>
+    <team>
+      <team_name>Betis</team_name>
+    </team>
+    <team>
+      <team_name>Cádiz</team_name>
+    </team>
+    <team>
+      <team_name>Celta</team_name>
+    </team>
+    <team>
+      <team_name>Deportivo</team_name>
+    </team>
+    <team>
+      <team_name>Espanyol</team_name>
+    </team>
+    <team>
+      <team_name>Getafe</team_name>
+    </team>
+    <team>
+      <team_name>Málaga</team_name>
+    </team>
+    <team>
+      <team_name>Mallorca</team_name>
+    </team>
+    <team>
+      <team_name>Osasuna</team_name>
+    </team>
+    <team>
+      <team_name>R. Madrid</team_name>
+    </team>
+    <team>
+      <team_name>R. Sociedad</team_name>
+    </team>
+    <team>
+      <team_name>Racing</team_name>
+    </team>
+    <team>
+      <team_name>Sevilla</team_name>
+    </team>
+    <team>
+      <team_name>Valencia</team_name>
+    </team>
+    <team>
+      <team_name>Villarreal</team_name>
+    </team>
+    <team>
+      <team_name>Zaragoza</team_name>
+    </team>
+  </teams>
+
+</league>
diff --git a/support_files/definitions/spain/league_spain2.xml b/support_files/definitions/spain/league_spain2.xml
new file mode 100644
index 00000000..f0e6b63b
--- /dev/null
+++ b/support_files/definitions/spain/league_spain2.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+
+  <sid>spain2</sid>
+  <name>Segunda División</name>
+  <short_name>2ª Div.</short_name>
+  <symbol>flag_spain.png</symbol>
+  <first_week>1</first_week>
+  <week_gap>1</week_gap>
+  <average_skill>7000</average_skill>
+  <!-- <names_file>spain</names_file> -->
+  <layer>2</layer>
+
+  <prom_rel>
+
+    <prom_rel_element>
+      <rank_start>1</rank_start>
+      <rank_end>3</rank_end>
+      <dest_sid>spain1</dest_sid>
+      <prom_rel_type>promotion</prom_rel_type>
+    </prom_rel_element>
+
+    <prom_rel_element>
+      <rank_start>19</rank_start>
+      <rank_end>22</rank_end>
+      <dest_sid>spain3a spain3b spain3c spain3d</dest_sid>
+      <prom_rel_type>relegation</prom_rel_type>
+    </prom_rel_element>
+
+  </prom_rel>
+
+  <teams>
+    <team>
+      <team_name>Albacete</team_name>
+    </team>
+    <team>
+      <team_name>Almería</team_name>
+    </team>
+    <team>
+      <team_name>Castellón</team_name>
+    </team>
+    <team>
+      <team_name>Ciudad Murcia</team_name>
+    </team>
+    <team>
+      <team_name>Eibar</team_name>
+    </team>
+    <team>
+      <team_name>Ejido</team_name>
+    </team>
+    <team>
+      <team_name>Elche</team_name>
+    </team>
+    <team>
+      <team_name>Gimnástic</team_name>
+    </team>
+    <team>
+      <team_name>Hércules</team_name>
+    </team>
+    <team>
+      <team_name>Levante</team_name>
+    </team>
+    <team>
+      <team_name>Lleida</team_name>
+    </team>
+    <team>
+      <team_name>Lorca</team_name>
+    </team>
+    <team>
+      <team_name>Málaga B</team_name>
+    </team>
+    <team>
+      <team_name>Murcia</team_name>
+    </team>
+    <team>
+      <team_name>Numancia</team_name>
+    </team>
+    <team>
+      <team_name>R. Ferrol</team_name>
+    </team>
+    <team>
+      <team_name>R. Madrid B</team_name>
+    </team>
+    <team>
+      <team_name>Recreativo</team_name>
+    </team>
+    <team>
+      <team_name>Sporting</team_name>
+    </team>
+    <team>
+      <team_name>Tenerife</team_name>
+    </team>
+    <team>
+      <team_name>Valladolid</team_name>
+    </team>
+    <team>
+      <team_name>Xerez</team_name>
+    </team>
+  </teams>
+
+</league>
diff --git a/support_files/definitions/spain/league_spain3a.xml b/support_files/definitions/spain/league_spain3a.xml
new file mode 100644
index 00000000..50fa7eb7
--- /dev/null
+++ b/support_files/definitions/spain/league_spain3a.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+
+  <sid>spain3a</sid>
+  <name>Segunda División B GI</name>
+  <short_name>2ª Div. B GI</short_name>
+  <symbol>flag_spain.png</symbol>
+  <first_week>1</first_week>
+  <week_gap>1</week_gap>
+  <average_skill>6000</average_skill>
+  <!-- <names_file>spain</names_file> -->
+  <layer>3</layer>
+
+  <prom_rel>
+    <prom_games>
+      <prom_games_dest_sid>spain2</prom_games_dest_sid>
+      <prom_games_cup_sid>spain_prom_games_1</prom_games_cup_sid>
+    </prom_games>
+  </prom_rel>
+
+  <teams>
+    <team>
+      <team_name>Alcála de Henares</team_name>
+    </team>
+    <team>
+      <team_name>Alcorcón</team_name>
+    </team>
+    <team>
+      <team_name>At. Madrid B</team_name>
+    </team>
+    <team>
+      <team_name>Castillo</team_name>
+    </team>
+    <team>
+      <team_name>Celta B</team_name>
+    </team>
+    <team>
+      <team_name>Fuenlabrada</team_name>
+    </team>
+    <team>
+      <team_name>Lanzarote</team_name>
+    </team>
+    <team>
+      <team_name>Las Palmas</team_name>
+    </team>
+    <team>
+      <team_name>Leganés</team_name>
+    </team>
+    <team>
+      <team_name>Melilla</team_name>
+    </team>
+    <team>
+      <team_name>Móstoles</team_name>
+    </team>
+    <team>
+      <team_name>Negreira</team_name>
+    </team>
+    <team>
+      <team_name>Ourense</team_name>
+    </team>
+    <team>
+      <team_name>Pajara-Playas de Jandia</team_name>
+    </team>
+    <team>
+      <team_name>Pontevedra</team_name>
+    </team>
+    <team>
+      <team_name>Rayo Vallecano</team_name>
+    </team>
+    <team>
+      <team_name>San Isidro</team_name>
+    </team>
+    <team>
+      <team_name>San Sebastián de los Reyes</team_name>
+    </team>
+    <team>
+      <team_name>Universidad</team_name>
+    </team>
+    <team>
+      <team_name>Vecindario</team_name>
+    </team>
+  </teams>
+
+</league>
diff --git a/support_files/definitions/spain/league_spain3b.xml b/support_files/definitions/spain/league_spain3b.xml
new file mode 100644
index 00000000..6b70c98b
--- /dev/null
+++ b/support_files/definitions/spain/league_spain3b.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+
+  <sid>spain3b</sid>
+  <name>Segunda División B GII</name>
+  <short_name>2ª Div. B GII</short_name>
+  <symbol>flag_spain.png</symbol>
+  <first_week>1</first_week>
+  <week_gap>1</week_gap>
+  <average_skill>6000</average_skill>
+  <!-- <names_file>spain</names_file> -->
+  <layer>3</layer>
+
+  <prom_rel>
+    <prom_games>
+      <prom_games_dest_sid>spain2</prom_games_dest_sid>
+      <prom_games_cup_sid>spain_prom_games_2</prom_games_cup_sid>
+    </prom_games>
+  </prom_rel>
+
+  <teams>
+    <team>
+      <team_name>Alavés B</team_name>
+    </team>
+    <team>
+      <team_name>Amurrio</team_name>
+    </team>
+    <team>
+      <team_name>Athletic B</team_name>
+    </team>
+    <team>
+      <team_name>Barakaldo</team_name>
+    </team>
+    <team>
+      <team_name>Burgos</team_name>
+    </team>
+    <team>
+      <team_name>C. Durango</team_name>
+    </team>
+    <team>
+      <team_name>C. Leonesa</team_name>
+    </team>
+    <team>
+      <team_name>Lemona</team_name>
+    </team>
+    <team>
+      <team_name>Luanco</team_name>
+    </team>
+    <team>
+      <team_name>Palencia</team_name>
+    </team>
+    <team>
+      <team_name>Ponferrada</team_name>
+    </team>
+    <team>
+      <team_name>Portugalete</team_name>
+    </team>
+    <team>
+      <team_name>R. Oviedo</team_name>
+    </team>
+    <team>
+      <team_name>R. Racing</team_name>
+    </team>
+    <team>
+      <team_name>R. Sociedad B</team_name>
+    </team>
+    <team>
+      <team_name>R. Unión</team_name>
+    </team>
+    <team>
+      <team_name>Salamanca</team_name>
+    </team>
+    <team>
+      <team_name>Valladolid B</team_name>
+    </team>
+    <team>
+      <team_name>Zalla</team_name>
+    </team>
+    <team>
+      <team_name>Zarnora</team_name>
+    </team>
+  </teams>
+
+</league>
diff --git a/support_files/definitions/spain/league_spain3c.xml b/support_files/definitions/spain/league_spain3c.xml
new file mode 100644
index 00000000..da5de78d
--- /dev/null
+++ b/support_files/definitions/spain/league_spain3c.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+
+  <sid>spain3c</sid>
+  <name>Segunda División B GIII</name>
+  <short_name>2ª Div. B GIII</short_name>
+  <symbol>flag_spain.png</symbol>
+  <first_week>1</first_week>
+  <week_gap>1</week_gap>
+  <average_skill>6000</average_skill>
+  <!-- <names_file>spain</names_file> -->
+  <layer>3</layer>
+
+  <prom_rel>
+    <prom_games>
+      <prom_games_dest_sid>spain2</prom_games_dest_sid>
+      <prom_games_cup_sid>spain_prom_games_3</prom_games_cup_sid>
+    </prom_games>
+  </prom_rel>
+
+  <teams>
+    <team>
+      <team_name>Alcoyano</team_name>
+    </team>
+    <team>
+      <team_name>Alfaro</team_name>
+    </team>
+    <team>
+      <team_name>Alicante</team_name>
+    </team>
+    <team>
+      <team_name>Badalona</team_name>
+    </team>
+    <team>
+      <team_name>Barcelona B</team_name>
+    </team>
+    <team>
+      <team_name>Benidorm</team_name>
+    </team>
+    <team>
+      <team_name>Figueres</team_name>
+    </team>
+    <team>
+      <team_name>Gramanet</team_name>
+    </team>
+    <team>
+      <team_name>Huesca</team_name>
+    </team>
+    <team>
+      <team_name>L'Hospitalet</team_name>
+    </team>
+    <team>
+      <team_name>Levante B</team_name>
+    </team>
+    <team>
+      <team_name>Osasuna B</team_name>
+    </team>
+    <team>
+      <team_name>Peralt</team_name>
+    </team>
+    <team>
+      <team_name>R. Rioja</team_name>
+    </team>
+    <team>
+      <team_name>Reus</team_name>
+    </team>
+    <team>
+      <team_name>Sabadell</team_name>
+    </team>
+    <team>
+      <team_name>Sant Andreu</team_name>
+    </team>
+    <team>
+      <team_name>Terrassa</team_name>
+    </team>
+    <team>
+      <team_name>Villajoyosa</team_name>
+    </team>
+    <team>
+      <team_name>Zaragoza B</team_name>
+    </team>
+  </teams>
+
+</league>
diff --git a/support_files/definitions/spain/league_spain3d.xml b/support_files/definitions/spain/league_spain3d.xml
new file mode 100644
index 00000000..60f3fb29
--- /dev/null
+++ b/support_files/definitions/spain/league_spain3d.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+
+  <sid>spain3d</sid>
+  <name>Segunda División B GIV</name>
+  <short_name>2ª Div. B GIV</short_name>
+  <symbol>flag_spain.png</symbol>
+  <first_week>1</first_week>
+  <week_gap>1</week_gap>
+  <average_skill>6000</average_skill>
+  <!-- <names_file>spain</names_file> -->
+  <layer>3</layer>
+
+  <prom_rel>
+    <prom_games>
+      <prom_games_dest_sid>spain2</prom_games_dest_sid>
+      <prom_games_cup_sid>spain_prom_games_4</prom_games_cup_sid>
+    </prom_games>
+  </prom_rel>
+
+  <teams>
+    <team>
+      <team_name>Águilas</team_name>
+    </team>
+    <team>
+      <team_name>Alcalá</team_name>
+    </team>
+    <team>
+      <team_name>Algeciras</team_name>
+    </team>
+    <team>
+      <team_name>Almansa</team_name>
+    </team>
+    <team>
+      <team_name>Badajoz</team_name>
+    </team>
+    <team>
+      <team_name>Baza</team_name>
+    </team>
+    <team>
+      <team_name>Cartagena</team_name>
+    </team>
+    <team>
+      <team_name>Ceuta</team_name>
+    </team>
+    <team>
+      <team_name>Conquense</team_name>
+    </team>
+    <team>
+      <team_name>Córdoba</team_name>
+    </team>
+    <team>
+      <team_name>Diter Zafra</team_name>
+    </team>
+    <team>
+      <team_name>Écija</team_name>
+    </team>
+    <team>
+      <team_name>Extremadura</team_name>
+    </team>
+    <team>
+      <team_name>Jaén</team_name>
+    </team>
+    <team>
+      <team_name>Linares</team_name>
+    </team>
+    <team>
+      <team_name>Marbella</team_name>
+    </team>
+    <team>
+      <team_name>Mérida</team_name>
+    </team>
+    <team>
+      <team_name>Sevilla B</team_name>
+    </team>
+    <team>
+      <team_name>Talavera</team_name>
+    </team>
+    <team>
+      <team_name>Villanueva</team_name>
+    </team>
+  </teams>
+
+</league>
diff --git a/support_files/definitions/wales/cup_wales_cl.xml b/support_files/definitions/wales/cup_wales_cl.xml
index 7d39da38..d71b0fbc 100644
--- a/support_files/definitions/wales/cup_wales_cl.xml
+++ b/support_files/definitions/wales/cup_wales_cl.xml
@@ -91,7 +91,7 @@
         </choose_team>
 
         <choose_team>
-          <choose_team_sid>spain1_short</choose_team_sid>
+          <choose_team_sid>spain1</choose_team_sid>
           <number_of_teams>1</number_of_teams>
           <randomly>1</randomly>
           <generate>1</generate>
diff --git a/support_files/definitions/wales/cup_wales_uefa.xml b/support_files/definitions/wales/cup_wales_uefa.xml
index 4576b723..9ae9829f 100644
--- a/support_files/definitions/wales/cup_wales_uefa.xml
+++ b/support_files/definitions/wales/cup_wales_uefa.xml
@@ -27,7 +27,7 @@
         <choose_team>
           <choose_team_sid>england1 france1 germany1 greece1_short
             italy1 netherlands1_short portugal1_short russia1_short
-            scotland1 spain1_short switzerland1_short turkey1_short
+            scotland1 spain1 switzerland1_short turkey1_short
             ukraine1_short belgium1 czech1_short
             denmark1_short</choose_team_sid>
           <number_of_teams>31</number_of_teams>
diff --git a/support_files/pixmaps/symbols/flag_spain.png b/support_files/pixmaps/symbols/flag_spain.png
new file mode 100644
index 00000000..64a2434a
Binary files /dev/null and b/support_files/pixmaps/symbols/flag_spain.png differ