diff --git a/package.nw/GridTracker.html b/package.nw/GridTracker.html
index 4ee5d4f2..5951affc 100644
--- a/package.nw/GridTracker.html
+++ b/package.nw/GridTracker.html
@@ -1167,7 +1167,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 <div class="mapItem">
                   <table align="center">
                     <tr>
-                      <td data-i18n="settings.UDP.Messages.label"><b>Receive UDP Messages</b></td>
+                      <td data-i18n="settings.general.UDP.Messages.label"><b>Receive UDP Messages</b></td>
                     </tr>
                     <tr>
                       <td id="lastMsgTimeDiv">No messages yet.</td>
@@ -1176,8 +1176,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                       <td id="secondsAgoMsg" class="roundBorderValue">Never</td>
                     </tr>
                     <tr>
-                      <td data-i18n="settings.UDP.Multicast.label">
-                        Multicast?
+                      <td>
+                        <label data-i18n="settings.general.UDP.Multicast.label" for="multicastEnable">Multicast?</label>
                         <input
                           title="Enable / Disable Local Network Multicast"
                           type="checkbox"
@@ -1187,8 +1187,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                       </td>
                     </tr>
                     <tr>
-                      <td data-i18n="settings.UDP.IP.label" id="multicastTD" style="display: none">
-                        IP
+                      <td id="multicastTD" style="display: none">
+                        <label data-i18n="settings.general.UDP.IP.label" for="multicastIpInput">IP</label>
                         <input
                           id="multicastIpInput"
                           type="text"
@@ -1201,8 +1201,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                       </td>
                     </tr>
                     <tr>
-                      <td data-i18n="settings.UDP.Port.label">
-                        Port
+                      <td>
+                        <label data-i18n="settings.UDP.Port.label" for="udpPortInput">Port</label>
                         <input
                           id="udpPortInput"
                           type="text"
@@ -1227,8 +1227,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                       <td data-i18n="settings.general.Fwd.Messages.label2"><i>e.g. GridTracker on another host</i></td>
                     </tr>
                     <tr>
-                      <td data-i18n="settings.general.Fwd.IP.label">
-                        IP
+                      <td>
+                        <label data-i18n="settings.general.Fwd.IP.label" for="udpForwardIpInput">IP</label>
                         <input
                           id="udpForwardIpInput"
                           type="text"
@@ -1241,8 +1241,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                       </td>
                     </tr>
                     <tr>
-                      <td data-i18n="settings.general.Fwd.Port.label">
-                        Port
+                      <td>
+                        <label data-i18n="settings.general.Fwd.Port.label" for="udpForwardPortInput">Port</label>
                         <input
                           id="udpForwardPortInput"
                           type="text"
@@ -1255,8 +1255,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                       </td>
                     </tr>
                     <tr>
-                      <td data-i18n="settings.general.Fwd.Enabled.label">
-                        Enabled?<input
+                      <td>
+                        <label data-i18n="settings.general.Fwd.Enabled.label" for="setUdpForwardEnable">Enabled?</label>
+                        <input
                           title="Enable / Disable UDP Message forwarding"
                           type="checkbox"
                           id="udpForwardEnable"
@@ -1358,8 +1359,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                       </td>
                     </tr>
                     <tr>
-                      <td data-i18n="settings.general.ClearSetttingsSure.label">
-                        Yes, I'm sure!<input
+                      <td>
+                        <label data-i18n="settings.general.ClearSetttingsSure.label" for="imSureCheck">Yes, I'm sure!</label>
+                        <input
                           type="checkbox"
                           id="imSureCheck"
                           title="Must be checked to enable clearing of settings"
@@ -1500,7 +1502,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 <th data-i18n="settings.lookup.Count.header">Count</th>
               </tr>
               <tr>
-                <td>United States ULS</td>
+                <td data-i18n="settings.lookup.db.ULS">United States ULS</td>
                 <td>
                   <input type="checkbox" id="ulsUseEnable" onclick="ulsValuesChanged();" />
                 </td>
@@ -1508,7 +1510,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 <td id="ulsCountTd">0</td>
               </tr>
               <tr>
-                <td>Logbook of The World</td>
+                <td data-i18n="settings.lookup.db.LoTW">Logbook of The World</td>
                 <td>
                   <input type="checkbox" id="lotwUseEnable" onclick="lotwValuesChanged();" />
                 </td>
@@ -1516,7 +1518,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 <td id="lotwCountTd">0</td>
               </tr>
               <tr>
-                <td>eQSL</td>
+                <td data-i18n="settings.lookup.db.eQSL">eQSL</td>
                 <td>
                   <input type="checkbox" id="eqslUseEnable" onclick="eqslValuesChanged();" />
                 </td>
@@ -1524,7 +1526,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 <td id="eqslCountTd">0</td>
               </tr>
               <tr>
-                <td>ClubLog OQRS</td>
+                <td data-i18n="settings.lookup.db.OQRS">ClubLog OQRS</td>
                 <td>
                   <input type="checkbox" id="oqrsUseEnable" onclick="oqrsValuesChanged();" />
                 </td>
@@ -1539,7 +1541,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <div class="mapItem">
               <table align="center">
                 <tr align="center">
-                  <td align="center">Text-to-speech Voice</td>
+                  <td data-i18n="settings.audio.TextToSpeech.label" align="center">Text-to-speech Voice</td>
                 </tr>
                 <tr align="center">
                   <td colspan="1">
@@ -1552,7 +1554,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <div class="mapItem">
               <table align="center">
                 <tr align="center">
-                  <td align="center">Speech Rate</td>
+                  <td data-i18n="settings.audio.Speech.Rate.label" align="center">Speech Rate</td>
                   <td align="center" id="speechRateTd">1</td>
                 </tr>
                 <tr align="center">
@@ -1574,7 +1576,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <div class="mapItem">
               <table align="center">
                 <tr>
-                  <td align="center">Speech Pitch</td>
+                  <td data-i18n="settings.audio.Speech.Pitch.label" align="center">Speech Pitch</td>
                   <td align="center" id="speechPitchTd">1</td>
                 </tr>
                 <tr align="center">
@@ -1596,7 +1598,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <div class="mapItem">
               <table align="center">
                 <tr>
-                  <td align="center">Speech Volume</td>
+                  <td data-i18n="settings.audio.Speech.Volume.label" align="center">Speech Volume</td>
                   <td align="center" id="speechVolumeTd">1</td>
                 </tr>
                 <tr align="center">
@@ -1618,7 +1620,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <div class="mapItem">
               <table align="center">
                 <tr>
-                  <td title="Speak Callsigns and Gridsquares phonetically">Phonetics</td>
+                  <td data-i18n="settings.audio.Speech.Phonetics.label" title="Speak Callsigns and Gridsquares phonetically">Phonetics</td>
                 </tr>
                 <tr>
                   <td title="Speak Callsigns and Gridsquares phonetically">