diff --git a/source/_data/numbers.json b/source/_data/numbers.json
index d36bd46..6883fff 100644
--- a/source/_data/numbers.json
+++ b/source/_data/numbers.json
@@ -2,66 +2,66 @@
 {
   "list":
     {
-      "lastUpdate": "18/04/19",
+      "lastUpdate": "03/05/19",
       "diaspora":
         {
-          "population": "699.550",
-          "activeUsers": "87.852",
-          "podsNum": "302"
+          "population": "698.902",
+          "activeUsers": "85.712",
+          "podsNum": "296"
         },
       "friendica":
         {
-          "population": "14.290",
-          "activeUsers": "2.485",
-          "podsNum": "380"
+          "population": "14.284",
+          "activeUsers": "2.451",
+          "podsNum": "379"
         },
       "hubzilla":
         {
-          "population": "7.327",
-          "activeUsers": "4.419",
-          "podsNum": "270"
+          "population": "6.404",
+          "activeUsers": "4.384",
+          "podsNum": "259"
         },
       "socialhome":
         {
-          "population": "1028",
-          "activeUsers": "366",
-          "podsNum": "7"
+          "population": "1001",
+          "activeUsers": "344",
+          "podsNum": "5"
         },
       "mastodon":
         {
-          "population": "2.163.859",
-          "activeUsers": "1.568.450",
-          "podsNum": "2.665"
+          "population": "2.149.216",
+          "activeUsers": "1.511.965",
+          "podsNum": "2.670"
         },
       "gnusocial":
         {
-          "population": "14.196",
+          "population": "14.190",
           "activeUsers": "",
-          "podsNum": "141"
+          "podsNum": "140"
         },
       "pleroma":
         {
-          "population": "28.831",
+          "population": "20.090",
           "activeUsers": "",
-          "podsNum": "499"
+          "podsNum": "500"
         },
       "misskey":
         {
-          "population": "760",
+          "population": "95",
           "activeUsers": "",
-          "podsNum": "51"
+          "podsNum": "48"
         },
       "peertube":
         {
-          "population": "14.716",
+          "population": "15.022",
           "activeUsers": "",
-          "podsNum": "324"
+          "podsNum": "328"
         },
       "pixelfed":
         {
-          "population": "8.749",
-          "activeUsers": "8.589",
-          "podsNum": "54"
+          "population": "9.176",
+          "activeUsers": "8.682",
+          "podsNum": "62"
         }
     }
 }
diff --git a/source/_data/peertube.json b/source/_data/peertube.json
index f9223c3..2cd53ee 100644
--- a/source/_data/peertube.json
+++ b/source/_data/peertube.json
@@ -35,6 +35,10 @@
         [
           {"id": "0", "url": "https://instances.joinpeertube.org/instances/stats"}
         ],
+      "services":
+        [
+          {"id": "0", "url": "https://app.spacebear.ee"}
+        ],
       "mascot": [{"item": "octopus", "imgNum": "1"}],
       "dwellers": "peertubers",
       "communities": "",
diff --git a/source/_data/pixelfed.json b/source/_data/pixelfed.json
index 46083ac..39d7dd4 100644
--- a/source/_data/pixelfed.json
+++ b/source/_data/pixelfed.json
@@ -23,6 +23,10 @@
         ],
       "mobile": "https://github.com/glitchpizza/morii",
       "devTutorial": "https://pixelfed.github.io/docs/master/installation.html",
+      "services":
+        [
+          {"id": "0", "url": "https://app.spacebear.ee"}
+        ],
       "mascot": [{"item": "red panda Fred", "imgNum": "1"}],
       "dwellers": "?",
       "communities": "",
diff --git a/source/en/pixelfed/index.md b/source/en/pixelfed/index.md
index 621e22b..fb3f293 100644
--- a/source/en/pixelfed/index.md
+++ b/source/en/pixelfed/index.md
@@ -1,6 +1,6 @@
 
 ---
-layout: "generic"
+layout: "pixelfed"
 title: "PixelFed"
 network: "pixelfed"
 subtitle: "federated image sharing platform"
diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml
index 53bb216..c2c2cfa 100644
--- a/themes/starter/languages/en.yml
+++ b/themes/starter/languages/en.yml
@@ -89,6 +89,7 @@ wizard: SERVER WIZARD
 userGuide: User guide
 adminGuide: Administrator guide
 devGuide: Developer guide
+preinstalled: Preinstalled hosting
 
 # diaspora page
 proxy: proxy
@@ -104,7 +105,6 @@ metrics: metrics
 dashboards: dashboards
 stats: stats
 graphs: graphs
-mastoPreinstalled: Preinstalled Mastodon
 mastoHosting: Your Mastodon server
 webmentions: Webmentions - site + Fediverse bridge
 mastofeed: Mastofeed
diff --git a/themes/starter/layout/mastodon.ejs b/themes/starter/layout/mastodon.ejs
index 51835c0..072e213 100644
--- a/themes/starter/layout/mastodon.ejs
+++ b/themes/starter/layout/mastodon.ejs
@@ -9,7 +9,7 @@ network: true
   const tuts = [__('intro'), __('howto'), __('guide')];
   const uxList = [__('uMatch'), __('mastoGallery'), __('trunk')];
   const stats = [__('dashboards'), __('stats')];
-  const tools = [__('mastoPreinstalled'), __('mastoHosting')];
+  const tools = [__('preinstalled')];
   const utils = [__('mastofeed'), __('crossposting'), __('feedPreview'), __('webmentions'), __('feed2toot')];
   const forkTitles = [__('glitchSoc'), __('mastoEphemeral')];
 %>
diff --git a/themes/starter/layout/peertube.ejs b/themes/starter/layout/peertube.ejs
index 77b7963..78dfafb 100644
--- a/themes/starter/layout/peertube.ejs
+++ b/themes/starter/layout/peertube.ejs
@@ -6,9 +6,8 @@ network: true
 
 <%
   const data = site.data.peertube.data;
-  const tutorials = data.tutorials;
   const tuts = [__('adminGuide')];
-  const ux = data.forUsers;
+  const tools = [__('preinstalled')];
   const uxList = [ __('userGuide')];
 %>
 
@@ -24,10 +23,21 @@ network: true
       <div class="section u-block">
         <h4><%- __('users') %></h4>
         <ul class="section-list">
-          <% for (item in ux) { %>
-            <% let n = ux[item].id %>
+          <% for (item in data.forUsers) { %>
+            <% let n = data.forUsers[item].id %>
             <li>
-              <a href="<%= ux[item].url %>"><%= uxList[n] %></a>
+              <a href="<%= data.forUsers[item].url %>"><%= uxList[n] %></a>
+            </li>
+          <% } %>
+        </ul>
+      </div>
+      <div class="section u-block">
+        <h4><%- __('techies') %></h4>
+        <ul class="section-list">
+          <% for (item in data.services) { %>
+            <% let b = data.services[item].id %>
+            <li class="u-inline">
+              <a href="<%= data.services[item].url %>"><%= tools[b] %></a><span>&nbsp;/&nbsp;</span>
             </li>
           <% } %>
         </ul>
@@ -35,10 +45,10 @@ network: true
       <div class="section u-block">
         <h4><%- __('tuts') %></h4>
         <ul class="section-list">
-          <% for (item in tutorials) { %>
-            <% let n = tutorials[item].id %>
+          <% for (item in data.tutorials) { %>
+            <% let n = data.tutorials[item].id %>
             <li>
-              <a href="<%= tutorials[item].url %>"><%= tuts[n] %></a>
+              <a href="<%= data.tutorials[item].url %>"><%= tuts[n] %></a>
             </li>
           <% } %>
         </ul>
diff --git a/themes/starter/layout/pixelfed.ejs b/themes/starter/layout/pixelfed.ejs
new file mode 100644
index 0000000..74167f5
--- /dev/null
+++ b/themes/starter/layout/pixelfed.ejs
@@ -0,0 +1,40 @@
+
+---
+layout: layout
+network: true
+---
+
+<%
+  const data = site.data.pixelfed.data;
+  const tools = [__('preinstalled')];
+%>
+
+<%- partial('_partial/heroheader') %>
+
+<main class="contents">
+
+  <%- 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 data.services) { %>
+            <% let b = data.services[item].id %>
+            <li class="u-inline">
+              <a href="<%= data.services[item].url %>"><%= tools[b] %></a><span>&nbsp;/&nbsp;</span>
+            </li>
+          <% } %>
+        </ul>
+      </div>
+    </section>
+  </div>
+
+  <%- partial('_partial/world') %>
+  <br>
+  <%- partial('_partial/contributing') %>
+
+  <%- partial('_partial/buttons') %>
+</main>