diff --git a/ponies/cadance.pony b/ponies/cadance.pony
index 69aa1c22..e937dc55 100644
--- a/ponies/cadance.pony
+++ b/ponies/cadance.pony
@@ -8,9 +8,10 @@ EYE: pink
 FREE: no
 GROUP: mare, royal
 KIND: alicorn
+LINK: regular
 MANE: pastel
-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: 55
diff --git a/ponies/colgate.pony b/ponies/colgate.pony
index 29642d1a..e06cd3f9 100644
--- a/ponies/colgate.pony
+++ b/ponies/colgate.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E01 Friendship is magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
 COAT: cyan
 DISPLAY: full, left
@@ -7,6 +7,7 @@ EYE: blue
 FREE: no
 GROUP: mare
 KIND: unicorn
+LINK: regular
 MANE: blue
 NAME: Minuette
 OTHER NAMES: Colgate (unofficial), TARDIE (unofficial), Romana (unofficial), Aquafresh (unofficial), Minty Fresh (unofficial)
diff --git a/ponies/diamondmint.pony b/ponies/diamondmint.pony
index 5eca36bc..adfdb184 100644
--- a/ponies/diamondmint.pony
+++ b/ponies/diamondmint.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E02 Friendship is Magic part 2
+APPEARANCE: S01E02 Friendship is Magic [Part 2]
 BALLOON: top
 COAT: blue
 DISPLAY: full, right
@@ -7,10 +7,11 @@ EYE: purple
 FREE: no
 GROUP: mare
 KIND: unicorn
+LINK: regular
 MANE: purple
 NAME: (not mentioned)
 OTHER NAMES: Diamond Mint (unofficial)
-POSE: troting
+POSE: trot
 SOURCE: desktop ponies
 WIDTH: 47
 HEIGHT: 25
diff --git a/ponies/discordamused.pony b/ponies/discordamused.pony
index 12ec71bc..3b3cbcf2 100644
--- a/ponies/discordamused.pony
+++ b/ponies/discordamused.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S02E01 The Return of Harmony part 1
+APPEARANCE: S02E01 The Return of Harmony [Part 1]
 BALLOON: top
 BASED ON: discord
 COAT: multiple
@@ -7,13 +7,14 @@ DISPLAY: head, right
 EYE: red
 FREE: no
 GROUP: male, antagonist
-KIND: draconequu
-MANE: gray
+KIND: draconequus
+LINK: regular
+MANE: grey
 MASTER: discord
 NAME: Discord
 POSE: amused
 SOURCE: (screenshoot)
-WIDTH: 80
+WIDTH: 83
 HEIGHT: 33
 
 
diff --git a/ponies/fillydashfly.pony b/ponies/fillydashfly.pony
index a20c5caf..0af9409d 100644
--- a/ponies/fillydashfly.pony
+++ b/ponies/fillydashfly.pony
@@ -1,19 +1,21 @@
 $$$
-APPEARANCE: s1c1m9s39
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+BALLOON: top
 BASED ON: rainbow
 COAT: blue
+DISPLAY: full, right
 EYE: purple
 FREE: no
-GROUP: mare
-GROUP NAME: mane
+GROUP: mare, mane
 KIND: pegasus
-MANE: red, orange, yellow, green, blue, purple
-MEDIA: TV series
-NAME: rainbow dash
-OTHER NAMES: rainbow, dash, dashie
+LINK: regular
+MANE: rainbow
+MASTER: rainbow
+NAME: Rainbow Dash
+POSE: filly fly
 SOURCE: desktop ponies
-WIDTH: 40
-HEIGHT: 22
+WIDTH: 49
+HEIGHT: 18
 
 
 $$$
diff --git a/ponies/filthyrich.pony b/ponies/filthyrich.pony
index 675e40a2..e0994ed0 100644
--- a/ponies/filthyrich.pony
+++ b/ponies/filthyrich.pony
@@ -1,12 +1,13 @@
 $$$
-APPEARANCE: S02E12 02:37
+APPEARANCE: S02E12 Family Appreciation Day
 BALLOON: top
 COAT: brown
-DISPLAY: ful, left
+DISPLAY: full, left
 EYE: blue
 FREE: no
-GROUP: stallion, voiced
+GROUP: stallion, background, voiced
 KIND: earth
+LINK: regular
 MANE: black
 NAME: Filthy Rich
 POSE: stand
diff --git a/ponies/fleurdelislay.pony b/ponies/fleurdelislay.pony
index e9c92ad1..ef1fd143 100644
--- a/ponies/fleurdelislay.pony
+++ b/ponies/fleurdelislay.pony
@@ -7,10 +7,12 @@ EYE: purple
 FREE: no
 GROUP: mare
 KIND: unicorn
+LINK: regular
 MANE: pink
+MASTER: fleurdelis
 NAME: (not mentioned)
 OTHER NAMES: Fleur de Lis (unofficial)
-POSE: waiting
+POSE: lay
 SOURCE: desktop ponies
 WIDTH: 45
 HEIGHT: 21
diff --git a/ponies/grannysleep.pony b/ponies/grannysleep.pony
index df56c749..da5755c1 100644
--- a/ponies/grannysleep.pony
+++ b/ponies/grannysleep.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
 COAT: green
 DISPLAY: full, left
@@ -7,9 +7,10 @@ EYE: closed, orange
 FREE: no
 GROUP: mare, background, voiced
 KIND: earth
+LINK: regular
 MANE: white
 NAME: Granny Smith
-POSE: sleeping
+POSE: sleep
 SOURCE: desktop ponies
 WIDTH: 37
 HEIGHT: 23
diff --git a/ponies/joetuxedo.pony b/ponies/joetuxedo.pony
index ea173424..ad8f7f93 100644
--- a/ponies/joetuxedo.pony
+++ b/ponies/joetuxedo.pony
@@ -1,19 +1,19 @@
 $$$
 APPEARANCE: S01E26 The Best Night Ever
 BALLOON: top
-BASED ON: joe
 COAT: yellow
 DISPLAY: full, left, turn
 EYE: closed, green
 FREE: no
 GROUP: stallion
 KIND: unicorn
+LINK: regular
 MANE: brown
 MASTER: joe
 NAME: Joe
 OTHER NAMES: Donut Joe (partially official)
-POSE: possing
-SOURCE: [jristz] based on dektop ponies
+POSE: poss
+SOURCE: [jristz], based on dektop ponies
 WIDTH: 39
 HEIGHT: 26
 
diff --git a/ponies/luna.pony b/ponies/luna.pony
index d8e5a1de..df2686c2 100644
--- a/ponies/luna.pony
+++ b/ponies/luna.pony
@@ -8,10 +8,11 @@ EYE: blue
 FREE: no
 GROUP: mare, royal
 KIND: alicorn
+LINK: regular
 MANE: cyan, blue (season 2)
-NAME: Princess Luna
-OTHER NAMES: Lunija (russian), Nightmare Moon (corrupted), Woona (unofficial)
-POSE: troting
+NAME: Luna
+OTHER NAMES: Princess Luna (official, full name), Lunija (official, russian), Nightmare Moon (official, corrupted), Woona (unofficial)
+POSE: trot
 SOURCE: desktop ponies
 WIDTH: 70
 HEIGHT: 38
diff --git a/ponies/lunafly.pony b/ponies/lunafly.pony
index 1aa96504..3263daf3 100644
--- a/ponies/lunafly.pony
+++ b/ponies/lunafly.pony
@@ -13,7 +13,7 @@ MANE: cyan, blue (season 2)
 MASTER: woona
 NAME: Luna
 OTHER NAMES: Princess Luna (official, full name), Lunija (official, russian), Nightmare Moon (official, corrupted), Woona (unofficial)
-POSE: flying
+POSE: fly
 SOURCE: (unknown)
 WIDTH: 85
 HEIGHT: 40
diff --git a/ponies/lyrabonbon.pony b/ponies/lyrabonbon.pony
index 841252e3..f30a5707 100644
--- a/ponies/lyrabonbon.pony
+++ b/ponies/lyrabonbon.pony
@@ -4,7 +4,7 @@ APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
 COAT: beige
 COAT: cyan
-DISPLAY: full, turned, right
+DISPLAY: full, turned, left
 DISPLAY: full, front, right
 EYE: teal
 EYE: yellow
diff --git a/ponies/milkyway.pony b/ponies/milkyway.pony
index 1bdd1dcf..087f751e 100644
--- a/ponies/milkyway.pony
+++ b/ponies/milkyway.pony
@@ -1,12 +1,13 @@
 $$$
-APPEARANCE: S02E22 02:40
+APPEARANCE: S02E22 Hurricane Fluttershy
 BALLOON: top
 COAT: white
-DISPLAY: full, left
+DISPLAY: full, right
 EYE: yellow
 FREE: no
 GROUP: stallion
 KIND: pegasus
+LINK: regular
 MANE: black
 NAME: (not mentioned)
 OTHER NAMES: Milky Way (unofficial)
diff --git a/ponies/noi.pony b/ponies/noi.pony
index d18c0aea..87b42ade 100644
--- a/ponies/noi.pony
+++ b/ponies/noi.pony
@@ -1,13 +1,14 @@
 $$$
-APPEARANCE: S01E12 00:04
+APPEARANCE: S01E12 Call of the Cutie
 BALLOON: top
 COAT: brown
-DISPLAY: full, right
+DISPLAY: full, left
 EYE: purple
 FREE: no
 GROUP: filly
 KIND: earth
-MANE: creme
+LINK: regular
+MANE: orange
 NAME: (not mentioned)
 OTHER NAMES: Noi (unofficial)
 POSE: stand
diff --git a/ponies/perrypierce.pony b/ponies/perrypierce.pony
index c5168054..7103f7d1 100644
--- a/ponies/perrypierce.pony
+++ b/ponies/perrypierce.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S02E09 03:43
+APPEARANCE: S02E09 Sweet and Elite
 BALLOON: top
 COAT: blue
 DISPLAY: full, right
@@ -7,11 +7,12 @@ EYE: brown
 FREE: no
 GROUP: stallion
 KIND: unicorn
+LINK: regular
 MANE: white
 NAME: (not mentioned)
 OTHER NAMES: Perry Pierce (unofficial), Pokey Pierce (unofficial, same look)
 POSE: stand
-SOURCE: desktop poniess
+SOURCE: desktop ponies
 WIDTH: 43
 HEIGHT: 27
 
diff --git a/ponies/pinkiefly.pony b/ponies/pinkiefly.pony
index cd5229ac..4ba183f0 100644
--- a/ponies/pinkiefly.pony
+++ b/ponies/pinkiefly.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: floating
+OTHER NAMES: Pinkie (official, short name), Pinkamina Diane Pie (official, full name)
+POSE: fly
 SOURCE: desktop ponies
 WIDTH: 49
 HEIGHT: 34
diff --git a/ponies/pinkiewhoops.pony b/ponies/pinkiewhoops.pony
index 29822052..ee312a8a 100644
--- a/ponies/pinkiewhoops.pony
+++ b/ponies/pinkiewhoops.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: accident, inside
+OTHER NAMES: Pinkie (official, short name), Pinkamina Diane Pie (official, full name)
+POSE: whoops
 SOURCE: desktop ponies
 WIDTH: 62
 HEIGHT: 29
diff --git a/ponies/spike.pony b/ponies/spike.pony
index cc45d9ad..62bbba28 100644
--- a/ponies/spike.pony
+++ b/ponies/spike.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
 BALLOON: top
 COAT: purple
 DISPLAY: full, left
@@ -7,11 +7,12 @@ EYE: green
 FREE: no
 GROUP: male, dragon
 KIND: animal
-MANE: green (scales)
+LINK: regular
+MANE: green
 NAME: Spike
 POSE: stand
 SOURCE: desktop ponies
-WIDTH: 23
+WIDTH: 21
 HEIGHT: 19
 
 
diff --git a/ponies/violet.pony b/ponies/violet.pony
index 3a11f69f..28787198 100644
--- a/ponies/violet.pony
+++ b/ponies/violet.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, left
 EYE: purple
 FREE: no
-GROUP: mare
+GROUP: mare, background
 KIND: unicorn
+LINK: regular
 MANE: blue
 NAME: (not mentioned)
 OTHER NAMES: Royal Ribbon (unofficial), Violet (unofficial)
-POSE: sitting
+POSE: sit
 SOURCE: desktop ponies
 WIDTH: 38
 HEIGHT: 26