diff --git a/js/app/ui/system_info.js b/js/app/ui/system_info.js
index 6ae559ed..592d989c 100644
--- a/js/app/ui/system_info.js
+++ b/js/app/ui/system_info.js
@@ -403,6 +403,9 @@ define([
                     return  render(val) === 'A' ? config.fontTriglivianClass : '';
                 };
             },
+            formatUrl: () => {
+                return (val, render) => render(val).replace(/ /g, '_');
+            },
 
             shatteredWormholeInfo: shatteredWormholeInfo,
 
diff --git a/public/css/v1.3.6/pathfinder.css b/public/css/v1.3.6/pathfinder.css
index 0c5b4531..fb73bad7 100644
--- a/public/css/v1.3.6/pathfinder.css
+++ b/public/css/v1.3.6/pathfinder.css
@@ -1,11 +1,11 @@
 /*!
  * Pathfinder - Mapping Tool
- * http://pathfinder.exodus4d.de/
+ * https://www.pathfinder-w.space
  *
  * CSS - Cascading Style Sheets
- * Generated with Compass http://compass-style.org/
+ * Generated with Compass http://compass-style.org
  *
- * Copyright 2015 - 2016, Exodus 4D - Mark Friedrich
+ * Copyright 2015 - 2018, Exodus 4D - Mark Friedrich
  *
  */html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font:inherit;font-size:100%;vertical-align:baseline}html{line-height:1}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:"";content:none}a img{border:none}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}@font-face{font-family:'Oxygen';src:url("../../fonts/oxygen-regular-webfont.eot");src:url("../../fonts/oxygen-regular-webfont.eot") format("embedded-opentype"),url("../../fonts/oxygen-regular-webfont.woff2") format("woff2"),url("../../fonts/oxygen-regular-webfont.woff") format("woff"),url("../../fonts/oxygen-regular-webfont.ttf") format("truetype");font-weight:400;font-style:normal}@font-face{font-family:'Oxygen Bold';src:url("../../fonts/oxygen-bold-webfont.eot");src:url("../../fonts/oxygen-bold-webfont.eot") format("embedded-opentype"),url("../../fonts/oxygen-bold-webfont.woff2") format("woff2"),url("../../fonts/oxygen-bold-webfont.woff") format("woff"),url("../../fonts/oxygen-bold-webfont.ttf") format("truetype");font-weight:700;font-style:normal}/*!
  * Bootstrap SASS
diff --git a/public/js/v1.3.6/app/ui/system_info.js b/public/js/v1.3.6/app/ui/system_info.js
index 6ae559ed..592d989c 100644
--- a/public/js/v1.3.6/app/ui/system_info.js
+++ b/public/js/v1.3.6/app/ui/system_info.js
@@ -403,6 +403,9 @@ define([
                     return  render(val) === 'A' ? config.fontTriglivianClass : '';
                 };
             },
+            formatUrl: () => {
+                return (val, render) => render(val).replace(/ /g, '_');
+            },
 
             shatteredWormholeInfo: shatteredWormholeInfo,
 
diff --git a/public/templates/dialog/credit.html b/public/templates/dialog/credit.html
index 76fffa14..090a4a41 100644
--- a/public/templates/dialog/credit.html
+++ b/public/templates/dialog/credit.html
@@ -25,7 +25,7 @@
         <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" rel="noopener"><em class="pf-brand">pathfinder</em></a></dd>
+                <dd><a target="_blank" href="//www.pathfinder-w.space" 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" 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>
diff --git a/public/templates/modules/system_info.html b/public/templates/modules/system_info.html
index 95edda51..c68ead16 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" rel="noopener"></a>
+        <a href="{{#formatUrl}}http://evemaps.dotlan.net/system/{{system.name}}{{/formatUrl}}" 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" rel="noopener"></a>
+        <a href="{{#formatUrl}}http://evemaps.dotlan.net/map/{{system.region.name}}/{{system.name}}{{/formatUrl}}" 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" rel="noopener"></a>
+        <a href="{{#formatUrl}}http://anoik.is/systems/{{system.name}}{{/formatUrl}}" 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/sass/pathfinder.scss b/sass/pathfinder.scss
index ebe22082..4bf81bf7 100644
--- a/sass/pathfinder.scss
+++ b/sass/pathfinder.scss
@@ -1,11 +1,11 @@
 /*!
  * Pathfinder - Mapping Tool
- * http://pathfinder.exodus4d.de/
+ * https://www.pathfinder-w.space
  *
  * CSS - Cascading Style Sheets
- * Generated with Compass http://compass-style.org/
+ * Generated with Compass http://compass-style.org
  *
- * Copyright 2015 - 2016, Exodus 4D - Mark Friedrich
+ * Copyright 2015 - 2018, Exodus 4D - Mark Friedrich
  *
  */