diff --git a/_config.yml b/_config.yml
index 04e106d..9676847 100644
--- a/_config.yml
+++ b/_config.yml
@@ -34,7 +34,7 @@ comments:
     # https://developers.facebook.com/docs/plugins/comments
     appid: 278555981041512
     num_posts: 5 # 5 (default)
-    colorscheme: "light" # "light" (default), "dark"
+    colorscheme: "dark" # "light" (default), "dark"
   utterances:
     theme: # "github-light" (default), "github-dark"
     issue_term: # "pathname" (default)
diff --git a/_includes/comments-providers/facebook.html b/_includes/comments-providers/facebook.html
index 009dc1c..692c90a 100644
--- a/_includes/comments-providers/facebook.html
+++ b/_includes/comments-providers/facebook.html
@@ -1,8 +1,13 @@
 <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 = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.5{% if site.comments.facebook.appid %}&appId={{ site.comments.facebook.appid }}{% endif %}";
-  fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));</script>
\ No newline at end of file
+<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 =
+      "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.5{% if site.comments.facebook.appid %}&appId={{ site.comments.facebook.appid }}{% endif %}";
+    fjs.parentNode.insertBefore(js, fjs);
+  })(document, "script", "facebook-jssdk");
+</script>
diff --git a/_includes/comments.html b/_includes/comments.html
index dbb90d1..3714553 100644
--- a/_includes/comments.html
+++ b/_includes/comments.html
@@ -1,159 +1,308 @@
 <div class="page__comments">
-  {% capture comments_label %}{{ site.data.ui-text[site.locale].comments_label | default: "Comments" }}{% endcapture %}
-  {% case site.comments.provider %}
-    {% when "discourse" %}
-      <h4 class="page__comments-title">{{ comments_label }}</h4>
-      <section id="discourse-comments"></section>
-    {% when "disqus" %}
-      <h4 class="page__comments-title">{{ comments_label }}</h4>
-      <section id="disqus_thread"></section>
-    {% when "facebook" %}
-      <h4 class="page__comments-title">{{ comments_label }}</h4>
-      <section class="fb-comments" data-href="{{ page.url | absolute_url }}" data-mobile="true" data-num-posts="{{ site.comments.facebook.num_posts | default: 5 }}" data-width="100%" data-colorscheme="{{ site.comments.facebook.colorscheme | default: 'light' }}"></section>
-    {% when "staticman_v2" %}
-      <section id="static-comments">
-        {% if site.repository and site.comments.staticman.branch %}
-          <!-- Start static comments -->
-          <div class="js-comments">
-            {% if site.data.comments[page.slug] %}
-              <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_title | default: "Comments" }}</h4>
-              {% assign comments = site.data.comments[page.slug] | sort %}
+  {% capture comments_label %}{{ site.data.ui-text[site.locale].comments_label |
+  default: "Comments" }}{% endcapture %} {% case site.comments.provider %} {%
+  when "discourse" %}
+  <h4 class="page__comments-title">{{ comments_label }}</h4>
+  <section id="discourse-comments"></section>
+  {% when "disqus" %}
+  <h4 class="page__comments-title">{{ comments_label }}</h4>
+  <section id="disqus_thread"></section>
+  {% when "facebook" %}
+  <h4 class="page__comments-title">{{ comments_label }}</h4>
+  <section
+    class="fb-comments"
+    data-href="{{ page.url | absolute_url }}"
+    data-mobile="true"
+    data-num-posts="{{ site.comments.facebook.num_posts | default: 5 }}"
+    data-width="100%"
+    data-colorscheme="{{ site.comments.facebook.colorscheme | default: 'light' }}"
+  ></section>
+  {% when "staticman_v2" %}
+  <section id="static-comments">
+    {% if site.repository and site.comments.staticman.branch %}
+    <!-- Start static comments -->
+    <div class="js-comments">
+      {% if site.data.comments[page.slug] %}
+      <h4 class="page__comments-title">
+        {{ site.data.ui-text[site.locale].comments_title | default: "Comments"
+        }}
+      </h4>
+      {% assign comments = site.data.comments[page.slug] | sort %} {% for
+      comment in comments %} {% assign email = comment[1].email %} {% assign
+      name = comment[1].name %} {% assign url = comment[1].url %} {% assign date
+      = comment[1].date %} {% assign message = comment[1].message %} {% include
+      comment.html index=forloop.index email=email name=name url=url date=date
+      message=message %} {% endfor %} {% endif %}
+    </div>
+    <!-- End static comments -->
 
-              {% for comment in comments %}
-                {% assign email = comment[1].email %}
-                {% assign name = comment[1].name %}
-                {% assign url = comment[1].url %}
-                {% assign date = comment[1].date %}
-                {% assign message = comment[1].message %}
-                {% include comment.html index=forloop.index email=email name=name url=url date=date message=message %}
-              {% endfor %}
-            {% endif %}
-          </div>
-          <!-- End static comments -->
-
-          <!-- Start new comment form -->
-          <div class="page__comments-form">
-            <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_label | default: "Leave a Comment" }}</h4>
-            <p class="small">{{ site.data.ui-text[site.locale].comment_form_info | default: "Your email address will not be published. Required fields are marked" }} <span class="required">*</span></p>
-            <form id="new_comment" class="page__comments-form js-form form" method="post" action="{{ site.comments.staticman.endpoint | default: 'https://api.staticman.net/v2/entry/' }}{{ site.repository }}/{{ site.comments.staticman.branch }}/comments">
-              <div class="form__spinner">
-                <i class="fas fa-spinner fa-spin fa-3x fa-fw"></i>
-                <span class="sr-only">{{ site.data.ui-text[site.locale].loading_label | default: "Loading..." }}</span>
-              </div>
+    <!-- Start new comment form -->
+    <div class="page__comments-form">
+      <h4 class="page__comments-title">
+        {{ site.data.ui-text[site.locale].comments_label | default: "Leave a
+        Comment" }}
+      </h4>
+      <p class="small">
+        {{ site.data.ui-text[site.locale].comment_form_info | default: "Your
+        email address will not be published. Required fields are marked" }}
+        <span class="required">*</span>
+      </p>
+      <form
+        id="new_comment"
+        class="page__comments-form js-form form"
+        method="post"
+        action="{{ site.comments.staticman.endpoint | default: 'https://api.staticman.net/v2/entry/' }}{{ site.repository }}/{{ site.comments.staticman.branch }}/comments"
+      >
+        <div class="form__spinner">
+          <i class="fas fa-spinner fa-spin fa-3x fa-fw"></i>
+          <span class="sr-only"
+            >{{ site.data.ui-text[site.locale].loading_label | default:
+            "Loading..." }}</span
+          >
+        </div>
 
-              <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>
-                <textarea type="text" rows="3" id="comment-form-message" name="fields[message]" tabindex="1"></textarea>
-                <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>
-                <input type="text" id="comment-form-name" name="fields[name]" tabindex="2" />
-              </div>
-              <div class="form-group">
-                <label for="comment-form-email">{{ site.data.ui-text[site.locale].comment_form_email_label | default: "Email address" }} <small class="required">*</small></label>
-                <input type="email" id="comment-form-email" name="fields[email]" tabindex="3" />
-              </div>
-              <div class="form-group">
-                <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 hidden" style="display: none;">
-                <input type="hidden" name="options[slug]" value="{{ page.slug }}">
-                <label for="comment-form-location">Not used. Leave blank if you are a human.</label>
-                <input type="text" id="comment-form-location" name="fields[hidden]" autocomplete="off"/>
-                {% if site.reCaptcha.siteKey %}<input type="hidden" name="options[reCaptcha][siteKey]" value="{{ site.reCaptcha.siteKey }}">{% endif %}
-                {% if site.reCaptcha.secret %}<input type="hidden" name="options[reCaptcha][secret]" value="{{ site.reCaptcha.secret }}">{% endif %}
-              </div>
-              <!-- Start comment form alert messaging -->
-              <p class="hidden js-notice">
-                <strong class="js-notice-text"></strong>
-              </p>
-              <!-- End comment form alert messaging -->
-              {% if site.reCaptcha.siteKey %}
-                <div class="form-group">
-                  <div class="g-recaptcha" data-sitekey="{{ site.reCaptcha.siteKey }}"></div>
-                </div>
-              {% endif %}
-              <div class="form-group">
-                <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>
-              </div>
-            </form>
+        <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
+          >
+          <textarea
+            type="text"
+            rows="3"
+            id="comment-form-message"
+            name="fields[message]"
+            tabindex="1"
+          ></textarea>
+          <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>
-          <!-- End new comment form -->
-          {% if site.reCaptcha.siteKey %}<script async src="https://www.google.com/recaptcha/api.js"></script>{% endif %}
+        </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
+          >
+          <input
+            type="text"
+            id="comment-form-name"
+            name="fields[name]"
+            tabindex="2"
+          />
+        </div>
+        <div class="form-group">
+          <label for="comment-form-email"
+            >{{ site.data.ui-text[site.locale].comment_form_email_label |
+            default: "Email address" }} <small class="required">*</small></label
+          >
+          <input
+            type="email"
+            id="comment-form-email"
+            name="fields[email]"
+            tabindex="3"
+          />
+        </div>
+        <div class="form-group">
+          <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 hidden" style="display: none">
+          <input type="hidden" name="options[slug]" value="{{ page.slug }}" />
+          <label for="comment-form-location"
+            >Not used. Leave blank if you are a human.</label
+          >
+          <input
+            type="text"
+            id="comment-form-location"
+            name="fields[hidden]"
+            autocomplete="off"
+          />
+          {% if site.reCaptcha.siteKey %}<input
+            type="hidden"
+            name="options[reCaptcha][siteKey]"
+            value="{{ site.reCaptcha.siteKey }}"
+          />{% endif %} {% if site.reCaptcha.secret %}<input
+            type="hidden"
+            name="options[reCaptcha][secret]"
+            value="{{ site.reCaptcha.secret }}"
+          />{% endif %}
+        </div>
+        <!-- Start comment form alert messaging -->
+        <p class="hidden js-notice">
+          <strong class="js-notice-text"></strong>
+        </p>
+        <!-- End comment form alert messaging -->
+        {% if site.reCaptcha.siteKey %}
+        <div class="form-group">
+          <div
+            class="g-recaptcha"
+            data-sitekey="{{ site.reCaptcha.siteKey }}"
+          ></div>
+        </div>
         {% endif %}
-      </section>
-    {% when "staticman" %}
-      <section id="static-comments">
-        {% if site.repository and site.staticman.branch %}
-          <!-- Start static comments -->
-          <div class="js-comments">
-            {% if site.data.comments[page.slug] %}
-              <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_title | default: "Comments" }}</h4>
-              {% assign comments = site.data.comments[page.slug] | sort %}
+        <div class="form-group">
+          <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>
+        </div>
+      </form>
+    </div>
+    <!-- End new comment form -->
+    {% if site.reCaptcha.siteKey %}
+    <script async src="https://www.google.com/recaptcha/api.js"></script>
+    {% endif %} {% endif %}
+  </section>
+  {% when "staticman" %}
+  <section id="static-comments">
+    {% if site.repository and site.staticman.branch %}
+    <!-- Start static comments -->
+    <div class="js-comments">
+      {% if site.data.comments[page.slug] %}
+      <h4 class="page__comments-title">
+        {{ site.data.ui-text[site.locale].comments_title | default: "Comments"
+        }}
+      </h4>
+      {% assign comments = site.data.comments[page.slug] | sort %} {% for
+      comment in comments %} {% assign email = comment[1].email %} {% assign
+      name = comment[1].name %} {% assign url = comment[1].url %} {% assign date
+      = comment[1].date %} {% assign message = comment[1].message %} {% include
+      comment.html index=forloop.index email=email name=name url=url date=date
+      message=message %} {% endfor %} {% endif %}
+    </div>
+    <!-- End static comments -->
 
-              {% for comment in comments %}
-                {% assign email = comment[1].email %}
-                {% assign name = comment[1].name %}
-                {% assign url = comment[1].url %}
-                {% assign date = comment[1].date %}
-                {% assign message = comment[1].message %}
-                {% include comment.html index=forloop.index email=email name=name url=url date=date message=message %}
-              {% endfor %}
-            {% endif %}
-          </div>
-          <!-- End static comments -->
+    <!-- Start new comment form -->
+    <div class="page__comments-form">
+      <h4 class="page__comments-title">
+        {{ site.data.ui-text[site.locale].comments_label | default: "Leave a
+        Comment" }}
+      </h4>
+      <p class="small">
+        {{ site.data.ui-text[site.locale].comment_form_info | default: "Your
+        email address will not be published. Required fields are marked" }}
+        <span class="required">*</span>
+      </p>
+      <form
+        id="new_comment"
+        class="page__comments-form js-form form"
+        method="post"
+        action="https://api.staticman.net/v1/entry/{{ site.repository }}/{{ site.staticman.branch }}"
+      >
+        <div class="form__spinner">
+          <i class="fas fa-spinner fa-spin fa-3x fa-fw"></i>
+          <span class="sr-only"
+            >{{ site.data.ui-text[site.locale].loading_label | default:
+            "Loading..." }}</span
+          >
+        </div>
 
-          <!-- Start new comment form -->
-          <div class="page__comments-form">
-            <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_label | default: "Leave a Comment" }}</h4>
-            <p class="small">{{ site.data.ui-text[site.locale].comment_form_info | default: "Your email address will not be published. Required fields are marked" }} <span class="required">*</span></p>
-            <form id="new_comment" class="page__comments-form js-form form" method="post" action="https://api.staticman.net/v1/entry/{{ site.repository }}/{{ site.staticman.branch }}">
-              <div class="form__spinner">
-                <i class="fas fa-spinner fa-spin fa-3x fa-fw"></i>
-                <span class="sr-only">{{ site.data.ui-text[site.locale].loading_label | default: "Loading..." }}</span>
-              </div>
-
-              <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>
-                <textarea type="text" rows="3" id="comment-form-message" name="fields[message]" tabindex="1"></textarea>
-                <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>
-                <input type="text" id="comment-form-name" name="fields[name]" tabindex="2" />
-              </div>
-              <div class="form-group">
-                <label for="comment-form-email">{{ site.data.ui-text[site.locale].comment_form_email_label | default: "Email address" }} <small class="required">*</small></label>
-                <input type="email" id="comment-form-email" name="fields[email]" tabindex="3" />
-              </div>
-              <div class="form-group">
-                <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 hidden" style="display: none;">
-                <input type="hidden" name="options[slug]" value="{{ page.slug }}">
-                <label for="comment-form-location">Not used. Leave blank if you are a human.</label>
-                <input type="text" id="comment-form-location" name="fields[hidden]" autocomplete="off"/>
-              </div>
-              <!-- Start comment form alert messaging -->
-              <p class="hidden js-notice">
-                <strong class="js-notice-text"></strong>
-              </p>
-              <!-- End comment form alert messaging -->
-              <div class="form-group">
-                <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>
-              </div>
-            </form>
+        <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
+          >
+          <textarea
+            type="text"
+            rows="3"
+            id="comment-form-message"
+            name="fields[message]"
+            tabindex="1"
+          ></textarea>
+          <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>
-          <!-- End new comment form -->
-        {% endif %}
-      </section>
-    {% when "utterances" %}
-      <h4 class="page__comments-title">{{ comments_label }}</h4>
-      <section id="utterances-comments"></section>
-    {% when "custom" %}
-      {% include /comments-providers/custom.html %}
-  {% endcase %}
+        </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
+          >
+          <input
+            type="text"
+            id="comment-form-name"
+            name="fields[name]"
+            tabindex="2"
+          />
+        </div>
+        <div class="form-group">
+          <label for="comment-form-email"
+            >{{ site.data.ui-text[site.locale].comment_form_email_label |
+            default: "Email address" }} <small class="required">*</small></label
+          >
+          <input
+            type="email"
+            id="comment-form-email"
+            name="fields[email]"
+            tabindex="3"
+          />
+        </div>
+        <div class="form-group">
+          <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 hidden" style="display: none">
+          <input type="hidden" name="options[slug]" value="{{ page.slug }}" />
+          <label for="comment-form-location"
+            >Not used. Leave blank if you are a human.</label
+          >
+          <input
+            type="text"
+            id="comment-form-location"
+            name="fields[hidden]"
+            autocomplete="off"
+          />
+        </div>
+        <!-- Start comment form alert messaging -->
+        <p class="hidden js-notice">
+          <strong class="js-notice-text"></strong>
+        </p>
+        <!-- End comment form alert messaging -->
+        <div class="form-group">
+          <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>
+        </div>
+      </form>
+    </div>
+    <!-- End new comment form -->
+    {% endif %}
+  </section>
+  {% when "utterances" %}
+  <h4 class="page__comments-title">{{ comments_label }}</h4>
+  <section id="utterances-comments"></section>
+  {% when "custom" %} {% include /comments-providers/custom.html %} {% endcase
+  %}
 </div>
diff --git a/_sass/minimal-mistakes/_comment.scss b/_sass/minimal-mistakes/_comment.scss
deleted file mode 100644
index d816305..0000000
--- a/_sass/minimal-mistakes/_comment.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.fb-comments {
-  background: #aaa;
-}