diff --git a/docs/creds-guide.md b/docs/creds-guide.md
index 2fb856dfa..e7c4e0080 100644
--- a/docs/creds-guide.md
+++ b/docs/creds-guide.md
@@ -13,11 +13,11 @@ This document aims to guide you through the process of creating a Discord accoun
 - Click on the `Add a Bot` button and confirm that you do want to add a bot to this app.
 - **Optional:** Add bot's avatar and description.
 - Copy your Token to `creds.yml` as shown above.
-- Scroll down to the `Privileged Gateway Intents` section
-    - Enabled the following:
-        - PRESENCE INTENT
-        - SERVER MEMBERS INTENT
-        - MESSAGE CONTENT INTENT
+- Scroll down to the **`Privileged Gateway Intents`** section
+    - **Enable the following:**
+         - **PRESENCE INTENT**
+         - **SERVER MEMBERS INTENT**
+         - **MESSAGE CONTENT INTENT**
 
 These are required for a number of features to function properly, and all should be on.
 
diff --git a/docs/guides/linux-guide.md b/docs/guides/linux-guide.md
index 51d627e14..9b1e3300f 100644
--- a/docs/guides/linux-guide.md
+++ b/docs/guides/linux-guide.md
@@ -1,8 +1,24 @@
-## Migration from 2.x 
+# Setting up NadekoBot on Linux
 
-##### ⚠ If you're already hosting NadekoBot, _You **MUST** update to latest version of 2.x and **run your bot at least once**_ before switching over to v3.
+## Please **READ** the [Migration] section if you are still on on Nadeko **2.x**
 
-#### [Linux migration instructions](../migration-guide/#linux)
+| Table of Contents                                   |
+| :-------------------------------------------------- |
+| [Migration]                                         |
+| [Linux From Source]                                 |
+| [Source Update Instructions]                        |
+| [Linux Release]                                     |
+| [Release Update Instructions]                       |
+| [Tmux (Preferred Method)]                           |
+| [Systemd]                                           |
+| [Systemd + Script]                                  |
+| [Setting up Nadeko on a VPS (Digital Ocean)]        |
+
+## Migration
+
+### ⚠ If you're already hosting NadekoBot, _You **MUST** update to latest version of 2.x and **run your bot at least once**_ before upgrading to v3. ⚠
+
+#### [**LINUX MIGRATION INSTRUCTIONS**](../migration-guide/#linux)
 
 #### Operating System Compatibility
 
@@ -37,9 +53,9 @@ Open Terminal (if you're on an installation with a window manager) and navigate
        - `Enter`
 8. Run the bot (type `3` and press enter)
 
-##### Update Instructions
+##### Source Update Instructions
 
-1. ⚠ Stop the bot
+1. ⚠ Stop the bot ⚠
 2. Update and run the **new** installer script `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/master/linuxAIO.sh && bash linuxAIO.sh`
 3. Update the bot (type `2` and press enter)
 4. Run the bot (type `3` and press enter)
@@ -47,7 +63,7 @@ Open Terminal (if you're on an installation with a window manager) and navigate
 
 ## Linux Release
 
-⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠ 
+**⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠** 
 
 ##### Installation Instructions
 
@@ -72,7 +88,7 @@ Open Terminal (if you're on an installation with a window manager) and navigate
 9. Run the bot
     - `./NadekoBot`
 
-##### Update Instructions
+##### Release Update Instructions
 
 1. Stop the bot
 2. Download the latest release from <https://gitlab.com/Kwoth/nadekobot/-/releases>
@@ -119,7 +135,7 @@ cd nadekobot && chmod +x NadekoBot
 
 While there are two run modes built into the installer, these options only run Nadeko within the current session. Below are 3 methods of running Nadeko as a background process.
 
-### Tmux (Preferred Method)
+### Tmux Method (Preferred)
 
 Using `tmux` is the simplest method, and is therefore recommended for most users.
 
@@ -290,3 +306,13 @@ If you are running your droplet for the first time, it will most likely ask you
 **Save the new password somewhere safe.**
 
 After that, your droplet should be ready for use. [Follow the guide from the beginning](#linux-from-source) to set Nadeko up on your newly created VPS.
+
+[Migration]: #migration
+[Linux From Source]: #linux-from-source
+[Source Update Instructions]: #source-update-instructions
+[Linux Release]: #linux-release
+[Release Update Instructions]: #release-update-instructions
+[Tmux (Preferred Method)]: #tmux-preferred-method
+[Systemd]: #systemd
+[Systemd + Script]: #systemd-script
+[Setting up Nadeko on a VPS (Digital Ocean)]: #setting-up-nadeko-on-a-linux-vps-digital-ocean-droplet
diff --git a/docs/guides/windows-guide.md b/docs/guides/windows-guide.md
index c4ff78e9f..f1943f22a 100644
--- a/docs/guides/windows-guide.md
+++ b/docs/guides/windows-guide.md
@@ -48,6 +48,8 @@
 
 - Either click on **`RUN`** button in the updater or run the bot via its desktop shortcut.
 
+### If you get a "No owner channels created..." message. Please follow the creds guide again [**HERE**](../../creds-guide).
+
 #### Updating Nadeko
 
 - Make sure Nadeko is closed and not running  
diff --git a/docs/jsons-explained.md b/docs/jsons-explained.md
index 0ed036302..e7acde5b4 100644
--- a/docs/jsons-explained.md
+++ b/docs/jsons-explained.md
@@ -75,6 +75,7 @@ For Windows (Updater), add this to your `creds.yml`
 ```yml
 RestartCommand:
     Cmd: "NadekoBot.exe"
+    args: "{0}"
 ```
 
 For Windows (Source), Linux or OSX, add this to your `creds.yml`
@@ -161,8 +162,8 @@ osuApiKey: 4c8c8fdffdsfdsfsdfsfa33f3f3140a7d93320d6
 #     cmd: dotnet
 #     args: "NadekoBot.dll -- {0}"
 # Windows default
-#     cmd: NadekoBot.exe
-#     args: {0}
+#     cmd: "NadekoBot.exe"
+#     args: "{0}"
 restartCommand:
   cmd: 
   args: 
diff --git a/src/NadekoBot/creds_example.yml b/src/NadekoBot/creds_example.yml
index b392b011e..bbf2b1892 100644
--- a/src/NadekoBot/creds_example.yml
+++ b/src/NadekoBot/creds_example.yml
@@ -74,8 +74,8 @@ osuApiKey:
 #     cmd: dotnet
 #     args: "NadekoBot.dll -- {0}"
 # Windows default
-#     cmd: NadekoBot.exe
-#     args: {0}
+#     cmd: "NadekoBot.exe"
+#     args: "{0}"
 restartCommand:
   cmd: 
   args: