diff --git a/README.md b/README.md
index 8b263881..c3a662ce 100644
--- a/README.md
+++ b/README.md
@@ -13,101 +13,103 @@ See [Contributing](.github/CONTRIBUTING.md).
 
 ## Table of contents
 
-- [Software](#software)
-  - [Analytics](#analytics)
-  - [Archiving and Digital Preservation (DP)](#archiving-and-digital-preservation-dp)
-  - [Automation](#automation)
-  - [Backup](#backup)
-  - [Blogging Platforms](#blogging-platforms)
-  - [Booking and Scheduling](#booking-and-scheduling)
-  - [Bookmarks and Link Sharing](#bookmarks-and-link-sharing)
-  - [Calendar & Contacts - CalDAV or CardDAV Servers](#calendar--contacts---caldav-or-carddav-servers)
-  - [Calendar & Contacts - CalDAV or CardDAV Web-based Clients](#calendar--contacts---caldav-or-carddav-web-based-clients)
-  - [Communication - Custom Communication Systems](#communication---custom-communication-systems)
-  - [Communication - Email - Complete Solutions](#communication---email---complete-solutions)
-  - [Communication - Email - Mail Delivery Agents](#communication---email---mail-delivery-agents)
-  - [Communication - Email - Mail Transfer Agents](#communication---email---mail-transfer-agents)
-  - [Communication - Email - Mailing Lists and Newsletters](#communication---email---mailing-lists-and-newsletters)
-  - [Communication - Email - Webmail Clients](#communication---email---webmail-clients)
-  - [Communication - IRC](#communication---irc)
-  - [Communication - SIP](#communication---sip)
-  - [Communication - Social Networks and Forums](#communication---social-networks-and-forums)
-  - [Communication - Video Conferencing](#communication---video-conferencing)
-  - [Communication - XMPP - Servers](#communication---xmpp---servers)
-  - [Communication - XMPP - Web Clients](#communication---xmpp---web-clients)
-  - [Community-Supported Agriculture (CSA)](#community-supported-agriculture-csa)
-  - [Conference Management](#conference-management)
-  - [Content Management Systems (CMS)](#content-management-systems-cms)
-  - [Database Management](#database-management)
-  - [DNS](#dns)
-  - [Document Management](#document-management)
-  - [Document Management - E-books](#document-management---e-books)
-  - [Document Management - Institutional Repository and Digital Library Software](#document-management---institutional-repository-and-digital-library-software)
-  - [Document Management - Integrated Library Systems (ILS)](#document-management---integrated-library-systems-ils)
-  - [E-commerce](#e-commerce)
-  - [Federated Identity & Authentication](#federated-identity--authentication)
-  - [Feed Readers](#feed-readers)
-  - [File Transfer & Synchronization](#file-transfer--synchronization)
-  - [File Transfer - Distributed Filesystems](#file-transfer---distributed-filesystems)
-  - [File Transfer - Object Storage & File Servers](#file-transfer---object-storage--file-servers)
-  - [File Transfer - Peer-to-peer Filesharing](#file-transfer---peer-to-peer-filesharing)
-  - [File Transfer - Single-click & Drag-n-drop Upload](#file-transfer---single-click--drag-n-drop-upload)
-  - [File Transfer - Web-based File Managers](#file-transfer---web-based-file-managers)
-  - [Games](#games)
-  - [Games - Administrative Utilities & Control Panels](#games---administrative-utilities--control-panels)
-  - [Genealogy](#genealogy)
-  - [Groupware](#groupware)
-  - [Human Resources Management (HRM)](#human-resources-management-hrm)
-  - [Internet of Things (IoT)](#internet-of-things-iot)
-  - [Inventory Management](#inventory-management)
-  - [Knowledge Management Tools](#knowledge-management-tools)
-  - [Learning and Courses](#learning-and-courses)
-  - [Maps and Global Positioning System (GPS)](#maps-and-global-positioning-system-gps)
-  - [Media Streaming](#media-streaming)
-  - [Media Streaming - Audio Streaming](#media-streaming---audio-streaming)
-  - [Media Streaming - Multimedia Streaming](#media-streaming---multimedia-streaming)
-  - [Media Streaming - Video Streaming](#media-streaming---video-streaming)
-  - [Miscellaneous](#miscellaneous)
-  - [Money, Budgeting & Management](#money-budgeting--management)
-  - [Monitoring](#monitoring)
-  - [Note-taking & Editors](#note-taking--editors)
-  - [Office Suites](#office-suites)
-  - [Password Managers](#password-managers)
-  - [Pastebins](#pastebins)
-  - [Personal Dashboards](#personal-dashboards)
-  - [Photo and Video Galleries](#photo-and-video-galleries)
-  - [Polls and Events](#polls-and-events)
-  - [Proxy](#proxy)
-  - [Recipe Management](#recipe-management)
-  - [Remote Access](#remote-access)
-  - [Resource Planning](#resource-planning)
-  - [Resource Planning - Enterprise Resource Planning](#resource-planning---enterprise-resource-planning)
-  - [Search Engines](#search-engines)
-  - [Self-hosting Solutions](#self-hosting-solutions)
-  - [Software Development](#software-development)
-  - [Software Development - API Management](#software-development---api-management)
-  - [Software Development - Continuous Integration & Deployment](#software-development---continuous-integration--deployment)
-  - [Software Development - FaaS & Serverless](#software-development---faas--serverless)
-  - [Software Development - IDE & Tools](#software-development---ide--tools)
-  - [Software Development - Localization](#software-development---localization)
-  - [Software Development - Low Code](#software-development---low-code)
-  - [Software Development - Project Management](#software-development---project-management)
-  - [Software Development - Testing](#software-development---testing)
-  - [Static Site Generators](#static-site-generators)
-  - [Status / Uptime pages](#status--uptime-pages)
-  - [Task Management & To-do Lists](#task-management--to-do-lists)
-  - [Ticketing](#ticketing)
-  - [Time Tracking](#time-tracking)
-  - [URL Shorteners](#url-shorteners)
-  - [VPN](#vpn)
-  - [Web Servers](#web-servers)
-  - [Wikis](#wikis)
-- [List of Licenses](#list-of-licenses)
-- [Anti-features](#anti-features)
-- [External Links](#external-links)
-- [Contributing](#contributing)
-- [Authors](#authors)
-- [License](#license)
+- [Awesome-Selfhosted](#awesome-selfhosted)
+  - [Table of contents](#table-of-contents)
+  - [Software](#software)
+    - [Analytics](#analytics)
+    - [Archiving and Digital Preservation (DP)](#archiving-and-digital-preservation-dp)
+    - [Automation](#automation)
+    - [Backup](#backup)
+    - [Blogging Platforms](#blogging-platforms)
+    - [Booking and Scheduling](#booking-and-scheduling)
+    - [Bookmarks and Link Sharing](#bookmarks-and-link-sharing)
+    - [Calendar \& Contacts - CalDAV or CardDAV Servers](#calendar--contacts---caldav-or-carddav-servers)
+    - [Calendar \& Contacts - CalDAV or CardDAV Web-based Clients](#calendar--contacts---caldav-or-carddav-web-based-clients)
+    - [Communication - Custom Communication Systems](#communication---custom-communication-systems)
+    - [Communication - Email - Complete Solutions](#communication---email---complete-solutions)
+    - [Communication - Email - Mail Delivery Agents](#communication---email---mail-delivery-agents)
+    - [Communication - Email - Mail Transfer Agents](#communication---email---mail-transfer-agents)
+    - [Communication - Email - Mailing Lists and Newsletters](#communication---email---mailing-lists-and-newsletters)
+    - [Communication - Email - Webmail Clients](#communication---email---webmail-clients)
+    - [Communication - IRC](#communication---irc)
+    - [Communication - SIP](#communication---sip)
+    - [Communication - Social Networks and Forums](#communication---social-networks-and-forums)
+    - [Communication - Video Conferencing](#communication---video-conferencing)
+    - [Communication - XMPP - Servers](#communication---xmpp---servers)
+    - [Communication - XMPP - Web Clients](#communication---xmpp---web-clients)
+    - [Community-Supported Agriculture (CSA)](#community-supported-agriculture-csa)
+    - [Conference Management](#conference-management)
+    - [Content Management Systems (CMS)](#content-management-systems-cms)
+    - [Database Management](#database-management)
+    - [DNS](#dns)
+    - [Document Management](#document-management)
+    - [Document Management - E-books](#document-management---e-books)
+    - [Document Management - Institutional Repository and Digital Library Software](#document-management---institutional-repository-and-digital-library-software)
+    - [Document Management - Integrated Library Systems (ILS)](#document-management---integrated-library-systems-ils)
+    - [E-commerce](#e-commerce)
+    - [Federated Identity \& Authentication](#federated-identity--authentication)
+    - [Feed Readers](#feed-readers)
+    - [File Transfer \& Synchronization](#file-transfer--synchronization)
+    - [File Transfer - Distributed Filesystems](#file-transfer---distributed-filesystems)
+    - [File Transfer - Object Storage \& File Servers](#file-transfer---object-storage--file-servers)
+    - [File Transfer - Peer-to-peer Filesharing](#file-transfer---peer-to-peer-filesharing)
+    - [File Transfer - Single-click \& Drag-n-drop Upload](#file-transfer---single-click--drag-n-drop-upload)
+    - [File Transfer - Web-based File Managers](#file-transfer---web-based-file-managers)
+    - [Games](#games)
+    - [Games - Administrative Utilities \& Control Panels](#games---administrative-utilities--control-panels)
+    - [Genealogy](#genealogy)
+    - [Groupware](#groupware)
+    - [Human Resources Management (HRM)](#human-resources-management-hrm)
+    - [Internet of Things (IoT)](#internet-of-things-iot)
+    - [Inventory Management](#inventory-management)
+    - [Knowledge Management Tools](#knowledge-management-tools)
+    - [Learning and Courses](#learning-and-courses)
+    - [Maps and Global Positioning System (GPS)](#maps-and-global-positioning-system-gps)
+    - [Media Streaming](#media-streaming)
+    - [Media Streaming - Audio Streaming](#media-streaming---audio-streaming)
+    - [Media Streaming - Multimedia Streaming](#media-streaming---multimedia-streaming)
+    - [Media Streaming - Video Streaming](#media-streaming---video-streaming)
+    - [Miscellaneous](#miscellaneous)
+    - [Money, Budgeting \& Management](#money-budgeting--management)
+    - [Monitoring](#monitoring)
+    - [Note-taking \& Editors](#note-taking--editors)
+    - [Office Suites](#office-suites)
+    - [Password Managers](#password-managers)
+    - [Pastebins](#pastebins)
+    - [Personal Dashboards](#personal-dashboards)
+    - [Photo and Video Galleries](#photo-and-video-galleries)
+    - [Polls and Events](#polls-and-events)
+    - [Proxy](#proxy)
+    - [Recipe Management](#recipe-management)
+    - [Remote Access](#remote-access)
+    - [Resource Planning](#resource-planning)
+    - [Resource Planning - Enterprise Resource Planning](#resource-planning---enterprise-resource-planning)
+    - [Search Engines](#search-engines)
+    - [Self-hosting Solutions](#self-hosting-solutions)
+    - [Software Development](#software-development)
+    - [Software Development - API Management](#software-development---api-management)
+    - [Software Development - Continuous Integration \& Deployment](#software-development---continuous-integration--deployment)
+    - [Software Development - FaaS \& Serverless](#software-development---faas--serverless)
+    - [Software Development - IDE \& Tools](#software-development---ide--tools)
+    - [Software Development - Localization](#software-development---localization)
+    - [Software Development - Low Code](#software-development---low-code)
+    - [Software Development - Project Management](#software-development---project-management)
+    - [Software Development - Testing](#software-development---testing)
+    - [Static Site Generators](#static-site-generators)
+    - [Status / Uptime pages](#status--uptime-pages)
+    - [Task Management \& To-do Lists](#task-management--to-do-lists)
+    - [Ticketing](#ticketing)
+    - [Time Tracking](#time-tracking)
+    - [URL Shorteners](#url-shorteners)
+    - [VPN](#vpn)
+    - [Web Servers](#web-servers)
+    - [Wikis](#wikis)
+  - [List of Licenses](#list-of-licenses)
+  - [Anti-features](#anti-features)
+  - [External Links](#external-links)
+  - [Contributing](#contributing)
+  - [Authors](#authors)
+  - [License](#license)
 
 --------------------
 
@@ -497,7 +499,7 @@ Simple deployment of [E-mail](https://en.wikipedia.org/wiki/Email) servers, e.g.
 - [The Lounge](https://thelounge.chat/) - Self-hosted web IRC client. ([Demo](https://demo.thelounge.chat/), [Source Code](https://github.com/thelounge/thelounge)) `MIT` `Nodejs/Docker`
 - [Tiny Tiny IRC](https://tt-rss.org/tt-irc/) - An open source AJAX-powered chat platform with support for IRC ([Source Code](https://git.tt-rss.org/fox/tt-irc)). `GPL-3.0` `PHP/Java`
 - [UnrealIRCd](https://www.unrealircd.org/) - Modular, advanced and highly configurable IRC server written in C for Linux, BSD, Windows, and macOS. ([Source Code](https://github.com/unrealircd/unrealircd)) `GPL-2.0` `C`
-- [Weechat](https://weechat.org/) - Fast, light and extensible chat client. `GPL-3.0` `C`
+- [Weechat](https://weechat.org/) - Fast, light and extensible chat client. ([Source Code](https://github.com/weechat/weechat)) `GPL-3.0` `C/Docker`
 - [ZNC](https://wiki.znc.in/ZNC) - Advanced IRC bouncer. ([Source Code](https://github.com/znc/znc)) `Apache-2.0` `C++`