diff --git a/_Sidebar.md b/_Sidebar.md
index 318dee1cff..8d77ba44f4 100644
--- a/_Sidebar.md
+++ b/_Sidebar.md
@@ -1,12 +1,18 @@
 * [Wiki Home](wiki/)
-* [QMK Overview](QMK-Overview)
-* [Build Environment Setup](Build-Environment-Setup)
-* [FAQ](FAQ)
- * [FAQ Build](FAQ-Build)
- * [FAQ Keymap](FAQ-Keymap)
-* [Keymap](Keymap)
+* Getting started
+  * [QMK Overview](QMK-Overview)
+  * [Build Environment Setup](Build-Environment-Setup)
+* [Overview for keymap creators](Keymap)
  * [Keycodes](Keycodes)
  * [Leader Key](Leader-Key)
  * [Macros](Macros)
  * [Space Cadet](Space-Cadet-Shift)
  * [Tap Dance](Tap-Dance)
+ * [FAQ: Creating a Keymap](FAQ-Keymap)
+ * [FAQ: Compiling QMK](FAQ-Build)
+* For hardware makers and modders
+  * [Modding your keyboard](Modding-your-keyboard)
+  * [Porting your keyboard to QMK](Porting-your-keyboard-to-QMK)
+* [General FAQ](FAQ)
+
+