From a75a6369a2584b557a4be7e7ee1ca6370304debb Mon Sep 17 00:00:00 2001
From: astridx <info@astrid-guenther.de>
Date: Fri, 22 Apr 2022 14:38:15 +0200
Subject: [PATCH] layout and field types

---
 aggpxtrack-update4.xml                        |  20 +
 changelog.xml                                 |   9 +
 j4/pkg_aggpxtrack/jorobo.ini                  |   2 +-
 .../fields/aggpxtrack/params/aggpxtrack.xml   | 993 +++---------------
 .../fields/aggpxtrack/tmpl/aggpxtrack.php     |   5 +-
 5 files changed, 175 insertions(+), 854 deletions(-)

diff --git a/aggpxtrack-update4.xml b/aggpxtrack-update4.xml
index c8b0eed..95fb675 100644
--- a/aggpxtrack-update4.xml
+++ b/aggpxtrack-update4.xml
@@ -82,4 +82,24 @@
         <sha256>be833b246e7be2b49aae3fd4e45de69f9a8f64f2844111018eb036f49216210a</sha256>
         <sha384>d1a6fb18f32e90aad4ead28431e00fcd5ee59f0aca4e219851b97fefc0b0b8c4fa0aec1bcfca96a38895115c753ede04</sha384>
     </update>
+    <update>
+        <name>pkg_aggpxtrack</name>
+        <description>pkg_aggpxtrack</description>
+        <element>pkg_aggpxtrack</element>
+        <type>package</type>
+        <client>site</client>
+        <version>4.0.4</version>
+        <infourl title="aggpxtrack">https://github.com/astridx/pkg_aggpxtrack/blob/v4.0.4/README.md</infourl>
+        <downloads>
+            <downloadurl type="full" format="zip">https://github.com/astridx/pkg_aggpxtrack/releases/download/v4.0.4/pkg-aggpxtrack-4.0.4.zip</downloadurl>
+        </downloads>
+        <tags>
+            <tag>stable</tag>
+        </tags>
+        <maintainer>Astrid Günther</maintainer>
+        <maintainerurl>https://astrid-guenther.de</maintainerurl>
+        <targetplatform name="joomla" version="4.*"/>
+        <sha256>92e6e78842ac23b606ab28c01da1b8ea5528015e8e14e2de912059fe3685d3fb</sha256>
+        <sha384>1752443de46e05dd9e18a134075590f4fc33d862a33595a3c15629566110e55e1e7076e0cff2816f6901d1ffe51c949e</sha384>
+    </update>
 </updates>
\ No newline at end of file
diff --git a/changelog.xml b/changelog.xml
index 99ac4d3..699692d 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -15,4 +15,13 @@
 			<item>Add Geoportal France and delete Openstreetmap black and white map provider.</item>
 		</note>
 	</changelog>
+	<changelog>
+		<element>pkg_aggpxtrack</element>
+		<type>package</type>
+		<version>4.0.4</version>
+		<note>
+			<item>Change field type radio to list.</item>
+			<item>Correct layout, delete '#JoomlaImage' trail.</item>
+		</note>
+	</changelog>
 </changelogs>
diff --git a/j4/pkg_aggpxtrack/jorobo.ini b/j4/pkg_aggpxtrack/jorobo.ini
index 3d45b36..29925c6 100644
--- a/j4/pkg_aggpxtrack/jorobo.ini
+++ b/j4/pkg_aggpxtrack/jorobo.ini
@@ -1,5 +1,5 @@
 extension = aggpxtrack
-version = 4.0.4
+version = 4.0.5
 source = src
 target = package
 
diff --git a/j4/pkg_aggpxtrack/src/plugins/fields/aggpxtrack/params/aggpxtrack.xml b/j4/pkg_aggpxtrack/src/plugins/fields/aggpxtrack/params/aggpxtrack.xml
index ae5ad9c..521f014 100644
--- a/j4/pkg_aggpxtrack/src/plugins/fields/aggpxtrack/params/aggpxtrack.xml
+++ b/j4/pkg_aggpxtrack/src/plugins/fields/aggpxtrack/params/aggpxtrack.xml
@@ -1,47 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
-	<fields
-		name="fieldparams"
-		addfieldpath="plugins/fields/aggpxtrack/field"
-	>
+	<fields name="fieldparams" addfieldpath="plugins/fields/aggpxtrack/field">
 		<fieldset name="fieldparams">
-			<field
-				name="directory"
-				type="folderlist"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_DIRECTORY_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_DIRECTORY_DESC"
-				directory="images"
-				hide_none="true"
-				recursive="true"
-			/>
-
-			<field
-				name="preview"
-				type="hidden"
-				default="false"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_PREVIEW_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_PREVIEW_DESC"
-			>
+			<field name="directory" type="folderlist" label="PLG_FIELDS_AGGPXTRACK_PARAMS_DIRECTORY_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_DIRECTORY_DESC" directory="images" hide_none="true" recursive="true" />
+
+			<field name="preview" type="hidden" default="false" label="PLG_FIELDS_AGGPXTRACK_PARAMS_PREVIEW_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_PREVIEW_DESC">
 				<option value="false">JNO</option>
 			</field>
-			<field
-				name="image_class"
-				type="textarea"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_IMAGE_CLASS_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_IMAGE_CLASS_DESC"
-				size="40"
-			/>
+			<field name="image_class" type="textarea" label="PLG_FIELDS_AGGPXTRACK_PARAMS_IMAGE_CLASS_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_IMAGE_CLASS_DESC" size="40" />
 
 			<field type="spacer" name="spacerpolylinecolor" hr="true" />
 
-			<field
-				type="list"
-				name="showelements"
-				default="'track', 'route', 'waypoint'"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_SHOWELEMENTS_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_SHOWELEMENTS_DESC"
-				validate="options"
-			>
+			<field type="list" name="showelements" default="'track', 'route', 'waypoint'" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_SHOWELEMENTS_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_SHOWELEMENTS_DESC" validate="options">
 				<option value="track,route,waypoint">track, route and waypoints</option>
 				<option value="track,route">track and route</option>
 				<option value="track">track</option>
@@ -51,53 +21,19 @@
 				<option value="route,waypoint'">route and waypoints</option>
 			</field>
 
-			<field
-				name="polylinecolor"
-				type="color"
-				default="#0000ff"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_POLYLINECOLOR_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_POLYLINECOLOR_DESC"
-				showon="showelements!:waypoint"
-			/>
-
-			<field
-				type="list"
-				name="custom_icons"
-				default="0"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONS_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONS_DESC"
-				validate="options"
-			>
+			<field name="polylinecolor" type="color" default="#0000ff" label="PLG_FIELDS_AGGPXTRACK_PARAMS_POLYLINECOLOR_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_POLYLINECOLOR_DESC" showon="showelements!:waypoint" />
+
+			<field type="list" name="custom_icons" default="0" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONS_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONS_DESC" validate="options">
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
 
-			<field
-				type="spacer"
-				name="customiconstart"
-				hr="false"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_START_SPACER_LABEL"
-				showon="custom_icons:1"
-			/>
-
-			<field
-				name="customiconstart_icon"
-				type="falist"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_DESC"
-				showon="custom_icons:1"
-			>
+			<field type="spacer" name="customiconstart" hr="false" label="PLG_FIELDS_AGGPXTRACK_PARAMS_START_SPACER_LABEL" showon="custom_icons:1" />
+
+			<field name="customiconstart_icon" type="falist" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_DESC" showon="custom_icons:1">
 			</field>
 
-			<field
-				name="customiconstart_markercolor"
-				type="list"
-				default="red"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_DESC"
-				showon="custom_icons:1"
-				validate="options"
-			>
+			<field name="customiconstart_markercolor" type="list" default="red" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_DESC" showon="custom_icons:1" validate="options">
 				<option value="red">red</option>
 				<option value="darkred">darkred</option>
 				<option value="orange">orange</option>
@@ -110,64 +46,21 @@
 				<option value="cadetblue">cadetblue</option>
 			</field>
 
-			<field
-				name="customiconstart_iconcolor"
-				type="color"
-				default="#ffffff"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_DESC"
-				showon="custom_icons:1"
-			/>
-
-			<field
-				name="customiconstart_extraclasses"
-				type="text"
-				default=""
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_DESC"
-				size="40"
-				showon="custom_icons:1"
-			/>
-
-			<field
-				name="customiconstart_spin"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="custom_icons:1"
-			>
+			<field name="customiconstart_iconcolor" type="color" default="#ffffff" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_DESC" showon="custom_icons:1" />
+
+			<field name="customiconstart_extraclasses" type="text" default="" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_DESC" size="40" showon="custom_icons:1" />
+
+			<field name="customiconstart_spin" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_DESC" default="0" showon="custom_icons:1">
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
 
-			<field
-				type="spacer"
-				name="customiconend"
-				hr="false"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_END_SPACER_LABEL"
-				showon="custom_icons:1"
-			/>
-
-			<field
-				name="customiconend_icon"
-				type="falist"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_DESC"
-				showon="custom_icons:1"
-			>
+			<field type="spacer" name="customiconend" hr="false" label="PLG_FIELDS_AGGPXTRACK_PARAMS_END_SPACER_LABEL" showon="custom_icons:1" />
+
+			<field name="customiconend_icon" type="falist" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_DESC" showon="custom_icons:1">
 			</field>
 
-			<field
-				name="customiconend_markercolor"
-				type="list"
-				default="red"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_DESC"
-				showon="custom_icons:1"
-				validate="options"
-			>
+			<field name="customiconend_markercolor" type="list" default="red" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_DESC" showon="custom_icons:1" validate="options">
 				<option value="red">red</option>
 				<option value="darkred">darkred</option>
 				<option value="orange">orange</option>
@@ -180,64 +73,21 @@
 				<option value="cadetblue">cadetblue</option>
 			</field>
 
-			<field
-				name="customiconend_iconcolor"
-				type="color"
-				default="#ffffff"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_DESC"
-				showon="custom_icons:1"
-			/>
-
-			<field
-				name="customiconend_extraclasses"
-				type="text"
-				default=""
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_DESC"
-				size="40"
-				showon="custom_icons:1"
-			/>
-
-			<field
-				name="customiconend_spin"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="custom_icons:1"
-			>
+			<field name="customiconend_iconcolor" type="color" default="#ffffff" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_DESC" showon="custom_icons:1" />
+
+			<field name="customiconend_extraclasses" type="text" default="" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_DESC" size="40" showon="custom_icons:1" />
+
+			<field name="customiconend_spin" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_DESC" default="0" showon="custom_icons:1">
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
 
-			<field
-				type="spacer"
-				name="customiconwaypoint"
-				hr="false"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_WAYPOINT_SPACER_LABEL"
-				showon="custom_icons:1"
-			/>
-
-			<field
-				name="customiconwaypoint_icon"
-				type="falist"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_DESC"
-				showon="custom_icons:1"
-			>
+			<field type="spacer" name="customiconwaypoint" hr="false" label="PLG_FIELDS_AGGPXTRACK_PARAMS_WAYPOINT_SPACER_LABEL" showon="custom_icons:1" />
+
+			<field name="customiconwaypoint_icon" type="falist" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_DESC" showon="custom_icons:1">
 			</field>
 
-			<field
-				name="customiconwaypoint_markercolor"
-				type="list"
-				default="red"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_DESC"
-				showon="custom_icons:1"
-				validate="options"
-			>
+			<field name="customiconwaypoint_markercolor" type="list" default="red" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_DESC" showon="custom_icons:1" validate="options">
 				<option value="red">red</option>
 				<option value="darkred">darkred</option>
 				<option value="orange">orange</option>
@@ -250,114 +100,37 @@
 				<option value="cadetblue">cadetblue</option>
 			</field>
 
-			<field
-				name="customiconwaypoint_iconcolor"
-				type="color"
-				default="#ffffff"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_DESC"
-				showon="custom_icons:1"
-			/>
-
-			<field
-				name="customiconwaypoint_extraclasses"
-				type="text"
-				default=""
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_DESC"
-				size="40"
-				showon="custom_icons:1"
-			/>
-
-			<field
-				name="customiconwaypoint_spin"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="custom_icons:1"
-			>
+			<field name="customiconwaypoint_iconcolor" type="color" default="#ffffff" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_DESC" showon="custom_icons:1" />
+
+			<field name="customiconwaypoint_extraclasses" type="text" default="" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_DESC" size="40" showon="custom_icons:1" />
+
+			<field name="customiconwaypoint_spin" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_DESC" default="0" showon="custom_icons:1">
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
 
-			<field
-				type="spacer"
-				name="customiconspecialwaypoint"
-				hr="false"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SPECIALWAYPOINT_SPACER_LABEL"
-				showon="custom_icons:1"
-			/>
-
-			<field
-				name="specialwaypoints"
-				type="subform"
-				formsource="plugins/fields/aggpxtrack/forms/specialwaypoint.xml"
-				multiple="true"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SPECIALWAYPOINT_SUBFORM_LABEL"
-				min= "1"
-				max= "20"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SPECIALWAYPOINT_SUBFORM_DESC"
-				layout="joomla.form.field.subform.repeatable"
-				showon="custom_icons:1"
-			/>
+			<field type="spacer" name="customiconspecialwaypoint" hr="false" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SPECIALWAYPOINT_SPACER_LABEL" showon="custom_icons:1" />
+
+			<field name="specialwaypoints" type="subform" formsource="plugins/fields/aggpxtrack/forms/specialwaypoint.xml" multiple="true" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SPECIALWAYPOINT_SUBFORM_LABEL" min= "1" max= "20" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SPECIALWAYPOINT_SUBFORM_DESC" layout="joomla.form.field.subform.repeatable" showon="custom_icons:1" />
 
 			<field type="spacer" name="downloadparams" hr="true" />
 
-			<field
-				name="show_downloadlink"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_DOWNLOAD_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_DOWNLOAD_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-			>
+			<field name="show_downloadlink" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_DOWNLOAD_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_DOWNLOAD_DESC" default="0">
 				<option value="0">JNO</option>
 				<option value="text">text</option>
 				<option value="button">button</option>
 			</field>
 
-			<field
-				name="downloadbuttoncolor"
-				type="color"
-				default="#cadea5"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_BUTTONCOLOR_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_BUTTONCOLOR_DESC"
-				showon="show_downloadlink:button"
-			/>
+			<field name="downloadbuttoncolor" type="color" default="#cadea5" label="PLG_FIELDS_AGGPXTRACK_PARAMS_BUTTONCOLOR_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_BUTTONCOLOR_DESC" showon="show_downloadlink:button" />
 
 			<field type="spacer" name="mapparams" hr="true" />
 
-			<field
-				type="integer"
-				name="map_height"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_HEIGHT_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS__CONTROL_HEIGHT_DESC"
-				default="400"
-				first="0"
-				last="1000"
-				step="1"
-			/>
-			<field
-				name="scrollwheelzoom"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SCOLLWHEELZOOM_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SCOLLWHEELZOOM_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="1"
-			>
+			<field type="integer" name="map_height" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_HEIGHT_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS__CONTROL_HEIGHT_DESC" default="400" first="0" last="1000" step="1" />
+			<field name="scrollwheelzoom" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SCOLLWHEELZOOM_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SCOLLWHEELZOOM_DESC" default="1">
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
 			</field>
-			<field
-				type="list"
-				name="maptype"
-				default="osm"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_MAPTYPE_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_MAPTYPE_DESC"
-				validate="options"
-			>
+			<field type="list" name="maptype" default="osm" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_MAPTYPE_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_MAPTYPE_DESC" validate="options">
 				<option value="osm">OpenStreetMap</option>
 				<option value="opentopomap">OpenTopoMap</option>
 				<option value="thunderforest">Thunderforest</option>
@@ -366,45 +139,13 @@
 				<option value="geoportailfrance">GeoportailFrance</option>
 			</field>
 
-			<field
-				name="geoportailfrancekey"
-				type="text"
-				default="choisirgeoportail"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_GEOPORTAILFRAMCEKEY_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_GEOPORTAILFRAMCEKEY_DESC"
-				size="40"
-				showon="maptype:geoportailfrance"
-			/>
-
-			<field
-				name="mapboxkey"
-				type="text"
-				default=""
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_MAPBOXKEY_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_MAPBOXKEY_DESC"
-				size="40"
-				showon="maptype:mapbox"
-			/>
-
-			<field
-				name="thunderforestkey"
-				type="text"
-				default=""
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_THUNDERFORESTKEY_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_THUNDERFORESTKEY_DESC"
-				size="40"
-				showon="maptype:thunderforest"
-			/>
-
-			<field
-				type="list"
-				name="thunderforestmaptype"
-				default="cycle"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_THUNDERFORESTMAPTYPE_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_THUNDERFORESTMAPTYPE_DESC"
-				showon="maptype:thunderforest"
-				validate="options"
-			>
+			<field name="geoportailfrancekey" type="text" default="choisirgeoportail" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_GEOPORTAILFRAMCEKEY_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_GEOPORTAILFRAMCEKEY_DESC" size="40" showon="maptype:geoportailfrance" />
+
+			<field name="mapboxkey" type="text" default="" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_MAPBOXKEY_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_MAPBOXKEY_DESC" size="40" showon="maptype:mapbox" />
+
+			<field name="thunderforestkey" type="text" default="" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_THUNDERFORESTKEY_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_THUNDERFORESTKEY_DESC" size="40" showon="maptype:thunderforest" />
+
+			<field type="list" name="thunderforestmaptype" default="cycle" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_THUNDERFORESTMAPTYPE_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_THUNDERFORESTMAPTYPE_DESC" showon="maptype:thunderforest" validate="options">
 				<option value="cycle">cycle</option>
 				<option value="transport">transport</option>
 				<option value="landscape">landscape</option>
@@ -416,25 +157,9 @@
 				<option value="neighbourhood">neighbourhood</option>
 			</field>
 
-			<field
-				name="googlekey"
-				type="text"
-				default=""
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_GOOGLEKEY_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_GOOGLEKEY_DESC"
-				size="40"
-				showon="maptype:google"
-			/>
-
-			<field
-				type="list"
-				name="googlemapstype"
-				default="satellite"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_GOOGLETYPE_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_GOOGLETYPE_DESC"
-				showon="maptype:google"
-				validate="options"
-			>
+			<field name="googlekey" type="text" default="" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_GOOGLEKEY_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_GOOGLEKEY_DESC" size="40" showon="maptype:google" />
+
+			<field type="list" name="googlemapstype" default="satellite" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_GOOGLETYPE_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_GOOGLETYPE_DESC" showon="maptype:google" validate="options">
 				<option value="satellite">satellite</option>
 				<option value="roadmap">roadmap</option>
 				<option value="terrain">terrain</option>
@@ -442,444 +167,180 @@
 			</field>
 			<field type="spacer" name="aggpxscale" hr="true" />
 
-			<field
-				type="checkboxes"
-				name="scale"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SCALE"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SCALE_DESC"
-			>
+			<field type="checkboxes" name="scale" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SCALE" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SCALE_DESC">
 				<option value="metric">PLG_FIELDS_AGGPXTRACK_PARAMS_METRIC</option>
 				<option value="imperial">PLG_FIELDS_AGGPXTRACK_PARAMS_IMPERIAL</option>
 			</field>
 
 			<field type="spacer" name="gpxparams" hr="true" />
 
-			<field
-				type="list"
-				name="showinfo"
-				default="no"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOWINFO_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOWINFO_DESC"
-				validate="options"
-			>
-				<option value="no">no</option>
+			<field type="list" name="showinfo" default="no" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOWINFO_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOWINFO_DESC" validate="options">
+				<option value="no">JNO</option>
 				<option value="before">before map</option>
 				<option value="after">after map</option>
 			</field>
-			<field
-				type="list"
-				name="infostyle"
-				default="style"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_INFOSTYLE_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_INFOSTYLE_DESC"
-				showon="showinfo!:no"
-				validate="options"
-			>
+			<field type="list" name="infostyle" default="style" label="PLG_FIELDS_AGGPXTRACK_PARAMS_INFOSTYLE_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_INFOSTYLE_DESC" showon="showinfo!:no" validate="options">
 				<option value="style">no</option>
 				<option value="style_1">style_1</option>
 				<option value="style_2">style_2</option>
 			</field>
-			<field
-				name="stylecolorlight"
-				type="color"
-				default="#cadea5"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_INFOCOLORLIGHT_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_INFOCOLORLIGHT_DESC"
-				showon="showinfo!:no[AND]infostyle!:style"
-			/>
-			<field
-				name="stylecolordark"
-				type="color"
-				default="#86b827"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_INFOCOLORDARK_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_INFOCOLORDARK_DESC"
-				showon="showinfo!:no[AND]infostyle!:style"
-			/>
-			<field
-				name="show_distance"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_DISTANCE_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_DISTANCE_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="stylecolorlight" type="color" default="#cadea5" label="PLG_FIELDS_AGGPXTRACK_PARAMS_INFOCOLORLIGHT_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_INFOCOLORLIGHT_DESC" showon="showinfo!:no[AND]infostyle!:style" />
+			<field name="stylecolordark" type="color" default="#86b827" label="PLG_FIELDS_AGGPXTRACK_PARAMS_INFOCOLORDARK_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_INFOCOLORDARK_DESC" showon="showinfo!:no[AND]infostyle!:style" />
+			<field name="show_distance" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_DISTANCE_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_DISTANCE_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_name"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_NAME_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_NAME_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_name" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_NAME_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_NAME_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_start_time"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_START_TIME_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_START_TIME_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_start_time" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_START_TIME_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_START_TIME_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_end_time"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_END_TIME_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_END_TIME_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_end_time" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_END_TIME_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_END_TIME_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_moving_time"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_MOVING_TIME_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_MOVING_TIME_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_moving_time" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_MOVING_TIME_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_MOVING_TIME_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_total_time"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_TOTAL_TIME_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_TOTAL_TIME_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_total_time" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_TOTAL_TIME_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_TOTAL_TIME_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_moving_pace"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_MOVING_PACE_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_MOVING_PACE_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_moving_pace" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_MOVING_PACE_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_MOVING_PACE_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_moving_speed"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_MOVING_SPEED_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_MOVING_SPEED_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_moving_speed" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_MOVING_SPEED_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_MOVING_SPEED_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_total_speed"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_TOTAL_SPEED_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_TOTAL_SPEED_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_total_speed" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_TOTAL_SPEED_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_TOTAL_SPEED_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_elevation_min"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_MIN_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_MIN_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_elevation_min" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_MIN_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_MIN_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_elevation_max"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_MAX_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_MAX_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_elevation_max" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_MAX_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_MAX_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_elevation_gain"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_GAIN_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_GAIN_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_elevation_gain" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_GAIN_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_GAIN_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_elevation_loss"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_LOSS_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_LOSS_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_elevation_loss" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_LOSS_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATION_LOSS_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_average_hr"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_AVERAGE_HR_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_AVERAGE_HR_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_average_hr" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_AVERAGE_HR_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_AVERAGE_HR_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_average_cadence"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_AVERAGE_CADENCE_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_AVERAGE_CADENCE_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_average_cadence" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_AVERAGE_CADENCE_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_AVERAGE_CADENCE_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="show_average_temp"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_AVERAGE_TEMP_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_AVERAGE_TEMP_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="showinfo!:no"
-			>
+			<field name="show_average_temp" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_AVERAGE_TEMP_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_AVERAGE_TEMP_DESC" default="0" showon="showinfo!:no">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
 			<field type="spacer" name="elevationcontrol" hr="true" />
 
-			<field
-				name="show_elevantioncontrol"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATIONCONTROL_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATIONCONTROL_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-			>
+			<field name="show_elevantioncontrol" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATIONCONTROL_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_ELEVATIONCONTROL_DESC" default="0">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				type="list"
-				name="elevantioncontrol_position"
-				default="topright"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_DESC"
-				showon="show_elevantioncontrol:1"
-				validate="options"
-			>
+			<field type="list" name="elevantioncontrol_position" default="topright" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_DESC" showon="show_elevantioncontrol:1" validate="options">
 				<option value="bottomleft">PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_BOTTOMLEFT</option>
 				<option value="bottomright">PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_BOTTOMRIGHT</option>
 				<option value="topleft">PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_TOPLEFT</option>
 				<option value="topright">PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_TOPRIGHT</option>
 			</field>
 
-			<field
-				type="list"
-				name="elevantioncontrol_theme"
-				default="elevation-lime"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_THEME_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_THEME_DESC"
-				showon="show_elevantioncontrol:1"
-				validate="options"
-			>
+			<field type="list" name="elevantioncontrol_theme" default="elevation-lime" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_THEME_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_THEME_DESC" showon="show_elevantioncontrol:1" validate="options">
 				<option value="steelblue-theme">steelblue-theme</option>
 				<option value="purple-theme">purple-theme</option>
 				<option value="lime-theme">lime-theme</option>
 			</field>
 
-			<field
-				type="list"
-				name="elevantioncontrol_height"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_HEIGHT_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_HEIGHT_DESC"
-				default="125"
-				showon="show_elevantioncontrol:1"
-				validate="options"
-			>
+			<field type="list" name="elevantioncontrol_height" label="PLG_FIELDS_AGGPXTRACK_PARAMS_HEIGHT_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_HEIGHT_DESC" default="125" showon="show_elevantioncontrol:1" validate="options">
 				<option value="-25">PLG_FIELDS_AGGPXTRACK_PARAMS_HEIGHT_25</option>
 				<option value="-50">PLG_FIELDS_AGGPXTRACK_PARAMS_HEIGHT_50</option>
 				<option value="-75">PLG_FIELDS_AGGPXTRACK_PARAMS_HEIGHT_75</option>
 				<option value="-100">PLG_FIELDS_AGGPXTRACK_PARAMS_HEIGHT_100</option>
 				<option value="1000">1000 Pixel</option>
-				<option value="900" >900 Pixel</option>
-				<option value="800" >800 Pixel</option>
-				<option value="700" >700 Pixel</option>
-				<option value="600" >600 Pixel</option>
-				<option value="500" >500 Pixel</option>
-				<option value="400" >400 Pixel</option>
-				<option value="300" >300 Pixel</option>
-				<option value="200" >200 Pixel</option>
-				<option value="100" >100 Pixel</option>
-			</field>
-
-			<field
-				type="list"
-				name="elevantioncontrol_width"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_WIDTH_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_WIDTH_DESC"
-				default="600"
-				showon="show_elevantioncontrol:1"
-				validate="options"
-			>
+				<option value="900">900 Pixel</option>
+				<option value="800">800 Pixel</option>
+				<option value="700">700 Pixel</option>
+				<option value="600">600 Pixel</option>
+				<option value="500">500 Pixel</option>
+				<option value="400">400 Pixel</option>
+				<option value="300">300 Pixel</option>
+				<option value="200">200 Pixel</option>
+				<option value="100">100 Pixel</option>
+			</field>
+
+			<field type="list" name="elevantioncontrol_width" label="PLG_FIELDS_AGGPXTRACK_PARAMS_WIDTH_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_WIDTH_DESC" default="600" showon="show_elevantioncontrol:1" validate="options">
 				<option value="-25">PLG_FIELDS_AGGPXTRACK_PARAMS_WIDTH_25</option>
 				<option value="-50">PLG_FIELDS_AGGPXTRACK_PARAMS_WIDTH_50</option>
 				<option value="-75">PLG_FIELDS_AGGPXTRACK_PARAMS_WIDTH_75</option>
 				<option value="-100">PLG_FIELDS_AGGPXTRACK_PARAMS_WIDTH_100</option>
 				<option value="1000">1000 Pixel</option>
-				<option value="900" >900 Pixel</option>
-				<option value="800" >800 Pixel</option>
-				<option value="700" >700 Pixel</option>
-				<option value="600" >600 Pixel</option>
-				<option value="500" >500 Pixel</option>
-				<option value="400" >400 Pixel</option>
-				<option value="300" >300 Pixel</option>
-				<option value="200" >200 Pixel</option>
-				<option value="100" >100 Pixel</option>
+				<option value="900">900 Pixel</option>
+				<option value="800">800 Pixel</option>
+				<option value="700">700 Pixel</option>
+				<option value="600">600 Pixel</option>
+				<option value="500">500 Pixel</option>
+				<option value="400">400 Pixel</option>
+				<option value="300">300 Pixel</option>
+				<option value="200">200 Pixel</option>
+				<option value="100">100 Pixel</option>
 			</field>
 
-			<field
-				type="integer"
-				name="elevantioncontrol_top"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_TOP_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_TOP_DESC"
-				default="10"
-				first="0"
-				last="100"
-				step="1"
-				showon="show_elevantioncontrol:1"
-			/>
-
-			<field
-				type="integer"
-				name="elevantioncontrol_bottom"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_BOTTOM_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_BOTTOM_DESC"
-				default="30"
-				first="0"
-				last="100"
-				step="1"
-				showon="show_elevantioncontrol:1"
-			/>
-
-			<field
-				type="integer"
-				name="elevantioncontrol_right"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_RIGHT_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_RIGHT_DESC"
-				default="20"
-				first="0"
-				last="100"
-				step="1"
-				showon="show_elevantioncontrol:1"
-			/>
-
-			<field
-				type="integer"
-				name="elevantioncontrol_left"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_LEFT_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_LEFT_DESC"
-				default="50"
-				first="0"
-				last="100"
-				step="1"
-				showon="show_elevantioncontrol:1"
-			/>
-
-			<field
-				type="list"
-				name="elevantioncontrol_collapsed"
-				default="true"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_COLLAPSED_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_COLLAPSED_DESC"
-				showon="show_elevantioncontrol:1"
-				validate="options"
-			>
+			<field type="integer" name="elevantioncontrol_top" label="PLG_FIELDS_AGGPXTRACK_PARAMS_TOP_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_TOP_DESC" default="10" first="0" last="100" step="1" showon="show_elevantioncontrol:1" />
+
+			<field type="integer" name="elevantioncontrol_bottom" label="PLG_FIELDS_AGGPXTRACK_PARAMS_BOTTOM_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_BOTTOM_DESC" default="30" first="0" last="100" step="1" showon="show_elevantioncontrol:1" />
+
+			<field type="integer" name="elevantioncontrol_right" label="PLG_FIELDS_AGGPXTRACK_PARAMS_RIGHT_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_RIGHT_DESC" default="20" first="0" last="100" step="1" showon="show_elevantioncontrol:1" />
+
+			<field type="integer" name="elevantioncontrol_left" label="PLG_FIELDS_AGGPXTRACK_PARAMS_LEFT_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_LEFT_DESC" default="50" first="0" last="100" step="1" showon="show_elevantioncontrol:1" />
+
+			<field type="list" name="elevantioncontrol_collapsed" default="true" label="PLG_FIELDS_AGGPXTRACK_PARAMS_COLLAPSED_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_COLLAPSED_DESC" showon="show_elevantioncontrol:1" validate="options">
 				<option value="true">JYES</option>
 				<option value="false">JNO</option>
 			</field>
 
 			<field type="spacer" name="fullscreenparams" hr="true" />
 
-			<field
-				name="show_fullscreencontrol"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_FULLSCREEN_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_FULLSCREEN_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-			>
+			<field name="show_fullscreencontrol" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_FULLSCREEN_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_FULLSCREEN_DESC" default="0">
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
 
-			<field
-				type="list"
-				name="fullscreencontrol_position"
-				default="topleft"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_DESC"
-				showon="show_fullscreencontrol:1"
-				validate="options"
-			>
+			<field type="list" name="fullscreencontrol_position" default="topleft" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_DESC" showon="show_fullscreencontrol:1" validate="options">
 				<option value="bottomleft">PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_BOTTOMLEFT</option>
 				<option value="bottomright">PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_BOTTOMRIGHT</option>
 				<option value="topleft">PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_TOPLEFT</option>
@@ -887,27 +348,12 @@
 			</field>
 			<field type="spacer" name="currentposition" hr="true" />
 
-			<field
-				name="show_currentposition"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_CURRENTPOSITION_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_CURRENTPOSITION_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-			>
+			<field name="show_currentposition" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_CURRENTPOSITION_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_CURRENTPOSITION_DESC" default="0">
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
 
-			<field
-				type="list"
-				name="currentposition_initialZoomLevel"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CURRENTPOSITION_INTITILZOOM_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CURRENTPOSITION_INTITILZOOM_DESC"
-				default="17"
-				showon="show_currentposition:1"
-				validate="options"
-			>
+			<field type="list" name="currentposition_initialZoomLevel" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CURRENTPOSITION_INTITILZOOM_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CURRENTPOSITION_INTITILZOOM_DESC" default="17" showon="show_currentposition:1" validate="options">
 				<option value="1">1</option>
 				<option value="2">2</option>
 				<option value="3">3</option>
@@ -929,15 +375,7 @@
 				<option value="19">19</option>
 			</field>
 
-			<field
-				type="list"
-				name="currentposition_position"
-				default="topleft"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_CURRENTPOSITION_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_CURRENTPOSITION_DESC"
-				showon="show_currentposition:1"
-				validate="options"
-			>
+			<field type="list" name="currentposition_position" default="topleft" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_CURRENTPOSITION_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_CURRENTPOSITION_DESC" showon="show_currentposition:1" validate="options">
 				<option value="bottomleft">PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_BOTTOMLEFT</option>
 				<option value="bottomright">PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_BOTTOMRIGHT</option>
 				<option value="topleft">PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_TOPLEFT</option>
@@ -946,49 +384,17 @@
 
 			<field type="spacer" name="omnivore" hr="true" />
 
-			<field
-				name="show_omnivore"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_OMNIVORE_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_OMNIVORE_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-			>
+			<field name="show_omnivore" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_OMNIVORE_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_OMNIVORE_DESC" default="0">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="omnivore_file"
-				type="filelist"
-				default=""
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_OMNIVORE_FILE_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_OMNIVORE_FILE_DESC"
-				directory="images/com_aggpxtrack"
-				filter="kml"
-				exclude=""
-				stripext=""
-				showon="show_omnivore:1"
-			/>
-
-			<field
-				name="omnivore_icon"
-				type="falist"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_DESC"
-				showon="show_omnivore:1"
-			>
+			<field name="omnivore_file" type="filelist" default="" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_OMNIVORE_FILE_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_OMNIVORE_FILE_DESC" directory="images/com_aggpxtrack" filter="kml" exclude="" stripext="" showon="show_omnivore:1" />
+
+			<field name="omnivore_icon" type="falist" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICON_DESC" showon="show_omnivore:1">
 			</field>
 
-			<field
-				name="omnivore_markercolor"
-				type="list"
-				default="red"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_DESC"
-				showon="show_omnivore:1"
-				validate="options"
-			>
+			<field name="omnivore_markercolor" type="list" default="red" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_MARKERCOLOR_DESC" showon="show_omnivore:1" validate="options">
 				<option value="red">red</option>
 				<option value="darkred">darkred</option>
 				<option value="orange">orange</option>
@@ -1001,175 +407,58 @@
 				<option value="cadetblue">cadetblue</option>
 			</field>
 
-			<field
-				name="omnivore_iconcolor"
-				type="color"
-				default="#ffffff"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_DESC"
-				showon="show_omnivore:1"
-			/>
-
-			<field
-				name="omnivore_extraclasses"
-				type="text"
-				default=""
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_DESC"
-				size="40"
-				showon="show_omnivore:1"
-			/>
-
-			<field
-				name="omnivore_spin"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-				showon="show_omnivore:1"
-			>
+			<field name="omnivore_iconcolor" type="color" default="#ffffff" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_ICONCOLOR_DESC" showon="show_omnivore:1" />
+
+			<field name="omnivore_extraclasses" type="text" default="" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_EXTRACLASSES_DESC" size="40" showon="show_omnivore:1" />
+
+			<field name="omnivore_spin" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_CUSTOMICONSTART_SPIN_DESC" default="0" showon="show_omnivore:1">
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
 
 			<field type="spacer" name="kilometerpointsspacer" hr="true" />
 
-			<field
-				name="show_kilometer_points"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_KILOMETERPOINTS_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_KILOMETERPOINTS_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-			>
+			<field name="show_kilometer_points" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_KILOMETERPOINTS_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_KILOMETERPOINTS_DESC" default="0">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				name="kilometer_point_color"
-				type="color"
-				default="#0000ff"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTCOLOR_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTCOLOR_DESC"
-				showon="show_kilometer_points:1"
-			/>
-
-			<field
-				name="kilometer_point_color_text"
-				type="color"
-				default="#ffffff"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTCOLORTEXT_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTCOLORTEXT_DESC"
-				showon="show_kilometer_points:1"
-			/>
-
-			<field
-				type="integer"
-				name="kilometer_point_intervall"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTINTERVALL_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTINTERVALL_DESC"
-				default="1"
-				first="1"
-				last="10"
-				step="1"
-				showon="show_kilometer_points:1"
-			/>
-
-			<field
-				type="integer"
-				name="kilometer_point_radius"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTRADIUS_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTRADIUS_DESC"
-				default="10"
-				first="1"
-				last="20"
-				step="1"
-				showon="show_kilometer_points:1"
-			/>
+			<field name="kilometer_point_color" type="color" default="#0000ff" label="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTCOLOR_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTCOLOR_DESC" showon="show_kilometer_points:1" />
+
+			<field name="kilometer_point_color_text" type="color" default="#ffffff" label="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTCOLORTEXT_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTCOLORTEXT_DESC" showon="show_kilometer_points:1" />
+
+			<field type="integer" name="kilometer_point_intervall" label="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTINTERVALL_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTINTERVALL_DESC" default="1" first="1" last="10" step="1" showon="show_kilometer_points:1" />
+
+			<field type="integer" name="kilometer_point_radius" label="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTRADIUS_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_KILOMETERPOINTRADIUS_DESC" default="10" first="1" last="20" step="1" showon="show_kilometer_points:1" />
 
 			<field type="spacer" name="easyPrint" hr="true" />
 
-			<field
-				name="show_easyprint"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_EASYPRINT_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_EASYPRINT_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-			>
+			<field name="show_easyprint" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_EASYPRINT_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_EASYPRINT_DESC" default="0">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field
-				type="list"
-				name="easyprint_position"
-				default="topleft"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_CURRENTPOSITION_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_CURRENTPOSITION_DESC"
-				showon="show_easyprint:1"
-				validate="options"
-			>
+			<field type="list" name="easyprint_position" default="topleft" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_CURRENTPOSITION_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_CURRENTPOSITION_DESC" showon="show_easyprint:1" validate="options">
 				<option value="bottomleft">PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_BOTTOMLEFT</option>
 				<option value="topleft">PLG_FIELDS_AGGPXTRACK_PARAMS_CONTROL_POSITION_TOPLEFT</option>
 			</field>
 
 			<field type="spacer" name="panelLayersSpacer" hr="true" />
 
-			<field
-				name="show_panelLayers"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_PANELLAYERS_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_PANELLAYERS_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-			>
+			<field name="show_panelLayers" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_PANELLAYERS_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_PANELLAYERS_DESC" default="0">
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
-			<field
-				name="panelLayers"
-				type="subform"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_PANELLAYERS_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_PANELLAYERS_DESC"
-				layout="joomla.form.field.subform.repeatable-table"
-				icon="list"
-				multiple="true"
-				showon="show_panelLayers:1"
-				validate="options"
-			>
+			<field name="panelLayers" type="subform" label="PLG_FIELDS_AGGPXTRACK_PARAMS_PANELLAYERS_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_PANELLAYERS_DESC" layout="joomla.form.field.subform.repeatable-table" icon="list" multiple="true" showon="show_panelLayers:1" validate="options">
 				<form hidden="true" name="list_templates_modal" repeat="true">
-					<field
-						name="name"
-						type="text"
-						description="PLG_FIELDS_AGGPXTRACK_PARAMS_PANELLAYERS_NAME_DESC"
-						default="Openstreetmap"
-						label="PLG_FIELDS_AGGPXTRACK_PARAMS_PANELLAYERS_NAME_LABEL"
-						size="30"
-					/>
-
-					<field
-						name="value"
-						type="text"
-						description="PLG_FIELDS_AGGPXTRACK_PARAMS_PANELLAYERS_LAYER_DESC"
-						default="http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-						label="PLG_FIELDS_AGGPXTRACK_PARAMS_PANELLAYERS_LAYER_LABEL"
-						size="30"
-					/>
+					<field name="name" type="text" description="PLG_FIELDS_AGGPXTRACK_PARAMS_PANELLAYERS_NAME_DESC" default="Openstreetmap" label="PLG_FIELDS_AGGPXTRACK_PARAMS_PANELLAYERS_NAME_LABEL" size="30" />
+
+					<field name="value" type="text" description="PLG_FIELDS_AGGPXTRACK_PARAMS_PANELLAYERS_LAYER_DESC" default="http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" label="PLG_FIELDS_AGGPXTRACK_PARAMS_PANELLAYERS_LAYER_LABEL" size="30" />
 				</form>
 			</field>
 			<field type="spacer" name="panelHideButton" hr="true" />
 
-			<field
-				name="show_inactivefirst"
-				type="radio"
-				label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_INACTIVEFIRST_LABEL"
-				description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_INACTIVEFIRST_DESC"
-				layout="joomla.form.field.radio.switcher"
-				default="0"
-			>
+			<field name="show_inactivefirst" type="list" label="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_INACTIVEFIRST_LABEL" description="PLG_FIELDS_AGGPXTRACK_PARAMS_SHOW_INACTIVEFIRST_DESC" default="0">
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
diff --git a/j4/pkg_aggpxtrack/src/plugins/fields/aggpxtrack/tmpl/aggpxtrack.php b/j4/pkg_aggpxtrack/src/plugins/fields/aggpxtrack/tmpl/aggpxtrack.php
index c2943a8..cdc5b8e 100644
--- a/j4/pkg_aggpxtrack/src/plugins/fields/aggpxtrack/tmpl/aggpxtrack.php
+++ b/j4/pkg_aggpxtrack/src/plugins/fields/aggpxtrack/tmpl/aggpxtrack.php
@@ -22,7 +22,10 @@
 	$class = ' class="' . htmlentities($class, ENT_COMPAT, 'UTF-8', true) . '"';
 }
 
-$value = (array) $field->value;
+$value_raw = $field->value;
+
+$value = (array) substr($value_raw, 0, strpos($value_raw, '#joomlaImage:'));
+
 $buffer = '';
 
 // Include skripts/styles to the header