diff --git a/README.md b/README.md
index 84739c9..fbc09a6 100644
--- a/README.md
+++ b/README.md
@@ -15,50 +15,146 @@
 
 ## Table of Contents
 
-- [Applications](#applications)
-  - [Audio](#audio)
-  - [Chat Clients](#chat-clients)
-  - [Data Backup and Recovery](#data-backup-and-recovery)
-  - [Desktop Customization](#desktop-customization)
-  - [Development](#development)
-  - [E-Book Utilities](#e-book-utilities)
-  - [Education](#education)
-  - [Email Utilities](#email)
-  - [File Manager](#file-manager)
-  - [Games](#games)
-  - [Graphics](#graphics)
-  - [Internet](#internet)
-  - [Office](#office)
-  - [Productivity](#productivity)
-  - [Proxy](#proxy)
-  - [Security](#security)
-  - [Sharing Files](#sharing-files)
-  - [Terminal](#terminal)
-  - [Text Editors](#text-editors)
-  - [Utilities](#utilities)
-  - [Video](#video)
-  - [VPN](#vpn)
-  - [Wiki Software](#wiki-software)
-  - [Others](#others)
-- [Command Line Utilities](#command-line-utilities)
-- [Custom Linux Kernels](#custom-linux-kernels)
-- [Desktop Environments](#desktop-environments)
-- [Display Managers](#display-manager)
-  - [Console](#console)
-  - [Graphic](#graphic)
-- [Window Managers](#window-managers)
-  - [Compositors](#compositors)
-  - [Stacking Window Managers](#stacking-window-managers)
-  - [Tiling Window Managers](#tiling-window-managers)
-  - [Dynamic Window Managers](#dynamic-window-managers)
-
----
-
-- [Linux News, Apps, and more ....](#linux-news-apps-and-more)
-- [Reddit](#reddit)
-- [Contributors](#contributors)
-- [Guidelines to Contribute](#guidelines-to-contribute)
-- [How to Contribute](#unsure-how-to-contribute)
+- [Awesome Linux Software](#awesome-linux-software)
+  - [Table of Contents](#table-of-contents)
+  - [Applications](#applications)
+    - [Audio](#audio)
+      - [Edit-Mix-Record](#edit-mix-record)
+      - [Music Player](#music-player)
+      - [Radio](#radio)
+      - [Utilities](#utilities)
+    - [Chat Clients](#chat-clients)
+      - [3rd Party Client](#3rd-party-client)
+      - [All-in-One Client](#all-in-one-client)
+      - [Chat Client Utilities](#chat-client-utilities)
+      - [IRC Client](#irc-client)
+      - [Official Client](#official-client)
+    - [Data Backup and Recovery](#data-backup-and-recovery)
+    - [Desktop Customization](#desktop-customization)
+      - [Desktop Icon Packs](#desktop-icon-packs)
+      - [Desktop Themes](#desktop-themes)
+      - [Desktop Widgets and Theme Utilities](#desktop-widgets-and-theme-utilities)
+    - [Development](#development)
+      - [Android](#android)
+      - [C++](#c)
+      - [Database](#database)
+      - [Game Engines](#game-engines)
+      - [Git](#git)
+      - [Golang](#golang)
+      - [Java](#java)
+      - [Javascript](#javascript)
+      - [Microcomputer and Embedded Devices](#microcomputer-and-embedded-devices)
+      - [Multiple Languages Support](#multiple-languages-support)
+      - [PHP](#php)
+      - [Python](#python)
+      - [Ruby](#ruby)
+      - [Shell](#shell)
+      - [Supporting Tools](#supporting-tools)
+    - [E-Book Utilities](#e-book-utilities)
+    - [Education](#education)
+    - [Email](#email)
+    - [File Manager](#file-manager)
+    - [Games](#games)
+      - [City Building Simulation](#city-building-simulation)
+      - [Command Line](#command-line)
+      - [Engine Re-creations (require the actual game)](#engine-re-creations-require-the-actual-game)
+      - [FPS](#fps)
+      - [Miscellaneous](#miscellaneous)
+      - [Puzzle](#puzzle)
+      - [Racing](#racing)
+      - [RPG](#rpg)
+      - [RTS](#rts)
+      - [Sandbox](#sandbox)
+      - [Shooter](#shooter)
+      - [Turn Based Strategy](#turn-based-strategy)
+      - [Gaming Applications](#gaming-applications)
+        - [Launchers](#launchers)
+        - [Tools](#tools)
+        - [W.I.N.E.](#wine)
+      - [Machine Emulators](#machine-emulators)
+        - [All-in-One](#all-in-one)
+        - [Atari](#atari)
+        - [Microsoft](#microsoft)
+        - [Nintendo](#nintendo)
+        - [Sony](#sony)
+        - [ZX Spectrum](#zx-spectrum)
+    - [Graphics](#graphics)
+      - [Graphic Creation](#graphic-creation)
+      - [Image Editor](#image-editor)
+      - [Image Management](#image-management)
+      - [Miscellaneous](#miscellaneous-1)
+      - [PSD, Sketch Inspection](#psd-sketch-inspection)
+      - [Screen Recorder](#screen-recorder)
+      - [Screenshot](#screenshot)
+      - [Streaming](#streaming)
+      - [Video Editor](#video-editor)
+    - [Internet](#internet)
+      - [Browser](#browser)
+      - [Supportive Tool](#supportive-tool)
+      - [Web Service Client](#web-service-client)
+    - [Office](#office)
+      - [Accounting](#accounting)
+      - [Office Suites](#office-suites)
+      - [LaTeX](#latex)
+      - [Markdown](#markdown)
+      - [Novel Writing](#novel-writing)
+    - [Productivity](#productivity)
+      - [Automation](#automation)
+      - [Dock](#dock)
+      - [Local Search](#local-search)
+      - [Miscellaneous](#miscellaneous-2)
+      - [Note Taking](#note-taking)
+      - [Time and Task](#time-and-task)
+      - [Time and Usage Tracker](#time-and-usage-tracker)
+      - [Widget and Indicator](#widget-and-indicator)
+    - [Proxy](#proxy)
+    - [Security](#security)
+      - [Boot Integrity](#boot-integrity)
+      - [Compartmentalization](#compartmentalization)
+      - [Firewall](#firewall)
+      - [Password Manager](#password-manager)
+      - [Reverse Engineering](#reverse-engineering)
+      - [Other](#other)
+    - [Sharing Files](#sharing-files)
+      - [Cloud Drive](#cloud-drive)
+      - [Download Manager](#download-manager)
+      - [File Sharing](#file-sharing)
+      - [Remote Desktop](#remote-desktop)
+      - [Torrent Client](#torrent-client)
+    - [Terminal](#terminal)
+    - [Text Editors](#text-editors)
+      - [Integrated Development Environment inspired / Common User Access based](#integrated-development-environment-inspired--common-user-access-based)
+      - [Modal editors \& derivatives](#modal-editors--derivatives)
+      - [Other editors](#other-editors)
+    - [Utilities](#utilities-1)
+      - [Disk Utilities](#disk-utilities)
+      - [System Maintenance](#system-maintenance)
+      - [System Monitoring](#system-monitoring)
+      - [Other](#other-1)
+    - [Video](#video)
+    - [VPN](#vpn)
+    - [Wiki Software](#wiki-software)
+    - [Others](#others)
+  - [Command Line Utilities](#command-line-utilities)
+    - [Internet](#internet-1)
+    - [System Info / Monitoring](#system-info--monitoring)
+    - [Tools](#tools-1)
+  - [Custom Linux Kernels](#custom-linux-kernels)
+  - [Desktop Environments](#desktop-environments)
+  - [Display manager](#display-manager)
+    - [Console](#console)
+    - [Graphic](#graphic)
+  - [Window Managers](#window-managers)
+    - [Compositors](#compositors)
+    - [Stacking Window Managers](#stacking-window-managers)
+    - [Tiling Window Managers](#tiling-window-managers)
+    - [Dynamic Window Managers](#dynamic-window-managers)
+  - [Linux News, Apps, and more:](#linux-news-apps-and-more)
+  - [Reddit](#reddit)
+  - [Contributors](#contributors)
+  - [Guidelines to contribute](#guidelines-to-contribute)
+  - [Unsure how to contribute?](#unsure-how-to-contribute)
+  - [License](#license)
 
 ---