Squashed commits '${title}'

2024-09-21 03:22:09 +00:00 · 2024-09-21 03:22:09 +00:00 · ac436b5ab1
commit ac436b5ab1
--- a/3
+++ b/3
@ -1,7 +1,6 @@
 BSD 3-Clause License

-Copyright (c) 2018-2024 Stephen Loomis
-Copyright (c) 2020-2024 GridTricker.org
+Copyright (c) 2024 Stephen Loomis, NØTTL, Henry Forte, N2VFL, Matthew Chambers, NRØQ, Sebastian Delmont, KI2D, Christian Bayer, WA4YA, Paul Traina, K6PST, Jon Angliss, KF5QHQ, Beau Gunderson, N7YHF, Jonathan Fick, KEØYBL, Florian Wolters, DF2ET, GridTricker.org
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/changes.txt
+++ b/changes.txt
@ -1,17 +1,16 @@
 Running changes for next release (clear changes after each release please)
 --------------------------------------------------------------------------

-Main - Map View Filters can now be hidden
-Main - Conditions button now planetary K-index (5 minute update)
-Main - Fixed Prediction button not returning when going online
-Map - All Grid Overlay - Field boundaries are bolder
-Map - 6 character Maidenhead locators only supported in Pin mode
-Map - Fixed zoom factor bug causing slow drawing 
-Map - Updated timezone data (corrects America/Mexico_City and others)
-Settings - Proper map selections when in offline mode
-System - Missing translations for Spanish and German fixed
-System - Map engine OpenLayers updated to 10.1.0
-System - BIGCTY update from September 5th
-Call Roster - Fixed ignored grids not saving on exit
-
-
+- Mac - Fixed some network issues on macOS 15 (Sequoia)
+- Panel - Data selector now a drop-down like the others
+ - Panel - Buttons are now movable (Shift-Key + Right-Click)
+- Stats - Logbook - Fixed issue where callsign lookups stopped working
+- Call Roster - Removed old and prevent new watchers with invalid characters
+- Map - Removed some Carto maps that are no longer public access
+- Map - Added Bathymetric Oceans by GEBCO
+- Map - Added Tiandi Tu Chinese maps - requires api key
+- Map - Fixed "old map tiles" showing up when switching maps
+- Map - Zoom buttons now smaller increments
+- System - Kp Index data now delivered over OAMS network
+- System - BIGCTY update from Sept 17th
+- System - NJWS engine updated to 0.78.1
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,19 @@
+gridtracker (1.24.0920) unstable; urgency=low
+ - Mac - Fixed some network issues on macOS 15 (Sequoia)
+ - Panel - Data selector now a drop-down like the others
+ - Panel - Buttons are now movable (Shift-Key + Right-Click)
+ - Stats - Logbook - Fixed issue where callsign lookups stopped working
+ - Call Roster - Removed old and prevent new watchers with invalid characters
+ - Map - Removed some Carto maps that are no longer public access
+ - Map - Added Bathymetric Oceans by GEBCO
+ - Map - Added Tiandi Tu Chinese maps - requires api key
+ - Map - Fixed "old map tiles" showing up when switching maps
+ - Map - Zoom buttons now smaller increments
+ - System - Kp Index data now delivered over OAMS network
+ - System - BIGCTY update from Sept 17th
+ - System - NJWS engine updated to 0.78.1
+-- Tag Loomis <n0ttl@gridtracker.org>  Fri, 20 Sep 2024 00:00:00 -000
+
 gridtracker (1.24.0908) unstable; urgency=low
  - Main - Map View Filters can now be hidden
  - Main - Conditions button now planetary K-index (5 minute update)
--- a/debian/copyright
+++ b/debian/copyright
@ -4,9 +4,9 @@ Upstream-Contact: GridTracker Team <contact@gridtracker.org>
 Source: https://gitlab.com/gridtracker.org/gridtracker

 Files: *
-Copyright: Copyright (c) 2018-2024 Stephen Loomis, Copyright (c) 2020-2024 GridTracker.org
+Copyright: Copyright (c) 2024 Stephen Loomis, NØTTL, Henry Forte, N2VFL, Matthew Chambers, NRØQ, Sebastian Delmont, KI2D, Christian Bayer, WA4YA, Paul Traina, K6PST, Jon Angliss, KF5QHQ, Beau Gunderson, N7YHF, Jonathan Fick, KEØYBL, Florian Wolters, DF2ET, GridTricker.org
 License: BSD-3-clause
-  Copyright (c) 2020-2024 GridTricker.org
+  Copyright (c) 2024 Stephen Loomis, NØTTL, Henry Forte, N2VFL, Matthew Chambers, NRØQ, Sebastian Delmont, KI2D, Christian Bayer, WA4YA, Paul Traina, K6PST, Jon Angliss, KF5QHQ, Beau Gunderson, N7YHF, Jonathan Fick, KEØYBL, Florian Wolters, DF2ET, GridTricker.org
  All rights reserved.
  .
  Redistribution and use in source and binary forms, with or without
--- a/gridtracker.spec
+++ b/gridtracker.spec
@ -1,6 +1,6 @@
 Name:           {{{ git_name name=gridtracker }}}
 Summary:        GridTracker: An Amateur Radio Companion
-Version:        1.24.0908
+Version:        1.24.0920
 Release:        1%{?dist}
 BuildArch:      noarch
 Source0:        {{{ git_dir_pack }}}
@ -40,6 +40,20 @@ DESTDIR=${RPM_BUILD_ROOT} make clean
 %license %{_docdir}/%{name}/

 %changelog
+* Fri Sep 20 2024 Tag Loomis <n0ttl@gridtracker.org> - 1.24.0920-1
+- Mac - Fixed some network issues on macOS 15 (Sequoia)
+- Panel - Data selector now a drop-down like the others
+- Panel - Buttons are now movable (Shift-Key + Right-Click)
+- Stats - Logbook - Fixed issue where callsign lookups stopped working
+- Call Roster - Removed old and prevent new watchers with invalid characters
+- Map - Removed some Carto maps that are no longer public access
+- Map - Added Bathymetric Oceans by GEBCO
+- Map - Added Tiandi Tu Chinese maps - requires api key
+- Map - Fixed "old map tiles" showing up when switching maps
+- Map - Zoom buttons now smaller increments
+- System - Kp Index data now delivered over OAMS network
+- System - BIGCTY update from Sept 17th
+- System - NJWS engine updated to 0.78.1
 * Sun Sep 08 2024 Tag Loomis <n0ttl@gridtracker.org> - 1.24.0908-1
 - Main - Map View Filters can now be hidden
 - Main - Conditions button now planetary K-index (5 minute update)
--- a/macos/README.md
+++ b/macos/README.md
@ -1,40 +0,0 @@
-# [Deprecated] DO NOT USE, KEPT FOR REFERENCE
-
-Use standard "npm run start" and "npm run dist" commands.
-
-
-
-# MacOS-specific notes and instructions
-
-# Development Environment
-
-Gridtracker uses [NW](nwjs.io) (formerly known as node-webkit) to run.
-Install the correct version of NW.js from (nwjs.io)[https://nwjs.io/] for your operating system.
-
-To run the app, just call `macos/run.sh` from your local repository.
-
-The script will download a copy of the right version of NWJS to the `build/macos` directory and use it to
-run GridTracker from the source files.
-
-
-
-# Building & Releasing
-
-To package a version of GridTracker for distribution, update the NWJS version in `macos/build.sh` as needed
-and run `./macos/build.sh` from the top level of your local repository.
-
-The script will download a copy of NWJS and follow the steps described
-[in the nwjs docs](https://nwjs.readthedocs.io/en/latest/For%20Users/Package%20and%20Distribute/)
-to produce a `GridTracker.app` macOS application in the `dist` directory.
-
-
-
-# Troubleshooting
-
-### NWJS won't run GridTracker
-
-If you see the error `"The display compositor is frequently crashing"` it's most likely because of
-[this known issue](https://github.com/nwjs/nw.js/issues/7253) that requires `package.js` to
-have a `product_string` value of `nwjs`, or not be present. The `macos/run.sh` script takes care of
-this for you, but if you want to run it in a different way, you'll have to manually edit `package.json`
-and remember not to commit those changes upstream.
--- a/macos/build.sh
+++ b/macos/build.sh
@ -1,33 +0,0 @@
-NWJS_VERSION=0.49.2
-
-if [ ! -e build/macos/nwjs-v$NWJS_VERSION-osx-x64/nwjs.app ]; then
-  echo "Downloading NWJS $NWJS_VERSION"
-  mkdir -p build/macos
-  cd build/macos
-  curl -O https://dl.nwjs.io/v$NWJS_VERSION/nwjs-v$NWJS_VERSION-osx-x64.zip
-  unzip nwjs-v$NWJS_VERSION-osx-x64.zip
-  cd ../..
-fi
-
-mkdir -p dist
-rm -rf dist/GridTracker.app
-cp -r build/macos/nwjs-v$NWJS_VERSION-osx-x64/nwjs.app build/macos/GridTracker.app
-
-mv build/macos/GridTracker.app/Contents/MacOS/nwjs build/macos/GridTracker.app/Contents/MacOS/GridTracker
-cp -r package.nw build/macos/GridTracker.app/Contents/Resources/app.nw
-cp -f macos/app.icns build/macos/GridTracker.app/Contents/Resources/app.icns
-cp -f macos/app.icns build/macos/GridTracker.app/Contents/Resources/document.icns
-
-sed -i "" -e "s/<string>nwjs<\/string>/<string>GridTracker<\/string>/g" build/macos/GridTracker.app/Contents/Info.plist
-sed -i "" -e "s/<string>io\.nwjs\.nwjs<\/string>/<string>org.gridtracker.GridTracker<\/string>/g" build/macos/GridTracker.app/Contents/Info.plist
-sed -i "" -e "s/<string>NWJS<\/string>/<string>GridTracker<\/string>/g" build/macos/GridTracker.app/Contents/Info.plist
-
-sed -i "" -e "s/\"nwjs\"/\"GridTracker\"/g" build/macos/GridTracker.app/Contents/Resources/en.lproj/InfoPlist.strings
-
-sed -i "" -e s/\"product_string\"/\"ignore_product_string\"/g build/macos/GridTracker.app/Contents/Resources/app.nw/package.json
-
-mv build/macos/GridTracker.app dist
-
-echo ""
-echo "GridTracker has been packaged for distribution and is available as 'dist/GridTracker.app'"
-echo ""
--- a/macos/run.sh
+++ b/macos/run.sh
@ -1,21 +0,0 @@
-NWJS_VERSION=0.49.2
-NWJS_FULL_NAME=nwjs-sdk-v$NWJS_VERSION-osx-x64
-
-if [ ! -e build/macos/$NWJS_FULL_NAME/nwjs.app ]; then
-  echo "Downloading NWJS $NWJS_VERSION ($NWJS_FULL_NAME)"
-  mkdir -p build/macos
-  cd build/macos
-  curl -O https://dl.nwjs.io/v$NWJS_VERSION/$NWJS_FULL_NAME.zip
-  unzip $NWJS_FULL_NAME.zip
-  cd ../..
-fi
-
-# Disable `product_string` before running nwjs (see https://github.com/nwjs/nw.js/issues/7253)
-sed -i "" -e s/\"product_string\"/\"ignore_product_string\"/g package.nw/package.json
-
-# Give time (15 seconds) for nwjs to start and then restore `product_string`
-( sleep 15 ; sed -i "" -e s/\"ignore_product_string\"/\"product_string\"/g package.nw/package.json ) &
-
-build/macos/$NWJS_FULL_NAME/nwjs.app/Contents/MacOS/nwjs ./package.nw
-
-
--- a/package.nw/GridTracker.html
+++ b/package.nw/GridTracker.html
@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <!--
-GridTracker Copyright © 2018-2024 Stephen Loomis
-GridTracker Copyright © 2020-2024 GridTracker.org
+GridTracker Copyright © 2024 Stephen Loomis, NØTTL, Henry Forte, N2VFL, Matthew Chambers, NRØQ, Sebastian Delmont, KI2D, Christian Bayer, WA4YA, Paul Traina, K6PST, Jon Angliss, KF5QHQ, Beau Gunderson, N7YHF, Jonathan Fick, KEØYBL, Florian Wolters, DF2ET, GridTricker.org
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@ -89,7 +88,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  </div>
  <div id="main" style="display: none;">
    <div id="mapDiv" class="mapDivEnd"></div>
-    <div id="mouseTrackDiv" style="display: none" class="mouseTrack"></div>
+    <div id="mouseTrackDiv" class="mouseTrack"></div>
    <div id="LegendDiv" style="display: none" class="legendDivEnd">
      <table align="center">
        <tr>
@ -466,17 +465,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <tr>
            <td data-i18n="mapFilter.data.label" style="color:cyan">Data</td>
            <td>
-              <div data-i18n="mapFilter.data.LogLive" id="gridViewButton" onclick="cycleGridView()" class="button"
-                title="Cycle Grid View" style="
-                    min-width: 94px;
-                    background-color: darkgreen;
-                    color: #ff0;
-                    font-size: 13.3333px;
-                    text-align: left;
-                    margin-bottom: 2px;
-                  ">
-                Logbook &amp; Live
-              </div>
+              <select id="gtGridViewMode" onkeypress="return false;" onchange="setGridView()">
+                <option data-i18n="mapFilter.data.Live"    value="1">Live</option>
+                <option data-i18n="mapFilter.data.Logbook" value="2">Logbook</option>
+                <option data-i18n="mapFilter.data.LogLive" value="3">Logbook &amp; Live</option>
+              </select>
            </td>
          </tr>
          <tr>
@ -497,7 +490,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          </tr>
        </table>
      </div>
-      <div id="buttonsDiv" style="margin-left: 0px; white-space: normal">
+      <div id="buttonsDiv" style="margin-top:1px;margin-left: 1px; display:grid;gap:0px;grid-template-columns: 1fr 1fr 1fr 1fr 1fr;grid-template-rows: auto;">
        <div id="callRosterButton" class="iconButton" onclick="openCallRosterWindow();" title="Open Call Roster">
          <img src="./img/roster-icon.png" class="buttonImg" />
        </div>
@ -641,7 +634,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            <td align="center">90%</td>
          </tr>
          <tr id="aufBarTr">
-            <td colspan="3" class="barGraph"><img style="width:170px; height:8px" src="https://tagloomis.com/auf/img/bar.png" /></td>
+            <td colspan="3" class="barGraph"><img style="width:170px; height:8px" src="./img/auf_bar.png" /></td>
          </tr>
          <tr id="mufRangeTr">
            <td align="left">&lt;5</td>
@ -1265,6 +1258,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        </table>
        <table align="center">
          <tr>
+            <td>
+              <div class="mapItem">
+                <table align="center">
+                  <tr>
+                    <td>
+                      <div data-i18n="settings.general.ResetButtonPanel.label" class="button" onclick="setButtonPanelOrder(GT.defaultButtons)">
+                        Reset-Button-Panel
+                      </div>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+            </td>
            <td>
              <div class="mapItem">
                <table align="center">
@ -1951,6 +1957,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
              <select id="offlineMapSelect" value="terrain-background" onchange="changeOfflineMap();"></select>
            </td>
          </tr>
+          <tr id="mapApiKeyTr">
+            <td>
+              <label data-i18n="settings.logging.QRZcom.details.apikey" for="mapApiKeyInput">API Key</label>
+              <input id="mapApiKeyInput" type="test" class="inputTextValue"  size="21" oninput="mapApiKeyInputChanged()" /><br/>
+              <div id="mapApiKeyApplyDiv" data-i18n="settings.Update.label" class="button" onclick="changeMapLayer()">Apply Changes
+              </div>
+            </td>
+          </tr>
        </table>
      </div>
      <div class="mapItem">
@ -1997,7 +2011,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <tr align="center">
            <td colspan="2">
              <input type="range" min="0.0" max="8" value="1.5" step="0.1" class="slider" id="pathWidthValue"
-                oninput="changePathWidth()" />
+                oninput="changePathValues()" />
            </td>
          </tr>
        </table>
@ -2010,7 +2024,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <tr align="center">
            <td colspan="2">
              <input type="range" min="0" max="361" value="0" class="slider" id="pathColorValue"
-                oninput="changeMapValues()" />
+                oninput="changePathValues()" />
            </td>
          </tr>
        </table>
@ -2024,7 +2038,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <tr align="center">
            <td colspan="2">
              <input type="range" min="0.0" max="10" value="1.5" step="0.1" class="slider" id="qrzPathWidthValue"
-                oninput="changePathWidth()" />
+                oninput="changePathValues()" />
            </td>
          </tr>
        </table>
@ -2037,7 +2051,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <tr align="center">
            <td colspan="2">
              <input type="range" min="0" max="361" value="360" class="slider" id="qrzPathColorValue"
-                oninput="changeMapValues()" />
+                oninput="changePathValues()" />
            </td>
          </tr>
        </table>
@ -2201,7 +2215,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                    <td>
                      <select id="mapNightSelect" value="18" onchange="changeMapNightValues();"></select>
                      <select id="offlineMapNightSelect" value="terrain-background" onchange="changeOfflineNightMap();"></select>
-                    </td
+                    </td>
+                  </tr>
+                  <tr id="nightMapApiKeyTr">
+                    <td>
+                      <label data-i18n="settings.logging.QRZcom.details.apikey" for="nightMapApiKeyInput">API Key</label>
+                      <input id="nightMapApiKeyInput" type="test" class="inputTextValue"  size="21" oninput="nightMapApiKeyInputChanged()" /><br/>
+                      <div id="nightMapApiKeyApplyDiv" data-i18n="settings.Update.label" class="button" onclick="changeMapLayer()">Apply Changes
+                      </div>
+                    </td>
                  </tr>
                </table>
              </div>
@ -2215,7 +2237,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                  <tr align="center">
                    <td colspan="2">
                      <input type="range" min="0" max="361" value="0" class="slider" id="nightPathColorValue"
-                        oninput="changeMapNightValues()" />
+                        oninput="changeMapNightPathValues()" />
                    </td>
                  </tr>
                </table>
@ -2229,7 +2251,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                  <tr align="center">
                    <td colspan="2">
                      <input type="range" min="0" max="361" value="0" class="slider" id="nightQrzPathColorValue"
-                        oninput="changeMapNightValues()" />
+                        oninput="changeMapNightPathValues()" />
                    </td>
                  </tr>
                </table>
@ -3322,17 +3344,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        </h2>
        <p>
          GridTracker is a warehouse of amateur radio information presented in an easy to use interface<br />
-          <br />
-          From Live Traffic Decodes<br />
-          Logbooks<br />
-          Real-time Spot Reports<br />
-          Weather<br />
-          Current Solar Conditions and More!<br />
+          <br/>
          Learn more at
-          <a href="#" style="cursor: pointer"
+          <a href="#" style="cursor: pointer; font-weight: bold; color:cyan;"
            onclick="nw.Shell.openExternal('https://gridtracker.org/');">GridTracker.org!</a>
        </p>
-        <p>Copyright &copy; 2024 GridTracker.org</p>
+        <p>Copyright &copy; 2024 Stephen Loomis, NØTTL, Henry Forte, N2VFL, Matthew Chambers, NRØQ<br/>
+        Sebastian Delmont, KI2D, Christian Bayer, WA4YA, Paul Traina, K6PST<br/>
+        Jon Angliss, KF5QHQ, Beau Gunderson, N7YHF, Jonathan Fick, KEØYBL<br/>
+        Florian Wolters, DF2ET, GridTracker.org</p>
        <img src="./gridview.png" /> <br />
      </div>
    </div>
--- a/package.nw/data/maps.json
+++ b/package.nw/data/maps.json
@ -1,5 +1,6 @@
 {
  "Mapnik by OpenStreetMap (Intl)": {
+    "sourceType" : "XYZ",
    "url": "http://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png",
    "attributions": "<a href=\"http://openstreetmap.org/\" target=\"_blank\">OpenStreetMap</a>",
    "minZoom": 0,
@ -7,6 +8,7 @@
    "offline": false
  },
  "Mapnik by OpenStreetMap (Deutsch)": {
+    "sourceType" : "XYZ",
    "url": "http://{a-c}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png",
    "attributions": "<a href=\"http://openstreetmap.de/\" target=\"_blank\">OpenStreetMap DE</a>",
    "minZoom": 0,
@ -14,6 +16,7 @@
    "offline": false
  },
  "Mapnik by OpenStreetMap (français)": {
+    "sourceType" : "XYZ",
    "url": "http://{a-c}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png",
    "attributions": "<a href=\"http://openstreetmap.fr/\" target=\"_blank\">OpenStreetMap FR</a>",
    "minZoom": 0,
@ -21,6 +24,7 @@
    "offline": false
  },
  "Toner by Stamen (No Labels)(Offline)": {
+    "sourceType" : "XYZ",
    "url": "/map/toner-background/{z}/{x}/{y}.png",
    "attributions": "Stamen Design",
    "minZoom": 0,
@ -28,46 +32,54 @@
    "offline": true
  },
  "National Geographic by Esri (English)": {
+    "sourceType" : "XYZ",
    "url": "http://server.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/tile/{z}/{y}/{x}",
    "attributions": "Esri &mdash; National Geographic",
    "maxZoom": 16,
    "offline": false
  },
  "Street by Esri (English)": {
+    "sourceType" : "XYZ",
    "url": "http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}",
    "attributions": "Esri",
    "offline": false
  },
  "Topographical by Esri (English)": {
+    "sourceType" : "XYZ",
    "url": "http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}",
    "attributions": "Esri",
    "offline": false
  },
  "Physical by Esri (No Labels)": {
+    "sourceType" : "XYZ",
    "url": "http://server.arcgisonline.com/ArcGIS/rest/services/World_Physical_Map/MapServer/tile/{z}/{y}/{x}",
    "attributions": "Esri",
    "maxZoom": 8,
    "offline": false
  },
  "Satellite by Esri (No Labels)": {
+    "sourceType" : "XYZ",
    "url": "http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
    "attributions": "Esri",
    "maxZoom": 18,
    "offline": false
  },
  "Terrain by Esri (No Labels)": {
+    "sourceType" : "XYZ",
    "url": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Terrain_Base/MapServer/tile/{z}/{y}/{x}",
    "attribution": "Esri",
    "maxZoom": 13,
    "offline": false
  },
  "Shaded Relief by Esri (No Labels)": {
+    "sourceType" : "XYZ",
    "url": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Shaded_Relief/MapServer/tile/{z}/{y}/{x}",
    "attribution": "Esri",
    "maxZoom": 13,
    "offline": false
  },
  "Humanitarian by OpenStreetMap (Intl)": {
+    "sourceType" : "XYZ",
    "url": "http://{a-c}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png",
    "attributions": "<a href=\"http://openstreetmap.org/\" target=\"_blank\">OpenStreetMap</a>",
    "minZoom": 0,
@ -75,84 +87,70 @@
    "offline": false
  },
  "Dark Gray by Esri (English)": {
+    "sourceType" : "XYZ",
    "url": "http://services.arcgisonline.com/arcgis/rest/services/Canvas/World_Dark_Gray_Base/MapServer/tile/{z}/{y}/{x}",
    "attributions": "Esri",
    "maxZoom": 19,
    "offline": false
  },
  "Light Gray by Esri (English)": {
+    "sourceType" : "XYZ",
    "url": "http://services.arcgisonline.com/arcgis/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}",
    "attributions": "Esri",
    "maxZoom": 16,
    "offline": false
  },
  "Oceans by Esri (No Labels)": {
+    "sourceType" : "XYZ",
    "url": "https://server.arcgisonline.com/arcgis/rest/services/Ocean/World_Ocean_Base/MapServer/tile/{z}/{y}/{x}",
    "attributions": "Esri",
    "maxZoom": 10,
    "offline": false
  },
-  "Midnight Commander by Carto (No Labels)": {
-    "url": "https://cartocdn_{a-d}.global.ssl.fastly.net/base-midnight/{z}/{x}/{y}.png",
-    "attributions": "Carto",
-    "maxZoom": 19,
-    "offline": false
-  },
-  "Antique by Carto (Minimal Labels)": {
-    "url": "https://cartocdn_{a-d}.global.ssl.fastly.net/base-antique/{z}/{x}/{y}.png",
-    "attributions": "Carto",
-    "maxZoom": 19,
-    "offline": false
-  },
-  "Eco by Carto (Minimal Labels)": {
-    "url": "https://cartocdn_{a-d}.global.ssl.fastly.net/base-eco/{z}/{x}/{y}.png",
-    "attributions": "Carto",
-    "maxZoom": 19,
-    "offline": false
-  },
  "Voyager by Carto (English)": {
+    "sourceType" : "XYZ",
    "url": "https://{a-d}.basemaps.cartocdn.com/rastertiles/voyager_labels_under/{z}/{x}/{y}.png",
    "attributions": "Carto",
    "maxZoom": 19,
    "offline": false
  },
  "Positron by Carto (English)": {
+    "sourceType" : "XYZ",
    "url": "https://{a-d}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png",
    "attributions": "Carto",
    "maxZoom": 19,
    "offline": false
  },
  "Dark Matter by Carto (English)": {
+    "sourceType" : "XYZ",
    "url": "https://{a-d}.basemaps.cartocdn.com/rastertiles/dark_all/{z}/{x}/{y}.png",
    "attributions": "Carto",
    "maxZoom": 19,
    "offline": false
  },
  "Voyager by Carto (No Labels)": {
+    "sourceType" : "XYZ",
    "url": "https://{a-d}.basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}.png",
    "attributions": "Carto",
    "maxZoom": 19,
    "offline": false
  },
  "Positron by Carto (No Labels)": {
+    "sourceType" : "XYZ",
    "url": "https://{a-d}.basemaps.cartocdn.com/rastertiles/light_nolabels/{z}/{x}/{y}.png",
    "attributions": "Carto",
    "maxZoom": 19,
    "offline": false
  },
  "Dark Matter by Carto (No Labels)": {
+    "sourceType" : "XYZ",
    "url": "https://{a-d}.basemaps.cartocdn.com/rastertiles/dark_nolabels/{z}/{x}/{y}.png",
    "attributions": "Carto",
    "maxZoom": 19,
    "offline": false
  },
-  "Flat Blue by Carto (No Labels)": {
-    "url": "https://cartocdn_{a-d}.global.ssl.fastly.net/base-flatblue/{z}/{x}/{y}.png",
-    "attributions": "Carto",
-    "maxZoom": 19,
-    "offline": false
-  },
  "Satellite by MapTiler (No Labels)(Offline)": {
+    "sourceType" : "XYZ",
    "url": "/map/sat/{z}/{x}/{y}.png",
    "attributions": "MapTiler",
    "minZoom": 0,
@ -160,31 +158,85 @@
    "offline": true
  },
  "HamGames by N0TTL (Intl)(Offline)": {
+    "sourceType" : "XYZ",
    "url": "/map/hamgames/{z}/{x}/{y}.png",
    "attributions": "N0TTL",
    "minZoom": 0,
    "maxZoom": 4,
    "offline": true
  },
-  "GoogleMap by GoogleCN (Chinese)": {
-    "url": "http://gac-geo.googlecnapps.cn/maps/vt?lyrs=m&gl=CN&x={x}&y={y}&z={z}",
-    "attributions": "GoogleCN",
-    "minZoom": 3,
-    "maxZoom": 19,
-    "offline": false
-  },
-  "GoogleMap Satellite by GoogleCN (Chinese)": {
-    "url": "http://gac-geo.googlecnapps.cn/maps/vt?lyrs=s,m&gl=CN&x={x}&y={y}&z={z}",
-    "attributions": "GoogleCN",
-    "minZoom": 3,
-    "maxZoom": 19,
-    "offline": false
-  },
  "City Lights by NASA (No Labels)": {
+    "sourceType" : "XYZ",
    "url": "https://tagloomis.com/maps/CityLights2016/{z}/{x}/{-y}.png",
    "attributions": "NASA",
    "minZoom": 0,
    "maxZoom": 5,
    "offline": false
+  },
+  "天地图 矢量 (Chinese)": {
+    "sourceType" : "Group",
+    "keyId" : "SkyMaps",
+    "attributions": "天地图",
+    "group" : [ 
+    {
+      "sourceType" : "XYZ",
+      "_url" : "http://t{r7}.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk={k}",
+      "maxZoom": 18,
+      "attributions": "天地图"
+    },
+    { 
+      "sourceType" : "XYZ",
+      "_url" : "http://t{r7}.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk={k}" ,
+      "maxZoom": 18
+    }
+    ],
+    "offline": false
+  },
+  "天地图 卫星 (Chinese)": {
+    "sourceType" : "Group",
+    "keyId" : "SkyMaps",
+    "attributions": "天地图",
+    "group" : [ 
+    {
+      "sourceType" : "XYZ",
+      "_url" : "http://t{r7}.tianditu.gov.cn/img_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk={k}",
+      "maxZoom": 18,
+      "attributions": "天地图"
+    },
+    { 
+      "sourceType" : "XYZ",
+      "_url" : "http://t{r7}.tianditu.gov.cn/cia_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cia&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk={k}" ,
+      "maxZoom": 18
+    }
+    ],
+    "offline": false
+  },
+  "天地图 地形 (Chinese)": {
+    "sourceType" : "Group",
+    "keyId" : "SkyMaps",
+    "attributions": "天地图",
+    "group" : [ 
+    {
+      "sourceType" : "XYZ",
+      "_url" : "http://t{r7}.tianditu.gov.cn/ter_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=ter&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk={k}",
+      "maxZoom": 14,
+      "attributions": "天地图"
+    },
+    { 
+      "sourceType" : "XYZ",
+      "_url" : "http://t{r7}.tianditu.gov.cn/cta_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cta&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk={k}" ,
+      "maxZoom": 14
+    }
+    ],
+    "offline": false
+  },
+  "Bathymetric Oceans by GEBCO (No Labels)": {
+    "sourceType" : "TileWMS",
+    "url": "https://wms.gebco.net/mapserv",
+    "params": { "layers": "GEBCO_LATEST_SUB_ICE_TOPO"},
+    "serverType" : "mapserver",
+    "attributions": "<a href=\"https://www.gebco.net/about_us/overview/\" target=\"_blank\">GEBCO</a>",
+    "crossOrigin": "Anonymous",
+    "offline": false
  }
 }
--- a/package.nw/data/mh-root-prefixed.json
+++ b/package.nw/data/mh-root-prefixed.json
@ -1519,7 +1519,7 @@
      "VE9TEN/5",
      "VE9XX/6",
      "VE9ZP/4",
-      "VER20240905",
+      "VER20240917",
      "VF0X",
      "VF0X/M",
      "VO/DL2GF",
@ -2563,7 +2563,6 @@
      "AB7YO",
      "AB8XX",
      "AB9OM",
-      "AC1RU",
      "AC2UJ",
      "AC3DF",
      "AC5ZY",
@ -2591,6 +2590,7 @@
      "AF7DQ",
      "AF7FV",
      "AF7UM",
+      "AG5GS",
      "AG5LN",
      "AG5OF",
      "AG6PI",
@ -3208,7 +3208,6 @@
      "N2TJY",
      "N3QEH",
      "N4AVX",
-      "N4DBX",
      "N4HCJ",
      "N4HZU",
      "N4IJB",
@ -3236,7 +3235,6 @@
      "N7HER",
      "N7HQK",
      "N7IA",
-      "N7JUX",
      "N7MGT",
      "N7MKL",
      "N7MTG",
@ -3309,7 +3307,6 @@
      "W7DDG",
      "W7EGG",
      "W7EIK",
-      "W7JAL",
      "W7JMR",
      "W7ORR",
      "W7PWA",
@ -3360,6 +3357,7 @@
      "WH6GBB",
      "WH6GCO",
      "WH6IQ",
+      "WH6PC",
      "WH7AK",
      "WI5GUY",
      "WJ6AA",
@ -7551,9 +7549,7 @@
    "confirmed_bands": {},
    "worked_modes": {},
    "confirmed_modes": {},
-    "direct": [
-      "VERSION"
-    ],
+    "direct": [],
    "prefixITU": {},
    "prefixCQ": {},
    "directITU": {},
@ -10904,6 +10900,7 @@
      "R6RA/9",
      "R6UAE/9",
      "R6XBA/9",
+      "R6XE/9",
      "R700SSR",
      "R70ASIA",
      "R70B",
@ -10925,6 +10922,7 @@
      "R7AL/0",
      "R7AL/0/M",
      "R7AL/0/P",
+      "R7HJ/0",
      "R7LP/0",
      "R7LZ/0",
      "R7LZ/8",
@ -11143,6 +11141,7 @@
      "RA9DA/0",
      "RA9DF/4/M",
      "RA9DF/P",
+      "RA9FEU/M",
      "RA9FTM/0",
      "RA9FW/9",
      "RA9H",
@ -12480,7 +12479,6 @@
      "UB5O/8",
      "UB5O/8/P",
      "UB5O/9",
-      "UB5O/P",
      "UB8J",
      "UB8JDH/0",
      "UB8M/M",
@ -16099,6 +16097,7 @@
      "UE23RRC/P": "34",
      "RV9WP/0": "22",
      "U0H/UA0AGQ": "22",
+      "R7HJ/0": "24",
      "RA/IK0PRH": "24",
      "RA/IK0PRH/P": "24",
      "RA4CF/0": "24",
@ -16369,6 +16368,7 @@
      "RW30RR": "32",
      "RW4YA/0": "32",
      "RW4YA/9": "32",
+      "RX0TX/P": "32",
      "RX3AT/0": "32",
      "RX3DFH/0": "32",
      "RX9WN/0": "32",
@ -16444,12 +16444,10 @@
      "RP78BD": "32",
      "RX0AE/0": "32",
      "RX0AT/0/P": "32",
-      "RX0TX/P": "32",
      "UA0ADU/0": "32",
      "UA0WGD/0": "32",
      "UA9ZZ/0/P": "32",
      "UB0Y": "32",
-      "UB5O/P": "32",
      "UE0OFF/0": "32",
      "UE44Y/9": "32",
      "UE70Y": "32",
@ -16533,6 +16531,7 @@
      "R4CDO/9/M": "18",
      "R4WBS/9": "18",
      "R5GA/9": "18",
+      "R6XE/9": "18",
      "RA3TND/0": "19",
      "RA3TND/9": "18",
      "RA4AAJ/9": "18",
@ -16930,6 +16929,7 @@
      "RA8JA/4/P": "16",
      "RA8W": "16",
      "RA9DF/4/M": "16",
+      "RA9FEU/M": "16",
      "RA9KDX/8/M": "16",
      "RA9W": "16",
      "RA9WU/9": "16",
@ -17051,6 +17051,7 @@
      "RW9JZ/9": "16",
      "RX22WN": "16",
      "RX95WN": "16",
+      "RX9WT/P": "16",
      "RY9W": "16",
      "RZ16WF": "16",
      "RZ90WU": "16",
@ -17405,6 +17406,7 @@
      "UE23RRC/P": "19",
      "RV9WP/0": "18",
      "U0H/UA0AGQ": "18",
+      "R7HJ/0": "19",
      "RA/IK0PRH": "19",
      "RA/IK0PRH/P": "19",
      "RA4CF/0": "19",
@ -17675,6 +17677,7 @@
      "RW30RR": "18",
      "RW4YA/0": "18",
      "RW4YA/9": "18",
+      "RX0TX/P": "18",
      "RX3AT/0": "18",
      "RX3DFH/0": "18",
      "RX9WN/0": "18",
@ -17750,12 +17753,10 @@
      "RP78BD": "23",
      "RX0AE/0": "23",
      "RX0AT/0/P": "23",
-      "RX0TX/P": "23",
      "UA0ADU/0": "23",
      "UA0WGD/0": "23",
      "UA9ZZ/0/P": "23",
      "UB0Y": "23",
-      "UB5O/P": "23",
      "UE0OFF/0": "23",
      "UE44Y/9": "23",
      "UE70Y": "23",
@ -18306,6 +18307,7 @@
      "AO150U",
      "AO3MWC/8",
      "AO4AAA/8",
+      "AO50MRG",
      "AO5DXX/8",
      "AO75IC",
      "EA1AK/8",
@ -18494,7 +18496,6 @@
      "EA4URE/9",
      "EA5DCL/9",
      "EA5ISM/9",
-      "EA5PC",
      "EA5RKB/9",
      "EA7JTF/9",
      "EA7URM/9",
@ -19144,8 +19145,6 @@
      "9M59MS",
      "9M59MW",
      "9M59SD",
-      "9M67MQ",
-      "9M67MS",
      "9M7DX",
      "9M9/7M2VPR",
      "9M9/CCL",
@ -20764,6 +20763,7 @@
      "R80WTW",
      "R80YBR",
      "R81AWD",
+      "R81BRO",
      "R850G",
      "R850PN",
      "R85AAL",
@ -20990,6 +20990,8 @@
      "RA80KEDR",
      "RA80OW",
      "RA80SP",
+      "RA8CP/M",
+      "RA8CP/P",
      "RA90FA",
      "RA95FL",
      "RA98AE",
@ -21011,7 +21013,6 @@
      "RA9FDR/4",
      "RA9FDR/4/P",
      "RA9FDR/M",
-      "RA9FEU/M",
      "RA9FLR/3",
      "RA9FNV/1",
      "RA9FR/4/M",
@ -21878,6 +21879,7 @@
      "UB5O/1/M",
      "UB5O/4",
      "UB5O/M",
+      "UB5O/P",
      "UB8ADI/5",
      "UB8ADI/6",
      "UB8AFZ/3",
@ -22956,6 +22958,7 @@
      "UA0KAO/4": "30",
      "UA0QJA/4": "30",
      "UA4H": "29",
+      "UA4HAZ/P": "30",
      "UA4HBM": "29",
      "UA4HGL": "29",
      "UA4HIP": "29",
@ -23062,10 +23065,8 @@
      "R9KC/8/M": "30",
      "RA27FM": "30",
      "RA9FDR/M": "30",
-      "RA9FEU/M": "30",
      "RA9G": "30",
      "RA9WU/M": "30",
-      "RA9WU/P": "30",
      "RA9XAI/4": "30",
      "RC20FM": "30",
      "RC9F": "30",
@ -23232,10 +23233,8 @@
      "R9KC/8/M": "17",
      "RA27FM": "17",
      "RA9FDR/M": "17",
-      "RA9FEU/M": "17",
      "RA9G": "17",
      "RA9WU/M": "17",
-      "RA9WU/P": "17",
      "RA9XAI/4": "17",
      "RC20FM": "17",
      "RC9F": "17",
@ -23687,6 +23686,7 @@
    "worked_modes": {},
    "confirmed_modes": {},
    "direct": [
+      "VERSION",
      "VP400BO",
      "VP9400/HW"
    ],
@ -26245,6 +26245,7 @@
      "LU2EJL/D",
      "LU2EK/D",
      "LU2ELT/D",
+      "LU2ELZ/I",
      "LU2EM/D",
      "LU2EMQ/D",
      "LU2ENG/D",
@ -30795,6 +30796,7 @@
      "KA8EBL",
      "KA8KND",
      "KB0PXK",
+      "KB0VKF",
      "KB0ZKZ",
      "KB1EUJ",
      "KB1HGW",
@ -31364,6 +31366,7 @@
      "WA0FUR",
      "WA0NHD",
      "WA0TFB",
+      "WA1NDW",
      "WA2AUI",
      "WA3ZEM",
      "WA3ZLB",
@ -31395,7 +31398,6 @@
      "WB6PIO",
      "WB6PJT",
      "WB6VBM",
-      "WB8NCD",
      "WD0FTF",
      "WD4MLF",
      "WD8LIB",
@ -31408,6 +31410,7 @@
      "WL7CSW/H",
      "WV0Z",
      "WV6K",
+      "WW2ECV",
      "WW7CC",
      "WX0H",
      "WY3B",
@ -37329,6 +37332,7 @@
      "N1RWD",
      "N1SCD",
      "N1SZM",
+      "N1VMY",
      "N1XZZ",
      "N1YAY",
      "N1ZJC",
@ -44072,6 +44076,7 @@
      "EA8TL/3",
      "EA9AA/7",
      "EA9ADD",
+      "EA9ADD/P",
      "EA9AZ/5",
      "EA9BLJ/5",
      "EA9CD/1",
@ -45868,6 +45873,7 @@
      "AC0H",
      "AC0IF",
      "AC1H",
+      "AC1RU",
      "AC2H",
      "AC4HV",
      "AC5AZ",
@ -46502,6 +46508,7 @@
      "K6Y",
      "K6YU",
      "K7A",
+      "K7AKR",
      "K7AWD",
      "K7B/SJ",
      "K7BRR",
@ -48248,6 +48255,7 @@
      "KL7JJE",
      "KL7JJN",
      "KL7JKC",
+      "KL7JKR",
      "KL7JKS",
      "KL7JKV",
      "KL7JO",
@ -48920,6 +48928,7 @@
      "N4CM",
      "N4CZB",
      "N4D",
+      "N4DBX",
      "N4EO",
      "N4ERC",
      "N4H",
@ -48995,6 +49004,7 @@
      "N7INQ",
      "N7JIZ",
      "N7JOL",
+      "N7JUX",
      "N7MNI",
      "N7MVL",
      "N7NVX",
@ -49783,6 +49793,7 @@
      "W7HJ",
      "W7IV",
      "W7IV/M",
+      "W7JAL",
      "W7JM",
      "W7KFI",
      "W7KMV",
@ -49873,6 +49884,7 @@
      "WB7SUQ/YL",
      "WB7TYK",
      "WB7UIJ",
+      "WB8NCD",
      "WB8TBI",
      "WB8UCD/4FL",
      "WB9SMM",
@ -50139,7 +50151,6 @@
      "WH6FAD",
      "WH6FAM",
      "WH6FAM/3",
-      "WH6FAR",
      "WH6FBA",
      "WH6FBH",
      "WH6FBM",
@ -50529,6 +50540,7 @@
      "WL7GT",
      "WL7GV",
      "WL7H",
+      "WL7HB",
      "WL7HC",
      "WL7HE",
      "WL7HK",
@ -50614,6 +50626,7 @@
      "WL7VV",
      "WL7W",
      "WL7WB",
+      "WL7WC",
      "WL7WF",
      "WL7WG",
      "WL7WK",
@ -51001,12 +51014,14 @@
      "WP4OZP",
      "WP4P",
      "WP4PEP",
+      "WP4PGY",
      "WP4PJE",
      "WP4PLR",
      "WP4PPH",
      "WP4PR",
      "WP4PRA",
      "WP4PRV",
+      "WP4PSN",
      "WP4PUR",
      "WP4PUV",
      "WP4PWN",
@ -51034,6 +51049,7 @@
      "WP4RQ",
      "WP4RRR",
      "WP4TD",
+      "WP4TGK",
      "WP4TX",
      "WP4UC",
      "WP4UFO",
@ -52061,6 +52077,7 @@
      "AB7QC": "07",
      "AC0H": "07",
      "AC0IF": "07",
+      "AH2AP": "07",
      "AH2BY": "07",
      "AH6ES/0": "07",
      "AH6FY": "07",
@ -52234,6 +52251,7 @@
      "KL7JGJ": "07",
      "KL7JIE": "07",
      "KL7JIM": "07",
+      "KL7JKR": "07",
      "KL7JR/0": "07",
      "KL7KRT": "07",
      "KL7MH": "07",
@ -52405,6 +52423,7 @@
      "AA1KS/USI": "08",
      "AB1US": "08",
      "AC1H": "08",
+      "AC1RU": "08",
      "AD1L": "08",
      "AH2EM": "08",
      "AH2V": "08",
@ -52781,7 +52800,6 @@
      "WH6DLD": "08",
      "WH6DNT": "08",
      "WH6EHT": "08",
-      "WH6FAR": "08",
      "WH6FRH": "08",
      "WH6OH": "08",
      "WH6UO": "08",
@ -52827,6 +52845,7 @@
      "WP4OKS": "08",
      "WP4OPY": "08",
      "WP4OWV": "08",
+      "WP4PSN": "08",
      "WP4PZB": "08",
      "WP4R": "08",
      "WP4RPD": "08",
@ -53866,6 +53885,7 @@
      "WB4LMK": "08",
      "WB4YQS": "08",
      "WB6LNX": "08",
+      "WB8NCD": "08",
      "WB8TBI": "08",
      "WB8UCD/4FL": "08",
      "WE3B": "08",
@ -53970,6 +53990,7 @@
      "WL7UN": "08",
      "WL7VC": "08",
      "WL7VG": "08",
+      "WL7WC": "08",
      "WL7YX": "08",
      "WO4EM": "08",
      "WP2AFZ": "08",
@ -54146,6 +54167,7 @@
      "WP4OXA": "08",
      "WP4P": "08",
      "WP4PEP": "08",
+      "WP4PGY": "08",
      "WP4PJE": "08",
      "WP4PR": "08",
      "WP4PRA": "08",
@ -54159,6 +54181,7 @@
      "WP4QHU": "08",
      "WP4RRR": "08",
      "WP4TD": "08",
+      "WP4TGK": "08",
      "WP4TX": "08",
      "WP4UC": "08",
      "WP4UFO": "08",
@ -54498,6 +54521,7 @@
      "N3WY": "07",
      "N4CD": "07",
      "N4CD/M": "07",
+      "N4DBX": "07",
      "N4ERC": "07",
      "N4WWT": "07",
      "N5ATC": "07",
@ -54768,7 +54792,6 @@
      "AH0U": "06",
      "AH0U/6": "06",
      "AH0W": "06",
-      "AH2AP": "06",
      "AH2DB": "06",
      "AH2DY": "06",
      "AH6AR": "06",
@ -56222,6 +56245,7 @@
      "N7INQ": "06",
      "N7JIZ": "06",
      "N7JOL": "06",
+      "N7JUX": "06",
      "N7MNI": "06",
      "N7MVL": "06",
      "N7NVX": "06",
@ -57036,6 +57060,7 @@
      "K4W": "08",
      "K4XSS": "08",
      "K6LN": "08",
+      "K7AKR": "08",
      "K7VCG": "08",
      "K8KH": "08",
      "KA3PSY": "08",
@ -57192,6 +57217,7 @@
      "WL7CGU": "08",
      "WL7CQH": "08",
      "WL7CQK": "08",
+      "WL7HB": "08",
      "WL7IP": "08",
      "WL7PC": "08",
      "WL7SF": "08",
@ -57254,6 +57280,7 @@
      "NL7MW": "07",
      "NL7UI": "07",
      "W7CRR": "07",
+      "W7JAL": "07",
      "W7QB": "07",
      "WB7NCN": "07",
      "WB7QWM": "07",
@ -57289,6 +57316,7 @@
      "AB7QC": "04",
      "AC0H": "04",
      "AC0IF": "04",
+      "AH2AP": "04",
      "AH2BY": "04",
      "AH6ES/0": "04",
      "AH6FY": "04",
@ -57462,6 +57490,7 @@
      "KL7JGJ": "04",
      "KL7JIE": "04",
      "KL7JIM": "04",
+      "KL7JKR": "04",
      "KL7JR/0": "04",
      "KL7KRT": "04",
      "KL7MH": "04",
@ -57633,6 +57662,7 @@
      "AA1KS/USI": "05",
      "AB1US": "05",
      "AC1H": "05",
+      "AC1RU": "05",
      "AD1L": "05",
      "AH2EM": "05",
      "AH2V": "05",
@ -58009,7 +58039,6 @@
      "WH6DLD": "05",
      "WH6DNT": "05",
      "WH6EHT": "05",
-      "WH6FAR": "05",
      "WH6FRH": "05",
      "WH6OH": "05",
      "WH6UO": "05",
@ -58055,6 +58084,7 @@
      "WP4OKS": "05",
      "WP4OPY": "05",
      "WP4OWV": "05",
+      "WP4PSN": "05",
      "WP4PZB": "05",
      "WP4R": "05",
      "WP4RPD": "05",
@ -59094,6 +59124,7 @@
      "WB4LMK": "05",
      "WB4YQS": "05",
      "WB6LNX": "05",
+      "WB8NCD": "05",
      "WB8TBI": "05",
      "WB8UCD/4FL": "05",
      "WE3B": "05",
@ -59198,6 +59229,7 @@
      "WL7UN": "05",
      "WL7VC": "05",
      "WL7VG": "05",
+      "WL7WC": "05",
      "WL7YX": "05",
      "WO4EM": "05",
      "WP2AFZ": "05",
@ -59374,6 +59406,7 @@
      "WP4OXA": "05",
      "WP4P": "05",
      "WP4PEP": "05",
+      "WP4PGY": "05",
      "WP4PJE": "05",
      "WP4PR": "05",
      "WP4PRA": "05",
@ -59387,6 +59420,7 @@
      "WP4QHU": "05",
      "WP4RRR": "05",
      "WP4TD": "05",
+      "WP4TGK": "05",
      "WP4TX": "05",
      "WP4UC": "05",
      "WP4UFO": "05",
@ -59726,6 +59760,7 @@
      "N3WY": "04",
      "N4CD": "04",
      "N4CD/M": "04",
+      "N4DBX": "04",
      "N4ERC": "04",
      "N4WWT": "04",
      "N5ATC": "04",
@ -59996,7 +60031,6 @@
      "AH0U": "03",
      "AH0U/6": "03",
      "AH0W": "03",
-      "AH2AP": "03",
      "AH2DB": "03",
      "AH2DY": "03",
      "AH6AR": "03",
@ -61450,6 +61484,7 @@
      "N7INQ": "03",
      "N7JIZ": "03",
      "N7JOL": "03",
+      "N7JUX": "03",
      "N7MNI": "03",
      "N7MVL": "03",
      "N7NVX": "03",
@ -62264,6 +62299,7 @@
      "K4W": "04",
      "K4XSS": "04",
      "K6LN": "04",
+      "K7AKR": "04",
      "K7VCG": "04",
      "K8KH": "04",
      "KA3PSY": "04",
@ -62420,6 +62456,7 @@
      "WL7CGU": "04",
      "WL7CQH": "04",
      "WL7CQK": "04",
+      "WL7HB": "04",
      "WL7IP": "04",
      "WL7PC": "04",
      "WL7SF": "04",
@ -62482,6 +62519,7 @@
      "NL7MW": "04",
      "NL7UI": "04",
      "W7CRR": "04",
+      "W7JAL": "04",
      "W7QB": "04",
      "WB7NCN": "04",
      "WB7QWM": "04",
@ -62917,6 +62955,7 @@
      "GB1HBL",
      "GB1HMM",
      "GB1HNF",
+      "GB1HTC",
      "GB1HTW",
      "GB1JC",
      "GB1KEY",
@ -63092,6 +63131,7 @@
      "GB5AC",
      "GB5ANT",
      "GB5BPL",
+      "GB5CJ",
      "GB5FI",
      "GB5GEO",
      "GB5LAF",
@ -63129,7 +63169,6 @@
      "GB75BB",
      "GB8HI",
      "GB8MD",
-      "GB8MG",
      "GB8ND",
      "GB8OAE",
      "GB8OQE",
@ -63793,7 +63832,6 @@
    ],
    "prefix": [
      "9M",
-      "9M67M",
      "9W"
    ],
    "worked": false,
@ -76227,6 +76265,7 @@
    "worked_modes": {},
    "confirmed_modes": {},
    "direct": [
+      "3D22",
      "3D2AG/P",
      "3D2EU",
      "3D2GC/P",
@ -76241,6 +76280,7 @@
      "3D2RR",
      "3D2RRR",
      "3D2RX",
+      "3D2V",
      "3D2VB/R",
      "3D2Y"
    ],
@ -77806,6 +77846,7 @@
      "FO/JI1WTF",
      "FO/KA7OQQ",
      "FO/N7WLR",
+      "FO/NX1P",
      "FO/OH1RX",
      "FO/ON4AXU",
      "FO/ON4AXU/M",
--- a/package.nw/gt_roster.html
+++ b/package.nw/gt_roster.html
@ -392,8 +392,6 @@
        </div>
        </div>
      </div>
-      <div id="ituzoneBoxDiv" class="infoTabcontent">
-      </div>
      <div id="ignoresBoxDiv" class="infoTabcontent">
        <div class="rowBuilder" >
          Entity&nbsp;
@ -430,7 +428,7 @@
    <div id="MainCallRoster" style="display:block;";>
      <header id="RosterControls">
        <div id="TransmitControls">
-          <div id="txrxdec" style="background-color: Green; border-style: outset; border-color: yellow; border-width: 3px; margin: 2px;" class="roundBorder">
+          <div id="txrxdec" style="background-color: Green; border-style: outset; border-color: yellow;" class="roundBorder">
          Waiting…
          </div>
          <div class="button" style="margin: 3px;" onclick="window.opener.haltAllTx(true);" data-i18n="roster.haltTX">Halt Tx</div>
--- a/package.nw/gt_stats.html
+++ b/package.nw/gt_stats.html
@ -48,28 +48,26 @@
      <div class="infotab">
        <button
          id="qsobox"
+          data-i18n="stats.tabs.logbook"
          class="infoTablinks active"
          onclick="resetSearch(); openInfoTab(event, 'workedBoxDiv', 'showWorkedBox')"
        >
          Logbook
        </button>
-        <button id="stabox" class="infoTablinks" onclick="openInfoTab(event, 'statBoxDiv', 'showStatBox');">
+        <button id="stabox" data-i18n="stats.tabs.scores" class="infoTablinks" onclick="openInfoTab(event, 'statBoxDiv', 'showStatBox');">
          Scores
        </button>
-        <button id="dxcbox" class="infoTablinks" onclick="openInfoTab(event, 'dxccBoxDiv', 'showDXCCsBox')">
+        <button id="dxcbox" data-i18n="stats.tabs.DXCCs" class="infoTablinks" onclick="openInfoTab(event, 'dxccBoxDiv', 'showDXCCsBox')">
          DXCCs
        </button>
-        <button id="cqzbox" class="infoTablinks" onclick="openInfoTab(event, 'cqzoneBoxDiv', 'showCQzoneBox')">
-          CQ Zones
+        <button id="cqzbox" data-i18n="stats.tabs.Zones" class="infoTablinks" onclick="openInfoTab(event, 'zonesBoxDiv', 'showZonesBox')">
+          Zones / WAC
        </button>
-        <button id="itubox" class="infoTablinks" onclick="openInfoTab(event, 'ituzoneBoxDiv', 'showITUzoneBox')">
-          ITU Zones
-        </button>
-        <button id="waswacbox" class="infoTablinks" onclick="openInfoTab(event, 'waswaczoneBoxDiv', 'showWASWACzoneBox')">
-          WAC / WAS / WACP / US48
+        <button id="waswacbox" data-i18n="stats.tabs.WAS"  class="infoTablinks" onclick="openInfoTab(event, 'wasPlusBoxDiv', 'showWASPlusBox')">
+          WAS / WACP / US48
        </button>
        <button id="wpxbox" class="infoTablinks" onclick="openInfoTab(event, 'wpxBoxDiv', 'showWPXBox')">WPX</button>
-        <button id="calbox" class="infoTablinks" onclick="openInfoTab(event, 'callsignBoxDiv', 'showCallsignBox')">
+        <button id="calbox" data-i18n="stats.tabs.live"  class="infoTablinks" onclick="openInfoTab(event, 'callsignBoxDiv', 'showCallsignBox')">
          Live
        </button>
        <button id="ldrbox" class="infoTablinks" onclick="openInfoTab(event, 'decodeLastDiv', null)">Decodes</button>
@ -80,14 +78,11 @@
      <div id="dxccBoxDiv" class="infoTabcontent">
        <div id="dxccListDiv" style="margin: 2px; padding: 2px; bottom: 5px"></div>
      </div>
-      <div id="cqzoneBoxDiv" class="infoTabcontent">
-        <div id="cqzoneListDiv" style="margin: 2px; padding: 2px"></div>
+      <div id="zonesBoxDiv" class="infoTabcontent">
+        <div id="zonesListDiv" style="margin: 2px; padding: 2px"></div>
      </div>
-      <div id="ituzoneBoxDiv" class="infoTabcontent">
-        <div id="ituzoneListDiv" style="margin: 2px; padding: 2px"></div>
-      </div>
-      <div id="waswaczoneBoxDiv" class="infoTabcontent">
-        <div id="waswacListDiv" style="margin: 2px; padding: 2px"></div>
+      <div id="wasPlusBoxDiv" class="infoTabcontent">
+        <div id="wasPlusListDiv" style="margin: 2px; padding: 2px"></div>
      </div>
      <div id="wpxBoxDiv" class="infoTabcontent">
        <div id="wpxListDiv" style="margin: 2px; padding: 2px"></div>
--- a/package.nw/gt_update.odt
+++ b/package.nw/gt_update.odt
--- a/package.nw/gt_update.pdf
+++ b/package.nw/gt_update.pdf
--- a/package.nw/i18n/cn-dxcc.json
+++ b/package.nw/i18n/cn-dxcc.json
@ -121,7 +121,7 @@
  "149": "亚速尔群岛",
  "150": "澳大利亚",
  "151": "马里-维索茨克岛",
-  "152": "澳门",
+  "152": "中国澳门",
  "153": "麦格理岛",
  "157": "瑙鲁",
  "158": "瓦努阿图",
@ -194,7 +194,7 @@
  "242": "冰岛",
  "245": "爱尔兰",
  "246": "马耳他骑士团",
-  "247": "南沙群岛",
+  "247": "中国南沙群岛",
  "248": "意大利",
  "249": "圣基茨和尼维斯",
  "250": "圣赫勒拿岛",
@ -250,7 +250,7 @@
  "312": "柬埔寨",
  "315": "斯里兰卡",
  "318": "中国",
-  "321": "香港",
+  "321": "中国香港",
  "324": "印度",
  "327": "印度尼西亚",
  "330": "伊朗",
@ -273,7 +273,7 @@
  "381": "新加坡",
  "382": "吉布提",
  "384": "叙利亚",
-  "386": "台湾",
+  "386": "中国台湾",
  "387": "泰国",
  "390": "土耳其",
  "391": "阿拉伯联合酋长国",
@ -328,8 +328,8 @@
  "502": "北马其顿",
  "503": "捷克",
  "504": "斯洛伐克",
-  "505": "东沙群岛",
-  "506": "黄岩岛",
+  "505": "中国东沙群岛",
+  "506": "中国黄岩岛",
  "507": "泰莫图省",
  "508": "南方群岛",
  "509": "马克萨斯岛",
--- a/package.nw/i18n/cn-t.json
+++ b/package.nw/i18n/cn-t.json
@ -199,6 +199,7 @@
    "settings.general.Distance.dg": "度",
    "settings.general.DecodeWaterfall.label": "右下角信息欄",
    "settings.general.CheckNewVersion.label": "檢查新版本",
+    "settings.general.ResetButtonPanel.label": "重置按鈕面板",
    "settings.general.Language.label": "語言（重新啟動）",
    "settings.general.ClearAllSettings.label": "清除所有設定！",
    "settings.general.ClearSettingSure.label": "是的,我肯定！",
@ -596,9 +597,8 @@
    "stats.tabs.logbook": "日誌",
    "stats.tabs.scores": "分數",
    "stats.tabs.DXCCs": "DXCCs",
-    "stats.tabs.CQZones": "CQ分區",
-    "stats.tabs.ITUZones": "ITU分區",
-    "stats.tabs.WASWAC": "洲大陸/美國州/加拿大省",
+    "stats.tabs.Zones": "分區/洲大陸",
+    "stats.tabs.WAS": "美國州/加拿大省/美國大陸網格",
    "stats.tabs.live": "在線",
    "stats.noDecodes": "還沒有解碼",
    "stats.viewing": "檢視",
--- a/package.nw/i18n/cn.json
+++ b/package.nw/i18n/cn.json
@ -199,6 +199,7 @@
    "settings.general.Distance.dg": "度",
    "settings.general.DecodeWaterfall.label": "右下角信息栏",
    "settings.general.CheckNewVersion.label": "检查新版本",
+    "settings.general.ResetButtonPanel.label": "重置按钮面板",
    "settings.general.Language.label": "语言（重新启动）",
    "settings.general.ClearAllSettings.label": "清除所有设置！",
    "settings.general.ClearSettingSure.label": "是的,我肯定！",
@ -596,9 +597,8 @@
    "stats.tabs.logbook": "日志",
    "stats.tabs.scores": "分数",
    "stats.tabs.DXCCs": "DXCCs",
-    "stats.tabs.CQZones": "CQ分区",
-    "stats.tabs.ITUZones": "ITU分区",
-    "stats.tabs.WASWAC": "洲大陆/美国州/加拿大省",
+    "stats.tabs.Zones": "區域/洲大陆",
+    "stats.tabs.WAS": "美国州/加拿大省/美国大陆网格",
    "stats.tabs.live": "实时",
    "stats.noDecodes": "还没有解码",
    "stats.viewing": "检视",
--- a/package.nw/i18n/cnt-dxcc.json
+++ b/package.nw/i18n/cnt-dxcc.json
@ -194,7 +194,7 @@
  "242": "冰島",
  "245": "愛爾蘭",
  "246": "馬耳他騎士團",
-  "247": "南沙群島",
+  "247": "中國南沙群島",
  "248": "意大利",
  "249": "聖基茨和尼維斯",
  "250": "聖赫勒拿島",
@ -250,7 +250,7 @@
  "312": "柬埔寨",
  "315": "斯里蘭卡",
  "318": "中國",
-  "321": "香港",
+  "321": "中國香港",
  "324": "印度",
  "327": "印度尼西亞",
  "330": "伊朗",
@ -273,7 +273,7 @@
  "381": "新加坡",
  "382": "吉布提",
  "384": "敘利亞",
-  "386": "台灣",
+  "386": "中國台灣",
  "387": "泰國",
  "390": "土耳其",
  "391": "阿拉伯聯合酋長國",
@ -328,8 +328,8 @@
  "502": "北馬其頓",
  "503": "捷克",
  "504": "斯洛伐克",
-  "505": "東沙群島",
-  "506": "黃岩島",
+  "505": "中國東沙群島",
+  "506": "中國黃岩島",
  "507": "泰莫圖省",
  "508": "南方群島",
  "509": "馬克薩斯島",
--- a/package.nw/i18n/de.json
+++ b/package.nw/i18n/de.json
@ -199,6 +199,7 @@
    "settings.general.Distance.dg": "Grad",
    "settings.general.DecodeWaterfall.label": "Wasserfallnachrichten decodieren",
    "settings.general.CheckNewVersion.label": "Nach Updates suchen",
+    "settings.general.ResetButtonPanel.label": "Reset-Tasten",
    "settings.general.Language.label": "Sprache (Neustart erforderlich)",
    "settings.general.ClearAllSettings.label": "Einstellungen zurücksetzen!",
    "settings.general.ClearSettingSure.label": "Ja, ich bin sicher!",
@ -601,9 +602,8 @@
    "stats.tabs.logbook": "Logbücher",
    "stats.tabs.scores": "Ergebnisse",
    "stats.tabs.DXCCs": "DXCCs",
-    "stats.tabs.CQZones": "CQ-Zonen",
-    "stats.tabs.ITUZones": "ITU-Zonen",
-    "stats.tabs.WASWAC": "WAC / WAS / WACP",
+    "stats.tabs.Zones": "Zonen / WAC",
+    "stats.tabs.WAS": "WAS / WACP / US48",
    "stats.tabs.live": "Live",
    "stats.noDecodes": "Noch keine Nachrichten",
    "stats.viewing": "Ansicht",
--- a/package.nw/i18n/en.json
+++ b/package.nw/i18n/en.json
@ -198,6 +198,7 @@
    "settings.general.Distance.dg": "Degrees",
    "settings.general.DecodeWaterfall.label": "Decode Traffic Waterfall",
    "settings.general.CheckNewVersion.label": "Check for new version",
+    "settings.general.ResetButtonPanel.label": "Reset Button Panel",
    "settings.general.Language.label": "Language (requires restart)",
    "settings.general.ClearAllSettings.label": "Clear All Settings!",
    "settings.general.ClearSettingSure.label": "Yes, I'm sure!",
@ -595,9 +596,8 @@
    "stats.tabs.logbook": "Logbook",
    "stats.tabs.scores": "Scores",
    "stats.tabs.DXCCs": "DXCCs",
-    "stats.tabs.CQZones": "CQ Zones",
-    "stats.tabs.ITUZones": "ITU Zones",
-    "stats.tabs.WASWAC": "WAC / WAS / WACP",
+    "stats.tabs.Zones": "Zones / WAC",
+    "stats.tabs.WAS": "WAS / WACP / US48",
    "stats.tabs.live": "Live",
    "stats.noDecodes": "No decodes yet",
    "stats.viewing": "Viewing",
--- a/package.nw/i18n/es.json
+++ b/package.nw/i18n/es.json
@ -199,6 +199,7 @@
  "settings.general.Distance.dg": "Grados",
  "settings.general.DecodeWaterfall.label": "Decodificar tráfico en la cascada",
  "settings.general.CheckNewVersion.label": "Buscar nueva versión",
+  "settings.general.ResetButtonPanel.label": "Panel de botones de reinicio",
  "settings.general.Language.label": "Idioma (requiere reinicio)",
  "settings.general.ClearAllSettings.label": "¡Borrar todas las configuraciones!",
  "settings.general.ClearSettingSure.label": "¡Sí, estoy seguro!",
@ -596,9 +597,8 @@
  "stats.tabs.logbook": "Libro de Guardia",
  "stats.tabs.scores": "Puntuaciones",
  "stats.tabs.DXCCs": "DXCCs",
-  "stats.tabs.CQZones": "Zonas CQ",
-  "stats.tabs.ITUZones": "Zonas ITU",
-  "stats.tabs.WASWAC": "WAC / WAS / WACP",
+  "stats.tabs.Zones": "Zonas / WAC",
+  "stats.tabs.WAS": "WAS / WACP / US48",
  "stats.tabs.live": "En Vivo",
  "stats.noDecodes": "Sin decodificaciones",
  "stats.viewing": "Viendo",
--- a/package.nw/i18n/fr.json
+++ b/package.nw/i18n/fr.json
@ -198,6 +198,7 @@
    "settings.general.Distance.dg": "Degrés",
    "settings.general.DecodeWaterfall.label": "Décoder les chutes du trafic",
    "settings.general.CheckNewVersion.label": "Vérifier la présence d'une nouvelle version",
+    "settings.general.ResetButtonPanel.label": "Panneau de boutons de réinitialisation",
    "settings.general.Language.label": "Langue (nécessite un redémarrage)",
    "settings.general.ClearAllSettings.label": "Effacer tous les paramètres !",
    "settings.general.ClearSettingSure.label": "Oui, j'en suis sûr !",
@ -595,9 +596,8 @@
    "stats.tabs.logbook": "Journal de bord",
    "stats.tabs.scores": "Scores",
    "stats.tabs.DXCCs": "DXCCs",
-    "stats.tabs.CQZones": "CQ Zones",
-    "stats.tabs.ITUZones": "ITU Zones",
-    "stats.tabs.WASWAC": "WAC / WAS / WACP",
+    "stats.tabs.Zones": "Zones / WAC",
+    "stats.tabs.WAS": "WAS / WACP / US48",
    "stats.tabs.live": "Live",
    "stats.noDecodes": "Aucun décodage pour l'instant",
    "stats.viewing": "Visualisation",
--- a/package.nw/i18n/it.json
+++ b/package.nw/i18n/it.json
@ -56,10 +56,10 @@
    "quickLoad.clearLive.hover": "Eliminare i dati live da GridTracker",
    "quickLoad.clearLive.label": "Cancella Live",
    "quickLoad.clearLog.hover": "Cancellare o ricaricare i dati di registro (non cancella i file)",
-    "quickLoad.clearLog.label": "Cancellare il Log",
+    "quickLoad.clearLog.label": "Cancella Log",
    "quickLoad.loadLog.label": "Caricare il Log",
    "mapFilter.title.hover": "Pannello di controllo del display della mappa",
-    "mapFilter.title.label": "Filtri di visualizzazione della mappa",
+    "mapFilter.title.label": "Visualizza Filtri",
    "mapFilter.band.hover": "Selezionare la banda (tracce automatiche WSJT-X)",
    "mapFilter.band.label": "Banda",
    "mapFilter.band.Auto": "Auto",
@ -198,6 +198,7 @@
    "settings.general.Distance.dg": "Gradi",
    "settings.general.DecodeWaterfall.label": "Decodificare il flusso del traffico",
    "settings.general.CheckNewVersion.label": "Verificare la presenza di una nuova versione",
+    "settings.general.ResetButtonPanel.label": "Pannello dei pulsanti di reset",
    "settings.general.Language.label": "Lingua (richiede il riavvio)",
    "settings.general.ClearAllSettings.label": "Cancellare tutte le impostazioni!",
    "settings.general.ClearSettingSure.label": "Sì, ne sono certo!",
@ -595,9 +596,8 @@
    "stats.tabs.logbook": "Diario di bordo",
    "stats.tabs.scores": "Punteggi",
    "stats.tabs.DXCCs": "DXCCs",
-    "stats.tabs.CQZones": "CQ Zone",
-    "stats.tabs.ITUZones": "ITU Zone",
-    "stats.tabs.WASWAC": "WAC / WAS / WACP",
+    "stats.tabs.Zones": "Zones / WAC",
+    "stats.tabs.WAS": "WAS / WACP / US48",
    "stats.tabs.live": "Live",
    "stats.noDecodes": "Nessuna decodifica per il momento",
    "stats.viewing": "Visualizzazione",
@ -774,8 +774,8 @@
    "gt.gridTable.Azim": "Azimut",
    "gt.gridTable.Lat": "Lat",
    "gt.gridTable.Long": "Long",
-    "gt.UpdateCount.ClearLog": "Cancellare il Log",
-    "gt.UpdateCount.LoadLog": "Caricamento dei Logs",
+    "gt.UpdateCount.ClearLog": "Cancella Log",
+    "gt.UpdateCount.LoadLog": "Carico Logs",
    "gt.CurrentBandMode.Band": "Bande miste",
    "gt.CurrentBandMode.Mode": "Modi misti",
    "gt.currentTime.never": "Mai",
--- a/package.nw/img/auf_bar.png
+++ b/package.nw/img/auf_bar.png
--- a/package.nw/lib/adif.js
+++ b/package.nw/lib/adif.js
@ -3159,6 +3159,6 @@ function parsePSKadif(adiBuffer)
      }
    }
  }
-  redrawLiveGrids();
+  redrawLiveGrids(false);
  updateCountStats();
 }
--- a/package.nw/lib/callsigns.js
+++ b/package.nw/lib/callsigns.js
@ -931,7 +931,7 @@ function processCtyDat(buffer)
    var file = "./data/mh-root-prefixed.json";
    if (fs.existsSync(file))
    {
-      var dxccInfo = require(file);
+      var dxccInfo = JSON.parse(fs.readFileSync(file, "UTF-8"));
      for (const key in dxccInfo)
      {
        dxccInfo[key].ituzone = null;
--- a/package.nw/lib/defaults.js
+++ b/package.nw/lib/defaults.js
@ -103,7 +103,8 @@ var def_appSettings = {
  workingDate: 0,
  qsoItemsPerPage: 100,
  qslAuthority: "L",
-  collapsedMapViewFilters: false
+  collapsedMapViewFilters: false,
+  buttonPanelOrder: []
 };

 var def_mapSettings = {
@ -142,7 +143,8 @@ var def_mapSettings = {
  showAllGrids: false,
  trophyOverlay: 0,
  zoom: 4,
-  mapTrans: 0.5
+  mapTrans: 0.5,
+  apiKeys: {}
 };

 var def_adifLogSettings = {
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
--- a/package.nw/lib/gtws.js
+++ b/package.nw/lib/gtws.js
@ -10,7 +10,8 @@ GT.chatRecvFunctions = {
  drop: gtChatRemoveCall,
  mesg: gtChatMessage,
  o: gtSpotMessage,
-  ba: bandActivityReply
+  ba: bandActivityReply,
+  Kp: kpIndexMessage
 };

 var ChatState = Object();
@ -312,6 +313,11 @@ function bandActivityReply(jsmesg)
  renderBandActivity();
 }

+function kpIndexMessage(jsmesg)
+{
+  handleKpIndexJSON(jsmesg.i);
+}
+
 function gtChatRemoveCall(jsmesg)
 {
  var id = jsmesg.id;
@ -730,7 +736,7 @@ function gtChatSendUUID()
  }

  msg.call = GT.appSettings.myCall;
-  msg.ver = gtShortVersion;
+  msg.ver = "v" + gtVersionStr;

  sendGtJson(JSON.stringify(msg), true);
  GT.gtState = ChatState.waitUUID;
--- a/package.nw/lib/ol.js
+++ b/package.nw/lib/ol.js
--- a/package.nw/lib/roster.js
+++ b/package.nw/lib/roster.js
@ -300,6 +300,16 @@ function loadSettings()

  fixLegacySettings();

+  // Fix because I allowed \ to be input as a key name char. -Tag
+  for (let key in CR.rosterSettings.watchers)
+  {
+    let test = key.replace(/\\/g, "");
+    if (test.length != key.length)
+    {
+      delete CR.rosterSettings.watchers[key];
+    }
+  }
+
  writeRosterSettings();

  // Code reducer
@ -3814,7 +3824,7 @@ function ValidateTextInput(inputText, validDiv = null)

 function watcherOnName()
 {
-  watcherName.value = watcherName.value.replace(/[$%.'",<>]/g, "");
+  watcherName.value = watcherName.value.replace(/[$%.'"\\,<>]/g, "");
  watcherNameValidate();
 }

--- a/package.nw/lib/stats.js
+++ b/package.nw/lib/stats.js
@ -171,17 +171,13 @@ function Resize()
  {
    window.opener.showDXCCsBox();
  }
-  if (cqzoneBoxDiv.style.display == "block")
+  if (zonesBoxDiv.style.display == "block")
  {
-    window.opener.showCQzoneBox();
+    window.opener.showZonesBox();
  }
-  if (ituzoneBoxDiv.style.display == "block")
+  if (wasPlusBoxDiv.style.display == "block")
  {
-    window.opener.showITUzoneBox();
-  }
-  if (waswaczoneBoxDiv.style.display == "block")
-  {
-    window.opener.showWASWACzoneBox();
+    window.opener.showWASPlusBox();
  }
  if (wpxBoxDiv.style.display == "block")
  {
@ -216,16 +212,13 @@ function reloadInfo(bandOrMode)
    window.opener.showWPXBox();
  }

-  if (cqzoneBoxDiv.style.display == "block")
+  if (zonesBoxDiv.style.display == "block")
  {
-    window.opener.showCQzoneBox();
+    window.opener.showZonesBox();
  }
-  if (ituzoneBoxDiv.style.display == "block")
+
+  if (wasPlusBoxDiv.style.display == "block")
  {
-    window.opener.showITUzoneBox();
-  }
-  if (waswaczoneBoxDiv.style.display == "block")
-  {
-    window.opener.showWASWACzoneBox();
+    window.opener.showWASPlusBox();
  }
 }
--- a/package.nw/lib/style.css
+++ b/package.nw/lib/style.css
@ -403,28 +403,50 @@ button:focus {
  -webkit-transition: border;
 }

-.iconButton {
-  -webkit-border-radius: 4px;
+.iconButton, .iconButtonMoving {
+  border-radius: 4px;
  cursor: pointer;
-  margin: 0px;
-  margin-top: 1px;
+  margin: 1px;
  padding: 1px;
  padding-top: 4px;
-
+  padding-bottom: 2px;
  border-width: 1px;
  border-color: #999;
  border-style: outset;
+  display: inline-grid;
+  transition: border-style;
+}

-  display: inline-block;
+.iconButtonMoving {
+  border-color: cyan;
+  border-style: dashed;
+  margin:0px;
+  border-width: 2px;
+  animation: borderDash 500ms ease infinite;
+  cursor: grab;
+}

-  -webkit-transition: border-style;
+@keyframes borderDash {
+  0% {
+    border-color: cyan;
+  }
+  50% {
+    border-color: rgb(187, 187, 0);
+  }
+  100% {
+    border-color: cyan;
+  }
 }

 .iconButton:active {
+  margin:0px;
+  border-width: 2px;
  border-style: inset;
 }

 .iconButton:hover {
+  margin:0px;
+  border-width: 2px;
  border-color: #fff;
 }

@ -581,10 +603,10 @@ select {
  text-overflow: "";
  min-width: 30px;
  padding: 2px;
-  padding-right: 3px;
  background-color: darkgreen;
  color: #ff0;
  cursor: pointer;
+  font-size: 12px;
 }

 select:focus {
@ -649,7 +671,6 @@ a {
 /* Create an active/current tablink class */
 .settingstab button.active {
  background-color: blue;
-
  color: yellow;
 }

@ -663,7 +684,6 @@ a {
  text-align: center;
  width: auto;
  border: 1px solid blue;
-
  vertical-align: top;
  -webkit-border-radius: 6px;
  white-space: normal;
--- a/package.nw/lib/style_roster.css
+++ b/package.nw/lib/style_roster.css
@ -404,6 +404,8 @@ input.slider {
 #txrxdec {
  padding-left: 5px;
  padding-right: 5px;
+  margin: 3px;
+  border-width: 2px;
  width: 68px;
 }

--- a/package.nw/package.json
+++ b/package.nw/package.json
@ -1,7 +1,7 @@
 {
  "name": "GridTracker",
  "product_string_do_not_use": "gridtracker",
-  "version": "1.24.0908",
+  "version": "1.24.0920",
  "betaVersion": "",
  "description": "GridTracker: An Amateur Radio Companion",
  "author": "GridTracker.org",
@ -23,7 +23,7 @@
    "start": "run --mirror https://dl.nwjs.io/ ."
  },
  "build": {
-    "nwVersion": "0.68.1",
+    "nwVersion": "0.78.1",
    "output": "../dist/.",
    "targets": [
      "zip",
@ -34,7 +34,9 @@
      "copyright": "Copyright (c) 2024 GridTracker.org",
      "plistStrings": {
        "CFBundleIdentifier": "org.gridtracker.gridtracker",
-        "CFBundleDocumentTypes": []
+        "CFBundleDocumentTypes": [],
+        "NSLocalNetworkUsageDescription": "GridTracker needs access to the local network to talk to WSJT-X",
+        "NSDocumentsFolderUsageDescription" : "GridTracker needs access to your documents folder to store logs"
      }
    },
    "win": {
@ -48,6 +50,5 @@
      "MUI_FINISHPAGE_RUN": ""
    }
  },
-  "dependencies": {
-  }
+  "dependencies": {}
 }