diff --git a/dev/colour-whitelist b/dev/colour-whitelist
index 1d20ac01..9fdcbdc5 100644
--- a/dev/colour-whitelist
+++ b/dev/colour-whitelist
@@ -13,4 +13,4 @@ green
 brown
 white
 pastel	(Celestia's mane colour)
-rainbow
+rainbow (Rainbow dash's mane colour)
diff --git a/dev/pony-checklist b/dev/pony-checklist
index e690820f..81b9186d 100644
--- a/dev/pony-checklist
+++ b/dev/pony-checklist
@@ -42,7 +42,7 @@ King Sombra
 Prince Blueblood
 Shining Armor
 The Great and Powerful Trixie
-Unicorn royal guards    http://mlp.wikia.com/wiki/Royal_guards
+Unicorn royal guards
 Diamond Tiara
 Featherweight
 Pipsqueak
@@ -401,7 +401,7 @@ DJ Pon-3 / Vın̈yl Scratch
 Doctor Stable		http://images3.wikia.nocookie.net/__cb20120205002824/mlp/images/thumb/2/2e/S02E16_UUS1.png/150px-S02E16_UUS1.png
 Earl Grey		http://images3.wikia.nocookie.net/__cb20120314011724/mlp/images/thumb/7/77/S02E09_Waiter_unicorn_blue.png/150px-S02E09_Waiter_unicorn_blue.png
 Eliza			http://images1.wikia.nocookie.net/__cb20120107205209/mlp/images/e/ea/S02E12_UUM2.png
-Quick fix /Epona / Clockwork
+Quick fix / Epona / Clockwork
 Fleur de Lis
 Glory / Spring Fresh	http://images4.wikia.nocookie.net/__cb20110823212004/mlp/images/thumb/2/2c/Glory.png/150px-Glory.png
 Graphite       		http://images1.wikia.nocookie.net/__cb20120202171924/mlp/images/7/7b/SuperSqueezy6000UnicornStallionAshes.png
diff --git a/ponies/laflour.pony b/ponies/laflour.pony
index 6f0c9ffb..1c7a2fd9 100644
--- a/ponies/laflour.pony
+++ b/ponies/laflour.pony
@@ -8,7 +8,7 @@ KIND: item
 LICENSE: cc-by-nc-sa
 LINK: regular
 NAME: Madam la Flour
-SOURCE: desktop ponies
+SOURCE: Desktop ponies
 WIDTH: 28
 HEIGHT: 26
 
diff --git a/ponies/lintsalot.pony b/ponies/lintsalot.pony
index eaf2eee7..8b681ba4 100644
--- a/ponies/lintsalot.pony
+++ b/ponies/lintsalot.pony
@@ -8,8 +8,8 @@ KIND: item
 LICENSE: cc-by-nc-sa
 LINK: regular
 NAME: Lintsalot
-SOURCE: desktop ponies
-WIDTH: 25
+SOURCE: Desktop ponies
+WIDTH: 27
 HEIGHT: 21
 
 License summary:   https://creativecommons.org/licenses/by-nc-sa/3.0
diff --git a/ponies/papermoon.pony b/ponies/papermoon.pony
index 45b1d9e7..e0651c8a 100644
--- a/ponies/papermoon.pony
+++ b/ponies/papermoon.pony
@@ -12,7 +12,7 @@ MANE: brown
 NAME: (not mentioned)
 OTHER NAMES: Papermoon (unofficial), Peppermoon (unofficial)
 POSE: trot
-SOURCE: desktop ponies
+SOURCE: [jristz]
 WIDTH: 39
 HEIGHT: 24
 
diff --git a/ponies/parasprite.pony b/ponies/parasprite.pony
index 21126bad..497af051 100644
--- a/ponies/parasprite.pony
+++ b/ponies/parasprite.pony
@@ -10,7 +10,7 @@ KIND: animal
 LICENSE: cc-by-sa
 LINK: regular
 POSE: smile
-SOURCE: desktop ponies
+SOURCE: sktop ponies
 WIDTH: 26
 HEIGHT: 15
 
diff --git a/ponies/perrypierce.pony b/ponies/perrypierce.pony
index 7103f7d1..7dd2b45f 100644
--- a/ponies/perrypierce.pony
+++ b/ponies/perrypierce.pony
@@ -12,7 +12,7 @@ MANE: white
 NAME: (not mentioned)
 OTHER NAMES: Perry Pierce (unofficial), Pokey Pierce (unofficial, same look)
 POSE: stand
-SOURCE: desktop ponies
+SOURCE: Desktop ponies
 WIDTH: 43
 HEIGHT: 27
 
diff --git a/ponies/purplehaze.pony b/ponies/purplehaze.pony
index c6740c40..d80b9f9f 100644
--- a/ponies/purplehaze.pony
+++ b/ponies/purplehaze.pony
@@ -12,7 +12,7 @@ MANE: purple
 NAME: (not  mentioned)
 OTHER NAMES: Purple Haze (unofficial)
 POSE: stand
-SOURCE: desktop ponies
+SOURCE: [jristz]
 WIDTH: 43
 HEIGHT: 27
 
diff --git a/ponies/raggedy.pony b/ponies/raggedy.pony
index 43d56f29..aef6b22e 100644
--- a/ponies/raggedy.pony
+++ b/ponies/raggedy.pony
@@ -12,7 +12,7 @@ MANE: black
 NAME: (not mentioned)
 OTHER NAMES: Raggedy (unofficial), Raggedy Doctor (unofficial)
 POSE: trot
-SOURCE: desktop ponies deviantart group
+SOURCE: Desktop ponies deviantart group
 WIDTH: 39
 HEIGHT: 30
 
diff --git a/ponies/ravenearth.pony b/ponies/ravenearth.pony
index e59e253f..df72f4b2 100644
--- a/ponies/ravenearth.pony
+++ b/ponies/ravenearth.pony
@@ -13,7 +13,7 @@ MASTER: raven
 NAME: (not mentioned)
 OTHER NAMES: Raven (unofficial)
 POSE: demon
-SOURCE: [jristz] based on (Bot-chan) Desktop ponies
+SOURCE: [jristz], based on (Bot-chan) Desktop ponies
 WIDTH: 44
 HEIGHT: 25
 
diff --git a/ponies/rocky.pony b/ponies/rocky.pony
index 0d0b338c..31ab6d48 100644
--- a/ponies/rocky.pony
+++ b/ponies/rocky.pony
@@ -9,8 +9,8 @@ KIND: item
 LICENSE: cc-by-nc-sa
 LINK: regular
 NAME: Rocky
-SOURCE: desktop ponies
-WIDTH: 22
+SOURCE: Desktop ponies
+WIDTH: 23
 HEIGHT: 27
 
 License summary:   https://creativecommons.org/licenses/by-nc-sa/3.0
diff --git a/ponies/spikecrystal.pony b/ponies/spikecrystal.pony
index c42022f8..bca5fbe7 100644
--- a/ponies/spikecrystal.pony
+++ b/ponies/spikecrystal.pony
@@ -12,8 +12,8 @@ MANE: green
 MASTER: spike
 NAME: Spike
 POSE: crystal
-SOURCE: desktop ponies
-WIDTH: 28
+SOURCE: [jristz]
+WIDTH: 30
 HEIGHT: 20
 
 
diff --git a/ponies/sunnyrays.pony b/ponies/sunnyrays.pony
index e82a17ab..28a1293b 100644
--- a/ponies/sunnyrays.pony
+++ b/ponies/sunnyrays.pony
@@ -12,7 +12,7 @@ MANE: pink
 NAME: (not mentioned)
 OTHER NAMES: Sunny Rays (official, in merchandise)
 POSE: fly
-SOURCE: desktop ponies
+SOURCE: Desktop ponies
 WIDTH: 49
 HEIGHT: 19
 
diff --git a/ponies/turnip.pony b/ponies/turnip.pony
index 17e962bb..d14f87fe 100644
--- a/ponies/turnip.pony
+++ b/ponies/turnip.pony
@@ -7,8 +7,8 @@ KIND: item
 LICENSE: cc-by-nc-sa
 LINK: regular
 NAME: Turnip
-SOURCE: desktop ponies
-WIDTH: 23
+SOURCE: Desktop ponies
+WIDTH: 24
 HEIGHT: 24
 
 License summary:   https://creativecommons.org/licenses/by-nc-sa/3.0
diff --git a/ponies/twilightcrystal.pony b/ponies/twilightcrystal.pony
index c20bc169..dc9a2c9f 100644
--- a/ponies/twilightcrystal.pony
+++ b/ponies/twilightcrystal.pony
@@ -14,7 +14,7 @@ MASTER: twilight
 NAME: Twilight
 OTHER NAMES: Twilight Sparkle (official, full name)
 POSE: crystal
-SOURCE: (Jay Wright, Humle, Bot-chan, StarStep, Anonycat, InfinityDash, supersayanmikito, aslic96) Desktop ponies
+SOURCE: [jristz]
 WIDTH: 48
 HEIGHT: 25
 
diff --git a/ponies/twilightspike.pony b/ponies/twilightspike.pony
index 2a86f0ad..b8943ca1 100644
--- a/ponies/twilightspike.pony
+++ b/ponies/twilightspike.pony
@@ -25,7 +25,7 @@ NAME: Spike
 OTHER NAMES: Twilight Sparkle (official, full name)
 OTHER NAMES: (none)
 POSE: ride
-SOURCE: Desktop ponies deviantart
+SOURCE: Desktop ponies deviantart group
 WIDTH: 44
 HEIGHT: 28