diff --git a/_snippets/recipe-footer.md b/_snippets/recipe-footer.md
index 54cbd81..1dfd4a0 100644
--- a/_snippets/recipe-footer.md
+++ b/_snippets/recipe-footer.md
@@ -16,7 +16,7 @@ Learn more about working with me [here](https://www.funkypenguin.co.nz/work-with
 
 Want to know now when this recipe gets updated, or when future recipes are added? Subscribe to the [RSS feed](https://mastodon.social/@geekcookbook_changes.rss), or leave your email address below, and we'll keep you updated.
 
-<div class="rm-area-subscribe-to-recipe"></div>
+<script async data-uid="20249aa846" src="https://funkypenguin.ck.page/20249aa846/index.js"></script>
 
 ## Your comments? 💬
 
diff --git a/_snippets/review-footer.md b/_snippets/review-footer.md
index b5ae8ac..b5b39ac 100644
--- a/_snippets/review-footer.md
+++ b/_snippets/review-footer.md
@@ -16,7 +16,7 @@ Learn more about working with me [here](https://www.funkypenguin.co.nz/work-with
 
 Want to know now when this recipe gets updated, or when future recipes are added? Subscribe to the [RSS feed](https://mastodon.social/@geekcookbook_changes.rss), or leave your email address below, and we'll keep you updated.
 
-<div class="rm-area-subscribe-to-recipe"></div>
+<script async data-uid="20249aa846" src="https://funkypenguin.ck.page/20249aa846/index.js"></script>
 
 ## Your comments? 💬
 
diff --git a/docs/community/discord.md b/docs/community/discord.md
index c0385a8..faad220 100644
--- a/docs/community/discord.md
+++ b/docs/community/discord.md
@@ -9,7 +9,7 @@ icon: fontawesome/brands/discord
 The most realtime and exciting way engage with our geeky community is in our [Discord server](http://chat.funkypenguin.co.nz)
 
 <!-- markdownlint-disable MD033 -->
-<iframe src="https://e.widgetbot.io/channels/396055506072109067/456689991326760973" height="600" width="800"></iframe>
+<iframe src="https://e.widgetbot.io/channels/396055506072109067/396055506663374849" height="600" width="800"></iframe>
 
 !!! question "Eh? What's a Discord? Get off my lawn, young whippersnappers!!"
     Yeah, I know. I also thought Discord was just for the gamer kids, but it turns out it's great for a geeky community. Why? [Let me elucidate ya.](https://www.youtube.com/watch?v=1qHoSWxVqtE)..
diff --git a/docs/extras/javascript/rightmessage.js b/docs/extras/javascript/rightmessage.js
deleted file mode 100644
index d23d561..0000000
--- a/docs/extras/javascript/rightmessage.js
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- RightMessage -->
-<script type="text/javascript"> 
-  (function(p, a, n, d, o, b, c) {
-      o = n.createElement('script'); o.type = 'text/javascript'; o.async = true; o.src = 'https://tb.rightmessage.com/'+p+'.js';
-      b = n.getElementsByTagName('script')[0]; d = function(h, u, i) { var c = n.createElement('style'); c.id = 'rmcloak'+i;
-          c.type = 'text/css'; c.appendChild(n.createTextNode('.rmcloak'+h+'{visibility:hidden}.rmcloak'+u+'{display:none}'));
-          b.parentNode.insertBefore(c, b); return c; }; c = d('', '-hidden', ''); d('-stay-invisible', '-stay-hidden', '-stay');
-      setTimeout(o.onerror = function() { c.parentNode && c.parentNode.removeChild(c); }, a); b.parentNode.insertBefore(o, b);
-  })('1802694484', 20000, document);
-  </script>
\ No newline at end of file
diff --git a/docs/recent-changes.md b/docs/recent-changes.md
index f2ac167..f954af4 100644
--- a/docs/recent-changes.md
+++ b/docs/recent-changes.md
@@ -35,7 +35,7 @@ Recipe                  | Description  | Date
 
 ## Subscribe to updates
 
-<div class="rm-area-subscribe-to-recipe"></div>
+<script async data-uid="20249aa846" src="https://funkypenguin.ck.page/20249aa846/index.js"></script>
 
 Also available via:
 
diff --git a/mkdocs.yml b/mkdocs.yml
index bcff52d..8d28e2d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -363,7 +363,7 @@ extra:
     deprecated: Deprecated
   social:
     - icon: 'fontawesome/brands/mastodon'
-      link: 'https://so.fnky.nz/'
+      link: 'https://so.fnky.nz/@funkypenguin'
     - icon: 'fontawesome/brands/github'
       link: 'https://github.com/funkypenguin'
     - icon: 'fontawesome/brands/twitter'
@@ -417,7 +417,6 @@ extra_css:
 extra_javascript:
   - extras/javascript/plausible.js
   # - extras/javascript/widgetbot.js # uncommented for dev
-  # - extras/javascript/rightmessage.js
   # - extras/javascript/feedback.js
   - https://unpkg.com/tablesort@5.3.0/dist/tablesort.min.js
   - extras/javascript/tablesort.js
diff --git a/overrides/main.html b/overrides/main.html
index b5c3e0b..7de2b3c 100644
--- a/overrides/main.html
+++ b/overrides/main.html
@@ -23,16 +23,6 @@
 {% block analytics %}
 <script src="/js/i-am-groot.js"></script>
 <script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>
-<!-- RightMessage -->
-<script type="text/javascript"> 
-  (function(p, a, n, d, o, b, c) {
-      o = n.createElement('script'); o.type = 'text/javascript'; o.async = true; o.src = 'https://tb.rightmessage.com/'+p+'.js';
-      b = n.getElementsByTagName('script')[0]; d = function(h, u, i) { var c = n.createElement('style'); c.id = 'rmcloak'+i;
-          c.type = 'text/css'; c.appendChild(n.createTextNode('.rmcloak'+h+'{visibility:hidden}.rmcloak'+u+'{display:none}'));
-          b.parentNode.insertBefore(c, b); return c; }; c = d('', '-hidden', ''); d('-stay-invisible', '-stay-hidden', '-stay');
-      setTimeout(o.onerror = function() { c.parentNode && c.parentNode.removeChild(c); }, a); b.parentNode.insertBefore(o, b);
-  })('1802694484', 20000, document);
-  </script>
 {% endblock %}
 
 <!-- Add little penguin ascii-art to titles instead of 20-character-long site name -->
diff --git a/overrides/social.html b/overrides/social.html
new file mode 100644
index 0000000..bed8fef
--- /dev/null
+++ b/overrides/social.html
@@ -0,0 +1,41 @@
+<!--
+  Copyright (c) 2016-2022 Martin Donath <martin.donath@squidfunk.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to
+  deal in the Software without restriction, including without limitation the
+  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+  sell copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+  IN THE SOFTWARE.
+-->
+
+<!-- Social links -->
+<div class="md-social">
+    {% for social in config.extra.social %}
+      {% set title = social.name %}
+      {% if not title and "//" in social.link %}
+        {% set _, url = social.link.split("//") %}
+        {% set title  = url.split("/")[0] %}
+      {% endif %}
+      <a
+        href="{{ social.link }}"
+        target="_blank" rel="noopener"
+        title="{{ title | e }}"
+        class="md-social__link"
+        rel="me"
+      >
+        {% include ".icons/" ~ social.icon ~ ".svg" %}
+      </a>
+    {% endfor %}
+  </div>
\ No newline at end of file