diff --git a/public/templates/dialog/credit.html b/public/templates/dialog/credit.html
index b8bc4495..76fffa14 100644
--- a/public/templates/dialog/credit.html
+++ b/public/templates/dialog/credit.html
@@ -25,18 +25,18 @@
         <div class="pf-dynamic-area">
             <dl class="dl-horizontal">
                 <dt class="text-left txt-color txt-color-grayLight">URL <i class="fas fa-external-link-alt fa-fw"></i></dt>
-                <dd><a target="_blank" href="//www.pathfinder.exodus4d.de"><em class="pf-brand">pathfinder</em></a></dd>
+                <dd><a target="_blank" href="//www.pathfinder.exodus4d.de" rel="noopener"><em class="pf-brand">pathfinder</em></a></dd>
                 <dt class="text-left txt-color txt-color-grayLight">Repository <i class="fab fa-github fa-fw"></i></dt>
-                <dd><a target="_blank" href="//github.com/exodus4d/pathfinder">GitHub</a></dd>
+                <dd><a target="_blank" href="//github.com/exodus4d/pathfinder" rel="noopener">GitHub</a></dd>
                 <dt class="text-left txt-color txt-color-grayLight">Social <i class="fab fa-google-plus-g fa-fw"></i></dt>
-                <dd><a target="_blank" href="//plus.google.com/+Pathfinder-wSpace">Google+</a></dd>
+                <dd><a target="_blank" href="//plus.google.com/+Pathfinder-wSpace" rel="noopener">Google+</a></dd>
             </dl>
 
             <dl class="dl-horizontal">
                 <dt class="text-left txt-color txt-color-grayLight">Media <i class="fab fa-youtube fa-fw"></i></dt>
-                <dd><a target="_blank" href="//www.youtube.com/channel/UC7HU7XEoMbqRwqxDTbMjSPg">YouTube</a></dd>
+                <dd><a target="_blank" href="//www.youtube.com/channel/UC7HU7XEoMbqRwqxDTbMjSPg" rel="noopener">YouTube</a></dd>
                 <dt class="txt-color txt-color-grayLight">Licence <i class="fas fa-certificate fa-fw"></i> </dt>
-                <dd><a target="_blank" href="http://opensource.org/licenses/MIT">(MIT) <em class="pf-brand">License</em></a></dd>
+                <dd><a target="_blank" href="http://opensource.org/licenses/MIT" rel="noopener">(MIT) <em class="pf-brand">License</em></a></dd>
                 <dt class="txt-color txt-color-grayLight">&nbsp;</dt>
                 <dd>&nbsp;</dd>
             </dl>
@@ -46,12 +46,12 @@
 
         <div class="row">
             <div class="col-xs-6 text-center">
-                <a class="btn" target="_blank" href="//www.patreon.com/exodus4d">
+                <a class="btn" target="_blank" href="//www.patreon.com/exodus4d" rel="noopener">
                     <img src="/public/img/landing/donate_patreon.png">
                 </a>
             </div>
             <div class="col-xs-6 text-center">
-                <a class="btn" target="_blank" href="//www.paypal.me/Exodus4D">
+                <a class="btn" target="_blank" href="//www.paypal.me/Exodus4D" rel="noopener">
                     <img src="/public/img/landing/donate_paypal.png">
                 </a>
             </div>
diff --git a/public/templates/dialog/map.html b/public/templates/dialog/map.html
index a5ca332d..bc06555a 100644
--- a/public/templates/dialog/map.html
+++ b/public/templates/dialog/map.html
@@ -126,7 +126,7 @@
                                                 <div class="input-group">
                                                     <input name="slackWebHookURL" type="url" class="form-control" id="{{slackWebHookURLId}}" value="{{slackWebHookURL}}" placeholder="https://hooks.slack.com/services/XXX/YYY/ZZZ" data-type-error="No valid URL" pattern="^https://hooks.slack.com/.*" data-pattern-error="Wrong domain. https://hooks.slack.com/)">
                                                     <div class="input-group-btn">
-                                                        <a class="btn btn-default" href="//slack.com/apps/A0F7XDUAZ-incoming-webhooks" target="_blank">
+                                                        <a class="btn btn-default" href="//slack.com/apps/A0F7XDUAZ-incoming-webhooks" target="_blank" rel="noopener">
                                                             add… <i class="fas fa-fw fa-external-link-alt"></i>
                                                         </a>
                                                     </div>
@@ -229,7 +229,7 @@
                                                 <div class="input-group" {{^discordRallyEnabled}}title="Globally disabled for this map type"{{/discordRallyEnabled}}>
                                                 <input name="discordWebHookURLRally" type="url" class="form-control" id="{{discordWebHookURLRallyId}}" value="{{discordWebHookURLRally}}" placeholder="https://discordapp.com/api/webhooks/XXXYYYZZZ" data-type-error="No valid URL" pattern="^https://(\w+\.)?discordapp.com/.*" data-pattern-error="Wrong domain. https://discordapp.com/)" {{^discordRallyEnabled}}disabled{{/discordRallyEnabled}}>
                                                 <div class="input-group-btn">
-                                                    <a class="btn btn-default" href="//support.discordapp.com/hc/en-us/articles/228383668-Intro-to-Webhooks" target="_blank">
+                                                    <a class="btn btn-default" href="//support.discordapp.com/hc/en-us/articles/228383668-Intro-to-Webhooks" target="_blank" rel="noopener">
                                                         add… <i class="fas fa-fw fa-external-link-alt"></i>
                                                     </a>
                                                 </div>
@@ -263,7 +263,7 @@
                                             <div class="input-group" {{^discordHistoryEnabled}}title="Globally disabled for this map type"{{/discordHistoryEnabled}}>
                                             <input name="discordWebHookURLHistory" type="url" class="form-control" id="{{discordWebHookURLHistoryId}}" value="{{discordWebHookURLHistory}}" placeholder="https://discordapp.com/api/webhooks/XXXYYYZZZ" data-type-error="No valid URL" pattern="^https://discordapp.com/.*" data-pattern-error="Wrong domain. https://discordapp.com/)" {{^discordHistoryEnabled}}disabled{{/discordHistoryEnabled}}>
                                             <div class="input-group-btn">
-                                                <a class="btn btn-default" href="//support.discordapp.com/hc/en-us/articles/228383668-Intro-to-Webhooks" target="_blank">
+                                                <a class="btn btn-default" href="//support.discordapp.com/hc/en-us/articles/228383668-Intro-to-Webhooks" target="_blank" rel="noopener">
                                                     add… <i class="fas fa-fw fa-external-link-alt"></i>
                                                 </a>
                                             </div>
diff --git a/public/templates/modules/footer.html b/public/templates/modules/footer.html
index 4eac2ba6..5981442a 100644
--- a/public/templates/modules/footer.html
+++ b/public/templates/modules/footer.html
@@ -9,7 +9,7 @@
         <div class="navbar-header pull-right">
             <p class="navbar-text  txt-color txt-color-gray">All <a href="http://www.eveonline.com/" target="_blank" rel="noopener">EVE ONLINE</a>
                 related materials are property of
-                <a target="_blank" href="http://www.ccpgames.com/">CCP Games</a></p>
+                <a target="_blank" href="http://www.ccpgames.com" rel="noopener">CCP Games</a></p>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/public/templates/modules/system_info.html b/public/templates/modules/system_info.html
index 7fb8b477..95edda51 100644
--- a/public/templates/modules/system_info.html
+++ b/public/templates/modules/system_info.html
@@ -21,14 +21,14 @@
     <h5><span class="{{systemTypeLinkClass}}" data-toggle="tooltip" data-placement="top" data-container="body" title="type">{{systemTypeName}}</span></h5>
 
     {{#systemIsWormhole}}
-        <a href="http://evemaps.dotlan.net/system/{{system.name}}" class="pf-icon pf-icon-dotlan" data-toggle="tooltip" data-placement="top" data-container="body" title="dotlan" target="_blank"></a>
+        <a href="http://evemaps.dotlan.net/system/{{system.name}}" class="pf-icon pf-icon-dotlan" data-toggle="tooltip" data-placement="top" data-container="body" title="dotlan" target="_blank" rel="noopener"></a>
     {{/systemIsWormhole}}
     {{^systemIsWormhole}}
-        <a href="http://evemaps.dotlan.net/map/{{system.region.name}}/{{system.name}}" class="pf-icon pf-icon-dotlan" data-toggle="tooltip" data-placement="top" data-container="body" title="dotlan" target="_blank"></a>
+        <a href="http://evemaps.dotlan.net/map/{{system.region.name}}/{{system.name}}" class="pf-icon pf-icon-dotlan" data-toggle="tooltip" data-placement="top" data-container="body" title="dotlan" target="_blank" rel="noopener"></a>
     {{/systemIsWormhole}}
 
     {{#systemIsWormhole}}
-        <a href="http://anoik.is/systems/{{system.name}}" class="pf-icon pf-icon-anoik" data-toggle="tooltip" data-placement="top" data-container="body" title="anoik" target="_blank"></a>
+        <a href="http://anoik.is/systems/{{system.name}}" class="pf-icon pf-icon-anoik" data-toggle="tooltip" data-placement="top" data-container="body" title="anoik" target="_blank" rel="noopener"></a>
     {{/systemIsWormhole}}
 </div>
 
diff --git a/public/templates/ui/timeline_element.html b/public/templates/ui/timeline_element.html
index 5e89d753..b092ec6e 100644
--- a/public/templates/ui/timeline_element.html
+++ b/public/templates/ui/timeline_element.html
@@ -3,7 +3,7 @@
     <div class="timeline-panel">
         <div class="timeline-heading">
             <h4 class="timeline-title">
-                <a href="{{releaseData.html_url}}" target="_blank">
+                <a href="{{releaseData.html_url}}" target="_blank" rel="noopener">
                     <i class="fas fa-fw fa-tag"></i>&nbsp;{{ releaseData.name }}
                 </a>
 
diff --git a/public/templates/view/setup.html b/public/templates/view/setup.html
index 4f9de89b..1e5e1f37 100644
--- a/public/templates/view/setup.html
+++ b/public/templates/view/setup.html
@@ -61,11 +61,11 @@
                             </tr>
                             <tr>
                                 <td>Contact</td>
-                                <td class="text-right"><a href="{{ @PATHFINDER.CONTACT }}" target="_blank">{{ @PATHFINDER.CONTACT }}</a></td>
+                                <td class="text-right"><a href="{{ @PATHFINDER.CONTACT }}" target="_blank" rel="noopener">{{ @PATHFINDER.CONTACT }}</a></td>
                             </tr>
                             <tr>
                                 <td>Repository</td>
-                                <td class="text-right"><a href="{{ @PATHFINDER.REPO }}" target="_blank">{{ @PATHFINDER.REPO }}</a></td>
+                                <td class="text-right"><a href="{{ @PATHFINDER.REPO }}" target="_blank" rel="noopener">{{ @PATHFINDER.REPO }}</a></td>
                             </tr>
                             </tbody>
                         </table>