diff --git a/source/_data/gnusocial.json b/source/_data/gnusocial.json
index 0087749..3865f39 100644
--- a/source/_data/gnusocial.json
+++ b/source/_data/gnusocial.json
@@ -46,6 +46,11 @@
             "name": "FSFE",
             "url": "https://quitter.no/fsfe",
             "avatar": "/img/avatars/fsfe.png"
+          },
+          {
+            "name": "Umea hackerspace",
+            "url": "https://social.umeahackerspace.se/blog",
+            "avatar": "/img/avatars/umea.png"
           }
         ],
       "communities": "http://laemeur.sdf.org/gs/group-index.html",
diff --git a/source/_data/hubzilla.json b/source/_data/hubzilla.json
index fc27e76..8aff31f 100644
--- a/source/_data/hubzilla.json
+++ b/source/_data/hubzilla.json
@@ -27,6 +27,10 @@
 
         ],
       "devTutorials": "https://github.com/redmatrix/hubzilla/wiki/Deploying-Hubzilla#install-and-set-up-the-basics",
+      "cheatsheets":
+        [
+          {"id": "0", "url": "/img/hubzilla-permissions.png"}
+        ],
       "notable": "",
       "communities": "https://hub.libranet.de/directory?f=&global=1&pubforums=1",
       "tracker": "https://github.com/redmatrix/hubzilla/issues",
diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json
index ba842f9..74ce1db 100644
--- a/source/_data/mastodon.json
+++ b/source/_data/mastodon.json
@@ -126,14 +126,9 @@
             "avatar": "/img/avatars/tutanota.png"
           },
           {
-            "name": "KDE",
-            "url": "https://mastodon.technology/@kde",
-            "avatar": "/img/avatars/kde.png"
-          },
-          {
-            "name": "Matrix",
-            "url": "https://mastodon.matrix.org/@matrix",
-            "avatar": "/img/avatars/matrix.png"
+            "name": "Yale Privacy Lab",
+            "url": "https://mastodon.social/@privacylab",
+            "avatar": "/img/avatars/yale-privacylab.png"
           },
           {
             "name": "Doorbraak",
@@ -165,6 +160,16 @@
             "url": "https://infosec.exchange/@dallas_hackers",
             "avatar": "/img/avatars/dallas_h.png"
           },
+          {
+            "name": "KDE",
+            "url": "https://mastodon.technology/@kde",
+            "avatar": "/img/avatars/kde.png"
+          },
+          {
+            "name": "Matrix",
+            "url": "https://mastodon.matrix.org/@matrix",
+            "avatar": "/img/avatars/matrix.png"
+          },
           {
             "name": "Fairphone",
             "url": "https://social.weho.st/@Fairphone",
diff --git a/source/img/avatars/umea.png b/source/img/avatars/umea.png
new file mode 100644
index 0000000..45f0ece
Binary files /dev/null and b/source/img/avatars/umea.png differ
diff --git a/source/img/avatars/yale-privacylab.png b/source/img/avatars/yale-privacylab.png
new file mode 100644
index 0000000..764b15e
Binary files /dev/null and b/source/img/avatars/yale-privacylab.png differ
diff --git a/source/img/hubzilla-permissions.png b/source/img/hubzilla-permissions.png
new file mode 100644
index 0000000..5394806
Binary files /dev/null and b/source/img/hubzilla-permissions.png differ
diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml
index 662a3db..8be4e61 100644
--- a/themes/starter/languages/en.yml
+++ b/themes/starter/languages/en.yml
@@ -65,6 +65,7 @@ mobapps: mobile apps
 tuts: tutorials
 utilities: utilities
 forks: forks
+cheatsheets: cheat sheets
 total: population
 servers: servers
 accounts: accounts
@@ -118,6 +119,7 @@ selfhost: Self-hosting Friendica
 memberGuide: Member guide
 adminGuide: Administrator guide
 channel: Personal channels
+permissions: Channel permissions and roles cheatsheet
 
 #Pleroma page
 ownInstance: Setting up your instance
diff --git a/themes/starter/layout/hubzilla.ejs b/themes/starter/layout/hubzilla.ejs
index 6977c7b..e055b69 100644
--- a/themes/starter/layout/hubzilla.ejs
+++ b/themes/starter/layout/hubzilla.ejs
@@ -6,7 +6,9 @@ layout: layout
 <%
   const data = site.data.hubzilla.data;
   const tutorials = data.tutorials;
+  const cheatsheets = data.cheatsheets;
   const tuts = [__('memberGuide'), __('adminGuide'), __('channel')];
+  const sheets = [__('permissions')];
 %>
 
 <%- partial('_partial/heroheader') %>
@@ -35,6 +37,17 @@ layout: layout
           <% } %>
         </ul>
       </div>
+      <div class="section u-block">
+        <h4><%- __('cheatsheets') %></h4>
+        <ul class="section-list">
+          <% for (item in cheatsheets) { %>
+            <% let n = cheatsheets[item].id %>
+            <li class="u-inline">
+              <a href="<%= cheatsheets[item].url %>"><%= sheets[n] %></a><span>&nbsp/&nbsp;</span>
+            </li>
+          <% } %>
+        </ul>
+      </div>
     </section>
   </div>