diff --git a/src/about.html b/src/about.html
index 178242d..075c171 100644
--- a/src/about.html
+++ b/src/about.html
@@ -13,7 +13,7 @@
 <div>
     <span data-i18n="aboutChangelog"></span><br>
     <span id="aboutStorageUsed"></span><br>
-    <span data-i18n="aboutDoc"></span><br>
+    <a href="https://github.com/gorhill/uMatrix/wiki"><span data-i18n="aboutDoc"></span></a><br>
     <span data-i18n="aboutPermissions"></span><br>
     <span data-i18n="aboutCode"></span><br>
     <span data-i18n="aboutCredits"></span><br>
diff --git a/src/privacy.html b/src/privacy.html
index 0607325..3bf73bc 100644
--- a/src/privacy.html
+++ b/src/privacy.html
@@ -40,11 +40,11 @@ ul > li {
 
 <ul>
     <li>
-        <input id="delete-blacklisted-cookies" type="checkbox"><span data-i18n="privacyDeleteBlockedCookiesPrompt"></span>
+        <input id="delete-blacklisted-cookies" type="checkbox"><label data-i18n="privacyDeleteBlockedCookiesPrompt" for="delete-blacklisted-cookies"></label>
         <button class="whatisthis"></button>
         <div class="whatisthis-expandable para" data-i18n="privacyDeleteBlockedCookiesHelp"></div>
     <li>
-        <input id="delete-unused-session-cookies" type="checkbox"><span data-i18n="privacyDeleteNonBlockedSessionCookiesPrompt1"></span>
+        <input id="delete-unused-session-cookies" type="checkbox"><label data-i18n="privacyDeleteNonBlockedSessionCookiesPrompt1" for="delete-unused-session-cookies"></label>
         <input id="delete-unused-session-cookies-after" type="text" value="60" size="3"><span data-i18n="privacyDeleteNonBlockedSessionCookiesPrompt2"></span>
         <button class="whatisthis"></button>
         <div class="whatisthis-expandable para" data-i18n="privacyDeleteNonBlockedSessionCookiesHelp"></div>
@@ -67,23 +67,23 @@ ul > li {
         of these cookies so that they cannot be used to track you.
     -->
     <li>
-        <input id="delete-blacklisted-localstorage" type="checkbox"><span data-i18n="privacyDeleteBlockedLocalStoragePrompt"></span>
+        <input id="delete-blacklisted-localstorage" type="checkbox"><label data-i18n="privacyDeleteBlockedLocalStoragePrompt" for="delete-blacklisted-localstorage"></label>
     <li>
-        <input id="clear-browser-cache" type="checkbox"><span data-i18n="privacyClearCachePrompt1"></span> 
-        <input id="clear-browser-cache-after" type="text" value="60" size="3"> <span data-i18n="privacyClearCachePrompt2"></span>
+        <input id="clear-browser-cache" type="checkbox"><label data-i18n="privacyClearCachePrompt1" for="clear-browser-cache"></label> 
+        <input id="clear-browser-cache-after" type="text" value="60" size="3"> <label data-i18n="privacyClearCachePrompt2" for="clear-browser-cache-after"></label>
         <button class="whatisthis"></button>
         <div class="whatisthis-expandable para" data-i18n="privacyClearCacheHelp"></div>
     <li>
-        <input id="process-referer" type="checkbox"><span data-i18n="privacyProcessRefererPrompt"></span>
+        <input id="process-referer" type="checkbox"><label data-i18n="privacyProcessRefererPrompt" for="process-referer"></label>
         <button class="whatisthis"></button>
         <div class="whatisthis-expandable para" data-i18n="privacyProcessRefererHelp"></div>
     <li>
-        <input id="process-hyperlink-auditing" type="checkbox"><span data-i18n="privacyProcessHyperlinkAuditingPrompt"></span>
+        <input id="process-hyperlink-auditing" type="checkbox"><label data-i18n="privacyProcessHyperlinkAuditingPrompt" for="process-hyperlink-auditing"></label>
         <button class="whatisthis"></button>
         <div class="whatisthis-expandable para" data-i18n="privacyProcessHyperlinkAuditingHelp"></div>
     <li>&nbsp;
     <li>
-        <input id="spoof-user-agent" type="checkbox"><span data-i18n="privacySpoofUserAgentPrompt1"></span> <input id="spoof-user-agent-every" type="text" value="5" size="3"> <span data-i18n="privacySpoofUserAgentPrompt2"></span>
+        <input id="spoof-user-agent" type="checkbox"><label data-i18n="privacySpoofUserAgentPrompt1" for="spoof-user-agent"></label> <input id="spoof-user-agent-every" type="text" value="5" size="3"> <span data-i18n="privacySpoofUserAgentPrompt2"></span>
         <button class="whatisthis"></button>
         <div class="whatisthis-expandable para" data-i18n="privacySpoofUserAgentHelp"></div>
         <textarea id="spoof-user-agent-with"></textarea>
diff --git a/src/settings.html b/src/settings.html
index 46bcd95..e87585e 100644
--- a/src/settings.html
+++ b/src/settings.html
@@ -44,8 +44,10 @@ ul > li {
 
 <h2 data-i18n="settingsMatrixDisplayHeader"></h2>
 <ul style="list-style:none">
-    <li><span data-i18n="settingsMatrixDisplayTextSizePrompt"></span>&ensp;<input type="radio" name="displayTextSize" value="13px"><span data-i18n="settingsMatrixDisplayTextSizeNormal"></span>&ensp;<input type="radio" name="displayTextSize" value="16px"><span data-i18n="settingsMatrixDisplayTextSizeLarge"></span>
-    <li style="margin-top:0.5em;"><input id="colorBlindFriendly" type="checkbox" data-range="bool"><span data-i18n="settingsMatrixDisplayColorBlind"></span>
+    <li style="margin-top:0.5em;"><input id="colorBlindFriendly" type="checkbox" data-range="bool"><label data-i18n="settingsMatrixDisplayColorBlind" for="colorBlindFriendly"></label>
+    <li style="margin-top:0.5em;"><span data-i18n="settingsMatrixDisplayTextSizePrompt"></span>
+    <input type="radio" name="displayTextSize" id="displayTextSizeNormal" value="13px"><label data-i18n="settingsMatrixDisplayTextSizeNormal" for="displayTextSizeNormal"></label>
+    <input type="radio" name="displayTextSize" id="displayTextSizeLarge" value="16px"><label data-i18n="settingsMatrixDisplayTextSizeLarge" for="displayTextSizeLarge"></label>
     <li style="margin-top:0.5em;">
         <span data-i18n="settingsSubframeColor"></span> <input id="subframe-color" type="color" value="#c00">
         &ensp;<span data-i18n="settingsSubframeOpacity"></span> <input id="subframe-opacity" type="range" min="0" max="100" value="100">
diff --git a/tools/_locales/de/messages.json b/tools/_locales/de/messages.json
index 99c2fa7..b80c177 100644
--- a/tools/_locales/de/messages.json
+++ b/tools/_locales/de/messages.json
@@ -464,8 +464,8 @@
         "description": "English: Storage used: {{storageUsed}}%"
     },
     "aboutDoc" : {
-        "message": "<a href='https://github.com/gorhill/httpswitchboard/wiki'>Dokumentation/Wiki</a>",
-        "description": "English: <a href='https://github.com/gorhill/httpswitchboard/wiki'>Documentation</a>"
+        "message": "<a href='https://github.com/gorhill/uMatrix/wiki'>Dokumentation</a>",
+        "description": "English: <a href='https://github.com/gorhill/uMatrix/wiki'>Documentation</a>"
     },
     "aboutPermissions" : {
         "message": "<a href='https://github.com/gorhill/httpswitchboard/wiki/Permissions'>Berechtigungen</a>",
diff --git a/tools/_locales/en/messages.json b/tools/_locales/en/messages.json
index 94ba644..687e8c9 100644
--- a/tools/_locales/en/messages.json
+++ b/tools/_locales/en/messages.json
@@ -468,8 +468,8 @@
         "description": "English: Storage used: {{storageUsed}} bytes"
     },
     "aboutDoc" : {
-        "message": "<a href='https://github.com/gorhill/httpswitchboard/wiki'>Documentation</a>",
-        "description": "English: <a href='https://github.com/gorhill/httpswitchboard/wiki'>Documentation</a>"
+        "message": "<a href='https://github.com/gorhill/uMatrix/wiki'>Documentation</a>",
+        "description": "English: <a href='https://github.com/gorhill/uMatrix/wiki'>Documentation</a>"
     },
     "aboutPermissions" : {
         "message": "<a href='https://github.com/gorhill/httpswitchboard/wiki/Permissions'>Permissions</a>",
@@ -516,7 +516,7 @@
         "description": "English: Reset to default settings"
     },
     "aboutResetConfirm" : {
-        "message": "Caution! this will also remove all your custom settings. Are you sure you want to proceed?",
+        "message": "Caution! this will remove all your custom settings. Are you sure you want to proceed?",
         "description": "Message asking user to confirm reset"
     },
 
diff --git a/tools/_locales/fr/messages.json b/tools/_locales/fr/messages.json
index 5fe1bb9..150a607 100644
--- a/tools/_locales/fr/messages.json
+++ b/tools/_locales/fr/messages.json
@@ -464,8 +464,8 @@
         "description": "English: Storage used: {{storageUsed}}%"
     },
     "aboutDoc" : {
-        "message": "<a href='https://github.com/gorhill/httpswitchboard/wiki'>Documentation (en Anglais)</a>",
-        "description": "English: <a href='https://github.com/gorhill/httpswitchboard/wiki'>Documentation</a>"
+        "message": "<a href='https://github.com/gorhill/uMatrix/wiki'>Documentation (en Anglais)</a>",
+        "description": "English: <a href='https://github.com/gorhill/uMatrix/wiki'>Documentation</a>"
     },
     "aboutPermissions" : {
         "message": "<a href='https://github.com/gorhill/httpswitchboard/wiki/Permissions'>Permissions (en Anglais)</a>",
diff --git a/tools/_locales/ru/messages.json b/tools/_locales/ru/messages.json
index edc6751..11dd8b4 100644
--- a/tools/_locales/ru/messages.json
+++ b/tools/_locales/ru/messages.json
@@ -464,8 +464,8 @@
         "description": "English: Storage used: {{storageUsed}}%"
     },
     "aboutDoc" : {
-        "message": "<a href='https://github.com/gorhill/httpswitchboard/wiki'>Документация</a>",
-        "description": "English: <a href='https://github.com/gorhill/httpswitchboard/wiki'>Documentation</a>"
+        "message": "<a href='https://github.com/gorhill/uMatrix/wiki'>Документация</a>",
+        "description": "English: <a href='https://github.com/gorhill/uMatrix/wiki'>Documentation</a>"
     },
     "aboutPermissions" : {
         "message": "<a href='https://github.com/gorhill/httpswitchboard/wiki/Permissions'>Разрешения</a>",
diff --git a/tools/_locales/zh_CN/messages.json b/tools/_locales/zh_CN/messages.json
index 73be8a0..8ae8b0e 100644
--- a/tools/_locales/zh_CN/messages.json
+++ b/tools/_locales/zh_CN/messages.json
@@ -464,8 +464,8 @@
         "description": "English: Storage used: {{storageUsed}}%"
     },
     "aboutDoc" : {
-        "message": "<a href='https://github.com/gorhill/httpswitchboard/wiki'>文档</a>",
-        "description": "English: <a href='https://github.com/gorhill/httpswitchboard/wiki'>Documentation</a>"
+        "message": "<a href='https://github.com/gorhill/uMatrix/wiki'>文档</a>",
+        "description": "English: <a href='https://github.com/gorhill/uMatrix/wiki'>Documentation</a>"
     },
     "aboutPermissions" : {
         "message": "<a href='https://github.com/gorhill/httpswitchboard/wiki/Permissions'>权限</a>",