diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json
index d7bd06c..ba777a6 100644
--- a/source/_data/mastodon.json
+++ b/source/_data/mastodon.json
@@ -30,7 +30,8 @@
         [
           {"id": "0", "url": "https://bridge.joinmastodon.org"},
           {"id": "1", "url": "https://vinayaka.distsn.org"},
-          {"id": "2", "url": "https://elenq.gitlab.io/artodon"}
+          {"id": "2", "url": "https://elenq.gitlab.io/artodon"},
+          {"id": "3", "url": "https://communitywiki.org/trunk"}
         ],
       "tutorials":
         [
@@ -87,7 +88,7 @@
         ],
       "information":
         [
-          "Direct messages (\"private messages\") will safely be delivered with limited visibility (non public) only between Mastodon users. Friends from other networks may get such \"direct message\" as public (visible to all) because some networks (like GNU Social) don't support DMs, and some other projects don't know how to handle them for now (Friendica, Hubzilla). Keep that in mind when sharing something private via DM."
+          "Direct messages (\"private messages\") will be delivered with limited visibility (non public) only between Mastodon users. Friends from other networks may get such \"direct messages\" as public (visible to all) because some networks (GNU Social) don't support DMs, and other projects don't know how to handle them and by default make them public (Friendica, Hubzilla, Osada). Keep that in mind when sharing something private via a DM."
         ],
       "donate": "https://patreon.com/mastodon",
       "tracker": "https://github.com/tootsuite/mastodon/issues",
diff --git a/source/_data/osada.json b/source/_data/osada.json
index dcbceb9..e1f50ea 100644
--- a/source/_data/osada.json
+++ b/source/_data/osada.json
@@ -24,11 +24,15 @@
           {"num": "3", "url": "https://osada.macgirvin.com/pubsites"}
         ],
       "mobile": "",
+      "forTechies":
+        [
+          {"id": "0", "url": "https://framagit.org/zot/zap/blob/dev/spec/Zot6/Home.md"}
+        ],
       "devTutorials": "https://framagit.org/macgirvin/osada/blob/master/install/INSTALL.txt",
       "mascot": [{"item": "?"}],
       "dwellers": "?",
       "communities": "",
-      "descr": "Osada is a general-purpose social network that provides such essential features as photo albums, file storage and groups / forums",
+      "descr": "Osada is a general-purpose social network that provides essential features as photo albums, file storage and groups / forums. Its unique hyper-drive engine helps users grow their social network. Osada supports Zot6 protocol which uses industry standards where possible, the latest version is incompatible with previous version of Zot.",
       "connections": ["Friendica", "Hubzilla", "Mastodon", "Pleroma", "PeerTube", "Misskey"],
       "donate": "",
       "tracker": "https://framagit.org/macgirvin/osada/issues",
diff --git a/source/en/osada/index.md b/source/en/osada/index.md
index 5a9fa11..56a918c 100644
--- a/source/en/osada/index.md
+++ b/source/en/osada/index.md
@@ -1,6 +1,6 @@
 
 ---
-layout: "generic"
+layout: "osada"
 title: "Osada"
 network: "osada"
 subtitle: "powered by hyper-drive social engine"
diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml
index 28e6588..1ddfefc 100644
--- a/themes/starter/languages/en.yml
+++ b/themes/starter/languages/en.yml
@@ -112,6 +112,7 @@ feedPreview: Instance timeline preview
 feed2toot: RSS to Mastodon bot
 glitchSoc: glitch-soc - fork with experimental features
 mastoEphemeral: ephemeral Mastodon with disappearing toots
+trunk: Mass follow users based on common interests
 
 #GNU Social page
 timeline: Timeline for website
@@ -132,6 +133,9 @@ permissions: Channel permissions and roles cheatsheet
 ownInstance: Setting up your instance
 dualQuitter: Dual boot with qvitter
 
+#Osada page
+zot6: Zot6 specification
+
 # Contributing partial
 foreword: Please, keep in mind that you are a participant, not a customer.
 promptStart: If you'd like to help the
diff --git a/themes/starter/layout/mastodon.ejs b/themes/starter/layout/mastodon.ejs
index 787a069..6d3b089 100644
--- a/themes/starter/layout/mastodon.ejs
+++ b/themes/starter/layout/mastodon.ejs
@@ -6,7 +6,7 @@ layout: layout
 <%
   const data = site.data.mastodon.data;
   const tuts = [__('intro'), __('howto'), __('guide')];
-  const uxList = [__('twFriends'), __('uMatch'), __('mastoGallery')];
+  const uxList = [__('twFriends'), __('uMatch'), __('mastoGallery'), __('trunk')];
   const stats = [__('dashboards'), __('stats'), __('graphs')];
   const tools = [__('mastoPreinstalled'), __('mastoHosting')];
   const utils = [__('mastofeed'), __('crossposting'), __('feedPreview'), __('webmentions'), __('feed2toot')];
@@ -48,22 +48,22 @@ layout: layout
           <% } %>
         </ul>
       </div>
-      <div class="section u-block">
-        <ul class="section-list">
-          <h4><%- __('forks') %></h4>
-          <% for (item in data.forks) { %>
-            <% let b = data.forks[item].id %>
-            <li>
-              <a href="<%= data.forks[item].url %>"><%= forkTitles[b] %></a>
-            </li>
-          <% } %>
-        </ul>
-      </div>
     </section>
   </div>
 
   <div class="section-wrapper">
     <div class="column">
+      <div class="section u-block">
+        <h4><%- __('tuts') %></h4>
+        <ul class="section-list">
+          <% for (item in data.tutorials) { %>
+            <% let n = data.tutorials[item].id %>
+            <li class="u-inline">
+              <a href="<%= data.tutorials[item].url %>"><%= tuts[n] %></a><span>&nbsp;/&nbsp;</span>
+            </li>
+          <% } %>
+        </ul>
+      </div>
       <div class="section u-block">
         <h4><%- __('utilities') %></h4>
         <ul class="section-list">
@@ -78,12 +78,12 @@ layout: layout
     </div>
     <div class="column">
       <div class="section u-block">
-        <h4><%- __('tuts') %></h4>
         <ul class="section-list">
-          <% for (item in data.tutorials) { %>
-            <% let n = data.tutorials[item].id %>
-            <li class="u-inline">
-              <a href="<%= data.tutorials[item].url %>"><%= tuts[n] %></a><span>&nbsp;/&nbsp;</span>
+          <h4><%- __('forks') %></h4>
+          <% for (item in data.forks) { %>
+            <% let b = data.forks[item].id %>
+            <li>
+              <a href="<%= data.forks[item].url %>"><%= forkTitles[b] %></a>
             </li>
           <% } %>
         </ul>
diff --git a/themes/starter/layout/osada.ejs b/themes/starter/layout/osada.ejs
new file mode 100644
index 0000000..1175b17
--- /dev/null
+++ b/themes/starter/layout/osada.ejs
@@ -0,0 +1,40 @@
+
+---
+layout: layout
+---
+
+<%
+  const data = site.data.osada.data;
+  const tx = data.forTechies;
+  const txList = [ __('zot6')];
+%>
+
+<%- partial('_partial/heroheader') %>
+
+<main class="contents network">
+
+  <%- partial('_partial/header') %>
+
+  <div class="section-wrapper">
+    <%- partial('_partial/generalinfo') %>
+    <section class="column">
+      <div class="section u-block">
+        <h4><%- __('techies') %></h4>
+        <ul class="section-list">
+          <% for (item in tx) { %>
+            <% let n = tx[item].id %>
+            <li>
+              <a href="<%= tx[item].url %>"><%= txList[n] %></a>
+            </li>
+          <% } %>
+        </ul>
+      </div>
+    </section>
+  </div>
+
+  <%- partial('_partial/world') %>
+  <br>
+  <%- partial('_partial/contributing') %>
+
+  <%- partial('_partial/buttons') %>
+</main>