diff --git a/README.md b/README.md
index 7862754..7f91b03 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,10 @@
   * [Hard disk encryption](#hard-disk-encryption)
   * [Bootloader configuration](#bootloader-configuration)
 - [Post install tasks](#post-install-tasks)
+  * [Disk partitions](#disk-partitions)
+    + [Lock the boot directory](#lock-the-boot-directory)
+    + [Secure /tmp and /var/tmp](#secure-tmp-and-var-tmp)
+    + [Disk quotas](#disk-quotas)
   * [Keep system updated](#keep-system-updated)
   * [Package management](#package-management)
     + [Remove packages with known issues](#remove-packages-with-known-issues)
@@ -64,9 +68,6 @@
     + [Login failures](#login-failures)
   * [System path permissions](#system-path-permissions)
     + [World writable files](#world-writable-files)
-  * [Disk partitions](#disk-partitions)
-    + [Secure /tmp and /var/tmp](#secure-tmp-and-var-tmp)
-    + [Disk quotas](#disk-quotas)
   * [PAM module](#pam-module)
   * [Limits](#limits)
   * [Shadow passwords](#shadow-passwords)
@@ -80,6 +81,8 @@
   * [Disable compilers](#disable-compilers)
   * [Email notifications](#email-notifications)
   * [Backups](#backups)
+  * [External devices](#external-devices)
+    + [Disable USB usage](disable-usb-usage)
 - [Tools](#tools)
   * [Logging and Auditing](#logging-and-auditing)
     + [Auditd](#auditd)
@@ -90,6 +93,7 @@
     + [Fail2ban](#fail2ban)
     + [PSAD](#psad)
     + [SELinux](#selinux)
+    + [Entropy daemon](#entropy-daemon)
     + [Centralized authentication service](#centralized-authentication-service)
   * [Testing tools](#testing-tools)
     + [Lynis](#lynis)
@@ -101,6 +105,8 @@
     + [NTP](#ntp)
     + [Cron](#cron)
     + [Anacron](#anacron)
+    + [GnuPG 2](#gnupg2)
+      + [Unattended key generation](#unattended-key-generation)
   * [DNS services](#dns-services)
     + [Bind9](#bind9)
   * [Mail services](#mail-services)
@@ -108,5 +114,19 @@
   * [Web services](#web-services)
     + [Nginx](#nginx)
     + [Apache](#apache)
+    + [Securing and tuning HTTP/HTTPS protocols](#securing-and-tuning-http-https-protocols)
+      - [Use HTTPS](#use-https)
+      - [Enable HTTP2](#enable-http2)
+      - [Separate domains](#separate-domains)
+      - [Redirect all unencrypted traffic to HTTPS](#redirect-all-unencrypted-traffic-to-https)
+      - [Enable HTTP Strict Transport Security](#enable-http-strict-transport-security)
+      - [Security related headers](#security-related-headers)
+  * [Databases](#databases)
+    + [PostgreSQL](#postgresql)
+    + [MySQL](#mysql)
+    + [Redis](#redis)
+  * [Queues](#queues)
+    + [AMQP](#amqp)
+- [Deployment](#deployment)
 - [Testing configuration](#testing-configuration)
 - [External resources](#external-resources)