18 files changed, 13 insertions, 25 deletions
diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md
index 9ecc0deb5..c9323deb5 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -125,6 +125,8 @@ The following options can be used to tweak the various animations:
 
 You can also modify the speeds that the different modes animate at:
 
+Here is a quick demo on Youtube (with NPKC KC60) (https://www.youtube.com/watch?v=VKrpPAHlisY).
+
 ```c
 // How long (in milliseconds) to wait between animation steps for each of the "Solid color breathing" animations
 const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5};
diff --git a/keyboards/atomic/readme.md b/keyboards/atomic/readme.md
index ab2fa4a23..0561c4fea 100644
--- a/keyboards/atomic/readme.md
+++ b/keyboards/atomic/readme.md
@@ -3,7 +3,7 @@ Atomic
 
 ![Atomic](http://i.imgur.com/3gNDJAh.jpg)
 
-A compact 60% (15x5) ortholinear keyboard kit made and sold by OLKB. [More info on qmk.fm](http://qmk.fm/atomic/)
+A compact 60% (15x5) ortholinear keyboard kit made and sold by OLKB.
 
 Keyboard Maintainer: [Jack Humbert](https://github.com/jackhumbert)  
 Hardware Supported: Atomic PCB rev1, Teensy 2.0  
diff --git a/keyboards/fc980c/README.md b/keyboards/fc980c/README.md
index 768d7d3a3..61dcf6ee9 100644
--- a/keyboards/fc980c/README.md
+++ b/keyboards/fc980c/README.md
@@ -155,7 +155,7 @@ Datasheets
 - AD5258: http://www.analog.com/media/en/technical-documentation/data-sheets/AD5258.pdf
 - JST S5B-PH-SM4: http://www.jst-mfg.com/product/pdf/eng/ePH.pdf
 - Hirose UX60SC-MB-5S8: https://www.hirose.com/product/en/products/UX/UX60SC-MB-5S8%2880%29/
-- Tr(E42) for LED?: http://cj-elec.com/txUpfile/2013614923661845.pdf
+- Tr(E42) for LED?: http://www.bklighting.com/cimages/specs-758.pdf
 - TYU TU1252WNR-05S: http://php2.twinner.com.tw/files/goodjob/TY1252series.pdf
 
 
diff --git a/keyboards/handwired/frenchdev/readme.md b/keyboards/handwired/frenchdev/readme.md
index 9d7c59e71..96825bb79 100644
--- a/keyboards/handwired/frenchdev/readme.md
+++ b/keyboards/handwired/frenchdev/readme.md
@@ -19,7 +19,6 @@ with the added possibility to connect up to 6 external switches like pedals,
 ## Laser-cuttable file
 There is intentionnaly no hole for the TRRS connector, you are supposed to use a drill for it. 
 This way if you don't want to use the pedals you don't have a useless hole. Plus it's cleaner.
-http://qmk.fm/frenchdev/frenchdev_v1_lasercut_template.svg
 
 ## Side stickers
 You can find my original file here : http://qmk.fm/frenchdev/example_printable_stickers.svg
diff --git a/keyboards/kbdfans/kbd66/keymaps/maartenwut/config.h b/keyboards/kbdfans/kbd66/keymaps/maartenwut/config.h
index c7b3d6ecc..c7b3d6ecc 100755..100644
--- a/keyboards/kbdfans/kbd66/keymaps/maartenwut/config.h
+++ b/keyboards/kbdfans/kbd66/keymaps/maartenwut/config.h
diff --git a/keyboards/kc60/keymaps/stanleylai/readme.md b/keyboards/kc60/keymaps/stanleylai/readme.md
index 815649d98..6f5953ded 100644
--- a/keyboards/kc60/keymaps/stanleylai/readme.md
+++ b/keyboards/kc60/keymaps/stanleylai/readme.md
@@ -1,8 +1,6 @@
 Stanley Lai's Split Right Shift with Dedicated Arrow Keys
 ======================
 
-![Image of KC60 with RGB Underglow](../ws2812/ws2812_example.jpg)
-
 ## Quantum MK Firmware
 For the full Quantum feature list, see [the parent readme.md](/readme.md).
 
@@ -20,7 +18,7 @@ For the full Quantum feature list, see [the parent readme.md](/readme.md).
 ![RGB Layer](http://imgur.com/ZWIfuPM)
 
 ## WS2812 Support
-By default, it is now setup for 16 LEDs on the PF5 breakout pin. See [included image](../ws2812/ws2812_wiring.jpg) for wiring reference.
+By default, it is now setup for 16 LEDs on the PF5 breakout pin.
 
 ### Build
 To build this keymap, simply run `make KEYMAP=stanleylai`.
diff --git a/keyboards/kc60/readme.md b/keyboards/kc60/readme.md
index da84f6159..e152824cc 100644
--- a/keyboards/kc60/readme.md
+++ b/keyboards/kc60/readme.md
@@ -24,7 +24,6 @@ $ make [default|jack|<name>]
 Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
 
 ## WS2812 Support
-![Image of KC60 with RGB Underglow](keymaps/ws2812/ws2812_example.jpg)
 
 Build with WS2812 Support by running `make ws2812`.
 
diff --git a/keyboards/kmac/readme.md b/keyboards/kmac/readme.md
index ec36c0a5c..cd181a5f6 100644
--- a/keyboards/kmac/readme.md
+++ b/keyboards/kmac/readme.md
@@ -20,7 +20,7 @@ For the full Quantum feature list, see the [documentation](https://docs.qmk.fm).
 
 The KMAC are available with two different PCB layouts, a winkey version and a winkeyless version. A default keymap are provided for each versions of the PCB.
 
-Depending on which PCB and keymap you would like to use, you will have to compile the firmware slightly differently. All of the commands should be run in the [keyboards/kmac](/keyboards/kmac) folder.
+Depending on which PCB and keymap you would like to use, you will have to compile the firmware slightly differently. All of the commands should be run in the [qmk root](https://github.com/qmk/qmk_firmware/) folder.
 
 ### Winkey keymap
 
diff --git a/keyboards/knops/readme.md b/keyboards/knops/readme.md
index 563099b6d..115e4d7c6 100644
--- a/keyboards/knops/readme.md
+++ b/keyboards/knops/readme.md
@@ -7,4 +7,4 @@
 * Maintainer: [Pawnerd](https://github.com/pawnerd)
 * Hardware Supported:
   * [`Mini`](mini/): Knops Mini
-* Hardware Availability: [knops.io](https://www.knops.io/)
-\ No newline at end of file
+* Hardware Availability: [knops.io](http://www.knops.io/)
+\ No newline at end of file
diff --git a/keyboards/lets_split/keymaps/piemod/README.md b/keyboards/lets_split/keymaps/piemod/README.md
index f2a051da1..6bae7e76d 100644
--- a/keyboards/lets_split/keymaps/piemod/README.md
+++ b/keyboards/lets_split/keymaps/piemod/README.md
@@ -17,9 +17,6 @@ A keymap for users that need:
 
 Still a work-in-progress. Suggestions welcome @ https://github.com/dwrz/piemod.
 
-### Keymap
-
-![PieMod Keymap](./keymap.png)
 
 ### TODO
 
diff --git a/keyboards/planck/keymaps/piemod/README.md b/keyboards/planck/keymaps/piemod/README.md
index f2a051da1..9c29e75db 100644
--- a/keyboards/planck/keymaps/piemod/README.md
+++ b/keyboards/planck/keymaps/piemod/README.md
@@ -17,10 +17,6 @@ A keymap for users that need:
 
 Still a work-in-progress. Suggestions welcome @ https://github.com/dwrz/piemod.
 
-### Keymap
-
-![PieMod Keymap](./keymap.png)
-
 ### TODO
 
 - [ ] Add Emacs layer.
diff --git a/keyboards/readme.md b/keyboards/readme.md
index 8b0c10ab4..81284755f 100644
--- a/keyboards/readme.md
+++ b/keyboards/readme.md
@@ -35,7 +35,7 @@ These keyboards are part of the QMK repository, but their manufacturers are not
 * [9key](/keyboards/9key) &mdash; A 9-key minipad sold by Bishop Keyboards.
 * [Alps64](/keyboards/alps64) &mdash; A 60% keyboard for Alps keyswitches.
 * [AMJ60](/keyboards/amj60) &mdash; DIY/Assembled compact 60% keyboard.
-* [Arrow Pad](/keyboards/arrow_pad) &mdash; A custom creation by IBNobody.
+* [Arrow Pad](/keyboards/handwired/arrow_pad) &mdash; A custom creation by IBNobody.
 * [Atreus](/keyboards/atreus) &mdash; Made by Technomancy.
 * [Bantam44](/keyboards/bantam44) &mdash; It is a 44-key 40% staggered keyboard.
 * [DataHand](/keyboards/handwired/datahand) &mdash; DataHand keyboard converted to use a Teensy board.
@@ -53,7 +53,7 @@ These keyboards are part of the QMK repository, but their manufacturers are not
 * [The Kitten Paw](/keyboards/kitten_paw) &mdash; A replacement controller (2016 revision) for the Filco Majestouch by [Bathroom Epiphanies](https://github.com/BathroomEpiphanies).
 * [Lets Split](/keyboards/lets_split) - Split ortholinear 40% keyboard.
 * [Phantom](/keyboards/phantom) &mdash; A tenkeyless kit by Teel, also from Geekhack.
-* [Retro Refit](/keyboards/retro_refit) &mdash; Another creation by IBNobody.
+* [Retro Refit](/keyboards/handwired/retro_refit) &mdash; Another creation by IBNobody.
 * [S60-x](/keyboards/s60_x) &mdash; DIY compact keyboard designed by VinnyCordeiro for Sentraq.
 * [Satan](/keyboards/satan) &mdash; A GH60 variant.
 * [SixKeyBoard](/keyboards/sixkeyboard) &mdash; A 6-key keyboard made by TechKeys.
diff --git a/layouts/community/ergodox/dvorak_spanish/readme.md b/layouts/community/ergodox/dvorak_spanish/readme.md
index e075e3cd7..1256c6887 100644
--- a/layouts/community/ergodox/dvorak_spanish/readme.md
+++ b/layouts/community/ergodox/dvorak_spanish/readme.md
@@ -1,5 +1,4 @@
 # Ergodox Spanish Dvorak Layout
- * See spanish dvorak layout [here](http://djelibeibi.unex.es/dvorak/)
  * Software layout must be set to SPANISH QWERTY to work properly
 
 ## Keymap Layers
diff --git a/layouts/community/ergodox/osx_de/readme.md b/layouts/community/ergodox/osx_de/readme.md
index 5011a9dd6..e4ccee3aa 100644
--- a/layouts/community/ergodox/osx_de/readme.md
+++ b/layouts/community/ergodox/osx_de/readme.md
@@ -1,4 +1,4 @@
-#Ergodox EZ für OSX 
+# Ergodox EZ für OSX 
 
 Dies ist nur ein kleiner Tweak der bestehenden firmware für das ErgoDox-EZ-Keyboard. Leider passte das layout nicht wirklich für OSX, deswegen habe ich einige Anpassungen gemacht. Dabei wurden folgende features umgesetzt:
 
@@ -14,7 +14,6 @@ Dies ist nur ein kleiner Tweak der bestehenden firmware für das ErgoDox-EZ-Keyb
 # Erstellt Mit Dem ErgodoxLayoutGenerator
 
 Der ErgodoxLayoutGenerator ist ein kleines Werkzeug, welches die Erstellung und Pflege der eigenen Keymaps erleichtern soll. Es ist in java geschrieben und kann [hier](https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases) heruntergeladen werden. Damit das Tool funktioniert sollte das offizielle Oracle JDK in aktueller Version installiert sein.
-Die Dokumentation für den ELG kann man [hier](https://boesebeck.name/2016/04/16/ergodoxlayoutgenerator-documentation/) nachlesen (momentan leider nur in Englisch verfügbar).
 
 
 
diff --git a/layouts/community/ergodox/osx_de_experimental/readme.md b/layouts/community/ergodox/osx_de_experimental/readme.md
index e6a101841..dde28eee4 100644
--- a/layouts/community/ergodox/osx_de_experimental/readme.md
+++ b/layouts/community/ergodox/osx_de_experimental/readme.md
@@ -8,7 +8,6 @@ dieses layout ist experimentell und wird im Lufe der Zeit viele Änderungen und
 # Erstellt Mit Dem ErgodoxLayoutGenerator
 
 Der ErgodoxLayoutGenerator (ELG) ist ein kleines Werkzeug, welches die Erstellung und Pflege der eigenen Keymaps erleichtern soll. Es ist in java geschrieben und kann [hier](https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases) heruntergeladen werden. Damit das Tool funktioniert sollte das offizielle Oracle JDK in aktueller Version installiert sein.
-Die Dokumentation für den ELG kann man [hier](https://boesebeck.name/2016/04/16/ergodoxlayoutgenerator-documentation/) nachlesen (momentan leider nur in Englisch verfügbar).
 ---------------------------------------------------------------------------------------------------------------------
 
 # Ergodox and Ergodox-EZ experimental layout
diff --git a/layouts/community/ergodox/teckinesis/readme.md b/layouts/community/ergodox/teckinesis/readme.md
index 6804bb06f..d9b22742c 100644
--- a/layouts/community/ergodox/teckinesis/readme.md
+++ b/layouts/community/ergodox/teckinesis/readme.md
@@ -1,6 +1,6 @@
 # teckinesis Layout
 
-*A blend of TECK and Kinesis layouts, based on ["The Ordinary Layout" by Nicholas Keene](http://qmk.fm/keyboards/ergodox_ez/keymaps/ordinary/#the-ordinary-layout-a-familiar-and-powerful-layout)*
+*A blend of TECK and Kinesis layouts, based on ["The Ordinary Layout" by Nicholas Keene](/layouts/community/ergodox/ordinary)*
 
 I love "The Ordinary Layout", but I still use a [TECK](https://www.trulyergonomic.com/store/index.php)
 at the office, and I found the transition back and forth to be a bit more difficult than I expected.
diff --git a/layouts/community/ergodox/tm2030/readme.md b/layouts/community/ergodox/tm2030/readme.md
index 23746ddb7..fce0c46e7 100644
--- a/layouts/community/ergodox/tm2030/readme.md
+++ b/layouts/community/ergodox/tm2030/readme.md
@@ -55,7 +55,7 @@ As on the original TM 2030, when `num` layer is activated, holding `fn` disables
 ## Dvorak Layer
 Same as Layer 0 but with _Dvorak_ layout, to use with QWERTY OS layout.
 
-Enable Dvorak layout with [`Magic`](/TMK_readme.md#magic-commands)+`1` (`LShift`+`RShift`+`1`), disable with `Magic`-`0`.
+Enable Dvorak layout with [`Magic`](/docs/feature_bootmagic.md)+`1` (`LShift`+`RShift`+`1`), disable with `Magic`-`0`.
 
 The middle (green) led indicates when the Dvorak layer is activated.
 
diff --git a/quantum/visualizer/readme.md b/quantum/visualizer/readme.md
index 545ba2270..298efb742 100644
--- a/quantum/visualizer/readme.md
+++ b/quantum/visualizer/readme.md
@@ -1,7 +1,7 @@
 # A visualization library for the TMK keyboard firmware
 
 This library is designed to work together with the [TMK keyboard firmware](https://github.com/tmk/tmk_keyboard). Currently it only works for [Chibios](http://www.chibios.org/)
- flavors, but it would be possible to add support for other configurations as well. The LCD display functionality is provided by the [uGFX library](http://www.ugfx.org/). 
+ flavors, but it would be possible to add support for other configurations as well. The LCD display functionality is provided by the [uGFX library](https://ugfx.io/). 
 
 ## To use this library as a user
 You can and should modify the visualizer\_user.c file. Check the comments in the file for more information.