diff --git a/templates/cave_data.html b/templates/cave_data.html
deleted file mode 100644
index 72647ed7b..000000000
--- a/templates/cave_data.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<!-- Only put one cave in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
-<!-- ALTERNATIVELY you can use the online troggle form. The template for this is
- in troggle/templates/dataformat/cave.xml and the code in troggle/core/forms.py and 
- troggle/views/caves.py . Default values are in the troggle/templates/dataformat/*.xml file -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-  <cave>
-    <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
-    <!-- there are 4 required fields: caveslug, area, kataster_number or unofficial_number, and url. The cave will not appear without all those. -->
-    <!-- ALWAYS use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
-
-<non_public></non_public> <!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
-<caveslug></caveslug> <!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
-<official_name></official_name> <!-- Name of the cave (normally in German) -->
-<area></area> <!--     (Required).The Kataster area (always 1623 or 1626). It's important to get this right, especially if near the border between the two areas. 1623 is our main area, but the border is not too far beyond the Stone Bridge so since 2014 some of our caves are in 1626. -->
-<area></area> <!-- Yes - there really are two different fields, both called 'area'. Bonkers. This second one is the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
-<kataster_code></kataster_code> <!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
-
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number></unofficial_number> <!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
-
-<!-- Add one entrance stanza for each entrance-->
-<entrance>
-  <entranceslug></entranceslug> <!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
-  <letter></letter> <!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
-</entrance>
-
-<explorers><p></p></explorers> <!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<underground_description><p></p></underground_description> <!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment><p></p></equipment> <!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey><p><div class="centre"></div><p></survey> <!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line> <!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes> <!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length> <!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth> <!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
-<survex_file></survex_file> <!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-</cave>
-</body>
-</html>
diff --git a/templates/cave_data.xml b/templates/cave_data.xml
new file mode 100644
index 000000000..c6032f0ff
--- /dev/null
+++ b/templates/cave_data.xml
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<!-- This file is generated by troggle on {{date}} UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- Only put one cave in this file -->
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
+make sure you update the database by doing a full data import. If you edit it using the online form
+though, you do not need to do a data import as it happens automatically -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+<b>This file is generated by troggle</b> on {{date}} UTC using the form documented at
+the form documented at 
+<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
+<br>
+
+<cave>
+<non_public>{{ cave.non_public }}</non_public>{% for slug in cave.caveslug_set.all %}<!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
+<!--<caveslug>{{ slug.slug|default_if_none:"1623-000"|safe }}</caveslug>{% endfor %}--> <!-- Ignored. No longer required, we use the filename instead e.g. 1623-315 for 1623-315.html  -->
+<official_name>{{ cave.official_name|default_if_none:""|safe }}</official_name><!-- Name of the cave (normally in German)  Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
+<area>{{cave.areacode |safe }}</area><!-- e.g. "1623" -->
+<kataster_code>{{ cave.kataster_code|default_if_none:"-"|safe }}</kataster_code><!-- 'length-or-depth/type exploration'
+code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+
+    T   Trockenh&ouml;hlen (Dry caves)
+    W   Wasserh&ouml;hlen (Caves with water)
+   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
+    E   Eishohlen (Caves with ice formations)
+    S   Schachth&ouml;hlen (Caves with pitches)
+    H   Halbh&ouml;hlen (Rock shelters ?)
+
+    -   unerforscht (unexplored)
+    =   befahren (visited)
+    ×   teilweise vermessen (partly surveyed)
+    +   erforscht (exploration considered complete)
+ -->
+<kataster_number>{{ cave.kataster_number|default_if_none:""|safe }}</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
+<unofficial_number>{{ cave.unofficial_number|default_if_none:""|safe }}</unofficial_number><!-- (This is any name. Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+{% for ce in cave.entrances.all %}
+<entrance>
+  <entranceslug>{{ ce.entrance.slug|default_if_none:""|safe }}</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
+  <letter>{{ ce.entranceletter|default_if_none:""|safe }}</letter><!--Leave blank for single-entrance cave. If there is more than one entrance then the letter needs to be given. Must match the entranceslug ID.  -->
+</entrance>
+{% endfor %}
+<explorers>{{ cave.explorers|default_if_none:""|safe }}</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
+<survex_file>{{ cave.survex_file|default_if_none:"caves-1623/000/000.svx"|safe }}</survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
+<underground_description>{{ cave.underground_description|default_if_none:""|safe }}</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
+<equipment>{{ cave.equipment|default_if_none:""|safe }}</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
+<references>{{ cave.references|default_if_none:""|safe }}</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
+<survey>{{ cave.survey|default_if_none:""|safe }}</survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
+<notes>{{ cave.notes|default_if_none:""|safe }}</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost, and whether a kataster form has been sent to Austria for this cave -->
+<length>{{ cave.length|default_if_none:""|safe }}</length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
+<depth>{{ cave.depth|default_if_none:""|safe }}</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<extent>{{cave.extent|default_if_none:""|safe }}</extent>
+
+<description_file>{{ cave.description_file|default_if_none:""|safe }}</description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
+</cave>
+</body>
+</html>
diff --git a/templates/entrance.xml b/templates/entrance.xml
new file mode 100644
index 000000000..6e4834379
--- /dev/null
+++ b/templates/entrance.xml
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<!-- Only put one entrance in this file -->
+<!-- This file is generated by troggle on {{date}} UTC using the form documented at handbook/survey/ententry.html -->
+<!-- If you edit this file by hand, and manually upload it to the server using git,
+make sure you update the database by doing a full data import. If you edit it using the online form
+though, you do not need to do a data import as it happens automatically -->
+
+    <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
+    <!-- there is 1 required field: slug. The entrance will not appear without that. -->
+    <!-- ALWAYS use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
+
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+<b>This file is generated by troggle</b> on {{date}} UTC using the form documented at 
+<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
+<br>
+<entrance>
+<non_public>{{ entrance.non_public }}</non_public>
+<slug>{{ entrance.slug|safe }}</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>{{ entrance.name|default_if_none:""|safe }}</name>
+<entrance_description>{{ entrance.entrance_description|default_if_none:""|safe }}</entrance_description>
+<explorers>{{ entrance.explorers|default_if_none:""|safe }}</explorers>
+<location_description>{{ entrance.location_description|default_if_none:""|safe }}</location_description>
+<lastvisit>{{ entrance.lastvisit|default_if_none:""|safe }}</lastvisit>
+<approach>{{ entrance.approach|default_if_none:""|safe }}</approach>
+<underground_description>{{ entrance.underground_description|default_if_none:""|safe }}</underground_description>
+<photo>{{ entrance.photo|default_if_none:"<img src='/1623/others/t/82jont.jpg' />"|safe }}</photo>
+<!-- marking options: P  = Paint,
+                      P? = Paint (?),
+                      T  = Tag,
+                      T? = Tag (?),
+                      R  = Retagged,
+                      S  = Spit,
+                      S? = Spit (?),
+                      U  = Unmarked,
+                      ?  = Unknown" -->
+<marking>{{ entrance.marking|default_if_none:"?"|safe }}</marking> 
+<marking_comment>{{ entrance.marking_comment|default_if_none:""|safe }}</marking_comment>
+<!-- findability options: ? = To be confirmed ...,
+                          S = Surveyed,
+                          L = Lost,
+                          R = Refindable" -->
+<findability>{{ entrance.findability|default_if_none:"?"|safe }}</findability>
+<findability_description>{{ entrance.findability_description|default_if_none:""|safe }}</findability_description>
+<alt>{{ entrance.alt|default_if_none:""|safe }}</alt>
+<lat_wgs84>{{ entrance.lat_wgs84|default_if_none:""|safe }}</lat_wgs84> 
+<long_wgs84>{{ entrance.long_wgs84|default_if_none:""|safe }}</long_wgs84> 
+<tag_station>{{ entrance.tag_station|default_if_none:""|safe }}</tag_station>
+<other_station>{{ entrance.other_station|default_if_none:""|safe }}</other_station>
+<other_description>{{ entrance.other_description|default_if_none:""|safe }}</other_description>
+<bearings>{{ entrance.bearings|default_if_none:""|safe }}</bearings> <!-- this is now read-only and not editable on the forms-->
+</entrance>
+</body>
+</html>
diff --git a/templates/entrance_data.html b/templates/entrance_data.html
deleted file mode 100644
index 120df1af6..000000000
--- a/templates/entrance_data.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<!-- Only put one entrance in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
-<!-- ALTERNATIVELY you can use the online troggle form. The template for this is
- in troggle/templates/dataformat/entrance.xml and the code in troggle/core/forms.py and 
- troggle/views/caves.py . Default values are in the troggle/templates/dataformat/*.xml file -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-    <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
-    <!-- there is 1 required field: slug. The entrance will not appear without that. -->
-    <!-- ALWAYS use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
-
-<entrance>
-<non_public></non_public> <!-- 'False' or 'True'. True if the cave
-should only be visible to logged-in users. Caves are normally public,
-so enter 'False' unless you know otherwise. -->
-<slug></slug> <!-- Internal I.D. referring to this entrance. Must match
-entranceslug in cave_data file. -->
-<name></name> <!-- Entrance name if it has a specific one. Normally empty.
--->
-<entrance_description></entrance_description> <!-- What does entrance
-look like -->
-<explorers></explorers> <!-- 'CUCC Expo' and year(s) of exploration.
-To distinguish from caves explored by foreign groups. Names can be
-given too if it was a small cave, or of original discoverer. -->
-<map_description></map_description> <!-- Location on specific map
-sheet - hardly ever used. -->
-<location_description></location_description> <!-- Immediate area. How
-to find entrance -->
-<approach></approach> <!-- Best approach to cave e.g. from path/other
-cave/landmark -->
-<underground_description></underground_description> <!--  -->
-<photo><p><div class="centre"></div></p></photo> <!--  -->
-<!-- marking options: P  = Paint,
-                      P? = Paint (?),
-                      T  = Tag,
-                      T? = Tag (?),
-                      R  = Re-tagged,
-                      S  = Spit,
-                      S? = Spit (?),
-                      U  = Unmarked,
-                      ?  = Unknown" -->
-<marking></marking> 
-<marking_comment></marking_comment> <!-- Clarifying comments about
-marking, if needed -->
-<!-- findability options: ? = To be confirmed ...,
-                          S = Surveyed,
-                          L = Lost,
-                          R = Refindable" -->
-<findability></findability>
-<findability_description></findability_description> <!-- Notes about
-findability, if needed -->
-<alt></alt> <!-- Altitude of entrance -->
-<northing></northing> <!-- Northing of entrance (WGS84 or UTM33).
-Leave for computer to calculate -->
-<easting></easting>  <!-- Easting of entrance (WGS84 or UTM33). Leave
-for computer to calculate -->
-<tag_station></tag_station> <!-- Which loser dataset (survex) point is the tag (if
-surveyed) -->
-<exact_station></exact_station> <!-- Which  loser dataset (survex)
-point is deemed as 'the entrance' (should be ground level at edge of
-'underground') -->
-<other_station></other_station> <!-- Other loser dataset (survex)
-points deemed important for this entrance-->
-<other_description></other_description> <!-- Notes on why
-other_station is relevant, if needed -->
-<bearings></bearings> <!-- Bearings from landmarks (from pre-GPS days) -->
-</entrance>
-</body>
-</html>
