diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 6aed033..e7c40e1 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,7 +1,7 @@
 		<div class="links">
-			<a href="/">Home</a>
+			<a href="{{.Site.BaseURL}}">Home</a>
 			{{ range first 1 (where .Site.Pages "Type" "post") }}
-				<a href="/post/">Archive</a>
+			<a href="{{"/post/"  | relURL}}">Archive</a>
 			{{ end }}
 			{{ range where .Site.Pages "Section" "pages" }}
 				{{ if .IsPage }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 4312b90..5368e8e 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -5,16 +5,16 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
 		<title>{{ .Title }} &middot; {{ .Site.Title }}</title>
 		<link rel="canonical" href="{{ .Permalink }}">
-		<link rel="stylesheet" type="text/css" href="/css/main.css" />
+		<link rel="stylesheet" type="text/css" href="{{ "css/main.css" | relURL}}">
 		{{ range .AlternativeOutputFormats -}}
 		    {{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
 		{{ end -}}
 		{{ partial "head.html" . }}
 	</head>
 	<body>
-		<a id="title" href="/" title="{{ .Site.Title }}">
+		<a id="title" href="{{.Site.BaseURL}}" title="{{ .Site.Title }}">
 			{{ if .Site.Params.logo }}
-				<img id="logo" alt="Logo" src="{{ .Site.Params.logo }}" />
+				<img id="logo" alt="Logo" src="{{ .Site.Params.logo | relURL}}" />
 			{{ end }}
 			{{ if .Site.Title }}
 				<h1>{{ .Site.Title }}</h1>
@@ -27,39 +27,39 @@
 			{{ $icon_size := "64px" }}
 			{{ if .Site.Params.email }}
 			<a href="mailto:{{ .Site.Params.email }}" title="Email">
-				<img alt="Email" height="{{ $icon_size }}" width="{{ $icon_size }}" src="/images/email.svg" />
+				<img alt="Email" height="{{ $icon_size }}" width="{{ $icon_size }}" src="{{ "/images/email.svg" | relURL}}" />
 			</a>
 			{{ end }}
 			{{ if .Site.Params.github }}
 			<a href="https://github.com/{{ .Site.Params.github }}" title="Github">
-				<img alt="GitHub" height="{{ $icon_size }}" width="{{ $icon_size }}" src="/images/github.svg" />
+				<img alt="GitHub" height="{{ $icon_size }}" width="{{ $icon_size }}" src="{{ "/images/github.svg" | relURL}}" />
 			</a>
 			{{ end }}
 			{{ if .Site.Params.facebook }}
 			<a href="https://facebook.com/{{ .Site.Params.facebook }}" title="Facebook">
-				<img alt="Facebook" height="{{ $icon_size }}" width="{{ $icon_size }}" src="/images/facebook.svg" />
+				<img alt="Facebook" height="{{ $icon_size }}" width="{{ $icon_size }}" src="{{"/images/facebook.svg" | relURL}}" />
 			</a>
 			{{ end }}
 			{{ if .Site.Params.twitter }}
 			<a href="https://twitter.com/{{ .Site.Params.twitter }}" title="Twitter">
-				<img alt="Twitter" height="{{ $icon_size }}" width="{{ $icon_size }}" src="/images/twitter.svg" />
+				<img alt="Twitter" height="{{ $icon_size }}" width="{{ $icon_size }}" src="{{"/images/twitter.svg" | relURL}}" />
 			</a>
 			{{ end }}
 			{{ if .Site.Params.linkedin }}
 			<a href="https://linkedin.com/in/{{ .Site.Params.linkedin }}" title="LinkedIn">
-				<img alt="LinkedIn" height="{{ $icon_size }}" width="{{ $icon_size }}" src="/images/linkedin.svg" />
+				<img alt="LinkedIn" height="{{ $icon_size }}" width="{{ $icon_size }}" src="{{"/images/linkedin.svg" | relURL}}" />
 			</a>
 			{{ end }}
                         {{ if .Site.Params.youtube }}
                         <a href="https://youtube.com/user/{{ .Site.Params.youtube }}" title="Youtube">
-                                <img alt="Youtube" height="{{ $icon_size }}" width="{{ $icon_size }}" src="/images/youtube.svg" />
+                                <img alt="Youtube" height="{{ $icon_size }}" width="{{ $icon_size }}" src="{{"/images/youtube.svg" | relURL}}" />
                         </a>
                         {{ end }}
 		</div>
 		<div class="links">
-			<a href="/">Home</a>
+			<a href="{{.Site.BaseURL}}">Home</a>
 			{{ range first 1 (where .Site.Pages "Type" "post") }}
-				<a href="/post/">Archive</a>
+				<a href="{{"/post/"  | relURL}}">Archive</a>
 			{{ end }}
 			{{ range (where .Site.Pages "Section" "pages") }}
 				{{ if .IsPage }}
