diff --git a/_config.yml b/_config.yml
index f2cde20..3fdb03e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -12,14 +12,14 @@ website:
 software:
     # These should point to the-flux-of-thought repository.
     home:               "https://github.com/frnmst/the-flux-of-thought"
-    version:            "2.0.2"
+    version:            "3.0.0"
     # The following is used along the version variable to build the
     # software version url.
     release_base_url:   "https://github.com/frnmst/the-flux-of-thought/releases/tag"
 
 author:
     name:               "Franco Masotti"
-    email:              "volvopolar731@gmail.com"
+    email:              "frnmst.blog@outlook.com"
     buymeacoffee:
         message:        "Buy me a coffee"
         url:            "https://buymeacoff.ee/frnmst"
@@ -138,7 +138,7 @@ defaults:
 
 ## Other Params
 include:                [ "_pages" ]
-exclude:                [ "LICENSE", "README.md", "CNAME", "vendor", "Gemfile", "Makefile" ]
+exclude:                [ "LICENSE", "README.md", "CNAME", "vendor", "Gemfile", "Makefile", "Pipfile", "Pipfile.lock", ".pre-commit-config.yaml" ]
 
 ## Ruby gems
 plugins:
diff --git a/_includes/comments.html b/_includes/comments.html
index 4e4f0cf..26e2685 100644
--- a/_includes/comments.html
+++ b/_includes/comments.html
@@ -1,16 +1,13 @@
 <div>
     {% capture mail %}{{ site.author.email }}{% endcapture %}
-    {% assign mail_substring = mail | split: '@' %}
-    {% assign mail_username = mail_substring[0] %}
-    {% assign mail_domain = mail_substring[1] %}
     {% if page.is_post %}
-        {% capture mailto_prefix %}{{ mail_username }}+{{ page.path | remove: ".md" | remove: "_posts/" }}{% endcapture %}
+        {% capture mailto_subject %}{{ page.path | remove: ".md" | remove: "_posts/" | urlencode }}{% endcapture %}
     {% else %}
-        {% capture mailto_prefix %}{{ mail_username }}+{{ page.path | remove: ".html" | remove: ".md" | remove: "_pages/" }}{% endcapture %}
+        {% capture mailto_subject %}{{ page.path | remove: ".html" | remove: ".md" | remove: "_pages/" | urlencode }}{% endcapture %}
     {% endif %}
     <div>
         <h3>
-            <a href="mailto:{{ mailto_prefix }}@{{ mail_domain }}">
+            <a href="mailto:{{ mail }}?subject={{ mailto_subject }}">
                 Post a new comment</a>
         </h3>
     </div>