diff --git a/doc/Commands.md b/doc/Commands.md
index d2fdba2c..f92019eb 100644
--- a/doc/Commands.md
+++ b/doc/Commands.md
@@ -15,72 +15,73 @@
     * [Factoids](#factoids)
       * [Code Factoids](#code-factoids)
       * [Modules](#modules)
-  * [Command documentation](#command-documentation)
+  * [List of commands](#list-of-commands)
     * [Administrative commands](#administrative-commands)
       * [Logging in and out of PBot](#logging-in-and-out-of-pbot)
-        * [login](#login)
-        * [logout](#logout)
+        * [login](Admin.md#login)
+        * [logout](Admin.md#logout)
       * [Admin management commands](#admin-management-commands)
-        * [adminadd](#adminadd)
-        * [adminrem](#adminrem)
-        * [adminset](#adminset)
-        * [adminunset](#adminunset)
-        * [list admins](#list-admins)
+        * [adminadd](Admin.md#adminadd)
+        * [adminrem](Admin.md#adminrem)
+        * [adminset](Admin.md#adminset)
+        * [adminunset](Admin.md#adminunset)
+        * [list admins](Admin.md#listing-admins)
       * [Channel management commands](#channel-management-commands)
-        * [join](#join)
-        * [part](#part)
-        * [chanadd](#chanadd)
-        * [chanrem](#chanrem)
-        * [chanset](#chanset)
-        * [chanunset](#chanunset)
-        * [chanlist](#chanlist)
+        * [join](Admin.md#join)
+        * [part](Admin.md#part)
+        * [chanadd](Admin.md#chanadd)
+        * [chanrem](Admin.md#chanrem)
+        * [chanset](Admin.md#chanset)
+        * [chanunset](Admin.md#chanunset)
+        * [chanlist](Admin.md#chanlist)
       * [Module management commands](#module-management-commands)
-        * [load](#load)
-        * [unload](#unload)
-        * [list modules](#list-modules)
+        * [load](Admin.md#load)
+        * [unload](Admin.md#unload)
+        * [list modules](Admin.md#listing-modules)
       * [Plugin management commands](#plugin-management-commands)
-        * [plug](#plug)
-        * [unplug](#unplug)
-        * [pluglist](#pluglist)
+        * [plug](Admin.md#plug)
+        * [unplug](Admin.md#unplug)
+        * [replug](Admin.md#replug)
+        * [pluglist](Admin.md#pluglist)
       * [Command metadata commands](#command-metadata-commands)
-        * [cmdset](#cmdset)
-        * [cmdunset](#cmdunset)
+        * [cmdset](Admin.md#cmdset)
+        * [cmdunset](Admin.md#cmdunset)
       * [Registry commands](#registry-commands)
-        * [regset](#regset)
-        * [regunset](#regunset)
-        * [regchange](#regchange)
-        * [regshow](#regshow)
-        * [regfind](#regfind)
-        * [regsetmeta](#regsetmeta)
-        * [regunsetmeta](#regunsetmeta)
+        * [regset](Registry.md#regset)
+        * [regunset](Registry.md#regunset)
+        * [regchange](Registry.md#regchange)
+        * [regshow](Registry.md#regshow)
+        * [regfind](Registry.md#regfind)
+        * [regsetmeta](Registry.md#regsetmeta)
+        * [regunsetmeta](Registry.md#regunsetmeta)
       * [Miscellaneous admin commands](#miscellaneous-admin-commands)
-        * [export](#export)
-        * [refresh](#refresh)
-        * [reload](#reload)
-        * [sl](#sl)
-        * [die](#die)
+        * [export](Admin.md#export)
+        * [refresh](Admin.md#refresh])
+        * [reload](Admin.md#reload])
+        * [sl](Admin.md#sl)
+        * [die](Admin.md#die)
     * [Factoid commands](#factoid-commands)
       * [Adding/remove factoids](#addingremove-factoids)
-        * [factadd](#factadd)
-        * [factrem](#factrem)
-        * [factalias](#factalias)
+        * [factadd](Factoids.md#factadd)
+        * [factrem](Factoids.md#factrem)
+        * [factalias](Factoids.md#factalias)
       * [Displaying factoids](#displaying-factoids)
-        * [fact](#fact)
-        * [factshow](#factshow)
+        * [fact](Factoids.md#fact)
+        * [factshow](Factoids.md#factshow)
       * [Editing factoids](#editing-factoids)
-        * [factchange](#factchange)
-        * [factmove](#factmove)
-        * [factundo](#factundo)
-        * [factredo](#factredo)
-        * [factset](#factset)
-        * [factunset](#factunset)
+        * [factchange](Factoids.md#factchange)
+        * [factmove](Factoids.md#factmove)
+        * [factundo](Factoids.md#factundo)
+        * [factredo](Factoids.md#factredo)
+        * [factset](Factoids.md#factset)
+        * [factunset](Factoids.md#factunset)
       * [Information about factoids](#information-about-factoids)
-        * [factlog](#factlog)
-        * [factfind](#factfind)
-        * [factinfo](#factinfo)
-        * [count](#count)
-        * [histogram](#histogram)
-        * [top20](#top20)
+        * [factlog](Factoids.md#factlog)
+        * [factfind](Factoids.md#factfind)
+        * [factinfo](Factoids.md#factinfo)
+        * [count](Factoids.md#count)
+        * [histogram](Factoids.md#histogram)
+        * [top20](Factoids.md#top20)
     * [Miscellaneous commands](#miscellaneous-commands)
 <!-- md-toc-end -->
 
@@ -200,10 +201,10 @@ a PBot module.
 
 Modules do not have access to PBot's internal API or data structures.
 
-## Command documentation
+## List of commands
 
-Here is the documentation for all of PBot's built-in commands and some of the
-more useful Factoids, Plugins and Modules.
+Here is the list of all of PBot's built-in commands and some of the more useful
+Factoids, Plugins and Modules.
 
 ### Administrative commands
 
@@ -240,6 +241,7 @@ more useful Factoids, Plugins and Modules.
 
 ##### [plug](Admin.md#plug)
 ##### [unplug](Admin.md#unplug)
+##### [replug](Admin.md#replug)
 ##### [pluglist](Admin.md#pluglist)
 
 #### Command metadata commands