diff --git a/README.md b/README.md
index 3c5663f..c8536f8 100644
--- a/README.md
+++ b/README.md
@@ -17,64 +17,61 @@
 
 ### Table of contents
 
-- [Awesome Sysadmin](#awesome-sysadmin)
-  - [Automation](#automation)
-  - [Backups](#backups)
-  - [Build and software organization tools](#build-and-software-organization-tools)
-  - [ChatOps](#chatops)
-  - [Client Management](#client-management)
-  - [Cloning](#cloning)
-  - [Cloud Computing](#cloud-computing)
-  - [Cloud Orchestration](#cloud-orchestration)
-  * Cloud Storage: [see awesome-selfhosted#file-transfersynchronization](https://github.com/Kickball/awesome-selfhosted#file-transfersynchronization)
-  - [Code Review](#code-review)
-  * Collaborative Software: [see awesome-selfhosted#groupware](https://github.com/Kickball/awesome-selfhosted#groupware)
-  - [Configuration Management Database](#configuration-management-database)
-  - [Configuration Management](#configuration-management)
-  - [Continuous Integration & Continuous Deployment](#continuous-integration--continuous-deployment)
-  - [Control Panels](#control-panels)
-  - [Databases](#databases)
-  - [Deployment Automation](#deployment-automation)
-  - [Diagramming](#diagramming)
-  - [Distributed Filesystems](#distributed-filesystems)
-  - [DNS](#dns)
-  - [Domains](#domains)
-  - [Editors](#editors)
-  - [Identity Management](#identity-management)
-  - [IT Asset Management](#it-asset-management)
-  - [Log Management](#log-management)
-  - [Mail Clients](#mail-clients)
-  * Mail servers/webmail: [see awesome-selfhosted#email](https://github.com/kickball/awesome-selfhosted#email)
-  - [Monitoring](#monitoring)
-  - [Metric & Metric Collection](#metric--metric-collection)
-  - [Network Configuration Management](#network-configuration-management)
-  - [Newsletter](#newsletters)
-  - [Packaging](#packaging)
-  - [Project Management](#project-management)
-  - [Queuing](#queuing)
-  - [Remote Management](#remote-management)
-  * Security: [see awesome-security](https://github.com/sbilly/awesome-security)
-  - [Service Discovery](#service-discovery)
-  - [Software Containers](#software-containers)
-  * SSH: [see awesome-ssh](https://github.com/moul/awesome-ssh)
-  * Statistics: [see awesome-selfhosted#analytics](https://github.com/Kickball/awesome-selfhosted#analytics)
-  - [Status Pages](#status-pages)
-  * Ticketing systems: [see awesome-selfhosted#ticketing](https://github.com/Kickball/awesome-selfhosted#ticketing)
-  - [Troubleshooting](#troubleshooting)
-  - [Version control](#version-control)
-  - [Virtualization](#virtualization)
-  - [VPN](#vpn)
-  * XMPP: [see awesome-selfhosted#xmpp](https://github.com/Kickball/awesome-selfhosted#xmpp)
-  - [Web](#web)
-  * Wiki Software: [see awesome-selfhosted#wikis](https://github.com/Kickball/awesome-selfhosted#wikis), Sysadmin Wikis: [see #wikis](#wikis)
-- [Resources](#resources)
-  - [Blogs](#blogs)
-  - [Books](#books)
-  - [Communities/Forums](#communities--forums)
-  - [Newsletters](#newsletters)
-  - [Repositories](#repositories)
-  - [Websites](#websites)
-  - [Wikis](#wikis)
+- [Software](#software)
+    - [Automation](#automation)
+    - [Backups](#backups)
+    - [Build and software organization tools](#build-and-software-organization-tools)
+    - [ChatOps](#chatops)
+    - [Client management](#client-management)
+    - [Cloning](#cloning)
+    - [Cloud Computing](#cloud-computing)
+    - [Cloud Orchestration](#cloud-orchestration)
+    - [Code Review](#code-review)
+    - [Configuration Management Database](#configuration-management-database)
+    - [Configuration Management](#configuration-management)
+    - [Continuous Integration & Continuous Deployment](#continuous-integration--continuous-deployment)
+    - [Control Panels](#control-panels)
+    - [Databases](#databases)
+    - [Deployment Automation](#deployment-automation)
+    - [Diagramming](#diagramming)
+    - [Distributed Filesystems](#distributed-filesystems)
+    - [DNS - Servers](#dns---servers)
+    - [DNS - Control Panels](#dns---control-panels)
+    - [DNS - Domain Management](#dns---domain-management)
+    - [Editors](#editors)
+    - [Identity Management](#identity-management)
+    - [Identity Management - LDAP](#identity-management---ldap)
+    - [Identity Management - Tools and web interfaces](#identity-management---tools-and-web-interfaces)
+    - [Identity Management - Single Sign-On SSO](#identity-management---single-sign-on-sso)
+    - [IT Asset Management](#it-asset-management)
+    - [Log Management](#log-management)
+    - [Mail Clients](#mail-clients)
+    - [Monitoring](#monitoring)
+    - [Status Pages](#status-pages)
+    - [Metric & Metric Collection](#metric--metric-collection)
+    - [Network Configuration Management](#network-configuration-management)
+    - [Newsletters](#newsletters)
+    - [Packaging](#packaging)
+    - [Project Management](#project-management)
+    - [Queuing](#queuing)
+    - [Remote Management](#remote-management)
+    - [Service Discovery](#service-discovery)
+    - [Software Containers](#software-containers)
+    - [Troubleshooting](#troubleshooting)
+    - [Version control](#version-control)
+    - [Virtualization](#virtualization)
+    - [VPN](#vpn)
+    - [Web](#web)
+- [List of Licenses](#list-of-licenses)
+- [External links](#external-links)
+- [Blogs](#blogs)
+- [Books](#books)
+- [Communities / Forums](#communities--forums)
+- [Newsletters](#newsletters)
+- [Repositories](#repositories)
+- [Websites](#websites)
+- [License](#license)
+
 
 --------------------