diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-android-arm64-16-android-arm64.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-android-arm64-16-android-arm64.xml
similarity index 76%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-android-arm64-16-android-arm64.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-android-arm64-16-android-arm64.xml
index e5bc5bd37a..59161ca6fb 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-android-arm64-16-android-arm64.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-android-arm64-16-android-arm64.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -20,7 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>16</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-android-arm64-16-android-arm64-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-android-arm64-16-android-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-android-arm64-16-android-arm64-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-android-arm64-16-android-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-android-armhf-16-android-armhf.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-android-armhf-16-android-armhf.xml
similarity index 76%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-android-armhf-16-android-armhf.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-android-armhf-16-android-armhf.xml
index cae0f88055..6b93953874 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-android-armhf-16-android-armhf.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-android-armhf-16-android-armhf.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -20,7 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>16</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-android-armhf-16-android-armhf-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-android-armhf-16-android-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-android-armhf-16-android-armhf-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-android-armhf-16-android-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-darwin-wx32-arm64-x86_64-14.1-macos.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
similarity index 68%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
index 79acff9681..f61b1be63d 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -17,10 +17,10 @@ Route tracking and remote control for Evolution pilots
 <target>darwin-wx32</target>
 <build-target>darwin</build-target>
 <build-gtk></build-gtk>
-<target-version>14.1</target-version>
+<target-version>14.3.1</target-version>
 <target-arch>arm64;x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-darwin-wx32-arm64-x86_64-14.1-macos-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-darwin-wx32-arm64-x86_64-14.1-macos.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-darwin-wx32-arm64-x86_64-14.3.1-macos-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-darwin-wx32-arm64-x86_64-14.3.1-macos.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-arm64-11-bullseye-arm64.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-11-bullseye-arm64.xml
similarity index 76%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-arm64-11-bullseye-arm64.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-11-bullseye-arm64.xml
index f2dccd4de9..6723d6a640 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-arm64-11-bullseye-arm64.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-11-bullseye-arm64.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -20,7 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>11</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-debian-arm64-11-bullseye-arm64-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-debian-arm64-11-bullseye-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-11-bullseye-arm64-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-11-bullseye-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-arm64-12-bookworm-arm64.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-12-bookworm-arm64.xml
similarity index 76%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-arm64-12-bookworm-arm64.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-12-bookworm-arm64.xml
index ac448132b3..d6462d50ab 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-arm64-12-bookworm-arm64.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-12-bookworm-arm64.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -20,7 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>12</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-debian-arm64-12-bookworm-arm64-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-debian-arm64-12-bookworm-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-12-bookworm-arm64-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-12-bookworm-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-13-trixie-arm64.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-13-trixie-arm64.xml
new file mode 100644
index 0000000000..695593fe7c
--- /dev/null
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-13-trixie-arm64.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> AutoTrackRaymarine </name>
+<version> 2.3.1.0 </version>
+<release> 0 </release>
+<summary> Route following for Raymarine EV-1 Autopilots </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Douwe Fokkema </author>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
+
+<description>
+Route tracking and remote control for Evolution pilots
+</description>
+
+<target>debian-arm64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>arm64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-13-trixie-arm64-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-debian-arm64-13-trixie-arm64.tar.gz
+</tarball-url>
+<info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
+</plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-armhf-11-bullseye-armhf.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-11-bullseye-armhf.xml
similarity index 76%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-armhf-11-bullseye-armhf.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-11-bullseye-armhf.xml
index dbcd099266..812d0e7c6b 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-armhf-11-bullseye-armhf.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-11-bullseye-armhf.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -20,7 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>11</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-debian-armhf-11-bullseye-armhf-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-debian-armhf-11-bullseye-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-11-bullseye-armhf-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-11-bullseye-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-armhf-12-bookworm-armhf.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-12-bookworm-armhf.xml
similarity index 84%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-armhf-12-bookworm-armhf.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-12-bookworm-armhf.xml
index 4541b5d0c4..7f97429a5c 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-armhf-12-bookworm-armhf.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-12-bookworm-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
@@ -20,8 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>12</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-debian-armhf-12-bookworm-armhf-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-debian-armhf-12-bookworm-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-12-bookworm-armhf-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-12-bookworm-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
-
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-13-trixie-armhf.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-13-trixie-armhf.xml
new file mode 100644
index 0000000000..0551b1918a
--- /dev/null
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-13-trixie-armhf.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> AutoTrackRaymarine </name>
+<version> 2.3.1.0 </version>
+<release> 0 </release>
+<summary> Route following for Raymarine EV-1 Autopilots </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Douwe Fokkema </author>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
+
+<description>
+Route tracking and remote control for Evolution pilots
+</description>
+
+<target>debian-armhf</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>armhf</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-13-trixie-armhf-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-debian-armhf-13-trixie-armhf.tar.gz
+</tarball-url>
+<info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
+</plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-x86_64-11-bullseye.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-11-bullseye.xml
similarity index 76%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-x86_64-11-bullseye.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-11-bullseye.xml
index 7347ea70d2..59989a6d73 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-x86_64-11-bullseye.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-11-bullseye.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -20,7 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>11</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-debian-x86_64-11-bullseye-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-debian-x86_64-11-bullseye.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-11-bullseye-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-11-bullseye.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-x86_64-12-bookworm.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-12-bookworm.xml
similarity index 76%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-x86_64-12-bookworm.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-12-bookworm.xml
index 9968f7cc18..746d29835b 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-debian-x86_64-12-bookworm.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-12-bookworm.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -20,7 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>12</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-debian-x86_64-12-bookworm-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-debian-x86_64-12-bookworm.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-12-bookworm-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-12-bookworm.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-13-trixie.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-13-trixie.xml
new file mode 100644
index 0000000000..715bcc3648
--- /dev/null
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-13-trixie.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> AutoTrackRaymarine </name>
+<version> 2.3.1.0 </version>
+<release> 0 </release>
+<summary> Route following for Raymarine EV-1 Autopilots </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Douwe Fokkema </author>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
+
+<description>
+Route tracking and remote control for Evolution pilots
+</description>
+
+<target>debian-x86_64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>x86_64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-13-trixie-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-debian-x86_64-13-trixie.tar.gz
+</tarball-url>
+<info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
+</plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-flatpak-aarch64-22.08-flatpak.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-flatpak-aarch64-22.08-flatpak.xml
similarity index 76%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-flatpak-aarch64-22.08-flatpak.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-flatpak-aarch64-22.08-flatpak.xml
index 65e1ca365c..407781c27a 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-flatpak-aarch64-22.08-flatpak.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-flatpak-aarch64-22.08-flatpak.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -20,7 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>22.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-aarch64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-aarch64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-flatpak-aarch64-24.08-flatpak.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-flatpak-aarch64-24.08-flatpak.xml
similarity index 76%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-flatpak-aarch64-24.08-flatpak.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-flatpak-aarch64-24.08-flatpak.xml
index 39bb7df15b..e0aefcf4e1 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-flatpak-aarch64-24.08-flatpak.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-flatpak-aarch64-24.08-flatpak.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -20,7 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>24.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-aarch64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-aarch64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-flatpak-x86_64-22.08-flatpak.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-flatpak-x86_64-22.08-flatpak.xml
similarity index 76%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-flatpak-x86_64-22.08-flatpak.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-flatpak-x86_64-22.08-flatpak.xml
index 02740da856..de9821c8cc 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-flatpak-x86_64-22.08-flatpak.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-flatpak-x86_64-22.08-flatpak.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -20,7 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>22.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-x86_64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-x86_64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-flatpak-x86_64-24.08-flatpak.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-flatpak-x86_64-24.08-flatpak.xml
similarity index 76%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-flatpak-x86_64-24.08-flatpak.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-flatpak-x86_64-24.08-flatpak.xml
index efabdc6936..faaa06647d 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-flatpak-x86_64-24.08-flatpak.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-flatpak-x86_64-24.08-flatpak.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -20,7 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>24.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-x86_64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-x86_64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-msvc-x86-10.0.20348-MSVC.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-msvc-x86-10.0.20348-MSVC.xml
similarity index 76%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-msvc-x86-10.0.20348-MSVC.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-msvc-x86-10.0.20348-MSVC.xml
index 034f49944c..37771dba3a 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-msvc-x86-10.0.20348-MSVC.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-msvc-x86-10.0.20348-MSVC.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -20,7 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-msvc-x86-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-msvc-x86-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-msvc-x86-wx32-10.0.20348-MSVC.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-msvc-x86-wx32-10.0.20348-MSVC.xml
similarity index 76%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-msvc-x86-wx32-10.0.20348-MSVC.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-msvc-x86-wx32-10.0.20348-MSVC.xml
index 0a07e51089..2bc0435ac3 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-msvc-x86-wx32-10.0.20348-MSVC.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-msvc-x86-wx32-10.0.20348-MSVC.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -20,7 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/AutoTrackRaymarine_pi-2.3.0.0-ubuntu-x86_64-22.04-jammy.xml b/metadata/AutoTrackRaymarine_pi-2.3.1.0-ubuntu-x86_64-22.04-jammy.xml
similarity index 77%
rename from metadata/AutoTrackRaymarine_pi-2.3.0.0-ubuntu-x86_64-22.04-jammy.xml
rename to metadata/AutoTrackRaymarine_pi-2.3.1.0-ubuntu-x86_64-22.04-jammy.xml
index 1ed7f1ef3a..5bc483daa4 100644
--- a/metadata/AutoTrackRaymarine_pi-2.3.0.0-ubuntu-x86_64-22.04-jammy.xml
+++ b/metadata/AutoTrackRaymarine_pi-2.3.1.0-ubuntu-x86_64-22.04-jammy.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AutoTrackRaymarine </name>
-<version> 2.3.0.0 </version>
+<version> 2.3.1.0 </version>
 <release> 0 </release>
 <summary> Route following for Raymarine EV-1 Autopilots </summary>
 
 <api-version> 1.18 </api-version>
 <open-source> yes </open-source>
 <author> Douwe Fokkema </author>
-<source> https://github.com/douwefokkema/AutoTrackRaymarine_pi </source>
+<source> https://github.com/rgleason/AutoTrackRaymarine_pi </source>
 
 <description>
 Route tracking and remote control for Evolution pilots
@@ -20,7 +20,7 @@ Route tracking and remote control for Evolution pilots
 <target-version>22.04</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.0.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v2.3.0.0/AutoTrackRaymarine_pi-2.3.0.0-ubuntu-x86_64-22.04-jammy.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autotrackraymarine-prod/raw/names/AutoTrackRaymarine_pi-2.3.1.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v2.3.1.0/AutoTrackRaymarine_pi-2.3.1.0-ubuntu-x86_64-22.04-jammy.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autotrackraymarine/index.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-android-arm64-16-android-arm64.xml b/metadata/aisradar_pi-1.4.21.0-android-arm64-16-android-arm64.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-android-arm64-16-android-arm64.xml
rename to metadata/aisradar_pi-1.4.21.0-android-arm64-16-android-arm64.xml
index ad2e3a9a9f..50102ee3ee 100644
--- a/metadata/aisradar_pi-1.4.20.0-android-arm64-16-android-arm64.xml
+++ b/metadata/aisradar_pi-1.4.21.0-android-arm64-16-android-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>16</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-android-arm64-16-android-arm64-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-android-arm64-16-android-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-android-arm64-16-android-arm64-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-android-arm64-16-android-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-android-armhf-16-android-armhf.xml b/metadata/aisradar_pi-1.4.21.0-android-armhf-16-android-armhf.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-android-armhf-16-android-armhf.xml
rename to metadata/aisradar_pi-1.4.21.0-android-armhf-16-android-armhf.xml
index 0e6c213aae..8afd5a5b21 100644
--- a/metadata/aisradar_pi-1.4.20.0-android-armhf-16-android-armhf.xml
+++ b/metadata/aisradar_pi-1.4.21.0-android-armhf-16-android-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>16</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-android-armhf-16-android-armhf-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-android-armhf-16-android-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-android-armhf-16-android-armhf-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-android-armhf-16-android-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-darwin-wx32-arm64-x86_64-14.1-macos.xml b/metadata/aisradar_pi-1.4.21.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
similarity index 76%
rename from metadata/aisradar_pi-1.4.20.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
rename to metadata/aisradar_pi-1.4.21.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
index 32c2b8ed87..7178f9ef64 100644
--- a/metadata/aisradar_pi-1.4.20.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
+++ b/metadata/aisradar_pi-1.4.21.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -17,10 +17,10 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target>darwin-wx32</target>
 <build-target>darwin</build-target>
 <build-gtk></build-gtk>
-<target-version>14.1</target-version>
+<target-version>14.3.1</target-version>
 <target-arch>arm64;x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-darwin-wx32-arm64-x86_64-14.1-macos-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-darwin-wx32-arm64-x86_64-14.1-macos.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-darwin-wx32-arm64-x86_64-14.3.1-macos-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-darwin-wx32-arm64-x86_64-14.3.1-macos.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-debian-arm64-11-bullseye-arm64.xml b/metadata/aisradar_pi-1.4.21.0-debian-arm64-11-bullseye-arm64.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-debian-arm64-11-bullseye-arm64.xml
rename to metadata/aisradar_pi-1.4.21.0-debian-arm64-11-bullseye-arm64.xml
index 9a5d17969c..733fb7b0b0 100644
--- a/metadata/aisradar_pi-1.4.20.0-debian-arm64-11-bullseye-arm64.xml
+++ b/metadata/aisradar_pi-1.4.21.0-debian-arm64-11-bullseye-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>11</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-debian-arm64-11-bullseye-arm64-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-debian-arm64-11-bullseye-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-debian-arm64-11-bullseye-arm64-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-debian-arm64-11-bullseye-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-debian-arm64-12-bookworm-arm64.xml b/metadata/aisradar_pi-1.4.21.0-debian-arm64-12-bookworm-arm64.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-debian-arm64-12-bookworm-arm64.xml
rename to metadata/aisradar_pi-1.4.21.0-debian-arm64-12-bookworm-arm64.xml
index e55f422f4a..34e2dbfaf9 100644
--- a/metadata/aisradar_pi-1.4.20.0-debian-arm64-12-bookworm-arm64.xml
+++ b/metadata/aisradar_pi-1.4.21.0-debian-arm64-12-bookworm-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>12</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-debian-arm64-12-bookworm-arm64-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-debian-arm64-12-bookworm-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-debian-arm64-12-bookworm-arm64-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-debian-arm64-12-bookworm-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.21.0-debian-arm64-13-trixie-arm64.xml b/metadata/aisradar_pi-1.4.21.0-debian-arm64-13-trixie-arm64.xml
new file mode 100644
index 0000000000..3e58499315
--- /dev/null
+++ b/metadata/aisradar_pi-1.4.21.0-debian-arm64-13-trixie-arm64.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> AIS Radar view </name>
+<version> 1.4.21.0 </version>
+<release> 0 </release>
+<summary> AIS Radar view Plugin </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Johan Sman </author>
+<source> https://github.com/rgleason/AISradar_pi </source>
+
+<description>
+Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
+</description>
+
+<target>debian-arm64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>arm64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-debian-arm64-13-trixie-arm64-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-debian-arm64-13-trixie-arm64.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
+</plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-debian-armhf-11-bullseye-armhf.xml b/metadata/aisradar_pi-1.4.21.0-debian-armhf-11-bullseye-armhf.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-debian-armhf-11-bullseye-armhf.xml
rename to metadata/aisradar_pi-1.4.21.0-debian-armhf-11-bullseye-armhf.xml
index d78197bb09..55022dc81b 100644
--- a/metadata/aisradar_pi-1.4.20.0-debian-armhf-11-bullseye-armhf.xml
+++ b/metadata/aisradar_pi-1.4.21.0-debian-armhf-11-bullseye-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>11</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-debian-armhf-11-bullseye-armhf-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-debian-armhf-11-bullseye-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-debian-armhf-11-bullseye-armhf-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-debian-armhf-11-bullseye-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-debian-armhf-12-bookworm-armhf.xml b/metadata/aisradar_pi-1.4.21.0-debian-armhf-12-bookworm-armhf.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-debian-armhf-12-bookworm-armhf.xml
rename to metadata/aisradar_pi-1.4.21.0-debian-armhf-12-bookworm-armhf.xml
index 5f08178291..9cbe92f478 100644
--- a/metadata/aisradar_pi-1.4.20.0-debian-armhf-12-bookworm-armhf.xml
+++ b/metadata/aisradar_pi-1.4.21.0-debian-armhf-12-bookworm-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>12</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-debian-armhf-12-bookworm-armhf-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-debian-armhf-12-bookworm-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-debian-armhf-12-bookworm-armhf-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-debian-armhf-12-bookworm-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.21.0-debian-armhf-13-trixie-armhf.xml b/metadata/aisradar_pi-1.4.21.0-debian-armhf-13-trixie-armhf.xml
new file mode 100644
index 0000000000..9e3af1e353
--- /dev/null
+++ b/metadata/aisradar_pi-1.4.21.0-debian-armhf-13-trixie-armhf.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> AIS Radar view </name>
+<version> 1.4.21.0 </version>
+<release> 0 </release>
+<summary> AIS Radar view Plugin </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Johan Sman </author>
+<source> https://github.com/rgleason/AISradar_pi </source>
+
+<description>
+Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
+</description>
+
+<target>debian-armhf</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>armhf</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-debian-armhf-13-trixie-armhf-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-debian-armhf-13-trixie-armhf.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
+</plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-debian-x86_64-11-bullseye.xml b/metadata/aisradar_pi-1.4.21.0-debian-x86_64-11-bullseye.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-debian-x86_64-11-bullseye.xml
rename to metadata/aisradar_pi-1.4.21.0-debian-x86_64-11-bullseye.xml
index fb5e944676..9e2458e03e 100644
--- a/metadata/aisradar_pi-1.4.20.0-debian-x86_64-11-bullseye.xml
+++ b/metadata/aisradar_pi-1.4.21.0-debian-x86_64-11-bullseye.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>11</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-debian-x86_64-11-bullseye-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-debian-x86_64-11-bullseye.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-debian-x86_64-11-bullseye-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-debian-x86_64-11-bullseye.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-debian-x86_64-12-bookworm.xml b/metadata/aisradar_pi-1.4.21.0-debian-x86_64-12-bookworm.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-debian-x86_64-12-bookworm.xml
rename to metadata/aisradar_pi-1.4.21.0-debian-x86_64-12-bookworm.xml
index c99b1f2eb4..161715ae66 100644
--- a/metadata/aisradar_pi-1.4.20.0-debian-x86_64-12-bookworm.xml
+++ b/metadata/aisradar_pi-1.4.21.0-debian-x86_64-12-bookworm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>12</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-debian-x86_64-12-bookworm-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-debian-x86_64-12-bookworm.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-debian-x86_64-12-bookworm-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-debian-x86_64-12-bookworm.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.21.0-debian-x86_64-13-trixie.xml b/metadata/aisradar_pi-1.4.21.0-debian-x86_64-13-trixie.xml
new file mode 100644
index 0000000000..400d4b8afd
--- /dev/null
+++ b/metadata/aisradar_pi-1.4.21.0-debian-x86_64-13-trixie.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> AIS Radar view </name>
+<version> 1.4.21.0 </version>
+<release> 0 </release>
+<summary> AIS Radar view Plugin </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Johan Sman </author>
+<source> https://github.com/rgleason/AISradar_pi </source>
+
+<description>
+Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
+</description>
+
+<target>debian-x86_64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>x86_64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-debian-x86_64-13-trixie-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-debian-x86_64-13-trixie.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
+</plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-flatpak-aarch64-22.08-flatpak.xml b/metadata/aisradar_pi-1.4.21.0-flatpak-aarch64-22.08-flatpak.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-flatpak-aarch64-22.08-flatpak.xml
rename to metadata/aisradar_pi-1.4.21.0-flatpak-aarch64-22.08-flatpak.xml
index 9a0fed3f61..66f31c6140 100644
--- a/metadata/aisradar_pi-1.4.20.0-flatpak-aarch64-22.08-flatpak.xml
+++ b/metadata/aisradar_pi-1.4.21.0-flatpak-aarch64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>22.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-aarch64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-aarch64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-flatpak-aarch64-24.08-flatpak.xml b/metadata/aisradar_pi-1.4.21.0-flatpak-aarch64-24.08-flatpak.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-flatpak-aarch64-24.08-flatpak.xml
rename to metadata/aisradar_pi-1.4.21.0-flatpak-aarch64-24.08-flatpak.xml
index 72ec18941e..184493bf65 100644
--- a/metadata/aisradar_pi-1.4.20.0-flatpak-aarch64-24.08-flatpak.xml
+++ b/metadata/aisradar_pi-1.4.21.0-flatpak-aarch64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>24.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-aarch64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-aarch64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-flatpak-x86_64-22.08-flatpak.xml b/metadata/aisradar_pi-1.4.21.0-flatpak-x86_64-22.08-flatpak.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-flatpak-x86_64-22.08-flatpak.xml
rename to metadata/aisradar_pi-1.4.21.0-flatpak-x86_64-22.08-flatpak.xml
index 3ec236be23..3199015fbd 100644
--- a/metadata/aisradar_pi-1.4.20.0-flatpak-x86_64-22.08-flatpak.xml
+++ b/metadata/aisradar_pi-1.4.21.0-flatpak-x86_64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>22.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-x86_64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-x86_64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-flatpak-x86_64-24.08-flatpak.xml b/metadata/aisradar_pi-1.4.21.0-flatpak-x86_64-24.08-flatpak.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-flatpak-x86_64-24.08-flatpak.xml
rename to metadata/aisradar_pi-1.4.21.0-flatpak-x86_64-24.08-flatpak.xml
index a9932c5bb2..abd426ac5e 100644
--- a/metadata/aisradar_pi-1.4.20.0-flatpak-x86_64-24.08-flatpak.xml
+++ b/metadata/aisradar_pi-1.4.21.0-flatpak-x86_64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>24.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-x86_64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-x86_64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-msvc-x86-10.0.20348-MSVC.xml b/metadata/aisradar_pi-1.4.21.0-msvc-x86-10.0.20348-MSVC.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-msvc-x86-10.0.20348-MSVC.xml
rename to metadata/aisradar_pi-1.4.21.0-msvc-x86-10.0.20348-MSVC.xml
index 8ea128c981..5f5823c9f2 100644
--- a/metadata/aisradar_pi-1.4.20.0-msvc-x86-10.0.20348-MSVC.xml
+++ b/metadata/aisradar_pi-1.4.21.0-msvc-x86-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-msvc-x86-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-msvc-x86-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-msvc-x86-wx32-10.0.20348-MSVC.xml b/metadata/aisradar_pi-1.4.21.0-msvc-x86-wx32-10.0.20348-MSVC.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-msvc-x86-wx32-10.0.20348-MSVC.xml
rename to metadata/aisradar_pi-1.4.21.0-msvc-x86-wx32-10.0.20348-MSVC.xml
index 14aff5d6b7..793c5cfb76 100644
--- a/metadata/aisradar_pi-1.4.20.0-msvc-x86-wx32-10.0.20348-MSVC.xml
+++ b/metadata/aisradar_pi-1.4.21.0-msvc-x86-wx32-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/aisradar_pi-1.4.20.0-ubuntu-x86_64-22.04-jammy.xml b/metadata/aisradar_pi-1.4.21.0-ubuntu-x86_64-22.04-jammy.xml
similarity index 82%
rename from metadata/aisradar_pi-1.4.20.0-ubuntu-x86_64-22.04-jammy.xml
rename to metadata/aisradar_pi-1.4.21.0-ubuntu-x86_64-22.04-jammy.xml
index 838399fa0a..4011cccefa 100644
--- a/metadata/aisradar_pi-1.4.20.0-ubuntu-x86_64-22.04-jammy.xml
+++ b/metadata/aisradar_pi-1.4.21.0-ubuntu-x86_64-22.04-jammy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> AIS Radar view </name>
-<version> 1.4.20.0 </version>
+<version> 1.4.21.0 </version>
 <release> 0 </release>
 <summary> AIS Radar view Plugin </summary>
 
@@ -20,7 +20,7 @@ Radar PlugIn for OpenCPN Shows AIS targets in a radar style view.
 <target-version>22.04</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.20.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v1.4.20.0/aisradar_pi-1.4.20.0-ubuntu-x86_64-22.04-jammy.tar.gz
+https://dl.cloudsmith.io/public/opencpn/aisradar-prod/raw/names/aisradar_pi-1.4.21.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v1.4.21.0/aisradar_pi-1.4.21.0-ubuntu-x86_64-22.04-jammy.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/aisradarview.html </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-android-arm64-16-android-arm64.xml b/metadata/autopilot_route_pi-0.4.42.0-android-arm64-16-android-arm64.xml
similarity index 84%
rename from metadata/autopilot_route_pi-0.4.35.0-android-arm64-16-android-arm64.xml
rename to metadata/autopilot_route_pi-0.4.42.0-android-arm64-16-android-arm64.xml
index d1ea4db5dc..1c5f8624b5 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-android-arm64-16-android-arm64.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-android-arm64-16-android-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>16</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-android-arm64-16-android-arm64-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-android-arm64-16-android-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-android-arm64-16-android-arm64-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-android-arm64-16-android-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-android-armhf-16-android-armhf.xml b/metadata/autopilot_route_pi-0.4.42.0-android-armhf-16-android-armhf.xml
similarity index 84%
rename from metadata/autopilot_route_pi-0.4.35.0-android-armhf-16-android-armhf.xml
rename to metadata/autopilot_route_pi-0.4.42.0-android-armhf-16-android-armhf.xml
index b42fb33e5d..4633ebda6c 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-android-armhf-16-android-armhf.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-android-armhf-16-android-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>16</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-android-armhf-16-android-armhf-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-android-armhf-16-android-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-android-armhf-16-android-armhf-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-android-armhf-16-android-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-darwin-wx32-arm64-x86_64-14.1-macos.xml b/metadata/autopilot_route_pi-0.4.42.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
similarity index 76%
rename from metadata/autopilot_route_pi-0.4.35.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
rename to metadata/autopilot_route_pi-0.4.42.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
index 2a14992d10..52b3a904f5 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -17,10 +17,10 @@ Configurable Autopilot Route following abilities.
 <target>darwin-wx32</target>
 <build-target>darwin</build-target>
 <build-gtk></build-gtk>
-<target-version>14.1</target-version>
+<target-version>14.3.1</target-version>
 <target-arch>arm64;x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-darwin-wx32-arm64-x86_64-14.1-macos-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-darwin-wx32-arm64-x86_64-14.1-macos.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-darwin-wx32-arm64-x86_64-14.3.1-macos-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-darwin-wx32-arm64-x86_64-14.3.1-macos.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-debian-arm64-11-bullseye-arm64.xml b/metadata/autopilot_route_pi-0.4.42.0-debian-arm64-11-bullseye-arm64.xml
similarity index 84%
rename from metadata/autopilot_route_pi-0.4.35.0-debian-arm64-11-bullseye-arm64.xml
rename to metadata/autopilot_route_pi-0.4.42.0-debian-arm64-11-bullseye-arm64.xml
index 4bf8fc1808..bd472ecd86 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-debian-arm64-11-bullseye-arm64.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-debian-arm64-11-bullseye-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>11</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-debian-arm64-11-bullseye-arm64-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-debian-arm64-11-bullseye-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-debian-arm64-11-bullseye-arm64-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-debian-arm64-11-bullseye-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-debian-arm64-12-bookworm-arm64.xml b/metadata/autopilot_route_pi-0.4.42.0-debian-arm64-12-bookworm-arm64.xml
similarity index 84%
rename from metadata/autopilot_route_pi-0.4.35.0-debian-arm64-12-bookworm-arm64.xml
rename to metadata/autopilot_route_pi-0.4.42.0-debian-arm64-12-bookworm-arm64.xml
index 013da72433..2c815c80f8 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-debian-arm64-12-bookworm-arm64.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-debian-arm64-12-bookworm-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>12</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-debian-arm64-12-bookworm-arm64-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-debian-arm64-12-bookworm-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-debian-arm64-12-bookworm-arm64-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-debian-arm64-12-bookworm-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.42.0-debian-arm64-13-trixie-arm64.xml b/metadata/autopilot_route_pi-0.4.42.0-debian-arm64-13-trixie-arm64.xml
new file mode 100644
index 0000000000..be22f01c00
--- /dev/null
+++ b/metadata/autopilot_route_pi-0.4.42.0-debian-arm64-13-trixie-arm64.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Autopilot Route </name>
+<version> 0.4.42.0 </version>
+<release> 0 </release>
+<summary> Autopilot Route PlugIn for OpenCPN </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Sean D'Epagnier </author>
+<source> https://github.com/rgleason/autopilot_route_pi </source>
+
+<description>
+Configurable Autopilot Route following abilities.
+</description>
+
+<target>debian-arm64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>arm64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-debian-arm64-13-trixie-arm64-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-debian-arm64-13-trixie-arm64.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
+</plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-debian-armhf-11-bullseye-armhf.xml b/metadata/autopilot_route_pi-0.4.42.0-debian-armhf-11-bullseye-armhf.xml
similarity index 84%
rename from metadata/autopilot_route_pi-0.4.35.0-debian-armhf-11-bullseye-armhf.xml
rename to metadata/autopilot_route_pi-0.4.42.0-debian-armhf-11-bullseye-armhf.xml
index adeef55f69..134f61713e 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-debian-armhf-11-bullseye-armhf.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-debian-armhf-11-bullseye-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>11</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-debian-armhf-11-bullseye-armhf-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-debian-armhf-11-bullseye-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-debian-armhf-11-bullseye-armhf-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-debian-armhf-11-bullseye-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-debian-armhf-12-bookworm-armhf.xml b/metadata/autopilot_route_pi-0.4.42.0-debian-armhf-12-bookworm-armhf.xml
similarity index 84%
rename from metadata/autopilot_route_pi-0.4.35.0-debian-armhf-12-bookworm-armhf.xml
rename to metadata/autopilot_route_pi-0.4.42.0-debian-armhf-12-bookworm-armhf.xml
index 45cb66dcdc..35d6943c73 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-debian-armhf-12-bookworm-armhf.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-debian-armhf-12-bookworm-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>12</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-debian-armhf-12-bookworm-armhf-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-debian-armhf-12-bookworm-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-debian-armhf-12-bookworm-armhf-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-debian-armhf-12-bookworm-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.42.0-debian-armhf-13-trixie-armhf.xml b/metadata/autopilot_route_pi-0.4.42.0-debian-armhf-13-trixie-armhf.xml
new file mode 100644
index 0000000000..9888dfab68
--- /dev/null
+++ b/metadata/autopilot_route_pi-0.4.42.0-debian-armhf-13-trixie-armhf.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Autopilot Route </name>
+<version> 0.4.42.0 </version>
+<release> 0 </release>
+<summary> Autopilot Route PlugIn for OpenCPN </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Sean D'Epagnier </author>
+<source> https://github.com/rgleason/autopilot_route_pi </source>
+
+<description>
+Configurable Autopilot Route following abilities.
+</description>
+
+<target>debian-armhf</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>armhf</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-debian-armhf-13-trixie-armhf-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-debian-armhf-13-trixie-armhf.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
+</plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-debian-x86_64-11-bullseye.xml b/metadata/autopilot_route_pi-0.4.42.0-debian-x86_64-11-bullseye.xml
similarity index 84%
rename from metadata/autopilot_route_pi-0.4.35.0-debian-x86_64-11-bullseye.xml
rename to metadata/autopilot_route_pi-0.4.42.0-debian-x86_64-11-bullseye.xml
index 7df5dfe422..c1784fcc4a 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-debian-x86_64-11-bullseye.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-debian-x86_64-11-bullseye.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>11</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-debian-x86_64-11-bullseye-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-debian-x86_64-11-bullseye.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-debian-x86_64-11-bullseye-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-debian-x86_64-11-bullseye.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-debian-x86_64-12-bookworm.xml b/metadata/autopilot_route_pi-0.4.42.0-debian-x86_64-12-bookworm.xml
similarity index 83%
rename from metadata/autopilot_route_pi-0.4.35.0-debian-x86_64-12-bookworm.xml
rename to metadata/autopilot_route_pi-0.4.42.0-debian-x86_64-12-bookworm.xml
index b11e9c52b8..fb0949aed6 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-debian-x86_64-12-bookworm.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-debian-x86_64-12-bookworm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>12</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-debian-x86_64-12-bookworm-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-debian-x86_64-12-bookworm.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-debian-x86_64-12-bookworm-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-debian-x86_64-12-bookworm.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.42.0-debian-x86_64-13-trixie.xml b/metadata/autopilot_route_pi-0.4.42.0-debian-x86_64-13-trixie.xml
new file mode 100644
index 0000000000..2ac613133d
--- /dev/null
+++ b/metadata/autopilot_route_pi-0.4.42.0-debian-x86_64-13-trixie.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Autopilot Route </name>
+<version> 0.4.42.0 </version>
+<release> 0 </release>
+<summary> Autopilot Route PlugIn for OpenCPN </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Sean D'Epagnier </author>
+<source> https://github.com/rgleason/autopilot_route_pi </source>
+
+<description>
+Configurable Autopilot Route following abilities.
+</description>
+
+<target>debian-x86_64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>x86_64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-debian-x86_64-13-trixie-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-debian-x86_64-13-trixie.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
+</plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-flatpak-aarch64-22.08-flatpak.xml b/metadata/autopilot_route_pi-0.4.42.0-flatpak-aarch64-22.08-flatpak.xml
similarity index 84%
rename from metadata/autopilot_route_pi-0.4.35.0-flatpak-aarch64-22.08-flatpak.xml
rename to metadata/autopilot_route_pi-0.4.42.0-flatpak-aarch64-22.08-flatpak.xml
index 4bc73e1648..8d2925ba3b 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-flatpak-aarch64-22.08-flatpak.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-flatpak-aarch64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>22.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-aarch64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-aarch64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-flatpak-aarch64-24.08-flatpak.xml b/metadata/autopilot_route_pi-0.4.42.0-flatpak-aarch64-24.08-flatpak.xml
similarity index 84%
rename from metadata/autopilot_route_pi-0.4.35.0-flatpak-aarch64-24.08-flatpak.xml
rename to metadata/autopilot_route_pi-0.4.42.0-flatpak-aarch64-24.08-flatpak.xml
index a75821ff3b..1b975013e1 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-flatpak-aarch64-24.08-flatpak.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-flatpak-aarch64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>24.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-aarch64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-aarch64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-flatpak-x86_64-22.08-flatpak.xml b/metadata/autopilot_route_pi-0.4.42.0-flatpak-x86_64-22.08-flatpak.xml
similarity index 84%
rename from metadata/autopilot_route_pi-0.4.35.0-flatpak-x86_64-22.08-flatpak.xml
rename to metadata/autopilot_route_pi-0.4.42.0-flatpak-x86_64-22.08-flatpak.xml
index 3036e63008..6fb4730a45 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-flatpak-x86_64-22.08-flatpak.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-flatpak-x86_64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>22.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-x86_64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-x86_64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-flatpak-x86_64-24.08-flatpak.xml b/metadata/autopilot_route_pi-0.4.42.0-flatpak-x86_64-24.08-flatpak.xml
similarity index 84%
rename from metadata/autopilot_route_pi-0.4.35.0-flatpak-x86_64-24.08-flatpak.xml
rename to metadata/autopilot_route_pi-0.4.42.0-flatpak-x86_64-24.08-flatpak.xml
index 776951ae7e..ede9002e31 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-flatpak-x86_64-24.08-flatpak.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-flatpak-x86_64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>24.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-x86_64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-x86_64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-msvc-x86-10.0.20348-MSVC.xml b/metadata/autopilot_route_pi-0.4.42.0-msvc-x86-10.0.20348-MSVC.xml
similarity index 83%
rename from metadata/autopilot_route_pi-0.4.35.0-msvc-x86-10.0.20348-MSVC.xml
rename to metadata/autopilot_route_pi-0.4.42.0-msvc-x86-10.0.20348-MSVC.xml
index 50ad6e6f48..0c8e4bf5d4 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-msvc-x86-10.0.20348-MSVC.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-msvc-x86-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-msvc-x86-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-msvc-x86-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-msvc-x86-wx32-10.0.20348-MSVC.xml b/metadata/autopilot_route_pi-0.4.42.0-msvc-x86-wx32-10.0.20348-MSVC.xml
similarity index 84%
rename from metadata/autopilot_route_pi-0.4.35.0-msvc-x86-wx32-10.0.20348-MSVC.xml
rename to metadata/autopilot_route_pi-0.4.42.0-msvc-x86-wx32-10.0.20348-MSVC.xml
index 6a1d98b914..e69b1a6ec8 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-msvc-x86-wx32-10.0.20348-MSVC.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-msvc-x86-wx32-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/autopilot_route_pi-0.4.35.0-ubuntu-x86_64-22.04-jammy.xml b/metadata/autopilot_route_pi-0.4.42.0-ubuntu-x86_64-22.04-jammy.xml
similarity index 84%
rename from metadata/autopilot_route_pi-0.4.35.0-ubuntu-x86_64-22.04-jammy.xml
rename to metadata/autopilot_route_pi-0.4.42.0-ubuntu-x86_64-22.04-jammy.xml
index 7cd111f9f6..8351791ca8 100644
--- a/metadata/autopilot_route_pi-0.4.35.0-ubuntu-x86_64-22.04-jammy.xml
+++ b/metadata/autopilot_route_pi-0.4.42.0-ubuntu-x86_64-22.04-jammy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Autopilot Route </name>
-<version> 0.4.35.0 </version>
+<version> 0.4.42.0 </version>
 <release> 0 </release>
 <summary> Autopilot Route PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Configurable Autopilot Route following abilities.
 <target-version>22.04</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.35.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v0.4.35.0/autopilot_route_pi-0.4.35.0-ubuntu-x86_64-22.04-jammy.tar.gz
+https://dl.cloudsmith.io/public/opencpn/autopilot-route-prod/raw/names/autopilot_route_pi-0.4.42.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v0.4.42.0/autopilot_route_pi-0.4.42.0-ubuntu-x86_64-22.04-jammy.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.37.0-android-arm64-16-android-arm64.xml b/metadata/polar_pi-1.2.38.0-android-arm64-16-android-arm64.xml
similarity index 86%
rename from metadata/polar_pi-1.2.37.0-android-arm64-16-android-arm64.xml
rename to metadata/polar_pi-1.2.38.0-android-arm64-16-android-arm64.xml
index dcdf93491e..648af92f70 100644
--- a/metadata/polar_pi-1.2.37.0-android-arm64-16-android-arm64.xml
+++ b/metadata/polar_pi-1.2.38.0-android-arm64-16-android-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>16</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-android-arm64-16-android-arm64-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-android-arm64-16-android-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-android-arm64-16-android-arm64-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-android-arm64-16-android-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.37.0-android-armhf-16-android-armhf.xml b/metadata/polar_pi-1.2.38.0-android-armhf-16-android-armhf.xml
similarity index 86%
rename from metadata/polar_pi-1.2.37.0-android-armhf-16-android-armhf.xml
rename to metadata/polar_pi-1.2.38.0-android-armhf-16-android-armhf.xml
index 70fedf14fb..82095a28cd 100644
--- a/metadata/polar_pi-1.2.37.0-android-armhf-16-android-armhf.xml
+++ b/metadata/polar_pi-1.2.38.0-android-armhf-16-android-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>16</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-android-armhf-16-android-armhf-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-android-armhf-16-android-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-android-armhf-16-android-armhf-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-android-armhf-16-android-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.37.0-darwin-wx32-arm64-x86_64-14.1-macos.xml b/metadata/polar_pi-1.2.38.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
similarity index 82%
rename from metadata/polar_pi-1.2.37.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
rename to metadata/polar_pi-1.2.38.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
index 4e97cd6374..aec12dbba4 100644
--- a/metadata/polar_pi-1.2.37.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
+++ b/metadata/polar_pi-1.2.38.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -17,10 +17,10 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target>darwin-wx32</target>
 <build-target>darwin</build-target>
 <build-gtk></build-gtk>
-<target-version>14.1</target-version>
+<target-version>14.3.1</target-version>
 <target-arch>arm64;x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-darwin-wx32-arm64-x86_64-14.1-macos-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-darwin-wx32-arm64-x86_64-14.1-macos.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-darwin-wx32-arm64-x86_64-14.3.1-macos-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-darwin-wx32-arm64-x86_64-14.3.1-macos.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.37.0-debian-arm64-11-bullseye-arm64.xml b/metadata/polar_pi-1.2.38.0-debian-arm64-11-bullseye-arm64.xml
similarity index 86%
rename from metadata/polar_pi-1.2.37.0-debian-arm64-11-bullseye-arm64.xml
rename to metadata/polar_pi-1.2.38.0-debian-arm64-11-bullseye-arm64.xml
index cc7a14dc14..9c1453cc6e 100644
--- a/metadata/polar_pi-1.2.37.0-debian-arm64-11-bullseye-arm64.xml
+++ b/metadata/polar_pi-1.2.38.0-debian-arm64-11-bullseye-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>11</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-debian-arm64-11-bullseye-arm64-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-debian-arm64-11-bullseye-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-debian-arm64-11-bullseye-arm64-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-debian-arm64-11-bullseye-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.37.0-debian-arm64-12-bookworm-arm64.xml b/metadata/polar_pi-1.2.38.0-debian-arm64-12-bookworm-arm64.xml
similarity index 86%
rename from metadata/polar_pi-1.2.37.0-debian-arm64-12-bookworm-arm64.xml
rename to metadata/polar_pi-1.2.38.0-debian-arm64-12-bookworm-arm64.xml
index d0227b318e..ea4dc466ff 100644
--- a/metadata/polar_pi-1.2.37.0-debian-arm64-12-bookworm-arm64.xml
+++ b/metadata/polar_pi-1.2.38.0-debian-arm64-12-bookworm-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>12</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-debian-arm64-12-bookworm-arm64-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-debian-arm64-12-bookworm-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-debian-arm64-12-bookworm-arm64-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-debian-arm64-12-bookworm-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.38.0-debian-arm64-13-trixie-arm64.xml b/metadata/polar_pi-1.2.38.0-debian-arm64-13-trixie-arm64.xml
new file mode 100644
index 0000000000..9143aa7c7e
--- /dev/null
+++ b/metadata/polar_pi-1.2.38.0-debian-arm64-13-trixie-arm64.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Polar </name>
+<version> 1.2.38.0 </version>
+<release> 0 </release>
+<summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Peter Tulp </author>
+<source> https://github.com/rgleason/polar_pi </source>
+
+<description>
+Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channel (Record Start/Stop at bottom) and direct from LogBoookKonni records, to creates a polar diagram which can then be edited manually, saved or loaded as a Boat Polar file. The LogbookKonni selection has several options.
+</description>
+
+<target>debian-arm64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>arm64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-debian-arm64-13-trixie-arm64-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-debian-arm64-13-trixie-arm64.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
+</plugin>
diff --git a/metadata/polar_pi-1.2.37.0-debian-armhf-11-bullseye-armhf.xml b/metadata/polar_pi-1.2.38.0-debian-armhf-11-bullseye-armhf.xml
similarity index 86%
rename from metadata/polar_pi-1.2.37.0-debian-armhf-11-bullseye-armhf.xml
rename to metadata/polar_pi-1.2.38.0-debian-armhf-11-bullseye-armhf.xml
index d8289477c2..0d322fd538 100644
--- a/metadata/polar_pi-1.2.37.0-debian-armhf-11-bullseye-armhf.xml
+++ b/metadata/polar_pi-1.2.38.0-debian-armhf-11-bullseye-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>11</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-debian-armhf-11-bullseye-armhf-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-debian-armhf-11-bullseye-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-debian-armhf-11-bullseye-armhf-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-debian-armhf-11-bullseye-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.37.0-debian-armhf-12-bookworm-armhf.xml b/metadata/polar_pi-1.2.38.0-debian-armhf-12-bookworm-armhf.xml
similarity index 86%
rename from metadata/polar_pi-1.2.37.0-debian-armhf-12-bookworm-armhf.xml
rename to metadata/polar_pi-1.2.38.0-debian-armhf-12-bookworm-armhf.xml
index 1344c0ea63..dffd44a615 100644
--- a/metadata/polar_pi-1.2.37.0-debian-armhf-12-bookworm-armhf.xml
+++ b/metadata/polar_pi-1.2.38.0-debian-armhf-12-bookworm-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>12</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-debian-armhf-12-bookworm-armhf-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-debian-armhf-12-bookworm-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-debian-armhf-12-bookworm-armhf-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-debian-armhf-12-bookworm-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.38.0-debian-armhf-13-trixie-armhf.xml b/metadata/polar_pi-1.2.38.0-debian-armhf-13-trixie-armhf.xml
new file mode 100644
index 0000000000..bb7cf2e800
--- /dev/null
+++ b/metadata/polar_pi-1.2.38.0-debian-armhf-13-trixie-armhf.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Polar </name>
+<version> 1.2.38.0 </version>
+<release> 0 </release>
+<summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Peter Tulp </author>
+<source> https://github.com/rgleason/polar_pi </source>
+
+<description>
+Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channel (Record Start/Stop at bottom) and direct from LogBoookKonni records, to creates a polar diagram which can then be edited manually, saved or loaded as a Boat Polar file. The LogbookKonni selection has several options.
+</description>
+
+<target>debian-armhf</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>armhf</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-debian-armhf-13-trixie-armhf-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-debian-armhf-13-trixie-armhf.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
+</plugin>
diff --git a/metadata/polar_pi-1.2.37.0-debian-x86_64-11-bullseye.xml b/metadata/polar_pi-1.2.38.0-debian-x86_64-11-bullseye.xml
similarity index 87%
rename from metadata/polar_pi-1.2.37.0-debian-x86_64-11-bullseye.xml
rename to metadata/polar_pi-1.2.38.0-debian-x86_64-11-bullseye.xml
index 9f0b52758b..cf49af4c69 100644
--- a/metadata/polar_pi-1.2.37.0-debian-x86_64-11-bullseye.xml
+++ b/metadata/polar_pi-1.2.38.0-debian-x86_64-11-bullseye.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>11</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-debian-x86_64-11-bullseye-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-debian-x86_64-11-bullseye.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-debian-x86_64-11-bullseye-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-debian-x86_64-11-bullseye.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.37.0-debian-x86_64-12-bookworm.xml b/metadata/polar_pi-1.2.38.0-debian-x86_64-12-bookworm.xml
similarity index 87%
rename from metadata/polar_pi-1.2.37.0-debian-x86_64-12-bookworm.xml
rename to metadata/polar_pi-1.2.38.0-debian-x86_64-12-bookworm.xml
index 7f974d93ff..06f5d8c633 100644
--- a/metadata/polar_pi-1.2.37.0-debian-x86_64-12-bookworm.xml
+++ b/metadata/polar_pi-1.2.38.0-debian-x86_64-12-bookworm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>12</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-debian-x86_64-12-bookworm-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-debian-x86_64-12-bookworm.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-debian-x86_64-12-bookworm-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-debian-x86_64-12-bookworm.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.38.0-debian-x86_64-13-trixie.xml b/metadata/polar_pi-1.2.38.0-debian-x86_64-13-trixie.xml
new file mode 100644
index 0000000000..a642763891
--- /dev/null
+++ b/metadata/polar_pi-1.2.38.0-debian-x86_64-13-trixie.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Polar </name>
+<version> 1.2.38.0 </version>
+<release> 0 </release>
+<summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Peter Tulp </author>
+<source> https://github.com/rgleason/polar_pi </source>
+
+<description>
+Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channel (Record Start/Stop at bottom) and direct from LogBoookKonni records, to creates a polar diagram which can then be edited manually, saved or loaded as a Boat Polar file. The LogbookKonni selection has several options.
+</description>
+
+<target>debian-x86_64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>x86_64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-debian-x86_64-13-trixie-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-debian-x86_64-13-trixie.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
+</plugin>
diff --git a/metadata/polar_pi-1.2.37.0-flatpak-aarch64-22.08-flatpak.xml b/metadata/polar_pi-1.2.38.0-flatpak-aarch64-22.08-flatpak.xml
similarity index 87%
rename from metadata/polar_pi-1.2.37.0-flatpak-aarch64-22.08-flatpak.xml
rename to metadata/polar_pi-1.2.38.0-flatpak-aarch64-22.08-flatpak.xml
index 8df057ecf7..8dc390cdf9 100644
--- a/metadata/polar_pi-1.2.37.0-flatpak-aarch64-22.08-flatpak.xml
+++ b/metadata/polar_pi-1.2.38.0-flatpak-aarch64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>22.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-aarch64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-aarch64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.37.0-flatpak-aarch64-24.08-flatpak.xml b/metadata/polar_pi-1.2.38.0-flatpak-aarch64-24.08-flatpak.xml
similarity index 87%
rename from metadata/polar_pi-1.2.37.0-flatpak-aarch64-24.08-flatpak.xml
rename to metadata/polar_pi-1.2.38.0-flatpak-aarch64-24.08-flatpak.xml
index ae06612355..b32d754885 100644
--- a/metadata/polar_pi-1.2.37.0-flatpak-aarch64-24.08-flatpak.xml
+++ b/metadata/polar_pi-1.2.38.0-flatpak-aarch64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>24.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-aarch64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-aarch64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.37.0-flatpak-x86_64-22.08-flatpak.xml b/metadata/polar_pi-1.2.38.0-flatpak-x86_64-22.08-flatpak.xml
similarity index 87%
rename from metadata/polar_pi-1.2.37.0-flatpak-x86_64-22.08-flatpak.xml
rename to metadata/polar_pi-1.2.38.0-flatpak-x86_64-22.08-flatpak.xml
index 309f50e47c..04768253b3 100644
--- a/metadata/polar_pi-1.2.37.0-flatpak-x86_64-22.08-flatpak.xml
+++ b/metadata/polar_pi-1.2.38.0-flatpak-x86_64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>22.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-x86_64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-x86_64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.37.0-flatpak-x86_64-24.08-flatpak.xml b/metadata/polar_pi-1.2.38.0-flatpak-x86_64-24.08-flatpak.xml
similarity index 87%
rename from metadata/polar_pi-1.2.37.0-flatpak-x86_64-24.08-flatpak.xml
rename to metadata/polar_pi-1.2.38.0-flatpak-x86_64-24.08-flatpak.xml
index db89e0033e..35fe0f6ff8 100644
--- a/metadata/polar_pi-1.2.37.0-flatpak-x86_64-24.08-flatpak.xml
+++ b/metadata/polar_pi-1.2.38.0-flatpak-x86_64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>24.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-x86_64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-x86_64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.37.0-msvc-x86-10.0.20348-MSVC.xml b/metadata/polar_pi-1.2.38.0-msvc-x86-10.0.20348-MSVC.xml
similarity index 87%
rename from metadata/polar_pi-1.2.37.0-msvc-x86-10.0.20348-MSVC.xml
rename to metadata/polar_pi-1.2.38.0-msvc-x86-10.0.20348-MSVC.xml
index f015666691..678db8cc88 100644
--- a/metadata/polar_pi-1.2.37.0-msvc-x86-10.0.20348-MSVC.xml
+++ b/metadata/polar_pi-1.2.38.0-msvc-x86-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-msvc-x86-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-msvc-x86-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.37.0-msvc-x86-wx32-10.0.20348-MSVC.xml b/metadata/polar_pi-1.2.38.0-msvc-x86-wx32-10.0.20348-MSVC.xml
similarity index 86%
rename from metadata/polar_pi-1.2.37.0-msvc-x86-wx32-10.0.20348-MSVC.xml
rename to metadata/polar_pi-1.2.38.0-msvc-x86-wx32-10.0.20348-MSVC.xml
index c7f4c1c22f..1d86b5981e 100644
--- a/metadata/polar_pi-1.2.37.0-msvc-x86-wx32-10.0.20348-MSVC.xml
+++ b/metadata/polar_pi-1.2.38.0-msvc-x86-wx32-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/polar_pi-1.2.37.0-ubuntu-x86_64-22.04-jammy.xml b/metadata/polar_pi-1.2.38.0-ubuntu-x86_64-22.04-jammy.xml
similarity index 86%
rename from metadata/polar_pi-1.2.37.0-ubuntu-x86_64-22.04-jammy.xml
rename to metadata/polar_pi-1.2.38.0-ubuntu-x86_64-22.04-jammy.xml
index ba30887666..6b5de5edd8 100644
--- a/metadata/polar_pi-1.2.37.0-ubuntu-x86_64-22.04-jammy.xml
+++ b/metadata/polar_pi-1.2.38.0-ubuntu-x86_64-22.04-jammy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Polar </name>
-<version> 1.2.37.0 </version>
+<version> 1.2.38.0 </version>
 <release> 0 </release>
 <summary> Polar Plugin makes polar diagrams for Weather Routing Predictions </summary>
 
@@ -20,7 +20,7 @@ Polar Plugin reads VDR data files directly, reads from Opencpn input Nmea channe
 <target-version>22.04</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.37.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v1.2.37.0/polar_pi-1.2.37.0-ubuntu-x86_64-22.04-jammy.tar.gz
+https://dl.cloudsmith.io/public/opencpn/polar-prod/raw/names/polar_pi-1.2.38.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v1.2.38.0/polar_pi-1.2.38.0-ubuntu-x86_64-22.04-jammy.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/polar.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-android-arm64-16-android-arm64.xml b/metadata/pypilot_pi-0.53.4.0-android-arm64-16-android-arm64.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-android-arm64-16-android-arm64.xml
rename to metadata/pypilot_pi-0.53.4.0-android-arm64-16-android-arm64.xml
index 3310424078..c29181f954 100644
--- a/metadata/pypilot_pi-0.53.2.0-android-arm64-16-android-arm64.xml
+++ b/metadata/pypilot_pi-0.53.4.0-android-arm64-16-android-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>16</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-android-arm64-16-android-arm64-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-android-arm64-16-android-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-android-arm64-16-android-arm64-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-android-arm64-16-android-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-android-armhf-16-android-armhf.xml b/metadata/pypilot_pi-0.53.4.0-android-armhf-16-android-armhf.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-android-armhf-16-android-armhf.xml
rename to metadata/pypilot_pi-0.53.4.0-android-armhf-16-android-armhf.xml
index 2a017cb44c..da08d7c465 100644
--- a/metadata/pypilot_pi-0.53.2.0-android-armhf-16-android-armhf.xml
+++ b/metadata/pypilot_pi-0.53.4.0-android-armhf-16-android-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>16</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-android-armhf-16-android-armhf-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-android-armhf-16-android-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-android-armhf-16-android-armhf-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-android-armhf-16-android-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-darwin-wx32-arm64-x86_64-14.1-macos.xml b/metadata/pypilot_pi-0.53.4.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
similarity index 81%
rename from metadata/pypilot_pi-0.53.2.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
rename to metadata/pypilot_pi-0.53.4.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
index 15fa8d6a92..0211fea747 100644
--- a/metadata/pypilot_pi-0.53.2.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
+++ b/metadata/pypilot_pi-0.53.4.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -17,10 +17,10 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target>darwin-wx32</target>
 <build-target>darwin</build-target>
 <build-gtk></build-gtk>
-<target-version>14.1</target-version>
+<target-version>14.3.1</target-version>
 <target-arch>arm64;x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-darwin-wx32-arm64-x86_64-14.1-macos-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-darwin-wx32-arm64-x86_64-14.1-macos.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-darwin-wx32-arm64-x86_64-14.3.1-macos-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-darwin-wx32-arm64-x86_64-14.3.1-macos.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-debian-arm64-11-bullseye-arm64.xml b/metadata/pypilot_pi-0.53.4.0-debian-arm64-11-bullseye-arm64.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-debian-arm64-11-bullseye-arm64.xml
rename to metadata/pypilot_pi-0.53.4.0-debian-arm64-11-bullseye-arm64.xml
index b071f795d4..1ea3556783 100644
--- a/metadata/pypilot_pi-0.53.2.0-debian-arm64-11-bullseye-arm64.xml
+++ b/metadata/pypilot_pi-0.53.4.0-debian-arm64-11-bullseye-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>11</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-debian-arm64-11-bullseye-arm64-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-debian-arm64-11-bullseye-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-debian-arm64-11-bullseye-arm64-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-debian-arm64-11-bullseye-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-debian-arm64-12-bookworm-arm64.xml b/metadata/pypilot_pi-0.53.4.0-debian-arm64-12-bookworm-arm64.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-debian-arm64-12-bookworm-arm64.xml
rename to metadata/pypilot_pi-0.53.4.0-debian-arm64-12-bookworm-arm64.xml
index 9d7f174bcc..5cd86b8c72 100644
--- a/metadata/pypilot_pi-0.53.2.0-debian-arm64-12-bookworm-arm64.xml
+++ b/metadata/pypilot_pi-0.53.4.0-debian-arm64-12-bookworm-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>12</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-debian-arm64-12-bookworm-arm64-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-debian-arm64-12-bookworm-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-debian-arm64-12-bookworm-arm64-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-debian-arm64-12-bookworm-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.4.0-debian-arm64-13-trixie-arm64.xml b/metadata/pypilot_pi-0.53.4.0-debian-arm64-13-trixie-arm64.xml
new file mode 100644
index 0000000000..a4529c3327
--- /dev/null
+++ b/metadata/pypilot_pi-0.53.4.0-debian-arm64-13-trixie-arm64.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> pypilot </name>
+<version> 0.53.4.0 </version>
+<release> 0 </release>
+<summary> pypilot PlugIn for OpenCPN </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Sean D'Epagnier </author>
+<source> https://github.com/rgleason/pypilot_pi </source>
+
+<description>
+Control the free software autopilot pypilot. See http://pypilot.org for more details. nThe plugin connects to pypilot directly implementing a control interface to configure, ncalibrate and command pypilot from opencpn. For more control and tuning route-following nlogic, consider the autopilot route plugin.
+</description>
+
+<target>debian-arm64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>arm64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-debian-arm64-13-trixie-arm64-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-debian-arm64-13-trixie-arm64.tar.gz
+</tarball-url>
+<info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
+</plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-debian-armhf-11-bullseye-armhf.xml b/metadata/pypilot_pi-0.53.4.0-debian-armhf-11-bullseye-armhf.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-debian-armhf-11-bullseye-armhf.xml
rename to metadata/pypilot_pi-0.53.4.0-debian-armhf-11-bullseye-armhf.xml
index 59cee7da1b..814a5fdb8a 100644
--- a/metadata/pypilot_pi-0.53.2.0-debian-armhf-11-bullseye-armhf.xml
+++ b/metadata/pypilot_pi-0.53.4.0-debian-armhf-11-bullseye-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>11</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-debian-armhf-11-bullseye-armhf-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-debian-armhf-11-bullseye-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-debian-armhf-11-bullseye-armhf-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-debian-armhf-11-bullseye-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-debian-armhf-12-bookworm-armhf.xml b/metadata/pypilot_pi-0.53.4.0-debian-armhf-12-bookworm-armhf.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-debian-armhf-12-bookworm-armhf.xml
rename to metadata/pypilot_pi-0.53.4.0-debian-armhf-12-bookworm-armhf.xml
index f56d50c753..7173e0339e 100644
--- a/metadata/pypilot_pi-0.53.2.0-debian-armhf-12-bookworm-armhf.xml
+++ b/metadata/pypilot_pi-0.53.4.0-debian-armhf-12-bookworm-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>12</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-debian-armhf-12-bookworm-armhf-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-debian-armhf-12-bookworm-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-debian-armhf-12-bookworm-armhf-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-debian-armhf-12-bookworm-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.4.0-debian-armhf-13-trixie-armhf.xml b/metadata/pypilot_pi-0.53.4.0-debian-armhf-13-trixie-armhf.xml
new file mode 100644
index 0000000000..dd71962d5b
--- /dev/null
+++ b/metadata/pypilot_pi-0.53.4.0-debian-armhf-13-trixie-armhf.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> pypilot </name>
+<version> 0.53.4.0 </version>
+<release> 0 </release>
+<summary> pypilot PlugIn for OpenCPN </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Sean D'Epagnier </author>
+<source> https://github.com/rgleason/pypilot_pi </source>
+
+<description>
+Control the free software autopilot pypilot. See http://pypilot.org for more details. nThe plugin connects to pypilot directly implementing a control interface to configure, ncalibrate and command pypilot from opencpn. For more control and tuning route-following nlogic, consider the autopilot route plugin.
+</description>
+
+<target>debian-armhf</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>armhf</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-debian-armhf-13-trixie-armhf-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-debian-armhf-13-trixie-armhf.tar.gz
+</tarball-url>
+<info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
+</plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-debian-x86_64-11-bullseye.xml b/metadata/pypilot_pi-0.53.4.0-debian-x86_64-11-bullseye.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-debian-x86_64-11-bullseye.xml
rename to metadata/pypilot_pi-0.53.4.0-debian-x86_64-11-bullseye.xml
index 1fb7709bf5..6fc8e4f8b3 100644
--- a/metadata/pypilot_pi-0.53.2.0-debian-x86_64-11-bullseye.xml
+++ b/metadata/pypilot_pi-0.53.4.0-debian-x86_64-11-bullseye.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>11</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-debian-x86_64-11-bullseye-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-debian-x86_64-11-bullseye.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-debian-x86_64-11-bullseye-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-debian-x86_64-11-bullseye.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-debian-x86_64-12-bookworm.xml b/metadata/pypilot_pi-0.53.4.0-debian-x86_64-12-bookworm.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-debian-x86_64-12-bookworm.xml
rename to metadata/pypilot_pi-0.53.4.0-debian-x86_64-12-bookworm.xml
index 6dd7779744..eb84174eaa 100644
--- a/metadata/pypilot_pi-0.53.2.0-debian-x86_64-12-bookworm.xml
+++ b/metadata/pypilot_pi-0.53.4.0-debian-x86_64-12-bookworm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>12</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-debian-x86_64-12-bookworm-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-debian-x86_64-12-bookworm.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-debian-x86_64-12-bookworm-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-debian-x86_64-12-bookworm.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.4.0-debian-x86_64-13-trixie.xml b/metadata/pypilot_pi-0.53.4.0-debian-x86_64-13-trixie.xml
new file mode 100644
index 0000000000..b95b057723
--- /dev/null
+++ b/metadata/pypilot_pi-0.53.4.0-debian-x86_64-13-trixie.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> pypilot </name>
+<version> 0.53.4.0 </version>
+<release> 0 </release>
+<summary> pypilot PlugIn for OpenCPN </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Sean D'Epagnier </author>
+<source> https://github.com/rgleason/pypilot_pi </source>
+
+<description>
+Control the free software autopilot pypilot. See http://pypilot.org for more details. nThe plugin connects to pypilot directly implementing a control interface to configure, ncalibrate and command pypilot from opencpn. For more control and tuning route-following nlogic, consider the autopilot route plugin.
+</description>
+
+<target>debian-x86_64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>x86_64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-debian-x86_64-13-trixie-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-debian-x86_64-13-trixie.tar.gz
+</tarball-url>
+<info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
+</plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-flatpak-aarch64-22.08-flatpak.xml b/metadata/pypilot_pi-0.53.4.0-flatpak-aarch64-22.08-flatpak.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-flatpak-aarch64-22.08-flatpak.xml
rename to metadata/pypilot_pi-0.53.4.0-flatpak-aarch64-22.08-flatpak.xml
index 8e69bbb9aa..6c60225893 100644
--- a/metadata/pypilot_pi-0.53.2.0-flatpak-aarch64-22.08-flatpak.xml
+++ b/metadata/pypilot_pi-0.53.4.0-flatpak-aarch64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>22.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-aarch64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-aarch64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-flatpak-aarch64-24.08-flatpak.xml b/metadata/pypilot_pi-0.53.4.0-flatpak-aarch64-24.08-flatpak.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-flatpak-aarch64-24.08-flatpak.xml
rename to metadata/pypilot_pi-0.53.4.0-flatpak-aarch64-24.08-flatpak.xml
index 837c22e9ca..03c11b0599 100644
--- a/metadata/pypilot_pi-0.53.2.0-flatpak-aarch64-24.08-flatpak.xml
+++ b/metadata/pypilot_pi-0.53.4.0-flatpak-aarch64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>24.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-aarch64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-aarch64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-flatpak-x86_64-22.08-flatpak.xml b/metadata/pypilot_pi-0.53.4.0-flatpak-x86_64-22.08-flatpak.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-flatpak-x86_64-22.08-flatpak.xml
rename to metadata/pypilot_pi-0.53.4.0-flatpak-x86_64-22.08-flatpak.xml
index 1efd222385..3e97a27960 100644
--- a/metadata/pypilot_pi-0.53.2.0-flatpak-x86_64-22.08-flatpak.xml
+++ b/metadata/pypilot_pi-0.53.4.0-flatpak-x86_64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>22.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-x86_64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-x86_64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-flatpak-x86_64-24.08-flatpak.xml b/metadata/pypilot_pi-0.53.4.0-flatpak-x86_64-24.08-flatpak.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-flatpak-x86_64-24.08-flatpak.xml
rename to metadata/pypilot_pi-0.53.4.0-flatpak-x86_64-24.08-flatpak.xml
index 57bb29d290..a797f9e57e 100644
--- a/metadata/pypilot_pi-0.53.2.0-flatpak-x86_64-24.08-flatpak.xml
+++ b/metadata/pypilot_pi-0.53.4.0-flatpak-x86_64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>24.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-x86_64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-x86_64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-msvc-x86-10.0.20348-MSVC.xml b/metadata/pypilot_pi-0.53.4.0-msvc-x86-10.0.20348-MSVC.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-msvc-x86-10.0.20348-MSVC.xml
rename to metadata/pypilot_pi-0.53.4.0-msvc-x86-10.0.20348-MSVC.xml
index 9f123a64d9..a3fa7958fb 100644
--- a/metadata/pypilot_pi-0.53.2.0-msvc-x86-10.0.20348-MSVC.xml
+++ b/metadata/pypilot_pi-0.53.4.0-msvc-x86-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-msvc-x86-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-msvc-x86-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-msvc-x86-wx32-10.0.20348-MSVC.xml b/metadata/pypilot_pi-0.53.4.0-msvc-x86-wx32-10.0.20348-MSVC.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-msvc-x86-wx32-10.0.20348-MSVC.xml
rename to metadata/pypilot_pi-0.53.4.0-msvc-x86-wx32-10.0.20348-MSVC.xml
index c34a874681..b364a15d07 100644
--- a/metadata/pypilot_pi-0.53.2.0-msvc-x86-wx32-10.0.20348-MSVC.xml
+++ b/metadata/pypilot_pi-0.53.4.0-msvc-x86-wx32-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/pypilot_pi-0.53.2.0-ubuntu-x86_64-22.04-jammy.xml b/metadata/pypilot_pi-0.53.4.0-ubuntu-x86_64-22.04-jammy.xml
similarity index 86%
rename from metadata/pypilot_pi-0.53.2.0-ubuntu-x86_64-22.04-jammy.xml
rename to metadata/pypilot_pi-0.53.4.0-ubuntu-x86_64-22.04-jammy.xml
index fe67e17069..324d6bab80 100644
--- a/metadata/pypilot_pi-0.53.2.0-ubuntu-x86_64-22.04-jammy.xml
+++ b/metadata/pypilot_pi-0.53.4.0-ubuntu-x86_64-22.04-jammy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> pypilot </name>
-<version> 0.53.2.0 </version>
+<version> 0.53.4.0 </version>
 <release> 0 </release>
 <summary> pypilot PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Control the free software autopilot pypilot. See http://pypilot.org for more det
 <target-version>22.04</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.2.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v0.53.2.0/pypilot_pi-0.53.2.0-ubuntu-x86_64-22.04-jammy.tar.gz
+https://dl.cloudsmith.io/public/opencpn/pypilot-prod/raw/names/pypilot_pi-0.53.4.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v0.53.4.0/pypilot_pi-0.53.4.0-ubuntu-x86_64-22.04-jammy.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/pypilot/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-android-arm64-16-android-arm64.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-android-arm64-16-android-arm64.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-android-arm64-16-android-arm64.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-android-arm64-16-android-arm64.xml
index cb1a2e5a89..06baabda9b 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-android-arm64-16-android-arm64.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-android-arm64-16-android-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>16</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-android-arm64-16-android-arm64-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-android-arm64-16-android-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-android-arm64-16-android-arm64-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-android-arm64-16-android-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-android-armhf-16-android-armhf.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-android-armhf-16-android-armhf.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-android-armhf-16-android-armhf.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-android-armhf-16-android-armhf.xml
index 8a6c4e1978..647bfe085d 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-android-armhf-16-android-armhf.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-android-armhf-16-android-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>16</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-android-armhf-16-android-armhf-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-android-armhf-16-android-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-android-armhf-16-android-armhf-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-android-armhf-16-android-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-darwin-wx32-arm64-x86_64-14.1-macos.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
similarity index 75%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
index d74a6ed0ca..4d48a1b021 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -17,10 +17,10 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target>darwin-wx32</target>
 <build-target>darwin</build-target>
 <build-gtk></build-gtk>
-<target-version>14.1</target-version>
+<target-version>14.3.1</target-version>
 <target-arch>arm64;x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-darwin-wx32-arm64-x86_64-14.1-macos-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-darwin-wx32-arm64-x86_64-14.1-macos.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-darwin-wx32-arm64-x86_64-14.3.1-macos-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-darwin-wx32-arm64-x86_64-14.3.1-macos.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-debian-arm64-11-bullseye-arm64.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-arm64-11-bullseye-arm64.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-debian-arm64-11-bullseye-arm64.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-debian-arm64-11-bullseye-arm64.xml
index 35d5954141..162a4b94b6 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-debian-arm64-11-bullseye-arm64.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-arm64-11-bullseye-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>11</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-debian-arm64-11-bullseye-arm64-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-debian-arm64-11-bullseye-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-debian-arm64-11-bullseye-arm64-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-debian-arm64-11-bullseye-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-debian-arm64-12-bookworm-arm64.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-arm64-12-bookworm-arm64.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-debian-arm64-12-bookworm-arm64.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-debian-arm64-12-bookworm-arm64.xml
index 50bd812248..1eb0c8f39a 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-debian-arm64-12-bookworm-arm64.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-arm64-12-bookworm-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>12</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-debian-arm64-12-bookworm-arm64-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-debian-arm64-12-bookworm-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-debian-arm64-12-bookworm-arm64-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-debian-arm64-12-bookworm-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.3.5.0-debian-arm64-13-trixie-arm64.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-arm64-13-trixie-arm64.xml
new file mode 100644
index 0000000000..f3f115ddc9
--- /dev/null
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-arm64-13-trixie-arm64.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Raymarine autopilot </name>
+<version> 2.3.5.0 </version>
+<release> 0 </release>
+<summary> Control a Raymarine Autopilot </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Bernd Cirotzki </author>
+<source> https://github.com/rgleason/raymarine_autopilot_pi </source>
+
+<description>
+Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EVO
+</description>
+
+<target>debian-arm64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>arm64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-debian-arm64-13-trixie-arm64-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-debian-arm64-13-trixie-arm64.tar.gz
+</tarball-url>
+<info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
+</plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-debian-armhf-11-bullseye-armhf.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-armhf-11-bullseye-armhf.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-debian-armhf-11-bullseye-armhf.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-debian-armhf-11-bullseye-armhf.xml
index 588354c8e2..e9c088cb41 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-debian-armhf-11-bullseye-armhf.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-armhf-11-bullseye-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>11</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-debian-armhf-11-bullseye-armhf-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-debian-armhf-11-bullseye-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-debian-armhf-11-bullseye-armhf-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-debian-armhf-11-bullseye-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-debian-armhf-12-bookworm-armhf.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-armhf-12-bookworm-armhf.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-debian-armhf-12-bookworm-armhf.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-debian-armhf-12-bookworm-armhf.xml
index 59b5e78758..b1fb751c54 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-debian-armhf-12-bookworm-armhf.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-armhf-12-bookworm-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>12</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-debian-armhf-12-bookworm-armhf-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-debian-armhf-12-bookworm-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-debian-armhf-12-bookworm-armhf-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-debian-armhf-12-bookworm-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.3.5.0-debian-armhf-13-trixie-armhf.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-armhf-13-trixie-armhf.xml
new file mode 100644
index 0000000000..6e8a61defb
--- /dev/null
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-armhf-13-trixie-armhf.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Raymarine autopilot </name>
+<version> 2.3.5.0 </version>
+<release> 0 </release>
+<summary> Control a Raymarine Autopilot </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Bernd Cirotzki </author>
+<source> https://github.com/rgleason/raymarine_autopilot_pi </source>
+
+<description>
+Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EVO
+</description>
+
+<target>debian-armhf</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>armhf</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-debian-armhf-13-trixie-armhf-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-debian-armhf-13-trixie-armhf.tar.gz
+</tarball-url>
+<info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
+</plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-debian-x86_64-11-bullseye.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-11-bullseye.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-debian-x86_64-11-bullseye.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-11-bullseye.xml
index 3d9495f2f2..851b890faf 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-debian-x86_64-11-bullseye.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-11-bullseye.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>11</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-debian-x86_64-11-bullseye-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-debian-x86_64-11-bullseye.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-11-bullseye-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-11-bullseye.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-debian-x86_64-12-bookworm.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-12-bookworm.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-debian-x86_64-12-bookworm.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-12-bookworm.xml
index 8e82107f19..94236b2cec 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-debian-x86_64-12-bookworm.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-12-bookworm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>12</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-debian-x86_64-12-bookworm-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-debian-x86_64-12-bookworm.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-12-bookworm-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-12-bookworm.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-13-trixie.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-13-trixie.xml
new file mode 100644
index 0000000000..5930891b0e
--- /dev/null
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-13-trixie.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Raymarine autopilot </name>
+<version> 2.3.5.0 </version>
+<release> 0 </release>
+<summary> Control a Raymarine Autopilot </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Bernd Cirotzki </author>
+<source> https://github.com/rgleason/raymarine_autopilot_pi </source>
+
+<description>
+Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EVO
+</description>
+
+<target>debian-x86_64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>x86_64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-13-trixie-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-debian-x86_64-13-trixie.tar.gz
+</tarball-url>
+<info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
+</plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-flatpak-aarch64-22.08-flatpak.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-flatpak-aarch64-22.08-flatpak.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-flatpak-aarch64-22.08-flatpak.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-flatpak-aarch64-22.08-flatpak.xml
index 9c3d7b60f4..2de3dd347f 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-flatpak-aarch64-22.08-flatpak.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-flatpak-aarch64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>22.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-aarch64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-aarch64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-flatpak-aarch64-24.08-flatpak.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-flatpak-aarch64-24.08-flatpak.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-flatpak-aarch64-24.08-flatpak.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-flatpak-aarch64-24.08-flatpak.xml
index c6dd808394..1b5bff0823 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-flatpak-aarch64-24.08-flatpak.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-flatpak-aarch64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>24.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-aarch64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-aarch64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-flatpak-x86_64-22.08-flatpak.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-flatpak-x86_64-22.08-flatpak.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-flatpak-x86_64-22.08-flatpak.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-flatpak-x86_64-22.08-flatpak.xml
index 84df9cc0f1..1ea10e3f0a 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-flatpak-x86_64-22.08-flatpak.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-flatpak-x86_64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>22.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-x86_64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-x86_64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-flatpak-x86_64-24.08-flatpak.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-flatpak-x86_64-24.08-flatpak.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-flatpak-x86_64-24.08-flatpak.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-flatpak-x86_64-24.08-flatpak.xml
index b5d6e8d66f..ceda17f310 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-flatpak-x86_64-24.08-flatpak.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-flatpak-x86_64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>24.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-x86_64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-x86_64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-msvc-x86-10.0.20348-MSVC.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-msvc-x86-10.0.20348-MSVC.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-msvc-x86-10.0.20348-MSVC.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-msvc-x86-10.0.20348-MSVC.xml
index 9fdbf56b3a..4e657babee 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-msvc-x86-10.0.20348-MSVC.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-msvc-x86-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-msvc-x86-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-msvc-x86-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-msvc-x86-wx32-10.0.20348-MSVC.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-msvc-x86-wx32-10.0.20348-MSVC.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-msvc-x86-wx32-10.0.20348-MSVC.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-msvc-x86-wx32-10.0.20348-MSVC.xml
index 0a9aa906de..263a8e6e1a 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-msvc-x86-wx32-10.0.20348-MSVC.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-msvc-x86-wx32-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/raymarine_autopilot_pi-2.2.2.0-ubuntu-x86_64-22.04-jammy.xml b/metadata/raymarine_autopilot_pi-2.3.5.0-ubuntu-x86_64-22.04-jammy.xml
similarity index 84%
rename from metadata/raymarine_autopilot_pi-2.2.2.0-ubuntu-x86_64-22.04-jammy.xml
rename to metadata/raymarine_autopilot_pi-2.3.5.0-ubuntu-x86_64-22.04-jammy.xml
index f73b56577c..4c21b271f3 100644
--- a/metadata/raymarine_autopilot_pi-2.2.2.0-ubuntu-x86_64-22.04-jammy.xml
+++ b/metadata/raymarine_autopilot_pi-2.3.5.0-ubuntu-x86_64-22.04-jammy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Raymarine autopilot </name>
-<version> 2.2.2.0 </version>
+<version> 2.3.5.0 </version>
 <release> 0 </release>
 <summary> Control a Raymarine Autopilot </summary>
 
@@ -20,7 +20,7 @@ Control Raymarine Autopilot using a NMEA0183 to ST1 Converter or NMEA2000 for EV
 <target-version>22.04</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.2.2.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v2.2.2.0/raymarine_autopilot_pi-2.2.2.0-ubuntu-x86_64-22.04-jammy.tar.gz
+https://dl.cloudsmith.io/public/opencpn/raymarine-autopilot-prod/raw/names/raymarine_autopilot_pi-2.3.5.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v2.3.5.0/raymarine_autopilot_pi-2.3.5.0-ubuntu-x86_64-22.04-jammy.tar.gz
 </tarball-url>
 <info-url> https://opencpn-manuals.github.io/main/autopilot-rm/0.1/index.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-android-arm64-16-android-arm64.xml b/metadata/tactics_pi-1.0.91.0-android-arm64-16-android-arm64.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-android-arm64-16-android-arm64.xml
rename to metadata/tactics_pi-1.0.91.0-android-arm64-16-android-arm64.xml
index b6e66d16f2..8c3c989897 100644
--- a/metadata/tactics_pi-1.0.87.0-android-arm64-16-android-arm64.xml
+++ b/metadata/tactics_pi-1.0.91.0-android-arm64-16-android-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>16</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-android-arm64-16-android-arm64-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-android-arm64-16-android-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-android-arm64-16-android-arm64-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-android-arm64-16-android-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-android-armhf-16-android-armhf.xml b/metadata/tactics_pi-1.0.91.0-android-armhf-16-android-armhf.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-android-armhf-16-android-armhf.xml
rename to metadata/tactics_pi-1.0.91.0-android-armhf-16-android-armhf.xml
index 02e24b6bcb..f0c662abd3 100644
--- a/metadata/tactics_pi-1.0.87.0-android-armhf-16-android-armhf.xml
+++ b/metadata/tactics_pi-1.0.91.0-android-armhf-16-android-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>16</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-android-armhf-16-android-armhf-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-android-armhf-16-android-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-android-armhf-16-android-armhf-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-android-armhf-16-android-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-darwin-wx32-arm64-x86_64-14.1-macos.xml b/metadata/tactics_pi-1.0.91.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
similarity index 77%
rename from metadata/tactics_pi-1.0.87.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
rename to metadata/tactics_pi-1.0.91.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
index 632c2947fb..69e2134b59 100644
--- a/metadata/tactics_pi-1.0.87.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
+++ b/metadata/tactics_pi-1.0.91.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -17,10 +17,10 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target>darwin-wx32</target>
 <build-target>darwin</build-target>
 <build-gtk></build-gtk>
-<target-version>14.1</target-version>
+<target-version>14.3.1</target-version>
 <target-arch>arm64;x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-darwin-wx32-arm64-x86_64-14.1-macos-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-darwin-wx32-arm64-x86_64-14.1-macos.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-darwin-wx32-arm64-x86_64-14.3.1-macos-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-darwin-wx32-arm64-x86_64-14.3.1-macos.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-debian-arm64-11-bullseye-arm64.xml b/metadata/tactics_pi-1.0.91.0-debian-arm64-11-bullseye-arm64.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-debian-arm64-11-bullseye-arm64.xml
rename to metadata/tactics_pi-1.0.91.0-debian-arm64-11-bullseye-arm64.xml
index 9424bf68f4..6837690ad5 100644
--- a/metadata/tactics_pi-1.0.87.0-debian-arm64-11-bullseye-arm64.xml
+++ b/metadata/tactics_pi-1.0.91.0-debian-arm64-11-bullseye-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>11</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-debian-arm64-11-bullseye-arm64-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-debian-arm64-11-bullseye-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-debian-arm64-11-bullseye-arm64-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-debian-arm64-11-bullseye-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-debian-arm64-12-bookworm-arm64.xml b/metadata/tactics_pi-1.0.91.0-debian-arm64-12-bookworm-arm64.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-debian-arm64-12-bookworm-arm64.xml
rename to metadata/tactics_pi-1.0.91.0-debian-arm64-12-bookworm-arm64.xml
index e0194a459d..de1db53139 100644
--- a/metadata/tactics_pi-1.0.87.0-debian-arm64-12-bookworm-arm64.xml
+++ b/metadata/tactics_pi-1.0.91.0-debian-arm64-12-bookworm-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>12</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-debian-arm64-12-bookworm-arm64-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-debian-arm64-12-bookworm-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-debian-arm64-12-bookworm-arm64-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-debian-arm64-12-bookworm-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.91.0-debian-arm64-13-trixie-arm64.xml b/metadata/tactics_pi-1.0.91.0-debian-arm64-13-trixie-arm64.xml
new file mode 100644
index 0000000000..eef987d712
--- /dev/null
+++ b/metadata/tactics_pi-1.0.91.0-debian-arm64-13-trixie-arm64.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Tactics </name>
+<version> 1.0.91.0 </version>
+<release> 0 </release>
+<summary> Tactics PlugIn for OpenCPN </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Tom R </author>
+<source> https://github.com/rgleason/tactics_pi </source>
+
+<description>
+Tactics PlugIn for OpenCPN Provides performance data and instrument display from NMEA source and polar file.
+</description>
+
+<target>debian-arm64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>arm64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-debian-arm64-13-trixie-arm64-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-debian-arm64-13-trixie-arm64.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
+</plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-debian-armhf-11-bullseye-armhf.xml b/metadata/tactics_pi-1.0.91.0-debian-armhf-11-bullseye-armhf.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-debian-armhf-11-bullseye-armhf.xml
rename to metadata/tactics_pi-1.0.91.0-debian-armhf-11-bullseye-armhf.xml
index a5c96711d7..25b7e61f0b 100644
--- a/metadata/tactics_pi-1.0.87.0-debian-armhf-11-bullseye-armhf.xml
+++ b/metadata/tactics_pi-1.0.91.0-debian-armhf-11-bullseye-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>11</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-debian-armhf-11-bullseye-armhf-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-debian-armhf-11-bullseye-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-debian-armhf-11-bullseye-armhf-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-debian-armhf-11-bullseye-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-debian-armhf-12-bookworm-armhf.xml b/metadata/tactics_pi-1.0.91.0-debian-armhf-12-bookworm-armhf.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-debian-armhf-12-bookworm-armhf.xml
rename to metadata/tactics_pi-1.0.91.0-debian-armhf-12-bookworm-armhf.xml
index daf5d22f3b..a7de6d8eb2 100644
--- a/metadata/tactics_pi-1.0.87.0-debian-armhf-12-bookworm-armhf.xml
+++ b/metadata/tactics_pi-1.0.91.0-debian-armhf-12-bookworm-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>12</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-debian-armhf-12-bookworm-armhf-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-debian-armhf-12-bookworm-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-debian-armhf-12-bookworm-armhf-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-debian-armhf-12-bookworm-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.91.0-debian-armhf-13-trixie-armhf.xml b/metadata/tactics_pi-1.0.91.0-debian-armhf-13-trixie-armhf.xml
new file mode 100644
index 0000000000..744a9d4d84
--- /dev/null
+++ b/metadata/tactics_pi-1.0.91.0-debian-armhf-13-trixie-armhf.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Tactics </name>
+<version> 1.0.91.0 </version>
+<release> 0 </release>
+<summary> Tactics PlugIn for OpenCPN </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Tom R </author>
+<source> https://github.com/rgleason/tactics_pi </source>
+
+<description>
+Tactics PlugIn for OpenCPN Provides performance data and instrument display from NMEA source and polar file.
+</description>
+
+<target>debian-armhf</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>armhf</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-debian-armhf-13-trixie-armhf-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-debian-armhf-13-trixie-armhf.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
+</plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-debian-x86_64-11-bullseye.xml b/metadata/tactics_pi-1.0.91.0-debian-x86_64-11-bullseye.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-debian-x86_64-11-bullseye.xml
rename to metadata/tactics_pi-1.0.91.0-debian-x86_64-11-bullseye.xml
index 4c37b7bea8..6647df4193 100644
--- a/metadata/tactics_pi-1.0.87.0-debian-x86_64-11-bullseye.xml
+++ b/metadata/tactics_pi-1.0.91.0-debian-x86_64-11-bullseye.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>11</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-debian-x86_64-11-bullseye-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-debian-x86_64-11-bullseye.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-debian-x86_64-11-bullseye-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-debian-x86_64-11-bullseye.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-debian-x86_64-12-bookworm.xml b/metadata/tactics_pi-1.0.91.0-debian-x86_64-12-bookworm.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-debian-x86_64-12-bookworm.xml
rename to metadata/tactics_pi-1.0.91.0-debian-x86_64-12-bookworm.xml
index bc61d6dcc1..6afdfabd05 100644
--- a/metadata/tactics_pi-1.0.87.0-debian-x86_64-12-bookworm.xml
+++ b/metadata/tactics_pi-1.0.91.0-debian-x86_64-12-bookworm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>12</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-debian-x86_64-12-bookworm-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-debian-x86_64-12-bookworm.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-debian-x86_64-12-bookworm-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-debian-x86_64-12-bookworm.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.91.0-debian-x86_64-13-trixie.xml b/metadata/tactics_pi-1.0.91.0-debian-x86_64-13-trixie.xml
new file mode 100644
index 0000000000..3b584d5804
--- /dev/null
+++ b/metadata/tactics_pi-1.0.91.0-debian-x86_64-13-trixie.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Tactics </name>
+<version> 1.0.91.0 </version>
+<release> 0 </release>
+<summary> Tactics PlugIn for OpenCPN </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Tom R </author>
+<source> https://github.com/rgleason/tactics_pi </source>
+
+<description>
+Tactics PlugIn for OpenCPN Provides performance data and instrument display from NMEA source and polar file.
+</description>
+
+<target>debian-x86_64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>x86_64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-debian-x86_64-13-trixie-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-debian-x86_64-13-trixie.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
+</plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-flatpak-aarch64-22.08-flatpak.xml b/metadata/tactics_pi-1.0.91.0-flatpak-aarch64-22.08-flatpak.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-flatpak-aarch64-22.08-flatpak.xml
rename to metadata/tactics_pi-1.0.91.0-flatpak-aarch64-22.08-flatpak.xml
index 954c7fe520..970615efc4 100644
--- a/metadata/tactics_pi-1.0.87.0-flatpak-aarch64-22.08-flatpak.xml
+++ b/metadata/tactics_pi-1.0.91.0-flatpak-aarch64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>22.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-aarch64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-aarch64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-flatpak-aarch64-24.08-flatpak.xml b/metadata/tactics_pi-1.0.91.0-flatpak-aarch64-24.08-flatpak.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-flatpak-aarch64-24.08-flatpak.xml
rename to metadata/tactics_pi-1.0.91.0-flatpak-aarch64-24.08-flatpak.xml
index c8d829fa2d..268b8837c6 100644
--- a/metadata/tactics_pi-1.0.87.0-flatpak-aarch64-24.08-flatpak.xml
+++ b/metadata/tactics_pi-1.0.91.0-flatpak-aarch64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>24.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-aarch64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-aarch64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-flatpak-x86_64-22.08-flatpak.xml b/metadata/tactics_pi-1.0.91.0-flatpak-x86_64-22.08-flatpak.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-flatpak-x86_64-22.08-flatpak.xml
rename to metadata/tactics_pi-1.0.91.0-flatpak-x86_64-22.08-flatpak.xml
index 9cde2fabe8..94b5553cee 100644
--- a/metadata/tactics_pi-1.0.87.0-flatpak-x86_64-22.08-flatpak.xml
+++ b/metadata/tactics_pi-1.0.91.0-flatpak-x86_64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>22.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-x86_64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-x86_64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-flatpak-x86_64-24.08-flatpak.xml b/metadata/tactics_pi-1.0.91.0-flatpak-x86_64-24.08-flatpak.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-flatpak-x86_64-24.08-flatpak.xml
rename to metadata/tactics_pi-1.0.91.0-flatpak-x86_64-24.08-flatpak.xml
index f13be52ab2..260a643518 100644
--- a/metadata/tactics_pi-1.0.87.0-flatpak-x86_64-24.08-flatpak.xml
+++ b/metadata/tactics_pi-1.0.91.0-flatpak-x86_64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>24.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-x86_64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-x86_64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-msvc-x86-10.0.20348-MSVC.xml b/metadata/tactics_pi-1.0.91.0-msvc-x86-10.0.20348-MSVC.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-msvc-x86-10.0.20348-MSVC.xml
rename to metadata/tactics_pi-1.0.91.0-msvc-x86-10.0.20348-MSVC.xml
index 139d358614..dee30d5f18 100644
--- a/metadata/tactics_pi-1.0.87.0-msvc-x86-10.0.20348-MSVC.xml
+++ b/metadata/tactics_pi-1.0.91.0-msvc-x86-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-msvc-x86-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-msvc-x86-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-msvc-x86-wx32-10.0.20348-MSVC.xml b/metadata/tactics_pi-1.0.91.0-msvc-x86-wx32-10.0.20348-MSVC.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-msvc-x86-wx32-10.0.20348-MSVC.xml
rename to metadata/tactics_pi-1.0.91.0-msvc-x86-wx32-10.0.20348-MSVC.xml
index c732ab46e9..30611e5404 100644
--- a/metadata/tactics_pi-1.0.87.0-msvc-x86-wx32-10.0.20348-MSVC.xml
+++ b/metadata/tactics_pi-1.0.91.0-msvc-x86-wx32-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/tactics_pi-1.0.87.0-ubuntu-x86_64-22.04-jammy.xml b/metadata/tactics_pi-1.0.91.0-ubuntu-x86_64-22.04-jammy.xml
similarity index 83%
rename from metadata/tactics_pi-1.0.87.0-ubuntu-x86_64-22.04-jammy.xml
rename to metadata/tactics_pi-1.0.91.0-ubuntu-x86_64-22.04-jammy.xml
index 3cd4c9cc08..e8af1d7074 100644
--- a/metadata/tactics_pi-1.0.87.0-ubuntu-x86_64-22.04-jammy.xml
+++ b/metadata/tactics_pi-1.0.91.0-ubuntu-x86_64-22.04-jammy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Tactics </name>
-<version> 1.0.87.0 </version>
+<version> 1.0.91.0 </version>
 <release> 0 </release>
 <summary> Tactics PlugIn for OpenCPN </summary>
 
@@ -20,7 +20,7 @@ Tactics PlugIn for OpenCPN Provides performance data and instrument display from
 <target-version>22.04</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.87.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v1.0.87.0/tactics_pi-1.0.87.0-ubuntu-x86_64-22.04-jammy.tar.gz
+https://dl.cloudsmith.io/public/opencpn/tactics-prod/raw/names/tactics_pi-1.0.91.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v1.0.91.0/tactics_pi-1.0.91.0-ubuntu-x86_64-22.04-jammy.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/tactics.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-android-arm64-16-android-arm64.xml b/metadata/watchdog_pi-2.5.4.0-android-arm64-16-android-arm64.xml
similarity index 83%
rename from metadata/watchdog_pi-2.5.2.0-android-arm64-16-android-arm64.xml
rename to metadata/watchdog_pi-2.5.4.0-android-arm64-16-android-arm64.xml
index 5adbdbf156..4d0bf85a1f 100644
--- a/metadata/watchdog_pi-2.5.2.0-android-arm64-16-android-arm64.xml
+++ b/metadata/watchdog_pi-2.5.4.0-android-arm64-16-android-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>16</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-android-arm64-16-android-arm64-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-android-arm64-16-android-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-android-arm64-16-android-arm64-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-android-arm64-16-android-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-android-armhf-16-android-armhf.xml b/metadata/watchdog_pi-2.5.4.0-android-armhf-16-android-armhf.xml
similarity index 83%
rename from metadata/watchdog_pi-2.5.2.0-android-armhf-16-android-armhf.xml
rename to metadata/watchdog_pi-2.5.4.0-android-armhf-16-android-armhf.xml
index 153ea7d014..e1e7ac3ed6 100644
--- a/metadata/watchdog_pi-2.5.2.0-android-armhf-16-android-armhf.xml
+++ b/metadata/watchdog_pi-2.5.4.0-android-armhf-16-android-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>16</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-android-armhf-16-android-armhf-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-android-armhf-16-android-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-android-armhf-16-android-armhf-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-android-armhf-16-android-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-darwin-wx32-arm64-x86_64-14.1-macos.xml b/metadata/watchdog_pi-2.5.4.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
similarity index 78%
rename from metadata/watchdog_pi-2.5.2.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
rename to metadata/watchdog_pi-2.5.4.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
index 47c718c4c2..b7a734a22e 100644
--- a/metadata/watchdog_pi-2.5.2.0-darwin-wx32-arm64-x86_64-14.1-macos.xml
+++ b/metadata/watchdog_pi-2.5.4.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -17,10 +17,10 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target>darwin-wx32</target>
 <build-target>darwin</build-target>
 <build-gtk></build-gtk>
-<target-version>14.1</target-version>
+<target-version>14.3.1</target-version>
 <target-arch>arm64;x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-darwin-wx32-arm64-x86_64-14.1-macos-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-darwin-wx32-arm64-x86_64-14.1-macos.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-darwin-wx32-arm64-x86_64-14.3.1-macos-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-darwin-wx32-arm64-x86_64-14.3.1-macos.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-debian-arm64-11-bullseye-arm64.xml b/metadata/watchdog_pi-2.5.4.0-debian-arm64-11-bullseye-arm64.xml
similarity index 83%
rename from metadata/watchdog_pi-2.5.2.0-debian-arm64-11-bullseye-arm64.xml
rename to metadata/watchdog_pi-2.5.4.0-debian-arm64-11-bullseye-arm64.xml
index 932a91fcda..17fad2979e 100644
--- a/metadata/watchdog_pi-2.5.2.0-debian-arm64-11-bullseye-arm64.xml
+++ b/metadata/watchdog_pi-2.5.4.0-debian-arm64-11-bullseye-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>11</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-debian-arm64-11-bullseye-arm64-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-debian-arm64-11-bullseye-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-debian-arm64-11-bullseye-arm64-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-debian-arm64-11-bullseye-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-debian-arm64-12-bookworm-arm64.xml b/metadata/watchdog_pi-2.5.4.0-debian-arm64-12-bookworm-arm64.xml
similarity index 83%
rename from metadata/watchdog_pi-2.5.2.0-debian-arm64-12-bookworm-arm64.xml
rename to metadata/watchdog_pi-2.5.4.0-debian-arm64-12-bookworm-arm64.xml
index 2acb239122..6f6da7dd44 100644
--- a/metadata/watchdog_pi-2.5.2.0-debian-arm64-12-bookworm-arm64.xml
+++ b/metadata/watchdog_pi-2.5.4.0-debian-arm64-12-bookworm-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>12</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-debian-arm64-12-bookworm-arm64-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-debian-arm64-12-bookworm-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-debian-arm64-12-bookworm-arm64-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-debian-arm64-12-bookworm-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.4.0-debian-arm64-13-trixie-arm64.xml b/metadata/watchdog_pi-2.5.4.0-debian-arm64-13-trixie-arm64.xml
new file mode 100644
index 0000000000..4cf8529189
--- /dev/null
+++ b/metadata/watchdog_pi-2.5.4.0-debian-arm64-13-trixie-arm64.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Watchdog </name>
+<version> 2.5.4.0 </version>
+<release> 0 </release>
+<summary> Implement watchdog ability for opencpn </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Sean d'Epagnier </author>
+<source> https://github.com/rgleason/watchdog_pi </source>
+
+<description>
+Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea, weather, pypilot, wind, deadman...
+</description>
+
+<target>debian-arm64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>arm64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-debian-arm64-13-trixie-arm64-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-debian-arm64-13-trixie-arm64.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
+</plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-debian-armhf-11-bullseye-armhf.xml b/metadata/watchdog_pi-2.5.4.0-debian-armhf-11-bullseye-armhf.xml
similarity index 83%
rename from metadata/watchdog_pi-2.5.2.0-debian-armhf-11-bullseye-armhf.xml
rename to metadata/watchdog_pi-2.5.4.0-debian-armhf-11-bullseye-armhf.xml
index a954e5c40e..a909183647 100644
--- a/metadata/watchdog_pi-2.5.2.0-debian-armhf-11-bullseye-armhf.xml
+++ b/metadata/watchdog_pi-2.5.4.0-debian-armhf-11-bullseye-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>11</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-debian-armhf-11-bullseye-armhf-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-debian-armhf-11-bullseye-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-debian-armhf-11-bullseye-armhf-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-debian-armhf-11-bullseye-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-debian-armhf-12-bookworm-armhf.xml b/metadata/watchdog_pi-2.5.4.0-debian-armhf-12-bookworm-armhf.xml
similarity index 83%
rename from metadata/watchdog_pi-2.5.2.0-debian-armhf-12-bookworm-armhf.xml
rename to metadata/watchdog_pi-2.5.4.0-debian-armhf-12-bookworm-armhf.xml
index 454a0217df..7cf495563a 100644
--- a/metadata/watchdog_pi-2.5.2.0-debian-armhf-12-bookworm-armhf.xml
+++ b/metadata/watchdog_pi-2.5.4.0-debian-armhf-12-bookworm-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>12</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-debian-armhf-12-bookworm-armhf-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-debian-armhf-12-bookworm-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-debian-armhf-12-bookworm-armhf-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-debian-armhf-12-bookworm-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.4.0-debian-armhf-13-trixie-armhf.xml b/metadata/watchdog_pi-2.5.4.0-debian-armhf-13-trixie-armhf.xml
new file mode 100644
index 0000000000..c8c55207d1
--- /dev/null
+++ b/metadata/watchdog_pi-2.5.4.0-debian-armhf-13-trixie-armhf.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Watchdog </name>
+<version> 2.5.4.0 </version>
+<release> 0 </release>
+<summary> Implement watchdog ability for opencpn </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Sean d'Epagnier </author>
+<source> https://github.com/rgleason/watchdog_pi </source>
+
+<description>
+Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea, weather, pypilot, wind, deadman...
+</description>
+
+<target>debian-armhf</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>armhf</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-debian-armhf-13-trixie-armhf-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-debian-armhf-13-trixie-armhf.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
+</plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-debian-x86_64-11-bullseye.xml b/metadata/watchdog_pi-2.5.4.0-debian-x86_64-11-bullseye.xml
similarity index 84%
rename from metadata/watchdog_pi-2.5.2.0-debian-x86_64-11-bullseye.xml
rename to metadata/watchdog_pi-2.5.4.0-debian-x86_64-11-bullseye.xml
index e7cd502e21..539951621d 100644
--- a/metadata/watchdog_pi-2.5.2.0-debian-x86_64-11-bullseye.xml
+++ b/metadata/watchdog_pi-2.5.4.0-debian-x86_64-11-bullseye.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>11</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-debian-x86_64-11-bullseye-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-debian-x86_64-11-bullseye.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-debian-x86_64-11-bullseye-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-debian-x86_64-11-bullseye.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-debian-x86_64-12-bookworm.xml b/metadata/watchdog_pi-2.5.4.0-debian-x86_64-12-bookworm.xml
similarity index 84%
rename from metadata/watchdog_pi-2.5.2.0-debian-x86_64-12-bookworm.xml
rename to metadata/watchdog_pi-2.5.4.0-debian-x86_64-12-bookworm.xml
index c6dd60dad8..18eb78e813 100644
--- a/metadata/watchdog_pi-2.5.2.0-debian-x86_64-12-bookworm.xml
+++ b/metadata/watchdog_pi-2.5.4.0-debian-x86_64-12-bookworm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>12</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-debian-x86_64-12-bookworm-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-debian-x86_64-12-bookworm.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-debian-x86_64-12-bookworm-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-debian-x86_64-12-bookworm.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.4.0-debian-x86_64-13-trixie.xml b/metadata/watchdog_pi-2.5.4.0-debian-x86_64-13-trixie.xml
new file mode 100644
index 0000000000..6ace517b25
--- /dev/null
+++ b/metadata/watchdog_pi-2.5.4.0-debian-x86_64-13-trixie.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> Watchdog </name>
+<version> 2.5.4.0 </version>
+<release> 0 </release>
+<summary> Implement watchdog ability for opencpn </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Sean d'Epagnier </author>
+<source> https://github.com/rgleason/watchdog_pi </source>
+
+<description>
+Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea, weather, pypilot, wind, deadman...
+</description>
+
+<target>debian-x86_64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>x86_64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-debian-x86_64-13-trixie-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-debian-x86_64-13-trixie.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
+</plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-flatpak-aarch64-22.08-flatpak.xml b/metadata/watchdog_pi-2.5.4.0-flatpak-aarch64-22.08-flatpak.xml
similarity index 84%
rename from metadata/watchdog_pi-2.5.2.0-flatpak-aarch64-22.08-flatpak.xml
rename to metadata/watchdog_pi-2.5.4.0-flatpak-aarch64-22.08-flatpak.xml
index 40853a26c2..58f97fd7f9 100644
--- a/metadata/watchdog_pi-2.5.2.0-flatpak-aarch64-22.08-flatpak.xml
+++ b/metadata/watchdog_pi-2.5.4.0-flatpak-aarch64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>22.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-aarch64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-aarch64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-flatpak-aarch64-24.08-flatpak.xml b/metadata/watchdog_pi-2.5.4.0-flatpak-aarch64-24.08-flatpak.xml
similarity index 84%
rename from metadata/watchdog_pi-2.5.2.0-flatpak-aarch64-24.08-flatpak.xml
rename to metadata/watchdog_pi-2.5.4.0-flatpak-aarch64-24.08-flatpak.xml
index 7ac1f62dcb..ec2f7096bc 100644
--- a/metadata/watchdog_pi-2.5.2.0-flatpak-aarch64-24.08-flatpak.xml
+++ b/metadata/watchdog_pi-2.5.4.0-flatpak-aarch64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>24.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-aarch64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-aarch64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-flatpak-x86_64-22.08-flatpak.xml b/metadata/watchdog_pi-2.5.4.0-flatpak-x86_64-22.08-flatpak.xml
similarity index 84%
rename from metadata/watchdog_pi-2.5.2.0-flatpak-x86_64-22.08-flatpak.xml
rename to metadata/watchdog_pi-2.5.4.0-flatpak-x86_64-22.08-flatpak.xml
index b6fe77fd60..1d666f0253 100644
--- a/metadata/watchdog_pi-2.5.2.0-flatpak-x86_64-22.08-flatpak.xml
+++ b/metadata/watchdog_pi-2.5.4.0-flatpak-x86_64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>22.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-x86_64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-x86_64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-flatpak-x86_64-24.08-flatpak.xml b/metadata/watchdog_pi-2.5.4.0-flatpak-x86_64-24.08-flatpak.xml
similarity index 84%
rename from metadata/watchdog_pi-2.5.2.0-flatpak-x86_64-24.08-flatpak.xml
rename to metadata/watchdog_pi-2.5.4.0-flatpak-x86_64-24.08-flatpak.xml
index 96295ee855..a503b7e82e 100644
--- a/metadata/watchdog_pi-2.5.2.0-flatpak-x86_64-24.08-flatpak.xml
+++ b/metadata/watchdog_pi-2.5.4.0-flatpak-x86_64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>24.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-x86_64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-x86_64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-msvc-x86-10.0.20348-MSVC.xml b/metadata/watchdog_pi-2.5.4.0-msvc-x86-10.0.20348-MSVC.xml
similarity index 84%
rename from metadata/watchdog_pi-2.5.2.0-msvc-x86-10.0.20348-MSVC.xml
rename to metadata/watchdog_pi-2.5.4.0-msvc-x86-10.0.20348-MSVC.xml
index df1b8d7352..7b2cbca492 100644
--- a/metadata/watchdog_pi-2.5.2.0-msvc-x86-10.0.20348-MSVC.xml
+++ b/metadata/watchdog_pi-2.5.4.0-msvc-x86-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-msvc-x86-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-msvc-x86-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-msvc-x86-wx32-10.0.20348-MSVC.xml b/metadata/watchdog_pi-2.5.4.0-msvc-x86-wx32-10.0.20348-MSVC.xml
similarity index 83%
rename from metadata/watchdog_pi-2.5.2.0-msvc-x86-wx32-10.0.20348-MSVC.xml
rename to metadata/watchdog_pi-2.5.4.0-msvc-x86-wx32-10.0.20348-MSVC.xml
index ca7147e142..1aff93116f 100644
--- a/metadata/watchdog_pi-2.5.2.0-msvc-x86-wx32-10.0.20348-MSVC.xml
+++ b/metadata/watchdog_pi-2.5.4.0-msvc-x86-wx32-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/watchdog_pi-2.5.2.0-ubuntu-x86_64-22.04-jammy.xml b/metadata/watchdog_pi-2.5.4.0-ubuntu-x86_64-22.04-jammy.xml
similarity index 84%
rename from metadata/watchdog_pi-2.5.2.0-ubuntu-x86_64-22.04-jammy.xml
rename to metadata/watchdog_pi-2.5.4.0-ubuntu-x86_64-22.04-jammy.xml
index bacafd1be3..5755ada450 100644
--- a/metadata/watchdog_pi-2.5.2.0-ubuntu-x86_64-22.04-jammy.xml
+++ b/metadata/watchdog_pi-2.5.4.0-ubuntu-x86_64-22.04-jammy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> Watchdog </name>
-<version> 2.5.2.0 </version>
+<version> 2.5.4.0 </version>
 <release> 0 </release>
 <summary> Implement watchdog ability for opencpn </summary>
 
@@ -20,7 +20,7 @@ Set alarms for changing conditions, boundaries, cog, landfall, ais, wind, nmea,
 <target-version>22.04</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.2.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v2.5.2.0/watchdog_pi-2.5.2.0-ubuntu-x86_64-22.04-jammy.tar.gz
+https://dl.cloudsmith.io/public/opencpn/watchdog-prod/raw/names/watchdog_pi-2.5.4.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v2.5.4.0/watchdog_pi-2.5.4.0-ubuntu-x86_64-22.04-jammy.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/watchdog.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-darwin-wx315-x86_64-12.6.3-macos.xml b/metadata/weatherfax_pi-1.10.17.0-darwin-wx315-x86_64-12.6.3-macos.xml
deleted file mode 100644
index 9b346ed906..0000000000
--- a/metadata/weatherfax_pi-1.10.17.0-darwin-wx315-x86_64-12.6.3-macos.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin version="1">
-<name> WeatherFax </name>
-<version> 1.10.17.0 </version>
-<release> 0 </release>
-<summary> Open fax image, decode audio fax, chart overlay </summary>
-
-<api-version> 1.18 </api-version>
-<open-source> yes </open-source>
-<author> Sean d'Epagnier </author>
-<source> https://github.com/rgleason/weatherfax_pi </source>
-
-<description>
-Open image files, decode audio fax to an image, calibrate chart overlay image. Convert images in mercator, polar, conic and uniform coordinates. Convert any image into a raster chart. Built in HF Radio Fax database for SSB and Internet retrieval from meterological sites.
-</description>
-
-<target>darwin-wx315</target>
-<build-target>darwin</build-target>
-<build-gtk></build-gtk>
-<target-version>12.6.3</target-version>
-<target-arch>x86_64</target-arch>
-<tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-darwin-wx315-x86_64-12.6.3-macos-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-darwin-wx315-x86_64-12.6.3-macos.tar.gz
-</tarball-url>
-<info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
-</plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-android-arm64-16-android-arm64.xml b/metadata/weatherfax_pi-1.10.18.0-android-arm64-16-android-arm64.xml
similarity index 86%
rename from metadata/weatherfax_pi-1.10.17.0-android-arm64-16-android-arm64.xml
rename to metadata/weatherfax_pi-1.10.18.0-android-arm64-16-android-arm64.xml
index 09d8e37213..961d1f9057 100644
--- a/metadata/weatherfax_pi-1.10.17.0-android-arm64-16-android-arm64.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-android-arm64-16-android-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -20,7 +20,7 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target-version>16</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-android-arm64-16-android-arm64-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-android-arm64-16-android-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-android-arm64-16-android-arm64-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-android-arm64-16-android-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-android-armhf-16-android-armhf.xml b/metadata/weatherfax_pi-1.10.18.0-android-armhf-16-android-armhf.xml
similarity index 86%
rename from metadata/weatherfax_pi-1.10.17.0-android-armhf-16-android-armhf.xml
rename to metadata/weatherfax_pi-1.10.18.0-android-armhf-16-android-armhf.xml
index 69f14fcc30..25c0fa927e 100644
--- a/metadata/weatherfax_pi-1.10.17.0-android-armhf-16-android-armhf.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-android-armhf-16-android-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -20,7 +20,7 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target-version>16</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-android-armhf-16-android-armhf-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-android-armhf-16-android-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-android-armhf-16-android-armhf-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-android-armhf-16-android-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-darwin-wx32-arm64-x86_64-12.6.3-macos.xml b/metadata/weatherfax_pi-1.10.18.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
similarity index 80%
rename from metadata/weatherfax_pi-1.10.17.0-darwin-wx32-arm64-x86_64-12.6.3-macos.xml
rename to metadata/weatherfax_pi-1.10.18.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
index baba5c06fa..bc595995cf 100644
--- a/metadata/weatherfax_pi-1.10.17.0-darwin-wx32-arm64-x86_64-12.6.3-macos.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-darwin-wx32-arm64-x86_64-14.3.1-macos.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -17,10 +17,10 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target>darwin-wx32</target>
 <build-target>darwin</build-target>
 <build-gtk></build-gtk>
-<target-version>12.6.3</target-version>
+<target-version>14.3.1</target-version>
 <target-arch>arm64;x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-darwin-wx32-arm64-x86_64-12.6.3-macos-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-darwin-wx32-arm64-x86_64-12.6.3-macos.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-darwin-wx32-arm64-x86_64-14.3.1-macos-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-darwin-wx32-arm64-x86_64-14.3.1-macos.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-debian-arm64-11-bullseye-arm64.xml b/metadata/weatherfax_pi-1.10.18.0-debian-arm64-11-bullseye-arm64.xml
similarity index 86%
rename from metadata/weatherfax_pi-1.10.17.0-debian-arm64-11-bullseye-arm64.xml
rename to metadata/weatherfax_pi-1.10.18.0-debian-arm64-11-bullseye-arm64.xml
index 93b7ecb8c0..770c91b2b9 100644
--- a/metadata/weatherfax_pi-1.10.17.0-debian-arm64-11-bullseye-arm64.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-debian-arm64-11-bullseye-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -20,7 +20,7 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target-version>11</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-debian-arm64-11-bullseye-arm64-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-debian-arm64-11-bullseye-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-debian-arm64-11-bullseye-arm64-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-debian-arm64-11-bullseye-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-debian-arm64-12-bookworm-arm64.xml b/metadata/weatherfax_pi-1.10.18.0-debian-arm64-12-bookworm-arm64.xml
similarity index 86%
rename from metadata/weatherfax_pi-1.10.17.0-debian-arm64-12-bookworm-arm64.xml
rename to metadata/weatherfax_pi-1.10.18.0-debian-arm64-12-bookworm-arm64.xml
index 3e9e238ab2..73c249dc14 100644
--- a/metadata/weatherfax_pi-1.10.17.0-debian-arm64-12-bookworm-arm64.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-debian-arm64-12-bookworm-arm64.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -20,7 +20,7 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target-version>12</target-version>
 <target-arch>arm64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-debian-arm64-12-bookworm-arm64-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-debian-arm64-12-bookworm-arm64.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-debian-arm64-12-bookworm-arm64-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-debian-arm64-12-bookworm-arm64.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.18.0-debian-arm64-13-trixie-arm64.xml b/metadata/weatherfax_pi-1.10.18.0-debian-arm64-13-trixie-arm64.xml
new file mode 100644
index 0000000000..929eb270ea
--- /dev/null
+++ b/metadata/weatherfax_pi-1.10.18.0-debian-arm64-13-trixie-arm64.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> WeatherFax </name>
+<version> 1.10.18.0 </version>
+<release> 0 </release>
+<summary> Open fax image, decode audio fax, chart overlay </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Sean d'Epagnier </author>
+<source> https://github.com/rgleason/weatherfax_pi </source>
+
+<description>
+Open image files, decode audio fax to an image, calibrate chart overlay image. Convert images in mercator, polar, conic and uniform coordinates. Convert any image into a raster chart. Built in HF Radio Fax database for SSB and Internet retrieval from meterological sites.
+</description>
+
+<target>debian-arm64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>arm64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-debian-arm64-13-trixie-arm64-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-debian-arm64-13-trixie-arm64.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
+</plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-debian-armhf-11-bullseye-armhf.xml b/metadata/weatherfax_pi-1.10.18.0-debian-armhf-11-bullseye-armhf.xml
similarity index 86%
rename from metadata/weatherfax_pi-1.10.17.0-debian-armhf-11-bullseye-armhf.xml
rename to metadata/weatherfax_pi-1.10.18.0-debian-armhf-11-bullseye-armhf.xml
index d725482e8c..3e01cf83e0 100644
--- a/metadata/weatherfax_pi-1.10.17.0-debian-armhf-11-bullseye-armhf.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-debian-armhf-11-bullseye-armhf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -20,7 +20,7 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target-version>11</target-version>
 <target-arch>armhf</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-debian-armhf-11-bullseye-armhf-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-debian-armhf-11-bullseye-armhf.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-debian-armhf-11-bullseye-armhf-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-debian-armhf-11-bullseye-armhf.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.18.0-debian-armhf-12-bookworm-armhf.xml b/metadata/weatherfax_pi-1.10.18.0-debian-armhf-12-bookworm-armhf.xml
new file mode 100644
index 0000000000..bab5654352
--- /dev/null
+++ b/metadata/weatherfax_pi-1.10.18.0-debian-armhf-12-bookworm-armhf.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> WeatherFax </name>
+<version> 1.10.18.0 </version>
+<release> 0 </release>
+<summary> Open fax image, decode audio fax, chart overlay </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Sean d'Epagnier </author>
+<source> https://github.com/rgleason/weatherfax_pi </source>
+
+<description>
+Open image files, decode audio fax to an image, calibrate chart overlay image. Convert images in mercator, polar, conic and uniform coordinates. Convert any image into a raster chart. Built in HF Radio Fax database for SSB and Internet retrieval from meterological sites.
+</description>
+
+<target>debian-armhf</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>12</target-version>
+<target-arch>armhf</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-debian-armhf-12-bookworm-armhf-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-debian-armhf-12-bookworm-armhf.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
+</plugin>
diff --git a/metadata/weatherfax_pi-1.10.18.0-debian-armhf-13-trixie-armhf.xml b/metadata/weatherfax_pi-1.10.18.0-debian-armhf-13-trixie-armhf.xml
new file mode 100644
index 0000000000..de4ca42a77
--- /dev/null
+++ b/metadata/weatherfax_pi-1.10.18.0-debian-armhf-13-trixie-armhf.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> WeatherFax </name>
+<version> 1.10.18.0 </version>
+<release> 0 </release>
+<summary> Open fax image, decode audio fax, chart overlay </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Sean d'Epagnier </author>
+<source> https://github.com/rgleason/weatherfax_pi </source>
+
+<description>
+Open image files, decode audio fax to an image, calibrate chart overlay image. Convert images in mercator, polar, conic and uniform coordinates. Convert any image into a raster chart. Built in HF Radio Fax database for SSB and Internet retrieval from meterological sites.
+</description>
+
+<target>debian-armhf</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>armhf</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-debian-armhf-13-trixie-armhf-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-debian-armhf-13-trixie-armhf.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
+</plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-debian-x86_64-11-bullseye.xml b/metadata/weatherfax_pi-1.10.18.0-debian-x86_64-11-bullseye.xml
similarity index 86%
rename from metadata/weatherfax_pi-1.10.17.0-debian-x86_64-11-bullseye.xml
rename to metadata/weatherfax_pi-1.10.18.0-debian-x86_64-11-bullseye.xml
index 868ec5b0d2..cce59a4f74 100644
--- a/metadata/weatherfax_pi-1.10.17.0-debian-x86_64-11-bullseye.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-debian-x86_64-11-bullseye.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -20,7 +20,7 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target-version>11</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-debian-x86_64-11-bullseye-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-debian-x86_64-11-bullseye.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-debian-x86_64-11-bullseye-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-debian-x86_64-11-bullseye.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-debian-x86_64-12-bookworm.xml b/metadata/weatherfax_pi-1.10.18.0-debian-x86_64-12-bookworm.xml
similarity index 86%
rename from metadata/weatherfax_pi-1.10.17.0-debian-x86_64-12-bookworm.xml
rename to metadata/weatherfax_pi-1.10.18.0-debian-x86_64-12-bookworm.xml
index 5580c5fe17..a85c2541d6 100644
--- a/metadata/weatherfax_pi-1.10.17.0-debian-x86_64-12-bookworm.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-debian-x86_64-12-bookworm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -20,7 +20,7 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target-version>12</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-debian-x86_64-12-bookworm-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-debian-x86_64-12-bookworm.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-debian-x86_64-12-bookworm-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-debian-x86_64-12-bookworm.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.18.0-debian-x86_64-13-trixie.xml b/metadata/weatherfax_pi-1.10.18.0-debian-x86_64-13-trixie.xml
new file mode 100644
index 0000000000..5a3e6e07df
--- /dev/null
+++ b/metadata/weatherfax_pi-1.10.18.0-debian-x86_64-13-trixie.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin version="1">
+<name> WeatherFax </name>
+<version> 1.10.18.0 </version>
+<release> 0 </release>
+<summary> Open fax image, decode audio fax, chart overlay </summary>
+
+<api-version> 1.18 </api-version>
+<open-source> yes </open-source>
+<author> Sean d'Epagnier </author>
+<source> https://github.com/rgleason/weatherfax_pi </source>
+
+<description>
+Open image files, decode audio fax to an image, calibrate chart overlay image. Convert images in mercator, polar, conic and uniform coordinates. Convert any image into a raster chart. Built in HF Radio Fax database for SSB and Internet retrieval from meterological sites.
+</description>
+
+<target>debian-x86_64</target>
+<build-target>debian</build-target>
+<build-gtk></build-gtk>
+<target-version>13</target-version>
+<target-arch>x86_64</target-arch>
+<tarball-url>
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-debian-x86_64-13-trixie-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-debian-x86_64-13-trixie.tar.gz
+</tarball-url>
+<info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
+</plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-flatpak-aarch64-22.08-flatpak.xml b/metadata/weatherfax_pi-1.10.18.0-flatpak-aarch64-22.08-flatpak.xml
similarity index 86%
rename from metadata/weatherfax_pi-1.10.17.0-flatpak-aarch64-22.08-flatpak.xml
rename to metadata/weatherfax_pi-1.10.18.0-flatpak-aarch64-22.08-flatpak.xml
index 3c2442e2b5..5cefb213ef 100644
--- a/metadata/weatherfax_pi-1.10.17.0-flatpak-aarch64-22.08-flatpak.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-flatpak-aarch64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -20,7 +20,7 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target-version>22.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-aarch64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-flatpak-aarch64-22.08-flatpak-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-aarch64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-flatpak-aarch64-24.08-flatpak.xml b/metadata/weatherfax_pi-1.10.18.0-flatpak-aarch64-24.08-flatpak.xml
similarity index 86%
rename from metadata/weatherfax_pi-1.10.17.0-flatpak-aarch64-24.08-flatpak.xml
rename to metadata/weatherfax_pi-1.10.18.0-flatpak-aarch64-24.08-flatpak.xml
index 9bdf2d9025..de20d24a32 100644
--- a/metadata/weatherfax_pi-1.10.17.0-flatpak-aarch64-24.08-flatpak.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-flatpak-aarch64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -20,7 +20,7 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target-version>24.08</target-version>
 <target-arch>aarch64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-aarch64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-flatpak-aarch64-24.08-flatpak-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-aarch64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-flatpak-x86_64-22.08-flatpak.xml b/metadata/weatherfax_pi-1.10.18.0-flatpak-x86_64-22.08-flatpak.xml
similarity index 86%
rename from metadata/weatherfax_pi-1.10.17.0-flatpak-x86_64-22.08-flatpak.xml
rename to metadata/weatherfax_pi-1.10.18.0-flatpak-x86_64-22.08-flatpak.xml
index 9fb394824e..e158e9f115 100644
--- a/metadata/weatherfax_pi-1.10.17.0-flatpak-x86_64-22.08-flatpak.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-flatpak-x86_64-22.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -20,7 +20,7 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target-version>22.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-x86_64_flatpak-22.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-flatpak-x86_64-22.08-flatpak-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-x86_64_flatpak-22.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-flatpak-x86_64-24.08-flatpak.xml b/metadata/weatherfax_pi-1.10.18.0-flatpak-x86_64-24.08-flatpak.xml
similarity index 86%
rename from metadata/weatherfax_pi-1.10.17.0-flatpak-x86_64-24.08-flatpak.xml
rename to metadata/weatherfax_pi-1.10.18.0-flatpak-x86_64-24.08-flatpak.xml
index 4d2c3957b2..84485037e7 100644
--- a/metadata/weatherfax_pi-1.10.17.0-flatpak-x86_64-24.08-flatpak.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-flatpak-x86_64-24.08-flatpak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -20,7 +20,7 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target-version>24.08</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-x86_64_flatpak-24.08.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-flatpak-x86_64-24.08-flatpak-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-x86_64_flatpak-24.08.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-msvc-x86-10.0.20348-MSVC.xml b/metadata/weatherfax_pi-1.10.18.0-msvc-x86-10.0.20348-MSVC.xml
similarity index 86%
rename from metadata/weatherfax_pi-1.10.17.0-msvc-x86-10.0.20348-MSVC.xml
rename to metadata/weatherfax_pi-1.10.18.0-msvc-x86-10.0.20348-MSVC.xml
index 31b44ee410..c3d9e37691 100644
--- a/metadata/weatherfax_pi-1.10.17.0-msvc-x86-10.0.20348-MSVC.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-msvc-x86-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -20,7 +20,7 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-msvc-x86-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-msvc-x86-10.0.20348-MSVC-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-msvc-x86-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-msvc-x86-wx32-10.0.20348-MSVC.xml b/metadata/weatherfax_pi-1.10.18.0-msvc-x86-wx32-10.0.20348-MSVC.xml
similarity index 86%
rename from metadata/weatherfax_pi-1.10.17.0-msvc-x86-wx32-10.0.20348-MSVC.xml
rename to metadata/weatherfax_pi-1.10.18.0-msvc-x86-wx32-10.0.20348-MSVC.xml
index 48897041d9..40c5f59792 100644
--- a/metadata/weatherfax_pi-1.10.17.0-msvc-x86-wx32-10.0.20348-MSVC.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-msvc-x86-wx32-10.0.20348-MSVC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -20,7 +20,7 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target-version>10.0.20348</target-version>
 <target-arch>x86</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-msvc-x86-wx32-10.0.20348-MSVC-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-msvc-x86-wx32-10.0.20348-MSVC.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>
diff --git a/metadata/weatherfax_pi-1.10.17.0-ubuntu-x86_64-22.04-jammy.xml b/metadata/weatherfax_pi-1.10.18.0-ubuntu-x86_64-22.04-jammy.xml
similarity index 86%
rename from metadata/weatherfax_pi-1.10.17.0-ubuntu-x86_64-22.04-jammy.xml
rename to metadata/weatherfax_pi-1.10.18.0-ubuntu-x86_64-22.04-jammy.xml
index b48b852f74..7bfdbf0c34 100644
--- a/metadata/weatherfax_pi-1.10.17.0-ubuntu-x86_64-22.04-jammy.xml
+++ b/metadata/weatherfax_pi-1.10.18.0-ubuntu-x86_64-22.04-jammy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin version="1">
 <name> WeatherFax </name>
-<version> 1.10.17.0 </version>
+<version> 1.10.18.0 </version>
 <release> 0 </release>
 <summary> Open fax image, decode audio fax, chart overlay </summary>
 
@@ -20,7 +20,7 @@ Open image files, decode audio fax to an image, calibrate chart overlay image. C
 <target-version>22.04</target-version>
 <target-arch>x86_64</target-arch>
 <tarball-url>
-https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.17.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v1.10.17.0/weatherfax_pi-1.10.17.0-ubuntu-x86_64-22.04-jammy.tar.gz
+https://dl.cloudsmith.io/public/opencpn/weatherfax-prod/raw/names/weatherfax_pi-1.10.18.0-ubuntu-x86_64-wx32-22.04-jammy-tarball/versions/v1.10.18.0/weatherfax_pi-1.10.18.0-ubuntu-x86_64-22.04-jammy.tar.gz
 </tarball-url>
 <info-url> https://opencpn.org/OpenCPN/plugins/weatherfax.html </info-url>
 </plugin>