Merge upstream

2024-12-06 16:44:12 -05:00
parent 14e8771049
commit 913e60acc9
86 changed files with 1987 additions and 1556 deletions
--- a/blog.bryanroessler.com/_includes/disqus.html
+++ b/blog.bryanroessler.com/_includes/disqus.html
@@ -1,19 +1,17 @@
 {%- if site.disqus -%}
-<div class="disqus-comments">
-  <div class="comments">
+<div class="comments">
    <div id="disqus_thread"></div>
    <script type="text/javascript">
-	  var disqus_shortname = '{{ site.disqus }}';
-	  /* ensure that pages with query string get the same discussion */
-	  var url_parts = window.location.href.split("?");
-	  var disqus_url = url_parts[0];
-	  (function() {
-		var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-		dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-		(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-	  })();
+        var disqus_shortname = '{{ site.disqus }}';
+        /* ensure that pages with query string get the same discussion */
+            var url_parts = window.location.href.split("?");
+            var disqus_url = url_parts[0];
+        (function() {
+            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
    </script>
-    <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-  </div>
+    <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
 </div>
 {%- endif -%}
--- a/blog.bryanroessler.com/_includes/ext-css.html
+++ b/blog.bryanroessler.com/_includes/ext-css.html
@@ -1,7 +1,7 @@
 {% if include.css.sri %}
  <link href="{{ include.css.href }}" rel="stylesheet" integrity="{{ include.css.sri }}" crossorigin="anonymous">
 {% elsif include.css.href %}
-  <link rel="stylesheet" href="{{ include.css.href }}">
+  <link rel="stylesheet" href="{{ include.css.href }}" />
 {% else %}
-  <link rel="stylesheet" href="{{ include.css }}">
+  <link rel="stylesheet" href="{{ include.css }}" />
 {% endif %}
--- a/blog.bryanroessler.com/_includes/fb-comment.html
+++ b/blog.bryanroessler.com/_includes/fb-comment.html
@@ -1,16 +1,14 @@
 {%- if site.fb_comment_id -%}
 <div class="comments">
-  <div id="fb-root"></div>
-  <script>
-    (function(d, s, id) {
-      var js, fjs = d.getElementsByTagName(s)[0];
-      if (d.getElementById(id)) return;
-      js = d.createElement(s); js.id = id;
-      js.src = 'https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.12&appId={{ site.fb_comment_id }}&autoLogAppEvents=1';
-      fjs.parentNode.insertBefore(js, fjs);
-    }(document, 'script', 'facebook-jssdk'));
-  </script>
-  <div class="fb-comments" data-href="{{ page.url | absolute_url }}" data-width="100%" data-numposts="5"></div>
-  <noscript>Please enable JavaScript to view the comments powered by Facebook.</noscript>
+    <div id="fb-root"></div>
+    <script>(function(d, s, id) {
+       var js, fjs = d.getElementsByTagName(s)[0];
+       if (d.getElementById(id)) return;
+       js = d.createElement(s); js.id = id;
+       js.src = 'https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.12&appId={{ site.fb_comment_id }}&autoLogAppEvents=1';
+       fjs.parentNode.insertBefore(js, fjs);
+    }(document, 'script', 'facebook-jssdk'));</script>
+    <div class="fb-comments" data-href="{{ page.url | absolute_url }}" data-width="100%" data-numposts="5"></div>
+    <noscript>Please enable JavaScript to view the comments powered by Facebook.</noscript>
 </div>
 {%- endif -%}
--- a/blog.bryanroessler.com/_includes/footer-minimal.html
+++ b/blog.bryanroessler.com/_includes/footer-minimal.html
@@ -1,18 +1,16 @@
 <footer class="footer-min">
  <div class="text-muted">
-    {% if site.author %}
-      {{ site.author }}
-      &nbsp;&nbsp;&bull;&nbsp;&nbsp;
-    {% endif %}
-    {% if page.date %}
-      {{ page.date }}
-    {% else %}
-      {{ site.time | date: '%Y' }}
-    {% endif %}
+	{{ site.author.name }}
+	&nbsp;&nbsp;&bull;&nbsp;&nbsp;
+	{% if page.date %}
+	  {{ page.date }}
+	{% else %}
+	  {{ site.time | date: '%Y' }}
+	{% endif %}

    {% if site.url-pretty %}
-      &nbsp;&nbsp;&bull;&nbsp;&nbsp;
-      <a href="{{ '' | absolute_url }}">{{ site.url-pretty }}</a>
+    &nbsp;&nbsp;&bull;&nbsp;&nbsp;
+    <a href="{{ site.url }}">{{ site.url-pretty }}</a>
    {% endif %}
  </div>
 </footer>
--- a/blog.bryanroessler.com/_includes/footer-scripts.html
+++ b/blog.bryanroessler.com/_includes/footer-scripts.html
@@ -9,9 +9,9 @@
    <!-- doing something a bit funky here because I want to be careful not to include JQuery twice! -->
    {% if js contains 'jquery' %}
      <script>
-        if (typeof jQuery == 'undefined') {
+      	if (typeof jQuery == 'undefined') {
          document.write('<script src="{{ js | relative_url }}"></scr' + 'ipt>');
-        }
+      	}
      </script>
    {% else %}
      <script src="{{ js | relative_url }}"></script>
@@ -19,12 +19,6 @@
  {% endfor %}
 {% endif %}

-{% if site.site-js %}
-  {% for js in site.site-js %}
-    <script src="{{ js | relative_url }}"></script>
-  {% endfor %}
-{% endif %}
-
 {% if page.ext-js %}
  {% for js in page.ext-js %}
    {% include ext-js.html js=js %}
--- a/blog.bryanroessler.com/_includes/footer.html
+++ b/blog.bryanroessler.com/_includes/footer.html
@@ -1,27 +1,36 @@
 <footer>
-  <div class="container-md beautiful-jekyll-footer">
+  <div class="container beautiful-jekyll-footer">
    <div class="row">
-      <div class="col-xl-8 offset-xl-2 col-lg-10 offset-lg-1">
-      {% include social-networks-links.html %}
-      {% if page.footer-extra %}
-        <div class="footer-custom-content">
-          {% for file in page.footer-extra %}
-            {% include {{ file }} %}
-          {% endfor %}
-        </div>
-      {% endif %}
+      <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
+        <ul class="list-inline text-center footer-links">
+          {%- for link in site.social-network-links -%}
+            {%- assign curkey = link[0] -%}
+            {%- assign element = site.data.SocialNetworks[curkey] -%}
+            <li>
+            {%- if curkey == 'rss' -%}
+              <a href="{{ '/feed.xml' | relative_url }}" title="{{ element.name }}">
+            {%- elsif curkey == 'yelp' -%}
+              <a href="https://{{ site.social-network-links[curkey] }}.yelp.com" title="{{ element.name }}">
+            {%- else -%}
+              <a href="{{element.baseURL}}{{ site.social-network-links[curkey] }}" title="{{ element.name }}">
+            {%- endif -%}
+                <span class="fa-stack fa-lg" aria-hidden="true">
+                  <i class="fa fa-circle fa-stack-2x"></i>
+                  <i class="fa {{ element.icon }} fa-stack-1x fa-inverse"></i>
+                </span>
+                <span class="sr-only">{{ element.name }}</span>
+              </a>
+            </li>
+          {%- endfor -%}
+        </ul>
      <p class="copyright text-muted">
-      {% if site.author %}
-        {{ site.author }}
-        &nbsp;&bull;&nbsp;
-      {% endif %}
+      {{ site.author.name }}
+      &nbsp;&bull;&nbsp;
      {{ site.time | date: '%Y' }}

      {% if site.url-pretty %}
-        &nbsp;&bull;&nbsp;
-        <span class="author-site">
-          <a href="{% if site.url-canonical %}{{ site.url-canonical }}{% else %}{{ '' | absolute_url }}{% endif %}">{{ site.url-pretty }}</a>
-        </span>
+      &nbsp;&bull;&nbsp;
+      <a href="{{ '' | absolute_url }}">{{ site.url-pretty }}</a>
      {% endif %}

      {% if site.matomo %}
@@ -30,17 +39,12 @@
          <a href="http://{{- site.matomo.uri -}}/index.php?module=CoreAdminHome&action=optOut" target="_blank" class="text_muted">Do-not-Track</a>
        {% endif %}
      {% endif%}
-
-      {% if site.edit_page_button and site.github.repository_url %}
-        &nbsp;&bull;&nbsp;
-        <a title="Edit this page on GitHub" href="{{ site.github.repository_url }}/edit/{{ site.github.source.branch }}/{{ page.path }}" class="text_muted">Edit page</a>
-       {% endif%}
-
      </p>
-      {% unless site.remove-ads %}<p class="theme-by text-muted">
-        Powered by
-        <a href="https://beautifuljekyll.com">Beautiful Jekyll</a>
-      </p>{% endunless %}
+          <!-- Please don't remove this, keep my open source work credited :) -->
+    <p class="theme-by text-muted">
+      Theme by
+      <a href="https://deanattali.com/beautiful-jekyll/">beautiful-jekyll</a>
+    </p>
      </div>
    </div>
  </div>
--- a/blog.bryanroessler.com/_includes/google_analytics.html
+++ b/blog.bryanroessler.com/_includes/google_analytics.html
@@ -1,14 +1,14 @@
 {% if site.google_analytics %}
 <!-- Google Analytics -->
 <script>
-  (function (i, s, o, g, r, a, m) {
-    i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
-      (i[r].q = i[r].q || []).push(arguments)
-    }, i[r].l = 1 * new Date(); a = s.createElement(o),
-      m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
-  })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
-  ga('create', '{{ site.google_analytics }}', 'auto');
-  ga('send', 'pageview');
+    (function (i, s, o, g, r, a, m) {
+        i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
+            (i[r].q = i[r].q || []).push(arguments)
+        }, i[r].l = 1 * new Date(); a = s.createElement(o),
+            m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
+    })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
+    ga('create', '{{ site.google_analytics }}', 'auto');
+    ga('send', 'pageview');
 </script>
 <!-- End Google Analytics -->
 {% endif %}
--- a/blog.bryanroessler.com/_includes/gtag.html
+++ b/blog.bryanroessler.com/_includes/gtag.html
@@ -1,10 +1,11 @@
 {% if site.gtag %}
 <!-- Global site tag (gtag.js) - Google Analytics -->
 <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.gtag }}"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
+    <script>
+          window.dataLayer = window.dataLayer || [];
  function gtag(){dataLayer.push(arguments);}
  gtag('js', new Date());
+
  gtag('config', '{{ site.gtag }}');
 </script>
 {% endif %}
--- a/blog.bryanroessler.com/_includes/gtm_body.html
+++ b/blog.bryanroessler.com/_includes/gtm_body.html
@@ -1,5 +1,6 @@
 {% if site.gtm %}
-  <!-- Google Tag Manager (noscript) -->
-  <noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ site.gtm }}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-  <!-- End Google Tag Manager (noscript) -->
+    <!-- Google Tag Manager (noscript) -->
+    <noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ site.gtm }}"
+    height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+    <!-- End Google Tag Manager (noscript) -->
 {% endif %}
--- a/blog.bryanroessler.com/_includes/gtm_head.html
+++ b/blog.bryanroessler.com/_includes/gtm_head.html
@@ -1,11 +1,9 @@
 {% if site.gtm %}
-  <!-- Google Tag Manager -->
-  <script>
-    (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-      new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-      j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-      'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-    })(window,document,'script','dataLayer','{{ site.gtm }}');
-  </script>
-  <!-- End Google Tag Manager -->
+    <!-- Google Tag Manager -->
+    <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+    j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+    'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+    })(window,document,'script','dataLayer','{{ site.gtm }}');</script>
+    <!-- End Google Tag Manager -->
 {% endif %}
--- a/blog.bryanroessler.com/_includes/head.html
+++ b/blog.bryanroessler.com/_includes/head.html
@@ -1,52 +1,21 @@
 <head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta charset="utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, viewport-fit=cover">

-  {% capture title %}
-    {%- if page.share-title -%}
-      {{ page.share-title | strip_html | xml_escape }}
-    {%- elsif page.title -%}
-      {{ page.title | strip_html | xml_escape  }}
-    {%- else -%}
-      {{ site.title | strip_html | xml_escape }}
-    {%- endif -%}
-  {% endcapture %}
+  <title>{% if page.use-site-title %}{{ site.title }} {{ site.title-separator }} {{ site.description }}{% elsif page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>

-  {% capture description %}
-    {%- if page.share-description -%}
-      {{ page.share-description | strip_html | xml_escape }}
-    {%- elsif page.subtitle -%}
-      {{ page.subtitle | strip_html | xml_escape }}
-    {%- else -%}
-      {%- assign excerpt_length = site.excerpt_length | default: 50 -%}
-      {{ page.content | strip_html | xml_escape | truncatewords: excerpt_length | strip }}
-    {%- endif -%}
-  {% endcapture %}
+  <meta name="author" content="{{ site.author.name }}" />

-  <title>{{ title }}</title>
-
-  {% if site.author %}
-  <meta name="author" content="{{ site.author }}">
+  {% if page.subtitle %}
+  <meta name="description" content="{{ page.subtitle }}">
  {% endif %}

-  <meta name="description" content="{{ description }}">
-
-  {% if site.mobile-theme-col %}
-  <meta name="theme-color" content="{{ site.mobile-theme-col }}">
-  {% endif %}
-
-  {% if site.keywords %}
-  <meta name="keywords" content="{{ site.keywords }}">
-  {% endif %}
-
-  {% if site.rss-description %}
-  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ '/feed.xml' | absolute_url }}">
-  {% endif %}
+  <link rel="alternate" type="application/rss+xml" title="{{ site.title }} {{ site.title-separator }} {{ site.description }}" href="{{ '/feed.xml' | absolute_url }}" />

  {% include gtag.html %}
  {% include gtm_head.html %}
  {% include google_analytics.html %}
-  {% include cloudflare_analytics.html %}

  {% if layout.common-ext-css %}
    {% for css in layout.common-ext-css %}
@@ -56,13 +25,13 @@

  {% if layout.common-css %}
    {% for css in layout.common-css %}
-      <link rel="stylesheet" href="{{ css | relative_url }}">
+      <link rel="stylesheet" href="{{ css | relative_url }}" />
    {% endfor %}
  {% endif %}

-  {% if site.site-css %}
-    {% for css in site.site-css %}
-      <link rel="stylesheet" href="{{ css | relative_url }}">
+  {% if layout.common-googlefonts %}
+    {% for font in layout.common-googlefonts %}
+      <link rel="stylesheet" href="//fonts.googleapis.com/css?family={{ font }}" />
    {% endfor %}
  {% endif %}

@@ -71,82 +40,92 @@
      {% include ext-css.html css=css %}
    {% endfor %}
  {% endif %}
-  
+
  {% if page.css %}
    {% for css in page.css %}
-      <link rel="stylesheet" href="{{ css | relative_url }}">
+      <link rel="stylesheet" href="{{ css | relative_url }}" />
    {% endfor %}
  {% endif %}

+  {% if page.googlefonts %}
+    {% for font in page.googlefonts %}
+      <link rel="stylesheet" href="//fonts.googleapis.com/css?family={{ font }}" />
+    {% endfor %}
+  {% endif %}
+
+    <!-- Facebook OpenGraph tags -->
  {% if site.fb_app_id %}
-  <meta property="fb:app_id" content="{{ site.fb_app_id }}">
+  <meta property="fb:app_id" content="{{ site.fb_app_id }}" />
  {% endif %}

-  {% if site.title %}
-  <meta property="og:site_name" content="{{ site.title }}">
+  {% if page.meta-title %}
+  <meta property="og:title" content="{{ page.meta-title }}" />
+  {% elsif page.title %}
+  <meta property="og:title" content="{{ page.title }}" />
+  {% else %}
+  <meta property="og:title" content="{{ site.title }}" />
  {% endif %}

-  {%- capture img -%}
-    {%- if page.share-img -%}
-      {{ page.share-img }}
-    {%- elsif page.cover-img -%}
-      {%- if page.cover-img.first -%}
-        {{ page.cover-img[0].first.first }}
-      {%- else -%}
-        {{ page.cover-img }}
-      {%- endif -%}
-    {%- elsif page.thumbnail-img -%}
-      {{ page.thumbnail-img }}
-    {%- elsif site.avatar -%}
-      {{ site.avatar }}
-    {% endif %}
-  {%- endcapture -%}
-  {%- assign img=img | strip -%}
-
-  <meta property="og:title" content="{{ title }}">
-  <meta property="og:description" content="{{ description }}">
-
-  {% if img != "" %}
-  <meta property="og:image" content="{{ img | absolute_url }}">
+   {% if page.meta-description %}
+  <meta property="og:description" content="{{ page.meta-description }}">
+  {% elsif page.subtitle %}
+  <meta property="og:description" content="{{ page.subtitle }}">
+  {% else %}
+  <meta property="og:description" content="{{ page.content | strip_html | xml_escape | truncatewords: 50 }}">
  {% endif %}

+
+  <meta property="og:type" content="website" />
+
  {% if page.id %}
-  <meta property="og:type" content="article">
-  <meta property="og:article:author" content="{{ site.author }}">
-  <meta property="og:article:published_time" content="{{ page.date | date_to_xmlschema }}">
-  <meta property="og:url" content="{{ page.url | absolute_url }}">
-  <link rel="canonical" href="{{ page.url | absolute_url }}">
+  <meta property="og:url" content="{{ page.url | absolute_url }}" />
+  <link rel="canonical" href="{{ page.url | absolute_url }}" />
  {% else %}
-  <meta property="og:type" content="website">
-  <meta property="og:url" content="{{ page.url | absolute_url | strip_index }}">
-  <link rel="canonical" href="{{ page.url | absolute_url | strip_index }}">
+  <meta property="og:url" content="{{ page.url | absolute_url | strip_index }}" />
+  <link rel="canonical" href="{{ page.url | absolute_url | strip_index }}" />
  {% endif %}

-  {% if img != "" and img != site.avatar %}
-  <meta name="twitter:card" content="summary_large_image">
+  {% if page.share-img %}
+  <meta property="og:image" content="{{ page.share-img }}" />
+  {% elsif site.avatar %}
+  <meta property="og:image" content="{{ site.avatar | absolute_url }}" />
+  {% endif %}
+
+
+  <!-- Twitter summary cards -->
+  <meta name="twitter:card" content="summary" />
+  <meta name="twitter:site" content="@{{ site.author.twitter }}" />
+  <meta name="twitter:creator" content="@{{ site.author.twitter }}" />
+
+  {% if page.meta-title %}
+  <meta name="twitter:title" content="{{ page.meta-title }}" />
+  {% elsif page.title %}
+  <meta name="twitter:title" content="{{ page.title }}" />
  {% else %}
-  <meta name="twitter:card" content="summary">
-  {% endif %}
-  <meta name="twitter:site" content="@{{ site.social-network-links.twitter }}">
-  <meta name="twitter:creator" content="@{{ site.social-network-links.twitter }}">
-
-  <meta property="twitter:title" content="{{ title }}">
-  <meta property="twitter:description" content="{{ description }}">
-
-  {% if img != "" %}
-  <meta name="twitter:image" content="{{ img | absolute_url }}">
+  <meta name="twitter:title" content="{{ site.title }}" />
  {% endif %}

+  {% if page.meta-description %}
+  <meta name="twitter:description" content="{{ page.meta-description }}">
+  {% elsif page.subtitle %}
+  <meta name="twitter:description" content="{{ page.subtitle }}">
+  {% else %}
+  <meta name="twitter:description" content="{{ page.content | strip_html | xml_escape | truncatewords: 50 }}">
+  {% endif %}
+
+  {% if page.share-img %}
+  <meta name="twitter:image" content="{{ page.share-img }}" />
+  {% elsif site.avatar %}
+  <meta name="twitter:image" content="{{ site.avatar | absolute_url }}" />
+  {% endif %}
+
+  {% if site.matomo %}
  {% include matomo.html %}
+  {% endif %}

  {% if page.comments and site.staticman.repository and site.staticman.branch %}
-  <link rel="stylesheet" href="{{ "/assets/css/staticman.css" | relative_url }}">
-  {% endif %}
-
-  {% if page.head-extra %}
-    {% for file in page.head-extra %}
-      {% include {{ file }} %}
-    {% endfor %}
+  <!-- Staticman -->
+  <link rel="stylesheet" href="{{ "/css/staticman.css" | relative_url }}" />
  {% endif %}

 </head>
--- a/blog.bryanroessler.com/_includes/header.html
+++ b/blog.bryanroessler.com/_includes/header.html
@@ -1,54 +1,43 @@
 <!-- TODO this file has become a mess, refactor it -->

-{% assign date_format = site.date_format | default: "%B %-d, %Y" %}
+{% if page.bigimg or page.title %}

-{% if page.cover-img or page.title %}
-
-{% if page.cover-img %}
-  <div id="header-big-imgs" data-num-img={% if page.cover-img.first %}{{ page.cover-img.size }}{% else %}1{% endif %}
-    {% for bigimg in page.cover-img %}
-    {% assign imgnum = forloop.index %}
-    {% for imginfo in bigimg %}
-      {% if imginfo[0] %}
-      data-img-src-{{ imgnum }}="{{ imginfo[0] | absolute_url }}"
-      data-img-desc-{{ imgnum }}="{{ imginfo[1] }}"
-    {% else %}
-      data-img-src-{{ imgnum }}="{{ imginfo | absolute_url }}"
-    {% endif %}
-    {% endfor %}
+{% if page.bigimg %}
+  <div id="header-big-imgs" data-num-img={% if page.bigimg.first %}{{ page.bigimg.size }}{% else %}1{% endif %}
+    {% for bigimg in page.bigimg %}
+	  {% assign imgnum = forloop.index %}
+	  {% for imginfo in bigimg %}
+	    {% if imginfo[0] %}
+		  data-img-src-{{ imgnum }}="{{ imginfo[0] | relative_url }}"
+		  data-img-desc-{{ imgnum }}="{{ imginfo[1] }}"
+		{% else %}
+		  data-img-src-{{ imgnum }}="{{ imginfo | relative_url }}"
+		{% endif %}
+	  {% endfor %}
    {% endfor %}
  ></div>
 {% endif %}

-<header class="header-section {% if page.cover-img %}has-img{% endif %}">
-{% if page.cover-img %}
+<header class="header-section {% if page.bigimg %}has-img{% endif %}">
+{% if page.bigimg %}
 <div class="big-img intro-header">
-  <div class="container-md">
+  <div class="container">
    <div class="row">
-      <div class="col-xl-8 offset-xl-2 col-lg-10 offset-lg-1">
+      <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
        <div class="{{ include.type }}-heading">
-          <h1>{% if page.title %}{{ page.title | strip_html }}{% else %}<br/>{% endif %}</h1>
-          {% if page.subtitle %}
-            {% if include.type == "page" %}
-              <hr class="small">
-              <span class="{{ include.type }}-subheading">{{ page.subtitle | strip_html }}</span>
-            {% else %}
-              <h2 class="{{ include.type }}-subheading">{{ page.subtitle | strip_html }}</h2>
-            {% endif %}
-          {% endif %}
+          <h1>{% if page.title %}{{ page.title }}{% else %}<br/>{% endif %}</h1>
+		  {% if page.subtitle %}
+		    {% if include.type == "page" %}
+            <hr class="small">
+            <span class="{{ include.type }}-subheading">{{ page.subtitle }}</span>
+			{% else %}
+			<h2 class="{{ include.type }}-subheading">{{ page.subtitle }}</h2>
+			{% endif %}
+		  {% endif %}

-          {% if include.type == "post" %}
-            <span class="post-meta">Posted on {{ page.date | date: date_format }}</span>
-            {% if page.last-updated %}
-              <span class="post-meta">
-                <span class="d-none d-md-inline middot">&middot;</span>
-                Last updated {{ page.last-updated | date: date_format }}
-              </span>
-            {% endif %}
-            {% if page.readtime %}
-              {% include readtime.html %}
-            {% endif %}
-          {% endif %}
+		  {% if include.type == "post" %}
+		  <span class="post-meta">Posted on {{ page.date | date: site.date_format }}</span>
+		  {% endif %}
        </div>
      </div>
    </div>
@@ -57,32 +46,23 @@
 </div>
 {% endif %}
 <div class="intro-header no-img">
-  <div class="container-md">
+  <div class="container">
    <div class="row">
-      <div class="col-xl-8 offset-xl-2 col-lg-10 offset-lg-1">
+      <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
        <div class="{{ include.type }}-heading">
-          <h1>{% if page.title %}{{ page.title | strip_html }}{% else %}<br/>{% endif %}</h1>
-          {% if page.subtitle %}
-            {% if include.type == "page" %}
-              <hr class="small">
-              <span class="{{ include.type }}-subheading">{{ page.subtitle | strip_html }}</span>
-            {% else %}
-              <h2 class="{{ include.type }}-subheading">{{ page.subtitle | strip_html }}</h2>
-            {% endif %}
-          {% endif %}
+          <h1>{% if page.title %}{{ page.title }}{% else %}<br/>{% endif %}</h1>
+		  {% if page.subtitle %}
+		    {% if include.type == "page" %}
+            <hr class="small">
+            <span class="{{ include.type }}-subheading">{{ page.subtitle }}</span>
+			{% else %}
+			<h2 class="{{ include.type }}-subheading">{{ page.subtitle }}</h2>
+			{% endif %}
+		  {% endif %}

-          {% if include.type == "post" %}
-            <span class="post-meta">Posted on {{ page.date | date: date_format }}</span>
-            {% if page.last-updated %}
-              <span class="post-meta">
-                <span class="d-none d-md-inline middot">&middot;</span>
-                Last updated {{ page.last-updated | date: date_format }}
-              </span>
-            {% endif %}
-            {% if page.readtime %}
-              {% include readtime.html %}
-            {% endif %}
-          {% endif %}
+		  {% if include.type == "post" %}
+		  <span class="post-meta">Posted on {{ page.date | date: site.date_format }}</span>
+		  {% endif %}
        </div>
      </div>
    </div>
--- a/blog.bryanroessler.com/_includes/nav.html
+++ b/blog.bryanroessler.com/_includes/nav.html
@@ -1,62 +1,57 @@
-<nav class="navbar navbar-expand-xl navbar-light fixed-top navbar-custom {% if page.nav-short %}top-nav-short-permanent{% else %}top-nav-regular{% endif %}">
+<nav class="navbar navbar-default navbar-fixed-top navbar-custom">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#main-navbar">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      {%- if site.title-img -%}
+        <a class="navbar-brand navbar-brand-logo" href="{{ '' | absolute_url }}"><img src="{{ site.title-img }}"/></a>
+      {%- else -%}
+        <a class="navbar-brand" href="{{ '' | absolute_url }}">{{ site.title }}</a>
+      {%- endif -%}
+    </div>

-  {%- if site.title-img -%}
-    <a class="navbar-brand navbar-brand-logo" href="{{ '' | absolute_url }}"><img alt="{{ site.title }} Logo" src="{{ site.title-img | relative_url}}"/></a>
-  {%- elsif site.title -%}
-    <a class="navbar-brand" href="{{ '' | absolute_url }}">{{ site.title }}</a>
-  {%- endif -%}
-
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#main-navbar" aria-controls="main-navbar" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
-
-  <div class="collapse navbar-collapse" id="main-navbar">
-    <ul class="navbar-nav ml-auto">
+    <div class="collapse navbar-collapse" id="main-navbar">
+      <ul class="nav navbar-nav navbar-right">
      {%- for link in site.navbar-links -%}
        {%- if link[1].first %}
-          <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ link[0] }}</a>
-            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
+          <li class="navlinks-container">
+            <a class="navlinks-parent" href="javascript:void(0)">{{ link[0] }}</a>
+            <div class="navlinks-children">
              {%- for childlink in link[1] -%}
-                {%- for linkparts in childlink %}
-                  <a class="dropdown-item" href="{{ linkparts[1] | relative_url }}">{{ linkparts[0] }}</a>
-                {%- endfor -%}
+              {%- for linkparts in childlink %}
+              <a href="{{ linkparts[1] | relative_url }}">{{ linkparts[0] }}</a>
+              {%- endfor -%}
              {%- endfor %}
            </div>
          </li>
        {% else %}
-          <li class="nav-item">
-            <a class="nav-link" href="{{ link[1] | relative_url }}">{{ link[0] }}</a>
-          </li>
+          <li><a href="{{ link[1] | relative_url }}">{{ link[0] }}</a></li>
        {%- endif -%}
      {%- endfor -%}
-      {% if site.post_search %}
-        <li class="nav-item">
-          <a class="nav-link" id="nav-search-link" href="#" title="Search">
-            <span id="nav-search-icon" class="fa fa-search"></span>
-            <span id="nav-search-text">Search</span>
-          </a>
-        </li>
-      {%- endif -%}
-    </ul>
-  </div>
-
-  {% if site.navbar-extra %}
-    {% for file in site.navbar-extra %}
-      {% include {{ file }} %}
-    {% endfor %}
-  {% endif %}
-
-  {% if site.avatar and page.show-avatar != false %}
-    <div class="avatar-container">
-      <div class="avatar-img-border">
-        <a href="{{ '' | absolute_url }}">
-          <img alt="Navigation bar avatar" class="avatar-img" src="{{ site.avatar | relative_url }}" />
-        </a>
-      </div>
+      </ul>
    </div>
-  {% endif %}

+	{% if page.image and (layout.show-avatar or page.show-avatar) %}
+	<div class="avatar-container">
+	  <div class="avatar-img-border">
+	    <a href="{{ '' | absolute_url }}">
+	      <img class="avatar-img" src="{{ page.image | relative_url }}" />
+		</a>
+	  </div>
+	</div>
+	{% elsif site.avatar and (layout.show-avatar or page.show-avatar) %}
+	<div class="avatar-container">
+	  <div class="avatar-img-border">
+	    <a href="{{ '' | absolute_url }}">
+	      <img class="avatar-img" src="{{ site.avatar | relative_url }}" />
+		</a>
+	  </div>
+	</div>
+	{% endif %}
+
+  </div>
 </nav>
-
-{% include search.html %}
--- a/blog.bryanroessler.com/_includes/search.html
+++ b/blog.bryanroessler.com/_includes/search.html
@@ -8,30 +8,10 @@
  
  <script src="https://unpkg.com/simple-jekyll-search@latest/dest/simple-jekyll-search.min.js"></script>
  <script>
-    var searchjson = '[ \
-      {% for post in site.posts %} \
-        { \
-          "title"    : "{% if post.title != "" %}{{ post.title | strip_html | escape }}{% else %}{{ post.excerpt | strip_html | escape | strip }}{%endif%}", \
-          "category" : "{{ post.tags | join: \', \' }}", \
-          "url"      : "{{ site.baseurl }}{{ post.url }}", \
-          "date"     : "{{ post.date | date: "%B %e, %Y" | default: "January 1, 1970" }}" \
-        }, \
-      {% endfor %} \
-      {% for page in site.html_pages %}{% if page.title != "{title}" and page.title != "404 - Page not found" %} \
-        { \
-          "title"    : "{% if page.title != "" %}{{ page.title | strip_html | escape }}{% else %}{{ page.excerpt | strip_html | escape | strip }}{% endif %}", \
-          "category" : "{% if page.tags %}{{ page.tags | join: \', \' }}{% else %}page{% endif %}", \
-          "url"      : "{{ site.baseurl }}{{ page.url }}", \
-          "date"     : "{{ page.date | date: '%B %e, %Y' | default: "January 1, 1970" }}" \
-        }{% unless forloop.last %},{% endunless %} \
-      {% endif %}{% endfor %} \
-    ]';
-    searchjson = JSON.parse(searchjson);
-
-    var sjs = SimpleJekyllSearch({
+    SimpleJekyllSearch({
      searchInput: document.getElementById('nav-search-input'),
      resultsContainer: document.getElementById('search-results-container'),
-      json: searchjson
+      json: '{{ site.baseurl }}/assets/data/searchcorpus.json' 
    });
  </script>
 </div>
--- a/blog.bryanroessler.com/_includes/social-networks-links.html
+++ b/blog.bryanroessler.com/_includes/social-networks-links.html
@@ -1,6 +1,9 @@
+{% if site.social-network-links %}
 <ul class="list-inline text-center footer-links">

-{%- if site.social-network-links.rss and site.rss-description -%}
+{%- for network in site.social-network-links -%}
+
+  {%- if network[0] == "rss" and network[1] and site.rss-description -%}
  <li class="list-inline-item">
    <a href="{{ '/feed.xml' | relative_url }}" title="RSS">
      <span class="fa-stack fa-lg" aria-hidden="true">
@@ -10,11 +13,11 @@
      <span class="sr-only">RSS</span>
    </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.email -%}
+  {%- if network[0] == "email" -%}
  <li class="list-inline-item">
-    <a href="mailto:{{ site.social-network-links.email }}" title="Email me">
+    <a href="mailto:{{ network[1] }}" title="Email me">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fas fa-envelope fa-stack-1x fa-inverse"></i>
@@ -22,11 +25,11 @@
      <span class="sr-only">Email me</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.calendly -%}
+  {%- if network[0] == "calendly" -%}
  <li class="list-inline-item">
-    <a href="https://calendly.com/{{ site.social-network-links.calendly }}" title="Schedule a meeting with me">
+    <a href="https://calendly.com/{{ network[1] }}" title="Schedule a meeting with me">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fas fa-calendar-check fa-stack-1x fa-inverse"></i>
@@ -34,11 +37,11 @@
      <span class="sr-only">Schedule a meeting with me</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.facebook -%}
+  {%- if network[0] == "facebook" -%}
  <li class="list-inline-item">
-    <a href="https://www.facebook.com/{{ site.social-network-links.facebook }}" title="Facebook">
+    <a href="https://www.facebook.com/{{ network[1] }}" title="Facebook">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-facebook fa-stack-1x fa-inverse"></i>
@@ -46,11 +49,11 @@
      <span class="sr-only">Facebook</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.telegram -%}
+  {%- if network[0] == "telegram" -%}
  <li class="list-inline-item">
-    <a href="https://t.me/{{ site.social-network-links.telegram }}" title="Telegram">
+    <a href="https://t.me/{{ network[1] }}" title="Telegram">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-telegram-plane fa-stack-1x fa-inverse"></i>
@@ -58,11 +61,23 @@
      <span class="sr-only">Telegram</span>
    </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.github -%}
+  {%- if network[0] == "whatsapp" -%}
  <li class="list-inline-item">
-    <a href="https://github.com/{{ site.social-network-links.github }}" title="GitHub">
+    <a href="https://wa.me/{{ network[1] }}" title="Whatsapp">
+      <span class="fa-stack fa-lg" aria-hidden="true">
+        <i class="fas fa-circle fa-stack-2x"></i>
+        <i class="fab fa-whatsapp fa-stack-1x fa-inverse"></i>
+      </span>
+      <span class="sr-only">Whatsapp</span>
+    </a>
+  </li>
+  {%- endif -%}
+
+  {%- if network[0] == "github" -%}
+  <li class="list-inline-item">
+    <a href="https://github.com/{{ network[1] }}" title="GitHub">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-github fa-stack-1x fa-inverse"></i>
@@ -70,23 +85,39 @@
      <span class="sr-only">GitHub</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.twitter -%}
+  {%- if network[0] == "gitlab" -%}
  <li class="list-inline-item">
-    <a href="https://twitter.com/{{ site.social-network-links.twitter }}" title="Twitter">
+    <a href="https://gitlab.com/{{ network[1] }}" title="GitLab">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
-        <i class="fab fa-twitter fa-stack-1x fa-inverse"></i>
+        <i class="fab fa-gitlab fa-stack-1x fa-inverse"></i>
      </span>
-      <span class="sr-only">Twitter</span>
+      <span class="sr-only">GitLab</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.reddit -%}
+  {%- if network[0] == "twitter" -%}
  <li class="list-inline-item">
-    <a href="https://reddit.com/u/{{ site.social-network-links.reddit }}" title="Reddit">
+    <a href="https://twitter.com/{{ network[1] }}" title="X (Twitter)">
+      <span class="fa-stack fa-lg" aria-hidden="true">
+        <i class="fas fa-circle fa-stack-2x"></i>
+        <i class="fab fa-x-twitter fa-stack-1x fa-inverse"></i>
+      </span>
+      <span class="sr-only">X (Twitter)</span>
+   </a>
+  </li>
+  {%- endif -%}
+
+  {%- if network[0] == "reddit" -%}
+  {% assign reddit_start = network[1] | split: "/" | first -%}
+  {% unless reddit_start == 'r' or reddit_start == 'u' -%}
+    {% assign reddit_url_prefix = 'u/' -%}
+  {% endunless -%}
+  <li class="list-inline-item">
+    <a href="https://reddit.com/{{ reddit_url_prefix }}{{ network[1] }}" title="Reddit">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-reddit fa-stack-1x fa-inverse"></i>
@@ -94,11 +125,11 @@
      <span class="sr-only">Reddit</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.linkedin -%}
+  {%- if network[0] == "linkedin" -%}
  <li class="list-inline-item">
-    <a href="https://linkedin.com/in/{{ site.social-network-links.linkedin }}" title="LinkedIn">
+    <a href="https://linkedin.com/in/{{ network[1] }}" title="LinkedIn">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-linkedin fa-stack-1x fa-inverse"></i>
@@ -106,11 +137,11 @@
      <span class="sr-only">LinkedIn</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.xing -%}
+  {%- if network[0] == "xing" -%}
  <li class="list-inline-item">
-    <a href="https://www.xing.com/profile/{{ site.social-network-links.xing }}" title="Xing">
+    <a href="https://www.xing.com/profile/{{ network[1] }}" title="Xing">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-xing fa-stack-1x fa-inverse"></i>
@@ -118,11 +149,11 @@
      <span class="sr-only">Xing</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.stackoverflow -%}
+  {%- if network[0] == "stackoverflow" -%}
  <li class="list-inline-item">
-    <a href="https://stackoverflow.com/users/{{ site.social-network-links.stackoverflow }}" title="StackOverflow">
+    <a href="https://stackoverflow.com/users/{{ network[1] }}" title="StackOverflow">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-stack-overflow fa-stack-1x fa-inverse"></i>
@@ -130,11 +161,11 @@
      <span class="sr-only">StackOverflow</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.snapchat -%}
+  {%- if network[0] == "snapchat" -%}
  <li class="list-inline-item">
-    <a href="https://www.snapchat.com/add/{{ site.social-network-links.snapchat }}" title="Snapchat">
+    <a href="https://www.snapchat.com/add/{{ network[1] }}" title="Snapchat">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-snapchat-ghost fa-stack-1x fa-inverse"></i>
@@ -142,11 +173,11 @@
      <span class="sr-only">Snapchat</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.instagram -%}
+  {%- if network[0] == "instagram" -%}
  <li class="list-inline-item">
-    <a href="https://www.instagram.com/{{ site.social-network-links.instagram }}" title="Instagram">
+    <a href="https://www.instagram.com/{{ network[1] }}" title="Instagram">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-instagram fa-stack-1x fa-inverse"></i>
@@ -154,11 +185,11 @@
      <span class="sr-only">Instagram</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.youtube -%}
+  {%- if network[0] == "youtube" -%}
  <li class="list-inline-item">
-    <a href="https://www.youtube.com/{{ site.social-network-links.youtube }}" title="YouTube">
+    <a href="https://www.youtube.com/{{ network[1] }}" title="YouTube">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-youtube fa-stack-1x fa-inverse"></i>
@@ -166,11 +197,11 @@
      <span class="sr-only">YouTube</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.spotify -%}
+  {%- if network[0] == "spotify" -%}
  <li class="list-inline-item">
-    <a href="https://open.spotify.com/user/{{ site.social-network-links.spotify }}" title="Spotify">
+    <a href="https://open.spotify.com/user/{{ network[1] }}" title="Spotify">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-spotify fa-stack-1x fa-inverse"></i>
@@ -178,11 +209,11 @@
      <span class="sr-only">Spotify</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.telephone -%}
+  {%- if network[0] == "telephone" -%}
  <li class="list-inline-item">
-    <a href="tel:{{ site.social-network-links.telephone }}" title="Phone">
+    <a href="tel:{{ network[1] }}" title="Phone">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fas fa-phone fa-stack-1x fa-inverse"></i>
@@ -190,11 +221,11 @@
      <span class="sr-only">Phone</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.steam -%}
+  {%- if network[0] == "steam" -%}
  <li class="list-inline-item">
-    <a href="https://steamcommunity.com/id/{{ site.social-network-links.steam }}" title="Steam">
+    <a href="https://steamcommunity.com/id/{{ network[1] }}" title="Steam">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-steam fa-stack-1x fa-inverse"></i>
@@ -202,11 +233,11 @@
      <span class="sr-only">Steam</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.twitch -%}
+  {%- if network[0] == "twitch" -%}
  <li class="list-inline-item">
-    <a href="https://www.twitch.tv/{{ site.social-network-links.twitch }}" title="Twitch">
+    <a href="https://www.twitch.tv/{{ network[1] }}" title="Twitch">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-twitch fa-stack-1x fa-inverse"></i>
@@ -214,11 +245,11 @@
      <span class="sr-only">Twitch</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.yelp -%}
+  {%- if network[0] == "yelp" -%}
  <li class="list-inline-item">
-    <a href="https://{{ site.social-network-links.yelp }}.yelp.com" title="Yelp">
+    <a href="https://yelp.com/{{ network[1] }}" title="Yelp">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-yelp fa-stack-1x fa-inverse"></i>
@@ -226,11 +257,11 @@
      <span class="sr-only">Yelp</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.mastodon -%}
+  {%- if network[0] == "mastodon" -%}
  <li class="list-inline-item">
-    <a rel="me" href="https://{{ site.social-network-links.mastodon }}" title="Mastodon">
+    <a rel="me" href="https://{{ network[1] }}" title="Mastodon">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-mastodon fa-stack-1x fa-inverse"></i>
@@ -238,11 +269,23 @@
      <span class="sr-only">Mastodon</span>
    </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.ORCID -%}
+  {%- if network[0] == "bluesky" -%}
+  <li class="list-inline-item">
+    <a rel="me" href="https://bsky.app/profile/{{ network[1] }}" title="Bluesky">
+      <span class="fa-stack fa-lg" aria-hidden="true">
+        <i class="fas fa-circle fa-stack-2x"></i>
+        <i class="fas fa-square fa-stack-1x fa-inverse"></i>
+      </span>
+      <span class="sr-only">Bluesky</span>
+    </a>
+  </li>
+  {%- endif -%}
+
+  {%- if network[0] == "ORCID" -%}
 <li class="list-inline-item">
-   <a href="https://orcid.org/{{ site.social-network-links.ORCID }}" title="ORCID">
+   <a href="https://orcid.org/{{ network[1] }}" title="ORCID">
     <span class="fa-stack fa-lg" aria-hidden="true">
       <i class="fas fa-circle fa-stack-2x"></i>
       <i class="fab fa-orcid fa-stack-1x fa-inverse"></i>
@@ -250,11 +293,11 @@
     <span class="sr-only">ORCID</span>
   </a>
 </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.google-scholar -%}
+  {%- if network[0] == "google-scholar" -%}
  <li class="list-inline-item">
-    <a href="https://scholar.google.com/{{ site.social-network-links.google-scholar }}" title="Google Scholar">
+    <a href="https://scholar.google.com/citations?user={{ network[1] }}" title="Google Scholar">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fa fa-graduation-cap fa-stack-1x fa-inverse"></i>
@@ -262,11 +305,11 @@
      <span class="sr-only">Google Scholar</span>
    </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.patreon -%}
+  {%- if network[0] == "patreon" -%}
  <li class="list-inline-item">
-    <a href="https://patreon.com/{{ site.social-network-links.patreon }}" title="Patreon">
+    <a href="https://patreon.com/{{ network[1] }}" title="Patreon">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-patreon fa-stack-1x fa-inverse"></i>
@@ -274,11 +317,11 @@
      <span class="sr-only">Patreon</span>
    </a>
  </li>
-{%- endif -%}
-  
-{%- if site.social-network-links.medium -%}
+  {%- endif -%}
+
+  {%- if network[0] == "medium" -%}
  <li class="list-inline-item">
-    <a href="https://medium.com/@{{ site.social-network-links.medium }}" title="Medium">
+    <a href="https://medium.com/@{{ network[1] }}" title="Medium">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-medium fa-stack-1x fa-inverse"></i>
@@ -286,11 +329,11 @@
      <span class="sr-only">Medium</span>
    </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.itchio -%}
+  {%- if network[0] == "itchio" -%}
  <li class="list-inline-item">
-    <a href="https://{{ site.social-network-links.itchio }}.itch.io/" title="Itchio">
+    <a href="https://{{ network[1] }}.itch.io/" title="Itchio">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-itch-io fa-stack-1x fa-inverse"></i>
@@ -298,11 +341,15 @@
      <span class="sr-only">Itchio</span>
   </a>
  </li>
-{%- endif -%}
-  
-{%- if site.social-network-links.discord -%}
+  {%- endif -%}
+
+  {%- if network[0] == "discord" -%}
+  {% assign discord_start = network[1] | split: "/" | first -%}
+  {% unless discord_start == 'users' or discord_start == 'invite' -%}
+    {% assign discord_url_prefix = 'invite/' -%}
+  {% endunless -%}
  <li class="list-inline-item">
-    <a href="https://discord.com/{{ site.social-network-links.discord }}" title="Discord">
+    <a href="https://discord.com/{{discord_url_prefix}}{{network[1]}}" title="Discord">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-discord fa-stack-1x fa-inverse"></i>
@@ -310,11 +357,11 @@
      <span class="sr-only">Discord</span>
   </a>
  </li>
-{%- endif -%}
-  
-{%- if site.social-network-links.kaggle -%}
+  {%- endif -%}
+
+  {%- if network[0] == "kaggle" -%}
  <li class="list-inline-item">
-    <a href="https://www.kaggle.com/{{ site.social-network-links.kaggle }}" title="Kaggle">
+    <a href="https://www.kaggle.com/{{ network[1] }}" title="Kaggle">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-kaggle fa-stack-1x fa-inverse"></i>
@@ -322,11 +369,11 @@
      <span class="sr-only">Kaggle</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}

-{%- if site.social-network-links.hackerrank -%}
+  {%- if network[0] == "hackerrank" -%}
  <li class="list-inline-item">
-    <a href="https://www.hackerrank.com/{{ site.social-network-links.hackerrank }}" title="Hackerrank">
+    <a href="https://www.hackerrank.com/{{ network[1] }}" title="Hackerrank">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
        <i class="fab fa-hackerrank fa-stack-1x fa-inverse"></i>
@@ -334,6 +381,21 @@
      <span class="sr-only">Hackerrank</span>
   </a>
  </li>
-{%- endif -%}
+  {%- endif -%}
+
+  {%- if network[0] == "untappd" -%}
+  <li class="list-inline-item">
+    <a href="https://untappd.com/user/{{ network[1] }}" title="Untappd">
+      <span class="fa-stack fa-lg" aria-hidden="true">
+        <i class="fas fa-circle fa-stack-2x"></i>
+        <i class="fab fa-untappd fa-stack-1x fa-inverse"></i>
+      </span>
+      <span class="sr-only">Untappd</span>
+   </a>
+  </li>
+  {%- endif -%}
+
+{%- endfor -%}

 </ul>
+{% endif %}
--- a/blog.bryanroessler.com/_includes/social-share.html
+++ b/blog.bryanroessler.com/_includes/social-share.html
@@ -11,45 +11,32 @@
  <span class="sr-only">Share: </span>

  {% if site.share-links-active.twitter %}
-    <a href="https://twitter.com/intent/tweet?text={{ page.title | strip_html | url_encode }}&url={{ page.url | absolute_url | url_encode }}"
+  <!--- Share on Twitter -->
+    <a href="https://twitter.com/intent/tweet?text={{ page.title | url_encode }}&url={{ page.url | absolute_url | url_encode }}"
      class="btn btn-social-icon btn-twitter" title="Share on Twitter">
-      <span class="fab fa-fw fa-twitter" aria-hidden="true"></span>
+      <span class="fa fa-fw fa-twitter" aria-hidden="true"></span>
      <span class="sr-only">Twitter</span>
    </a>
  {% endif %}

  {% if site.share-links-active.facebook %}
+  <!--- Share on Facebook -->
    <a href="https://www.facebook.com/sharer/sharer.php?u={{ page.url | absolute_url | url_encode }}"
      class="btn btn-social-icon btn-facebook" title="Share on Facebook">
-      <span class="fab fa-fw fa-facebook" aria-hidden="true"></span>
+      <span class="fa fa-fw fa-facebook" aria-hidden="true"></span>
      <span class="sr-only">Facebook</span>
    </a>
  {% endif %}

  {% if site.share-links-active.linkedin %}
+  <!--- Share on LinkedIn -->
    <a href="https://www.linkedin.com/shareArticle?mini=true&url={{ page.url | absolute_url | url_encode }}"
      class="btn btn-social-icon btn-linkedin" title="Share on LinkedIn">
-      <span class="fab fa-fw fa-linkedin" aria-hidden="true"></span>
+      <span class="fa fa-fw fa-linkedin" aria-hidden="true"></span>
      <span class="sr-only">LinkedIn</span>
    </a>
  {% endif %}

-  {% if site.share-links-active.vk %}
-    <a href="https://vk.com/share.php?url={{ page.url | absolute_url | url_encode }}"
-      class="btn btn-social-icon btn-vk" title="Share on VK">
-      <span class="fab fa-fw fa-vk" aria-hidden="true"></span>
-      <span class="sr-only">VK</span>
-    </a>
-  {% endif %}
-
-  {% if site.share-links-active.reddit %}
-    <a href="https://www.reddit.com/submit?url={{ page.url | absolute_url | url_encode }}"
-      class="btn btn-social-icon btn-reddit" title="Share on Reddit">
-      <span class="fab fa-fw fa-reddit" aria-hidden="true"></span>
-      <span class="sr-only">Reddit</span>
-    </a>
-  {% endif %}
-
 </section>

 {% endif %}
--- a/blog.bryanroessler.com/_includes/staticman-comments.html
+++ b/blog.bryanroessler.com/_includes/staticman-comments.html
@@ -1,5 +1,4 @@
 {% if site.staticman.repository and site.staticman.branch %}
-<div class="staticman-comments">
  <div class="page__comments">
    <!-- Start static comments -->
    <div class="js-comments">
@@ -25,7 +24,7 @@
        <div class="form-group">
          <label for="comment-form-message">{{ site.data.ui-text[site.locale].comment_form_comment_label | default: "Comment" }} <small class="required">*</small></label><br>
          <textarea type="text" rows="12" cols="36" id="comment-form-message" name="fields[message]" tabindex="1"></textarea>
-          <div class="small form-text"><a href="https://daringfireball.net/projects/markdown/">{{ site.data.ui-text[site.locale].comment_form_md_info | default: "Markdown is supported." }}</a></div>
+          <div class="small help-block"><a href="https://daringfireball.net/projects/markdown/">{{ site.data.ui-text[site.locale].comment_form_md_info | default: "Markdown is supported." }}</a></div>
        </div>
        <div class="form-group">
          <label for="comment-form-name">{{ site.data.ui-text[site.locale].comment_form_name_label | default: "Name" }} <small class="required">*</small></label>
@@ -39,7 +38,7 @@
          <label for="comment-form-url">{{ site.data.ui-text[site.locale].comment_form_website_label | default: "Website (optional)" }}</label>
          <input type="url" id="comment-form-url" name="fields[url]" tabindex="4"/>
        </div>
-        <div class="form-group d-none" style="display: none;">
+        <div class="form-group hidden" style="display: none;">
          <input type="hidden" name="options[origin]" value="{{ page.url | absolute_url }}">
          <input type="hidden" name="options[slug]" value="{{ page.slug }}">
          <label for="comment-form-location">Not used. Leave blank if you are a human.</label>
@@ -48,9 +47,9 @@
          {% if site.staticman.reCaptcha.secret %}<input type="hidden" name="options[reCaptcha][secret]" value="{{ site.staticman.reCaptcha.secret }}">{% endif %}
        </div>
        <!-- Start comment form alert messaging -->
-        <p class="d-none js-notice alert">
-          <strong class="js-notice-text-success d-none">{{ site.data.ui-text[site.locale].comment_success_msg | default: "Thanks for your comment! It will show on the site once it has been approved." }}</strong>
-          <strong class="js-notice-text-failure d-none">{{ site.data.ui-text[site.locale].comment_error_msg | default: "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again." }}</strong>
+        <p class="hidden js-notice">
+          <strong class="js-notice-text-success hidden">{{ site.data.ui-text[site.locale].comment_success_msg | default: "Thanks for your comment! It will show on the site once it has been approved." }}</strong>
+          <strong class="js-notice-text-failure hidden">{{ site.data.ui-text[site.locale].comment_error_msg | default: "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again." }}</strong>
        </p>
        <!-- End comment form alert messaging -->
        {% if site.staticman.reCaptcha.siteKey %}
@@ -59,8 +58,8 @@
          </div>
        {% endif %}
        <div class="form-group">
-          <button type="submit" id="comment-form-submit" tabindex="5" class="btn btn-primary btn-lg">{{ site.data.ui-text[site.locale].comment_btn_submit | default: "Submit Comment" }}</button>
-          <button type="submit" id="comment-form-submitted" tabindex="5" class="btn btn-primary btn-lg d-none" disabled>{{ site.data.ui-text[site.locale].comment_btn_submitted | default: "Submitted" }}</button>
+          <button type="submit" id="comment-form-submit" tabindex="5" class="btn btn--primary btn--large">{{ site.data.ui-text[site.locale].comment_btn_submit | default: "Submit Comment" }}</button>
+          <button type="submit" id="comment-form-submitted" tabindex="5" class="btn btn--primary btn--large hidden" disabled>{{ site.data.ui-text[site.locale].comment_btn_submitted | default: "Submitted" }}</button>
        </div>
      </form>
    </div>
@@ -75,9 +74,8 @@
  <!-- doing something a bit funky here because I want to be careful not to include JQuery twice! -->
  <script>
    if (typeof jQuery == 'undefined') {
-      document.write('<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></scr' + 'ipt>');
+      document.write('<script src="{{ "/js/jquery-1.11.2.min.js" | relative_url }}"></scr' + 'ipt>');
    }
  </script>
-  <script src="{{ "/assets/js/staticman.js" | relative_url }}"></script>
-</div>
+  <script src="{{ "/js/staticman.js" | relative_url }}"></script>
 {% endif %}