diff --git a/source/_data/common.json b/source/_data/common.json
index 120ed1f..363dbc9 100644
--- a/source/_data/common.json
+++ b/source/_data/common.json
@@ -67,6 +67,12 @@
         "url" : "https://joinpeertube.org/en",
         "smallImg": "/img/peertube.png",
         "descr": "Decentralized video hosting. Take back the control of your videos"
+      },
+      {
+        "title": "Osada",
+        "url" : "https://zotlabs.com/osada",
+        "smallImg": "/img/osada.png",
+        "descr": "Conversational style network powered by hyper-drive social engine"
       }
     ],
   "protocols":
@@ -96,7 +102,7 @@
     [
       {
         "name": "PHP",
-        "networks": "GNU Social, Friendica, Hubzilla, postActiv, Pixelfed"
+        "networks": "GNU Social, Friendica, Hubzilla, postActiv, Osada, Pixelfed"
       },
       {
         "name": "Ruby",
diff --git a/source/_data/numbers.json b/source/_data/numbers.json
index 2a83a8d..6d5ee66 100644
--- a/source/_data/numbers.json
+++ b/source/_data/numbers.json
@@ -69,11 +69,11 @@
           "activeUsers": "",
           "podsNum": "198"
         },
-      "aardwolf":
+      "osada":
         {
           "population": "?",
           "activeUsers": "",
-          "podsNum": "?"
+          "podsNum": "2"
         }
     }
 }
diff --git a/source/_data/osada.json b/source/_data/osada.json
new file mode 100644
index 0000000..c2c78a1
--- /dev/null
+++ b/source/_data/osada.json
@@ -0,0 +1,39 @@
+
+{
+  "data":
+    {
+      "title": "osada",
+      "category": "social network",
+      "type": "macroblogging",
+      "logoClr": "d3d3d3",
+      "created": "2018",
+      "official": "https://zotlabs.com/osada",
+      "license": "MIT",
+      "repo": "https://framagit.org/macgirvin/osada",
+      "language": "PHP",
+      "protocols":
+        [
+          {"title": "Zot", "url": "https://project.hubzilla.org/help/developer/zot_protocol"},
+          {"title": "ActivityPub", "url": "https://activitypub.rocks"}
+        ],
+      "docs": "http://www.postactiv.com/docs",
+      "wiki": "",
+      "servers":
+        [
+          {"num": "1", "url": "https://osada.macgirvin.com/pubsites"}
+        ],
+      "mobile": "",
+      "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",
+      "connections": ["Friendica", "Hubzilla", "Mastodon", "Pleroma", "PeerTube", "Misskey"],
+      "donate": "",
+      "tracker": "https://framagit.org/macgirvin/osada/issues",
+      "bounty": "",
+      "translating": "",
+      "reading": "",
+      "notable": ""
+    }
+}
diff --git a/source/en/osada/index.md b/source/en/osada/index.md
new file mode 100644
index 0000000..56a918c
--- /dev/null
+++ b/source/en/osada/index.md
@@ -0,0 +1,9 @@
+
+---
+layout: "osada"
+title: "Osada"
+network: "osada"
+subtitle: "powered by hyper-drive social engine"
+banner: "/img/osada-bg.jpg"
+percent: "45% 50%"
+---
diff --git a/source/img/osada-bg.jpg b/source/img/osada-bg.jpg
new file mode 100644
index 0000000..fbb426c
Binary files /dev/null and b/source/img/osada-bg.jpg differ
diff --git a/source/img/osada.png b/source/img/osada.png
new file mode 100644
index 0000000..3286a07
Binary files /dev/null and b/source/img/osada.png differ
diff --git a/themes/starter/layout/_partial/contributing.ejs b/themes/starter/layout/_partial/contributing.ejs
index b489cd2..acefefc 100644
--- a/themes/starter/layout/_partial/contributing.ejs
+++ b/themes/starter/layout/_partial/contributing.ejs
@@ -50,9 +50,11 @@
 <br>
 <strong><%- __('thanks') %> <%= page.title %>.</strong>
 
-<div class="section u-block">
-  <h4><%- __('note') %></h4>
-  <p><span class="u-emphasize">
-    [1], [2]<% if (numbers.activeUsers) { %>, [3] <% } %></span> - updated regularly, latest update - <%= update %>
-  </p>
-</div>
+<% if (numbers) { %>
+  <div class="section u-block footnotes">
+    <h4><%- __('note') %></h4>
+    <p class="footnote-item">
+      <span id="fn-1" class="u-emphasize">[1]</span>, <span id="fn-2" class="u-emphasize">[2]</span>, <span id="fn-3" class="u-emphasize">[3]</span> - updated regularly, latest update - <%= update %>
+    </p>
+  </div>
+<% } %>
diff --git a/themes/starter/layout/_partial/world.ejs b/themes/starter/layout/_partial/world.ejs
index 42d3848..40ae315 100644
--- a/themes/starter/layout/_partial/world.ejs
+++ b/themes/starter/layout/_partial/world.ejs
@@ -6,17 +6,19 @@
 
 <section class="section-hero">
   <h3>
-    <span><%- __('total') %></span><span> ~ <%= numbers.population %></span><span><%- __('accounts') %></span><sup>[1]</sup>
+    <span><%- __('total') %></span>
+    <span><% if (numbers) { %> ~ <%= numbers.population %><% } else { %> ? <% } %></span>
+    <span><%- __('accounts') %></span><% if (numbers) { %><sup><a href="#fn-1">[1]</a></sup><% } %>
   </h3>
   <% if (numbers.activeUsers) { %>
     <h3>
-      <span><%- __('active') %></span><span> ~ <%= numbers.activeUsers %></span><span><%- __('people') %></span><sup>[2]</sup>
+      <span><%- __('active') %></span><span> ~ <%= numbers.activeUsers %></span><span><%- __('people') %></span><sup><a href="#fn-2">[2]</a></sup>
     </h3>
   <% } %>
   <h3>
-    <span><%- __('servers') %></span><span> > <%= numbers.podsNum %></span><span><%- __('instances') %></span><sup>
-    <% if (numbers.activeUsers) { %>[3] <% } else { %> [2] <% } %>
-    </sup>
+    <span><%- __('servers') %></span>
+    <span><% if (numbers) { %> > <%= numbers.podsNum %> <% } else { %> ? <% } %></span>
+    <span><%- __('instances') %></span><% if (numbers) { %><sup><a href="#fn-3">[3]</a></sup><% } %>
   </h3>
 </section>
 
diff --git a/themes/starter/layout/osada.ejs b/themes/starter/layout/osada.ejs
new file mode 100644
index 0000000..0e19e4b
--- /dev/null
+++ b/themes/starter/layout/osada.ejs
@@ -0,0 +1,25 @@
+
+---
+layout: layout
+---
+
+<%
+  const data = site.data.osada.data;
+%>
+
+<%- partial('_partial/heroheader') %>
+
+<main class="contents network">
+
+  <%- partial('_partial/header') %>
+
+  <div class="section-wrapper">
+    <%- partial('_partial/generalinfo') %>
+  </div>
+
+  <%- partial('_partial/world') %>
+  <br>
+  <%- partial('_partial/contributing') %>
+
+  <%- partial('_partial/buttons') %>
+</main>
diff --git a/themes/starter/source/assets/scss/modules/_chronicles.scss b/themes/starter/source/assets/scss/modules/_chronicles.scss
index 494e7b7..fcca896 100644
--- a/themes/starter/source/assets/scss/modules/_chronicles.scss
+++ b/themes/starter/source/assets/scss/modules/_chronicles.scss
@@ -174,7 +174,8 @@ $taglist: (diaspora, $diaspora),
           (aardwolf, $aardwolf),
           (postactiv, $postactiv),
           (peertube, $peertube),
-          (misskey, $misskey);
+          (misskey, $misskey),
+          (osada, $osada);
 
 @each $tag, $color in $taglist {
   svg.#{$tag} {
@@ -200,8 +201,8 @@ $taglist: (diaspora, $diaspora),
   .post__preview.featured > .post__image,
   .post__preview.featured .post__content {
     flex: 100% 0 0;
-    margin-bottom: 2em
-  };
+    margin-bottom: 2em;
+  }
 }
 
 @media screen and (max-width: $mq-medium) {
diff --git a/themes/starter/source/assets/scss/modules/_index.scss b/themes/starter/source/assets/scss/modules/_index.scss
index 7dea4bc..16c4cec 100644
--- a/themes/starter/source/assets/scss/modules/_index.scss
+++ b/themes/starter/source/assets/scss/modules/_index.scss
@@ -86,6 +86,11 @@
   left: 26%;
 }
 
+.f-Osada {
+  top: 76%;
+  left: 48%;
+}
+
 .f-diaspora {
   top: 7em;
   left: 87%;
@@ -277,6 +282,12 @@
     flex-wrap: wrap;
   }
 
+  .grid__item__image {
+    width: 45px;
+    height: 45px;
+    flex: 25% 0 0;
+  }
+
   .f-Aardwolf {
     top: -1em;
     left: 70%;
diff --git a/themes/starter/source/assets/scss/partials/_colors.scss b/themes/starter/source/assets/scss/partials/_colors.scss
index 42cd55f..62f2586 100644
--- a/themes/starter/source/assets/scss/partials/_colors.scss
+++ b/themes/starter/source/assets/scss/partials/_colors.scss
@@ -19,3 +19,4 @@ $pleroma: #fba457;
 $aardwolf: #46332d;
 $peertube: #f1680d;
 $misskey: #db3f86;
+$osada: #d3d3d3;
diff --git a/themes/starter/source/assets/scss/partials/_layout.scss b/themes/starter/source/assets/scss/partials/_layout.scss
index 2de8f36..07b67d0 100644
--- a/themes/starter/source/assets/scss/partials/_layout.scss
+++ b/themes/starter/source/assets/scss/partials/_layout.scss
@@ -290,11 +290,14 @@ dfn {
 }
 
 .section-hero span:first-child,
-.section-hero span:last-of-type,
-.section-hero sup {
+.section-hero span:last-of-type {
   color: $grey;
 }
 
+.section-hero sup > a {
+  border-bottom: none;
+}
+
 .section-hero span:last-of-type {
   margin-right: 0;
 }
diff --git a/themes/starter/source/assets/scss/partials/_variables.scss b/themes/starter/source/assets/scss/partials/_variables.scss
index e91893e..8648d14 100644
--- a/themes/starter/source/assets/scss/partials/_variables.scss
+++ b/themes/starter/source/assets/scss/partials/_variables.scss
@@ -1,5 +1,5 @@
 $mq-xsmall: 33.9em; // max-width 542px, xxSmall devices (portrait phones)
-$mq-small: 47.938em; // max-width 767px, small devices (landscape phones)
+$mq-small: 51em; // max-width 816px, small devices (landscape phones)
 $mq-medium: 64em; //  max-width 1024px, medium devices (tablets)
 $mq-large: 80em; // max-width 1280px, large devices (laptops, desktops)
 $mq-xlarge: 90em; // max-width 1440px, xLarge devices (desktops)