diff --git a/content/implementations/_index.md b/content/implementations/_index.md
index a33aa0a..45f4c7a 100644
--- a/content/implementations/_index.md
+++ b/content/implementations/_index.md
@@ -3,33 +3,3 @@ title: Implementations
 description : Non-exhaustive list of implementation of SCIM protocol in server and client applications
 color : blue-1
 ---
-
-{{< grid >}}
-{{< implementation type="server client">}}
-#### Keycloak
-{{< /implementation >}}
-
-{{< implementation type="server" devs="Greenhost">}}
-#### Stackspin
-{{< /implementation >}}
-
-{{< implementation type="client" devs="Yaal">}}
-#### Discourse
-{{< /implementation >}}
-
-{{< implementation type="client" devs="IndieHosters & Audriga">}}
-#### Nextcloud
-{{< /implementation >}}
-
-{{< implementation type="client" devs="Yaal & IndieHosters">}}
-#### Element
-{{< /implementation >}}
-
-{{< implementation type="client" devs="Yaal">}}
-#### Canaille
-{{< /implementation >}}
-
-{{< implementation type="client" devs="Yaal" link="https://scim2-cli.readthedocs.io/en/latest/#">}}
-#### Cli
-{{< /implementation >}}
-{{< /grid >}}
\ No newline at end of file
diff --git a/content/implementations/discourse.md b/content/implementations/discourse.md
new file mode 100644
index 0000000..471c108
--- /dev/null
+++ b/content/implementations/discourse.md
@@ -0,0 +1,7 @@
+---
+title: Discourse
+description: A platform for community discussion. Free, open, simple.
+source: https://forge.libre.sh/libre.sh/discourse-scim.git
+role: server
+implementation: plugin
+---
diff --git a/content/implementations/grist.md b/content/implementations/grist.md
new file mode 100644
index 0000000..9c22708
--- /dev/null
+++ b/content/implementations/grist.md
@@ -0,0 +1,7 @@
+---
+title: Grist
+description: Grist is a modern relational spreadsheet. It combines the flexibility of a spreadsheet with the robustness of a database.
+source: https://github.com/gristlabs/grist-core.git
+role: server
+implementation: native
+---
diff --git a/content/implementations/keycloak.md b/content/implementations/keycloak.md
new file mode 100644
index 0000000..370a971
--- /dev/null
+++ b/content/implementations/keycloak.md
@@ -0,0 +1,7 @@
+---
+title: Keycloak
+description: Open Source Identity and Access Management For Modern Applications and Services
+source: https://forge.libre.sh/libre.sh/keycloak-scim.git
+role: client 
+implementation: both
+---
diff --git a/content/implementations/nextcloud.md b/content/implementations/nextcloud.md
new file mode 100644
index 0000000..ce3352b
--- /dev/null
+++ b/content/implementations/nextcloud.md
@@ -0,0 +1,7 @@
+---
+title: Nextcloud
+description: A safe home for all your data.
+source: https://forge.libre.sh/libre.sh/scimserviceprovider.git
+role: server
+implementation: plugin
+---
diff --git a/content/implementations/scim-cli.md b/content/implementations/scim-cli.md
new file mode 100644
index 0000000..dbc7440
--- /dev/null
+++ b/content/implementations/scim-cli.md
@@ -0,0 +1,6 @@
+---
+title: scim-cli
+description: SCIM application development CLI.
+source: https://github.com/python-scim/scim2-cli.git
+role: client
+---
diff --git a/content/implementations/stackspin.md b/content/implementations/stackspin.md
new file mode 100644
index 0000000..02dca1a
--- /dev/null
+++ b/content/implementations/stackspin.md
@@ -0,0 +1,7 @@
+---
+title: Stackspin
+description: A platform that offers self-managed, click-and-play provisioning of online applications for Civil Society Organisations (CSOs).
+source: https://open.greenhost.net/stackspin/dashboard.git
+role: client
+implementation: native
+---
diff --git a/content/implementations/synapse.md b/content/implementations/synapse.md
new file mode 100644
index 0000000..1e351b3
--- /dev/null
+++ b/content/implementations/synapse.md
@@ -0,0 +1,7 @@
+---
+title: Synapse
+description: Matrix homeserver written in Python/Twisted.
+source: https://github.com/element-hq/synapse/pull/17144
+role: server
+implementation: native
+---
diff --git a/themes/Indiiie/layouts/implementations/list.html b/themes/Indiiie/layouts/implementations/list.html
index c5bae24..c8e5343 100644
--- a/themes/Indiiie/layouts/implementations/list.html
+++ b/themes/Indiiie/layouts/implementations/list.html
@@ -1,24 +1,35 @@
-<!DOCTYPE html>
-<html>
-  {{- partial "head.html" . -}}
-  <body>
-    {{- partial "header.html" . -}}
-    <main class="flex">
-    <section class="section-home {{ .Params.color }} flex w-100">
-        <div class="flex align-center bck-marked w-100 section-header">
-            <h2>{{ .Params.title }}</h2>
-            <p class="subtitle">{{ .Params.description | markdownify  }}</p>
-        </div>
-        <div class="content">
-            <div>
-                <button data-type="client server" class="activable active btn lv2 implementationtype">All</button>
-                <button data-type="client" class="activable btn lv2 implementationtype client">Clients</button>
-                <button data-type="server" class="activable btn lv2 implementationtype server">Servers</button>
+{{ define "main" }}
+<main class="flex">
+  <section class="section-home {{ .Params.color }} flex w-100">
+      <div class="flex align-center bck-marked w-100 section-header">
+          <h2>{{ .Params.title }}</h2>
+          <p class="subtitle">{{ .Params.description | markdownify  }}</p>
+      </div>
+      <div class="content">
+          <div>
+              <button data-type="client server" class="activable active btn lv2 implementationtype">All</button>
+              <button data-type="client" class="activable btn lv2 implementationtype client">Clients</button>
+              <button data-type="server" class="activable btn lv2 implementationtype server">Servers</button>
+          </div>
+          <section class="grid">
+            {{ range .Pages }}
+            <div class="space-between card flex implementation {{ .Params.role }}" data-type="{{ .Params.role }}">
+              <div class="flex">
+                <h4>{{ .Title }}</h4>
+                <p>
+                  <span class="type {{ .Params.role }} marked-color">{{ .Params.role }}</span>
+                  <span class="type {{ .Params.role }} marked-color">{{ .Params.implementation }}</span>
+                </p>
+                <p>{{ .Params.description | markdownify }}</p>
+              </div>
+              <div class="flex-row">
+                <a class="btn lv1" target="_blank" href="{{ .Params.source }}">git ↗</a>
+                <!-- <a class="btn lv1" target="_blank" href="{{ .Path }}">doc ↗</a> -->
+              </div>
             </div>
-            {{ partial "content.html" .Content }}
-        </div>
-    </section>
-    </main>
-    {{- partial "footer.html" . -}}
-  </body>
-</html>
+            {{ end }}
+          </section>
+      </div>
+  </section>
+</main>
+{{ end }}
diff --git a/themes/Indiiie/layouts/implementations/single.html b/themes/Indiiie/layouts/implementations/single.html
new file mode 100644
index 0000000..6aa59c4
--- /dev/null
+++ b/themes/Indiiie/layouts/implementations/single.html
@@ -0,0 +1,13 @@
+{{ define "main" }}
+<main class="flex">
+    <section class="section-home {{ .Params.color }} flex w-100">
+        <div class="flex align-center bck-marked w-100 section-header">
+            <h2>{{ .Params.title }}</h2>
+            <p class="subtitle">{{ .Params.description | markdownify  }}</p>
+            <a class="btn lv1" target="_blank" href="{{ .Params.source }}">git ↗</a>
+        </div>
+        <div class="content">
+            {{ .Content }}
+        </div>
+    </section>
+{{ end }}
diff --git a/themes/Indiiie/layouts/shortcodes/implementation.html b/themes/Indiiie/layouts/shortcodes/implementation.html
deleted file mode 100644
index 91f483b..0000000
--- a/themes/Indiiie/layouts/shortcodes/implementation.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="space-between card flex implementation {{ if .Get "type"}}{{ .Get "type" }}{{ end }}" data-type="{{ if .Get "type"}}{{ .Get "type" }}{{ end }}">
-    <div class="flex">
-    {{ .Inner | markdownify }}
-
-    {{ if .Get "type" }}
-    <p>
-    {{ $types := split (.Get "type") " " }}
-        {{ range $types }}
-            <span class="type {{ . }} marked-color">{{ . }}</span>
-        {{ end }}
-    </p>
-    {{ end }}
-
-
-    {{ if .Get "devs" }}
-        <p class="devs">Main devs: {{ .Get "devs" }}</p>
-    {{ end }}
-    </div>
-    <div class="flex">
-    {{ if .Get "link" }}
-        <a class="btn lv1" target="_blank" href="{{ .Get "link" }}">specs ↗</a>
-    {{ else }}
-        <p class="btn draft marked-color"><em>soon to be released...</em></p>
-    {{ end }}
-    </div>
-</div>
\ No newline at end of file