diff --git a/ponies/fillycadance.pony b/ponies/fillycadance.pony
index fa7eb0fe..f0c8842a 100644
--- a/ponies/fillycadance.pony
+++ b/ponies/fillycadance.pony
@@ -1,4 +1,24 @@
 $$$
+APPEARANCE: S02E25 The Royal Wedding part 1
+AURA: pink
+BALLOON: top
+BASED ON: cadance
+COAT: pink
+DISPLAY: full, left
+EYE: pink
+FREE: no
+GROUP: filly, royal
+KIND: alicorn
+MANE: pastel
+MASTER: cadance
+NAME: Princess Cadance
+OTHER NAMES: Mi amore Cadenza (on invitation), Cadence (on credits)
+POSE: stroting
+SOURCE: desktop ponies
+WIDTH: 49
+HEIGHT: 27
+
+
 $$$
 $balloon32$
                              $\$
diff --git a/ponies/fillyjack.pony b/ponies/fillyjack.pony
index 8944ffa8..2ad9c01b 100644
--- a/ponies/fillyjack.pony
+++ b/ponies/fillyjack.pony
@@ -1,18 +1,21 @@
 $$$
-APPEARANCE: s1c1m7s30
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+BALLOON: top
+BASED ON: applejack
 COAT: brown
+DISPLAY: full, left
 EYE: blue
 FREE: no
-GROUP: mare
-GROUP NAME: mane
+GROUP: filly, mane
 KIND: earth
+LINK: regular
 MANE: yellow
-MEDIA: TV series
-NAME: applejack
-OTHER NAMES: aj
+MASTER: applejack
+NAME: Applejack
+POSE: stamp
 SOURCE: desktop ponies
-WIDTH: 52
-HEIGHT: 27
+WIDTH: 34
+HEIGHT: 21
 
 
 $$$
diff --git a/ponies/fillyjacktravel.pony b/ponies/fillyjacktravel.pony
index 9afec023..529f903f 100644
--- a/ponies/fillyjacktravel.pony
+++ b/ponies/fillyjacktravel.pony
@@ -1,18 +1,21 @@
 $$$
-APPEARANCE: s1c1m7s30
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+BALLOON: top
+BASED ON: applejack
 COAT: brown
+DISPLAY: full, left
 EYE: blue
 FREE: no
-GROUP: mare
-GROUP NAME: mane
+GROUP: mare, mane
 KIND: earth
+LINK: regular
 MANE: yellow
-MEDIA: TV series
-NAME: applejack
-OTHER NAMES: aj
+MASTER: applejack
+NAME: Applejack
+POSE: travel
 SOURCE: desktop ponies
-WIDTH: 52
-HEIGHT: 27
+WIDTH: 39
+HEIGHT: 21
 
 
 $$$
diff --git a/ponies/fillyshy.pony b/ponies/fillyshy.pony
index 76850bd6..b7fb1828 100644
--- a/ponies/fillyshy.pony
+++ b/ponies/fillyshy.pony
@@ -1,4 +1,23 @@
 $$$
+APPEARANCE: S01E01 Friendship is Magic part 1
+BALLOON: top
+BASED ON: fluttershy
+COAT: yellow
+DISPLAY: full, left
+EYE: closed, cyan
+FREE: no
+GROUP: filly, mane
+KIND: unicorn
+MANE: pink
+MASTER: fluttershy
+NAME: Fluttershy
+OTHER NAMES: Shy (sometimes)
+POSE: flying
+SOURCE: desktop ponies
+WIDTH: 42
+HEIGHT: 21
+
+
 $$$
 $balloon8$
      $\$
diff --git a/ponies/filthyrich.pony b/ponies/filthyrich.pony
index 050930a6..675e40a2 100644
--- a/ponies/filthyrich.pony
+++ b/ponies/filthyrich.pony
@@ -1,13 +1,15 @@
 $$$
-APPEARANCE: s2c12m2s37
+APPEARANCE: S02E12 02:37
+BALLOON: top
 COAT: brown
+DISPLAY: ful, left
 EYE: blue
 FREE: no
-GROUP: stallion
+GROUP: stallion, voiced
 KIND: earth
 MANE: black
-MEDIA: TV series
-NAME: filthy rich
+NAME: Filthy Rich
+POSE: stand
 SOURCE: [jristz]
 WIDTH: 45
 HEIGHT: 27
diff --git a/ponies/fluttershy.pony b/ponies/fluttershy.pony
index 59b70648..d151f9dd 100644
--- a/ponies/fluttershy.pony
+++ b/ponies/fluttershy.pony
@@ -1,15 +1,16 @@
 $$$
-APPEARANCE: s1c1m13s51
+APPEARANCE: S01E01 Friendship is Magic part 1
+BALLOON: top
 COAT: yellow
+DISPLAY: full, left
 EYE: cyan
 FREE: no
-GROUP: mare
-GROUP NAME: mane
+GROUP: mare, mane
 KIND: unicorn
 MANE: pink
-MEDIA: TV series
-NAME: fluttershy
-OTHER NAMES: shy
+NAME: Fluttershy
+OTHER NAMES: Shy (sometimes)
+POSE: troting
 SOURCE: desktop ponies
 WIDTH: 54
 HEIGHT: 26
diff --git a/ponies/fluttershygala.pony b/ponies/fluttershygala.pony
index e589e629..c385d9f1 100644
--- a/ponies/fluttershygala.pony
+++ b/ponies/fluttershygala.pony
@@ -1,4 +1,23 @@
 $$$
+APPEARANCE: S01E01 Friendship is Magic part 1
+BALLOON: top
+BASED ON: fluttershy
+COAT: yellow
+DISPLAY: full, left
+EYE: cyan
+FREE: no
+GROUP: mare, mane
+KIND: unicorn
+MANE: pink
+MASTER: fluttershy
+NAME: Fluttershy
+OTHER NAMES: Shy (sometimes)
+POSE: stand
+SOURCE: desktop ponies
+WIDTH: 55
+HEIGHT: 25
+
+
 $$$
 $balloon6$
    $\$
diff --git a/ponies/fluttershyshy.pony b/ponies/fluttershyshy.pony
index d14dd3fd..e3eaf99f 100644
--- a/ponies/fluttershyshy.pony
+++ b/ponies/fluttershyshy.pony
@@ -1,4 +1,23 @@
 $$$
+APPEARANCE: S01E01 Friendship is Magic part 1
+BALLOON: top
+BASED ON: fluttershy
+COAT: yellow
+DISPLAY: full, left
+EYE: cyan
+FREE: no
+GROUP: mare, mane
+KIND: unicorn
+MANE: pink
+MASTER: flutershy
+NAME: Fluttershy
+OTHER NAMES: Shy (sometimes)
+POSE: shy
+SOURCE: desktop ponies
+WIDTH: 45
+HEIGHT: 25
+
+
 $$$
 $balloon5$
   $\$
diff --git a/ponies/fluttershystare.pony b/ponies/fluttershystare.pony
index 00d823dd..49106b26 100644
--- a/ponies/fluttershystare.pony
+++ b/ponies/fluttershystare.pony
@@ -1,4 +1,23 @@
 $$$
+APPEARANCE: S01E01 Friendship is Magic part 1
+BALLOON: top
+BASED ON: fluttershy
+COAT: yellow
+DISPLAY: full, left
+EYE: cyan
+FREE: no
+GROUP: mare, mane
+KIND: unicorn
+MANE: pink
+MASTER: fluttershy
+NAME: Fluttershy
+OTHER NAMES: Shy (sometimes)
+POSE: stare
+SOURCE: desktop ponies
+WIDTH: 53
+HEIGHT: 23
+
+
 $$$
 $balloon5$
   $\$
diff --git a/ponies/frederickhorseshoepin.pony b/ponies/frederickhorseshoepin.pony
index 4dc49fe1..597a4616 100644
--- a/ponies/frederickhorseshoepin.pony
+++ b/ponies/frederickhorseshoepin.pony
@@ -2,7 +2,7 @@ $$$
 APPEARANCE: S01E26 The Best Night Ever
 BALLOON: top
 COAT: brown
-DISPLAY: full, left, sit
+DISPLAY: full, left, back
 EYE: green
 FREE: no
 GROUP: stallion