diff --git a/docs/index.md b/docs/index.md
index f22353ac..26156087 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -3,14 +3,14 @@
 ##Content
 - [About](about.md)
 - Guides
-	- [Windows Guide](guides/comprehensiveguide.md)
-	- [Linux Guide](guides/linuxguide.md)
-	- [OSX Guide](guides/macguide.md)
-	- [Building from Source](guides/fromsource.md)
-	- [Docker Guide](guides/dockerguide.md)
+	- [Windows Guide](guides/Windows Guide.md)
+	- [Linux Guide](guides/Linux Guide.md)
+	- [OSX Guide](guides/OSX Guide.md)
+	- [Building from Source](guides/Building from Source.md)
+	- [Docker Guide](guides/Docker Guide.md)
 - [Commands List](commandslist.md)
-- [Permissions System](permissions.md)
-- [JSON Explanations](explanations.md)
-- [Custiom Reactions](customreactions.md)
-- [Frequently Asked Questions](FAQ.md)
-- [Contribution Guide](contributionguide.md)
\ No newline at end of file
+- [Permissions System](Permissions System.md)
+- [JSON Explanations](JSON Explanations.md)
+- [Custiom Reactions](Custom Reactions.md)
+- [Frequently Asked Questions](Frequently Asked Questions.md)
+- [Contribution Guide](Contribution Guide.md)
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 6422bb25..95d6dc27 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -3,16 +3,16 @@ pages:
 - Home: index.md
 - About: about.md
 - Guides:
-    - Windows Guide: guides/comprehensiveguide.md
-    - Linux Guide: guides/linuxguide.md
-    - OSX Guide: guides/macguide.md
-    - Building from Source: guides/fromsource.md
-    - Docker Guide: guides/dockerguide.md
-- Commands List: https://github.com/Kwoth/NadekoBot/blob/master/commandlist.md
-- Permissions System: permissions.md
-- JSON Explanations: explanations.md
-- Custom Commands: customreactions.md
-- Frequently Asked Questions: FAQ.md
-- Contribution Guide: contributionguide.md
+    - Windows Guide: guides/Windows Guide.md
+    - Linux Guide: guides/Linux Guide.md
+    - OSX Guide: guides/OSX Guide.md
+    - Building from Source: guides/Building from Source.md
+    - Docker Guide: guides/Docker Guide.md
+- Commands List: commandlist.md
+- Permissions System: Permissions System.md
+- JSON Explanations: JSON Explanations.md
+- Custom Commands: Custom Reactions.md
+- Frequently Asked Questions: Frequently Asked Questions.md
+- Contribution Guide: Contribution Guide.md
 
 theme: readthedocs
diff --git a/mkdocs.yml b/mkdocs.yml
index d0fe64de..95d6dc27 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -3,16 +3,16 @@ pages:
 - Home: index.md
 - About: about.md
 - Guides:
-    - Windows Guide: guides/comprehensiveguide.md
-    - Linux Guide: guides/linuxguide.md
-    - OSX Guide: guides/macguide.md
-    - Building from Source: guides/fromsource.md
-    - Docker Guide: guides/dockerguide.md
+    - Windows Guide: guides/Windows Guide.md
+    - Linux Guide: guides/Linux Guide.md
+    - OSX Guide: guides/OSX Guide.md
+    - Building from Source: guides/Building from Source.md
+    - Docker Guide: guides/Docker Guide.md
 - Commands List: commandlist.md
-- Permissions System: permissions.md
-- JSON Explanations: explanations.md
-- Custom Commands: customreactions.md
-- Frequently Asked Questions: FAQ.md
-- Contribution Guide: contributionguide.md
+- Permissions System: Permissions System.md
+- JSON Explanations: JSON Explanations.md
+- Custom Commands: Custom Reactions.md
+- Frequently Asked Questions: Frequently Asked Questions.md
+- Contribution Guide: Contribution Guide.md
 
-theme: readthedocs
\ No newline at end of file
+theme: readthedocs