diff --git a/Waymark.php b/Waymark.php
index 43c08984..2ac43138 100644
--- a/Waymark.php
+++ b/Waymark.php
@@ -4,7 +4,7 @@
 Plugin Name: Waymark
 Plugin URI: https://www.waymark.dev/
 Description: Mapping with WordPress made easy. With Waymark enabled, click on the "Maps" link in the sidebar to create and edit Maps. Once you are happy with your Map, copy the Waymark shortcode and add it to your content.
-Version: 1.4.2
+Version: 1.4.3
 Text Domain: waymark
 Author: Joe Hawes
 Author URI: https://www.morehawes.ca/
diff --git a/assets/js/admin.min.js b/assets/js/admin.min.js
index 37e1511b..b85d3f10 100644
--- a/assets/js/admin.min.js
+++ b/assets/js/admin.min.js
@@ -1 +1 @@
-function waymark_setup_map_export(){jQuery(".waymark-map-export, .waymark-collection-export").each((function(){var a=jQuery(this);if(a){var e=a.parents(".waymark-shortcode");if(e.length)var t=jQuery(".waymark-map",e);else t=jQuery(".waymark-map");var r=a.parents(".waymark-meta-export_data");if(r.length||(r=a.parent("div")),"FORM"!=a.get(0).tagName){for(var n=jQuery("<form>").append(a.contents()),i=a.get(0).attributes,o=i.length-1;o>=0;o--)n.attr(i[o].name,i[o].value);a.replaceWith(n),a=n}var s=jQuery('input[name="map_data"]',a),u=t.data("Waymark");void 0!==u&&u.map.on("layerremove layeradd",(function(){var a=0;u.map_data.eachLayer((function(e){u.map.hasLayer(e)&&a++})),a>0?r.show():r.hide()})),a.on("submit",(function(e){var r=jQuery("select",a),n=r.val()?r.val():"geojson",i=Waymark_L.layerGroup();(u=t.data("Waymark")).map_data.eachLayer((function(a){for(key in a.feature.properties)if(void 0!==a.feature.properties[key]?"title"==key&&"kml"==n&&(a.feature.properties.name=a.feature.properties[key],delete a.feature.properties[key]):delete a.feature.properties[key],"description"==key&&void 0!==a.feature.properties.description){var e=a.feature.properties.description,t=e.indexOf('<div class="waymark-description-link');-1!==t&&(e=e.substring(0,t)),e=e.replace("'","&apos;"),a.feature.properties.description=e}i.addLayer(a)}));var o=i.toGeoJSON();switch(r.val()){case"gpx":var y=togpx(o);break;case"kml":y=tokml(o);break;default:case"geojson":y=JSON.stringify(o)}s.val(encodeURIComponent(y))}))}}))}function waymark_setup_parameter_tooltips(){jQuery("a.waymark-tooltip").on({mouseenter:function(a){var e=jQuery(this).data("title");jQuery('<p id="waymark-tooltip-active"></p>').text(e).appendTo("body").fadeIn("slow")},mouseleave:function(a){jQuery("#waymark-tooltip-active").remove()},mousemove:function(a){if(waymark_is_touch_device())var e=a.pageX-250;else e=a.pageX-220;var t=a.pageY+5;jQuery("#waymark-tooltip-active").css({top:t,left:e})}})}function waymark_is_touch_device(){var a=" -webkit- -moz- -o- -ms- ".split(" ");return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)||function(a){return window.matchMedia(a).matches}(["(",a.join("touch-enabled),("),"heartz",")"].join(""))}function waymark_setup_accordions(){var a=jQuery(".waymark-accordion-container");a.length&&(a.addClass("waymark-self-clear"),a.each((function(){var a=0;jQuery(".waymark-accordion-group",jQuery(this)).each((function(){jQuery(this).addClass("waymark-self-clear"),jQuery(this).data("waymark-index",a);var e=jQuery(".waymark-accordion-group-content",jQuery(this));0==a?(jQuery(this).addClass("waymark-first"),e.show().addClass(a)):e.hide().addClass(a),jQuery("legend",jQuery(this)).each((function(){var a=jQuery(this).html();-1==a.indexOf("[+]")&&jQuery(this).html(a+" <span>[+]</span>"),jQuery(this).click((function(){var a=jQuery(this).parents(".waymark-accordion-group").data("waymark-index");jQuery(".waymark-accordion-group",jQuery(this).parents(".waymark-accordion-container")).each((function(){jQuery(this).data("waymark-index")==a?jQuery(".waymark-accordion-group-content",jQuery(this)).slideDown():jQuery(".waymark-accordion-group-content",jQuery(this)).slideUp()}))}))})),a++}))})))}function waymark_setup_map_editor(a={}){if(!a.map||!wp.editor||!wp.media)return void a.message("waymark_editor.map/wp.editor/wp.media not available","error");a.debug("Admin Editor Integrations"),jQuery(".waymark-edit-toolbar a.waymark-edit-upload").removeClass("waymark-hidden");const e=jQuery(".waymark-edit-toolbar a.waymark-edit-image");e.length&&void 0!==wp.media&&(a.debug("Enabling Media Library for Image Uploads"),e.removeClass("waymark-hidden"),e.on("click",(function(a){return a.preventDefault(),wp.media.editor.send.attachment=function(a,e){if(void 0===e.url)return!1;var t=new FormData;t.append("waymark_security",waymark_security),t.append("action","waymark_get_attatchment_meta"),t.append("attachment_id",e.id),jQuery.ajax({type:"POST",url:waymark_js.ajaxurl,data:t,dataType:"json",processData:!1,contentType:!1,success:function(a){if(Waymark.debug("waymark_get_attatchment_meta"),null!==a){var t=Waymark.map.getCenter();(latlng=Waymark.get_exif_latlng(a))&&(t=latlng,Waymark.map.setView(t));var r=Waymark.get_image_sizes(e.sizes,e.url),n=Waymark.create_marker_json(t,r);Waymark.map_data.addData(n),Waymark.map_was_edited()}else Waymark.message(waymark_js.lang.error_photo_meta,"error")}})},wp.media.editor.open(),!1}))),a.map.on("popupopen",(function(e){const t=e.popup._source.feature,r=jQuery(".waymark-map .waymark-info").first(),n=jQuery(".waymark-info-image_large_url .button",r);n.length&&(a.debug("Popup Media Library Integration"),n.removeClass("waymark-hidden"),n.on("click",(function(e){return e.preventDefault(),wp.media.editor.send.attachment=function(e,n){if(void 0===n.url)return!1;var i=Waymark.get_image_sizes(n.sizes,n.url);t.properties=Object.assign({},t.properties,i),jQuery(".waymark-info-image_large_url",r).find("a").attr("href",t.properties.image_large_url).end().find("img").attr("src",t.properties.image_thumbnail_url).end().find("input").val(t.properties.image_large_url),a.map_was_edited()},wp.media.editor.open(),!1}))),setTimeout((function(){a.debug("Popup Rich Text Editor Integration"),wp.editor.initialize("waymark-info-description",{tinymce:{toolbar1:"styleselect | bullist numlist | link image",setup:function(e){e.on("change",(function(e){t.properties.description=wp.editor.getContent("waymark-info-description"),a.map_was_edited()}))}}})}),200)})),a.map.on("popupclose",(function(a){wp.editor.remove("waymark-info-description"),jQuery("#waymark-info-description").show()}))}function waymark_setup_colour_pickers(){jQuery(".waymark-colour-picker .waymark-input").wpColorPicker()}function waymark_setup_repeatable_settings(){jQuery(".waymark-settings-tab .waymark-repeatable").each((function(){var a=jQuery(this);jQuery(".form-table",a).each((function(){var e=jQuery(this),t=[];for(e.remove(),jQuery(".waymark-input",e).each((function(){var a=jQuery(this);if(a.addClass("waymark-"+a.data("id")),"SELECT"!=a.get(0).nodeName)var e=a.val();else e=a.data("multi-value");for(i in"string"!=typeof e&&(e=e.toString()),e=e.split(waymark_multi_value_seperator))"object"!=typeof t[i]&&(t[i]={}),t[i][a.data("id")]=e[i]})),i=0;i<t.length;i++){var r=e.clone();for(var n in t[i]){var o=t[i][n],s=jQuery(".waymark-input-"+n,r);s.attr("name",s.attr("name")+"["+i+"]"),"SELECT"!=s.get(0).nodeName||jQuery("option[value='"+t[i][n]+"']",s).length||(o=jQuery("option",s).first().val()),s.attr("value",o).val(o),s.parents(".waymark-control-group").hasClass("waymark-uneditable")&&s.attr("readonly","readonly")}var u=jQuery("<div />").text("x").attr("title",waymark_php_lang.repeatable_delete_title).addClass("waymark-delete").on("click",(function(a){return a.preventDefault(),jQuery(this).parents(".form-table").remove(),!1}));r.append(u),a.append(r),a.attr("data-count",i),waymark_setup_parameter_tooltips()}var y=jQuery("<button />").html('<i class="ion ion-plus"></i>').addClass("button waymark-add").on("click",(function(a){a.preventDefault();var t=jQuery(this).parents(".waymark-repeatable"),r=parseInt(t.attr("data-count"))+1;t.attr("data-count",r);var n=e.clone();return jQuery(".waymark-input",n).each((function(){var a=jQuery(this),e=a.attr("name")+"["+r+"]";switch(a.attr("name",e),a.attr("placeholder",""),"SELECT"!=a.get(0).nodeName&&a.val(""),a.data("id")){case"line_colour":case"shape_colour":case"icon_colour":case"marker_colour":a.wpColorPicker();break;case"meta_options":a.parents("tr").hide()}})),jQuery(this).before(n),waymark_setup_parameter_tooltips(),waymark_setup_select_meta_type(),waymark_setup_select_icon_type(),!1}));a.append(y),a.sortable()}))}))}function waymark_setup_marker_tab(){jQuery(".waymark-input.waymark-marker_icon").each((function(){var a=jQuery(this),e="";0===a.val().indexOf("ion-")?e+="ion "+a.val():0===a.val().indexOf("fa-")?e+="fa "+a.val():e+="ion ion-"+a.val();var t=jQuery("<i />").addClass(e);a.parents(".waymark-controls").prepend(t)}));var a=jQuery(".waymark-input.waymark-marker_colour");if("function"==typeof Waymark_Map){var e=new Waymark_Map;a.each((function(){jQuery(this).val(e.get_marker_background(jQuery(this).val())),jQuery(this).wpColorPicker()}))}}function waymark_setup_external_links(){jQuery(".waymark-settings-tab a,#waymark_map_meta a").each((function(){location.hostname!==this.hostname&&this.hostname.length&&void 0===jQuery(this).attr("target")&&jQuery(this).attr("target","_blank")}))}function waymark_setup_select_meta_type(){jQuery("select.waymark-meta_type").each((function(){var a=jQuery(this),e=a.parents(".form-table"),t=jQuery(".waymark-input.waymark-meta_options",e).parents("tr");"select"==a.val()||"select_multi"==a.val()?t.show():t.hide(),a.change((function(){"select"==a.val()||"select_multi"==a.val()?t.show():t.hide()}))}))}function waymark_setup_select_icon_type(){jQuery("select.waymark-icon_type").each((function(){var a=jQuery(this),e=a.parents(".form-table"),t=jQuery(".waymark-input.waymark-icon_colour",e).parents("tr"),r=jQuery(".waymark-input.waymark-marker_icon",e),n=r.parents("tr"),i=jQuery(".waymark-icon-type",n),o=jQuery(".waymark-controls i",n),s=jQuery(".waymark-icons-help",n),u=jQuery(".waymark-tooltip",n),y=u.attr("data-title").split("|"),m=function(a){switch(a){case"icon":o.show(),s.show(),t.show(),r.css("maxWidth","unset"),i.text(waymark_php_lang.marker_icon_icon_label),u.data("title",y[0]);break;case"text":o.hide(),s.hide(),t.show(),r.css("maxWidth","45px"),i.text(waymark_php_lang.marker_icon_text_label),u.data("title",y[1]);break;case"html":o.hide(),s.hide(),t.hide(),r.css("maxWidth","unset"),i.text(waymark_php_lang.marker_icon_html_label),u.data("title",y[2])}waymark_setup_parameter_tooltips()};m(a.val()),a.change((function(){m(a.val())}))}))}function waymark_setup_dropdowns(){jQuery(".waymark-parameters-container").each((function(){var a=jQuery(this);jQuery("select",a).each((function(){var e="waymark-dropdown-"+jQuery(this).data("id")+"-";e+=jQuery(this).val(),a.addClass(e),jQuery(this).on("change",(function(){var e="waymark-dropdown-"+jQuery(this).data("id")+"-";jQuery("option",jQuery(this)).each((function(){a.removeClass(e+jQuery(this).attr("value"))})),e+=jQuery(this).val(),a.addClass(e)}))}))}))}function waymark_setup_settings_nav(){var a=jQuery("body.wp-admin.waymark_page_waymark-settings #waymark-settings-nav");if(!a)return!1;var e=jQuery("#waymark-admin-container"),t=jQuery("form",e),r=(jQuery(".waymark-settings-tab",e),a.data("init_tab_key")),n=jQuery("select",a);n.hover((function(){jQuery(this).attr("size",jQuery("option",jQuery(this)).length)}),(function(){jQuery(this).removeAttr("size")})),n.change((function(){n.removeAttr("size");var a=jQuery(this).val();e.attr("class","");var i=jQuery('input[name="_wp_http_referer"]',t),o=document.location.toString();o=o.indexOf("content=")>0?o.replace("content="+r,"content="+a):o+"&content="+a,i.val(o);jQuery("."+a).first();jQuery(".waymark-settings-tab").each((function(){var t=jQuery(this);t.hide(),a.indexOf("settings-tab")&&t.hasClass(a)&&(t.show(),e.addClass("waymark-active-"+a)),jQuery(".waymark-settings-section",t).each((function(){var r=jQuery(this);a.indexOf("settings-tab")>0?r.show():a.indexOf("settings-section")>0&&(r.hide(),r.hasClass(a)&&(t.show(),r.show(),e.addClass("waymark-active-"+a)))}))}))})),n.trigger("change")}function waymark_handle_repeatable_clone(a){if(!(!a instanceof jQuery)){a.parents(".waymark-form");return a}}function waymark_setup_repeatable_parameters(){jQuery(".waymark-repeatable-container").each((function(){var a=jQuery(this),e=a.data("count"),t=jQuery(".waymark-repeatable-template",a);t.removeClass("waymark-repeatable-template"),t.remove(),jQuery(".waymark-parameters-container",a).each((function(){var a=jQuery(this),e=jQuery("<button />").html('<i class="ion ion-android-delete"></i>').addClass("button waymark-delete").on("click",(function(e){e.preventDefault(),a.remove()}));a.append(e)}));var r=jQuery(".waymark-repeatable-add",a).first();r.on("click",(function(n){n.preventDefault();var i=t.clone();return jQuery(".waymark-input",i).each((function(){var a=jQuery(this);a.attr("name",a.attr("name").replace("__count__",e))})),jQuery(".waymark-control-label",i).each((function(){var a=jQuery(this);a.attr("for",a.attr("for").replace("__count__",e))})),r.before(i),i=waymark_handle_repeatable_clone(i),waymark_setup_dropdowns(),a.data("count",++e),!1}))}))}function waymark_admin_message(a=null,e="info",t="#wpbody-content"){if(a){var r="";void 0!==waymark_admin_js.lang[e+"_message_prefix"]&&(r=waymark_admin_js.lang[e+"_message_prefix"]),r&&(r="<b>["+r+"]</b> ");var n=r+a,i=jQuery(t).first();if(i.length){jQuery(".waymark-notice",i).each((function(){jQuery(this).remove()}));var o=jQuery("<div />").attr({class:"waymark-notice notice notice-"+e}),s=jQuery("<p />").html(n);o.append(s),i.prepend(o)}else alert(n)}}jQuery(document).ready((function(){waymark_setup_parameter_tooltips(),waymark_setup_map_export(),waymark_setup_accordions()})),jQuery(document).ready((function(){waymark_setup_settings_nav(),waymark_setup_repeatable_settings(),waymark_setup_marker_tab(),waymark_setup_colour_pickers(),waymark_setup_external_links(),waymark_setup_select_meta_type(),waymark_setup_select_icon_type(),waymark_setup_dropdowns()}));
\ No newline at end of file
+function waymark_setup_map_export(){jQuery(".waymark-map-export, .waymark-collection-export").each((function(){var a=jQuery(this);if(a){var e=a.parents(".waymark-shortcode");if(e.length)var t=jQuery(".waymark-map",e);else t=jQuery(".waymark-map");var r=a.parents(".waymark-meta-export_data");if(r.length||(r=a.parent("div")),"FORM"!=a.get(0).tagName){for(var n=jQuery("<form>").append(a.contents()),i=a.get(0).attributes,o=i.length-1;o>=0;o--)n.attr(i[o].name,i[o].value);a.replaceWith(n),a=n}var s=jQuery('input[name="map_data"]',a),u=t.data("Waymark");void 0!==u&&u.map.on("layerremove layeradd",(function(){var a=0;u.map_data.eachLayer((function(e){u.map.hasLayer(e)&&a++})),a>0?r.show():r.hide()})),a.on("submit",(function(e){var r=jQuery("select",a),n=r.val()?r.val():"geojson",i=Waymark_L.layerGroup();(u=t.data("Waymark")).map_data.eachLayer((function(a){for(key in a.feature.properties)if(void 0!==a.feature.properties[key]?"title"==key&&"kml"==n&&(a.feature.properties.name=a.feature.properties[key],delete a.feature.properties[key]):delete a.feature.properties[key],"description"==key&&void 0!==a.feature.properties.description){var e=a.feature.properties.description,t=e.indexOf('<div class="waymark-description-link');-1!==t&&(e=e.substring(0,t)),e=e.replace("'","&apos;"),a.feature.properties.description=e}i.addLayer(a)}));var o=i.toGeoJSON();switch(r.val()){case"gpx":const e={metadata:{}};var m=jQuery('input[name="map_title"]',a).val();m&&(e.metadata.name=m);var y=togpx(o,e);break;case"kml":y=tokml(o);break;default:case"geojson":y=JSON.stringify(o)}s.val(encodeURIComponent(y))}))}}))}function waymark_setup_parameter_tooltips(){jQuery("a.waymark-tooltip").on({mouseenter:function(a){var e=jQuery(this).data("title");jQuery('<p id="waymark-tooltip-active"></p>').text(e).appendTo("body").fadeIn("slow")},mouseleave:function(a){jQuery("#waymark-tooltip-active").remove()},mousemove:function(a){if(waymark_is_touch_device())var e=a.pageX-250;else e=a.pageX-220;var t=a.pageY+5;jQuery("#waymark-tooltip-active").css({top:t,left:e})}})}function waymark_is_touch_device(){var a=" -webkit- -moz- -o- -ms- ".split(" ");return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)||function(a){return window.matchMedia(a).matches}(["(",a.join("touch-enabled),("),"heartz",")"].join(""))}function waymark_setup_accordions(){var a=jQuery(".waymark-accordion-container");a.length&&(a.addClass("waymark-self-clear"),a.each((function(){var a=0;jQuery(".waymark-accordion-group",jQuery(this)).each((function(){jQuery(this).addClass("waymark-self-clear"),jQuery(this).data("waymark-index",a);var e=jQuery(".waymark-accordion-group-content",jQuery(this));0==a?(jQuery(this).addClass("waymark-first"),e.show().addClass(a)):e.hide().addClass(a),jQuery("legend",jQuery(this)).each((function(){var a=jQuery(this).html();-1==a.indexOf("[+]")&&jQuery(this).html(a+" <span>[+]</span>"),jQuery(this).click((function(){var a=jQuery(this).parents(".waymark-accordion-group").data("waymark-index");jQuery(".waymark-accordion-group",jQuery(this).parents(".waymark-accordion-container")).each((function(){jQuery(this).data("waymark-index")==a?jQuery(".waymark-accordion-group-content",jQuery(this)).slideDown():jQuery(".waymark-accordion-group-content",jQuery(this)).slideUp()}))}))})),a++}))})))}function waymark_setup_map_editor(a={}){if(!a.map||!wp.editor||!wp.media)return void a.message("waymark_editor.map/wp.editor/wp.media not available","error");a.debug("Admin Editor Integrations"),jQuery(".waymark-edit-toolbar a.waymark-edit-upload").removeClass("waymark-hidden");const e=jQuery(".waymark-edit-toolbar a.waymark-edit-image");e.length&&void 0!==wp.media&&(a.debug("Enabling Media Library for Image Uploads"),e.removeClass("waymark-hidden"),e.on("click",(function(a){return a.preventDefault(),wp.media.editor.send.attachment=function(a,e){if(void 0===e.url)return!1;var t=new FormData;t.append("waymark_security",waymark_security),t.append("action","waymark_get_attatchment_meta"),t.append("attachment_id",e.id),jQuery.ajax({type:"POST",url:waymark_js.ajaxurl,data:t,dataType:"json",processData:!1,contentType:!1,success:function(a){if(Waymark.debug("waymark_get_attatchment_meta"),null!==a){var t=Waymark.map.getCenter();(latlng=Waymark.get_exif_latlng(a))&&(t=latlng,Waymark.map.setView(t));var r=Waymark.get_image_sizes(e.sizes,e.url),n=Waymark.create_marker_json(t,r);Waymark.map_data.addData(n),Waymark.map_was_edited()}else Waymark.message(waymark_js.lang.error_photo_meta,"error")}})},wp.media.editor.open(),!1}))),a.map.on("popupopen",(function(e){const t=e.popup._source.feature,r=jQuery(".waymark-map .waymark-info").first(),n=jQuery(".waymark-info-image_large_url .button",r);n.length&&(a.debug("Popup Media Library Integration"),n.removeClass("waymark-hidden"),n.on("click",(function(e){return e.preventDefault(),wp.media.editor.send.attachment=function(e,n){if(void 0===n.url)return!1;var i=Waymark.get_image_sizes(n.sizes,n.url);t.properties=Object.assign({},t.properties,i),jQuery(".waymark-info-image_large_url",r).find("a").attr("href",t.properties.image_large_url).end().find("img").attr("src",t.properties.image_thumbnail_url).end().find("input").val(t.properties.image_large_url),a.map_was_edited()},wp.media.editor.open(),!1}))),setTimeout((function(){a.debug("Popup Rich Text Editor Integration"),wp.editor.initialize("waymark-info-description",{tinymce:{toolbar1:"styleselect | bullist numlist | link image",setup:function(e){e.on("change",(function(e){t.properties.description=wp.editor.getContent("waymark-info-description"),a.map_was_edited()}))}}})}),200)})),a.map.on("popupclose",(function(a){wp.editor.remove("waymark-info-description"),jQuery("#waymark-info-description").show()}))}function waymark_setup_colour_pickers(){jQuery(".waymark-colour-picker .waymark-input").wpColorPicker()}function waymark_setup_repeatable_settings(){jQuery(".waymark-settings-tab .waymark-repeatable").each((function(){var a=jQuery(this);jQuery(".form-table",a).each((function(){var e=jQuery(this),t=[];for(e.remove(),jQuery(".waymark-input",e).each((function(){var a=jQuery(this);if(a.addClass("waymark-"+a.data("id")),"SELECT"!=a.get(0).nodeName)var e=a.val();else e=a.data("multi-value");for(i in"string"!=typeof e&&(e=e.toString()),e=e.split(waymark_multi_value_seperator))"object"!=typeof t[i]&&(t[i]={}),t[i][a.data("id")]=e[i]})),i=0;i<t.length;i++){var r=e.clone();for(var n in t[i]){var o=t[i][n],s=jQuery(".waymark-input-"+n,r);s.attr("name",s.attr("name")+"["+i+"]"),"SELECT"!=s.get(0).nodeName||jQuery("option[value='"+t[i][n]+"']",s).length||(o=jQuery("option",s).first().val()),s.attr("value",o).val(o),s.parents(".waymark-control-group").hasClass("waymark-uneditable")&&s.attr("readonly","readonly")}var u=jQuery("<div />").text("x").attr("title",waymark_php_lang.repeatable_delete_title).addClass("waymark-delete").on("click",(function(a){return a.preventDefault(),jQuery(this).parents(".form-table").remove(),!1}));r.append(u),a.append(r),a.attr("data-count",i),waymark_setup_parameter_tooltips()}var m=jQuery("<button />").html('<i class="ion ion-plus"></i>').addClass("button waymark-add").on("click",(function(a){a.preventDefault();var t=jQuery(this).parents(".waymark-repeatable"),r=parseInt(t.attr("data-count"))+1;t.attr("data-count",r);var n=e.clone();return jQuery(".waymark-input",n).each((function(){var a=jQuery(this),e=a.attr("name")+"["+r+"]";switch(a.attr("name",e),a.attr("placeholder",""),"SELECT"!=a.get(0).nodeName&&a.val(""),a.data("id")){case"line_colour":case"shape_colour":case"icon_colour":case"marker_colour":a.wpColorPicker();break;case"meta_options":a.parents("tr").hide()}})),jQuery(this).before(n),waymark_setup_parameter_tooltips(),waymark_setup_select_meta_type(),waymark_setup_select_icon_type(),!1}));a.append(m),a.sortable()}))}))}function waymark_setup_marker_tab(){jQuery(".waymark-input.waymark-marker_icon").each((function(){var a=jQuery(this),e="";0===a.val().indexOf("ion-")?e+="ion "+a.val():0===a.val().indexOf("fa-")?e+="fa "+a.val():e+="ion ion-"+a.val();var t=jQuery("<i />").addClass(e);a.parents(".waymark-controls").prepend(t)}));var a=jQuery(".waymark-input.waymark-marker_colour");if("function"==typeof Waymark_Map){var e=new Waymark_Map;a.each((function(){jQuery(this).val(e.get_marker_background(jQuery(this).val())),jQuery(this).wpColorPicker()}))}}function waymark_setup_external_links(){jQuery(".waymark-settings-tab a,#waymark_map_meta a").each((function(){location.hostname!==this.hostname&&this.hostname.length&&void 0===jQuery(this).attr("target")&&jQuery(this).attr("target","_blank")}))}function waymark_setup_select_meta_type(){jQuery("select.waymark-meta_type").each((function(){var a=jQuery(this),e=a.parents(".form-table"),t=jQuery(".waymark-input.waymark-meta_options",e).parents("tr");"select"==a.val()||"select_multi"==a.val()?t.show():t.hide(),a.change((function(){"select"==a.val()||"select_multi"==a.val()?t.show():t.hide()}))}))}function waymark_setup_select_icon_type(){jQuery("select.waymark-icon_type").each((function(){var a=jQuery(this),e=a.parents(".form-table"),t=jQuery(".waymark-input.waymark-icon_colour",e).parents("tr"),r=jQuery(".waymark-input.waymark-marker_icon",e),n=r.parents("tr"),i=jQuery(".waymark-icon-type",n),o=jQuery(".waymark-controls i",n),s=jQuery(".waymark-icons-help",n),u=jQuery(".waymark-tooltip",n),m=u.attr("data-title").split("|"),y=function(a){switch(a){case"icon":o.show(),s.show(),t.show(),r.css("maxWidth","unset"),i.text(waymark_php_lang.marker_icon_icon_label),u.data("title",m[0]);break;case"text":o.hide(),s.hide(),t.show(),r.css("maxWidth","45px"),i.text(waymark_php_lang.marker_icon_text_label),u.data("title",m[1]);break;case"html":o.hide(),s.hide(),t.hide(),r.css("maxWidth","unset"),i.text(waymark_php_lang.marker_icon_html_label),u.data("title",m[2])}waymark_setup_parameter_tooltips()};y(a.val()),a.change((function(){y(a.val())}))}))}function waymark_setup_dropdowns(){jQuery(".waymark-parameters-container").each((function(){var a=jQuery(this);jQuery("select",a).each((function(){var e="waymark-dropdown-"+jQuery(this).data("id")+"-";e+=jQuery(this).val(),a.addClass(e),jQuery(this).on("change",(function(){var e="waymark-dropdown-"+jQuery(this).data("id")+"-";jQuery("option",jQuery(this)).each((function(){a.removeClass(e+jQuery(this).attr("value"))})),e+=jQuery(this).val(),a.addClass(e)}))}))}))}function waymark_setup_settings_nav(){var a=jQuery("body.wp-admin.waymark_page_waymark-settings #waymark-settings-nav");if(!a)return!1;var e=jQuery("#waymark-admin-container"),t=jQuery("form",e),r=(jQuery(".waymark-settings-tab",e),a.data("init_tab_key")),n=jQuery("select",a);n.hover((function(){jQuery(this).attr("size",jQuery("option",jQuery(this)).length)}),(function(){jQuery(this).removeAttr("size")})),n.change((function(){n.removeAttr("size");var a=jQuery(this).val();e.attr("class","");var i=jQuery('input[name="_wp_http_referer"]',t),o=document.location.toString();o=o.indexOf("content=")>0?o.replace("content="+r,"content="+a):o+"&content="+a,i.val(o);jQuery("."+a).first();jQuery(".waymark-settings-tab").each((function(){var t=jQuery(this);t.hide(),a.indexOf("settings-tab")&&t.hasClass(a)&&(t.show(),e.addClass("waymark-active-"+a)),jQuery(".waymark-settings-section",t).each((function(){var r=jQuery(this);a.indexOf("settings-tab")>0?r.show():a.indexOf("settings-section")>0&&(r.hide(),r.hasClass(a)&&(t.show(),r.show(),e.addClass("waymark-active-"+a)))}))}))})),n.trigger("change")}function waymark_handle_repeatable_clone(a){if(!(!a instanceof jQuery)){a.parents(".waymark-form");return a}}function waymark_setup_repeatable_parameters(){jQuery(".waymark-repeatable-container").each((function(){var a=jQuery(this),e=a.data("count"),t=jQuery(".waymark-repeatable-template",a);t.removeClass("waymark-repeatable-template"),t.remove(),jQuery(".waymark-parameters-container",a).each((function(){var a=jQuery(this),e=jQuery("<button />").html('<i class="ion ion-android-delete"></i>').addClass("button waymark-delete").on("click",(function(e){e.preventDefault(),a.remove()}));a.append(e)}));var r=jQuery(".waymark-repeatable-add",a).first();r.on("click",(function(n){n.preventDefault();var i=t.clone();return jQuery(".waymark-input",i).each((function(){var a=jQuery(this);a.attr("name",a.attr("name").replace("__count__",e))})),jQuery(".waymark-control-label",i).each((function(){var a=jQuery(this);a.attr("for",a.attr("for").replace("__count__",e))})),r.before(i),i=waymark_handle_repeatable_clone(i),waymark_setup_dropdowns(),a.data("count",++e),!1}))}))}function waymark_admin_message(a=null,e="info",t="#wpbody-content"){if(a){var r="";void 0!==waymark_admin_js.lang[e+"_message_prefix"]&&(r=waymark_admin_js.lang[e+"_message_prefix"]),r&&(r="<b>["+r+"]</b> ");var n=r+a,i=jQuery(t).first();if(i.length){jQuery(".waymark-notice",i).each((function(){jQuery(this).remove()}));var o=jQuery("<div />").attr({class:"waymark-notice notice notice-"+e}),s=jQuery("<p />").html(n);o.append(s),i.prepend(o)}else alert(n)}}jQuery(document).ready((function(){waymark_setup_parameter_tooltips(),waymark_setup_map_export(),waymark_setup_accordions()})),jQuery(document).ready((function(){waymark_setup_settings_nav(),waymark_setup_repeatable_settings(),waymark_setup_marker_tab(),waymark_setup_colour_pickers(),waymark_setup_external_links(),waymark_setup_select_meta_type(),waymark_setup_select_icon_type(),waymark_setup_dropdowns()}));
\ No newline at end of file
diff --git a/assets/js/front.min.js b/assets/js/front.min.js
index 1938f8ec..1429f5e7 100644
--- a/assets/js/front.min.js
+++ b/assets/js/front.min.js
@@ -1 +1 @@
-function waymark_setup_map_export(){jQuery(".waymark-map-export, .waymark-collection-export").each((function(){var a=jQuery(this);if(a){var e=a.parents(".waymark-shortcode");if(e.length)var r=jQuery(".waymark-map",e);else r=jQuery(".waymark-map");var t=a.parents(".waymark-meta-export_data");if(t.length||(t=a.parent("div")),"FORM"!=a.get(0).tagName){for(var o=jQuery("<form>").append(a.contents()),n=a.get(0).attributes,i=n.length-1;i>=0;i--)o.attr(n[i].name,n[i].value);a.replaceWith(o),a=o}var u=jQuery('input[name="map_data"]',a),y=r.data("Waymark");void 0!==y&&y.map.on("layerremove layeradd",(function(){var a=0;y.map_data.eachLayer((function(e){y.map.hasLayer(e)&&a++})),a>0?t.show():t.hide()})),a.on("submit",(function(e){var t=jQuery("select",a),o=t.val()?t.val():"geojson",n=Waymark_L.layerGroup();(y=r.data("Waymark")).map_data.eachLayer((function(a){for(key in a.feature.properties)if(void 0!==a.feature.properties[key]?"title"==key&&"kml"==o&&(a.feature.properties.name=a.feature.properties[key],delete a.feature.properties[key]):delete a.feature.properties[key],"description"==key&&void 0!==a.feature.properties.description){var e=a.feature.properties.description,r=e.indexOf('<div class="waymark-description-link');-1!==r&&(e=e.substring(0,r)),e=e.replace("'","&apos;"),a.feature.properties.description=e}n.addLayer(a)}));var i=n.toGeoJSON();switch(t.val()){case"gpx":var s=togpx(i);break;case"kml":s=tokml(i);break;default:case"geojson":s=JSON.stringify(i)}u.val(encodeURIComponent(s))}))}}))}function waymark_setup_parameter_tooltips(){jQuery("a.waymark-tooltip").on({mouseenter:function(a){var e=jQuery(this).data("title");jQuery('<p id="waymark-tooltip-active"></p>').text(e).appendTo("body").fadeIn("slow")},mouseleave:function(a){jQuery("#waymark-tooltip-active").remove()},mousemove:function(a){if(waymark_is_touch_device())var e=a.pageX-250;else e=a.pageX-220;var r=a.pageY+5;jQuery("#waymark-tooltip-active").css({top:r,left:e})}})}function waymark_is_touch_device(){var a=" -webkit- -moz- -o- -ms- ".split(" ");return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)||function(a){return window.matchMedia(a).matches}(["(",a.join("touch-enabled),("),"heartz",")"].join(""))}function waymark_setup_accordions(){var a=jQuery(".waymark-accordion-container");a.length&&(a.addClass("waymark-self-clear"),a.each((function(){var a=0;jQuery(".waymark-accordion-group",jQuery(this)).each((function(){jQuery(this).addClass("waymark-self-clear"),jQuery(this).data("waymark-index",a);var e=jQuery(".waymark-accordion-group-content",jQuery(this));0==a?(jQuery(this).addClass("waymark-first"),e.show().addClass(a)):e.hide().addClass(a),jQuery("legend",jQuery(this)).each((function(){var a=jQuery(this).html();-1==a.indexOf("[+]")&&jQuery(this).html(a+" <span>[+]</span>"),jQuery(this).click((function(){var a=jQuery(this).parents(".waymark-accordion-group").data("waymark-index");jQuery(".waymark-accordion-group",jQuery(this).parents(".waymark-accordion-container")).each((function(){jQuery(this).data("waymark-index")==a?jQuery(".waymark-accordion-group-content",jQuery(this)).slideDown():jQuery(".waymark-accordion-group-content",jQuery(this)).slideUp()}))}))})),a++}))})))}function waymark_setup_map_editor(a={}){if(!a.map)return void a.message("waymark_editor.map not available","error");jQuery(".waymark-edit-toolbar a.waymark-edit-upload").removeClass("waymark-hidden");const e=jQuery(".waymark-edit-toolbar a.waymark-edit-image");e.length&&(a.debug("Enabling Front-End Image Uploads."),e.removeClass("waymark-hidden"),e.on("click",(function(e){e.preventDefault();var r=jQuery("<input />").attr({type:"file",name:"add_photo"}).css("display","none").change((function(){a.handle_file_upload(jQuery(this))}));return jQuery("#waymark-edit-toolbar").append(r),r.trigger("click"),!1}))),a.map.on("popupopen",(function(e){const r=e.popup._source.feature,t=jQuery(".waymark-map .waymark-info").first(),o=jQuery(".waymark-info-image_large_url .button",t);o.length&&(o.removeClass("waymark-hidden"),o.on("click",(function(e){e.preventDefault();var o=jQuery("<input />").attr({type:"file",name:"marker_photo"}).css("display","none").change((function(){a.handle_file_upload(jQuery(this),{feature:r,img_view:jQuery(".waymark-info-image_large_url a",t),img_input:jQuery(".waymark-info-image_large_url input",t)})}));return t.append(o),o.trigger("click"),!1})))}))}function waymark_setup_map_shortcode(){jQuery(".waymark-shortcode").each((function(){var a=jQuery(this);jQuery(".waymark-header",a).each((function(){var e=jQuery(this),r=jQuery(".waymark-link",e).first(),t=jQuery(".waymark-meta",e);if(t.length){var o=jQuery(".waymark-map-export",t).length,n=jQuery(".waymark-meta-item",t);o&&n.length;r.on("click",(function(){return t.show(),!1})),jQuery("i",r).attr("class","ion ion-map"),t.css("height",a.height()+"px");var i=jQuery("<i />").attr({class:"waymark-meta-close ion ion-close"}).on("click",(function(){t.hide()}));t.append(i)}}))}))}jQuery(document).ready((function(){waymark_setup_parameter_tooltips(),waymark_setup_map_export(),waymark_setup_accordions()})),jQuery(document).ready((function(){waymark_setup_map_shortcode()}));
\ No newline at end of file
+function waymark_setup_map_export(){jQuery(".waymark-map-export, .waymark-collection-export").each((function(){var a=jQuery(this);if(a){var e=a.parents(".waymark-shortcode");if(e.length)var r=jQuery(".waymark-map",e);else r=jQuery(".waymark-map");var t=a.parents(".waymark-meta-export_data");if(t.length||(t=a.parent("div")),"FORM"!=a.get(0).tagName){for(var o=jQuery("<form>").append(a.contents()),n=a.get(0).attributes,i=n.length-1;i>=0;i--)o.attr(n[i].name,n[i].value);a.replaceWith(o),a=o}var u=jQuery('input[name="map_data"]',a),y=r.data("Waymark");void 0!==y&&y.map.on("layerremove layeradd",(function(){var a=0;y.map_data.eachLayer((function(e){y.map.hasLayer(e)&&a++})),a>0?t.show():t.hide()})),a.on("submit",(function(e){var t=jQuery("select",a),o=t.val()?t.val():"geojson",n=Waymark_L.layerGroup();(y=r.data("Waymark")).map_data.eachLayer((function(a){for(key in a.feature.properties)if(void 0!==a.feature.properties[key]?"title"==key&&"kml"==o&&(a.feature.properties.name=a.feature.properties[key],delete a.feature.properties[key]):delete a.feature.properties[key],"description"==key&&void 0!==a.feature.properties.description){var e=a.feature.properties.description,r=e.indexOf('<div class="waymark-description-link');-1!==r&&(e=e.substring(0,r)),e=e.replace("'","&apos;"),a.feature.properties.description=e}n.addLayer(a)}));var i=n.toGeoJSON();switch(t.val()){case"gpx":const e={metadata:{}};var s=jQuery('input[name="map_title"]',a).val();s&&(e.metadata.name=s);var c=togpx(i,e);break;case"kml":c=tokml(i);break;default:case"geojson":c=JSON.stringify(i)}u.val(encodeURIComponent(c))}))}}))}function waymark_setup_parameter_tooltips(){jQuery("a.waymark-tooltip").on({mouseenter:function(a){var e=jQuery(this).data("title");jQuery('<p id="waymark-tooltip-active"></p>').text(e).appendTo("body").fadeIn("slow")},mouseleave:function(a){jQuery("#waymark-tooltip-active").remove()},mousemove:function(a){if(waymark_is_touch_device())var e=a.pageX-250;else e=a.pageX-220;var r=a.pageY+5;jQuery("#waymark-tooltip-active").css({top:r,left:e})}})}function waymark_is_touch_device(){var a=" -webkit- -moz- -o- -ms- ".split(" ");return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)||function(a){return window.matchMedia(a).matches}(["(",a.join("touch-enabled),("),"heartz",")"].join(""))}function waymark_setup_accordions(){var a=jQuery(".waymark-accordion-container");a.length&&(a.addClass("waymark-self-clear"),a.each((function(){var a=0;jQuery(".waymark-accordion-group",jQuery(this)).each((function(){jQuery(this).addClass("waymark-self-clear"),jQuery(this).data("waymark-index",a);var e=jQuery(".waymark-accordion-group-content",jQuery(this));0==a?(jQuery(this).addClass("waymark-first"),e.show().addClass(a)):e.hide().addClass(a),jQuery("legend",jQuery(this)).each((function(){var a=jQuery(this).html();-1==a.indexOf("[+]")&&jQuery(this).html(a+" <span>[+]</span>"),jQuery(this).click((function(){var a=jQuery(this).parents(".waymark-accordion-group").data("waymark-index");jQuery(".waymark-accordion-group",jQuery(this).parents(".waymark-accordion-container")).each((function(){jQuery(this).data("waymark-index")==a?jQuery(".waymark-accordion-group-content",jQuery(this)).slideDown():jQuery(".waymark-accordion-group-content",jQuery(this)).slideUp()}))}))})),a++}))})))}function waymark_setup_map_editor(a={}){if(!a.map)return void a.message("waymark_editor.map not available","error");jQuery(".waymark-edit-toolbar a.waymark-edit-upload").removeClass("waymark-hidden");const e=jQuery(".waymark-edit-toolbar a.waymark-edit-image");e.length&&(a.debug("Enabling Front-End Image Uploads."),e.removeClass("waymark-hidden"),e.on("click",(function(e){e.preventDefault();var r=jQuery("<input />").attr({type:"file",name:"add_photo"}).css("display","none").change((function(){a.handle_file_upload(jQuery(this))}));return jQuery("#waymark-edit-toolbar").append(r),r.trigger("click"),!1}))),a.map.on("popupopen",(function(e){const r=e.popup._source.feature,t=jQuery(".waymark-map .waymark-info").first(),o=jQuery(".waymark-info-image_large_url .button",t);o.length&&(o.removeClass("waymark-hidden"),o.on("click",(function(e){e.preventDefault();var o=jQuery("<input />").attr({type:"file",name:"marker_photo"}).css("display","none").change((function(){a.handle_file_upload(jQuery(this),{feature:r,img_view:jQuery(".waymark-info-image_large_url a",t),img_input:jQuery(".waymark-info-image_large_url input",t)})}));return t.append(o),o.trigger("click"),!1})))}))}function waymark_setup_map_shortcode(){jQuery(".waymark-shortcode").each((function(){var a=jQuery(this);jQuery(".waymark-header",a).each((function(){var e=jQuery(this),r=jQuery(".waymark-link",e).first(),t=jQuery(".waymark-meta",e);if(t.length){var o=jQuery(".waymark-map-export",t).length,n=jQuery(".waymark-meta-item",t);o&&n.length;r.on("click",(function(){return t.show(),!1})),jQuery("i",r).attr("class","ion ion-map"),t.css("height",a.height()+"px");var i=jQuery("<i />").attr({class:"waymark-meta-close ion ion-close"}).on("click",(function(){t.hide()}));t.append(i)}}))}))}jQuery(document).ready((function(){waymark_setup_parameter_tooltips(),waymark_setup_map_export(),waymark_setup_accordions()})),jQuery(document).ready((function(){waymark_setup_map_shortcode()}));
\ No newline at end of file
diff --git a/assets/js/shared.js b/assets/js/shared.js
index 299a57ee..c00f3a52 100644
--- a/assets/js/shared.js
+++ b/assets/js/shared.js
@@ -122,9 +122,23 @@ function waymark_setup_map_export() {
 				switch (export_select.val()) {
 					//GPX
 					case "gpx":
+						const options = {
+							metadata: {},
+						};
+
+						// Name Metadata
+						var map_title = jQuery(
+							'input[name="map_title"]',
+							export_container,
+						).val();
+
+						if (map_title) {
+							options.metadata.name = map_title;
+						}
+
 						//Convert to GPX
 						//Thanks! https://github.com/tyrasd/togpx
-						var map_data = togpx(map_data_geojson);
+						var map_data = togpx(map_data_geojson, options);
 						var map_data_type = "application/gpx+xml;charset=utf-8";
 						var map_data_extension = "gpx";
 
diff --git a/inc/Helpers/Waymark_Helper.php b/inc/Helpers/Waymark_Helper.php
index 9920c86c..ad8cf48a 100644
--- a/inc/Helpers/Waymark_Helper.php
+++ b/inc/Helpers/Waymark_Helper.php
@@ -1,1474 +1,1520 @@
 <?php
 
-class Waymark_Helper {
+class Waymark_Helper
+{
 
-	static public function inc($path = '') {
-		$path = plugin_dir_path(__DIR__) . $path;
+    public static function inc($path = '')
+    {
+        $path = plugin_dir_path(__DIR__) . $path;
 
-		require_once $path;
-	}
+        require_once $path;
+    }
 
-	static public function plugin_about() {
-		$out = '';
-
-		$out .= '	<div id="waymark-about">' . "\n";
-		$out .= '		<img width="75" height="75" alt="Joe\'s mug" src="//www.morehawes.ca/assets/images/Joe1BW.jpg" />' . "\n";
-		$out .= '		<p class="waymark-first"><b>' . sprintf(esc_html__("Hi, I'm %s.", 'waymark'), "Joe") . '</b></p>' . "\n";
-
-		$out .= '		<p>' . __('Waymark is <strong><a href="https://github.com/opengis/waymark">open source</a></strong> and a work in progress.', 'waymark') . '</p>' . "\n";
-		$out .= '		<p>' . __('Feedback is very important, so please feel free to get in touch by either:', 'waymark') . '</p>' . "\n";
-
-		$out .= '		<ul>' . "\n";
-		$out .= '			<li>' . sprintf(__('Leaving a <strong><a href="%s">review</a></strong>, or creating a <a href="%s">support topic</a> on the WordPress plugin directory.', 'waymark'), 'https://wordpress.org/support/plugin/waymark/reviews/#new-post', 'https://wordpress.org/support/plugin/waymark/#new-topic-0') . '</li>' . "\n";
-		$out .= '			<li>' . sprintf(__('Posting in the <a href="%s">Forums</a>.', 'waymark'), 'https://www.waymark.dev/forums/') . '</li>' . "\n";
-		$out .= '			<li>' . sprintf(__('Creating a <a href="%s">GitHub issue</a>.', 'waymark'), 'https://github.com/opengis/waymark/issues/new') . '</li>' . "\n";
-		$out .= '		</ul>' . "\n";
-
-		$out .= '		<p>' . esc_html__('Thanks', 'waymark') . '!</p>' . "\n";
-
-		$out .= '		<hr />' . "\n";
-
-		$out .= '		<p>' . sprintf(__('Built on the shoulders of giants, <a href="%s">thank you</a>!', 'waymark'), 'https://www.waymark.dev/docs/thanks/') . '</p>' . "\n";
-
-		// Debug Info
-		$debug = (self::is_debug()) ? '1' : '0';
-		$out .= '		Waymark v' . Waymark_Config::get_item('plugin_version') . ' | <a href="' . admin_url('edit.php?post_type=waymark_map&page=waymark-settings&content=waymark-settings-tab-misc#wpfooter') . '">' . __('Debug', 'waymark') . '</a>: ' . $debug . "\n";
-
-		$out .= '	</div>' . "\n";
-
-		return $out;
-	}
-
-	static public function logo($colour = 'dark', $width = '20', $height = '20', $title = false) {
-		if (!$title) {
-			$title = Waymark_Config::get_name();
-		}
-		return '<img class="waymark-logo" alt="' . Waymark_Config::get_name() . '" src="' . self::asset_url('img/waymark-icon-' . $colour . '.png') . '" width="' . $width . '" height="' . $height . '" />';
-	}
-
-	static public function site_url($url_path = '') {
-		return Waymark_Config::get_item('site_url') . $url_path;
-	}
-
-	static public function asset_url($file_path = '') {
-		return plugin_dir_url('') . 'waymark/assets/' . $file_path;
-	}
-
-	static public function plugin_url($file_path = '') {
-		return plugin_dir_url('') . 'waymark/' . $file_path;
-	}
-
-	static public function http_url($data = array()) {
-		return trim(add_query_arg(array_merge(array('waymark_http' => '1'), $data), home_url('/')), '/');
-	}
-
-	static function waymark_array_random_assoc($arr, $num = 1) {
-		$keys = array_keys($arr);
-		shuffle($keys);
-
-		$r = array();
-		for ($i = 0; $i < $num; $i++) {
-			$r[$keys[$i]] = $arr[$keys[$i]];
-		}
-		return $r;
-	}
-
-	static public function get_meta($post_id) {
-		$meta_array = get_post_meta($post_id);
-
-		$meta_out = array();
-		foreach ($meta_array as $meta_key => $meta_value) {
-			if ($meta_key[0] == '_') {
-				continue;
-			}
-
-			if (is_array($meta_value)) {
-				$meta_value = array_shift($meta_value);
-			}
-
-			$meta_out[$meta_key] = $meta_value;
-		}
-
-		return $meta_out;
-	}
-
-	static public function get_map_meta($Map, $context = 'map_single') {
-		$map_meta = array();
-
-		// =============== PREPEND ===============
-
-		//Thumbnail?
-		$map_thumbnail = get_the_post_thumbnail($Map->post_id, 'large', array(
-			'class' => 'waymark-map-thumbnail',
-			'width' => '',
-			'height' => '',
-		));
-		if ($map_thumbnail) {
-			if ($context == 'shortcode') {
-				$map_thumbnail = '<a href="' . get_permalink($Map->post_id) . '">' . $map_thumbnail . '</a>';
-			}
-
-			$map_meta['map_thumbnail'] = array(
-				'meta_key' => 'map_thumbnail',
-				'meta_value' => $map_thumbnail,
-				'meta_title' => '',
-				'meta_group' => '',
-			);
-		}
-
-		// =============== SETTINGS ===============
-
-		$settings_meta = Waymark_Config::get_item('meta', 'inputs', true);
-
-		//For each setting
-		foreach ($settings_meta as $setting_meta) {
-			//Shortcode output setting
-			//If we are displaying the shortcode *and* there is a meta_shortcode setting *AND* it's set to false
-			if ($context == 'shortcode' && (isset($setting_meta['meta_shortcode']) && !$setting_meta['meta_shortcode'])) {
-				//Don't display this
-				continue;
-			}
-
-			$meta_key = self::make_key($setting_meta['meta_title'], 'map');
-
-			//If we have data
-			if (array_key_exists($meta_key, $Map->data) && !empty($Map->data[$meta_key])) {
-				$data = array(
-					'meta_key' => $meta_key,
-					'meta_title' => $setting_meta['meta_title'],
-					'meta_group' => isset($setting_meta['meta_group']) ? $setting_meta['meta_group'] : '',
-				);
-
-				//Select
-				if (in_array($setting_meta['meta_type'], array('select')) && array_key_exists('meta_options', $setting_meta)) {
-					$options_array = self::comma_string_to_array($setting_meta['meta_options']);
-
-					//Only if option exists
-					if (isset($options_array[$Map->data[$meta_key]])) {
-						$data['meta_value'] = $options_array[$Map->data[$meta_key]];
-					}
-					//Multi-Select
-				} elseif (in_array($setting_meta['meta_type'], array('select_multi')) && array_key_exists('meta_options', $setting_meta)) {
-					$options_array = self::comma_string_to_array($setting_meta['meta_options']);
-					$values_array = self::array_string_to_array($Map->data[$meta_key]);
-
-					//Build output
-					$data['meta_value'] = '';
-					foreach ($values_array as $value) {
-						//Only if option exists
-						if (isset($options_array[$value])) {
-							$data['meta_value'] .= $options_array[$value] . '<br />';
-						}
-					}
-					//Rich text
-				} elseif (in_array($setting_meta['meta_type'], array('textarea_rich'))) {
-					$data['meta_value'] = wpautop($Map->data[$meta_key]);
-					//Value
-				} else {
-					$data['meta_value'] = $Map->data[$meta_key];
-				}
-
-				$map_meta[$meta_key] = $data;
-			}
-		}
-
-		// =============== APPEND ===============
-
-		//Collection List
-		$collection_list = get_the_term_list($Map->post_id, 'waymark_collection', '', '<!--,-->, ');
-
-		if ($collection_list) {
-
-			$meta_title = esc_html__('Collection', 'waymark');
-
-			$map_meta['collection_list'] = array(
-				'meta_key' => 'collection_list',
-				'meta_title' => $meta_title,
-				'meta_value' => $collection_list,
-				'meta_group' => '',
-			);
-		}
-
-		//Add Export dropdown/link
-		$has_features = array_key_exists('map_data', $Map->data) && Waymark_GeoJSON::get_feature_count($Map->data['map_data']);
-		if ($has_features && Waymark_Config::get_setting('misc', 'map_options', 'allow_export') == true) {
-			$map_meta['export_data'] = array(
-				'meta_key' => 'export_data',
-				'meta_title' => esc_html__('Export', 'waymark'),
-				'meta_value' => self::map_export_html($Map),
-				'meta_info' => '<a data-title="' . esc_attr__('This will download the Overlays currently displayed by the Map in the selected format.', 'waymark') . '" href="#" onclick="return false;" class="waymark-tooltip">?</a>',
-				'meta_group' => '',
-			);
-		}
+    public static function plugin_about()
+    {
+        $out = '';
+
+        $out .= '	<div id="waymark-about">' . "\n";
+        $out .= '		<img width="75" height="75" alt="Joe\'s mug" src="//www.morehawes.ca/assets/images/Joe1BW.jpg" />' . "\n";
+        $out .= '		<p class="waymark-first"><b>' . sprintf(esc_html__("Hi, I'm %s.", 'waymark'), "Joe") . '</b></p>' . "\n";
+
+        $out .= '		<p>' . __('Waymark is <strong><a href="https://github.com/opengis/waymark">open source</a></strong> and a work in progress.', 'waymark') . '</p>' . "\n";
+        $out .= '		<p>' . __('Feedback is very important, so please feel free to get in touch by either:', 'waymark') . '</p>' . "\n";
+
+        $out .= '		<ul>' . "\n";
+        $out .= '			<li>' . sprintf(__('Leaving a <strong><a href="%s">review</a></strong>, or creating a <a href="%s">support topic</a> on the WordPress plugin directory.', 'waymark'), 'https://wordpress.org/support/plugin/waymark/reviews/#new-post', 'https://wordpress.org/support/plugin/waymark/#new-topic-0') . '</li>' . "\n";
+        $out .= '			<li>' . sprintf(__('Posting in the <a href="%s">Forums</a>.', 'waymark'), 'https://www.waymark.dev/forums/') . '</li>' . "\n";
+        $out .= '			<li>' . sprintf(__('Creating a <a href="%s">GitHub issue</a>.', 'waymark'), 'https://github.com/opengis/waymark/issues/new') . '</li>' . "\n";
+        $out .= '		</ul>' . "\n";
+
+        $out .= '		<p>' . esc_html__('Thanks', 'waymark') . '!</p>' . "\n";
+
+        $out .= '		<hr />' . "\n";
+
+        $out .= '		<p>' . sprintf(__('Built on the shoulders of giants, <a href="%s">thank you</a>!', 'waymark'), 'https://www.waymark.dev/docs/thanks/') . '</p>' . "\n";
+
+        // Debug Info
+        $debug = (self::is_debug()) ? '1' : '0';
+        $out .= '		Waymark v' . Waymark_Config::get_item('plugin_version') . ' | <a href="' . admin_url('edit.php?post_type=waymark_map&page=waymark-settings&content=waymark-settings-tab-misc#wpfooter') . '">' . __('Debug', 'waymark') . '</a>: ' . $debug . "\n";
+
+        $out .= '	</div>' . "\n";
+
+        return $out;
+    }
+
+    public static function logo($colour = 'dark', $width = '20', $height = '20', $title = false)
+    {
+        if (! $title) {
+            $title = Waymark_Config::get_name();
+        }
+        return '<img class="waymark-logo" alt="' . Waymark_Config::get_name() . '" src="' . self::asset_url('img/waymark-icon-' . $colour . '.png') . '" width="' . $width . '" height="' . $height . '" />';
+    }
+
+    public static function site_url($url_path = '')
+    {
+        return Waymark_Config::get_item('site_url') . $url_path;
+    }
+
+    public static function asset_url($file_path = '')
+    {
+        return plugin_dir_url('') . 'waymark/assets/' . $file_path;
+    }
+
+    public static function plugin_url($file_path = '')
+    {
+        return plugin_dir_url('') . 'waymark/' . $file_path;
+    }
+
+    public static function http_url($data = [])
+    {
+        return trim(add_query_arg(array_merge(['waymark_http' => '1'], $data), home_url('/')), '/');
+    }
+
+    public static function waymark_array_random_assoc($arr, $num = 1)
+    {
+        $keys = array_keys($arr);
+        shuffle($keys);
+
+        $r = [];
+        for ($i = 0; $i < $num; $i++) {
+            $r[$keys[$i]] = $arr[$keys[$i]];
+        }
+        return $r;
+    }
+
+    public static function get_meta($post_id)
+    {
+        $meta_array = get_post_meta($post_id);
+
+        $meta_out = [];
+        foreach ($meta_array as $meta_key => $meta_value) {
+            if ($meta_key[0] == '_') {
+                continue;
+            }
+
+            if (is_array($meta_value)) {
+                $meta_value = array_shift($meta_value);
+            }
+
+            $meta_out[$meta_key] = $meta_value;
+        }
+
+        return $meta_out;
+    }
+
+    public static function get_map_meta($Map, $context = 'map_single')
+    {
+        $map_meta = [];
+
+        // =============== PREPEND ===============
+
+        //Thumbnail?
+        $map_thumbnail = get_the_post_thumbnail($Map->post_id, 'large', [
+            'class'  => 'waymark-map-thumbnail',
+            'width'  => '',
+            'height' => '',
+        ]);
+        if ($map_thumbnail) {
+            if ($context == 'shortcode') {
+                $map_thumbnail = '<a href="' . get_permalink($Map->post_id) . '">' . $map_thumbnail . '</a>';
+            }
+
+            $map_meta['map_thumbnail'] = [
+                'meta_key'   => 'map_thumbnail',
+                'meta_value' => $map_thumbnail,
+                'meta_title' => '',
+                'meta_group' => '',
+            ];
+        }
+
+        // =============== SETTINGS ===============
+
+        $settings_meta = Waymark_Config::get_item('meta', 'inputs', true);
+
+        //For each setting
+        foreach ($settings_meta as $setting_meta) {
+            //Shortcode output setting
+            //If we are displaying the shortcode *and* there is a meta_shortcode setting *AND* it's set to false
+            if ($context == 'shortcode' && (isset($setting_meta['meta_shortcode']) && ! $setting_meta['meta_shortcode'])) {
+                //Don't display this
+                continue;
+            }
+
+            $meta_key = self::make_key($setting_meta['meta_title'], 'map');
+
+            //If we have data
+            if (array_key_exists($meta_key, $Map->data) && ! empty($Map->data[$meta_key])) {
+                $data = [
+                    'meta_key'   => $meta_key,
+                    'meta_title' => $setting_meta['meta_title'],
+                    'meta_group' => isset($setting_meta['meta_group']) ? $setting_meta['meta_group'] : '',
+                ];
+
+                //Select
+                if (in_array($setting_meta['meta_type'], ['select']) && array_key_exists('meta_options', $setting_meta)) {
+                    $options_array = self::comma_string_to_array($setting_meta['meta_options']);
+
+                    //Only if option exists
+                    if (isset($options_array[$Map->data[$meta_key]])) {
+                        $data['meta_value'] = $options_array[$Map->data[$meta_key]];
+                    }
+                    //Multi-Select
+                } elseif (in_array($setting_meta['meta_type'], ['select_multi']) && array_key_exists('meta_options', $setting_meta)) {
+                    $options_array = self::comma_string_to_array($setting_meta['meta_options']);
+                    $values_array  = self::array_string_to_array($Map->data[$meta_key]);
+
+                    //Build output
+                    $data['meta_value'] = '';
+                    foreach ($values_array as $value) {
+                        //Only if option exists
+                        if (isset($options_array[$value])) {
+                            $data['meta_value'] .= $options_array[$value] . '<br />';
+                        }
+                    }
+                    //Rich text
+                } elseif (in_array($setting_meta['meta_type'], ['textarea_rich'])) {
+                    $data['meta_value'] = wpautop($Map->data[$meta_key]);
+                    //Value
+                } else {
+                    $data['meta_value'] = $Map->data[$meta_key];
+                }
+
+                $map_meta[$meta_key] = $data;
+            }
+        }
+
+        // =============== APPEND ===============
+
+        //Collection List
+        $collection_list = get_the_term_list($Map->post_id, 'waymark_collection', '', '<!--,-->, ');
+
+        if ($collection_list) {
+
+            $meta_title = esc_html__('Collection', 'waymark');
+
+            $map_meta['collection_list'] = [
+                'meta_key'   => 'collection_list',
+                'meta_title' => $meta_title,
+                'meta_value' => $collection_list,
+                'meta_group' => '',
+            ];
+        }
+
+        //Add Export dropdown/link
+        $has_features = array_key_exists('map_data', $Map->data) && Waymark_GeoJSON::get_feature_count($Map->data['map_data']);
+        if ($has_features && Waymark_Config::get_setting('misc', 'map_options', 'allow_export') == true) {
+            $map_meta['export_data'] = [
+                'meta_key'   => 'export_data',
+                'meta_title' => esc_html__('Export', 'waymark'),
+                'meta_value' => self::map_export_html($Map),
+                'meta_info'  => '<a data-title="' . esc_attr__('This will download the Overlays currently displayed by the Map in the selected format.', 'waymark') . '" href="#" onclick="return false;" class="waymark-tooltip">?</a>',
+                'meta_group' => '',
+            ];
+        }
 
 // 		self::debug($map_meta);
 
-		return $map_meta;
-	}
-
-	static public function get_collection_meta($Collection, $context = 'shortcode') {
-		$map_meta = array();
-
-		//Add Description
-		if ($Collection->description) {
-			$map_meta['collection_desc'] = array(
-				'meta_key' => 'collection_desc',
-				'meta_title' => '',
-				'meta_group' => '',
-				'meta_value' => $Collection->description,
-			);
-		}
-
-		//Add Export dropdown/link
-		if (sizeof($Collection->Maps) && Waymark_Config::get_setting('misc', 'map_options', 'allow_export') == true) {
-			$map_meta['export_data'] = array(
-				'meta_key' => 'export_data',
-				'meta_title' => esc_html__('Export', 'waymark'),
-				'meta_value' => self::collection_export_html($Collection),
-				'meta_info' => '<a data-title="' . esc_attr__('This will download the Overlays currently displayed by the Map in the selected format.', 'waymark') . '" href="#" onclick="return false;" class="waymark-tooltip">?</a>',
-				'meta_group' => '',
-			);
-		}
+        return $map_meta;
+    }
+
+    public static function get_collection_meta($Collection, $context = 'shortcode')
+    {
+        $map_meta = [];
+
+        //Add Description
+        if ($Collection->description) {
+            $map_meta['collection_desc'] = [
+                'meta_key'   => 'collection_desc',
+                'meta_title' => '',
+                'meta_group' => '',
+                'meta_value' => $Collection->description,
+            ];
+        }
+
+        //Add Export dropdown/link
+        if (sizeof($Collection->Maps) && Waymark_Config::get_setting('misc', 'map_options', 'allow_export') == true) {
+            $map_meta['export_data'] = [
+                'meta_key'   => 'export_data',
+                'meta_title' => esc_html__('Export', 'waymark'),
+                'meta_value' => self::collection_export_html($Collection),
+                'meta_info'  => '<a data-title="' . esc_attr__('This will download the Overlays currently displayed by the Map in the selected format.', 'waymark') . '" href="#" onclick="return false;" class="waymark-tooltip">?</a>',
+                'meta_group' => '',
+            ];
+        }
 
 // 		self::debug($map_meta);
 
-		return $map_meta;
-	}
-
-	static public function get_meta_groups() {
-		//Get Groups
-		$meta_groups = Waymark_Config::get_item('meta', 'groups', true);
-		$meta_groups = self::multi_use_as_key($meta_groups, 'group_title');
-
-		return $meta_groups;
-	}
-
-	static public function group_meta($meta_array, $meta_groups = []) {
-		if (!$meta_groups) {
-			//Get Groups
-			$meta_groups = self::get_meta_groups();
-		}
-
-		//Sort into groups
-		$meta_grouped = [];
-		foreach ($meta_array as $meta) {
-			//Group exists
-			if (array_key_exists($meta['meta_group'], $meta_groups)) {
-				$meta_grouped[$meta['meta_group']][$meta['meta_key']] = $meta;
-				//Group does not exist
-			} else {
-				//Add to "None"
-				$meta_grouped[''][$meta['meta_key']] = $meta;
-			}
-		}
-
-		return $meta_grouped;
-	}
-
-	static public function map_meta_html($meta_array = array()) {
-		$out = '';
-
-		//Do we have data?
-		if (is_array($meta_array) && sizeof($meta_array)) {
-			//Get Meta Groups
-			$meta_groups = self::get_meta_groups();
-
-			//Sort into groups
-			$meta_grouped = self::group_meta($meta_array, $meta_groups);
-
-			//Container
-			$out = '<!-- START Parameter Container -->' . "\n";
-			$out .= '<div class="waymark-map-meta waymark-accordion-container waymark-meta-count-' . sizeof($meta_array) . '">' . "\n";
-
-			//Do ungrouped first
-			if (isset($meta_grouped[''])) {
-				$out .= '	<div class="waymark-map-meta-ungrouped waymark-self-clear">' . "\n";
-
-				foreach ($meta_grouped[''] as $meta) {
-					$out .= self::meta_entry_html($meta);
-				}
-				$out .= '	</div>' . "\n";
-
-				unset($meta_grouped['']);
-			}
-
-			//Iterate by group
-			if (sizeof($meta_groups)) {
-				$out .= '	<div class="waymark-map-meta-grouped">' . "\n";
-
-				foreach ($meta_groups as $group_key => $meta_groups) {
-					//Do we have meta for this group?
-					if (isset($meta_grouped[$group_key])) {
-						$out .= '		<div class="waymark-meta-group waymark-accordion-group waymark-meta-group-' . $group_key . '">' . "\n";
-
-						$group_meta = $meta_grouped[$group_key];
-
-						//Container
-						$out .= '			<legend class="waymark-meta-group-title" title="Click to expand">' . $meta_groups['group_title'] . '</legend>' . "\n";
-						$out .= '			<div class="waymark-accordion-group-content">' . "\n";
-
-						//Each meta in group
-						foreach ($group_meta as $meta) {
-							$out .= self::meta_entry_html($meta);
-						}
-
-						$out .= '			</div>' . "\n";
-						$out .= '		</div>' . "\n";
-					}
-				}
-				$out .= '	</div>' . "\n";
-			}
-
-			$out .= '</div>' . "\n";
-			$out .= '<!-- END Parameter Container -->' . "\n";
-		}
-
-		return $out;
-	}
-
-	static public function meta_entry_html($meta) {
-		$out = '';
-
-		//Ensure we have a value
-		if (!isset($meta['meta_value'])) {
-			return $out;
-		}
-
-		$out .= '	<div class="waymark-meta-item waymark-meta-' . $meta['meta_key'] . '">' . "\n";
-		//Special case
-		if ($meta['meta_key'] == 'map_description') {
-			$out .= '		<div colspan="3" class="waymark-meta-content">' . $meta['meta_value'] . '</div>' . "\n";
-		} else {
-			$out .= '		<div class="waymark-meta-info">' . "\n";
-			if (array_key_exists('meta_info', $meta) && !empty($meta['meta_info'])) {
-				$out .= $meta['meta_info'];
-			}
-			$out .= '		</div>' . "\n";
-			$out .= '		<div class="waymark-meta-title" scope="row">' . $meta['meta_title'] . '</div>' . "\n";
-			$out .= '		<div class="waymark-meta-content">' . $meta['meta_value'] . '</div>' . "\n";
-		}
-		$out .= '	</div>' . "\n";
-
-		return $out;
-	}
-
-	static public function flatten_meta($data_in) {
-		$data_out = array();
-
-		if (is_array($data_in)) {
-			foreach ($data_in as $data_key => $data_value) {
-				$data_out[$data_key] = $data_value[0];
-			}
-		}
-
-		return $data_out;
-	}
-
-	//Thanks https://stackoverflow.com/questions/2526304/php-extract-gps-exif-data/16437888#16437888
-	static public function exif_gps_to_gps_float($coordinate, $hemisphere) {
-		if (is_string($coordinate)) {
-			$coordinate = array_map("trim", explode(",", $coordinate));
-		}
-
-		for ($i = 0; $i < 3; $i++) {
-			$part = explode('/', $coordinate[$i]);
-			if (count($part) == 1) {
-				$coordinate[$i] = $part[0];
-			} else if (count($part) == 2) {
-				$coordinate[$i] = floatval($part[0]) / floatval($part[1]);
-			} else {
-				$coordinate[$i] = 0;
-			}
-		}
-
-		list($degrees, $minutes, $seconds) = $coordinate;
-		$sign = ($hemisphere == 'W' || $hemisphere == 'S') ? -1 : 1;
-
-		return $sign * ($degrees + $minutes / 60 + $seconds / 3600);
-	}
-
-	static public function make_key($str, $prefix = '', $use_underscores = true) {
-		$str = str_replace(' ', '_', $str);
-
-		if ($prefix) {
-			$str = $prefix . '_' . $str;
-		}
-
-		//Like in JS
-		if (!$use_underscores) {
-			$str = str_replace('_', '', $str);
-		}
-
-		$str = strtolower($str);
-		$str = preg_replace('/[^a-z0-9+_]+/i', '', $str);
-
-		return $str;
-	}
-
-	static public function latlng_string_to_array($latlng_string) {
-		$latlng_array = explode(',', $latlng_string);
-
-		if (is_array($latlng_array) && sizeof($latlng_array) == 2) {
-			if (is_numeric($latlng_array[0]) && is_numeric($latlng_array[1])) {
-				return $latlng_array;
-			}
-		}
-
-		return false;
-	}
-
-	static public function is_debug() {
-		return (true == Waymark_Config::get_setting('misc', 'advanced', 'debug_mode'));
-	}
-
-	static public function debug($thing, $die = true) {
-		if (!self::is_debug()) {
-			return;
-		}
-
-		echo '<pre>';
-		print_r($thing);
-		echo '</pre>';
-		if ($die) {
-			die;
-		}
-	}
-
-	//Thanks! https://stackoverflow.com/a/24365425/569788
-	static public function stringify_numbers($obj) {
-		//Bad data
-		if (!$obj) {
-			return $obj;
-		}
-
-		foreach ($obj as &$item) {
-			if (is_object($item) || is_array($item)) {
-				$item = self::stringify_numbers($item); // recurse!
-			}
-
-			if (is_numeric($item)) {
-				$item = (string) $item;
-			}
-		}
-
-		return $obj;
-	}
-
-	static public function set_map_data_property($map_data, $key = false, $value = false, $append = false) {
-		$FeatureCollection = json_decode($map_data);
-
-		//Ensure valid data
-		if ($FeatureCollection && sizeof($FeatureCollection->features)) {
-			foreach ($FeatureCollection->features as &$feature) {
-				//No existing properties
-				if (!property_exists($feature, 'properties')) {
-					$feature->properties = new stdClass();
-				}
-
-				//Set
-				if (!property_exists($feature->properties, $key)) {
-					$feature->properties->{$key} = $value;
-					//Update
-				} else {
-					if ($append) {
-						$feature->properties->{$key} .= $value;
-					} else {
-						$feature->properties->{$key} = $value;
-					}
-				}
-			}
-			//Invalid data
-		} else {
-			return $map_data;
-		}
-
-		return json_encode($FeatureCollection);
-	}
-
-	static public function add_map_link_to_description($map_id = null, $map_title = false, $map_data = null) {
-		$desc_append = '<div class="waymark-description-link">';
-
-		// Title?
-		$map_title = ($map_title) ? $map_title : esc_html__('Map', 'waymark');
-
-		// Add link to Map
-		$desc_append .= '	<span class="waymark-map-link"><a href="' . get_permalink($map_id) . '">' . $map_title . '</a></span>';
-
-		// Is Map part of the waymark_collection taxonomy?
-		$collections = wp_get_post_terms($map_id, 'waymark_collection');
-
-		//If we have Collections
-		if (sizeof($collections)) {
-			//Sort by count ASC
-			usort($collections, function ($a, $b) {
-				return $a->count < $b->count;
-			});
-
-			// Add link to first
-			$desc_append .= '	<span class="waymark-collection-link"><a href="' . get_term_link($collections[0]) . '">' . $collections[0]->name . '</a></span>';
-		}
-
-		$desc_append .= '</div>';
-
-		return self::set_map_data_property($map_data, 'description', $desc_append, true);
-	}
-
-	public static function convert_single_value_to_array($value_in) {
-		//Array
-		if (is_array($value_in)) {
-			$array_out = array();
-
-			foreach ($value_in as $key => $value) {
-				$multi = explode(Waymark_Config::get_item('multi_value_seperator'), $value);
-
-				$count = 0;
-				foreach ($multi as $m) {
-					$array_out[$count][$key] = $m;
-					//				self::debug($m, false);
-
-					$count++;
-				}
-			}
-
-			return $array_out;
-			//String
-		} else {
-			return explode(Waymark_Config::get_item('multi_value_seperator'), $value_in);
-		}
-	}
-
-	public static function convert_values_to_single_value($array_in) {
-		$array_out = array();
-
-		if (!is_array($array_in)) {
-			return $array_out;
-		}
-
-		foreach ($array_in as $key => $value) {
-			//Single value
-			if (!is_array($value)) {
-				//Use that
-				$array_out[$key] = $value;
-				//Multiple values
-			} else {
-				//Single value, use that
-				$array_out[$key] = implode(Waymark_Config::get_item('multi_value_seperator'), $value);
-			}
-		}
-
-		return $array_out;
-	}
-
-	public static function multi_use_as_key($array_in, $as_key = false) {
-		$array_out = array();
-
-		$count = 0;
-		if (is_array($array_in)) {
-			foreach ($array_in as $data) {
-				if (is_array($data) && $as_key && array_key_exists($as_key, $data)) {
-					$out_key = self::make_key($data[$as_key]);
-				} else {
-					$out_key = $count;
-				}
-
-				$array_out[$out_key] = $data;
-
-				$count++;
-			}
-		}
-
-		return $array_out;
-	}
-
-	/**
-	 * Get the overlay types
-	 *
-	 * @param  string  $feature_type      Feature type
-	 * @param  boolean $use_key           Build associative array using $use_key as key
-	 * @param  boolean $as_options        Build as options array ready for <select>
-	 * @return array                      Array of overlay types
-	 */
-	public static function get_overlay_types($feature_type = 'marker', $use_key = '', $as_options = false) {
-		$object_types = Waymark_Config::get_item($feature_type . 's', $feature_type . '_types', true);
-
-		//Use keys
-		if ($use_key) {
-			$object_types = self::multi_use_as_key($object_types, $use_key);
-
-			//Convert to dropdown
-			if ($as_options) {
-				foreach ($object_types as $key => $data) {
-					if (array_key_exists($use_key, $data)) {
-						$object_types[$key] = $data[$use_key];
-					} else {
-						$object_types[$key] = $key;
-					}
-				}
-			}
-		}
-
-		return $object_types;
-	}
-
-	/**
-	 * Get the overlay type data
-	 *
-	 * @param  string  $feature_type      Feature type
-	 * @param  string  $type_key          Type key
-	 * @return array                      Array of overlay types
-	 */
-	public static function get_type_data($feature_type = 'marker', $type_key = '') {
-		$marker_types = self::get_overlay_types($feature_type, $feature_type . '_title');
-
-		if (array_key_exists($type_key, $marker_types)) {
-			return $marker_types[$type_key];
-		} else {
-			return false;
-		}
-	}
-
-	public static function array_string_to_array($string) {
-		$string = str_replace(array('[', ']', '"', '"'), array('', '', '', ''), $string);
-
-		return self::comma_string_to_array($string);
-	}
-
-	public static function comma_string_to_array($string) {
-		//Process options
-		$options_exploded = explode(',', $string);
-		$options_array = array();
-		foreach ($options_exploded as $option) {
-			$value = trim($option);
-			$key = self::make_key($value);
-
-			$options_array[$key] = $value;
-		}
-
-		return $options_array;
-	}
-
-	static public function map_export_html($Map) {
-		if (!isset($Map->post_id) || !isset($Map->post_title)) {
-			return false;
-		}
-
-		$element = (is_admin()) ? 'div' : 'form';
-
-		$out = '<' . $element . ' action="' . self::http_url() . '" method="post" id="waymark-map-export-' . $Map->post_id . '" class="waymark-map-export" data-map_id="' . $Map->post_id . '" data-map_slug="' . sanitize_title($Map->post_title) . '">' . "\n";
-		$out .= '	<select name="export_format">' . "\n";
-		$out .= '		<option value="gpx">GPX</option>' . "\n";
-		$out .= '		<option value="kml">KML</option>' . "\n";
-		$out .= '		<option value="geojson">GeoJSON</option>' . "\n";
-		$out .= '	</select>' . "\n";
-		$out .= '	<input type="hidden" name="waymark_action" value="download_map_data" />' . "\n";
-		$out .= '	<input type="hidden" name="waymark_security" value="' . wp_create_nonce(Waymark_Config::get_item('nonce_string')) . '" />' . "\n";
-		$out .= '	<input type="hidden" name="map_data" value="" />' . "\n";
-		$out .= '	<input type="hidden" name="map_id" value="' . $Map->post_id . '" />' . "\n";
-		$out .= '	<input type="submit" value="' . __('Download', 'waymark') . '" class="button" />' . "\n";
-		$out .= '</' . $element . '>' . "\n";
-
-		return $out;
-	}
-
-	static public function collection_export_html($Collection) {
+        return $map_meta;
+    }
+
+    public static function get_meta_groups()
+    {
+        //Get Groups
+        $meta_groups = Waymark_Config::get_item('meta', 'groups', true);
+        $meta_groups = self::multi_use_as_key($meta_groups, 'group_title');
+
+        return $meta_groups;
+    }
+
+    public static function group_meta($meta_array, $meta_groups = [])
+    {
+        if (! $meta_groups) {
+            //Get Groups
+            $meta_groups = self::get_meta_groups();
+        }
+
+        //Sort into groups
+        $meta_grouped = [];
+        foreach ($meta_array as $meta) {
+            //Group exists
+            if (array_key_exists($meta['meta_group'], $meta_groups)) {
+                $meta_grouped[$meta['meta_group']][$meta['meta_key']] = $meta;
+                //Group does not exist
+            } else {
+                //Add to "None"
+                $meta_grouped[''][$meta['meta_key']] = $meta;
+            }
+        }
+
+        return $meta_grouped;
+    }
+
+    public static function map_meta_html($meta_array = [])
+    {
+        $out = '';
+
+        //Do we have data?
+        if (is_array($meta_array) && sizeof($meta_array)) {
+            //Get Meta Groups
+            $meta_groups = self::get_meta_groups();
+
+            //Sort into groups
+            $meta_grouped = self::group_meta($meta_array, $meta_groups);
+
+            //Container
+            $out = '<!-- START Parameter Container -->' . "\n";
+            $out .= '<div class="waymark-map-meta waymark-accordion-container waymark-meta-count-' . sizeof($meta_array) . '">' . "\n";
+
+            //Do ungrouped first
+            if (isset($meta_grouped[''])) {
+                $out .= '	<div class="waymark-map-meta-ungrouped waymark-self-clear">' . "\n";
+
+                foreach ($meta_grouped[''] as $meta) {
+                    $out .= self::meta_entry_html($meta);
+                }
+                $out .= '	</div>' . "\n";
+
+                unset($meta_grouped['']);
+            }
+
+            //Iterate by group
+            if (sizeof($meta_groups)) {
+                $out .= '	<div class="waymark-map-meta-grouped">' . "\n";
+
+                foreach ($meta_groups as $group_key => $meta_groups) {
+                    //Do we have meta for this group?
+                    if (isset($meta_grouped[$group_key])) {
+                        $out .= '		<div class="waymark-meta-group waymark-accordion-group waymark-meta-group-' . $group_key . '">' . "\n";
+
+                        $group_meta = $meta_grouped[$group_key];
+
+                        //Container
+                        $out .= '			<legend class="waymark-meta-group-title" title="Click to expand">' . $meta_groups['group_title'] . '</legend>' . "\n";
+                        $out .= '			<div class="waymark-accordion-group-content">' . "\n";
+
+                        //Each meta in group
+                        foreach ($group_meta as $meta) {
+                            $out .= self::meta_entry_html($meta);
+                        }
+
+                        $out .= '			</div>' . "\n";
+                        $out .= '		</div>' . "\n";
+                    }
+                }
+                $out .= '	</div>' . "\n";
+            }
+
+            $out .= '</div>' . "\n";
+            $out .= '<!-- END Parameter Container -->' . "\n";
+        }
+
+        return $out;
+    }
+
+    public static function meta_entry_html($meta)
+    {
+        $out = '';
+
+        //Ensure we have a value
+        if (! isset($meta['meta_value'])) {
+            return $out;
+        }
+
+        $out .= '	<div class="waymark-meta-item waymark-meta-' . $meta['meta_key'] . '">' . "\n";
+        //Special case
+        if ($meta['meta_key'] == 'map_description') {
+            $out .= '		<div colspan="3" class="waymark-meta-content">' . $meta['meta_value'] . '</div>' . "\n";
+        } else {
+            $out .= '		<div class="waymark-meta-info">' . "\n";
+            if (array_key_exists('meta_info', $meta) && ! empty($meta['meta_info'])) {
+                $out .= $meta['meta_info'];
+            }
+            $out .= '		</div>' . "\n";
+            $out .= '		<div class="waymark-meta-title" scope="row">' . $meta['meta_title'] . '</div>' . "\n";
+            $out .= '		<div class="waymark-meta-content">' . $meta['meta_value'] . '</div>' . "\n";
+        }
+        $out .= '	</div>' . "\n";
+
+        return $out;
+    }
+
+    public static function flatten_meta($data_in)
+    {
+        $data_out = [];
+
+        if (is_array($data_in)) {
+            foreach ($data_in as $data_key => $data_value) {
+                $data_out[$data_key] = $data_value[0];
+            }
+        }
+
+        return $data_out;
+    }
+
+    //Thanks https://stackoverflow.com/questions/2526304/php-extract-gps-exif-data/16437888#16437888
+    public static function exif_gps_to_gps_float($coordinate, $hemisphere)
+    {
+        if (is_string($coordinate)) {
+            $coordinate = array_map("trim", explode(",", $coordinate));
+        }
+
+        for ($i = 0; $i < 3; $i++) {
+            $part = explode('/', $coordinate[$i]);
+            if (count($part) == 1) {
+                $coordinate[$i] = $part[0];
+            } else if (count($part) == 2) {
+                $coordinate[$i] = floatval($part[0]) / floatval($part[1]);
+            } else {
+                $coordinate[$i] = 0;
+            }
+        }
+
+        list($degrees, $minutes, $seconds) = $coordinate;
+        $sign                              = ($hemisphere == 'W' || $hemisphere == 'S') ? -1 : 1;
+
+        return $sign * ($degrees + $minutes / 60 + $seconds / 3600);
+    }
+
+    public static function make_key($str, $prefix = '', $use_underscores = true)
+    {
+        $str = str_replace(' ', '_', $str);
+
+        if ($prefix) {
+            $str = $prefix . '_' . $str;
+        }
+
+        //Like in JS
+        if (! $use_underscores) {
+            $str = str_replace('_', '', $str);
+        }
+
+        $str = strtolower($str);
+        $str = preg_replace('/[^a-z0-9+_]+/i', '', $str);
+
+        return $str;
+    }
+
+    public static function latlng_string_to_array($latlng_string)
+    {
+        $latlng_array = explode(',', $latlng_string);
+
+        if (is_array($latlng_array) && sizeof($latlng_array) == 2) {
+            if (is_numeric($latlng_array[0]) && is_numeric($latlng_array[1])) {
+                return $latlng_array;
+            }
+        }
+
+        return false;
+    }
+
+    public static function is_debug()
+    {
+        return (true == Waymark_Config::get_setting('misc', 'advanced', 'debug_mode'));
+    }
+
+    public static function debug($thing, $die = true)
+    {
+        if (! self::is_debug()) {
+            return;
+        }
+
+        echo '<pre>';
+        print_r($thing);
+        echo '</pre>';
+        if ($die) {
+            die;
+        }
+    }
+
+    //Thanks! https://stackoverflow.com/a/24365425/569788
+    public static function stringify_numbers($obj)
+    {
+        //Bad data
+        if (! $obj) {
+            return $obj;
+        }
+
+        foreach ($obj as &$item) {
+            if (is_object($item) || is_array($item)) {
+                $item = self::stringify_numbers($item); // recurse!
+            }
+
+            if (is_numeric($item)) {
+                $item = (string) $item;
+            }
+        }
+
+        return $obj;
+    }
+
+    public static function set_map_data_property($map_data, $key = false, $value = false, $append = false)
+    {
+        $FeatureCollection = json_decode($map_data);
+
+        //Ensure valid data
+        if ($FeatureCollection && sizeof($FeatureCollection->features)) {
+            foreach ($FeatureCollection->features as &$feature) {
+                //No existing properties
+                if (! property_exists($feature, 'properties')) {
+                    $feature->properties = new stdClass();
+                }
+
+                //Set
+                if (! property_exists($feature->properties, $key)) {
+                    $feature->properties->{$key} = $value;
+                    //Update
+                } else {
+                    if ($append) {
+                        $feature->properties->{$key} .= $value;
+                    } else {
+                        $feature->properties->{$key} = $value;
+                    }
+                }
+            }
+            //Invalid data
+        } else {
+            return $map_data;
+        }
+
+        return json_encode($FeatureCollection);
+    }
+
+    public static function add_map_link_to_description($map_id = null, $map_title = false, $map_data = null)
+    {
+        $desc_append = '<div class="waymark-description-link">';
+
+        // Title?
+        $map_title = ($map_title) ? $map_title : esc_html__('Map', 'waymark');
+
+        // Add link to Map
+        $desc_append .= '	<span class="waymark-map-link"><a href="' . get_permalink($map_id) . '">' . $map_title . '</a></span>';
+
+        // Is Map part of the waymark_collection taxonomy?
+        $collections = wp_get_post_terms($map_id, 'waymark_collection');
+
+        //If we have Collections
+        if (sizeof($collections)) {
+            //Sort by count ASC
+            usort($collections, function ($a, $b) {
+                return $a->count < $b->count;
+            });
+
+            // Add link to first
+            $desc_append .= '	<span class="waymark-collection-link"><a href="' . get_term_link($collections[0]) . '">' . $collections[0]->name . '</a></span>';
+        }
+
+        $desc_append .= '</div>';
+
+        return self::set_map_data_property($map_data, 'description', $desc_append, true);
+    }
+
+    public static function convert_single_value_to_array($value_in)
+    {
+        //Array
+        if (is_array($value_in)) {
+            $array_out = [];
+
+            foreach ($value_in as $key => $value) {
+                $multi = explode(Waymark_Config::get_item('multi_value_seperator'), $value);
+
+                $count = 0;
+                foreach ($multi as $m) {
+                    $array_out[$count][$key] = $m;
+                    //				self::debug($m, false);
+
+                    $count++;
+                }
+            }
+
+            return $array_out;
+            //String
+        } else {
+            return explode(Waymark_Config::get_item('multi_value_seperator'), $value_in);
+        }
+    }
+
+    public static function convert_values_to_single_value($array_in)
+    {
+        $array_out = [];
+
+        if (! is_array($array_in)) {
+            return $array_out;
+        }
+
+        foreach ($array_in as $key => $value) {
+            //Single value
+            if (! is_array($value)) {
+                //Use that
+                $array_out[$key] = $value;
+                //Multiple values
+            } else {
+                //Single value, use that
+                $array_out[$key] = implode(Waymark_Config::get_item('multi_value_seperator'), $value);
+            }
+        }
+
+        return $array_out;
+    }
+
+    public static function multi_use_as_key($array_in, $as_key = false)
+    {
+        $array_out = [];
+
+        $count = 0;
+        if (is_array($array_in)) {
+            foreach ($array_in as $data) {
+                if (is_array($data) && $as_key && array_key_exists($as_key, $data)) {
+                    $out_key = self::make_key($data[$as_key]);
+                } else {
+                    $out_key = $count;
+                }
+
+                $array_out[$out_key] = $data;
+
+                $count++;
+            }
+        }
+
+        return $array_out;
+    }
+
+    /**
+     * Get the overlay types
+     *
+     * @param  string  $feature_type      Feature type
+     * @param  boolean $use_key           Build associative array using $use_key as key
+     * @param  boolean $as_options        Build as options array ready for <select>
+     * @return array                      Array of overlay types
+     */
+    public static function get_overlay_types($feature_type = 'marker', $use_key = '', $as_options = false)
+    {
+        $object_types = Waymark_Config::get_item($feature_type . 's', $feature_type . '_types', true);
+
+        //Use keys
+        if ($use_key) {
+            $object_types = self::multi_use_as_key($object_types, $use_key);
+
+            //Convert to dropdown
+            if ($as_options) {
+                foreach ($object_types as $key => $data) {
+                    if (array_key_exists($use_key, $data)) {
+                        $object_types[$key] = $data[$use_key];
+                    } else {
+                        $object_types[$key] = $key;
+                    }
+                }
+            }
+        }
+
+        return $object_types;
+    }
+
+    /**
+     * Get the overlay type data
+     *
+     * @param  string  $feature_type      Feature type
+     * @param  string  $type_key          Type key
+     * @return array                      Array of overlay types
+     */
+    public static function get_type_data($feature_type = 'marker', $type_key = '')
+    {
+        $marker_types = self::get_overlay_types($feature_type, $feature_type . '_title');
+
+        if (array_key_exists($type_key, $marker_types)) {
+            return $marker_types[$type_key];
+        } else {
+            return false;
+        }
+    }
+
+    public static function array_string_to_array($string)
+    {
+        $string = str_replace(['[', ']', '"', '"'], ['', '', '', ''], $string);
+
+        return self::comma_string_to_array($string);
+    }
+
+    public static function comma_string_to_array($string)
+    {
+        //Process options
+        $options_exploded = explode(',', $string);
+        $options_array    = [];
+        foreach ($options_exploded as $option) {
+            $value = trim($option);
+            $key   = self::make_key($value);
+
+            $options_array[$key] = $value;
+        }
+
+        return $options_array;
+    }
+
+    public static function map_export_html($Map)
+    {
+        if (! isset($Map->post_id) || ! isset($Map->post_title)) {
+            return false;
+        }
+
+        $element = (is_admin()) ? 'div' : 'form';
+
+        $out = '<' . $element . ' action="' . self::http_url() . '" method="post" id="waymark-map-export-' . $Map->post_id . '" class="waymark-map-export" data-map_id="' . $Map->post_id . '" data-map_slug="' . sanitize_title($Map->post_title) . '">' . "\n";
+        $out .= '	<select name="export_format">' . "\n";
+        $out .= '		<option value="gpx">GPX</option>' . "\n";
+        $out .= '		<option value="kml">KML</option>' . "\n";
+        $out .= '		<option value="geojson">GeoJSON</option>' . "\n";
+        $out .= '	</select>' . "\n";
+        $out .= '	<input type="hidden" name="waymark_action" value="download_map_data" />' . "\n";
+        $out .= '	<input type="hidden" name="waymark_security" value="' . wp_create_nonce(Waymark_Config::get_item('nonce_string')) . '" />' . "\n";
+        $out .= '	<input type="hidden" name="map_data" value="" />' . "\n";
+        $out .= '	<input type="hidden" name="map_id" value="' . $Map->post_id . '" />' . "\n";
+        $out .= '	<input type="hidden" name="map_title" value="' . esc_attr($Map->post_title) . '" />' . "\n";
+        $out .= '	<input type="submit" value="' . __('Download', 'waymark') . '" class="button" />' . "\n";
+        $out .= '</' . $element . '>' . "\n";
+
+        return $out;
+    }
+
+    public static function collection_export_html($Collection)
+    {
 // 		self::debug($Collection);
 
-		if (!isset($Collection->collection_id)) {
-			return false;
-		}
-
-		$element = (is_admin()) ? 'div' : 'form';
-
-		$out = '<' . $element . ' action="' . self::http_url() . '" method="post" id="waymark-map-export-' . $Collection->collection_id . '" class="waymark-map-export" data-collection_id="' . $Collection->collection_id . '" data-collection_slug="' . $Collection->slug . '">' . "\n";
-		$out .= '	<select name="export_format">' . "\n";
-		$out .= '		<option value="gpx">GPX</option>' . "\n";
-		$out .= '		<option value="kml">KML</option>' . "\n";
-		$out .= '		<option value="geojson">GeoJSON</option>' . "\n";
-		$out .= '	</select>' . "\n";
-		$out .= '	<input type="hidden" name="waymark_action" value="download_collection_data" />' . "\n";
-		$out .= '	<input type="hidden" name="waymark_security" value="' . wp_create_nonce(Waymark_Config::get_item('nonce_string')) . '" />' . "\n";
-		$out .= '	<input type="hidden" name="map_data" value="" />' . "\n";
-		$out .= '	<input type="hidden" name="collection_id" value="' . $Collection->collection_id . '" />' . "\n";
-		$out .= '	<input type="submit" value="' . __('Download', 'waymark') . '" class="button" />' . "\n";
-		$out .= '</' . $element . '>' . "\n";
-
-		return $out;
-	}
-
-	static public function get_section_repeatable_count($section_data) {
-		$first_field = $section_data['fields'][array_keys($section_data['fields'])[0]];
-
-		if (is_array($first_field['default'])) {
-			return sizeof($first_field['default']);
-		}
-
-		return false;
-	}
-
-	static public function repeatable_setting_option_array($tab, $section, $key) {
-		$options_array = array();
-		$values = Waymark_Config::get_item($tab, $section, true);
-
-		if (!is_array($values)) {
-			return null;
-		}
-
-		foreach ($values as $s) {
-			//If exists
-			if (array_key_exists($key, $s)) {
-				//Add as option
-				$options_array[self::make_key($s[$key])] = $s[$key];
-			}
-		}
-
-		return $options_array;
-	}
-
-	/**
-	 * =====================================
-	 * ============ Submission =============
-	 * =====================================
-	 */
-
-	static function country_code_to_bounds($country_code = '') {
-		$country_bounding_boxes = [
-			'AF' => [60.5284298033, 29.318572496, 75.1580277851, 38.4862816432],
-			'AO' => [11.6400960629, -17.9306364885, 24.0799052263, -4.43802336998],
-			'AL' => [19.3044861183, 39.624997667, 21.0200403175, 42.6882473822],
-			'AE' => [51.5795186705, 22.4969475367, 56.3968473651, 26.055464179],
-			'AR' => [-73.4154357571, -55.25, -53.628348965, -21.8323104794],
-			'AM' => [43.5827458026, 38.7412014837, 46.5057198423, 41.2481285671],
-			'AQ' => [-180.0, -90.0, 180.0, -63.2706604895],
-			'TF' => [68.72, -49.775, 70.56, -48.625],
-			'AU' => [113.338953078, -43.6345972634, 153.569469029, -10.6681857235],
-			'AT' => [9.47996951665, 46.4318173285, 16.9796667823, 49.0390742051],
-			'AZ' => [44.7939896991, 38.2703775091, 50.3928210793, 41.8606751572],
-			'BI' => [29.0249263852, -4.49998341229, 30.752262811, -2.34848683025],
-			'BE' => [2.51357303225, 49.5294835476, 6.15665815596, 51.4750237087],
-			'BJ' => [0.772335646171, 6.14215770103, 3.79711225751, 12.2356358912],
-			'BF' => [-5.47056494793, 9.61083486576, 2.17710778159, 15.1161577418],
-			'BD' => [88.0844222351, 20.670883287, 92.6727209818, 26.4465255803],
-			'BG' => [22.3805257504, 41.2344859889, 28.5580814959, 44.2349230007],
-			'BS' => [-78.98, 23.71, -77.0, 27.04],
-			'BA' => [15.7500260759, 42.65, 19.59976, 45.2337767604],
-			'BY' => [23.1994938494, 51.3195034857, 32.6936430193, 56.1691299506],
-			'BZ' => [-89.2291216703, 15.8869375676, -88.1068129138, 18.4999822047],
-			'BO' => [-69.5904237535, -22.8729187965, -57.4983711412, -9.76198780685],
-			'BR' => [-73.9872354804, -33.7683777809, -34.7299934555, 5.24448639569],
-			'BN' => [114.204016555, 4.007636827, 115.450710484, 5.44772980389],
-			'BT' => [88.8142484883, 26.7194029811, 92.1037117859, 28.2964385035],
-			'BW' => [19.8954577979, -26.8285429827, 29.4321883481, -17.6618156877],
-			'CF' => [14.4594071794, 2.2676396753, 27.3742261085, 11.1423951278],
-			'CA' => [-140.99778, 41.6751050889, -52.6480987209, 83.23324],
-			'CH' => [6.02260949059, 45.7769477403, 10.4427014502, 47.8308275417],
-			'CL' => [-75.6443953112, -55.61183, -66.95992, -17.5800118954],
-			'CN' => [73.6753792663, 18.197700914, 135.026311477, 53.4588044297],
-			'CI' => [-8.60288021487, 4.33828847902, -2.56218950033, 10.5240607772],
-			'CM' => [8.48881554529, 1.72767263428, 16.0128524106, 12.8593962671],
-			'CD' => [12.1823368669, -13.2572266578, 31.1741492042, 5.25608775474],
-			'CG' => [11.0937728207, -5.03798674888, 18.4530652198, 3.72819651938],
-			'CO' => [-78.9909352282, -4.29818694419, -66.8763258531, 12.4373031682],
-			'CR' => [-85.94172543, 8.22502798099, -82.5461962552, 11.2171192489],
-			'CU' => [-84.9749110583, 19.8554808619, -74.1780248685, 23.1886107447],
-			'CY' => [32.2566671079, 34.5718694118, 34.0048808123, 35.1731247015],
-			'CZ' => [12.2401111182, 48.5553052842, 18.8531441586, 51.1172677679],
-			'DE' => [5.98865807458, 47.3024876979, 15.0169958839, 54.983104153],
-			'DJ' => [41.66176, 10.9268785669, 43.3178524107, 12.6996385767],
-			'DK' => [8.08997684086, 54.8000145534, 12.6900061378, 57.730016588],
-			'DO' => [-71.9451120673, 17.598564358, -68.3179432848, 19.8849105901],
-			'DZ' => [-8.68439978681, 19.0573642034, 11.9995056495, 37.1183806422],
-			'EC' => [-80.9677654691, -4.95912851321, -75.2337227037, 1.3809237736],
-			'EG' => [24.70007, 22.0, 36.86623, 31.58568],
-			'ER' => [36.3231889178, 12.4554157577, 43.0812260272, 17.9983074],
-			'ES' => [-9.39288367353, 35.946850084, 3.03948408368, 43.7483377142],
-			'EE' => [23.3397953631, 57.4745283067, 28.1316992531, 59.6110903998],
-			'ET' => [32.95418, 3.42206, 47.78942, 14.95943],
-			'FI' => [20.6455928891, 59.846373196, 31.5160921567, 70.1641930203],
-			'FJ' => [-180.0, -18.28799, 180.0, -16.0208822567],
-			'FK' => [-61.2, -52.3, -57.75, -51.1],
-			'FR' => [-54.5247541978, 2.05338918702, 9.56001631027, 51.1485061713],
-			'GA' => [8.79799563969, -3.97882659263, 14.4254557634, 2.32675751384],
-			'GB' => [-7.57216793459, 49.959999905, 1.68153079591, 58.6350001085],
-			'GE' => [39.9550085793, 41.0644446885, 46.6379081561, 43.553104153],
-			'GH' => [-3.24437008301, 4.71046214438, 1.0601216976, 11.0983409693],
-			'GN' => [-15.1303112452, 7.3090373804, -7.83210038902, 12.5861829696],
-			'GM' => [-16.8415246241, 13.1302841252, -13.8449633448, 13.8764918075],
-			'GW' => [-16.6774519516, 11.0404116887, -13.7004760401, 12.6281700708],
-			'GQ' => [9.3056132341, 1.01011953369, 11.285078973, 2.28386607504],
-			'GR' => [20.1500159034, 34.9199876979, 26.6041955909, 41.8269046087],
-			'GL' => [-73.297, 60.03676, -12.20855, 83.64513],
-			'GT' => [-92.2292486234, 13.7353376327, -88.2250227526, 17.8193260767],
-			'GY' => [-61.4103029039, 1.26808828369, -56.5393857489, 8.36703481692],
-			'HN' => [-89.3533259753, 12.9846857772, -83.147219001, 16.0054057886],
-			'HR' => [13.6569755388, 42.47999136, 19.3904757016, 46.5037509222],
-			'HT' => [-74.4580336168, 18.0309927434, -71.6248732164, 19.9156839055],
-			'HU' => [16.2022982113, 45.7594811061, 22.710531447, 48.6238540716],
-			'ID' => [95.2930261576, -10.3599874813, 141.03385176, 5.47982086834],
-			'IN' => [68.1766451354, 7.96553477623, 97.4025614766, 35.4940095078],
-			'IE' => [-9.97708574059, 51.6693012559, -6.03298539878, 55.1316222195],
-			'IR' => [44.1092252948, 25.0782370061, 63.3166317076, 39.7130026312],
-			'IQ' => [38.7923405291, 29.0990251735, 48.5679712258, 37.3852635768],
-			'IS' => [-24.3261840479, 63.4963829617, -13.609732225, 66.5267923041],
-			'IL' => [34.2654333839, 29.5013261988, 35.8363969256, 33.2774264593],
-			'IT' => [6.7499552751, 36.619987291, 18.4802470232, 47.1153931748],
-			'JM' => [-78.3377192858, 17.7011162379, -76.1996585761, 18.5242184514],
-			'JO' => [34.9226025734, 29.1974946152, 39.1954683774, 33.3786864284],
-			'JP' => [129.408463169, 31.0295791692, 145.543137242, 45.5514834662],
-			'KZ' => [46.4664457538, 40.6623245306, 87.3599703308, 55.3852501491],
-			'KE' => [33.8935689697, -4.67677, 41.8550830926, 5.506],
-			'KG' => [69.464886916, 39.2794632025, 80.2599902689, 43.2983393418],
-			'KH' => [102.3480994, 10.4865436874, 107.614547968, 14.5705838078],
-			'KR' => [126.117397903, 34.3900458847, 129.468304478, 38.6122429469],
-			'KW' => [46.5687134133, 28.5260627304, 48.4160941913, 30.0590699326],
-			'LA' => [100.115987583, 13.88109101, 107.564525181, 22.4647531194],
-			'LB' => [35.1260526873, 33.0890400254, 36.6117501157, 34.6449140488],
-			'LR' => [-11.4387794662, 4.35575511313, -7.53971513511, 8.54105520267],
-			'LY' => [9.31941084152, 19.58047, 25.16482, 33.1369957545],
-			'LK' => [79.6951668639, 5.96836985923, 81.7879590189, 9.82407766361],
-			'LS' => [26.9992619158, -30.6451058896, 29.3251664568, -28.6475017229],
-			'LT' => [21.0558004086, 53.9057022162, 26.5882792498, 56.3725283881],
-			'LU' => [5.67405195478, 49.4426671413, 6.24275109216, 50.1280516628],
-			'LV' => [21.0558004086, 55.61510692, 28.1767094256, 57.9701569688],
-			'MA' => [-17.0204284327, 21.4207341578, -1.12455115397, 35.7599881048],
-			'MD' => [26.6193367856, 45.4882831895, 30.0246586443, 48.4671194525],
-			'MG' => [43.2541870461, -25.6014344215, 50.4765368996, -12.0405567359],
-			'MX' => [-117.12776, 14.5388286402, -86.811982388, 32.72083],
-			'MK' => [20.46315, 40.8427269557, 22.9523771502, 42.3202595078],
-			'ML' => [-12.1707502914, 10.0963607854, 4.27020999514, 24.9745740829],
-			'MM' => [92.3032344909, 9.93295990645, 101.180005324, 28.335945136],
-			'ME' => [18.45, 41.87755, 20.3398, 43.52384],
-			'MN' => [87.7512642761, 41.5974095729, 119.772823928, 52.0473660345],
-			'MZ' => [30.1794812355, -26.7421916643, 40.7754752948, -10.3170960425],
-			'MR' => [-17.0634232243, 14.6168342147, -4.92333736817, 27.3957441269],
-			'MW' => [32.6881653175, -16.8012997372, 35.7719047381, -9.23059905359],
-			'MY' => [100.085756871, 0.773131415201, 119.181903925, 6.92805288332],
-			'NA' => [11.7341988461, -29.045461928, 25.0844433937, -16.9413428687],
-			'NC' => [164.029605748, -22.3999760881, 167.120011428, -20.1056458473],
-			'NE' => [0.295646396495, 11.6601671412, 15.9032466977, 23.4716684026],
-			'NG' => [2.69170169436, 4.24059418377, 14.5771777686, 13.8659239771],
-			'NI' => [-87.6684934151, 10.7268390975, -83.147219001, 15.0162671981],
-			'NL' => [3.31497114423, 50.803721015, 7.09205325687, 53.5104033474],
-			'NO' => [4.99207807783, 58.0788841824, 31.29341841, 80.6571442736],
-			'NP' => [80.0884245137, 26.3978980576, 88.1748043151, 30.4227169866],
-			'NZ' => [166.509144322, -46.641235447, 178.517093541, -34.4506617165],
-			'OM' => [52.0000098, 16.6510511337, 59.8080603372, 26.3959343531],
-			'PK' => [60.8742484882, 23.6919650335, 77.8374507995, 37.1330309108],
-			'PA' => [-82.9657830472, 7.2205414901, -77.2425664944, 9.61161001224],
-			'PE' => [-81.4109425524, -18.3479753557, -68.6650797187, -0.0572054988649],
-			'PH' => [117.17427453, 5.58100332277, 126.537423944, 18.5052273625],
-			'PG' => [141.000210403, -10.6524760881, 156.019965448, -2.50000212973],
-			'PL' => [14.0745211117, 49.0273953314, 24.0299857927, 54.8515359564],
-			'PR' => [-67.2424275377, 17.946553453, -65.5910037909, 18.5206011011],
-			'KP' => [124.265624628, 37.669070543, 130.780007359, 42.9853868678],
-			'PT' => [-9.52657060387, 36.838268541, -6.3890876937, 42.280468655],
-			'PY' => [-62.6850571357, -27.5484990374, -54.2929595608, -19.3427466773],
-			'QA' => [50.7439107603, 24.5563308782, 51.6067004738, 26.1145820175],
-			'RO' => [20.2201924985, 43.6884447292, 29.62654341, 48.2208812526],
-			'RU' => [-180.0, 41.151416124, 180.0, 81.2504],
-			'RW' => [29.0249263852, -2.91785776125, 30.8161348813, -1.13465911215],
-			'SA' => [34.6323360532, 16.3478913436, 55.6666593769, 32.161008816],
-			'SD' => [21.93681, 8.61972971293, 38.4100899595, 22.0],
-			'SS' => [23.8869795809, 3.50917, 35.2980071182, 12.2480077571],
-			'SN' => [-17.6250426905, 12.332089952, -11.4678991358, 16.5982636581],
-			'SB' => [156.491357864, -10.8263672828, 162.398645868, -6.59933847415],
-			'SL' => [-13.2465502588, 6.78591685631, -10.2300935531, 10.0469839543],
-			'SV' => [-90.0955545723, 13.1490168319, -87.7235029772, 14.4241327987],
-			'SO' => [40.98105, -1.68325, 51.13387, 12.02464],
-			'RS' => [18.82982, 42.2452243971, 22.9860185076, 46.1717298447],
-			'SR' => [-58.0446943834, 1.81766714112, -53.9580446031, 6.0252914494],
-			'SK' => [16.8799829444, 47.7584288601, 22.5581376482, 49.5715740017],
-			'SI' => [13.6981099789, 45.4523163926, 16.5648083839, 46.8523859727],
-			'SE' => [11.0273686052, 55.3617373725, 23.9033785336, 69.1062472602],
-			'SZ' => [30.6766085141, -27.2858794085, 32.0716654803, -25.660190525],
-			'SY' => [35.7007979673, 32.312937527, 42.3495910988, 37.2298725449],
-			'TD' => [13.5403935076, 7.42192454674, 23.88689, 23.40972],
-			'TG' => [-0.0497847151599, 5.92883738853, 1.86524051271, 11.0186817489],
-			'TH' => [97.3758964376, 5.69138418215, 105.589038527, 20.4178496363],
-			'TJ' => [67.4422196796, 36.7381712916, 74.9800024759, 40.9602133245],
-			'TM' => [52.5024597512, 35.2706639674, 66.5461503437, 42.7515510117],
-			'TL' => [124.968682489, -9.39317310958, 127.335928176, -8.27334482181],
-			'TT' => [-61.95, 10.0, -60.895, 10.89],
-			'TN' => [7.52448164229, 30.3075560572, 11.4887874691, 37.3499944118],
-			'TR' => [26.0433512713, 35.8215347357, 44.7939896991, 42.1414848903],
-			'TW' => [120.106188593, 21.9705713974, 121.951243931, 25.2954588893],
-			'TZ' => [29.3399975929, -11.7209380022, 40.31659, -0.95],
-			'UG' => [29.5794661801, -1.44332244223, 35.03599, 4.24988494736],
-			'UA' => [22.0856083513, 44.3614785833, 40.0807890155, 52.3350745713],
-			'UY' => [-58.4270741441, -34.9526465797, -53.209588996, -30.1096863746],
-			'US' => [-171.791110603, 18.91619, -66.96466, 71.3577635769],
-			'UZ' => [55.9289172707, 37.1449940049, 73.055417108, 45.5868043076],
-			'VE' => [-73.3049515449, 0.724452215982, -59.7582848782, 12.1623070337],
-			'VN' => [102.170435826, 8.59975962975, 109.33526981, 23.3520633001],
-			'VU' => [166.629136998, -16.5978496233, 167.844876744, -14.6264970842],
-			'PS' => [34.9274084816, 31.3534353704, 35.5456653175, 32.5325106878],
-			'YE' => [42.6048726743, 12.5859504257, 53.1085726255, 19.0000033635],
-			'ZA' => [16.3449768409, -34.8191663551, 32.830120477, -22.0913127581],
-			'ZM' => [21.887842645, -17.9612289364, 33.4856876971, -8.23825652429],
-			'ZW' => [25.2642257016, -22.2716118303, 32.8498608742, -15.5077869605],
-		];
-
-		if (array_key_exists($country_code, $country_bounding_boxes)) {
-			return $country_bounding_boxes[$country_code];
-		} else {
-			$bounds = self::waymark_array_random_assoc($country_bounding_boxes);
-			//Random
-			return array_pop($bounds);
-
-			//CA
-			//return [-140.99778, 41.6751050889, -52.6480987209, 83.23324];
-
-			//SE
-			//return [11.0273686052, 55.3617373725, 23.9033785336, 69.1062472602];
-
-			//GB
-			//return [-7.57216793459, 49.959999905, 1.68153079591, 58.6350001085];
-		}
-	}
-
-	static function allowable_file($ext = '', $mime = false, $file_image = 'file') {
-		$allowable_mimes = Waymark_Config::get_item('mimes', $file_image);
-
-		//Make always lower
-		$ext = strtolower($ext);
-
-		//Valid extension
-		if (array_key_exists($ext, $allowable_mimes)) {
-			if ($mime === false) {
-				return true;
-			}
-
-			//Check MIME
-			//Single
-			if (is_string($allowable_mimes[$ext])) {
-				return $mime == $allowable_mimes[$ext];
-				//Multiple
-			} elseif (is_array($allowable_mimes[$ext])) {
-				return in_array($mime, $allowable_mimes[$ext]);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * build_icon_data
-	 *
-	 * Builds the data necessary to render an icon
-	 *
-	 * @param  array  $type Type data
-	 * @return array        Icon data
-	 * @since  2024.1
-	 * @access public
-	 * @static
-	 */
-	static public function build_icon_data($type = []) {
-
-		// self::debug($type);
-
-		// If Type key not set
-		if (!isset($type['type_key'])) {
-			//Create Type Key
-			$type['type_key'] = self::make_key($type['marker_title']);
-
-		}
-
-		$icon_data = [
-			'className' => 'waymark-marker waymark-marker-' . $type['type_key'],
-		];
-
-		//Shape
-		if (isset($type['marker_shape']) && isset($type['marker_size'])) {
-			$icon_data['className'] .= ' waymark-marker-' . $type['marker_shape'];
-			$icon_data['className'] .= ' waymark-marker-' . $type['marker_size'];
-
-			switch ($type['marker_shape']) {
-			//Markers & Circles
-			case 'rectangle':
-			case 'circle':
-			case 'marker':
-				//Size
-				switch ($type['marker_size']) {
-				case 'small':
-					$icon_data['iconSize'] = [16, 16];
-
-					break;
-				case 'medium':
-					$icon_data['iconSize'] = [25, 25];
-
-					break;
-				default:
-				case 'large':
-					$icon_data['iconSize'] = [32, 32];
-
-					break;
-				}
-
-				break;
-			}
-
-			//Marker only
-			if ($type['marker_shape'] == 'marker') {
-				$icon_data['iconAnchor'] = [
-					$icon_data['iconSize'][0] / 2,
-					$icon_data['iconSize'][1] * 1.25,
-				];
-			}
-		}
-
-		//CSS Styles
-		$background_css = 'background:' . self::get_marker_background($type['marker_colour']) . ';';
-		$icon_css = 'color:' . $type['icon_colour'] . ';';
-
-		//HTML
-		$icon_data['html'] = '<div class="waymark-marker-background" style="' . $background_css . '"></div>';
-
-		//Classes
-		$icon_class = 'waymark-marker-icon';
-
-		//Text, HTML or Icon Name
-		switch ($type['icon_type']) {
-		//Text
-		case 'text':
-			$icon_class .= ' waymark-icon-text';
-
-			$icon_data['html'] .= '<div style="' . $icon_css . '" class="' . $icon_class . '">' . $type['marker_icon'] . '</div>';
-
-			break;
-
-		//HTML
-		case 'html':
-			$icon_class .= ' waymark-icon-html';
-
-			//Decode HTML entities
-			$icon_html = html_entity_decode($type['marker_icon']);
-
-			$icon_data['html'] .= '<div class="' . $icon_class . '">' . $icon_html . '</div>';
-
-			break;
-
-		//Icon Name
-		case 'icon':
-		default:
-			$icon_class .= ' waymark-icon-icon';
-
-			//If Ionic Icons
-			if (strpos($type['marker_icon'], 'ion-') === 0) {
-				$icon_class .= ' ion ';
-				$icon_class .= ' ' . $type['marker_icon'];
-				//Font Awesome
-			} elseif (strpos($type['marker_icon'], 'fa-') === 0) {
-				$icon_class .= ' fa';
-				$icon_class .= ' ' . $type['marker_icon'];
-				//Default to Ionic
-			} else {
-				$icon_class .= ' ion';
-				$icon_class .= ' ion-' . $type['marker_icon'];
-			}
-
-			$icon_data['html'] .= '<i style="' . $icon_css . '" class="' . $icon_class . '"></i>';
-
-			break;
-		}
-
-		return $icon_data;
-	}
-
-	/**
-	 * build_icon_html
-	 * Builds the HTML for an icon
-	 * @param  array  $icon_data Icon data
-	 * @return string            HTML
-	 * @since  2024.1
-	 * @access public
-	 * @static
-	 */
-	static public function build_icon_html($icon_data = []) {
-
-		// self::debug($icon_data);
-
-		$icon_html = '<div class="' . $icon_data['className'] . '">';
-
-		//HTML
-		if (isset($icon_data['html'])) {
-			$icon_html .= $icon_data['html'];
-		}
-
-		$icon_html .= '</div>';
-
-		return $icon_html;
-
-	}
-
-	/**
-	 *
-	 * Converts old background options to new ones
-	 *
-	 * @param  string $colour Colour
-	 * @return string         Colour
-	 * @since  2024.1
-	 * @access public
-	 * @static
-	 *
-	 */
-	public static function get_marker_background($colour = '') {
-		$old_background_options = [
-			'red',
-			'darkred',
-			'orange',
-			'green',
-			'darkgreen',
-			'blue',
-			'purple',
-			'darkpurple',
-			'cadetblue',
-			'white',
-			'black',
-		];
-
-		//Convert
-		if (in_array($colour, $old_background_options)) {
-			switch ($colour) {
-			case 'red':
-				return '#da3d20';
-				break;
-			case 'darkred':
-				return '#a43233';
-				break;
-			case 'orange':
-				return '#f9960a';
-				break;
-			case 'green':
-				return '#70af00';
-				break;
-			case 'darkgreen':
-				return '#72820d';
-				break;
-			case 'blue':
-				return '#2aabe1';
-				break;
-			case 'purple':
-				return '#d553bd';
-				break;
-			case 'darkpurple':
-				return '#5c3a6e';
-				break;
-			case 'cadetblue':
-				return '#416979';
-				break;
-			case 'white':
-				return '#fbfbfb';
-				break;
-			case 'black':
-				return '#303030';
-				break;
-			}
-		}
-
-		return $colour;
-	}
-
-	/**
-	 *
-	 * Builds the HTML content for an overlay
-	 *
-	 * @param  array  $feature      Feature array
-	 * @param  string $feature_type Feature type
-	 * @param  array  $type_data    Type data
-	 * @return string               HTML content
-	 * @since  2024.1
-	 * @access public
-	 * @static
-	 *
-	 */
-	public static function build_overlay_content($feature = [], $feature_type = 'marker', $type_data = []) {
-
-		// Switch by feature_type
-		switch ($feature_type) {
-		case 'marker':
-			$content = '<div class="waymark-overlay-content waymark-overlay-marker" data-marker_latlng="' . $feature['geometry']['coordinates'][1] . ',' . $feature['geometry']['coordinates'][0] . '">' . "\n";
-
-			break;
-
-		default:
-			$content = '<div class="waymark-overlay-content waymark-overlay-' . $feature_type . '">' . "\n";
-
-			break;
-		}
-
-		// If we don't have type data
-		if (empty($type_data)) {
-			// Get Type Data
-			$type_data = self::get_type_data($feature_type, $feature['properties']['type_key']);
-
-			self::debug($type_data);
-
-		}
-
-		//Expected Waymark properties
-		// i.e. array('radius', 'type', 'title', 'description', 'image_thumbnail_url', 'image_medium_url', 'image_large_url')
-		foreach (Waymark_Helper::get_overlay_properties() as $property_key) {
-			//Property not set
-			if (!isset($feature['properties'][$property_key])) {
-				continue;
-			}
-
-			//Wrap in div
-			$content .= '<div class="waymark-overlay-property waymark-overlay-property-' . $property_key . '">';
-
-			switch ($property_key) {
-
-			//Title
-			case 'title':
-				$title = $feature['properties']['title'];
-
-				//We have a title
-				if ($title) {
-					$content .= '<strong>' . $feature['properties']['title'] . '</strong>';
-					//No description
-				} else {
-					$content .= '<strong>' . $type_data['type_title'] . '</strong>';
-				}
-
-				break;
-
-			//Type
-			case 'type':
-				$content .= self::type_to_text($feature_type, $type_data, 'small');
-
-				break;
-
-			//Description
-			case 'description':
-				$description = $feature['properties']['description'];
-
-				//We have a description
-				if ($description) {
-					//HTML
-					if (strpos($description, '<') === 0) {
-						$content .= $description;
-						//Plain text
-					} else {
-						$content .= '<p>' . $description . '</p>';
-					}
-					//No description
-				} else {
-					$content .= '<p>&nbsp;</p>';
-				}
-
-				break;
-
-			//Image
-			case 'image_large_url':
-				//We have an image
-				if (isset($feature['properties']['image_large_url'])) {
-					//Use Medium if we have it
-					$thumb_url = $feature['properties']['image_large_url'];
-					if (isset($feature['properties']['image_medium_url'])) {
-						$thumb_url = $feature['properties']['image_medium_url'];
-					}
-
-					$content .= '<a href="' . $feature['properties']['image_large_url'] . '" target="_blank" style="background-image:url(' . $thumb_url . ')"></a>';
-					//We don't have an image
-				} else {
-					$content .= '<p>&nbsp;</p>';
-				}
-
-				break;
-
-			}
-
-			$content .= '</div>';
-		}
-
-		$content .= '</div>';
-
-		return $content;
-	}
-
-	/**
-	 *
-	 * Represent Type as text
-	 *
-	 * Outputs a textual representation of a type, coloured according to the type's colour Settings
-	 * https://www.waymark.dev/docs/settings/
-	 *
-	 * @param string $feature_type - marker, line, shape
-	 * @param array $type_data - array of type data, must have these keys: type_key, type_title, marker_colour, icon_colour
-	 * @param string $ele - HTML element to use to wrap the output
-	 * @return string
-	 * @since  2024.1
-	 * @access public
-	 * @static
-	 */
-	public static function type_to_text($feature_type = '', $type_data = [], $ele = 'span') {
-		$preview_class = 'waymark-type-text waymark-' . $feature_type . '-type';
-		$preview_style = '';
-
-		switch ($feature_type) {
-		case 'marker':
-			$preview_style .= 'color:' . $type_data['icon_colour'] . ';';
-			$preview_style .= 'background:' . self::get_marker_background($type_data['marker_colour']);
-
-			break;
-		case 'line':
-			$preview_style .= 'color:' . $type_data['line_colour'] . ';box-shadow:inset 0 0 0 1px ' . $type_data['line_colour'];
-
-			break;
-		case 'shape':
-			$preview_style .= 'background:' . $type_data['shape_colour'];
-
-			break;
-		}
-
-		return '<' . $ele . ' class="' . $preview_class . '" style="' . $preview_style . '">' . $type_data[$feature_type . '_title'] . '</' . $ele . '>';
-	}
-
-	/**
-	 *
-	 * Creates the HTML strucuture for the overlays list
-	 *
-	 * $overlays must have one of these keys: markers, lines, shapes containing an array of overlays
-	 * Waymark_GeoJSON::features_by_overlay_type() is a good way to get this data
-	 *
-	 * Markers/Lines/Shapes are displayed separately and divided into types
-	 * Types are displayed as a header with a count
-	 * Each overlay is displayed as a list item
-	 * Each overlay has a title, description and image
-	 *
-	 * @param  array $overlays	An array containing 'marker' => [ $markers ], 'line' => [ $lines ], 'shape' => [ $shapes ]
-	 * @return string			HTML
-	 * @since  2024.1
-	 * @access public
-	 * @static
-	 *
-	 */
-	public static function overlays_list_html($overlays = []) {
-		$out = '';
-
-		if (!sizeof($overlays)) {
-			return $out;
-		}
-
-		// $overlays must have one of these keys: markers, lines, shapes
-		if (!array_key_exists('markers', $overlays) && !array_key_exists('lines', $overlays) && !array_key_exists('shapes', $overlays)) {
-			return $out;
-		}
-
-		// self::debug($overlays);
-
-		foreach ($overlays as $overlay_type => $overlay) {
-			// $overlay must be an array
-			if (!is_array($overlay)) {
-				continue;
-			}
-
-			$out .= '<div class="waymark-overlays-list">' . "\n";
-
-			switch ($overlay_type) {
-			case 'markers':
-				// Wrapper
-				$out .= '<div class="waymark-overlay-list waymark-overlay-markers">' . "\n";
-				$out .= '	<div class="waymark-title">' . __('Markers', 'waymark') . '</div>' . "\n";
-				$out .= '	<div class="waymark-overlays">' . "\n";
-
-				// Every marker type
-				foreach ($overlay as $marker_type => $markers) {
-					// Ensure we have markers
-					if (!sizeof($markers)) {
-						continue;
-					}
-
-					// Get type data
-					$type_data = self::get_type_data('marker', $marker_type);
-
-					if (!$type_data) {
-						continue;
-					}
-
-					// Wrapper for Type
-					$out .= '		<div class="waymark-type waymark-type-' . $marker_type . '" data-type_key="' . $marker_type . '">' . "\n";
-
-					//Output Title, Icon and count
-					$icon_data = self::build_icon_data($type_data);
-					$icon_html = self::build_icon_html($icon_data);
-
-					$out .= '		<div class="waymark-header" style="background-color:' . $type_data['marker_colour'] . ';color:' . $type_data['icon_colour'] . ';">' . "\n";
-					$out .= '			<div class="waymark-type-icon">' . $icon_html . '</div>' . "\n";
-					$out .= '			<div class="waymark-type-title">' . $type_data['marker_title'] . '</div>' . "\n";
-					$out .= '			<div class="waymark-type-count">' . sizeof($markers) . '</div>' . "\n";
-					$out .= '		</div>' . "\n";
-
-					// Iterate over markers
-					foreach ($markers as $marker) {
-						$out .= self::build_overlay_content($marker, 'marker', $type_data);
-					}
-
-					$out .= '		</div>' . "\n";
-				}
-
-				$out .= '	</div>' . "\n";
-				$out .= '</div>' . "\n";
-
-				break;
-			case 'lines':
-				// Get valid line types
-				$line_types = self::get_overlay_types('line', 'line_title');
-
-				// Wrapper
-				$out .= '<div class="waymark-overlays waymark-lines">' . "\n";
-
-				// Every line type
-				foreach ($overlay as $line_type => $lines) {
-					// Ensure is valid line type
-					if (!array_key_exists($line_type, $line_types)) {
-						continue;
-					}
-
-					$out .= '<li>' . $line_type . ' (' . sizeof($lines) . ')</li>' . "\n";
-				}
-				$out .= '</div>' . "\n";
-
-				break;
-			case 'shapes':
-				// Get valid shape types
-				$shape_types = self::get_overlay_types('shape', 'shape_title');
-
-				// Wrapper
-				$out .= '<div class="waymark-overlays waymark-shapes">' . "\n";
-
-				// Every shape type
-				foreach ($overlay as $shape_type => $shapes) {
-
-					// Ensure is valid shape type
-					if (!array_key_exists($shape_type, $shape_types)) {
-						continue;
-					}
-
-					$out .= '<li>' . $shape_type . ' (' . sizeof($shapes) . ')</li>' . "\n";
-				}
-				$out .= '</div>' . "\n";
-
-				break;
-			}
-		}
-
-		$out .= '</div>' . "\n";
-
-		return $out;
-	}
-
-	public static function get_overlay_properties() {
-		$default = Waymark_Config::get_item('overlay_properties');
-
-		// Additional GeoJSON Properties
-		$extra = Waymark_Config::get_item('properties', 'props', true);
-		$extra = Waymark_Helper::multi_use_as_key($extra, 'property_key');
-
-		if (sizeof($extra)) {
-			// Key an array of property keys
-			$extra = array_keys($extra);
-		}
-
-		return array_merge($default, $extra);
-	}
-}
\ No newline at end of file
+        if (! isset($Collection->collection_id)) {
+            return false;
+        }
+
+        $element = (is_admin()) ? 'div' : 'form';
+
+        $out = '<' . $element . ' action="' . self::http_url() . '" method="post" id="waymark-map-export-' . $Collection->collection_id . '" class="waymark-map-export" data-collection_id="' . $Collection->collection_id . '" data-collection_slug="' . $Collection->slug . '">' . "\n";
+        $out .= '	<select name="export_format">' . "\n";
+        $out .= '		<option value="gpx">GPX</option>' . "\n";
+        $out .= '		<option value="kml">KML</option>' . "\n";
+        $out .= '		<option value="geojson">GeoJSON</option>' . "\n";
+        $out .= '	</select>' . "\n";
+        $out .= '	<input type="hidden" name="waymark_action" value="download_collection_data" />' . "\n";
+        $out .= '	<input type="hidden" name="waymark_security" value="' . wp_create_nonce(Waymark_Config::get_item('nonce_string')) . '" />' . "\n";
+        $out .= '	<input type="hidden" name="map_data" value="" />' . "\n";
+        $out .= '	<input type="hidden" name="collection_id" value="' . $Collection->collection_id . '" />' . "\n";
+        $out .= '	<input type="submit" value="' . __('Download', 'waymark') . '" class="button" />' . "\n";
+        $out .= '</' . $element . '>' . "\n";
+
+        return $out;
+    }
+
+    public static function get_section_repeatable_count($section_data)
+    {
+        $first_field = $section_data['fields'][array_keys($section_data['fields'])[0]];
+
+        if (is_array($first_field['default'])) {
+            return sizeof($first_field['default']);
+        }
+
+        return false;
+    }
+
+    public static function repeatable_setting_option_array($tab, $section, $key)
+    {
+        $options_array = [];
+        $values        = Waymark_Config::get_item($tab, $section, true);
+
+        if (! is_array($values)) {
+            return null;
+        }
+
+        foreach ($values as $s) {
+            //If exists
+            if (array_key_exists($key, $s)) {
+                //Add as option
+                $options_array[self::make_key($s[$key])] = $s[$key];
+            }
+        }
+
+        return $options_array;
+    }
+
+    /**
+     * =====================================
+     * ============ Submission =============
+     * =====================================
+     */
+
+    public static function country_code_to_bounds($country_code = '')
+    {
+        $country_bounding_boxes = [
+            'AF' => [60.5284298033, 29.318572496, 75.1580277851, 38.4862816432],
+            'AO' => [11.6400960629, -17.9306364885, 24.0799052263, -4.43802336998],
+            'AL' => [19.3044861183, 39.624997667, 21.0200403175, 42.6882473822],
+            'AE' => [51.5795186705, 22.4969475367, 56.3968473651, 26.055464179],
+            'AR' => [-73.4154357571, -55.25, -53.628348965, -21.8323104794],
+            'AM' => [43.5827458026, 38.7412014837, 46.5057198423, 41.2481285671],
+            'AQ' => [-180.0, -90.0, 180.0, -63.2706604895],
+            'TF' => [68.72, -49.775, 70.56, -48.625],
+            'AU' => [113.338953078, -43.6345972634, 153.569469029, -10.6681857235],
+            'AT' => [9.47996951665, 46.4318173285, 16.9796667823, 49.0390742051],
+            'AZ' => [44.7939896991, 38.2703775091, 50.3928210793, 41.8606751572],
+            'BI' => [29.0249263852, -4.49998341229, 30.752262811, -2.34848683025],
+            'BE' => [2.51357303225, 49.5294835476, 6.15665815596, 51.4750237087],
+            'BJ' => [0.772335646171, 6.14215770103, 3.79711225751, 12.2356358912],
+            'BF' => [-5.47056494793, 9.61083486576, 2.17710778159, 15.1161577418],
+            'BD' => [88.0844222351, 20.670883287, 92.6727209818, 26.4465255803],
+            'BG' => [22.3805257504, 41.2344859889, 28.5580814959, 44.2349230007],
+            'BS' => [-78.98, 23.71, -77.0, 27.04],
+            'BA' => [15.7500260759, 42.65, 19.59976, 45.2337767604],
+            'BY' => [23.1994938494, 51.3195034857, 32.6936430193, 56.1691299506],
+            'BZ' => [-89.2291216703, 15.8869375676, -88.1068129138, 18.4999822047],
+            'BO' => [-69.5904237535, -22.8729187965, -57.4983711412, -9.76198780685],
+            'BR' => [-73.9872354804, -33.7683777809, -34.7299934555, 5.24448639569],
+            'BN' => [114.204016555, 4.007636827, 115.450710484, 5.44772980389],
+            'BT' => [88.8142484883, 26.7194029811, 92.1037117859, 28.2964385035],
+            'BW' => [19.8954577979, -26.8285429827, 29.4321883481, -17.6618156877],
+            'CF' => [14.4594071794, 2.2676396753, 27.3742261085, 11.1423951278],
+            'CA' => [-140.99778, 41.6751050889, -52.6480987209, 83.23324],
+            'CH' => [6.02260949059, 45.7769477403, 10.4427014502, 47.8308275417],
+            'CL' => [-75.6443953112, -55.61183, -66.95992, -17.5800118954],
+            'CN' => [73.6753792663, 18.197700914, 135.026311477, 53.4588044297],
+            'CI' => [-8.60288021487, 4.33828847902, -2.56218950033, 10.5240607772],
+            'CM' => [8.48881554529, 1.72767263428, 16.0128524106, 12.8593962671],
+            'CD' => [12.1823368669, -13.2572266578, 31.1741492042, 5.25608775474],
+            'CG' => [11.0937728207, -5.03798674888, 18.4530652198, 3.72819651938],
+            'CO' => [-78.9909352282, -4.29818694419, -66.8763258531, 12.4373031682],
+            'CR' => [-85.94172543, 8.22502798099, -82.5461962552, 11.2171192489],
+            'CU' => [-84.9749110583, 19.8554808619, -74.1780248685, 23.1886107447],
+            'CY' => [32.2566671079, 34.5718694118, 34.0048808123, 35.1731247015],
+            'CZ' => [12.2401111182, 48.5553052842, 18.8531441586, 51.1172677679],
+            'DE' => [5.98865807458, 47.3024876979, 15.0169958839, 54.983104153],
+            'DJ' => [41.66176, 10.9268785669, 43.3178524107, 12.6996385767],
+            'DK' => [8.08997684086, 54.8000145534, 12.6900061378, 57.730016588],
+            'DO' => [-71.9451120673, 17.598564358, -68.3179432848, 19.8849105901],
+            'DZ' => [-8.68439978681, 19.0573642034, 11.9995056495, 37.1183806422],
+            'EC' => [-80.9677654691, -4.95912851321, -75.2337227037, 1.3809237736],
+            'EG' => [24.70007, 22.0, 36.86623, 31.58568],
+            'ER' => [36.3231889178, 12.4554157577, 43.0812260272, 17.9983074],
+            'ES' => [-9.39288367353, 35.946850084, 3.03948408368, 43.7483377142],
+            'EE' => [23.3397953631, 57.4745283067, 28.1316992531, 59.6110903998],
+            'ET' => [32.95418, 3.42206, 47.78942, 14.95943],
+            'FI' => [20.6455928891, 59.846373196, 31.5160921567, 70.1641930203],
+            'FJ' => [-180.0, -18.28799, 180.0, -16.0208822567],
+            'FK' => [-61.2, -52.3, -57.75, -51.1],
+            'FR' => [-54.5247541978, 2.05338918702, 9.56001631027, 51.1485061713],
+            'GA' => [8.79799563969, -3.97882659263, 14.4254557634, 2.32675751384],
+            'GB' => [-7.57216793459, 49.959999905, 1.68153079591, 58.6350001085],
+            'GE' => [39.9550085793, 41.0644446885, 46.6379081561, 43.553104153],
+            'GH' => [-3.24437008301, 4.71046214438, 1.0601216976, 11.0983409693],
+            'GN' => [-15.1303112452, 7.3090373804, -7.83210038902, 12.5861829696],
+            'GM' => [-16.8415246241, 13.1302841252, -13.8449633448, 13.8764918075],
+            'GW' => [-16.6774519516, 11.0404116887, -13.7004760401, 12.6281700708],
+            'GQ' => [9.3056132341, 1.01011953369, 11.285078973, 2.28386607504],
+            'GR' => [20.1500159034, 34.9199876979, 26.6041955909, 41.8269046087],
+            'GL' => [-73.297, 60.03676, -12.20855, 83.64513],
+            'GT' => [-92.2292486234, 13.7353376327, -88.2250227526, 17.8193260767],
+            'GY' => [-61.4103029039, 1.26808828369, -56.5393857489, 8.36703481692],
+            'HN' => [-89.3533259753, 12.9846857772, -83.147219001, 16.0054057886],
+            'HR' => [13.6569755388, 42.47999136, 19.3904757016, 46.5037509222],
+            'HT' => [-74.4580336168, 18.0309927434, -71.6248732164, 19.9156839055],
+            'HU' => [16.2022982113, 45.7594811061, 22.710531447, 48.6238540716],
+            'ID' => [95.2930261576, -10.3599874813, 141.03385176, 5.47982086834],
+            'IN' => [68.1766451354, 7.96553477623, 97.4025614766, 35.4940095078],
+            'IE' => [-9.97708574059, 51.6693012559, -6.03298539878, 55.1316222195],
+            'IR' => [44.1092252948, 25.0782370061, 63.3166317076, 39.7130026312],
+            'IQ' => [38.7923405291, 29.0990251735, 48.5679712258, 37.3852635768],
+            'IS' => [-24.3261840479, 63.4963829617, -13.609732225, 66.5267923041],
+            'IL' => [34.2654333839, 29.5013261988, 35.8363969256, 33.2774264593],
+            'IT' => [6.7499552751, 36.619987291, 18.4802470232, 47.1153931748],
+            'JM' => [-78.3377192858, 17.7011162379, -76.1996585761, 18.5242184514],
+            'JO' => [34.9226025734, 29.1974946152, 39.1954683774, 33.3786864284],
+            'JP' => [129.408463169, 31.0295791692, 145.543137242, 45.5514834662],
+            'KZ' => [46.4664457538, 40.6623245306, 87.3599703308, 55.3852501491],
+            'KE' => [33.8935689697, -4.67677, 41.8550830926, 5.506],
+            'KG' => [69.464886916, 39.2794632025, 80.2599902689, 43.2983393418],
+            'KH' => [102.3480994, 10.4865436874, 107.614547968, 14.5705838078],
+            'KR' => [126.117397903, 34.3900458847, 129.468304478, 38.6122429469],
+            'KW' => [46.5687134133, 28.5260627304, 48.4160941913, 30.0590699326],
+            'LA' => [100.115987583, 13.88109101, 107.564525181, 22.4647531194],
+            'LB' => [35.1260526873, 33.0890400254, 36.6117501157, 34.6449140488],
+            'LR' => [-11.4387794662, 4.35575511313, -7.53971513511, 8.54105520267],
+            'LY' => [9.31941084152, 19.58047, 25.16482, 33.1369957545],
+            'LK' => [79.6951668639, 5.96836985923, 81.7879590189, 9.82407766361],
+            'LS' => [26.9992619158, -30.6451058896, 29.3251664568, -28.6475017229],
+            'LT' => [21.0558004086, 53.9057022162, 26.5882792498, 56.3725283881],
+            'LU' => [5.67405195478, 49.4426671413, 6.24275109216, 50.1280516628],
+            'LV' => [21.0558004086, 55.61510692, 28.1767094256, 57.9701569688],
+            'MA' => [-17.0204284327, 21.4207341578, -1.12455115397, 35.7599881048],
+            'MD' => [26.6193367856, 45.4882831895, 30.0246586443, 48.4671194525],
+            'MG' => [43.2541870461, -25.6014344215, 50.4765368996, -12.0405567359],
+            'MX' => [-117.12776, 14.5388286402, -86.811982388, 32.72083],
+            'MK' => [20.46315, 40.8427269557, 22.9523771502, 42.3202595078],
+            'ML' => [-12.1707502914, 10.0963607854, 4.27020999514, 24.9745740829],
+            'MM' => [92.3032344909, 9.93295990645, 101.180005324, 28.335945136],
+            'ME' => [18.45, 41.87755, 20.3398, 43.52384],
+            'MN' => [87.7512642761, 41.5974095729, 119.772823928, 52.0473660345],
+            'MZ' => [30.1794812355, -26.7421916643, 40.7754752948, -10.3170960425],
+            'MR' => [-17.0634232243, 14.6168342147, -4.92333736817, 27.3957441269],
+            'MW' => [32.6881653175, -16.8012997372, 35.7719047381, -9.23059905359],
+            'MY' => [100.085756871, 0.773131415201, 119.181903925, 6.92805288332],
+            'NA' => [11.7341988461, -29.045461928, 25.0844433937, -16.9413428687],
+            'NC' => [164.029605748, -22.3999760881, 167.120011428, -20.1056458473],
+            'NE' => [0.295646396495, 11.6601671412, 15.9032466977, 23.4716684026],
+            'NG' => [2.69170169436, 4.24059418377, 14.5771777686, 13.8659239771],
+            'NI' => [-87.6684934151, 10.7268390975, -83.147219001, 15.0162671981],
+            'NL' => [3.31497114423, 50.803721015, 7.09205325687, 53.5104033474],
+            'NO' => [4.99207807783, 58.0788841824, 31.29341841, 80.6571442736],
+            'NP' => [80.0884245137, 26.3978980576, 88.1748043151, 30.4227169866],
+            'NZ' => [166.509144322, -46.641235447, 178.517093541, -34.4506617165],
+            'OM' => [52.0000098, 16.6510511337, 59.8080603372, 26.3959343531],
+            'PK' => [60.8742484882, 23.6919650335, 77.8374507995, 37.1330309108],
+            'PA' => [-82.9657830472, 7.2205414901, -77.2425664944, 9.61161001224],
+            'PE' => [-81.4109425524, -18.3479753557, -68.6650797187, -0.0572054988649],
+            'PH' => [117.17427453, 5.58100332277, 126.537423944, 18.5052273625],
+            'PG' => [141.000210403, -10.6524760881, 156.019965448, -2.50000212973],
+            'PL' => [14.0745211117, 49.0273953314, 24.0299857927, 54.8515359564],
+            'PR' => [-67.2424275377, 17.946553453, -65.5910037909, 18.5206011011],
+            'KP' => [124.265624628, 37.669070543, 130.780007359, 42.9853868678],
+            'PT' => [-9.52657060387, 36.838268541, -6.3890876937, 42.280468655],
+            'PY' => [-62.6850571357, -27.5484990374, -54.2929595608, -19.3427466773],
+            'QA' => [50.7439107603, 24.5563308782, 51.6067004738, 26.1145820175],
+            'RO' => [20.2201924985, 43.6884447292, 29.62654341, 48.2208812526],
+            'RU' => [-180.0, 41.151416124, 180.0, 81.2504],
+            'RW' => [29.0249263852, -2.91785776125, 30.8161348813, -1.13465911215],
+            'SA' => [34.6323360532, 16.3478913436, 55.6666593769, 32.161008816],
+            'SD' => [21.93681, 8.61972971293, 38.4100899595, 22.0],
+            'SS' => [23.8869795809, 3.50917, 35.2980071182, 12.2480077571],
+            'SN' => [-17.6250426905, 12.332089952, -11.4678991358, 16.5982636581],
+            'SB' => [156.491357864, -10.8263672828, 162.398645868, -6.59933847415],
+            'SL' => [-13.2465502588, 6.78591685631, -10.2300935531, 10.0469839543],
+            'SV' => [-90.0955545723, 13.1490168319, -87.7235029772, 14.4241327987],
+            'SO' => [40.98105, -1.68325, 51.13387, 12.02464],
+            'RS' => [18.82982, 42.2452243971, 22.9860185076, 46.1717298447],
+            'SR' => [-58.0446943834, 1.81766714112, -53.9580446031, 6.0252914494],
+            'SK' => [16.8799829444, 47.7584288601, 22.5581376482, 49.5715740017],
+            'SI' => [13.6981099789, 45.4523163926, 16.5648083839, 46.8523859727],
+            'SE' => [11.0273686052, 55.3617373725, 23.9033785336, 69.1062472602],
+            'SZ' => [30.6766085141, -27.2858794085, 32.0716654803, -25.660190525],
+            'SY' => [35.7007979673, 32.312937527, 42.3495910988, 37.2298725449],
+            'TD' => [13.5403935076, 7.42192454674, 23.88689, 23.40972],
+            'TG' => [-0.0497847151599, 5.92883738853, 1.86524051271, 11.0186817489],
+            'TH' => [97.3758964376, 5.69138418215, 105.589038527, 20.4178496363],
+            'TJ' => [67.4422196796, 36.7381712916, 74.9800024759, 40.9602133245],
+            'TM' => [52.5024597512, 35.2706639674, 66.5461503437, 42.7515510117],
+            'TL' => [124.968682489, -9.39317310958, 127.335928176, -8.27334482181],
+            'TT' => [-61.95, 10.0, -60.895, 10.89],
+            'TN' => [7.52448164229, 30.3075560572, 11.4887874691, 37.3499944118],
+            'TR' => [26.0433512713, 35.8215347357, 44.7939896991, 42.1414848903],
+            'TW' => [120.106188593, 21.9705713974, 121.951243931, 25.2954588893],
+            'TZ' => [29.3399975929, -11.7209380022, 40.31659, -0.95],
+            'UG' => [29.5794661801, -1.44332244223, 35.03599, 4.24988494736],
+            'UA' => [22.0856083513, 44.3614785833, 40.0807890155, 52.3350745713],
+            'UY' => [-58.4270741441, -34.9526465797, -53.209588996, -30.1096863746],
+            'US' => [-171.791110603, 18.91619, -66.96466, 71.3577635769],
+            'UZ' => [55.9289172707, 37.1449940049, 73.055417108, 45.5868043076],
+            'VE' => [-73.3049515449, 0.724452215982, -59.7582848782, 12.1623070337],
+            'VN' => [102.170435826, 8.59975962975, 109.33526981, 23.3520633001],
+            'VU' => [166.629136998, -16.5978496233, 167.844876744, -14.6264970842],
+            'PS' => [34.9274084816, 31.3534353704, 35.5456653175, 32.5325106878],
+            'YE' => [42.6048726743, 12.5859504257, 53.1085726255, 19.0000033635],
+            'ZA' => [16.3449768409, -34.8191663551, 32.830120477, -22.0913127581],
+            'ZM' => [21.887842645, -17.9612289364, 33.4856876971, -8.23825652429],
+            'ZW' => [25.2642257016, -22.2716118303, 32.8498608742, -15.5077869605],
+        ];
+
+        if (array_key_exists($country_code, $country_bounding_boxes)) {
+            return $country_bounding_boxes[$country_code];
+        } else {
+            $bounds = self::waymark_array_random_assoc($country_bounding_boxes);
+            //Random
+            return array_pop($bounds);
+
+            //CA
+            //return [-140.99778, 41.6751050889, -52.6480987209, 83.23324];
+
+            //SE
+            //return [11.0273686052, 55.3617373725, 23.9033785336, 69.1062472602];
+
+            //GB
+            //return [-7.57216793459, 49.959999905, 1.68153079591, 58.6350001085];
+        }
+    }
+
+    public static function allowable_file($ext = '', $mime = false, $file_image = 'file')
+    {
+        $allowable_mimes = Waymark_Config::get_item('mimes', $file_image);
+
+        //Make always lower
+        $ext = strtolower($ext);
+
+        //Valid extension
+        if (array_key_exists($ext, $allowable_mimes)) {
+            if ($mime === false) {
+                return true;
+            }
+
+            //Check MIME
+            //Single
+            if (is_string($allowable_mimes[$ext])) {
+                return $mime == $allowable_mimes[$ext];
+                //Multiple
+            } elseif (is_array($allowable_mimes[$ext])) {
+                return in_array($mime, $allowable_mimes[$ext]);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * build_icon_data
+     *
+     * Builds the data necessary to render an icon
+     *
+     * @param  array  $type Type data
+     * @return array        Icon data
+     * @since  2024.1
+     * @access public
+     * @static
+     */
+    public static function build_icon_data($type = [])
+    {
+
+        // self::debug($type);
+
+        // If Type key not set
+        if (! isset($type['type_key'])) {
+            //Create Type Key
+            $type['type_key'] = self::make_key($type['marker_title']);
+
+        }
+
+        $icon_data = [
+            'className' => 'waymark-marker waymark-marker-' . $type['type_key'],
+        ];
+
+        //Shape
+        if (isset($type['marker_shape']) && isset($type['marker_size'])) {
+            $icon_data['className'] .= ' waymark-marker-' . $type['marker_shape'];
+            $icon_data['className'] .= ' waymark-marker-' . $type['marker_size'];
+
+            switch ($type['marker_shape']) {
+                //Markers & Circles
+                case 'rectangle':
+                case 'circle':
+                case 'marker':
+                    //Size
+                    switch ($type['marker_size']) {
+                        case 'small':
+                            $icon_data['iconSize'] = [16, 16];
+
+                            break;
+                        case 'medium':
+                            $icon_data['iconSize'] = [25, 25];
+
+                            break;
+                        default:
+                        case 'large':
+                            $icon_data['iconSize'] = [32, 32];
+
+                            break;
+                    }
+
+                    break;
+            }
+
+            //Marker only
+            if ($type['marker_shape'] == 'marker') {
+                $icon_data['iconAnchor'] = [
+                    $icon_data['iconSize'][0] / 2,
+                    $icon_data['iconSize'][1] * 1.25,
+                ];
+            }
+        }
+
+        //CSS Styles
+        $background_css = 'background:' . self::get_marker_background($type['marker_colour']) . ';';
+        $icon_css       = 'color:' . $type['icon_colour'] . ';';
+
+        //HTML
+        $icon_data['html'] = '<div class="waymark-marker-background" style="' . $background_css . '"></div>';
+
+        //Classes
+        $icon_class = 'waymark-marker-icon';
+
+        //Text, HTML or Icon Name
+        switch ($type['icon_type']) {
+            //Text
+            case 'text':
+                $icon_class .= ' waymark-icon-text';
+
+                $icon_data['html'] .= '<div style="' . $icon_css . '" class="' . $icon_class . '">' . $type['marker_icon'] . '</div>';
+
+                break;
+
+            //HTML
+            case 'html':
+                $icon_class .= ' waymark-icon-html';
+
+                //Decode HTML entities
+                $icon_html = html_entity_decode($type['marker_icon']);
+
+                $icon_data['html'] .= '<div class="' . $icon_class . '">' . $icon_html . '</div>';
+
+                break;
+
+            //Icon Name
+            case 'icon':
+            default:
+                $icon_class .= ' waymark-icon-icon';
+
+                //If Ionic Icons
+                if (strpos($type['marker_icon'], 'ion-') === 0) {
+                    $icon_class .= ' ion ';
+                    $icon_class .= ' ' . $type['marker_icon'];
+                    //Font Awesome
+                } elseif (strpos($type['marker_icon'], 'fa-') === 0) {
+                    $icon_class .= ' fa';
+                    $icon_class .= ' ' . $type['marker_icon'];
+                    //Default to Ionic
+                } else {
+                    $icon_class .= ' ion';
+                    $icon_class .= ' ion-' . $type['marker_icon'];
+                }
+
+                $icon_data['html'] .= '<i style="' . $icon_css . '" class="' . $icon_class . '"></i>';
+
+                break;
+        }
+
+        return $icon_data;
+    }
+
+    /**
+     * build_icon_html
+     * Builds the HTML for an icon
+     * @param  array  $icon_data Icon data
+     * @return string            HTML
+     * @since  2024.1
+     * @access public
+     * @static
+     */
+    public static function build_icon_html($icon_data = [])
+    {
+
+        // self::debug($icon_data);
+
+        $icon_html = '<div class="' . $icon_data['className'] . '">';
+
+        //HTML
+        if (isset($icon_data['html'])) {
+            $icon_html .= $icon_data['html'];
+        }
+
+        $icon_html .= '</div>';
+
+        return $icon_html;
+
+    }
+
+    /**
+     *
+     * Converts old background options to new ones
+     *
+     * @param  string $colour Colour
+     * @return string         Colour
+     * @since  2024.1
+     * @access public
+     * @static
+     *
+     */
+    public static function get_marker_background($colour = '')
+    {
+        $old_background_options = [
+            'red',
+            'darkred',
+            'orange',
+            'green',
+            'darkgreen',
+            'blue',
+            'purple',
+            'darkpurple',
+            'cadetblue',
+            'white',
+            'black',
+        ];
+
+        //Convert
+        if (in_array($colour, $old_background_options)) {
+            switch ($colour) {
+                case 'red':
+                    return '#da3d20';
+                    break;
+                case 'darkred':
+                    return '#a43233';
+                    break;
+                case 'orange':
+                    return '#f9960a';
+                    break;
+                case 'green':
+                    return '#70af00';
+                    break;
+                case 'darkgreen':
+                    return '#72820d';
+                    break;
+                case 'blue':
+                    return '#2aabe1';
+                    break;
+                case 'purple':
+                    return '#d553bd';
+                    break;
+                case 'darkpurple':
+                    return '#5c3a6e';
+                    break;
+                case 'cadetblue':
+                    return '#416979';
+                    break;
+                case 'white':
+                    return '#fbfbfb';
+                    break;
+                case 'black':
+                    return '#303030';
+                    break;
+            }
+        }
+
+        return $colour;
+    }
+
+    /**
+     *
+     * Builds the HTML content for an overlay
+     *
+     * @param  array  $feature      Feature array
+     * @param  string $feature_type Feature type
+     * @param  array  $type_data    Type data
+     * @return string               HTML content
+     * @since  2024.1
+     * @access public
+     * @static
+     *
+     */
+    public static function build_overlay_content($feature = [], $feature_type = 'marker', $type_data = [])
+    {
+
+        // Switch by feature_type
+        switch ($feature_type) {
+            case 'marker':
+                $content = '<div class="waymark-overlay-content waymark-overlay-marker" data-marker_latlng="' . $feature['geometry']['coordinates'][1] . ',' . $feature['geometry']['coordinates'][0] . '">' . "\n";
+
+                break;
+
+            default:
+                $content = '<div class="waymark-overlay-content waymark-overlay-' . $feature_type . '">' . "\n";
+
+                break;
+        }
+
+        // If we don't have type data
+        if (empty($type_data)) {
+            // Get Type Data
+            $type_data = self::get_type_data($feature_type, $feature['properties']['type_key']);
+
+            self::debug($type_data);
+
+        }
+
+        //Expected Waymark properties
+        // i.e. array('radius', 'type', 'title', 'description', 'image_thumbnail_url', 'image_medium_url', 'image_large_url')
+        foreach (Waymark_Helper::get_overlay_properties() as $property_key) {
+            //Property not set
+            if (! isset($feature['properties'][$property_key])) {
+                continue;
+            }
+
+            //Wrap in div
+            $content .= '<div class="waymark-overlay-property waymark-overlay-property-' . $property_key . '">';
+
+            switch ($property_key) {
+
+                //Title
+                case 'title':
+                    $title = $feature['properties']['title'];
+
+                    //We have a title
+                    if ($title) {
+                        $content .= '<strong>' . $feature['properties']['title'] . '</strong>';
+                        //No description
+                    } else {
+                        $content .= '<strong>' . $type_data['type_title'] . '</strong>';
+                    }
+
+                    break;
+
+                //Type
+                case 'type':
+                    $content .= self::type_to_text($feature_type, $type_data, 'small');
+
+                    break;
+
+                //Description
+                case 'description':
+                    $description = $feature['properties']['description'];
+
+                    //We have a description
+                    if ($description) {
+                        //HTML
+                        if (strpos($description, '<') === 0) {
+                            $content .= $description;
+                            //Plain text
+                        } else {
+                            $content .= '<p>' . $description . '</p>';
+                        }
+                        //No description
+                    } else {
+                        $content .= '<p>&nbsp;</p>';
+                    }
+
+                    break;
+
+                //Image
+                case 'image_large_url':
+                    //We have an image
+                    if (isset($feature['properties']['image_large_url'])) {
+                        //Use Medium if we have it
+                        $thumb_url = $feature['properties']['image_large_url'];
+                        if (isset($feature['properties']['image_medium_url'])) {
+                            $thumb_url = $feature['properties']['image_medium_url'];
+                        }
+
+                        $content .= '<a href="' . $feature['properties']['image_large_url'] . '" target="_blank" style="background-image:url(' . $thumb_url . ')"></a>';
+                        //We don't have an image
+                    } else {
+                        $content .= '<p>&nbsp;</p>';
+                    }
+
+                    break;
+
+            }
+
+            $content .= '</div>';
+        }
+
+        $content .= '</div>';
+
+        return $content;
+    }
+
+    /**
+     *
+     * Represent Type as text
+     *
+     * Outputs a textual representation of a type, coloured according to the type's colour Settings
+     * https://www.waymark.dev/docs/settings/
+     *
+     * @param string $feature_type - marker, line, shape
+     * @param array $type_data - array of type data, must have these keys: type_key, type_title, marker_colour, icon_colour
+     * @param string $ele - HTML element to use to wrap the output
+     * @return string
+     * @since  2024.1
+     * @access public
+     * @static
+     */
+    public static function type_to_text($feature_type = '', $type_data = [], $ele = 'span')
+    {
+        $preview_class = 'waymark-type-text waymark-' . $feature_type . '-type';
+        $preview_style = '';
+
+        switch ($feature_type) {
+            case 'marker':
+                $preview_style .= 'color:' . $type_data['icon_colour'] . ';';
+                $preview_style .= 'background:' . self::get_marker_background($type_data['marker_colour']);
+
+                break;
+            case 'line':
+                $preview_style .= 'color:' . $type_data['line_colour'] . ';box-shadow:inset 0 0 0 1px ' . $type_data['line_colour'];
+
+                break;
+            case 'shape':
+                $preview_style .= 'background:' . $type_data['shape_colour'];
+
+                break;
+        }
+
+        return '<' . $ele . ' class="' . $preview_class . '" style="' . $preview_style . '">' . $type_data[$feature_type . '_title'] . '</' . $ele . '>';
+    }
+
+    /**
+     *
+     * Creates the HTML strucuture for the overlays list
+     *
+     * $overlays must have one of these keys: markers, lines, shapes containing an array of overlays
+     * Waymark_GeoJSON::features_by_overlay_type() is a good way to get this data
+     *
+     * Markers/Lines/Shapes are displayed separately and divided into types
+     * Types are displayed as a header with a count
+     * Each overlay is displayed as a list item
+     * Each overlay has a title, description and image
+     *
+     * @param  array $overlays    An array containing 'marker' => [ $markers ], 'line' => [ $lines ], 'shape' => [ $shapes ]
+     * @return string            HTML
+     * @since  2024.1
+     * @access public
+     * @static
+     *
+     */
+    public static function overlays_list_html($overlays = [])
+    {
+        $out = '';
+
+        if (! sizeof($overlays)) {
+            return $out;
+        }
+
+        // $overlays must have one of these keys: markers, lines, shapes
+        if (! array_key_exists('markers', $overlays) && ! array_key_exists('lines', $overlays) && ! array_key_exists('shapes', $overlays)) {
+            return $out;
+        }
+
+        // self::debug($overlays);
+
+        foreach ($overlays as $overlay_type => $overlay) {
+            // $overlay must be an array
+            if (! is_array($overlay)) {
+                continue;
+            }
+
+            $out .= '<div class="waymark-overlays-list">' . "\n";
+
+            switch ($overlay_type) {
+                case 'markers':
+                    // Wrapper
+                    $out .= '<div class="waymark-overlay-list waymark-overlay-markers">' . "\n";
+                    $out .= '	<div class="waymark-title">' . __('Markers', 'waymark') . '</div>' . "\n";
+                    $out .= '	<div class="waymark-overlays">' . "\n";
+
+                    // Every marker type
+                    foreach ($overlay as $marker_type => $markers) {
+                        // Ensure we have markers
+                        if (! sizeof($markers)) {
+                            continue;
+                        }
+
+                        // Get type data
+                        $type_data = self::get_type_data('marker', $marker_type);
+
+                        if (! $type_data) {
+                            continue;
+                        }
+
+                        // Wrapper for Type
+                        $out .= '		<div class="waymark-type waymark-type-' . $marker_type . '" data-type_key="' . $marker_type . '">' . "\n";
+
+                        //Output Title, Icon and count
+                        $icon_data = self::build_icon_data($type_data);
+                        $icon_html = self::build_icon_html($icon_data);
+
+                        $out .= '		<div class="waymark-header" style="background-color:' . $type_data['marker_colour'] . ';color:' . $type_data['icon_colour'] . ';">' . "\n";
+                        $out .= '			<div class="waymark-type-icon">' . $icon_html . '</div>' . "\n";
+                        $out .= '			<div class="waymark-type-title">' . $type_data['marker_title'] . '</div>' . "\n";
+                        $out .= '			<div class="waymark-type-count">' . sizeof($markers) . '</div>' . "\n";
+                        $out .= '		</div>' . "\n";
+
+                        // Iterate over markers
+                        foreach ($markers as $marker) {
+                            $out .= self::build_overlay_content($marker, 'marker', $type_data);
+                        }
+
+                        $out .= '		</div>' . "\n";
+                    }
+
+                    $out .= '	</div>' . "\n";
+                    $out .= '</div>' . "\n";
+
+                    break;
+                case 'lines':
+                    // Get valid line types
+                    $line_types = self::get_overlay_types('line', 'line_title');
+
+                    // Wrapper
+                    $out .= '<div class="waymark-overlays waymark-lines">' . "\n";
+
+                    // Every line type
+                    foreach ($overlay as $line_type => $lines) {
+                        // Ensure is valid line type
+                        if (! array_key_exists($line_type, $line_types)) {
+                            continue;
+                        }
+
+                        $out .= '<li>' . $line_type . ' (' . sizeof($lines) . ')</li>' . "\n";
+                    }
+                    $out .= '</div>' . "\n";
+
+                    break;
+                case 'shapes':
+                    // Get valid shape types
+                    $shape_types = self::get_overlay_types('shape', 'shape_title');
+
+                    // Wrapper
+                    $out .= '<div class="waymark-overlays waymark-shapes">' . "\n";
+
+                    // Every shape type
+                    foreach ($overlay as $shape_type => $shapes) {
+
+                        // Ensure is valid shape type
+                        if (! array_key_exists($shape_type, $shape_types)) {
+                            continue;
+                        }
+
+                        $out .= '<li>' . $shape_type . ' (' . sizeof($shapes) . ')</li>' . "\n";
+                    }
+                    $out .= '</div>' . "\n";
+
+                    break;
+            }
+        }
+
+        $out .= '</div>' . "\n";
+
+        return $out;
+    }
+
+    public static function get_overlay_properties()
+    {
+        $default = Waymark_Config::get_item('overlay_properties');
+
+        // Additional GeoJSON Properties
+        $extra = Waymark_Config::get_item('properties', 'props', true);
+        $extra = Waymark_Helper::multi_use_as_key($extra, 'property_key');
+
+        if (sizeof($extra)) {
+            // Key an array of property keys
+            $extra = array_keys($extra);
+        }
+
+        return array_merge($default, $extra);
+    }
+}
diff --git a/inc/Waymark_Config.php b/inc/Waymark_Config.php
index c67364d3..f5a4e351 100644
--- a/inc/Waymark_Config.php
+++ b/inc/Waymark_Config.php
@@ -11,7 +11,7 @@ public static function init() {
 			'plugin_name' => 'Waymark',
 			'plugin_name_short' => 'Waymark',
 			'custom_types' => [],
-			'plugin_version' => '1.4.2',
+			'plugin_version' => '1.4.3',
 			'nonce_string' => 'Waymark_Nonce',
 			'site_url' => 'https://www.waymark.dev/',
 			'directory_url' => 'https://wordpress.org/support/plugin/waymark/',
diff --git a/languages/waymark-en_CA.po b/languages/waymark-en_CA.po
index 141a3f32..bcc2902b 100644
--- a/languages/waymark-en_CA.po
+++ b/languages/waymark-en_CA.po
@@ -2,7 +2,7 @@
 # This file is distributed under the GPLv2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Waymark 1.4.2\n"
+"Project-Id-Version: Waymark 1.4.3\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/waymark\n"
 "POT-Creation-Date: 2024-01-18 00:24:31+00:00\n"
 "PO-Revision-Date: 2024-01-23 10:12-0800\n"
diff --git a/languages/waymark-en_GB.po b/languages/waymark-en_GB.po
index b9e52807..885122a3 100644
--- a/languages/waymark-en_GB.po
+++ b/languages/waymark-en_GB.po
@@ -2,7 +2,7 @@
 # This file is distributed under the GPLv2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Waymark 1.4.2\n"
+"Project-Id-Version: Waymark 1.4.3\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/waymark\n"
 "POT-Creation-Date: 2024-01-18 00:24:31+00:00\n"
 "PO-Revision-Date: 2024-01-23 08:47-0800\n"
diff --git a/languages/waymark-es_ES.po b/languages/waymark-es_ES.po
index 148036f6..b54b2686 100644
--- a/languages/waymark-es_ES.po
+++ b/languages/waymark-es_ES.po
@@ -2,7 +2,7 @@
 # This file is distributed under the GPLv2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Waymark 1.4.2\n"
+"Project-Id-Version: Waymark 1.4.3\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/waymark\n"
 "POT-Creation-Date: 2024-01-18 00:24:31+00:00\n"
 "PO-Revision-Date: 2024-01-23 10:19-0800\n"
diff --git a/languages/waymark-fr_CA.po b/languages/waymark-fr_CA.po
index cc6ac7e3..935a9645 100644
--- a/languages/waymark-fr_CA.po
+++ b/languages/waymark-fr_CA.po
@@ -2,7 +2,7 @@
 # This file is distributed under the GPLv2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Waymark 1.4.2\n"
+"Project-Id-Version: Waymark 1.4.3\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/waymark\n"
 "POT-Creation-Date: 2024-01-18 00:24:31+00:00\n"
 "PO-Revision-Date: 2024-01-23 10:17-0800\n"
diff --git a/languages/waymark-ja_JP.po b/languages/waymark-ja_JP.po
index 6f128d78..f7ffcd19 100644
--- a/languages/waymark-ja_JP.po
+++ b/languages/waymark-ja_JP.po
@@ -2,7 +2,7 @@
 # This file is distributed under the GPLv2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Waymark 1.4.2\n"
+"Project-Id-Version: Waymark 1.4.3\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/waymark\n"
 "POT-Creation-Date: 2024-01-23 14:32:30+00:00\n"
 "PO-Revision-Date: 2024-01-23 10:42-0800\n"
diff --git a/languages/waymark-sv_SE.po b/languages/waymark-sv_SE.po
index 3599bd13..1b7efe26 100644
--- a/languages/waymark-sv_SE.po
+++ b/languages/waymark-sv_SE.po
@@ -2,7 +2,7 @@
 # This file is distributed under the GPLv2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Waymark 1.4.2\n"
+"Project-Id-Version: Waymark 1.4.3\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/waymark\n"
 "POT-Creation-Date: 2024-01-18 00:24:31+00:00\n"
 "PO-Revision-Date: 2024-01-23 10:18-0800\n"
diff --git a/languages/waymark-uk_UA.po b/languages/waymark-uk_UA.po
index 78e04dee..a58e8437 100644
--- a/languages/waymark-uk_UA.po
+++ b/languages/waymark-uk_UA.po
@@ -2,7 +2,7 @@
 # This file is distributed under the GPLv2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Waymark 1.4.2\n"
+"Project-Id-Version: Waymark 1.4.3\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/waymark\n"
 "POT-Creation-Date: 2024-01-18 00:24:31+00:00\n"
 "PO-Revision-Date: 2024-01-23 10:18-0800\n"
diff --git a/languages/waymark-zh_CN.po b/languages/waymark-zh_CN.po
index a5628c8c..b2d0e1b7 100644
--- a/languages/waymark-zh_CN.po
+++ b/languages/waymark-zh_CN.po
@@ -2,7 +2,7 @@
 # This file is distributed under the GPLv2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Waymark 1.4.2\n"
+"Project-Id-Version: Waymark 1.4.3\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/waymark\n"
 "POT-Creation-Date: 2024-01-23 14:32:30+00:00\n"
 "PO-Revision-Date: 2024-01-23 10:25-0800\n"
diff --git a/languages/waymark.pot b/languages/waymark.pot
index ab251e3f..cdc885c0 100644
--- a/languages/waymark.pot
+++ b/languages/waymark.pot
@@ -1,14 +1,14 @@
-# Copyright (C) 2024 Joe Hawes
+# Copyright (C) 2025 Joe Hawes
 # This file is distributed under the GPLv2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Waymark 1.4.1\n"
+"Project-Id-Version: Waymark 1.4.3\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/waymark\n"
-"POT-Creation-Date: 2024-12-09 20:02:54+00:00\n"
+"POT-Creation-Date: 2025-01-10 00:48:36+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2024-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2025-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "X-Generator: grunt-wp-i18n 1.0.3\n"
@@ -59,7 +59,7 @@ msgid "New Map"
 msgstr ""
 
 #: inc/Admin/Waymark_Menu.php:19 inc/Admin/Waymark_Menu.php:100
-#: inc/Waymark_Admin.php:174 inc/Waymark_Taxonomies.php:13
+#: inc/Waymark_Admin.php:174 inc/Waymark_Taxonomies.php:15
 msgid "Collections"
 msgstr ""
 
@@ -83,8 +83,8 @@ msgstr ""
 msgid "Shortcode"
 msgstr ""
 
-#: inc/Admin/Waymark_Meta.php:13 inc/Helpers/Waymark_Helper.php:197
-#: inc/Helpers/Waymark_Helper.php:226
+#: inc/Admin/Waymark_Meta.php:13 inc/Helpers/Waymark_Helper.php:208
+#: inc/Helpers/Waymark_Helper.php:238
 msgid "Export"
 msgstr ""
 
@@ -197,7 +197,7 @@ msgid "Overlays"
 msgstr ""
 
 #: inc/Admin/Waymark_Settings.php:43 inc/Admin/Waymark_Settings.php:131
-#: inc/Helpers/Waymark_Helper.php:1371 inc/Helpers/Waymark_Lang.php:41
+#: inc/Helpers/Waymark_Helper.php:1416 inc/Helpers/Waymark_Lang.php:41
 msgid "Markers"
 msgstr ""
 
@@ -1228,7 +1228,7 @@ msgstr ""
 msgid "Excerpt"
 msgstr ""
 
-#: inc/Admin/Waymark_Settings.php:1300 inc/Helpers/Waymark_Helper.php:35
+#: inc/Admin/Waymark_Settings.php:1300 inc/Helpers/Waymark_Helper.php:38
 msgid "Debug"
 msgstr ""
 
@@ -1304,59 +1304,59 @@ msgstr ""
 msgid "Submission"
 msgstr ""
 
-#: inc/Helpers/Waymark_Helper.php:16
+#: inc/Helpers/Waymark_Helper.php:19
 msgid "Hi, I'm %s."
 msgstr ""
 
-#: inc/Helpers/Waymark_Helper.php:18
+#: inc/Helpers/Waymark_Helper.php:21
 msgid ""
 "Waymark is <strong><a href=\"https://github.com/opengis/waymark\">open "
 "source</a></strong> and a work in progress."
 msgstr ""
 
-#: inc/Helpers/Waymark_Helper.php:19
+#: inc/Helpers/Waymark_Helper.php:22
 msgid "Feedback is very important, so please feel free to get in touch by either:"
 msgstr ""
 
-#: inc/Helpers/Waymark_Helper.php:22
+#: inc/Helpers/Waymark_Helper.php:25
 msgid ""
 "Leaving a <strong><a href=\"%s\">review</a></strong>, or creating a <a "
 "href=\"%s\">support topic</a> on the WordPress plugin directory."
 msgstr ""
 
-#: inc/Helpers/Waymark_Helper.php:23
+#: inc/Helpers/Waymark_Helper.php:26
 msgid "Posting in the <a href=\"%s\">Forums</a>."
 msgstr ""
 
-#: inc/Helpers/Waymark_Helper.php:24
+#: inc/Helpers/Waymark_Helper.php:27
 msgid "Creating a <a href=\"%s\">GitHub issue</a>."
 msgstr ""
 
-#: inc/Helpers/Waymark_Helper.php:27
+#: inc/Helpers/Waymark_Helper.php:30
 msgid "Thanks"
 msgstr ""
 
-#: inc/Helpers/Waymark_Helper.php:31
+#: inc/Helpers/Waymark_Helper.php:34
 msgid "Built on the shoulders of giants, <a href=\"%s\">thank you</a>!"
 msgstr ""
 
-#: inc/Helpers/Waymark_Helper.php:182 inc/Waymark_Taxonomies.php:14
-#: inc/Waymark_Taxonomies.php:15
+#: inc/Helpers/Waymark_Helper.php:193 inc/Waymark_Taxonomies.php:16
+#: inc/Waymark_Taxonomies.php:17
 msgid "Collection"
 msgstr ""
 
-#: inc/Helpers/Waymark_Helper.php:199 inc/Helpers/Waymark_Helper.php:228
+#: inc/Helpers/Waymark_Helper.php:210 inc/Helpers/Waymark_Helper.php:240
 msgid ""
 "This will download the Overlays currently displayed by the Map in the "
 "selected format."
 msgstr ""
 
-#: inc/Helpers/Waymark_Helper.php:492 inc/Waymark_Types.php:10
+#: inc/Helpers/Waymark_Helper.php:517 inc/Waymark_Types.php:10
 #: inc/Waymark_Types.php:14 inc/Waymark_Types.php:16
 msgid "Map"
 msgstr ""
 
-#: inc/Helpers/Waymark_Helper.php:667 inc/Helpers/Waymark_Helper.php:692
+#: inc/Helpers/Waymark_Helper.php:701 inc/Helpers/Waymark_Helper.php:727
 msgid "Download"
 msgstr ""
 
@@ -1645,74 +1645,78 @@ msgstr ""
 msgid "Blue"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:16
+#: inc/Waymark_Taxonomies.php:18
 msgid "All Collections"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:17
+#: inc/Waymark_Taxonomies.php:19
 msgid "Parent"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:18
+#: inc/Waymark_Taxonomies.php:20
 msgid "Parent Collection:"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:19
+#: inc/Waymark_Taxonomies.php:21
 msgid "New Collection Name"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:20
+#: inc/Waymark_Taxonomies.php:22
 msgid "Create Collection"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:21
+#: inc/Waymark_Taxonomies.php:23
 msgid "Edit Collection"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:22
+#: inc/Waymark_Taxonomies.php:24
 msgid "Update Collection"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:23
+#: inc/Waymark_Taxonomies.php:25
 msgid "View Collection"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:24
+#: inc/Waymark_Taxonomies.php:26
 msgid "Separate Collections with commas"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:25
+#: inc/Waymark_Taxonomies.php:27
 msgid "Add or remove Collections"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:26
+#: inc/Waymark_Taxonomies.php:28
 msgid "Choose from the most used"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:27
+#: inc/Waymark_Taxonomies.php:29
 msgid "Popular Collections"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:28
+#: inc/Waymark_Taxonomies.php:30
 msgid "Search Collections"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:29
+#: inc/Waymark_Taxonomies.php:31
 msgid "Not Found"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:30
+#: inc/Waymark_Taxonomies.php:32
 msgid "No Collections"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:31
+#: inc/Waymark_Taxonomies.php:33
 msgid "Collection list"
 msgstr ""
 
-#: inc/Waymark_Taxonomies.php:32
+#: inc/Waymark_Taxonomies.php:34
 msgid "Collection list navigation"
 msgstr ""
 
+#: inc/Waymark_Taxonomies.php:35
+msgid "Back to Collections"
+msgstr ""
+
 #: inc/Waymark_Types.php:17
 msgid "Map Archives"
 msgstr ""
diff --git a/package.json b/package.json
index 3c5eaed9..a0f1313d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Waymark",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Waymark for WordPress",
   "author": "Joe Hawes",
   "main": "Gruntfile.js",
diff --git a/readme.md b/readme.md
index ec0ccbda..388aa309 100644
--- a/readme.md
+++ b/readme.md
@@ -4,7 +4,7 @@
 **Requires at least:** 4.6  
 **Tested up to:** 6.7  
 **Requires PHP:** 5.2  
-**Stable tag:** 1.4.2  
+**Stable tag:** 1.4.3  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -191,6 +191,12 @@ Built on the shoulders of giants, [thank you](https://www.waymark.dev/docs/thank
 
 ## Changelog ##
 
+### 1.4.3 ###
+
+- Add missing MultiPolygon support. Raised [here](https://wordpress.org/support/topic/large-kml-display-issue/) and [here](https://github.com/OpenGIS/Waymark/issues/55).
+- [Taxonomy label fix](https://github.com/OpenGIS/Waymark/issues/47).
+- [Added Name to GPX metadata on Export](https://github.com/OpenGIS/Waymark/issues/48).
+
 ### 1.4.2 ###
 
 Fixed a vulnerability where content output to the browser was not being escaped. Thanks to vgo0 for reporting this via Wordfence.
diff --git a/readme.txt b/readme.txt
index b131b254..657a8f59 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: GIS, Map maker, GPX, Track, Elevation
 Requires at least: 4.6
 Tested up to: 6.7
 Requires PHP: 5.2
-Stable tag: 1.4.2
+Stable tag: 1.4.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -173,6 +173,12 @@ Built on the shoulders of giants, [thank you](https://www.waymark.dev/docs/thank
 
 == Changelog ==
 
+= 1.4.3 = 
+
+- Add missing MultiPolygon support. Raised [here](https://wordpress.org/support/topic/large-kml-display-issue/) and [here](https://github.com/OpenGIS/Waymark/issues/55).
+- [Taxonomy label fix](https://github.com/OpenGIS/Waymark/issues/47).
+- [Added Name to GPX metadata on Export](https://github.com/OpenGIS/Waymark/issues/48).
+
 = 1.4.2 =
 
 Fixed a vulnerability where content output to the browser was not being escaped. Thanks to vgo0 for reporting this via Wordfence.
diff --git a/waymark-js b/waymark-js
index ed739683..705e51a1 160000
--- a/waymark-js
+++ b/waymark-js
@@ -1 +1 @@
-Subproject commit ed739683856b8cb6eff070e32c5995ec6ea6746b
+Subproject commit 705e51a184ef0fd6a7bb6e1e3600e00a900c162e