diff --git a/CHANGELOG b/CHANGELOG
index ac44202c..28d91335 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,15 @@
 Version 3.0
 
 	New ponies: amira, babseed, bear, beautybrass, bigmacsleep, billneigh, cadancecrystal, cloudchaser,
-		    descent, flitter, haakim, lighningdust, mrbreezy, orangebird, orangefrog, pinkiecrazyface, 
+		    descent, flitter, haakim, lighningdust, mrbreezy, orangebird, orangefrog, pinkiecrazyface,
 		    raccoon, rumble, shiningarmorcrystal, sombra, spikecrystal, squirrel, sweetcream (comic)
 		    trixieamulet, twilightcrystal, twinkleshine
 
 	New extraponies: gleamingshield, pipsqueak (without pirate suit), pizzapony, tempo
 
+	Ponies renamed: lotusbloosom → lotusblossom (typo)
+	                maredowellgallop → maredowellgallop (need one version named as master)
+
 	Renamed option -F to +f and option --F to ++f.
 
 	Environment variable 'PONYSAY_TYPO_LIMIT' has been added.
@@ -44,13 +47,13 @@ Version 3.0
 
 	fillycelestia and filliestia has been moved to extraponies.
 
-	Ponies renamed: shadowbolts to nightingale (shadowbolts split)
-			lily to lilyvalley (official name)
-			sweatiesing to sweetiesing (name consistency)
+	Ponies renamed: shadowbolts → nightingale (shadowbolts split)
+			lily → lilyvalley (official name)
+			sweatiesing → sweetiesing (name consistency)
 			carecake become carrotcake (official name)
-			peppermoon to papermoon (miswriting)
+			peppermoon → papermoon (miswriting)
 			maria into danger (given by the author)
-			meliot to melilot (miswriting)
+			meliot → melilot (miswriting)
 
 	Pony symlink added: lily → lilyvalley
 			    sweetiedrops → bonbon
@@ -122,7 +125,7 @@ Version 2.7
 			 drhooves11, nyx (Fanfic: Past Sins), nyxdisguised (Fanfic: Past Sins),
 			 pinkaminacupcake (Fanfic)
 
-	Pony renamed: cracky to crackle
+	Pony renamed: cracky → crackle
 
 
 Version 2.6
@@ -214,7 +217,7 @@ Version 2.1.1
 
 Version 2.1
 
-	Pony renamed: applebumkin to applebumpkin
+	Pony renamed: applebumkin → applebumpkin
 
 	New ponies: purplehaze, owlowiscious
 
@@ -253,7 +256,7 @@ Version 1.3
 
 	New ponies: forestspirit, hollydash, raggedy, rhyme
 
-	Pony renamed: sindy to powderrouge
+	Pony renamed: sindy → powderrouge
 
 	Pony symlink added: sindy → powderrouge
 
@@ -270,7 +273,7 @@ Version 1.2
 	            highscore, junebug, mrsparkle, persnickety, ponet,
 		    screwloose, tornadobolt.
 
-	Pony renamed: elsie to prettyvision
+	Pony renamed: elsie → prettyvision
 
 	Pony symlinks added: mrsparkle → nightlight
 			     elsie → prettyvision
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index 21406a7e..a7f4b6fd 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -936,8 +936,10 @@ Wildlife, for example timberwolfs
 @item @code{pet}
 A pony's pet, Spike does not count because Twilight does not play with him during
 pony–pet play dates.
+@item @code{royal}
+Royal pony, either by birth or conquer (i.e. the old school style).
 @item @code{villain}
-Villains, normally minons to antagonists. Applies to changelings.
+Villains, normally minions to antagonists. Applies to changelings.
 @item @code{antagonist} (applies to: nightmare moon, gilda, discord, chrysalis)
 Antagonists are also known as archvillians or archenemies.
 Nightmare Moon, Discord and Chrysalis are such, but Gilda also counts as one.
@@ -1063,7 +1065,8 @@ balloon is not printed.
 @cindex slave file
 @cindex extras
 One word (preferably) to distinguish the pony files from other pony files with the
-same @var{MASTER}. Master files should try to specify this tag but are not required
+same @var{MASTER}. It is preferable that this is written in bare infinitive.
+Master files should try to specify this tag but are not required
 to, however, non-master files (slave files) are required to specify this tag.
 @b{This tag is important for the extras feature to function.}
 
@@ -2921,6 +2924,10 @@ New ponies: @file{amira},  @file{babseed}, @file{bear}, @file{beautybrass}, @fil
 @item
 New extraponies: @file{gleamingshield}, @file{pipsqueak}, @file{pizzapony}, @file{tempo}
 @item
+@file{lotusbloosom} has been renamed to @file{lotusblossom} (typo)
+@item
+@file{maredowellgallop} has been renamed to  @file{maredowellgallop} (need one version named as master)
+@item
 Renamed option @option{-F} to @option{+f} and option @option{--F} to @option{++f}.
 @item
 Environment variable @env{PONYSAY_TYPO_LIMIT} has been added.
diff --git a/ponies/applefritter.pony b/ponies/applefritter.pony
index 34b31131..bce2d249 100644
--- a/ponies/applefritter.pony
+++ b/ponies/applefritter.pony
@@ -10,7 +10,7 @@ KIND: earth
 LINK: regular
 MANE: green
 NAME: Apple Fritter
-POSE: troting
+POSE: trot
 SOURCE: desktop ponies
 WIDTH: 40
 HEIGHT: 25
diff --git a/ponies/applejackscarecrow.pony b/ponies/applejackscarecrow.pony
index 35b6a550..5cfbfb27 100644
--- a/ponies/applejackscarecrow.pony
+++ b/ponies/applejackscarecrow.pony
@@ -2,13 +2,14 @@ $$$
 APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
 COAT: brown
-DISPLAY: full, left
+DISPLAY: full, right
 EYE: blue
 FREE: no
 GROUP: mare, mane
 KIND: earth
 LINK: regular
 MANE: yellow
+MASTER: applejack
 NAME: Applejack
 POSE: scarecrow
 SOURCE: desktop ponies
diff --git a/ponies/bastionyorsets.pony b/ponies/bastionyorsets.pony
index 15b48642..bf5bb35d 100644
--- a/ponies/bastionyorsets.pony
+++ b/ponies/bastionyorsets.pony
@@ -1,12 +1,13 @@
 $$$
-APPEARANCE: S01E23 12:58
+APPEARANCE: S01E23 The Cutie Mark Chronicles
 BALLOON: top
 COAT: blue
-DISPLAY: full, left
+DISPLAY: full, right
 EYE: yellow
 FREE: no
 GROUP: stallion
 KIND: unicorn
+LINK: regular
 MANE: white
 NAME: (not mentioned)
 OTHER NAMES: Bastion Yorsets (unofficial),  George Washingtony (unofficial)
diff --git a/ponies/bear.pony b/ponies/bear.pony
index 37fef306..6431ec2a 100644
--- a/ponies/bear.pony
+++ b/ponies/bear.pony
@@ -1,20 +1,29 @@
 $$$
 APPEARANCE: S02E03 Lesson Zero
 BALLOON: top
-COAT: gray (ponysay), brown (source)
-DISPLAY: full, left
+COAT: brown
+DISPLAY: full, right
 EYE: yellow
 FREE: yes
-GROUP: bear
+GROUP: bear, wildlife
 KIND: animal
 LICENSE: CC0
+LINK: regular
 NAME: (not mentioned)
-POSE: eating
+POSE: eat
 SOURCE: (screenshoot)
 WIDTH: 87
 HEIGHT: 58
 
+The person who associated a work with this deed has dedicated the work to
+the public domain by waiving all of his or her rights to the work worldwide under
+copyright law, including all related and neighboring rights, to the extent allowed
+by law.
 
+You can copy, modify, distribute and perform the work, even for commercial
+purposes, all without asking permission. See Other Information below.
+
+http://creativecommons.org/publicdomain/zero/1.0/legalcode
 $$$
 $balloon56$
                                                      $\$
diff --git a/ponies/blinkie.pony b/ponies/blinkie.pony
index b4ed88f5..6db696b8 100644
--- a/ponies/blinkie.pony
+++ b/ponies/blinkie.pony
@@ -1,13 +1,15 @@
 $$$
-APPEARANCE: S01E23 16:07
+APPEARANCE: S01E23 The Cutie Mark Chronicles
 BALLOON: top
-COAT: gray
+COAT: grey
 DISPLAY: full, right
 EYE: brown
 FREE: no
-GROUP: filly
+GROUP: filly, background
 KIND: earth
-MANE: gray
+LINK: regular
+MANE: grey
+NAME: (not mentioned)
 OTHER NAMES: Blinkie Pie (unofficial)
 POSE: stand
 SOURCE: desktop ponies
diff --git a/ponies/blossomforth.pony b/ponies/blossomforth.pony
index ddc6dc46..8ecd1867 100644
--- a/ponies/blossomforth.pony
+++ b/ponies/blossomforth.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S02E22 03:39
+APPEARANCE: S02E22 Hurricane Fluttershy
 BALLOON: top
 COAT: white
 DISPLAY: full, right
@@ -7,9 +7,11 @@ EYE: green (ponysay), blue (source)
 FREE: no
 GROUP: mare
 KIND: pegasus
+LINK: regular
 MANE: pink
-NAME: Blossomforth (official on toy line)
-POSE: troting
+NAME: (not mentioned)
+OTHER NAMES: Blossomforth (official, toy line)
+POSE: trot
 SOURCE: desktop ponies devel
 WIDTH: 51
 HEIGHT: 24
diff --git a/ponies/blueberry.pony b/ponies/blueberry.pony
index e3558399..29c0b394 100644
--- a/ponies/blueberry.pony
+++ b/ponies/blueberry.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E13 06:03
+APPEARANCE: S01E13 Fall Weather Friends
 BALLOON: top
 COAT: blue
 DISPLAY: full, left
@@ -7,9 +7,10 @@ EYE: purple
 FREE: no
 GROUP: mare
 KIND: earth
+LINK: regular
 MANE: brown
-NAME: Berry Dreams (mentioned on toy line)
-OTHER NAMES: Blue berry (unofficial)
+NAME: (not mentioned)
+OTHER NAMES: Berry Dreams (official, toy line), Blue berry (unofficial)
 POSE: stand
 SOURCE: [jristz]
 WIDTH: 45
diff --git a/ponies/blues.pony b/ponies/blues.pony
index a0fa1ca0..9c614923 100644
--- a/ponies/blues.pony
+++ b/ponies/blues.pony
@@ -1,16 +1,17 @@
 $$$
-APPEARANCE: S01E11 01:46
+APPEARANCE: S01E11 Winter Wrap Up
 BALLOON: top
 COAT: blue
 DISPLAY: full, left
 EYE: brown
 FREE: no
 GROUP: stallion
-KIND: earth
+KIND: earth, background
+LINK: regular
 MANE: blue
-NAME: Noteworthy (mentioned on toy line)
-OTHER NAMES: Blues (unofficial)
-POSE: playing
+NAME: (not mentioned)
+OTHER NAMES: Noteworthy (unofficial, toy line), Blues (unofficial)
+POSE: play
 SOURCE: desktop ponies
 WIDTH: 49
 HEIGHT: 25
diff --git a/ponies/bonvoyage.pony b/ponies/bonvoyage.pony
index 185b5a10..80354837 100644
--- a/ponies/bonvoyage.pony
+++ b/ponies/bonvoyage.pony
@@ -7,10 +7,11 @@ EYE: pink
 FREE: no
 GROUP: mare
 KIND: pegasus
+LINK: regular
 MANE: pink
 NAME: (not mentioned)
 OTHER NAMES: Bon voyage (unofficial)
-POSE: flying
+POSE: fly
 SOURCE: [jristz]
 WIDTH: 49
 HEIGHT: 20
diff --git a/ponies/cadancecrystal.pony b/ponies/cadancecrystal.pony
index 48d10095..d812ea6c 100644
--- a/ponies/cadancecrystal.pony
+++ b/ponies/cadancecrystal.pony
@@ -1,18 +1,18 @@
 $$$
-APPEARANCE: S02E25 The Royal Wedding part 1
+APPEARANCE: S02E25 The Royal Wedding [Part 1]
 AURA: pink
 BALLOON: top
-BASED ON: cadance
 COAT: pink
 DISPLAY: full, left
 EYE: pink
 FREE: no
 GROUP: mare, royal, crystal
 KIND: alicorn
+LINK: regular
 MANE: pastel
 MASTER: cadance
-NAME: Princess Cadance
-OTHER NAMES: Mi amore Cadenza (on invitation), Cadence (on credits)
+NAME: Cadance
+OTHER NAMES: Princess Cadance (official, titled), Mi Amore Cadenza (official, full named without title), Princess Mi Amore Cadenza (official, full named)
 POSE: stand
 SOURCE: [jristz]
 WIDTH: 46
diff --git a/ponies/caesar.pony b/ponies/caesar.pony
index 4f189017..a5e5d3eb 100644
--- a/ponies/caesar.pony
+++ b/ponies/caesar.pony
@@ -1,15 +1,16 @@
 $$$
-APPEARANCE: S01E03 07:26
+APPEARANCE: S01E03 The Ticket Master
 BALLOON: top
-COAT: gray
-DISPLAY: full, right
+COAT: grey
+DISPLAY: full, left
 EYE: brown
 FREE: no
-GROUP: stallion, voiced
+GROUP: stallion, background, voiced
 KIND: earth
-MANE: gray
+LINK: regular
+MANE: grey
 NAME: (not mentioned)
-OTHER NAMES: Caesar
+OTHER NAMES: Caesar (unofficial)
 POSE: stand
 SOURCE: desktop ponies
 WIDTH: 48
diff --git a/ponies/candylicious.pony b/ponies/candylicious.pony
index c0f283e7..bf1795ea 100644
--- a/ponies/candylicious.pony
+++ b/ponies/candylicious.pony
@@ -1,15 +1,16 @@
 $$$
-APPEARANCE: S01E14 14:06
+APPEARANCE: S01E14 Suited for Success
 BALLOON: top
 COAT: purple
 DISPLAY: full, left
 EYE: purple
 FREE: no
-GROUP: mare
+GROUP: mare, background
 KIND: earth
+LINK: regular
 MANE: blue
 NAME: (not mentioned)
-OTHER NAMES: Candylicious
+OTHER NAMES: Candylicious (unofficial)
 POSE: stand
 SOURCE: [jristz]
 WIDTH: 49
diff --git a/ponies/candymane.pony b/ponies/candymane.pony
index 0109190a..8d9b52f6 100644
--- a/ponies/candymane.pony
+++ b/ponies/candymane.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E01 Frienship is Magic part 1
+APPEARANCE: S01E01 Frienship is Magic [Part 1]
 BALLOON: top
 COAT: brown
 DISPLAY: full, left
@@ -7,6 +7,7 @@ EYE: pink
 FREE: no
 GROUP: mare
 KIND: earth
+LINK: regular
 MANE: pink
 NAME: (not mentioned)
 OTHER NAMES: Candy Mane (unofficial), Sugarcoat (unofficial)
diff --git a/ponies/carrot.pony b/ponies/carrot.pony
index 9674df37..b503e0de 100644
--- a/ponies/carrot.pony
+++ b/ponies/carrot.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E01 Frienship is Magic part 1
+APPEARANCE: S01E01 Frienship is Magic [Part 1]
 BALLOON: top
 COAT: yellow
 DISPLAY: full, right
@@ -7,10 +7,11 @@ EYE: green
 FREE: no
 GROUP: mare
 KIND: earth
+LINK: regular
 MANE: orange
-NAME: Golden Harvest
-OTHER NAMES: Carrot Top (traiding card state this is they nick name)
-POSE: siting
+NAME: (not mentioned)
+OTHER NAMES: Golden Harvest (official, on collector card), Carrot Top (traiding card state this is they nick name)
+POSE: sit
 SOURCE: desktop ponies
 WIDTH: 44
 HEIGHT: 25
diff --git a/ponies/celestiasmall.pony b/ponies/celestiasmall.pony
index 1f59a284..8c559c3d 100644
--- a/ponies/celestiasmall.pony
+++ b/ponies/celestiasmall.pony
@@ -1,8 +1,7 @@
 $$$
-APPEARANCE: S01E01 Frienship is Magic part 1
-AURA: yellow, black (watch 'The crystal empire part 1')
+APPEARANCE: S01E01 Frienship is Magic [Part 1] (animated in a book, real life first appearance is S01E02 Frienship is Magic [Part 2])
+AURA: yellow
 BALLOON: top
-BASED ON: celestia
 COAT: white
 DISPLAY: full, left
 EYE: pink
@@ -11,9 +10,10 @@ GROUP: mare, royal
 KIND: alicorn
 LINK: regular
 MANE: pastel
-NAME: Princess Celestia
-OTHER NAMES: Celestia, Celest (see 'Golden Harvest' quotes)
-POSE: stand
+MASTER: celestia
+NAME: Celestia
+OTHER NAMES: Princess Celestia (official, full name)
+POSE: small
 SOURCE: unknown
 WIDTH: 80
 HEIGHT: 32
diff --git a/ponies/cerberus.pony b/ponies/cerberus.pony
index 7ce57b16..8f1ffb23 100644
--- a/ponies/cerberus.pony
+++ b/ponies/cerberus.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S02
+APPEARANCE: S02E20 It's About Time
 BALLOON: top
 COAT: black
 DISPLAY: full, right
@@ -8,13 +8,22 @@ FREE: yes
 GROUP: dog, wildlife, cerberus
 KIND: animal
 LICENSE: CC0
+LINK: regular
 NAME: Cerberus
 POSE: playing
 SOURCE: (screenshoot)
-WIDTH: 80
+WIDTH: 107
 HEIGHT: 33
 
+The person who associated a work with this deed has dedicated the work to
+the public domain by waiving all of his or her rights to the work worldwide under
+copyright law, including all related and neighboring rights, to the extent allowed
+by law.
 
+You can copy, modify, distribute and perform the work, even for commercial
+purposes, all without asking permission. See Other Information below.
+
+http://creativecommons.org/publicdomain/zero/1.0/legalcode
 $$$
 $balloon46$
                                            $\$
diff --git a/ponies/changeling.pony b/ponies/changeling.pony
index 97d3655a..85c43166 100644
--- a/ponies/changeling.pony
+++ b/ponies/changeling.pony
@@ -1,19 +1,20 @@
 $$$
-APPEARANCE: S02E26 The Royal Wedding part 2
+APPEARANCE: S02E26 The Royal Wedding [Part 2]
 BALLOON: top
-COAT: black blue
+COAT: black
 DISPLAY: full, right
 EYE: blue
 FREE: no
 GROUP: villain
 KIND: changeling
+LINK: regular
 MANE: black
 NAME: (not mentioned)
 POSE: stand
 SOURCE: desktop ponies
 WIDTH: 37
 HEIGHT: 26
-
+WING: teal
 
 $$$
 $balloon20$
diff --git a/ponies/cloudkicker.pony b/ponies/cloudkicker.pony
index 57b019b9..8620c5b1 100644
--- a/ponies/cloudkicker.pony
+++ b/ponies/cloudkicker.pony
@@ -1,15 +1,16 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
-COAT: teal
+COAT: blue
 DISPLAY: full, right
 EYE: purple
 FREE: no
-GROUP: mare
+GROUP: mare, background
 KIND: pegasus
+LINK: regular
 MANE: yellow
 NAME: (not mentioned)
-OTHER NAMES: Cloud Kicker
+OTHER NAMES: Cloud Kicker (unofficial)
 POSE: derped
 SOURCE: desktop ponies
 WIDTH: 47
diff --git a/ponies/clyde.pony b/ponies/clyde.pony
index 88728a27..9f66cdcb 100644
--- a/ponies/clyde.pony
+++ b/ponies/clyde.pony
@@ -7,6 +7,7 @@ EYE: brown
 FREE: no
 GROUP: stallion
 KIND: earth
+LINK: regular
 MANE: gray
 NAME: (not mentioned)
 OTHER NAMES: Clyde (unofficial)
diff --git a/ponies/cow.pony b/ponies/cow.pony
index 08df9a8c..7838b3a3 100644
--- a/ponies/cow.pony
+++ b/ponies/cow.pony
@@ -8,14 +8,23 @@ FREE: yes
 GROUP: cow
 KIND: animal
 LICENSE: CC0
+LINK: regular
 MANE: brown
 NAME: (not mentioned)
-POSE: waiting
+POSE: stand
 SOURCE: [jristz]
 WIDTH: 27
 HEIGHT: 24
 
+The person who associated a work with this deed has dedicated the work to
+the public domain by waiving all of his or her rights to the work worldwide under
+copyright law, including all related and neighboring rights, to the extent allowed
+by law.
 
+You can copy, modify, distribute and perform the work, even for commercial
+purposes, all without asking permission. See Other Information below.
+
+http://creativecommons.org/publicdomain/zero/1.0/legalcode
 $$$
 $balloon3$
 $\$
diff --git a/ponies/crackle.pony b/ponies/crackle.pony
index cdce9b37..8d327333 100644
--- a/ponies/crackle.pony
+++ b/ponies/crackle.pony
@@ -8,13 +8,15 @@ FREE: sharable
 GROUP: dragon
 KIND: animal
 LICENSE: cc-nc-by-sa
+LINK: regular
 NAME: Crackle
 POSE: derped
 SOURCE: deviantar brony art group
-WIDTH: 108
+WIDTH: 131
 HEIGHT: 60
 
-
+License summary:   https://creativecommons.org/licenses/by-nc-sa/3.0
+Full license text: https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode
 $$$
 $balloon61$
                                                           $\$
diff --git a/ponies/daisy.pony b/ponies/daisy.pony
index 9019b80b..04462310 100644
--- a/ponies/daisy.pony
+++ b/ponies/daisy.pony
@@ -1,16 +1,17 @@
 $$$
-APPEARANCE: S01E01 Friendship is magic part 1
+APPEARANCE: S01E01 Friendship is magic [Part 1]
 BALLOON: top
 COAT: pink
 DISPLAY: full, right
 EYE: blue
 FREE: no
-GROUP: mare, voiced
+GROUP: mare, background, voiced
 KIND: earth
+LINK: regular
 MANE: green
 NAME: Daisy
 OTHER NAMES: Flower Wishes (unofficial, a toy match here)
-POSE: stroting
+POSE: trot
 SOURCE: desktop ponies
 WIDTH: 45
 HEIGHT: 26
diff --git a/ponies/davenport.pony b/ponies/davenport.pony
index 63349d18..e2b2d56d 100644
--- a/ponies/davenport.pony
+++ b/ponies/davenport.pony
@@ -1,12 +1,13 @@
 $$$
-APPEARANCE: S01E24 10:37
+APPEARANCE: S01E24 Owl's Well That Ends Well
 BALLOON: top
 COAT: brown
-DISPLAY: full, left
+DISPLAY: full, right
 EYE: green
 FREE: no
 GROUP: stallion
 KIND: earth
+LINK: regular
 MANE: brown
 NAME: (not mentioned)
 OTHER NAMES: Davenport (unofficial)
diff --git a/ponies/derpysad.pony b/ponies/derpysad.pony
index 16301500..136813c5 100644
--- a/ponies/derpysad.pony
+++ b/ponies/derpysad.pony
@@ -1,15 +1,17 @@
 $$$
 APPEARANCE: S01E01 Friendship is Magic part 1
 BALLOON: top
-COAT: gray
+COAT: grey
 DISPLAY: full, left
 EYE: yellow
 FREE: no
-GROUP: mare, voiced
+GROUP: mare, background, voiced
 KIND: pegasus
+LINK: regular
 MANE: yellow
+MASTER: derpy
 NAME: Derpy
-OTHER NAMES: Derpy Hooves (partially offical), Ditzy Doo (on manuscripts)
+OTHER NAMES: Derpy Hooves (partially offical), Ditzy Doo (official, in manuscript)
 POSE: sad
 SOURCE: desktop ponies
 WIDTH: 43
diff --git a/ponies/derpysit.pony b/ponies/derpysit.pony
index 3a1e0724..3e085607 100644
--- a/ponies/derpysit.pony
+++ b/ponies/derpysit.pony
@@ -1,16 +1,18 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
-COAT: gray
+COAT: grey
 DISPLAY: full, left
 EYE: yellow
 FREE: no
-GROUP: mare, voiced
+GROUP: mare, background, voiced
 KIND: pegasus
+LINK: regular
 MANE: yellow
+MASTER: derpy
 NAME: Derpy
-OTHER NAMES: Derpy Hooves (partially offical), Ditzy Doo (on manuscripts)
-POSE: sitting
+OTHER NAMES: Derpy Hooves (partially offical), Ditzy Doo (official, in manuscript)
+POSE: sit
 SOURCE: desktop ponies
 WIDTH: 43
 HEIGHT: 20
diff --git a/ponies/derpystandwing.pony b/ponies/derpystandwing.pony
index 95079972..ba66d0f3 100644
--- a/ponies/derpystandwing.pony
+++ b/ponies/derpystandwing.pony
@@ -1,16 +1,17 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
-COAT: gray
+COAT: grey
 DISPLAY: full, left
 EYE: yellow
 FREE: no
 GROUP: mare, voiced
 KIND: pegasus
 MANE: yellow
+MASTER: derpy
 NAME: Derpy
 OTHER NAMES: Derpy Hooves (partially offical), Ditzy Doo (on manuscripts)
-POSE: stand
+POSE: stand wing
 SOURCE: desktop ponies
 WIDTH: 48
 HEIGHT: 25
diff --git a/ponies/diamondtiara.pony b/ponies/diamondtiara.pony
index dbbf70f4..71bc6fa0 100644
--- a/ponies/diamondtiara.pony
+++ b/ponies/diamondtiara.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E12 00:04
+APPEARANCE: S01E12 Call of the Cutie
 BALLOON: top
 COAT: pink
 DISPLAY: full, left
@@ -7,8 +7,9 @@ EYE: teal
 FREE: no
 GROUP: filly, villain
 KIND: earth
+LINK: regular
 MANE: purple
-NAME: Diamond tiara
+NAME: Diamond Tiara
 POSE: stand
 SOURCE: desktop ponies
 WIDTH: 36
diff --git a/ponies/discord.pony b/ponies/discord.pony
index bc0e091b..4aff6ead 100644
--- a/ponies/discord.pony
+++ b/ponies/discord.pony
@@ -1,17 +1,19 @@
 $$$
-APPEARANCE: S02E01 The Return of Harmony part 1
+APPEARANCE: S02E01 The Return of Harmony [Part 1]
+AURA: (invisible)
 BALLOON: top
 COAT: multiple
 DISPLAY: full, right
 EYE: red
 FREE: no
 GROUP: male, antagonist
-KIND: draconequu
-MANE: gray
+KIND: draconequus
+LINK: regular
+MANE: grey
 NAME: Discord
 POSE: disgusted
 SOURCE: desktop ponies
-WIDTH: 80
+WIDTH: 92
 HEIGHT: 53
 
 
diff --git a/ponies/fancypants.pony b/ponies/fancypants.pony
index e89786e0..79640bb4 100644
--- a/ponies/fancypants.pony
+++ b/ponies/fancypants.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S02E09 03:50
+APPEARANCE: S02E09 Sweed and Eliet
 BALLOON: top
 COAT: white
 DISPLAY: full, left
@@ -7,6 +7,7 @@ EYE: blue
 FREE: no
 GROUP: stallion
 KIND: unicorn
+LINK: regular
 MANE: blue
 NAME: Fancypants
 POSE: stand
diff --git a/ponies/fillyjacktravel.pony b/ponies/fillyjacktravel.pony
index 529f903f..02aeca9b 100644
--- a/ponies/fillyjacktravel.pony
+++ b/ponies/fillyjacktravel.pony
@@ -1,7 +1,7 @@
 $$$
 APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
-BASED ON: applejack
+BASED ON: Generation 3 Applejack
 COAT: brown
 DISPLAY: full, left
 EYE: blue
diff --git a/ponies/fillyrarity.pony b/ponies/fillyrarity.pony
index 1321956f..39adbe2c 100644
--- a/ponies/fillyrarity.pony
+++ b/ponies/fillyrarity.pony
@@ -1,17 +1,17 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
-BASED ON: rarity
 COAT: white
 DISPLAY: full, left
 EYE: blue
 FREE: no
 GROUP: filly, mane
 KIND: unicorn
+LINK: regular
 MANE: purple
 MASTER: rarity
 NAME: Rarity
-POSE: stand
+POSE: filly
 SOURCE: desktop ponies
 WIDTH: 38
 HEIGHT: 21
diff --git a/ponies/firestreak.pony b/ponies/firestreak.pony
index 31dd5a2e..919d69ea 100644
--- a/ponies/firestreak.pony
+++ b/ponies/firestreak.pony
@@ -2,13 +2,14 @@ $$$
 APPEARANCE: S01E16 Sonic Rainboom
 BALLOON: top
 COAT: white
-DISPLAY: full, right
+DISPLAY: full, left
 FREE: no
 GROUP: stallion, wonderbolt
 KIND: pegasus
+LINK: regular
 MANE: orange
 NAME: (not mentioned)
-OTHER NAMES: fire Streak (unofficial)
+OTHER NAMES: Fire Streak (unofficial)
 POSE: stand
 SOURCE: [jristz]
 WIDTH: 43
diff --git a/ponies/fleurdelis.pony b/ponies/fleurdelis.pony
index 770251a0..2a9c4ff0 100644
--- a/ponies/fleurdelis.pony
+++ b/ponies/fleurdelis.pony
@@ -7,6 +7,7 @@ EYE: purple
 FREE: no
 GROUP: mare
 KIND: unicorn
+LINK: regular
 MANE: pink
 NAME: (not mentioned)
 OTHER NAMES: Fleur de Lis (unofficial)
diff --git a/ponies/flim.pony b/ponies/flim.pony
index c646c118..ba0d5120 100644
--- a/ponies/flim.pony
+++ b/ponies/flim.pony
@@ -7,6 +7,7 @@ EYE: green
 FREE: no
 GROUP: stallion, villain
 KIND: unicorn
+LINK: regular
 MANE: red
 NAME: Flim
 POSE: troting
diff --git a/ponies/flowertrio.pony b/ponies/flowertrio.pony
index 43a050af..3c19990f 100644
--- a/ponies/flowertrio.pony
+++ b/ponies/flowertrio.pony
@@ -1,7 +1,8 @@
 $$$
 FREE: no
+GROUP NAME: Flower Trio
 SOURCE: desktop ponies deviatart group
-WIDTH: 115
+WIDTH: 122
 HEIGHT: 34
 
 
diff --git a/ponies/fluttershy.pony b/ponies/fluttershy.pony
index d151f9dd..b27e0884 100644
--- a/ponies/fluttershy.pony
+++ b/ponies/fluttershy.pony
@@ -1,16 +1,17 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
 COAT: yellow
 DISPLAY: full, left
 EYE: cyan
 FREE: no
 GROUP: mare, mane
-KIND: unicorn
+KIND: pegasus
+LINK: regular
 MANE: pink
 NAME: Fluttershy
 OTHER NAMES: Shy (sometimes)
-POSE: troting
+POSE: trot
 SOURCE: desktop ponies
 WIDTH: 54
 HEIGHT: 26
diff --git a/ponies/fluttershygala.pony b/ponies/fluttershygala.pony
index fc883855..e8bd572b 100644
--- a/ponies/fluttershygala.pony
+++ b/ponies/fluttershygala.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
 BASED ON: fluttershy
 COAT: yellow
@@ -7,12 +7,13 @@ DISPLAY: full, left
 EYE: cyan
 FREE: no
 GROUP: mare, mane
-KIND: unicorn
+KIND: pegasus
+LINK: regular
 MANE: pink
 MASTER: fluttershy
 NAME: Fluttershy
 OTHER NAMES: Shy (sometimes)
-POSE: gala, stand
+POSE: gala
 SOURCE: desktop ponies
 WIDTH: 55
 HEIGHT: 25
diff --git a/ponies/forestspirit.pony b/ponies/forestspirit.pony
index 9d2433b4..d951ac02 100644
--- a/ponies/forestspirit.pony
+++ b/ponies/forestspirit.pony
@@ -7,6 +7,7 @@ EYE: black
 FREE: no
 GROUP: mare
 KIND: earth
+LINK: regular
 MANE: green
 NAME: (not mentioned)
 OTHER NAMES: Forest Spirit (unofficial)
diff --git a/ponies/frederickhorseshoepin.pony b/ponies/frederickhorseshoepin.pony
index 597a4616..eef877f6 100644
--- a/ponies/frederickhorseshoepin.pony
+++ b/ponies/frederickhorseshoepin.pony
@@ -7,10 +7,11 @@ EYE: green
 FREE: no
 GROUP: stallion
 KIND: earth
+LINK: regular
 MANE: yellow
 NAME: (not mentioned)
 OTHER NAMES: Frederick Horseshoepin (unofficial)
-POSE: playing
+POSE: play
 SOURCE: desktop ponies
 WIDTH: 59
 HEIGHT: 36
diff --git a/ponies/gummy.pony b/ponies/gummy.pony
index 401c6a0b..8a63d206 100644
--- a/ponies/gummy.pony
+++ b/ponies/gummy.pony
@@ -1,12 +1,13 @@
 $$$
-APPEARANCE: S01
+APPEARANCE: S01E15 Feeling Pinkie Keen
 BALLOON: top
 COAT: green
-DISPLAY: full, right
+DISPLAY: full, left
 EYE: purple
 FREE: no
 GROUP: alligator, pet
 KIND: animals
+LINK: regular
 NAME: Gummy
 POSE: stand
 SOURCE: desktop ponies
diff --git a/ponies/horte.pony b/ponies/horte.pony
index 1028f4f0..1344d05f 100644
--- a/ponies/horte.pony
+++ b/ponies/horte.pony
@@ -7,10 +7,11 @@ EYE: closed, brown
 FREE: no
 GROUP: stallion
 KIND: earth
+LINK: regular
 MANE: blue
 NAME: (not mentioned)
 OTHER NAMES: Horte Cuisine (unofficial)
-POSE: sstand
+POSE: stand
 SOURCE: desktop ponies
 WIDTH: 40
 HEIGHT: 24
diff --git a/ponies/inky.pony b/ponies/inky.pony
index 32b8053f..ca0c17c5 100644
--- a/ponies/inky.pony
+++ b/ponies/inky.pony
@@ -1,13 +1,13 @@
 $$$
 APPEARANCE: S01E23 The Cutie Mark Chronicles
 BALLOON: top
-COAT: gray
-DISPLAY: full, left
+COAT: grey
+DISPLAY: full, front, left
 EYE: closed, purple
 FREE: no
 GROUP: filly
 KIND: earth
-MANE: gray
+MANE: grey
 NAME: (not mentioned)
 OTHER NAMES: Inkie Pie (unofficial), Inky (unofficial)
 POSE: dancing
diff --git a/ponies/jeffletrotski.pony b/ponies/jeffletrotski.pony
index 5012919c..161131eb 100644
--- a/ponies/jeffletrotski.pony
+++ b/ponies/jeffletrotski.pony
@@ -7,8 +7,10 @@ EYE: blue
 FREE: no
 GROUP: stallion
 KIND: earth
+LINK: regular
 MANE: brown
-NAME: Jeff "The Dude" Letrotski
+NAME: (not mentioned)
+OTHER NAMES: Jeff "The Dude" Letrotski (unofficial)
 POSE: stand
 SOURCE: (botchan) desktop ponies deviantart group
 WIDTH: 43
diff --git a/ponies/jesuspezuna.pony b/ponies/jesuspezuna.pony
index 12de8f68..9d0594a6 100644
--- a/ponies/jesuspezuna.pony
+++ b/ponies/jesuspezuna.pony
@@ -2,14 +2,16 @@ $$$
 APPEARANCE: S02E06 The Cutie Pox
 BALLOON: top
 COAT: brown
-DISPLAY: full, right
+DISPLAY: full, left
 EYE: cyan
 FREE: no
 GROUP: stallion
 KIND: earth
+LINK: regular
 MANE: black
-NAME: Jesús Pezuña
-POSE: troting
+NAME: (not mentioned)
+OTHER NAMES: Jesús Pezuña (unofficial)
+POSE: trot
 SOURCE: [jristz]
 WIDTH: 41
 HEIGHT: 29
diff --git a/ponies/lightningdust.pony b/ponies/lightningdust.pony
index a18d9963..36a49afd 100644
--- a/ponies/lightningdust.pony
+++ b/ponies/lightningdust.pony
@@ -7,6 +7,7 @@ EYE: orange
 FREE: no
 GROUP: mare, villain, voiced
 KIND: pegasus
+LINK: regular
 MANE: orange
 NAME: Lightning Dust
 POSE: waiting
diff --git a/ponies/lilyvalley.pony b/ponies/lilyvalley.pony
index 03bbfe98..4274d4a4 100644
--- a/ponies/lilyvalley.pony
+++ b/ponies/lilyvalley.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E04
+APPEARANCE: S01E04 Applebuck Season
 BALLOON: top
 COAT: pink
 DISPLAY: full, left
@@ -7,8 +7,10 @@ EYE: orange
 FREE: no
 GROUP: mare, voiced
 KIND: earth
+LINK: regular
 MANE: yellow
-NAME: Lily Valley
+NAME: (not mentioned)
+OTHER NAMES: Lily Valley (official, on collector card)
 POSE: stand
 SOURCE: desktop ponies
 WIDTH: 45
diff --git a/ponies/lotus.pony b/ponies/lotus.pony
index 23b53cb2..1f21f520 100644
--- a/ponies/lotus.pony
+++ b/ponies/lotus.pony
@@ -1,14 +1,15 @@
 $$$
-APPEARANCE: S01E09 20:52
+APPEARANCE: S01E09 Bridle Gossip
 BALLOON: top
 COAT: blue
-DISPLAY: full, right
+DISPLAY: full, left
 EYE: blue
 FREE: no
-GROUP: mare, voiced
+GROUP: mare, bakground, voiced
 KIND: earth
+LINK: regular
 MANE: pink
-NAME: Lotus Blosoom
+NAME: Lotus Blossom
 POSE: stand
 SOURCE: desktop ponies
 WIDTH: 39
diff --git a/ponies/lotusbloosom.pony b/ponies/lotusblossom.pony
similarity index 100%
rename from ponies/lotusbloosom.pony
rename to ponies/lotusblossom.pony
diff --git a/ponies/lunafly.pony b/ponies/lunafly.pony
index 734da6fe..1aa96504 100644
--- a/ponies/lunafly.pony
+++ b/ponies/lunafly.pony
@@ -11,11 +11,11 @@ GROUP: mare, royal
 KIND: alicorn
 MANE: cyan, blue (season 2)
 MASTER: woona
-NAME: Princess Luna
-OTHER NAMES: Lunija (russian), Nightmare Moon (corrupted), Woona (unofficial)
+NAME: Luna
+OTHER NAMES: Princess Luna (official, full name), Lunija (official, russian), Nightmare Moon (official, corrupted), Woona (unofficial)
 POSE: flying
 SOURCE: (unknown)
-WIDTH: 80
+WIDTH: 85
 HEIGHT: 40
 
 
diff --git a/ponies/lyrabonbon.pony b/ponies/lyrabonbon.pony
index ebaca703..841252e3 100644
--- a/ponies/lyrabonbon.pony
+++ b/ponies/lyrabonbon.pony
@@ -1,5 +1,28 @@
 $$$
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+BALLOON: top
+COAT: beige
+COAT: cyan
+DISPLAY: full, turned, right
+DISPLAY: full, front, right
+EYE: teal
+EYE: yellow
 FREE: no
+GROUP: mare, background, voiced
+GROUP: mare, background, voiced
+KIND: earth
+KIND: unicorn
+LINK: regular
+LINK ON: 1
+MANE: pink, black
+MANE: white
+MASTER: bonbon
+NAME: Bon Bon (unofficial, but FAR more used)
+NAME: Lyra (gameloft game)
+OTHER NAMES: Sweetie Drops (official)
+OTHER NAMES: Lyra Heartstrings, Harpass (wikia mention as an old name), Heartstrings (old name)
+POSE: lyra
 SOURCE: imageboard
 WIDTH: 69
 HEIGHT: 29
diff --git a/ponies/manticore.pony b/ponies/manticore.pony
index 8544fff6..5f710ec2 100644
--- a/ponies/manticore.pony
+++ b/ponies/manticore.pony
@@ -15,7 +15,15 @@ SOURCE: (screenshoot)
 WIDTH: 75
 HEIGHT: 33
 
+The person who associated a work with this deed has dedicated the work to
+the public domain by waiving all of his or her rights to the work worldwide under
+copyright law, including all related and neighboring rights, to the extent allowed
+by law.
 
+You can copy, modify, distribute and perform the work, even for commercial
+purposes, all without asking permission. See Other Information below.
+
+http://creativecommons.org/publicdomain/zero/1.0/legalcode
 $$$
 $balloon33$
                               $\$
diff --git a/ponies/maredowellgallop.pony b/ponies/maredowell.pony
similarity index 96%
rename from ponies/maredowellgallop.pony
rename to ponies/maredowell.pony
index 15f5505b..c39e99ca 100644
--- a/ponies/maredowellgallop.pony
+++ b/ponies/maredowell.pony
@@ -1,14 +1,17 @@
 $$$
-APPEARANCE: S02
+APPEARANCE: S02E08 The Mysterious Mare Do Well
+AURA: purple
 BALLOON: top
-BASED ON: maredowell
+COAT: black
 DISPLAY: full, left
+EYE: blue
 FREE: no
-GROUP: mare, voiced
-KIND: earth
-MASTER: maredowell
+GROUP: mare
+KIND: earth, unicorn
+LINK: regular
 NAME: Mare Do Well
-POSE: galloping
+OTHER NAMES: The Mysterious Mare Do Well (official, titled name)
+POSE: gallop
 SOURCE: desktop ponies
 WIDTH: 52
 HEIGHT: 24
diff --git a/ponies/maredowellfly.pony b/ponies/maredowellfly.pony
index bc1863d0..e87cd3e0 100644
--- a/ponies/maredowellfly.pony
+++ b/ponies/maredowellfly.pony
@@ -1,14 +1,17 @@
 $$$
-APPEARANCE: S02
+APPEARANCE: S02E08 The Mysterious Mare Do Well
 BALLOON: top
-BASED ON: maredowell
+COAT: black
 DISPLAY: full, left
+EYE: blue
 FREE: no
-GROUP: mare, voiced
+GROUP: mare
 KIND: pegasus
+LINK: regular
 MASTER: maredowell
 NAME: Mare Do Well
-POSE: flying
+OTHER NAMES: The Mysterious Mare Do Well (official, titled name)
+POSE: fly
 SOURCE: desktop ponies
 WIDTH: 41
 HEIGHT: 25
diff --git a/ponies/master.pony b/ponies/master.pony
index a606a3ab..82e011e2 100644
--- a/ponies/master.pony
+++ b/ponies/master.pony
@@ -7,9 +7,10 @@ EYE: green
 FREE: no
 GROUP: stallion
 KIND: earth
+LINK: regular
 MANE: yellow
 NAME: (not mentioned)
-OTHER NAMES: Master (unofficia)
+OTHER NAMES: Master (unofficial)
 POSE: stand
 SOURCE: desktop ponies
 WIDTH: 39
diff --git a/ponies/mayor.pony b/ponies/mayor.pony
index 38e6aeda..11160d4f 100644
--- a/ponies/mayor.pony
+++ b/ponies/mayor.pony
@@ -1,14 +1,16 @@
 $$$
-APPEARANCE: s1c1m19s03
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+BALLOON: top
 COAT: brown
+DISPLAY: full, right
 EYE: blue
 FREE: no
 GROUP: mare
 KIND: earth
+LINK: regular
 MANE: white
-MEDIA: TV series
-NAME: mayor mare
-OTHER NAMES: mayor, mare
+NAME: Mayor Mare
+POSE: stand
 SOURCE: desktop ponies
 WIDTH: 50
 HEIGHT: 27
diff --git a/ponies/meadowsong.pony b/ponies/meadowsong.pony
index 72bfb534..8059d677 100644
--- a/ponies/meadowsong.pony
+++ b/ponies/meadowsong.pony
@@ -1,16 +1,17 @@
 $$$
-APPEARANCE: S01E02 Friendship is Magic part 25
+APPEARANCE: S01E02 Friendship is Magic [Part 2]
 BALLOON: top
 COAT: brown
 DISPLAY: full, left
 EYE: green
 FREE: no
-GROUP: stallion, voiced
+GROUP: stallion, background, voiced
 KIND: earth
+LINK: regular
 MANE: yellow
-NAME: Meadow Song
-OTHER NAMES: Blue Grass (unofficial), Guitar (unofficial), Yellow Burst (unofficial)
-POSE: troting
+NAME: (not mentioned)
+OTHER NAMES: Meadow Song (official, toy line), Blue Grass (unofficial), Guitar (unofficial), Yellow Burst (unofficial)
+POSE: trot
 SOURCE: [jristz]
 WIDTH: 41
 HEIGHT: 28
diff --git a/ponies/melilot.pony b/ponies/melilot.pony
index b3a07253..cbc01a1b 100644
--- a/ponies/melilot.pony
+++ b/ponies/melilot.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E11 13:26
+APPEARANCE: S01E11 Winter Wrap Up
 BALLOON: top
 COAT: brown
 DISPLAY: full, left
@@ -7,10 +7,11 @@ EYE: blue
 FREE: no
 GROUP: stallion
 KIND: earth
+LINK: regular
 MANE: brown
 NAME: (not mentioned)
 OTHER NAMES: Melilot (unofficial), Meliot (unofficial)
-POSE: troting
+POSE: trot
 SOURCE: [jristz]
 WIDTH: 38
 HEIGHT: 24
diff --git a/ponies/nightingale.pony b/ponies/nightingale.pony
index 5271faf1..96e0c635 100644
--- a/ponies/nightingale.pony
+++ b/ponies/nightingale.pony
@@ -1,15 +1,16 @@
 $$$
-APPEARANCE: S01E02 Friendship is Magic part 2
+APPEARANCE: S01E02 Friendship is Magic [Part 2]
 BALLOON: top
-COAT: gray
+COAT: grey
 DISPLAY: full, left
 FREE: no
 GROUP: mare, shadowbolt
 KIND: pegasus
+LINK: regular
 MANE: blue
 NAME: (not mentioned)
 OTHER NAMES: Nightingale (unofficial)
-POSE: siting
+POSE: sitting
 SOURCE: desktop ponies
 WIDTH: 49
 HEIGHT: 25
diff --git a/ponies/octavia.pony b/ponies/octavia.pony
index d6960536..aaed5ec2 100644
--- a/ponies/octavia.pony
+++ b/ponies/octavia.pony
@@ -7,9 +7,10 @@ EYE: purple
 FREE: no
 GROUP: mare
 KIND: earth
+LINK: regular
 MANE: black
 NAME: Octavia
-POSE: playing
+POSE: play
 SOURCE: desktop ponies
 WIDTH: 45
 HEIGHT: 31
diff --git a/ponies/oinkoinkoink.pony b/ponies/oinkoinkoink.pony
index 80149c40..2902c671 100644
--- a/ponies/oinkoinkoink.pony
+++ b/ponies/oinkoinkoink.pony
@@ -1,18 +1,19 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
-BASED ON: pinkie
+BASED ON: Generation 3 Pinkie Pie
 COAT: pink
 DISPLAY: full, left
 EYE: blue
 FREE: no
 GROUP: mare, mane
 KIND: earth
+LINK: regular
 MANE: pink
 MASTER: pinkie
 NAME: Pinkie Pie
-OTHER NAMES: Pinkie, Pinkamina Diane Pie
-POSE: oinkoinkoink
+OTHER NAMES: Pinkie (official, short name), Pinkamina Diane Pie (official, full name)
+POSE: oink oink oink
 SOURCE: desktop ponies
 WIDTH: 42
 HEIGHT: 23
diff --git a/ponies/opal.pony b/ponies/opal.pony
index e2f71cc2..8c07b133 100644
--- a/ponies/opal.pony
+++ b/ponies/opal.pony
@@ -1,15 +1,17 @@
 $$$
-APPEARANCE: S01
+APPEARANCE: S01E14 Suited for Success
 BALLOON: top
 COAT: white
-DISPLAY: full, left
+DISPLAY: full, right
 EYE: green
 FREE: no
 GROUP: cat, pet
 GROUP NAME: pet
 KIND: animals
+LINK: regular
 NAME: Opalescence
-POSE: walking
+OTHER NAMES: Opal (offical, short name)
+POSE: trot
 SOURCE: desktop ponies
 WIDTH: 29
 HEIGHT: 18
diff --git a/ponies/orangebird.pony b/ponies/orangebird.pony
index 3e249402..b323f814 100644
--- a/ponies/orangebird.pony
+++ b/ponies/orangebird.pony
@@ -13,7 +13,15 @@ SOURCE: [jristz]
 WIDTH: 44
 HEIGHT: 28
 
+The person who associated a work with this deed has dedicated the work to
+the public domain by waiving all of his or her rights to the work worldwide under
+copyright law, including all related and neighboring rights, to the extent allowed
+by law.
 
+You can copy, modify, distribute and perform the work, even for commercial
+purposes, all without asking permission. See Other Information below.
+
+http://creativecommons.org/publicdomain/zero/1.0/legalcode
 $$$
 $balloon28$
                          $\$
diff --git a/ponies/orangefrog.pony b/ponies/orangefrog.pony
index cf56a315..00d13ec5 100644
--- a/ponies/orangefrog.pony
+++ b/ponies/orangefrog.pony
@@ -7,12 +7,21 @@ FREE: yes
 GROUP: frog, orange
 KIND: animal, item, hybrid
 LICENSE: CC0
-POSE: singing
+LINK: regular
+POSE: sing
 SOURCE: (screenshoot)
 WIDTH: 58
 HEIGHT: 33
 
+The person who associated a work with this deed has dedicated the work to
+the public domain by waiving all of his or her rights to the work worldwide under
+copyright law, including all related and neighboring rights, to the extent allowed
+by law.
 
+You can copy, modify, distribute and perform the work, even for commercial
+purposes, all without asking permission. See Other Information below.
+
+http://creativecommons.org/publicdomain/zero/1.0/legalcode
 $$$
 $balloon19$
                 $\$
diff --git a/ponies/owl.pony b/ponies/owl.pony
index 01551ff5..f931fa78 100644
--- a/ponies/owl.pony
+++ b/ponies/owl.pony
@@ -8,12 +8,22 @@ FREE: yes
 GROUP: owl, pet
 KIND: animals
 LICENSE: CC0
+LINK: regular
+NAME: Owlowiscious
 POSE: watching
 SOURCE: imageboard
 WIDTH: 21
 HEIGHT: 23
 
+The person who associated a work with this deed has dedicated the work to
+the public domain by waiving all of his or her rights to the work worldwide under
+copyright law, including all related and neighboring rights, to the extent allowed
+by law.
 
+You can copy, modify, distribute and perform the work, even for commercial
+purposes, all without asking permission. See Other Information below.
+
+http://creativecommons.org/publicdomain/zero/1.0/legalcode
 $$$
 $balloon$
 $\$
diff --git a/ponies/owlowiscious.pony b/ponies/owlowiscious.pony
index a22b9e61..c9ce2007 100644
--- a/ponies/owlowiscious.pony
+++ b/ponies/owlowiscious.pony
@@ -14,7 +14,15 @@ SOURCE: imageboard
 WIDTH: 30
 HEIGHT: 22
 
+The person who associated a work with this deed has dedicated the work to
+the public domain by waiving all of his or her rights to the work worldwide under
+copyright law, including all related and neighboring rights, to the extent allowed
+by law.
 
+You can copy, modify, distribute and perform the work, even for commercial
+purposes, all without asking permission. See Other Information below.
+
+http://creativecommons.org/publicdomain/zero/1.0/legalcode
 $$$
 $balloon5$
   $\$
diff --git a/ponies/persnickety.pony b/ponies/persnickety.pony
index de6718ef..00f68e52 100644
--- a/ponies/persnickety.pony
+++ b/ponies/persnickety.pony
@@ -5,8 +5,9 @@ COAT: white
 DISPLAY: full, left
 EYE: closed, purple
 FREE: no
-GROUP: stallion, voiced
+GROUP: stallion, background, voiced
 KIND: earth
+LINK: regular
 MANE: yellow
 NAME: (not mentioned)
 OTHER NAMES: Persnickety (unofficial)
diff --git a/ponies/philomenaphoenix.pony b/ponies/philomenaphoenix.pony
index 89f68ea6..1c897bc6 100644
--- a/ponies/philomenaphoenix.pony
+++ b/ponies/philomenaphoenix.pony
@@ -1,18 +1,18 @@
 $$$
-APPEARANCE: S01
+APPEARANCE: S01E22 A Bird in the Hood
 BALLOON: top
-BASED ON: philomena
 COAT: red
 DISPLAY: full, front
 EYE: yellow
 FREE: no
 GROUP: phoenix, pet
 KIND: animals
+LINK: regular
 MASTER: philomena
 NAME: Philomena
 POSE: rebirth
 SOURCE: desktop ponies
-WIDTH: 80
+WIDTH: 99
 HEIGHT: 30
 
 
diff --git a/ponies/pinkamina.pony b/ponies/pinkamina.pony
index 730ddfaa..7c08ef0f 100644
--- a/ponies/pinkamina.pony
+++ b/ponies/pinkamina.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
 BASED ON: pinkie
 COAT: pink
@@ -8,11 +8,12 @@ EYE: blue
 FREE: no
 GROUP: mare, mane
 KIND: earth
+LINK: regular
 MANE: pink
 MASTER: pinkie
 NAME: Pinkie Pie
-OTHER NAMES: Pinkie, Pinkamina Diane Pie
-POSE: sad, crazy
+OTHER NAMES: Pinkie (offical, short name), Pinkamina Diane Pie (official, full name)
+POSE: pinkamina, sad, crazy
 SOURCE: desktop ponies
 WIDTH: 44
 HEIGHT: 25
diff --git a/ponies/pinkie.pony b/ponies/pinkie.pony
index 3e803904..44fcb09b 100644
--- a/ponies/pinkie.pony
+++ b/ponies/pinkie.pony
@@ -1,18 +1,18 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
-BASED ON: pinkie
 COAT: pink
 DISPLAY: full, left
-EYE: blue
+EYE: closed, blue
 FREE: no
 GROUP: mare, mane
 KIND: earth
+LINK: regular
 MANE: pink
 MASTER: pinkie
 NAME: Pinkie Pie
-OTHER NAMES: Pinkie, Pinkamina Diane Pie
-POSE: happy
+OTHER NAMES: Pinkie (official, short name), Pinkamina Diane Pie (official, full name)
+POSE: happy (very descriptive for pinkie pie)
 SOURCE: desktop ponies
 WIDTH: 49
 HEIGHT: 22
diff --git a/ponies/pinkiegummy.pony b/ponies/pinkiegummy.pony
index 77a9ec89..5f6ca151 100644
--- a/ponies/pinkiegummy.pony
+++ b/ponies/pinkiegummy.pony
@@ -1,4 +1,35 @@
 $$$
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+APPEARANCE: S01E15 Feeling Pinkie Keen
+BALLOON: top
+BASED ON: Generation 3 Pinkie Pie
+BASED ON: (none)
+COAT: pink
+COAT: green
+DISPLAY: full, left
+DISPLAY: full, left, down
+EYE: closed, blue
+EYE: purple
+FREE: no
+GROUP: mare, mane
+GROUP: alligator, pet
+KIND: earth
+KIND: animal
+LINK: regular
+LINK ON: 2
+MANE: pink
+MANE: (none)
+MASTER: pinkie
+NAME: Pinkie Pie
+NAME: Gummy
+OTHER NAMES: Pinkie (official, short name), Pinkamina Diane Pie (official, full name)
+OTHER NAMES: (none)
+POSE: gummy
+SOURCE: desktop ponies
+WIDTH: 51
+HEIGHT: 32
+
+
 $$$
 $balloon8$
     $\$
diff --git a/ponies/pinkiegummydisguise.pony b/ponies/pinkiegummydisguise.pony
index df499cbb..bbe98297 100644
--- a/ponies/pinkiegummydisguise.pony
+++ b/ponies/pinkiegummydisguise.pony
@@ -1,4 +1,8 @@
 $$$
+WIDTH: 55
+HEIGHT: 33
+
+
 $$$
 $balloon14$
            $\$
diff --git a/ponies/pinkiehugfluttershy.pony b/ponies/pinkiehugfluttershy.pony
index b52e267d..bebae180 100644
--- a/ponies/pinkiehugfluttershy.pony
+++ b/ponies/pinkiehugfluttershy.pony
@@ -1,4 +1,34 @@
 $$$
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+BALLOON: top
+BASED ON: (none)
+BASED ON: Generation 3 Pinkie Pie
+COAT: yellow
+COAT: pink
+DISPLAY: full, right
+DISPLAY: full, left
+EYE: cyan
+EYE: blue
+GROUP: mare, mane
+GROUP: mare, mane
+KIND: pegasus
+KIND: earth
+LINK: regular
+LINK ON: 2
+MANE: pink
+MANE: pink
+MASTER: pinkie
+NAME: Fluttershy
+NAME: Pinkie Pie
+OTHER NAMES: Shy (sometimes)
+OTHER NAMES: Pinkie (official, short name), Pinkamina Diane Pie (official, full name)
+POSE: hug fluttershy
+SOURCE: desktop ponies
+WIDTH: 70
+HEIGHT: 32
+
+
 $$$
 $balloon48$
                                              $\$
diff --git a/ponies/pinkieprincess.pony b/ponies/pinkieprincess.pony
index fc455e8c..955a6cc7 100644
--- a/ponies/pinkieprincess.pony
+++ b/ponies/pinkieprincess.pony
@@ -1,18 +1,19 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
-BASED ON: pinkie
+BASED ON: Generation 3 Pinkie Pie
 COAT: pink
 DISPLAY: full, left
 EYE: closed, blue
 FREE: no
 GROUP: mare, mane
 KIND: earth
+LINK: regular
 MANE: pink
 MASTER: pinkie
 NAME: Pinkie Pie
-OTHER NAMES: Pinkie, Pinkamina Diane Pie
-POSE: princess, troting
+OTHER NAMES: Pinkie (official, short name), Pinkamina Diane Pie (official, full name)
+POSE: princess
 SOURCE: desktop ponies
 WIDTH: 44
 HEIGHT: 29
diff --git a/ponies/pinkietongue.pony b/ponies/pinkietongue.pony
index d0c5cf59..fe18b51f 100644
--- a/ponies/pinkietongue.pony
+++ b/ponies/pinkietongue.pony
@@ -1,18 +1,19 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
-BASED ON: pinkie
+BASED ON: Generation 3 Pinkie Pie
 COAT: pink
 DISPLAY: full, left
 EYE: blue
 FREE: no
 GROUP: mare, mane
 KIND: earth
+LINK: regular
 MANE: pink
 MASTER: pinkie
 NAME: Pinkie Pie
-OTHER NAMES: Pinkie, Pinkamina Diane Pie
-POSE: sad, cursed
+OTHER NAMES: Pinkie (official, short name), Pinkamina Diane Pie (official, full name)
+POSE: tongue
 SOURCE: desktop ponies
 WIDTH: 54
 HEIGHT: 25
diff --git a/ponies/pinkiewhoopseat.pony b/ponies/pinkiewhoopseat.pony
index e0726482..7c22e217 100644
--- a/ponies/pinkiewhoopseat.pony
+++ b/ponies/pinkiewhoopseat.pony
@@ -1,20 +1,21 @@
 $$$
 APPEARANCE: S01E01 Friendship is Magic part 1
 BALLOON: top
-BASED ON: pinkie
+BASED ON: Generation 3 Pinkie Pie
 COAT: pink
 DISPLAY: full, left
 EYE: blue
 FREE: no
 GROUP: mare, mane
 KIND: earth
+LINK: regular
 MANE: pink
 MASTER: pinkie
 NAME: Pinkie Pie
-OTHER NAMES: Pinkie, Pinkamina Diane Pie
-POSE: accident, eat
+OTHER NAMES: Pinkie (official, short name), Pinkamina Diane Pie (official, full name)
+POSE: whoops eat
 SOURCE: desktop ponies
-WIDTH: 80
+WIDTH: 85
 HEIGHT: 32
 
 
diff --git a/ponies/poppycock.pony b/ponies/poppycock.pony
index 0f7f6943..9f5cc37f 100644
--- a/ponies/poppycock.pony
+++ b/ponies/poppycock.pony
@@ -1,12 +1,13 @@
 $$$
-APPEARANCE: S02E26 The Royal Wedding part 2
+APPEARANCE: S02E26 The Royal Wedding [Part 2]
 BALLOON: top
 COAT: red
-DISPLAY: full, left
+DISPLAY: full, right
 EYE: gray
 FREE: no
 GROUP: stallion
 KIND: unicorn
+LINK: regular
 MANE: blue
 NAME: (not mentioned)
 OTHER NAMES: Poppycock (unofficial)
diff --git a/ponies/prettyvision.pony b/ponies/prettyvision.pony
index b79d11be..35902c35 100644
--- a/ponies/prettyvision.pony
+++ b/ponies/prettyvision.pony
@@ -7,6 +7,7 @@ EYE: green
 FREE: no
 GROUP: mare
 KIND: earth
+LINK: regular
 MANE: yellow
 NAME: (not mentioned)
 OTHER NAMES: Pretty vision (unofficial), Elsie (unofficial), Suity Voyage (unofficial)
diff --git a/ponies/purplehaze.pony b/ponies/purplehaze.pony
index 2a09b969..c6740c40 100644
--- a/ponies/purplehaze.pony
+++ b/ponies/purplehaze.pony
@@ -2,14 +2,15 @@ $$$
 APPEARANCE: S01E03 The Ticket Master
 BALLOON: top
 COAT: purple
-DISPLAY: full, left
+DISPLAY: full, right
 EYE: purple
 FREE: no
 GROUP: mare
 KIND: earth
+LINK: regular
 MANE: purple
 NAME: (not  mentioned)
-OTHER NAMES: Purple Haze (nofficial)
+OTHER NAMES: Purple Haze (unofficial)
 POSE: stand
 SOURCE: desktop ponies
 WIDTH: 43
diff --git a/ponies/raccoon.pony b/ponies/raccoon.pony
index b753b7da..ba3e294e 100644
--- a/ponies/raccoon.pony
+++ b/ponies/raccoon.pony
@@ -13,7 +13,15 @@ SOURCE: (screenshoot)
 WIDTH: 80
 HEIGHT: 27
 
+The person who associated a work with this deed has dedicated the work to
+the public domain by waiving all of his or her rights to the work worldwide under
+copyright law, including all related and neighboring rights, to the extent allowed
+by law.
 
+You can copy, modify, distribute and perform the work, even for commercial
+purposes, all without asking permission. See Other Information below.
+
+http://creativecommons.org/publicdomain/zero/1.0/legalcode
 $$$
 $balloon18$
                $\$
diff --git a/ponies/rainbowdrag.pony b/ponies/rainbowdrag.pony
index 0129421f..9ca96e45 100644
--- a/ponies/rainbowdrag.pony
+++ b/ponies/rainbowdrag.pony
@@ -1,16 +1,18 @@
 $$$
-APPEARANCE: s1c1m9s39
-BASED ON: rainbow
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+BALLOON: top
 COAT: blue
+DISPLAY: full, front, right
 EYE: purple
 FREE: no
 GROUP: mare
 GROUP NAME: mane
 KIND: pegasus
+LINK: mirrored
 MANE: rainbow
-MEDIA: TV series
-NAME: rainbow dash
-OTHER NAMES: rainbow, dash, dashie
+MASTER: rainbow
+NAME: Rainbow Dash
+POSE: drag
 SOURCE: desktop ponies
 WIDTH: 51
 HEIGHT: 33
diff --git a/ponies/rainbowhurricane.pony b/ponies/rainbowhurricane.pony
index beffd441..3e2f8a7c 100644
--- a/ponies/rainbowhurricane.pony
+++ b/ponies/rainbowhurricane.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E01 Friendship is magic part 1
+APPEARANCE: S01E01 Friendship is magic [Part 1]
 BALLOON: top
 COAT: blue
 DISPLAY: full, left
@@ -7,10 +7,11 @@ EYE: purple
 FREE: no
 GROUP: mare, mane
 KIND: pegasus
-MANE: rainbows
+LINK: regular
+MANE: rainbow
+MASTER: rainbow
 NAME: Rainbow Dash
-OTHER NAMES: Rainbow, Dash, Dashie
-POSE: disguised as Commander Hurricane
+POSE: Commander Hurricane
 SOURCE: [jristz]
 WIDTH: 54
 HEIGHT: 34
diff --git a/ponies/rainbowsalute.pony b/ponies/rainbowsalute.pony
index b630f26a..2acb1771 100644
--- a/ponies/rainbowsalute.pony
+++ b/ponies/rainbowsalute.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E01 Friendship is magic part 1
+APPEARANCE: S01E01 Friendship is magic [Part 1]
 BALLOON: top
 COAT: blue
 DISPLAY: full, left
@@ -7,9 +7,9 @@ EYE: purple
 FREE: no
 GROUP: mare, mane
 KIND: pegasus
-MANE: rainbows
+LINK: regular
+MANE: rainbow
 NAME: Rainbow Dash
-OTHER NAMES: Rainbow, Dash, Dashie
 POSE: salute
 SOURCE: desktop ponies
 WIDTH: 48
diff --git a/ponies/raindrops.pony b/ponies/raindrops.pony
index f2902ff5..9373b7f4 100644
--- a/ponies/raindrops.pony
+++ b/ponies/raindrops.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
 COAT: orange
 DISPLAY: full, right
@@ -7,6 +7,7 @@ EYE: cyan
 FREE: no
 GROUP: mare
 KIND: pegasus
+LINK: regular
 MANE: cyan
 NAME: (not mentioned)
 OTHER NAMES: Raindrops (unofficial)
diff --git a/ponies/raritydrama.pony b/ponies/raritydrama.pony
index 10874ef3..31a0d84c 100644
--- a/ponies/raritydrama.pony
+++ b/ponies/raritydrama.pony
@@ -1,18 +1,23 @@
 $$$
-APPEARANCE: s1c1m12s2
-BASED ON: rarity
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+AURA: blue
+BALLOON: top
 COAT: white
+DISPLAY: full, right
 EYE: blue
 FREE: no
 GROUP: mare
 GROUP NAME: mane
 KIND: unicorn
+LINK: regular
 MANE: purple
+MASTER: rarity
 MEDIA: TV series
-NAME: rarity
+NAME: Rarity
+POSE: drama
 SOURCE: desktop ponies
-WIDTH: 44
-HEIGHT: 25
+WIDTH: 91
+HEIGHT: 39
 
 
 $$$
diff --git a/ponies/raritysdad.pony b/ponies/raritysdad.pony
index a912b90c..18c694b5 100644
--- a/ponies/raritysdad.pony
+++ b/ponies/raritysdad.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S02E05 01:15
+APPEARANCE: S02E05 Sisterhooves Social
 BALLOON: top
 COAT: white
 DISPLAY: full, right
diff --git a/ponies/redheart.pony b/ponies/redheart.pony
index 356766f4..fecd5588 100644
--- a/ponies/redheart.pony
+++ b/ponies/redheart.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E04 14:59
+APPEARANCE: S01E04 Applebuck Season
 BALLOON: top
 COAT: white
 DISPLAY: full, left
@@ -7,7 +7,8 @@ EYE: blue
 FREE: no
 GROUP: mare
 KIND: earth
-MANE: gray (ponysay), pink (source
+LINK: regular
+MANE: white (ponysay), pink (source)
 NAME: (not mentioned)
 OTHER NAMES: Nurse Redheart (unofficial)
 POSE: stand
diff --git a/ponies/rover.pony b/ponies/rover.pony
index 4c64bd51..57d378f2 100644
--- a/ponies/rover.pony
+++ b/ponies/rover.pony
@@ -1,14 +1,16 @@
 $$$
-APPEARANCE: s1
+APPEARANCE: S01E19 A Dog and Pony Show
 BALLOON: top
-COAT: gray
+COAT: grey
 DISPLAY: full, left
 EYE: green
 FREE: no
 GROUP: dog, antagonist, diamond dog
 KIND: animals
-NAME: Rover (on manuscripts)
-POSE: walking
+LINK: regular
+NAME: (not mentioned)
+OTHER NAMES: Rover (official, in manuscripts)
+POSE: trot
 SOURCE: desktop ponies
 WIDTH: 51
 HEIGHT: 26
diff --git a/ponies/royalguard.pony b/ponies/royalguard.pony
index 79abb696..b1f5dc10 100644
--- a/ponies/royalguard.pony
+++ b/ponies/royalguard.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
 COAT: white
 DISPLAY: full, left
@@ -7,9 +7,8 @@ EYE: cyan
 FREE: no
 GROUP: stallion, voiced, guard
 KIND: pegasus
+LINK: regular
 MANE: blue
-NAME: Pegasus Royal Guard
-OTHER NAMES: Royal Guard, Pegasus Guard
 POSE: stand
 SOURCE: desktop ponies
 WIDTH: 44
diff --git a/ponies/ruby.pony b/ponies/ruby.pony
index 92a94f83..974d1f0c 100644
--- a/ponies/ruby.pony
+++ b/ponies/ruby.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E02 Friendship is magic (part 2)
+APPEARANCE: S01E02 Friendship is magic [part 2]
 BALLOON: top
 COAT: pink
 DISPLAY: full, right
@@ -7,6 +7,7 @@ EYE: green
 FREE: no
 GROUP: filly
 KIND: earth
+LINK: regular
 MANE: pink
 NAME: (not mentioned)
 OTHER NAMES: Berry Pinch (unofficial), Ruby (unofficial), Ruby Pinch (unofficial)
diff --git a/ponies/sapphire.pony b/ponies/sapphire.pony
index ab3eb2d2..e8632505 100644
--- a/ponies/sapphire.pony
+++ b/ponies/sapphire.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E19 00:29
+APPEARANCE: S01E19 A Dog and Pony Show
 BALLOON: top
 COAT: yellow
 DISPLAY: full, right
@@ -7,6 +7,7 @@ EYE: brown
 FREE: no
 GROUP: mare
 KIND: earth
+LINK: regular
 MANE: blue
 NAME: Sapphire Shores
 POSE: stand
diff --git a/ponies/shiningarmor.pony b/ponies/shiningarmor.pony
index b1d39c2b..101e0cca 100644
--- a/ponies/shiningarmor.pony
+++ b/ponies/shiningarmor.pony
@@ -1,16 +1,16 @@
 $$$
-APPEARANCE: S02E25 The Royal Wedding part 1
+APPEARANCE: S02E25 The Royal Wedding [Part 1]
 BALLOON: top
 COAT: white
 DISPLAY: full, left
 EYE: cyan
 FREE: no
-GROUP: stallion, royal
+GROUP: stallion
 KIND: unicorn
-MANE: blue, cyan
+LINK: regular
+MANE: blue
 NAME: Shining Armor
-OTHER NAMES: Shining Armour
-POSE: trotting
+POSE: trot
 SOURCE: [jristz]
 WIDTH: 44
 HEIGHT: 25
diff --git a/ponies/shiningarmorwedding.pony b/ponies/shiningarmorwedding.pony
index eebe0849..43d6b900 100644
--- a/ponies/shiningarmorwedding.pony
+++ b/ponies/shiningarmorwedding.pony
@@ -1,18 +1,17 @@
 $$$
-APPEARANCE: S02E25 The Royal Wedding part 1
+APPEARANCE: S02E25 The Royal Wedding [Part 1]
 BALLOON: top
-BASED ON: shiningarmor
 COAT: white
-DISPLAY: full, right
+DISPLAY: full, left
 EYE: cyan
 FREE: no
-GROUP: stallion, royal
+GROUP: stallion
 KIND: unicorn
-MANE: blue, cyan
+LINK: regular
+MANE: blue
 MASTER: shiningarmor
 NAME: Shining Armor
-OTHER NAMES: Shining Armour
-POSE: stand
+POSE: wedding
 SOURCE: [jristz]
 WIDTH: 40
 HEIGHT: 25
diff --git a/ponies/silverspoon.pony b/ponies/silverspoon.pony
index 522cd6fb..6f8b793f 100644
--- a/ponies/silverspoon.pony
+++ b/ponies/silverspoon.pony
@@ -1,15 +1,16 @@
 $$$
-APPEARANCE: S01E12 00:04
+APPEARANCE: S01E12 Call of the Cutie
 BALLOON: top
-COAT: gray
-DISPLAY: full, left
+COAT: grey
+DISPLAY: full, right
 EYE: purple
 FREE: no
 GROUP: filly, villain
 KIND: earth
+LINK: regular
 MANE: white
 NAME: Silver Spoon
-POSE: stand, smiling
+POSE: stand
 SOURCE: desktop ponies
 WIDTH: 33
 HEIGHT: 21
diff --git a/ponies/silverstar.pony b/ponies/silverstar.pony
index 18b28326..ca09cde7 100644
--- a/ponies/silverstar.pony
+++ b/ponies/silverstar.pony
@@ -1,13 +1,14 @@
 $$$
-APPEARANCE: S01E21 07:36
+APPEARANCE: S01E21 Over a Barrel
 BALLOON: top
 COAT: brown
-DISPLAY: full, left
+DISPLAY: full, right
 EYE: cyan
 FREE: no
 GROUP: stallion
 KIND: earth
-MANE: gray (ponysay), brown (sorce)
+LINK: regular
+MANE: grey (ponysay), brown (source)
 NAME: Sheriff Silverstar
 OTHER NAMES: Silverstar (shorter)
 POSE: stand
diff --git a/ponies/skyra.pony b/ponies/skyra.pony
index c6e2172c..05887808 100644
--- a/ponies/skyra.pony
+++ b/ponies/skyra.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E16 06:27
+APPEARANCE: S01E16 Sonic Rainboom
 BALLOON: top
 COAT: cyan
 DISPLAY: full, left
diff --git a/ponies/sparkler.pony b/ponies/sparkler.pony
index e10d8550..fa3d3aaa 100644
--- a/ponies/sparkler.pony
+++ b/ponies/sparkler.pony
@@ -10,9 +10,9 @@ GROUP: mare, background, voiced
 KIND: unicorn
 LINK: regular
 MANE: purple
-NAME: Amethyst Star (in merchandise)
-OTHER NAMES: Sparkler (unofficial)
-POSE: troting
+NAME: (not mentioned)
+OTHER NAMES: Amethyst Star (official, in merchandise), Sparkler (unofficial)
+POSE: trot
 SOURCE: desktop ponies
 WIDTH: 42
 HEIGHT: 25
diff --git a/ponies/spitfire.pony b/ponies/spitfire.pony
index eb818dbf..2b4fea68 100644
--- a/ponies/spitfire.pony
+++ b/ponies/spitfire.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E16 13:50
+APPEARANCE: S01E16 Sonic Rainboom
 BALLOON: top
 COAT: yellow
 DISPLAY: full, right
diff --git a/ponies/spot.pony b/ponies/spot.pony
index d8db47db..451a3313 100644
--- a/ponies/spot.pony
+++ b/ponies/spot.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01
+APPEARANCE: S01E19 A Dog and Pony Show
 BALLOON: top
 COAT: brown
 DISPLAY: full, left
@@ -7,8 +7,10 @@ EYE: yellow
 FREE: no
 GROUP: dog, antagonist, diamond dog
 KIND: animals
-NAME: Spot (on manuscripts)
-POSE: walking
+LINK: regular
+NAME: (not mentioned)
+OTHER NAMES: Spot (official, in manuscripts)
+POSE: grap
 SOURCE: desktop ponies
 WIDTH: 47
 HEIGHT: 23
diff --git a/ponies/squirrel.pony b/ponies/squirrel.pony
index a8e44fe8..d44afe26 100644
--- a/ponies/squirrel.pony
+++ b/ponies/squirrel.pony
@@ -2,7 +2,7 @@ $$$
 APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
 COAT: brown
-DISPLAY: full, right
+DISPLAY: full, left
 EYE: black
 FREE: yes
 GROUP: squirrel
@@ -13,7 +13,15 @@ SOURCE: [jristz]
 WIDTH: 34
 HEIGHT: 23
 
+The person who associated a work with this deed has dedicated the work to
+the public domain by waiving all of his or her rights to the work worldwide under
+copyright law, including all related and neighboring rights, to the extent allowed
+by law.
 
+You can copy, modify, distribute and perform the work, even for commercial
+purposes, all without asking permission. See Other Information below.
+
+http://creativecommons.org/publicdomain/zero/1.0/legalcode
 $$$
 $balloon24$
                      $\$
diff --git a/ponies/stevenmagnettrue.pony b/ponies/stevenmagnettrue.pony
index 972efa10..6c7f94b0 100644
--- a/ponies/stevenmagnettrue.pony
+++ b/ponies/stevenmagnettrue.pony
@@ -7,9 +7,10 @@ EYE: black
 FREE: no
 GROUP: male, sea serpent, wildlife
 KIND: animals
+LINK: regular
 MANE: orange
-NAME: Sea Serpent (in merchandise)
-OTHER NAMES: Steven Magnet (unofficial), River Serpent (stated by the crew)
+NAME: (not mentioned)
+OTHER NAMES: Sea Serpent (official, in merchandise), Steven Magnet (unofficial), River Serpent (stated by the crew)
 POSE: true
 SOURCE: desktop ponies
 WIDTH: 77
diff --git a/ponies/sweetcream.pony b/ponies/sweetcream.pony
index 8553a2a4..5039938e 100644
--- a/ponies/sweetcream.pony
+++ b/ponies/sweetcream.pony
@@ -3,12 +3,15 @@ APPEARANCE: Comic issue 1
 BALLOON: top
 COAT: cream
 DISPLAY: full, left
+EYE: blue
 FREE: no
-GROUP: mare
+GROUP: mare, changeling
 KIND: unicorn
+LINK: regular
 MANE: yellow
 MEDIA: official comic
-NAME: Sweetcream Scoops (Given by the author)
+NAME: Sweetcream Scoops
+OTHER NAMES: Sweetcream (shorter)
 POSE: changeling
 SOURCE: [jristz]
 WIDTH: 49
diff --git a/ponies/sweetie.pony b/ponies/sweetie.pony
index 66104f98..69fa5a29 100644
--- a/ponies/sweetie.pony
+++ b/ponies/sweetie.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
 COAT: white
 DISPLAY: full, left
@@ -7,9 +7,10 @@ EYE: green
 FREE: no
 GROUP: filly, deuteragonist
 KIND: unicorn
+LINK: regular
 MANE: pink
 NAME: Sweetie Belle
-POSE: sitting, watching
+POSE: sit
 SOURCE: desktop ponies
 WIDTH: 37
 HEIGHT: 23
diff --git a/ponies/tenderheart.pony b/ponies/tenderheart.pony
index a234ca07..926c3548 100644
--- a/ponies/tenderheart.pony
+++ b/ponies/tenderheart.pony
@@ -1,13 +1,17 @@
 $$$
-APPEARANCE: s1c4m15s5
+APPEARANCE: S01E04 Applebuck Season
+BALLOON: top
 COAT: cyan
+DISPLAY: full, left
 EYE: purple
 FREE: no
-GROUP: mare
+GROUP: mare, background
 KIND: earth
+LINK: regular
 MANE: green
-MEDIA: TV series
-NAME: nurse tenderheart
+NAME: (not mentioned)
+OTHER NAMES: Nurse Tenderheart (unofficial)
+POSE: stand
 SOURCE: [jristz]
 WIDTH: 40
 HEIGHT: 26
diff --git a/ponies/tom.pony b/ponies/tom.pony
index fa1f33b4..b8fee029 100644
--- a/ponies/tom.pony
+++ b/ponies/tom.pony
@@ -12,7 +12,15 @@ SOURCE: imageboard
 WIDTH: 52
 HEIGHT: 30
 
+The person who associated a work with this deed has dedicated the work to
+the public domain by waiving all of his or her rights to the work worldwide under
+copyright law, including all related and neighboring rights, to the extent allowed
+by law.
 
+You can copy, modify, distribute and perform the work, even for commercial
+purposes, all without asking permission. See Other Information below.
+
+http://creativecommons.org/publicdomain/zero/1.0/legalcode
 $$$
 $balloon12$
          $\$
diff --git a/ponies/tornadobolt.pony b/ponies/tornadobolt.pony
index b4e443eb..f879f57b 100644
--- a/ponies/tornadobolt.pony
+++ b/ponies/tornadobolt.pony
@@ -1,13 +1,18 @@
 $$$
-APPEARANCE: s1c7m1s46
-COAT: gray
+APPEARANCE: S01E07 Dragonshy
+BALLOON: top
+COAT: grey
+DISPLAY: full, left
 EYE: yellow
 FREE: no
-GROUP: colt (wikia), stallion (others reliable sources)
+GROUP: filly
 KIND: pegasus
+LINK: regular
 MANE: purple
 MEDIA: TV series
-NAME: tornado bolt
+NAME: (not mentioned)
+OTHER NAMES: Tornado Bolt (unofficial)
+POSE: stand
 SOURCE: [jristz]
 WIDTH: 50
 HEIGHT: 26
diff --git a/ponies/trixie.pony b/ponies/trixie.pony
index 20647617..2c5f0419 100644
--- a/ponies/trixie.pony
+++ b/ponies/trixie.pony
@@ -1,16 +1,18 @@
 $$$
-APPEARANCE: S01E06 02:28
+APPEARANCE: S01E06 Boast Busters
+AURA: pink
 BALLOON: top
 COAT: blue
 DISPLAY: full, right
 EYE: purple
 FREE: no
-GROUP: mare, villain, voiced
+GROUP: mare, villain, reconciled
 KIND: unicorn
+LINK: regular
 MANE: white
-NAME: The Great and Powerful Trixie
-OTHER NAMES: Trixie, Trixie Lulamoon (toy line), Lulamoon (toy line)
-POSE: presentating
+NAME: Trixie
+OTHER NAMES: The Great and Powerful Trixie (official, titled), Trixie Lulamoon (official, toy line), Lulamoon (official, toy line)
+POSE: boast
 SOURCE: desktop ponies
 WIDTH: 51
 HEIGHT: 33
diff --git a/ponies/trixieamulet.pony b/ponies/trixieamulet.pony
index 89a2b64d..7913980f 100644
--- a/ponies/trixieamulet.pony
+++ b/ponies/trixieamulet.pony
@@ -1,16 +1,19 @@
 $$$
-APPEARANCE: s1c6m2s28
-BASED ON: trixie
+APPEARANCE: S01E06 Boast Busters
+AURA: red (while wielding the amulet), pink (without the amulet)
+BALLOON: top
 COAT: blue
+DISPLAY: full, right
 EYE: purple
 FREE: no
-GROUP: mare
-GROUP NAME: villain
+GROUP: mare, villian, reconciled
 KIND: unicorn
+LINK: regular
 MANE: white
-MEDIA: TV series
-NAME: the grat and powerful trixie
-OTHER NAMES: trixie, trixie lulamoon, lulamoon
+MASTER: trixie
+NAME: Trixie
+OTHER NAMES: The Great and Powerful Trixie (official, titled), Trixie Lulamoon (official, toy line), Lulamoon (official, toy line)
+POSE: amulet
 SOURCE: desktop ponies
 WIDTH: 44
 HEIGHT: 26
diff --git a/ponies/truffleshuffle.pony b/ponies/truffleshuffle.pony
index 85aa155b..a36acd01 100644
--- a/ponies/truffleshuffle.pony
+++ b/ponies/truffleshuffle.pony
@@ -1,13 +1,17 @@
 $$$
-APPEARANCE: s2c12m5s57
-COAT: gray
+APPEARANCE: S02E12 Family Appreciation Day
+BALLOON: top
+COAT: grey
+DISPLAY: full, right
 EYE: blue
 FREE: no
 GROUP: colt
 KIND: earth
+LINK: regular
 MANE: black
-MEDIA: TV series
-NAME: truffle shuffle
+NAME: (not mentioned)
+OTHER NAMES: Truffle Shuffle (unofficial)
+POSE: stand
 SOURCE: [jristz]
 WIDTH: 32
 HEIGHT: 21
diff --git a/ponies/turf.pony b/ponies/turf.pony
index 598e140a..77f68302 100644
--- a/ponies/turf.pony
+++ b/ponies/turf.pony
@@ -1,13 +1,17 @@
 $$$
-APPEARANCE: s2c19m2s21
+APPEARANCE: S02E19 Putting Your Hood Down
+BALLOON: top
 COAT: blue
+DISPLAY: full, left
 EYE: cyan
 FREE: no
 GROUP: mare
 KIND: earth
+LINK: regular
 MANE: brown
 MEDIA: TV series
-NAME: turf
+OTHER NAMES: Turf (unofficial)
+POSE: stand
 SOURCE: [jristz]
 WIDTH: 45
 HEIGHT: 26
diff --git a/ponies/twilightspike.pony b/ponies/twilightspike.pony
index 5695034f..2da60b6f 100644
--- a/ponies/twilightspike.pony
+++ b/ponies/twilightspike.pony
@@ -1,4 +1,34 @@
 $$$
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+AURA: purple (whitish lilac in season 1)
+AURA: (no magic)
+BALLOON: top
+COAT: purple
+COAT: purple
+DISPLAY: full, left
+DISPLAY: full, right
+EYE: purple
+EYE: green
+FREE: no
+GROUP: mare, mane
+GROUP: dragon, tritagonist
+KIND: unicorn
+KIND: animal
+LINK: regular
+LINK ON: 2
+MANE: purple
+MANE: green
+MASTER: spike
+NAME: Twilight
+NAME: Spike
+OTHERNAMES: Twilight Sparkle (official, full name)
+OTHERNAMES: (none)
+POSE: ride
+WIDTH: 44
+HEIGHT: 28
+
+
 $$$
 $balloon20$
                  $\$
diff --git a/ponies/twilighttime.pony b/ponies/twilighttime.pony
index 0f9981ff..812f41da 100644
--- a/ponies/twilighttime.pony
+++ b/ponies/twilighttime.pony
@@ -1,16 +1,19 @@
 $$$
-APPEARANCE: s1c1m1s31
-BASED ON: twilight
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+AURA: purple (whitish lilac in season 1)
+BALLOON: top
 COAT: purple
+DISPLAY: full, left
 EYE: purple
 FREE: no
-GROUP: mare
-GROUP NAME: mane
+GROUP: mare, mane
 KIND: unicorn
+LINK: regular
 MANE: purple, blue
-MEDIA: TV series
-NAME: twilight sparkle
-OTHER NAMES: twilight
+MASTER: twilight
+NAME: Twilight
+OTHER NAMES: Twilight Sparkle (official, full name)
+POSE: time
 SOURCE: desktop ponies
 WIDTH: 50
 HEIGHT: 28