diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 3dcd9f8b4..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## Expected behavior
-
-
-## Actual behavior
-
-
-## Steps to reproduce the problem
-
-  1.
-  1.
-  1.
-  1.
-  1.
-
-## Specifications
-
-  - Windows version:
-  - Project64 version:
-  - Plugins used:
diff --git a/.github/ISSUE_TEMPLATE/BUG.md b/.github/ISSUE_TEMPLATE/BUG.md
new file mode 100644
index 000000000..b8ab9c783
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/BUG.md
@@ -0,0 +1,44 @@
+### Expected behavior
+- 
+- 
+- 
+
+### Actual behavior
+- 
+- 
+- 
+
+### Steps to reproduce the problem
+
+  1.
+  1.
+  1.
+  1.
+  1.
+
+### Error messages you received
+- 
+- 
+- 
+
+### Screenshots (if applicable)
+- 
+- 
+- 
+
+### Specifications
+
+  - Hardware specifications of the computer or device you used to run Project64
+    - CPU
+	- GPU
+	- RAM
+
+  - Windows version (include version and OS build number using WinVer):
+  - Project64 version (include commit version number and whether you are using the 32-bit or 64-bit version):
+
+### Plugins used while the issue occurred:
+
+  - Graphics plugin (and HLE or LLE):
+  - Sound plugin:
+  - Input plugin:
+  - RSP plugin:
diff --git a/.github/ISSUE_TEMPLATE/FEATURE.md b/.github/ISSUE_TEMPLATE/FEATURE.md
new file mode 100644
index 000000000..10bb9b198
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEATURE.md
@@ -0,0 +1,8 @@
+### Feature desired:
+- 
+
+### Why this feature should be added:
+- 
+
+### Examples of it being successfully implemented in other software:
+- 
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4030f6fe7..24303f471 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,13 @@
+[Add description of the PR here]
+
 Fixes #
 
-## Proposed Changes
+### Proposed changes
+  -
+  -
+  -
 
-  -
-  -
-  -
+### Does this make breaking changes?
+
+
+### Does this version of Project64 compile and run without issue?
diff --git a/BUILDING.md b/BUILDING.md
index 57f20d02a..c5edd4ca2 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -3,7 +3,7 @@ Project64 - Building from source
 
 This document describes how to set up a local build environment for Project64 on Windows.
 It is meant for helping contributors set up building Project64 on their machines so that they can write code to fix bugs and add new features.
-If you just want to run Project64 or its development builds, use the [Readme](https://github.com/project64/project64user-content-project64---nintendo-64-emulator) instead.
+If you just want to run Project64 or its development builds, use the [Readme](https://github.com/project64/project64/blob/develop/README.md) instead.
 
 ## Required software
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0e7f15f2..b3079ab57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
-Android Release 9:
-- Add ability to change screen res
-- Fix multiple pause/resume
-- minor bug fixes
-
-Windows 2.4
-- Build with v2015
-- fixed fpu issue - Indiana Jones (#76) 
-- Fix bug in key assignment (#1309)
-- Add Shygoo's debugger code
-- New audio plugin
-- large address aware
+Version 3.0
+- GLideN64 has been added and you can select it as the default plugin in the welcome screen
+- Add new audio and input plugin
+- Added "enhancement patches"
+- Cheat system has been rebuilt from the ground up
 - Ability to change defaults
-- Add GlideN64
-- Add New controller plugin
-- Saves in unique directory
+- Saves in their own unique directory
+- Add Shygoo's debugger code
+- Fixed FPU issue - Indiana Jones (#76)
+- Fix bug in key assignment (#1309)
+- Large address aware
+- Now built with Visual Studio 2015
+
+Android Release 9:
+- Add ability to change screen resolution
+- Fix multiple pause/resume
+- Minor bug fixes