diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 0c1f775d..905d0b22 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -13,7 +13,7 @@
     {{ if .Params.tags }}
     <ul class="post-tags">
       {{ range .Params.tags }}
-      <li><a href="{{ `/tags/` }}{{ . | urlize }}/">{{ . }}</a></li>
+      <li><a href="{{$.Site.BaseURL}}tags/{{ . | urlize }}">{{ . }}</a></li>
       {{ end }}
     </ul>
     {{ end }}
@@ -25,7 +25,8 @@
   <script>
     var disqus_shortname = '{{ .Site.DisqusShortname }}';
     (function() { // DON'T EDIT BELOW THIS LINE
-      var d = document, s = d.createElement('script');
+      var d = document,
+        s = d.createElement('script');
       s.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
       s.setAttribute('data-timestamp', +new Date());
       (d.head || d.body).appendChild(s);
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 7b716a18..72e1e4c5 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -25,21 +25,21 @@
   <!-- Styles -->
   <link href="https://fonts.googleapis.com/css?family=PT+Sans:400,400i,700,700i" rel="stylesheet">
   <link href="https://cdn.bootcss.com/highlight.js/9.12.0/styles/default.min.css" rel="stylesheet">
-  <link href="/css/style.css" rel="stylesheet">
+  <link href="{{.Site.BaseURL}}css/style.css" rel="stylesheet">
   <!-- Favicons -->
-  <link rel="apple-touch-icon" href="/img/apple-touch-icon.png">
-  <link rel="icon" href="/img/favicon.ico">
+  <link rel="apple-touch-icon" href="{{.Site.BaseURL}}img/apple-touch-icon.png">
+  <link rel="icon" href="{{.Site.BaseURL}}img/favicon.ico">
   <!-- Generator -->
   <meta name="generator" content="Hugo {{ .Hugo.Version }}">
   <!-- RSS -->
-  <link rel="alternate" type="application/atom+xml" href="/index.xml" title="{{ .Site.Title }}">
+  <link rel="alternate" type="application/atom+xml" href="{{.Site.BaseURL}}index.xml" title="{{ .Site.Title }}">
 </head>
 <body class="{{if eq .Kind `page` }}single{{else}}list{{ if .IsHome }} home{{ end }}{{end}}">
   <header class="header">
     {{ if .IsHome }}
-    <h1 class="title"><a href="{{ `/` }}">{{ .Site.Title }}</a></h1>
+    <h1 class="title"><a href="{{.Site.BaseURL}}">{{ .Site.Title }}</a></h1>
     {{ else }}
-    <p class="title"><a href="{{ `/` }}">{{ .Site.Title }}</a></p>
+    <p class="title"><a href="{{.Site.BaseURL}}">{{ .Site.Title }}</a></p>
     {{ end }}
     <button class="menu-toggle" type="button"></button>
     <nav class="menu">
