diff --git a/keyboards/clueboard/keymaps/caps_fn/layout.png b/keyboards/clueboard/keymaps/caps_fn/layout.png
deleted file mode 100644
index a5bd57adbb..0000000000
Binary files a/keyboards/clueboard/keymaps/caps_fn/layout.png and /dev/null differ
diff --git a/keyboards/clueboard/keymaps/caps_fn/readme.md b/keyboards/clueboard/keymaps/caps_fn/readme.md
index 74ad01fca8..47a530a80b 100644
--- a/keyboards/clueboard/keymaps/caps_fn/readme.md
+++ b/keyboards/clueboard/keymaps/caps_fn/readme.md
@@ -1,13 +1,4 @@
-```
- ___     _____ _            _                         _     __    __ _   __
-|__ \   / ____| |          | |                       | |   / /   / /(_) / /
- ||) | | |    | |_   _  ___| |__   ___   __ _ _ __ __| |  / /_  / /_   / /
- |/ /  | |    | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / /
- |_|   | |____| | |_| |  __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _
- (_)    \_____|_|\__,_|\___|_.__/ \___/ \__,_|_|  \__,_|  \___/ \___/_/ (_)
-```
-
-![Clueboard Layout Image](layout.png)
+![Clueboard Layout Image](http://i.imgur.com/kGADucy.png)
 
 # Caps Fn Layout
 
diff --git a/keyboards/clueboard/keymaps/default/layout.png b/keyboards/clueboard/keymaps/default/layout.png
deleted file mode 100644
index cd318163e4..0000000000
Binary files a/keyboards/clueboard/keymaps/default/layout.png and /dev/null differ
diff --git a/keyboards/clueboard/keymaps/default/readme.md b/keyboards/clueboard/keymaps/default/readme.md
index cede17ee17..019131aeb1 100644
--- a/keyboards/clueboard/keymaps/default/readme.md
+++ b/keyboards/clueboard/keymaps/default/readme.md
@@ -1,13 +1,4 @@
-```
- ___     _____ _            _                         _     __    __ _   __
-|__ \   / ____| |          | |                       | |   / /   / /(_) / /
- ||) | | |    | |_   _  ___| |__   ___   __ _ _ __ __| |  / /_  / /_   / /
- |/ /  | |    | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / /
- |_|   | |____| | |_| |  __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _
- (_)    \_____|_|\__,_|\___|_.__/ \___/ \__,_|_|  \__,_|  \___/ \___/_/ (_)
-```
-
-![Clueboard Layout Image](layout.png)
+![Clueboard Layout Image](http://i.imgur.com/7Capi8W.png)
 
 # Default Clueboard Layout
 
diff --git a/keyboards/clueboard/keymaps/jokrik/readme.md b/keyboards/clueboard/keymaps/jokrik/readme.md
index cc5eeba961..a845e65f1b 100644
--- a/keyboards/clueboard/keymaps/jokrik/readme.md
+++ b/keyboards/clueboard/keymaps/jokrik/readme.md
@@ -1,11 +1,2 @@
-```
- ___     _____ _            _                         _     __    __ _   __
-|__ \   / ____| |          | |                       | |   / /   / /(_) / /
- ||) | | |    | |_   _  ___| |__   ___   __ _ _ __ __| |  / /_  / /_   / /
- |/ /  | |    | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / /
- |_|   | |____| | |_| |  __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _
- (_)    \_____|_|\__,_|\___|_.__/ \___/ \__,_|_|  \__,_|  \___/ \___/_/ (_)
-```
-
 # Jokrik's Clueboard Layout
 
diff --git a/keyboards/clueboard/keymaps/mac_optimized/layout.png b/keyboards/clueboard/keymaps/mac_optimized/layout.png
deleted file mode 100644
index e84ba54ea9..0000000000
Binary files a/keyboards/clueboard/keymaps/mac_optimized/layout.png and /dev/null differ
diff --git a/keyboards/clueboard/keymaps/mac_optimized/readme.md b/keyboards/clueboard/keymaps/mac_optimized/readme.md
index 940e09125d..282da369dc 100644
--- a/keyboards/clueboard/keymaps/mac_optimized/readme.md
+++ b/keyboards/clueboard/keymaps/mac_optimized/readme.md
@@ -1,13 +1,4 @@
-```
- ___     _____ _            _                         _     __    __ _   __
-|__ \   / ____| |          | |                       | |   / /   / /(_) / /
- ||) | | |    | |_   _  ___| |__   ___   __ _ _ __ __| |  / /_  / /_   / /
- |/ /  | |    | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / /
- |_|   | |____| | |_| |  __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _
- (_)    \_____|_|\__,_|\___|_.__/ \___/ \__,_|_|  \__,_|  \___/ \___/_/ (_)
-```
-
-![Clueboard Layout Image](layout.png)
+![Clueboard Layout Image](http://i.imgur.com/7oZCsHF.png)
 
 # Default Clueboard Layout for Mac
 
diff --git a/keyboards/clueboard/keymaps/magicmonty/layout.png b/keyboards/clueboard/keymaps/magicmonty/layout.png
deleted file mode 100644
index 9e866a92c3..0000000000
Binary files a/keyboards/clueboard/keymaps/magicmonty/layout.png and /dev/null differ
diff --git a/keyboards/clueboard/keymaps/magicmonty/readme.md b/keyboards/clueboard/keymaps/magicmonty/readme.md
index 728c188225..2959172df1 100644
--- a/keyboards/clueboard/keymaps/magicmonty/readme.md
+++ b/keyboards/clueboard/keymaps/magicmonty/readme.md
@@ -1,13 +1,4 @@
-```
- ___     _____ _            _                         _     __    __ _   __
-|__ \   / ____| |          | |                       | |   / /   / /(_) / /
- ||) | | |    | |_   _  ___| |__   ___   __ _ _ __ __| |  / /_  / /_   / /
- |/ /  | |    | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / /
- |_|   | |____| | |_| |  __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _
- (_)    \_____|_|\__,_|\___|_.__/ \___/ \__,_|_|  \__,_|  \___/ \___/_/ (_)
-```
-
-![Clueboard Layout Image](layout.png)
+![Clueboard Layout Image](http://i.imgur.com/ngg4EAY.png)
 
 # MouseKeys Layout
 
diff --git a/keyboards/clueboard/keymaps/maximised/layout.png b/keyboards/clueboard/keymaps/maximised/layout.png
deleted file mode 100644
index bdc5d76239..0000000000
Binary files a/keyboards/clueboard/keymaps/maximised/layout.png and /dev/null differ
diff --git a/keyboards/clueboard/keymaps/maximised/readme.md b/keyboards/clueboard/keymaps/maximised/readme.md
index b95d1750f4..fc82e68793 100644
--- a/keyboards/clueboard/keymaps/maximised/readme.md
+++ b/keyboards/clueboard/keymaps/maximised/readme.md
@@ -1,13 +1,4 @@
-```
- ___     _____ _            _                         _     __    __ _   __
-|__ \   / ____| |          | |                       | |   / /   / /(_) / /
- ||) | | |    | |_   _  ___| |__   ___   __ _ _ __ __| |  / /_  / /_   / /
- |/ /  | |    | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / /
- |_|   | |____| | |_| |  __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _
- (_)    \_____|_|\__,_|\___|_.__/ \___/ \__,_|_|  \__,_|  \___/ \___/_/ (_)
-```
-
-![Clueboard Layout Image](layout.png)
+![Clueboard Layout Image](http://i.imgur.com/7oZCsHF.png)
 
 # Maximised Clueboard Layout
 
diff --git a/keyboards/clueboard/keymaps/mouse_keys/layout.png b/keyboards/clueboard/keymaps/mouse_keys/layout.png
deleted file mode 100644
index 52e5c4581b..0000000000
Binary files a/keyboards/clueboard/keymaps/mouse_keys/layout.png and /dev/null differ
diff --git a/keyboards/clueboard/keymaps/mouse_keys/readme.md b/keyboards/clueboard/keymaps/mouse_keys/readme.md
index 97ac6dfa23..7fb038205a 100644
--- a/keyboards/clueboard/keymaps/mouse_keys/readme.md
+++ b/keyboards/clueboard/keymaps/mouse_keys/readme.md
@@ -1,12 +1,3 @@
-```
- ___     _____ _            _                         _     __    __ _   __
-|__ \   / ____| |          | |                       | |   / /   / /(_) / /
- ||) | | |    | |_   _  ___| |__   ___   __ _ _ __ __| |  / /_  / /_   / /
- |/ /  | |    | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / /
- |_|   | |____| | |_| |  __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _
- (_)    \_____|_|\__,_|\___|_.__/ \___/ \__,_|_|  \__,_|  \___/ \___/_/ (_)
-```
-
 ![Clueboard Layout Image](layout.png)
 
 # MouseKeys Layout
diff --git a/keyboards/clueboard/keymaps/serubin/layout-base.png b/keyboards/clueboard/keymaps/serubin/layout-base.png
deleted file mode 100644
index 8dcdc06435..0000000000
Binary files a/keyboards/clueboard/keymaps/serubin/layout-base.png and /dev/null differ
diff --git a/keyboards/clueboard/keymaps/serubin/layout-fn.png b/keyboards/clueboard/keymaps/serubin/layout-fn.png
deleted file mode 100644
index 3cff46a726..0000000000
Binary files a/keyboards/clueboard/keymaps/serubin/layout-fn.png and /dev/null differ
diff --git a/keyboards/clueboard/keymaps/serubin/layout-media.png b/keyboards/clueboard/keymaps/serubin/layout-media.png
deleted file mode 100644
index 753cb64fac..0000000000
Binary files a/keyboards/clueboard/keymaps/serubin/layout-media.png and /dev/null differ
diff --git a/keyboards/clueboard/keymaps/serubin/readme.md b/keyboards/clueboard/keymaps/serubin/readme.md
index e39adbb169..78eef53523 100644
--- a/keyboards/clueboard/keymaps/serubin/readme.md
+++ b/keyboards/clueboard/keymaps/serubin/readme.md
@@ -1,23 +1,14 @@
-```
- ___     _____ _            _                         _     __    __ _   __
-|__ \   / ____| |          | |                       | |   / /   / /(_) / /
- ||) | | |    | |_   _  ___| |__   ___   __ _ _ __ __| |  / /_  / /_   / /
- |/ /  | |    | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / /
- |_|   | |____| | |_| |  __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _
- (_)    \_____|_|\__,_|\___|_.__/ \___/ \__,_|_|  \__,_|  \___/ \___/_/ (_)
-```
-
 # Serubin's Clueboard Layout
 
 This is the layout based on the clueboard default, modified for development on Mac, PC, and Windows. This layout also handles media and volume keys on all the previously listed platforms. Most importantly, Capslock has been replaced by a dual function Esc/Ctrl key. This is particularly handy for use in Vim. 
 
 #### Base Layer
-![Base Layout Image](layout-base.png)
+![Base Layout Image](http://i.imgur.com/qL78n1y.png)
 
 #### Fn Layer
-![Fn Layout Image](layout-fn.png)
+![Fn Layout Image](http://i.imgur.com/QuwxePw.png)
 
 #### Media Layer
-![Media Layer Image](layout-media.png)
+![Media Layer Image](http://i.imgur.com/oOfWXMf.png)
 
 
diff --git a/keyboards/clueboard/keymaps/shift_fn/layout.png b/keyboards/clueboard/keymaps/shift_fn/layout.png
deleted file mode 100644
index 66d85410cc..0000000000
Binary files a/keyboards/clueboard/keymaps/shift_fn/layout.png and /dev/null differ
diff --git a/keyboards/clueboard/keymaps/shift_fn/readme.md b/keyboards/clueboard/keymaps/shift_fn/readme.md
index 369f556f88..4bd920ad4e 100644
--- a/keyboards/clueboard/keymaps/shift_fn/readme.md
+++ b/keyboards/clueboard/keymaps/shift_fn/readme.md
@@ -1,14 +1,3 @@
-```
- ___     _____ _            _                         _     __    __ _   __
-|__ \   / ____| |          | |                       | |   / /   / /(_) / /
- ||) | | |    | |_   _  ___| |__   ___   __ _ _ __ __| |  / /_  / /_   / /
- |/ /  | |    | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / /
- |_|   | |____| | |_| |  __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _
- (_)    \_____|_|\__,_|\___|_.__/ \___/ \__,_|_|  \__,_|  \___/ \___/_/ (_)
-```
-
-![Clueboard Layout Image](layout.png)
-
 # Shift Fn Clueboard Layout
 
 This is an experimental layout. It makes the left shift key a dual roll key.
diff --git a/keyboards/clueboard/keymaps/skully/layout.png b/keyboards/clueboard/keymaps/skully/layout.png
deleted file mode 100644
index 64854aaefd..0000000000
Binary files a/keyboards/clueboard/keymaps/skully/layout.png and /dev/null differ
diff --git a/keyboards/clueboard/keymaps/skully/readme.md b/keyboards/clueboard/keymaps/skully/readme.md
index 08255dfbc5..b9ad1b09a9 100644
--- a/keyboards/clueboard/keymaps/skully/readme.md
+++ b/keyboards/clueboard/keymaps/skully/readme.md
@@ -1,16 +1,11 @@
-```
- ___     _____ _            _                         _     __    __ _   __
-|__ \   / ____| |          | |                       | |   / /   / /(_) / /
- ||) | | |    | |_   _  ___| |__   ___   __ _ _ __ __| |  / /_  / /_   / /
- |/ /  | |    | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / /
- |_|   | |____| | |_| |  __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _
- (_)    \_____|_|\__,_|\___|_.__/ \___/ \__,_|_|  \__,_|  \___/ \___/_/ (_)
-```
-
-![Clueboard Layout Image](layout.png)
+![Clueboard Layout Image](http://i.imgur.com/VaoGn3M.png)
 
 # skullY's Clueboard Layout
 
 This layout is what I (@skullydazed) use on my personal Clueboards. I mostly use it for programming, CAD, and general typing.
 
-The most notable change from the default layout is putting Ctrl on the Capslock key. I also swap Alt and Cmd because I mostly use a Mac day to day.
+I've made the following changes from the default layout:
+
+* shift_fn on left shift
+* Change capslock to control
+* Swap Alt and Cmd
diff --git a/keyboards/clueboard/keymaps/smt/layout.png b/keyboards/clueboard/keymaps/smt/layout.png
deleted file mode 100644
index 6c27277a9a..0000000000
Binary files a/keyboards/clueboard/keymaps/smt/layout.png and /dev/null differ
diff --git a/keyboards/clueboard/keymaps/smt/readme.md b/keyboards/clueboard/keymaps/smt/readme.md
index 6a8b3edb44..7fc0f0248d 100644
--- a/keyboards/clueboard/keymaps/smt/readme.md
+++ b/keyboards/clueboard/keymaps/smt/readme.md
@@ -1,15 +1,6 @@
-```
- ___     _____ _            _                         _     __    __ _   __
-|__ \   / ____| |          | |                       | |   / /   / /(_) / /
- ||) | | |    | |_   _  ___| |__   ___   __ _ _ __ __| |  / /_  / /_   / /
- |/ /  | |    | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / /
- |_|   | |____| | |_| |  __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _
- (_)    \_____|_|\__,_|\___|_.__/ \___/ \__,_|_|  \__,_|  \___/ \___/_/ (_)
-```
-
 # smt Clueboard Layout (HHKB variant)
 
-![Clueboard Layout Image](layout.png)
+![Clueboard Layout Image](http://i.imgur.com/Ll5gGte.png)
 
 This is smt's HHKB variant layout, based on the default layout that comes
 flashed on every Clueboard. The primary differences from the default are:
diff --git a/keyboards/clueboard/keymaps/unix_optimized/layout.png b/keyboards/clueboard/keymaps/unix_optimized/layout.png
deleted file mode 100644
index ea7d30e357..0000000000
Binary files a/keyboards/clueboard/keymaps/unix_optimized/layout.png and /dev/null differ
diff --git a/keyboards/clueboard/keymaps/unix_optimized/readme.md b/keyboards/clueboard/keymaps/unix_optimized/readme.md
index 3510e138bf..9e6d0e902a 100644
--- a/keyboards/clueboard/keymaps/unix_optimized/readme.md
+++ b/keyboards/clueboard/keymaps/unix_optimized/readme.md
@@ -1,13 +1,4 @@
-```
- ___     _____ _            _                         _     __    __ _   __
-|__ \   / ____| |          | |                       | |   / /   / /(_) / /
- ||) | | |    | |_   _  ___| |__   ___   __ _ _ __ __| |  / /_  / /_   / /
- |/ /  | |    | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / /
- |_|   | |____| | |_| |  __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _
- (_)    \_____|_|\__,_|\___|_.__/ \___/ \__,_|_|  \__,_|  \___/ \___/_/ (_)
-```
-
-![Clueboard Layout Image](layout.png)
+![Clueboard Layout Image](http://i.imgur.com/BnWlOht.png)
 
 # Default Clueboard Layout
 
diff --git a/keyboards/clueboard/keymaps/win_optimized/layout.png b/keyboards/clueboard/keymaps/win_optimized/layout.png
deleted file mode 100644
index 7d8c82da7c..0000000000
Binary files a/keyboards/clueboard/keymaps/win_optimized/layout.png and /dev/null differ
diff --git a/keyboards/clueboard/keymaps/win_optimized/readme.md b/keyboards/clueboard/keymaps/win_optimized/readme.md
index cede17ee17..703a37be0c 100644
--- a/keyboards/clueboard/keymaps/win_optimized/readme.md
+++ b/keyboards/clueboard/keymaps/win_optimized/readme.md
@@ -1,13 +1,4 @@
-```
- ___     _____ _            _                         _     __    __ _   __
-|__ \   / ____| |          | |                       | |   / /   / /(_) / /
- ||) | | |    | |_   _  ___| |__   ___   __ _ _ __ __| |  / /_  / /_   / /
- |/ /  | |    | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / /
- |_|   | |____| | |_| |  __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _
- (_)    \_____|_|\__,_|\___|_.__/ \___/ \__,_|_|  \__,_|  \___/ \___/_/ (_)
-```
-
-![Clueboard Layout Image](layout.png)
+![Clueboard Layout Image](http://i.imgur.com/fsqOqZo.png)
 
 # Default Clueboard Layout