diff --git a/doom_modules.lua b/doom_modules.lua
index 9f1608dae..13434f086 100644
--- a/doom_modules.lua
+++ b/doom_modules.lua
@@ -15,13 +15,13 @@ M.source = debug.getinfo(1, "S").source:sub(2)
 
 M.modules = {
   ui = {
-    "dashboard", -- Start screen
+    "dashboard",          -- Start screen
     -- "doom-themes",     -- Additional doom emacs' colorschemes
     -- "indentlines",     -- Show indent lines
     -- "show_registers",  -- popup that shows register contents
-    "statusline", -- Statusline
-    "tabline", -- Tabline, shows your buffers list at top
-    "which-key", -- Keybindings popup menu like Emacs' guide-key
+    "statusline",         -- Statusline
+    "tabline",            -- Tabline, shows your buffers list at top
+    "which-key",          -- Keybindings popup menu like Emacs' guide-key
     -- "zen",             -- Distraction free environment
   },
   doom = {
@@ -30,21 +30,22 @@ M.modules = {
     -- "runner",          -- Open a REPL for the current language or run the current file
   },
   editor = {
-    "autopairs", -- Autopairs
-    "auto-session", -- A small automated session manager for Neovim
-    "dap", -- Debug Adapter Protocol
+    "autopairs",          -- Autopairs
+    "auto-session",       -- A small automated session manager for Neovim
+    "dap",                -- Debug Adapter Protocol
     -- "editorconfig",    -- EditorConfig support for Neovim
-    "explorer", -- Tree explorer
-    "formatter", -- File formatting
-    "gitsigns", -- Git signs
-    "kommentary", -- Comments plugin
-    "lsp", -- Language Server Protocols
+    "explorer",           -- Tree explorer
+    "formatter",          -- File formatting
+    "gitsigns",           -- Git signs
+    "kommentary",         -- Comments plugin
+    "lsp",                -- Language Server Protocols
     -- "minimap",         -- Code minimap, requires github.com/wfxr/code-minimap
     -- "ranger",          -- Ranger File Browser, requires ranger file browser
-    "snippets", -- LSP snippets
-    "symbols", -- LSP symbols and tags
-    "telescope", -- Highly extendable fuzzy finder over lists
+    "snippets",           -- Code snippets
+    "symbols",            -- LSP symbols and tags
+    "telescope",          -- Highly extendable fuzzy finder over lists
     -- "terminal",        -- Terminal for Neovim (NOTE: needed for runner and compiler)
+    -- "trouble",         -- A pretty list to help you solve all the trouble your code is causing.
   },
   langs = {
     -- To enable the language server for a language just add the +lsp flag
@@ -58,28 +59,32 @@ M.modules = {
 
     -- "bash",            -- The terminal gods language
     -- "elixir",          -- Build scalable and maintainable software
-    "lua", -- Support for our gods language
+    "lua",                -- Support for our gods language
     -- "python +lsp",     -- Python support + lsp
     -- "ruby",            -- Look ma, I love the gems!
 
+    -- "c",               -- Core dumped: segmentation fault
     -- "cpp",             -- C++ support
     -- "go",              -- Hello, gopher
     -- "haskell",         -- Because Functional programming is fun, isn't it?
     -- "java",            -- Java support
     -- "rust +lsp",       -- Let's get rusty!
 
+    -- "comment",         -- Better annotations and comments
     -- "config",          -- Configuration files (JSON, YAML, TOML)
     -- "dockerfile",      -- Do you like containers, right?
   },
   utilities = {
     -- "lazygit",         -- LazyGit integration for Neovim, requires LazyGit
     -- "neogit",          -- Magit for Neovim
-    "range-highlight", -- hightlights ranges you have entered in commandline
+    "range-highlight",    -- Hightlights ranges you have entered in commandline
     -- "suda",            -- Write and read files without sudo permissions
+    -- "superman",        -- Read Unix man pages faster than a speeding bullet!
+    -- "todo_comments",   -- Highlight, list and search todo comments in your projects
   },
   web = {
     -- "colorizer",       -- Fastest colorizer for Neovim
-    -- "firenvim",        -- requires firenvim browser extension; change fontsize by increasing guifontsize in doom_config
+    -- "firenvim",        -- Requires firenvim browser extension; change fontsize by increasing guifontsize in doom_config
     -- "restclient",      -- A fast Neovim http client
   },
 }
diff --git a/lua/doom/modules/init.lua b/lua/doom/modules/init.lua
index 04d3f9f77..c6355ec65 100644
--- a/lua/doom/modules/init.lua
+++ b/lua/doom/modules/init.lua
@@ -478,17 +478,29 @@ packer.startup(function(use)
     config = require("doom.modules.config.doom-fire"),
   })
 
+  local disabled_todo = functions.is_plugin_disabled("todo_comments")
   use({
     "folke/todo-comments.nvim",
     requires = "nvim-lua/plenary.nvim",
     config = require("doom.modules.config.doom-todo"),
+    disable = disabled_todo,
   })
+
+  local disabled_trouble = functions.is_plugin_disabled("trouble")
   use({
     "folke/trouble.nvim",
+    cmd = { "Trouble", "TroubleClose", "TroubleRefresh", "TroubleToggle" },
     requires = "kyazdani42/nvim-web-devicons",
     config = require("doom.modules.config.doom-trouble"),
+    disable = disabled_trouble,
+  })
+
+  local disabled_superman = functions.is_plugin_disabled("superman")
+  use({
+    "jez/vim-superman",
+    cmd = "SuperMan",
+    disable = disabled_superman,
   })
-  use({ "jez/vim-superman" })
 
   -----[[----------------]]-----
   ---     Custom Plugins     ---