diff --git a/README.md b/README.md
index a792809..77367a9 100644
--- a/README.md
+++ b/README.md
@@ -534,21 +534,31 @@ Also, there is an advisory database of Rust slopware crates, which you can use i
 > * [Secrets](https://apps.gnome.org/Secrets/) uses the KeePass file format.
 > * Password managers based on [pass](https://www.passwordstore.org/) or [Himitsu](https://himitsustore.org/) could be interesting.
 
-## Services and Utilities
+## Git Servers
 
-| Name | Alternative(s) | Evidence |
-|---|---|---|
-| [Calibre 8.16.2](https://calibre-ebook.com) | [BookLore](https://booklore.org/)<br /> [Clbre](https://github.com/grimthorpe/clbre), a Calibre fork without AI<br /> [Arcalibre](https://codeberg.org/rereading/arcalibre), a Calibre hard-fork from before AI features | [Added "Discuss selected book(s) with AI" feature](https://github.com/kovidgoyal/calibre/blob/master/Changelog.txt)
-| [Ghost](https://ghost.org/) | [WriteFreely] | Include configurations for [Claude](https://github.com/TryGhost/Ghost/tree/main/.claude) and [cursor](https://github.com/TryGhost/Ghost/blob/main/.cursor/rules/yarn.mdc); images on website seem generated |
-| [Wagtail CMS](https://wagtail.org/) | [WriteFreely] | Include [AGENTS.md](https://github.com/wagtail/wagtail/blob/main/AGENTS.md); [Wagtail AI](https://wagtail.org/wagtail-ai/) |
-| [WordPress](https://wordpress.org) | [WriteFreely] | Include [AGENTS.md](https://github.com/WordPress/gutenberg/blob/trunk/AGENTS.md); has [Copilot PRs](https://github.com/WordPress/gutenberg/pull/74449) |
-| [Gitea](https://about.gitea.com/) | [Forgejo](https://codeberg.org/forgejo/forgejo) (self-hosted) or [Codeberg](https://codeberg.org/) (hosted) | Include [AGENTS.md](https://github.com/go-gitea/gitea/blob/main/AGENTS.md) and [CLAUDE.md](https://github.com/go-gitea/gitea/blob/main/CLAUDE.md); Include [AI contribution policy](https://github.com/go-gitea/gitea/blob/main/CONTRIBUTING.md#ai-contribution-policy); Some [blog post images](https://about.gitea.com/blog/gitea-achieves-soc2-type2-soc3-certification) are AI generated |
-| [GitLab](https://gitlab.com/rluna-gitlab/gitlab-ce) | [Forgejo](https://codeberg.org/forgejo/forgejo) (self-hosted) or [Codeberg](https://codeberg.org/) (hosted) | Include [AGENTS.md](https://gitlab.com/rluna-gitlab/gitlab-ce/-/blob/master/.ai/AGENTS.md) and [.ai](https://gitlab.com/rluna-gitlab/gitlab-ce/-/blob/master/.ai/); |
-| [somafm_tui](https://github.com/zsh-ncursed/somafm_tui) | [soma-player](https://github.com/mpuccini/soma-play) | Commits from [QwenCoder](https://github.com/zsh-ncursed/somafm_tui/commit/bd176678d3f6b4f63603c331fb4481356068e78e) & [Claude](https://github.com/zsh-ncursed/somafm_tui/commit/11c9e9e934aa0d6fe4a1f572eed2ba252aac064b)
-| [Bludit CMS](https://www.bludit.com/) | See below | [Coding with Claude and reviewing by Code Rabbit](https://github.com/bludit/bludit/pull/1642) |
-| [Hugo](https://gohugo.io/) | See below | Include [AGENTS.md](https://github.com/gohugoio/hugo/blob/842d8f105256c5656e7895ee61fa5b2dfe90a9e3/AGENTS.md), [Claude.md](https://github.com/gohugoio/hugo/blob/842d8f105256c5656e7895ee61fa5b2dfe90a9e3/CLAUDE.md), Commits made with [Claude](https://github.com/gohugoio/hugo/commit/842d8f105256c5656e7895ee61fa5b2dfe90a9e3) |
-| [Pelican](https://getpelican.com/) | See below | Includes [Claude-generated code](https://github.com/getpelican/pelican/pull/3405#issuecomment-2592359405) |
-| [Zola](https://www.getzola.org/) | See below | Include [.claude](https://github.com/getzola/zola/blob/ec865e2cb7c159169f4dc56ebcd35a460b8eb297/.claude/settings.local.json) |
+| Name | Last Untainted Version or Commit ID | Tags and Evidence | Alternative(s) |
+|---|:---:|---|---|
+| [Gitea](https://about.gitea.com/) | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![Permissive AI policy](./badges/permissive-ai-policy-orange.svg)](#permissive-ai-policy) ([1](https://github.com/go-gitea/gitea/blob/main/CONTRIBUTING.md#ai-contribution-policy), [2](https://github.com/go-gitea/gitea/blob/main/AGENTS.md), [3](https://github.com/go-gitea/gitea/blob/main/CLAUDE.md)) <br /> [![Gen AI 'Art'](./badges/gen-ai-art-dark-yellow.svg)](https://codeberg.org/small-hack/open-slopware#gen-ai-art) ([1](https://about.gitea.com/blog/gitea-achieves-soc2-type2-soc3-certification)) | [Forgejo](https://codeberg.org/forgejo/forgejo) (self-hosted) or [Codeberg](https://codeberg.org/) (hosted) |
+| [GitLab](https://gitlab.com/rluna-gitlab/gitlab-ce) | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![Permissive AI policy](./badges/permissive-ai-policy-orange.svg)](#permissive-ai-policy) ([1](https://gitlab.com/rluna-gitlab/gitlab-ce/-/blob/master/.ai/)) | [Forgejo](https://codeberg.org/forgejo/forgejo) (self-hosted) or [Codeberg](https://codeberg.org/) (hosted) |
+
+## Blogging Software
+
+### Content Management Systems
+
+| Name | Last Untainted Version or Commit ID | Tags and Evidence | Alternative(s) |
+|---|:---:|---|---|
+| [Ghost](https://ghost.org/) | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![Permissive AI policy](./badges/permissive-ai-policy-orange.svg)](#permissive-ai-policy) ([1](https://github.com/TryGhost/Ghost/tree/main/.claude)) <br /> | [WriteFreely] |
+| [Wagtail](https://wagtail.org/) | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![Permissive AI policy](./badges/permissive-ai-policy-orange.svg)](#permissive-ai-policy) ([1](https://github.com/wagtail/wagtail/blob/main/AGENTS.md)) <br /> [![AI Functionality](./badges/ai-functionality-yellow.svg)](#ai-functionality) ([1](https://wagtail.org/wagtail-ai/)) | [WriteFreely] |
+| [WordPress](https://wordpress.org) | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![Permissive AI policy](./badges/permissive-ai-policy-orange.svg)](#permissive-ai-policy) ([1](https://github.com/WordPress/gutenberg/blob/trunk/AGENTS.md), [2](https://github.com/WordPress/gutenberg/pull/74449)) | [WriteFreely] |
+| [Bludit](https://www.bludit.com/) | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![Permissive AI policy](./badges/permissive-ai-policy-orange.svg)](#permissive-ai-policy) ([1](https://github.com/bludit/bludit/pull/1642)) <br /> [![AI Code Reviews](./badges/ai-code-reviews-purple.svg)](#ai-code-reviews) ([1](https://github.com/bludit/bludit/pull/1642)) | [WriteFreely] |
+
+### Static Site Generators
+
+| Name | Last Untainted Version or Commit ID | Tags and Evidence |
+|---|:---:|---|
+| [Hugo](https://gohugo.io/) | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![Permissive AI policy](./badges/permissive-ai-policy-orange.svg)](#permissive-ai-policy) ([1](https://github.com/gohugoio/hugo/blob/842d8f105256c5656e7895ee61fa5b2dfe90a9e3/AGENTS.md), [2](https://github.com/gohugoio/hugo/blob/842d8f105256c5656e7895ee61fa5b2dfe90a9e3/CLAUDE.md), [3](https://github.com/gohugoio/hugo/commit/842d8f105256c5656e7895ee61fa5b2dfe90a9e3)) |
+| [Pelican](https://getpelican.com/) | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![Permissive AI policy](./badges/permissive-ai-policy-orange.svg)](#permissive-ai-policy) ([1](https://github.com/getpelican/pelican/pull/3405#issuecomment-2592359405)) |
+| [Zola](https://www.getzola.org/) | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![Permissive AI policy](./badges/permissive-ai-policy-orange.svg)](#permissive-ai-policy) ([1](https://github.com/getzola/zola/blob/ec865e2cb7c159169f4dc56ebcd35a460b8eb297/.claude)) |
 
 > [!Note]
 > #### Static site generators alternatives
@@ -558,6 +568,13 @@ Also, there is an advisory database of Rust slopware crates, which you can use i
 > * [Haunt](https://dthompson.us/projects/haunt.html)
 > * [Zine](https://zine-ssg.io)
 
+## Services and Utilities
+
+| Name | Last Untainted Version or Commit ID | Tags and Evidence | Alternative(s) |
+|---|:---:|---|---|
+| [Calibre](https://calibre-ebook.com) | [`8.15.0`](https://github.com/kovidgoyal/calibre/releases/tag/v8.15.0) | [![AI Functionality](./badges/ai-functionality-yellow.svg)](#ai-functionality) ([1](https://github.com/kovidgoyal/calibre/blob/master/Changelog.txt)) | [BookLore](https://booklore.org/) <br /> [Clbre](https://github.com/grimthorpe/clbre), a Calibre fork without AI <br /> [Arcalibre](https://codeberg.org/rereading/arcalibre), a Calibre hard-fork from before AI features |
+| [somafm_tui](https://github.com/zsh-ncursed/somafm_tui) | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![Permissive AI policy](./badges/permissive-ai-policy-orange.svg)](#permissive-ai-policy) ([1](https://github.com/zsh-ncursed/somafm_tui/commit/bd176678d3f6b4f63603c331fb4481356068e78e), [2](https://github.com/zsh-ncursed/somafm_tui/commit/11c9e9e934aa0d6fe4a1f572eed2ba252aac064b)) | [soma-player](https://github.com/mpuccini/soma-play) |
+
 ### File Storage
 
 | Name | Alternative(s) | Evidence |