diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index dedf751..86d19a2 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -18,7 +18,8 @@
     <link rel="stylesheet" href="{{ .Site.BaseURL }}css/poole.css">
     <link rel="stylesheet" href="{{ .Site.BaseURL }}css/hyde.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Fira+Sans:300,300i,400,400i,500">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
+    <!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" /> -->
+    <script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
     {{ if .Site.Params.highlightjs -}}
     {{ "<!-- highlight.js-->" | safeHTML }} 
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/{{ .Site.Params.highlightjsstyle | default "default" }}.min.css">
@@ -41,4 +42,4 @@
     {{ "<!-- RSS -->" | safeHTML }} 
     <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
     <link href="{{ .RSSLink }}" rel="feed" type="application/rss+xml" title="{{ .Site.Title }}" />
-    {{- end }}
\ No newline at end of file
+    {{- end }}
diff --git a/layouts/partials/post_footer.html b/layouts/partials/post_footer.html
index 2e57de2..58ff0cd 100644
--- a/layouts/partials/post_footer.html
+++ b/layouts/partials/post_footer.html
@@ -1,7 +1,7 @@
 {{ if .Site.Params.highlightjs -}}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
 {{ range .Site.Params.highlightjslanguages }}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/{{.}}.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/{{.}}.min.js"></script>
 {{ end }}
 <script type="text/javascript">
     hljs.initHighlightingOnLoad();
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index cebbe21..7027a50 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -11,10 +11,8 @@
         <p>
 		{{ partial "sidebar_social.html" . }}
         </p>
-		<p class="copyright">{{ with .Site.Params.copyright }}{{.}}{{ else }}&copy; {{ now.Format "2006"}} {{.Site.Params.author}}. <br/>
-        <a href="https://creativecommons.org/licenses/by/4.0">Some Rights Reserved</a>. {{end}}
-        <br/>
-		<p class="poweredby">Powered by <a href="https://gohugo.io/">Hugo</a> &amp; <a href="https://github.com/htr3n/hyde-hyde">hyde-hyde</a>.</p>
+		<p class="copyright">{{ with .Site.Params.copyright }}{{.}}{{ else }}&copy; {{ now.Format "2006"}} {{.Site.Params.author}}.
+        <a href="https://creativecommons.org/licenses/by/4.0">Some Rights Reserved</a>.<br/>Built with <a href="https://gohugo.io/">Hugo</a> &amp; <a href="https://github.com/htr3n/hyde-hyde">hyde-hyde</a>.{{end}}
         </p>
 	</div>
 	<div>
diff --git a/layouts/partials/sidebar_social.html b/layouts/partials/sidebar_social.html
index 6d93628..7083fed 100644
--- a/layouts/partials/sidebar_social.html
+++ b/layouts/partials/sidebar_social.html
@@ -1,32 +1,32 @@
 <section class="row text-center">
 	{{ with .Site.Params.social.twitter }}
-	<a href="https://twitter.com/{{.}}"><i class="fa fa-twitter fa-lg" aria-hidden="true"></i></a>
+	<a href="https://twitter.com/{{.}}"><i class="fab fa-twitter fa-lg" aria-hidden="true"></i></a>
 	{{ end }}
 	{{ with .Site.Params.social.facebook }}
-	&nbsp;<a href="https://facebook.com/{{.}}"><i class="fa fa-facebook-official fa-lg" aria-hidden="true"></i></a>
+	&nbsp;<a href="https://facebook.com/{{.}}"><i class="fab fa-facebook-f"></i></a>
 	{{ end }}
 	{{ with .Site.Params.social.github }}
-	&nbsp;<a href="https://github.com/{{.}}"><i class="fa fa-github fa-lg" aria-hidden="true"></i></a>
+	&nbsp;<a href="https://github.com/{{.}}"><i class="fab fa-github fa-lg" aria-hidden="true"></i></a>
 	{{ end }}
 	{{ with .Site.Params.social.bitbucket }}
-	&nbsp;<a href="https://bitbucket.org/{{.}}"><i class="fa fa-bitbucket fa-lg" aria-hidden="true"></i></a>
+	&nbsp;<a href="https://bitbucket.org/{{.}}"><i class="fab fa-bitbucket fa-lg" aria-hidden="true"></i></a>
 	{{ end }}
 	{{ with .Site.Params.social.instagram }}
-	&nbsp;<a href="https://instagram.com/{{.}}"><i class="fa fa-instagram fa-lg" aria-hidden="true"></i></a>
+	&nbsp;<a href="https://instagram.com/{{.}}"><i class="fab fa-instagram fa-lg" aria-hidden="true"></i></a>
 	{{ end }}
 	{{ with .Site.Params.social.linkedin }}
-	&nbsp;<a href="https://linkedin.com/in/{{.}}"><i class="fa fa-linkedin fa-lg" aria-hidden="true"></i></a>
+	&nbsp;<a href="https://linkedin.com/in/{{.}}"><i class="fab fa-linkedin fa-lg" aria-hidden="true"></i></a>
 	{{ end }}
 	{{ with .Site.Params.social.stackoverflow }}
-	&nbsp;<a href="https://stackoverflow.com/users/{{.}}"><i class="fa fa-stack-overflow fa-lg" aria-hidden="true"></i></a>
+	&nbsp;<a href="https://stackoverflow.com/users/{{.}}"><i class="fab fa-stack-overflow fa-lg" aria-hidden="true"></i></a>
 	{{ end }}
 	{{ with .Site.Params.social.medium}}
-	&nbsp;<a href="https://medium.com/{{.}}"><i class="fa fa-medium fa-lg" aria-hidden="true"></i></a>
+	&nbsp;<a href="https://medium.com/{{.}}"><i class="fab fa-medium fa-lg" aria-hidden="true"></i></a>
 	{{ end }}
 	{{ with .Site.Params.social.xing }}
-	&nbsp;<a href="https://www.xing.com/profile/{{.}}"><i class="fa fa-xing fa-lg" aria-hidden="true"></i></a>
+	&nbsp;<a href="https://www.xing.com/profile/{{.}}"><i class="fab fa-xing fa-lg" aria-hidden="true"></i></a>
 	{{ end }}
 	{{ with .Site.Params.social.email }}
-	&nbsp;<a href="mailto:{{.}}"><i class="fa fa-envelope-o fa-lg" aria-hidden="true"></i></a>
+	&nbsp;<a href="mailto:{{.}}"><i class="fas fa-at fa-lg" aria-hidden="true"></i></a>
 	{{ end }}
 </section>
diff --git a/static/css/custom.css b/static/css/custom.css
index 52a60ea..0190c85 100644
--- a/static/css/custom.css
+++ b/static/css/custom.css
@@ -43,12 +43,31 @@ pre
     tab-size: 2;
 }
 
+
+.hljs {
+    white-space: pre;
+    
+    overflow-x: auto; /* no line wrapping */
+}
+
 pre,
 code
 {
     font-family: monospace;
+    border-radius: 4px;
+    width: 100%;
+    font-size: .85em;
 }
 
+code {
+	padding:.15em .3em;
+	background: #272932!important;
+	color: #ececec!important;
+	box-sizing: border-box;
+	margin: 0 .25em;
+}
+
+
 .copyright, 
 .poweredby
 {