diff --git a/index.md b/index.md
index f0015f0..563d9bd 100644
--- a/index.md
+++ b/index.md
@@ -49,8 +49,8 @@ More information about wiiload and alternatives can be found here: http://wiibre
 
 # Download
 The plugin loader can be downloaded here:  
-Nightlies: [Download](https://github.com/Maschell/WiiUPluginSystem/releases)  
-Source: [Here](https://github.com/Maschell/WiiUPluginSystem)  
+Nightlies: [Download](https://github.com/Maschell/WiiUPluginLoader/releases)  
+Source: [Here](https://github.com/Maschell/WiiUPluginLoader)  
 Load the file with the homebrew launcher.
 
 {% include links.html %}
diff --git a/pages/dev/dev_compile_loader.md b/pages/dev/dev_compile_loader.md
index e71c494..6a26e4e 100644
--- a/pages/dev/dev_compile_loader.md
+++ b/pages/dev/dev_compile_loader.md
@@ -2,7 +2,7 @@
 title: How to compile the loader
 tags: 
 keywords: system functions, dynamic_libs, dynamic libs, wut
-last_updated: July 24, 2018
+last_updated: November 20, 2018
 sidebar: dev_sidebar
 permalink: dev_compile_loader.html
 folder: dev
@@ -10,8 +10,8 @@ topnav: topnav
 ---
 
 ## Requirements
-To be able to compile the loader, you need to already have installed the [toolchain](https://github.com/Maschell/WiiUPluginSystem/wiki/Setting-up-the-Toolchain) 
-and [required libs](https://github.com/Maschell/WiiUPluginSystem/wiki/Installing-the-required-libraries).  
+To be able to compile the loader, you need to already have installed the [toolchain](dev_toolchain_setup) 
+and [required libs](dev_required_libraries).  
 **Make sure to also install DevkitARM!**
 
 ## Compiling the loader
diff --git a/pages/dev/dev_plugin_makefile.md b/pages/dev/dev_plugin_makefile.md
index 806b97a..ca022e3 100644
--- a/pages/dev/dev_plugin_makefile.md
+++ b/pages/dev/dev_plugin_makefile.md
@@ -18,7 +18,7 @@ The `plugin_makefile.mk` will be installed automatically into the _WUPS_DIR_ ins
 [WUPS library](https://github.com/Maschell/WiiUPluginSystem/wiki/Installing-the-required-libraries#wups-library).  
 
 The `Makefile` and `makefile.mk` can be found inside the [example plugin](https://github.com/Maschell/WiiUPluginSystem/tree/master/plugins/example_plugin). 
-When using the [Code::Blocks template](https://github.com/Maschell/WiiUPluginSystem/wiki/Using-project-templates-in-Code::Blocks), these will be provided.
+When using the [Code::Blocks template](dev_project_template_in_code_blocks), these will be provided.
 
 # makefile.mk
 The `makefile.mk` should be self explanatory, but common changes will be explained here.
diff --git a/pages/dev/dev_project_template_in_code_blocks.md b/pages/dev/dev_project_template_in_code_blocks.md
index bc2d19f..2e46ded 100644
--- a/pages/dev/dev_project_template_in_code_blocks.md
+++ b/pages/dev/dev_project_template_in_code_blocks.md
@@ -11,8 +11,8 @@ topnav: topnav
 
 Code::Blocks allows you to save projects as an template for other (new projects). This page is about setting up the example plugin template.
 ## Setting up a plugin template.
-The Wii U Plugin also provides an example Code::Blocks project which can be used as a template.   
-It can be found in the following directory of this repository:  
+The Wii U Plugin System also provides an example Code::Blocks project which can be used as a template.   
+It can be found in the following directory of the [repository](https://github.com/Maschell/WiiUPluginSystem/tree/master/ide_templates/codeblocks):  
 `ide_templates\codeblocks`  
 The directory contains a project file (`windows_template.cbp`), a example source file (`src/main.cpp`) and a default Makefile (`Makefile`).
 Once you've opened the project in Code::Blocks, make sure you can compile it. Press `Ctrl + F11` to call `make clean && make`. You can also do `right click -> Rebuild` on the project.