diff --git a/app/src/main/java/net/osmtracker/OSMTracker.java b/app/src/main/java/net/osmtracker/OSMTracker.java
index 14d54b1ea..568811876 100644
--- a/app/src/main/java/net/osmtracker/OSMTracker.java
+++ b/app/src/main/java/net/osmtracker/OSMTracker.java
@@ -29,6 +29,7 @@ public static final class Preferences {
 		public final static String KEY_OUTPUT_GPX_HDOP_APPROXIMATION = "gpx.hdop.approximation";
 		public final static String KEY_OUTPUT_DIR_PER_TRACK = "gpx.directory_per_track";
 		public final static String KEY_OUTPUT_COMPASS = "gpx.compass_heading";
+		public final static String KEY_GPX_FORMAT_SHORT = "gpx.gpx_format_short";
 		
 		public final static String KEY_UI_PICTURE_SOURCE = "ui.picture.source";
 		public final static String KEY_UI_BUTTONS_LAYOUT = "ui.buttons.layout";
@@ -75,6 +76,7 @@ public static final class Preferences {
 		
 		public final static boolean VAL_OUTPUT_GPX_HDOP_APPROXIMATION = false;
 		public final static boolean VAL_OUTPUT_GPX_OUTPUT_DIR_PER_TRACK = true;
+		public final static boolean VAL_GPX_FORMAT_SHORT = false;
 
 		public final static String VAL_UI_PICTURE_SOURCE_CAMERA = "camera";
 		public final static String VAL_UI_PICTURE_SOURCE_GALLERY = "gallery";
diff --git a/app/src/main/java/net/osmtracker/gpx/ExportToStorageTask.java b/app/src/main/java/net/osmtracker/gpx/ExportToStorageTask.java
index daf13d632..00fd48d5e 100644
--- a/app/src/main/java/net/osmtracker/gpx/ExportToStorageTask.java
+++ b/app/src/main/java/net/osmtracker/gpx/ExportToStorageTask.java
@@ -39,6 +39,9 @@ protected File getExportDirectory(Date startDate) throws ExportTrackException {
 
 		boolean directoryPerTrack = prefs.getBoolean(OSMTracker.Preferences.KEY_OUTPUT_DIR_PER_TRACK, 
 				OSMTracker.Preferences.VAL_OUTPUT_GPX_OUTPUT_DIR_PER_TRACK);
+
+		boolean gpxFormatShort = prefs.getBoolean(OSMTracker.Preferences.KEY_GPX_FORMAT_SHORT,
+				OSMTracker.Preferences.VAL_GPX_FORMAT_SHORT);
 				
 		// Create the path to the directory to which we will be writing
 		// Trim the directory name, as additional spaces at the end will 
diff --git a/app/src/main/java/net/osmtracker/gpx/ExportTrackTask.java b/app/src/main/java/net/osmtracker/gpx/ExportTrackTask.java
index b72fa621c..5c0ac9f67 100644
--- a/app/src/main/java/net/osmtracker/gpx/ExportTrackTask.java
+++ b/app/src/main/java/net/osmtracker/gpx/ExportTrackTask.java
@@ -290,6 +290,9 @@ private void writeGpxFile(String trackName, String tags, String track_descriptio
 		String compassOutput = PreferenceManager.getDefaultSharedPreferences(context).getString(
 				OSMTracker.Preferences.KEY_OUTPUT_COMPASS,
 				OSMTracker.Preferences.VAL_OUTPUT_COMPASS);
+		boolean gpxFormatShort = PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
+				OSMTracker.Preferences.KEY_GPX_FORMAT_SHORT,
+				OSMTracker.Preferences.VAL_GPX_FORMAT_SHORT);
 
 		Log.v(TAG, "write preferences: compass:" + compassOutput);
 
@@ -315,8 +318,13 @@ private void writeGpxFile(String trackName, String tags, String track_descriptio
 
 			writer.write("\t</metadata>\n");
 
-			writeWayPoints(writer, cWayPoints, accuracyOutput, fillHDOP, compassOutput);
-			writeTrackPoints(context.getResources().getString(R.string.gpx_track_name), writer, cTrackPoints, fillHDOP, compassOutput);
+			if (gpxFormatShort) {
+				writeWayPoints_short(writer, cWayPoints, accuracyOutput, fillHDOP, compassOutput);
+				writeTrackPoints_short(context.getResources().getString(R.string.gpx_track_name), writer, cTrackPoints, fillHDOP, compassOutput);
+			} else {
+				writeWayPoints_long(writer, cWayPoints, accuracyOutput, fillHDOP, compassOutput);
+				writeTrackPoints_long(context.getResources().getString(R.string.gpx_track_name), writer, cTrackPoints, fillHDOP, compassOutput);
+			}
 			writer.write("</gpx>");
 
 		} finally {
@@ -327,7 +335,7 @@ private void writeGpxFile(String trackName, String tags, String track_descriptio
 	}
 
 	/**
-	 * Iterates on track points and write them.
+	 * Iterates on track points and write them. Long version, multiple lines per point.
 	 * @param trackName Name of the track (metadata).
 	 * @param fw Writer to the target file.
 	 * @param c Cursor to track points.
@@ -335,7 +343,7 @@ private void writeGpxFile(String trackName, String tags, String track_descriptio
 	 * @param compass Indicates if and how to write compass heading to the GPX ('none', 'comment', 'extension')
 	 * @throws IOException
 	 */
-	private void writeTrackPoints(String trackName, Writer fw, Cursor c, boolean fillHDOP, String compass) throws IOException {
+	private void writeTrackPoints_long(String trackName, Writer fw, Cursor c, boolean fillHDOP, String compass) throws IOException {
 		// Update dialog every 1%
 		int dialogUpdateThreshold = c.getCount() / 100;
 		if (dialogUpdateThreshold == 0) {
@@ -376,6 +384,7 @@ private void writeTrackPoints(String trackName, Writer fw, Cursor c, boolean fil
 			}
 
 			String buff = "";
+			buff += "\t\t\t\t\t<accuracy>" + String.valueOf(c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_ACCURACY))) + "</accuracy>\n";
 			if(! c.isNull(c.getColumnIndex(TrackContentProvider.Schema.COL_SPEED))) {
 				buff += "\t\t\t\t\t" + "<speed>" + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_SPEED)) + "</speed>" + "\n";
 			}
@@ -402,7 +411,7 @@ private void writeTrackPoints(String trackName, Writer fw, Cursor c, boolean fil
 	}
 
 	/**
-	 * Iterates on way points and write them.
+	 * Iterates on way points and write them. Long version, multiple lines per point.
 	 * @param fw Writer to the target file.
 	 * @param c Cursor to way points.
 	 * @param accuracyInfo Constant describing how to include (or not) accuracy info for way points.
@@ -410,7 +419,7 @@ private void writeTrackPoints(String trackName, Writer fw, Cursor c, boolean fil
 	 * @param compass Indicates if and how to write compass heading to the GPX ('none', 'comment', 'extension')
 	 * @throws IOException
 	 */
-	private void writeWayPoints(Writer fw, Cursor c, String accuracyInfo, boolean fillHDOP, String compass) throws IOException {
+	private void writeWayPoints_long(Writer fw, Cursor c, String accuracyInfo, boolean fillHDOP, String compass) throws IOException {
 
 		// Update dialog every 1%
 		int dialogUpdateThreshold = c.getCount() / 100;
@@ -504,6 +513,191 @@ private void writeWayPoints(Writer fw, Cursor c, String accuracyInfo, boolean fi
 
 			fw.write(out.toString());
 
+			if (i % dialogUpdateThreshold == 0) {
+				publishProgress((long) dialogUpdateThreshold);
+			}
+		}
+	}	
+	
+	/**
+	 * Iterates on track points and write them. Short version, one line per point.
+	 * @param trackName Name of the track (metadata).
+	 * @param fw Writer to the target file.
+	 * @param c Cursor to track points.
+	 * @param fillHDOP Indicates whether fill <hdop> tag with approximation from location accuracy.
+	 * @param compass Indicates if and how to write compass heading to the GPX ('none', 'comment', 'extension')
+	 * @throws IOException
+	 */
+	private void writeTrackPoints_short(String trackName, Writer fw, Cursor c, boolean fillHDOP, String compass) throws IOException {
+		// Update dialog every 1%
+		int dialogUpdateThreshold = c.getCount() / 100;
+		if (dialogUpdateThreshold == 0) {
+			dialogUpdateThreshold++;
+		}
+
+		fw.write("<trk>" + "\n");
+		fw.write("<name>" + CDATA_START + trackName + CDATA_END + "</name>" + "\n");
+		if (fillHDOP) {
+			fw.write("<cmt>"
+					+ CDATA_START
+					+ context.getResources().getString(R.string.gpx_hdop_approximation_cmt)
+					+ CDATA_END
+					+ "</cmt>" + "\n");
+		}
+		fw.write("<trkseg>" + "\n");
+
+		int i=0;
+		for(c.moveToFirst(); !c.isAfterLast(); c.moveToNext(),i++) {
+			StringBuffer out = new StringBuffer();
+			out.append("<trkpt lat=\""
+					+ c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_LATITUDE)) + "\" "
+					+ "lon=\"" + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_LONGITUDE)) + "\">");
+			if (! c.isNull(c.getColumnIndex(TrackContentProvider.Schema.COL_ELEVATION))) {
+				out.append("<ele>" + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_ELEVATION)) + "</ele>");
+			}
+			out.append("<time>" + pointDateFormatter.format(new Date(c.getLong(c.getColumnIndex(TrackContentProvider.Schema.COL_TIMESTAMP)))) + "</time>");
+
+			if(fillHDOP && ! c.isNull(c.getColumnIndex(TrackContentProvider.Schema.COL_ACCURACY))) {
+				out.append("<hdop>" + (c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_ACCURACY)) / OSMTracker.HDOP_APPROXIMATION_FACTOR) + "</hdop>");
+			}
+			if(OSMTracker.Preferences.VAL_OUTPUT_COMPASS_COMMENT.equals(compass) && !c.isNull(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS))) {
+				out.append("<cmt>"+CDATA_START+"compass: " +
+						c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS))+
+						" compAccuracy: " +
+						c.getLong(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS_ACCURACY))+
+						CDATA_END+"</cmt>");
+			}
+
+			String buff = "";
+			buff += "<accuracy>" + String.valueOf(c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_ACCURACY))) + "</accuracy>";
+			if(! c.isNull(c.getColumnIndex(TrackContentProvider.Schema.COL_SPEED))) {
+				buff += "<speed>" + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_SPEED)) + "</speed>";
+			}
+			if(OSMTracker.Preferences.VAL_OUTPUT_COMPASS_EXTENSION.equals(compass) && !c.isNull(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS))) {
+				buff += "<compass>" + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS)) + "</compass>";
+				buff += "<compass_accuracy>" + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS_ACCURACY)) + "</compass_accuracy>";
+			}
+			if(! buff.equals("")) {
+				out.append("<extensions>");
+				out.append(buff);
+				out.append("</extensions>");
+			}
+
+			out.append("</trkpt>" + "\n");
+			fw.write(out.toString());
+
+			if (i % dialogUpdateThreshold == 0) {
+				publishProgress((long) dialogUpdateThreshold);
+			}
+		}
+
+		fw.write("</trkseg>" + "\n");
+		fw.write("</trk>" + "\n");
+	}
+
+	/**
+	 * Iterates on way points and write them. Short version, one line per point.
+	 * @param fw Writer to the target file.
+	 * @param c Cursor to way points.
+	 * @param accuracyInfo Constant describing how to include (or not) accuracy info for way points.
+	 * @param fillHDOP Indicates whether fill <hdop> tag with approximation from location accuracy.
+	 * @param compass Indicates if and how to write compass heading to the GPX ('none', 'comment', 'extension')
+	 * @throws IOException
+	 */
+	private void writeWayPoints_short(Writer fw, Cursor c, String accuracyInfo, boolean fillHDOP, String compass) throws IOException {
+
+		// Update dialog every 1%
+		int dialogUpdateThreshold = c.getCount() / 100;
+		if (dialogUpdateThreshold == 0) {
+			dialogUpdateThreshold++;
+		}
+
+		// Label for meter unit
+		String meterUnit = context.getResources().getString(R.string.various_unit_meters);
+		// Word "accuracy"
+		String accuracy = context.getResources().getString(R.string.various_accuracy);
+
+		int i=0;
+		for(c.moveToFirst(); !c.isAfterLast(); c.moveToNext(), i++) {
+			StringBuffer out = new StringBuffer();
+			out.append("<wpt lat=\""
+					+ c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_LATITUDE)) + "\" "
+					+ "lon=\"" + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_LONGITUDE)) + "\">");
+			if (! c.isNull(c.getColumnIndex(TrackContentProvider.Schema.COL_ELEVATION))) {
+				out.append("<ele>" + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_ELEVATION)) + "</ele>");
+			}
+			out.append("<time>" + pointDateFormatter.format(new Date(c.getLong(c.getColumnIndex(TrackContentProvider.Schema.COL_TIMESTAMP)))) + "</time>");
+
+			String name = c.getString(c.getColumnIndex(TrackContentProvider.Schema.COL_NAME));
+
+			if (! OSMTracker.Preferences.VAL_OUTPUT_ACCURACY_NONE.equals(accuracyInfo) && ! c.isNull(c.getColumnIndex(TrackContentProvider.Schema.COL_ACCURACY))) {
+				// Outputs accuracy info for way point
+				if (OSMTracker.Preferences.VAL_OUTPUT_ACCURACY_WPT_NAME.equals(accuracyInfo)) {
+					// Output accuracy with name
+					out.append("<name>"
+							+ CDATA_START
+							+ name
+							+ " (" + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_ACCURACY)) + meterUnit + ")"
+							+ CDATA_END
+							+ "</name>");
+					if (OSMTracker.Preferences.VAL_OUTPUT_COMPASS_COMMENT.equals(compass) &&
+							! c.isNull(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS))) {
+						out.append("<cmt>" + CDATA_START + "compass: " + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS)) +
+								" compass accuracy: " + c.getInt(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS_ACCURACY)) + CDATA_END + "</cmt>");
+					}
+				} else if (OSMTracker.Preferences.VAL_OUTPUT_ACCURACY_WPT_CMT.equals(accuracyInfo)) {
+					// Output accuracy in separate tag
+					out.append("<name>" + CDATA_START + name + CDATA_END + "</name>");
+					if (OSMTracker.Preferences.VAL_OUTPUT_COMPASS_COMMENT.equals(compass) &&
+							! c.isNull(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS))) {
+						out.append("<cmt>" + CDATA_START + accuracy + ": " + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_ACCURACY)) + meterUnit +
+								" compass heading: " + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS)) +
+								"deg compass accuracy: " + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS_ACCURACY)) +CDATA_END + "</cmt>");
+					} else {
+						out.append("<cmt>" + CDATA_START + accuracy + ": " + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_ACCURACY)) + meterUnit + CDATA_END + "</cmt>");
+					}
+				} else {
+					// Unknown value for accuracy info, shouldn't occur but who knows ?
+					// See issue #68. Output at least the name just in case.
+					out.append("<name>" + CDATA_START + name + CDATA_END + "</name>");
+				}
+			} else {
+				// No accuracy info requested, or available
+				out.append("<name>" + CDATA_START + name + CDATA_END + "</name>");
+				if (OSMTracker.Preferences.VAL_OUTPUT_COMPASS_COMMENT.equals(compass) &&
+						! c.isNull(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS))) {
+					out.append("<cmt>" + CDATA_START + "compass: " + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS)) +
+							" compass accuracy: " + c.getInt(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS_ACCURACY)) + CDATA_END + "</cmt>");
+				}
+			}
+
+			String link = c.getString(c.getColumnIndex(TrackContentProvider.Schema.COL_LINK));
+			if (link != null) {
+				out.append("<link href=\"" + URLEncoder.encode(link) + "\">");
+				out.append("<text>" + link +"</text>");
+				out.append("</link>");
+			}
+
+			if (! c.isNull(c.getColumnIndex(TrackContentProvider.Schema.COL_NBSATELLITES))) {
+				out.append("<sat>" + c.getInt(c.getColumnIndex(TrackContentProvider.Schema.COL_NBSATELLITES)) + "</sat>");
+			}
+
+			if(fillHDOP && ! c.isNull(c.getColumnIndex(TrackContentProvider.Schema.COL_ACCURACY))) {
+				out.append("<hdop>" + (c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_ACCURACY)) / OSMTracker.HDOP_APPROXIMATION_FACTOR) + "</hdop>");
+			}
+
+			if (OSMTracker.Preferences.VAL_OUTPUT_COMPASS_EXTENSION.equals(compass) &&
+					! c.isNull(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS))) {
+				out.append("<extensions>");
+				out.append("<compass>" + c.getDouble(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS)) + "</compass>");
+				out.append("<compass_accuracy>" + c.getInt(c.getColumnIndex(TrackContentProvider.Schema.COL_COMPASS_ACCURACY)) + "</compass_accuracy>");
+				out.append("</extensions>");
+			}
+
+			out.append("</wpt>" + "\n");
+
+			fw.write(out.toString());
+
 			if (i % dialogUpdateThreshold == 0) {
 				publishProgress((long) dialogUpdateThreshold);
 			}
diff --git a/app/src/main/res/values/strings-preferences.xml b/app/src/main/res/values/strings-preferences.xml
index de851929a..842240fa7 100644
--- a/app/src/main/res/values/strings-preferences.xml
+++ b/app/src/main/res/values/strings-preferences.xml
@@ -77,6 +77,8 @@
 	<string name="prefs_storage_dir_hint">Effective for the next track (not the current one)</string>
 	<string name="prefs_output_one_dir_per_track">One directory per track</string>
 	<string name="prefs_output_one_dir_per_track_summary">Save each track and associated files to its own directory</string>
+	<string name="prefs_gpx_format_type">Short format</string>
+	<string name="prefs_gpx_format_type_summary">One line per track- or waypoint</string>
 	<string name="prefs_output_filename">Filename for named tracks</string>
 	<string name="prefs_output_filename_summary">Pattern for filename if the track has a name</string>
 	<string-array name="prefs_output_filename_keys">
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 13c1ec7a9..c1ad0da2f 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,108 +1,113 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 	<ListPreference
-		android:title="@string/prefs_voicerec_duration"
-		android:key="voicerec.duration"
-		android:entryValues="@array/prefs_voicerec_durations"
 		android:defaultValue="2"
-		android:entries="@array/prefs_voicerec_durations" />
+		android:entries="@array/prefs_voicerec_durations"
+		android:entryValues="@array/prefs_voicerec_durations"
+		android:key="voicerec.duration"
+		android:title="@string/prefs_voicerec_duration" />
 	<CheckBoxPreference
+		android:defaultValue="true"
 		android:key="sound_enabled"
-		android:title="@string/prefs_sound_enabled"
 		android:summary="@string/prefs_sound_enabled_summary"
-		android:defaultValue="true" />
+		android:title="@string/prefs_sound_enabled" />
 	<CheckBoxPreference
+		android:defaultValue="false"
 		android:key="gpx.use_barometer"
-		android:title="@string/prefs_use_barometer"
 		android:summary="@string/prefs_use_barometer_summary"
-		android:defaultValue="false" />
-	<com.android.internal.preference.YesNoPreference android:key="osm.oauth.clear-data"
-		android:title="@string/prefs_osm_clear_oauth_data" android:summary="@string/prefs_osm_clear_oauth_data_summary"
-		android:dialogMessage="@string/prefs_osm_clear_oauth_data_dialog" android:dialogIcon="@android:drawable/ic_dialog_alert" />
+		android:title="@string/prefs_use_barometer" />
+	<com.android.internal.preference.YesNoPreference android:dialogIcon="@android:drawable/ic_dialog_alert"
+		android:dialogMessage="@string/prefs_osm_clear_oauth_data_dialog" android:key="osm.oauth.clear-data"
+		android:summary="@string/prefs_osm_clear_oauth_data_summary" android:title="@string/prefs_osm_clear_oauth_data" />
 	
 	<PreferenceCategory android:title="@string/prefs_gps">
 		<Preference
+			android:key="gps.ossettings"
 			android:summary="@string/prefs_gps_os_settings_summary"
-			android:title="@string/prefs_gps_os_settings"
-			android:key="gps.ossettings" />
+			android:title="@string/prefs_gps_os_settings" />
 		<CheckBoxPreference
+			android:defaultValue="true"
 			android:key="gps.checkstartup"
-			android:title="@string/prefs_check_gps_startup"
 			android:summary="@string/prefs_check_gps_startup_summary"
-			android:defaultValue="true" />
+			android:title="@string/prefs_check_gps_startup" />
 		<CheckBoxPreference
+			android:defaultValue="false"
 			android:key="gps.ignoreclock"
-			android:title="@string/prefs_gps_ignore_clock"
 			android:summary="@string/prefs_gps_ignore_clock_summary"
-			android:defaultValue="false" />
+			android:title="@string/prefs_gps_ignore_clock" />
 		<EditTextPreference
+			android:defaultValue="0"
+			android:inputType="number"
 			android:key="gps.logging.interval"
-			android:title="@string/prefs_gps_logging_interval"
 			android:summary="@string/prefs_gps_logging_interval_summary"
-			android:defaultValue="0"
-			android:inputType="number" />
+			android:title="@string/prefs_gps_logging_interval" />
 		<EditTextPreference
+			android:defaultValue="0"
+			android:inputType="number"
 			android:key="gps.logging.min_distance"
-			android:title="@string/prefs_gps_logging_min_distance"
 			android:summary="@string/prefs_gps_logging_min_distance_summary"
-			android:defaultValue="0"
-			android:inputType="number" />
+			android:title="@string/prefs_gps_logging_min_distance" />
 	</PreferenceCategory>
 	
 	<PreferenceCategory android:title="@string/prefs_output">
-		<EditTextPreference android:key="logging.storage.dir"
-			android:defaultValue="/osmtracker" android:title="@string/prefs_storage_dir" android:dialogMessage="@string/prefs_storage_dir_hint"/>
+		<EditTextPreference android:defaultValue="/osmtracker"
+			android:dialogMessage="@string/prefs_storage_dir_hint" android:key="logging.storage.dir" android:title="@string/prefs_storage_dir"/>
 		<CheckBoxPreference
+			android:defaultValue="true"
 			android:key="gpx.directory_per_track"
-			android:title="@string/prefs_output_one_dir_per_track"
 			android:summary="@string/prefs_output_one_dir_per_track_summary"
-			android:defaultValue="true" />
-		<ListPreference android:key="gpx.filename" android:defaultValue="name_date" android:summary="@string/prefs_output_filename_summary"
-			android:title="@string/prefs_output_filename" android:entryValues="@array/prefs_output_filename_values"
-			android:entries="@array/prefs_output_filename_keys" />
+			android:title="@string/prefs_output_one_dir_per_track" />
+		<CheckBoxPreference
+			android:defaultValue="false"
+			android:key="gpx.gpx_format_short"
+			android:summary="@string/prefs_gpx_format_type_summary"
+			android:title="@string/prefs_gpx_format_type" />
+		<ListPreference android:defaultValue="name_date" android:entries="@array/prefs_output_filename_keys" android:entryValues="@array/prefs_output_filename_values"
+			android:key="gpx.filename" android:summary="@string/prefs_output_filename_summary"
+			android:title="@string/prefs_output_filename" />
 		<ListPreference
-			android:key="gpx.accuracy"
 			android:defaultValue="none"
-			android:summary="@string/prefs_output_accuracy_summary"
-			android:title="@string/prefs_output_accuracy"
+			android:entries="@array/prefs_output_accuracy_keys"
 			android:entryValues="@array/prefs_output_accuracy_values"
-			android:entries="@array/prefs_output_accuracy_keys" />
+			android:key="gpx.accuracy"
+			android:summary="@string/prefs_output_accuracy_summary"
+			android:title="@string/prefs_output_accuracy" />
 		<CheckBoxPreference
+			android:defaultValue="false"
 			android:key="gpx.hdop.approximation"
-			android:title="@string/prefs_output_gpx_hdop_approximation"
 			android:summary="@string/prefs_output_gpx_hdop_approximation_summary"
-			android:defaultValue="false" />
-		<ListPreference android:key="gpx.compass_heading" android:summary="@string/prefs_compass_heading_summary" android:title="@string/prefs_compass_heading" android:entryValues="@array/prefs_compass_heading_values" android:entries="@array/prefs_compass_heading_keys"/>
+			android:title="@string/prefs_output_gpx_hdop_approximation" />
+		<ListPreference android:entries="@array/prefs_compass_heading_keys" android:entryValues="@array/prefs_compass_heading_values" android:key="gpx.compass_heading" android:summary="@string/prefs_compass_heading_summary" android:title="@string/prefs_compass_heading"/>
 	</PreferenceCategory>
 
 	<PreferenceCategory android:title="@string/prefs_ui">
 		<ListPreference
 			android:defaultValue="none"
+			android:entries="@array/prefs_ui_picture_source_keys"
+			android:entryValues="@array/prefs_ui_picture_source_values"
 			android:key="ui.picture.source"
-			android:title="@string/prefs_ui_picture_source"
 			android:summary="@string/prefs_ui_picture_source_summary"
-			android:entries="@array/prefs_ui_picture_source_keys"
-			android:entryValues="@array/prefs_ui_picture_source_values" />
+			android:title="@string/prefs_ui_picture_source" />
 		<CheckBoxPreference
+			android:defaultValue="true"
 			android:key="ui.display_keep_on"
-			android:title="@string/prefs_display_always_on"
 			android:summary="@string/prefs_display_always_on_summary"
-			android:defaultValue="true" />
+			android:title="@string/prefs_display_always_on" />
 		<ListPreference
+			android:defaultValue="@style/DefaultTheme"
 			android:entries="@array/prefs_theme_keys"
-			android:title="@string/prefs_theme"
 			android:entryValues="@array/prefs_theme_values"
 			android:key="ui.theme"
 			android:summary="@string/prefs_theme_summary"
-			android:defaultValue="@style/DefaultTheme" />
-		<PreferenceScreen android:title="@string/prefs_ui_buttons_layout" android:summary="@string/prefs_ui_buttons_layout_summary">
+			android:title="@string/prefs_theme" />
+		<PreferenceScreen android:summary="@string/prefs_ui_buttons_layout_summary" android:title="@string/prefs_ui_buttons_layout">
 			<intent android:action="launch_buttons_presets" />
 		</PreferenceScreen>
 		<CheckBoxPreference
+			android:defaultValue="false"
 			android:key="ui.displaytrack.osm"
-			android:title="@string/prefs_displaytrack_osm"
 			android:summary="@string/prefs_displaytrack_osm_summary"
-			android:defaultValue="false" />
+			android:title="@string/prefs_displaytrack_osm" />
 		<!--<ListPreference
 			android:entries="@array/prefs_map_tile_keys"
 			android:title="@string/prefs_map_tile"
@@ -112,11 +117,11 @@
 			android:defaultValue="MAPNIK" />-->
 		<ListPreference
 			android:defaultValue="none"
+			android:entries="@array/prefs_ui_orientation_options_keys"
+			android:entryValues="@array/prefs_ui_orientation_options_values"
 			android:key="ui.orientation"
-			android:title="@string/prefs_ui_orientation"
 			android:summary="@string/prefs_ui_orientation_summary"
-			android:entries="@array/prefs_ui_orientation_options_keys"
-			android:entryValues="@array/prefs_ui_orientation_options_values" />
+			android:title="@string/prefs_ui_orientation" />
 	</PreferenceCategory>