diff --git a/ponies/fillydash.pony b/ponies/fillydash.pony
index 653682bd..0df70aaa 100644
--- a/ponies/fillydash.pony
+++ b/ponies/fillydash.pony
@@ -1,16 +1,18 @@
 $$$
-APPEARANCE: s1c1m9s39
+APPEARANCE: S01E01 Friendship is magic part 1
+BALLOON: top
 BASED ON: rainbow
 COAT: blue
+DISPLAY: full, left
 EYE: purple
 FREE: no
-GROUP: mare
-GROUP NAME: mane
+GROUP: filly, mane
 KIND: pegasus
-MANE: red, orange, yellow, green, blue, purple
-MEDIA: TV series
-NAME: rainbow dash
-OTHER NAMES: rainbow, dash, dashie
+MANE: rainbows
+MASTER: rainbow
+NAME: Rainbow Dash
+OTHER NAMES: Rainbow, Dash, Dashie
+POSE: stand
 SOURCE: desktop ponies
 WIDTH: 40
 HEIGHT: 22
diff --git a/ponies/raggedy.pony b/ponies/raggedy.pony
index 0d68477d..76d4dae0 100644
--- a/ponies/raggedy.pony
+++ b/ponies/raggedy.pony
@@ -1,14 +1,16 @@
 $$$
-APPEARANCE: s2c9m16s51
+APPEARANCE: S02E09 16:51
+BALLOON: top
 COAT: gray
+DISPLAY: full, right
 EYE: brown
 FREE: no
 GROUP: stallion
 KIND: earth
 MANE: black
-MEDIA: TV series
-NAME: raggedy doctor
-OTHER NAMES: raggedy
+NAME: (not mentioned)
+OTHER NAMES: Raggedy (unofficial), Raggedy Doctor (unofficial)
+POSE: troting
 SOURCE: desktop ponies deviantart group
 WIDTH: 39
 HEIGHT: 30
diff --git a/ponies/rainbow.pony b/ponies/rainbow.pony
index 84aa3741..0ed550e7 100644
--- a/ponies/rainbow.pony
+++ b/ponies/rainbow.pony
@@ -1,15 +1,16 @@
 $$$
-APPEARANCE: s1c1m9s39
+APPEARANCE: S01E01 Friendship is magic part 1
+BALLOON: top
 COAT: blue
-EYE: purple
+DISPLAY: full, left
+EYE: closed, purple
 FREE: no
-GROUP: mare
-GROUP NAME: mane
+GROUP: mare, mane
 KIND: pegasus
 MANE: rainbows
-MEDIA: TV series
-NAME: rainbow dash
-OTHER NAMES: rainbow, dash, dashie
+NAME: Rainbow Dash
+OTHER NAMES: Rainbow, Dash, Dashie
+POSE: possing
 SOURCE: desktop ponies
 WIDTH: 51
 HEIGHT: 26
diff --git a/ponies/rainbowfly.pony b/ponies/rainbowfly.pony
index aa27460d..34288330 100644
--- a/ponies/rainbowfly.pony
+++ b/ponies/rainbowfly.pony
@@ -1,16 +1,16 @@
 $$$
-APPEARANCE: s1c1m9s39
-BASED ON: rainbow
+APPEARANCE: S01E01 Friendship is magic part 1
+BALLOON: top
 COAT: blue
+DISPLAY: full, left
 EYE: purple
 FREE: no
-GROUP: mare
-GROUP NAME: mane
+GROUP: mare, mane
 KIND: pegasus
-MANE: rainbow
-MEDIA: TV series
-NAME: rainbow dash
-OTHER NAMES: rainbow, dash, dashie
+MANE: rainbows
+NAME: Rainbow Dash
+OTHER NAMES: Rainbow, Dash, Dashie
+POSE: flying
 SOURCE: desktop ponies
 WIDTH: 53
 HEIGHT: 19
diff --git a/ponies/rainbowgala.pony b/ponies/rainbowgala.pony
index b0dd46c9..bee69ce2 100644
--- a/ponies/rainbowgala.pony
+++ b/ponies/rainbowgala.pony
@@ -1,16 +1,16 @@
 $$$
-APPEARANCE: s1c1m9s39
-BASED ON: rainbow
+APPEARANCE: S01E01 Friendship is magic part 1
+BALLOON: top
 COAT: blue
+DISPLAY: full, right
 EYE: purple
 FREE: no
-GROUP: mare
-GROUP NAME: mane
+GROUP: mare, mane
 KIND: pegasus
-MANE: rainbow
-MEDIA: TV series
-NAME: rainbow dash
-OTHER NAMES: rainbow, dash, dashie
+MANE: rainbows
+NAME: Rainbow Dash
+OTHER NAMES: Rainbow, Dash, Dashie
+POSE: gala, stand
 SOURCE: desktop ponies
 WIDTH: 58
 HEIGHT: 25
diff --git a/ponies/rainbowhurricane.pony b/ponies/rainbowhurricane.pony
index 3790b670..beffd441 100644
--- a/ponies/rainbowhurricane.pony
+++ b/ponies/rainbowhurricane.pony
@@ -1,17 +1,17 @@
 $$$
-APPEARANCE: s1c1m9s39
-BASED ON: rainbow
+APPEARANCE: S01E01 Friendship is magic part 1
+BALLOON: top
 COAT: blue
+DISPLAY: full, left
 EYE: purple
 FREE: no
-GROUP: mare
-GROUP NAME: mane
+GROUP: mare, mane
 KIND: pegasus
-MANE: rainbow
-MEDIA: TV series
-NAME: rainbow dash
-OTHER NAMES: rainbow, dash, dashie
-SOURCE: desktop ponies
+MANE: rainbows
+NAME: Rainbow Dash
+OTHER NAMES: Rainbow, Dash, Dashie
+POSE: disguised as Commander Hurricane
+SOURCE: [jristz]
 WIDTH: 54
 HEIGHT: 34
 
diff --git a/ponies/rainbowsalute.pony b/ponies/rainbowsalute.pony
index 14a1ac17..b630f26a 100644
--- a/ponies/rainbowsalute.pony
+++ b/ponies/rainbowsalute.pony
@@ -1,16 +1,16 @@
 $$$
-APPEARANCE: s1c1m9s39
-BASED ON: rainbow
+APPEARANCE: S01E01 Friendship is magic part 1
+BALLOON: top
 COAT: blue
+DISPLAY: full, left
 EYE: purple
 FREE: no
-GROUP: mare
-GROUP NAME: mane
+GROUP: mare, mane
 KIND: pegasus
-MANE: rainbow
-MEDIA: TV series
-NAME: rainbow dash
-OTHER NAMES: rainbow, dash, dashie
+MANE: rainbows
+NAME: Rainbow Dash
+OTHER NAMES: Rainbow, Dash, Dashie
+POSE: salute
 SOURCE: desktop ponies
 WIDTH: 48
 HEIGHT: 25
diff --git a/ponies/rainbowshadowbolt.pony b/ponies/rainbowshadowbolt.pony
index 47ca2e4a..b11c25f1 100644
--- a/ponies/rainbowshadowbolt.pony
+++ b/ponies/rainbowshadowbolt.pony
@@ -1,16 +1,16 @@
 $$$
-APPEARANCE: s1c1m9s39
-BASED ON: rainbow
+APPEARANCE: S01E01 Friendship is magic part 1
+BALLOON: top
 COAT: blue
-EYE: purple
+DISPLAY: full, left
+EYE: closed, purple
 FREE: no
-GROUP: mare
-GROUP NAME: mane, shadowbolts
+GROUP: mare, mane, shadowbolt
 KIND: pegasus
-MANE: rainbow
-MEDIA: TV series
-NAME: rainbow dash
-OTHER NAMES: rainbow, dash, dashie
+MANE: rainbows
+NAME: Rainbow Dash
+OTHER NAMES: Rainbow, Dash, Dashie
+POSE: disguised as Shadowbolt
 SOURCE: desktop ponies
 WIDTH: 52
 HEIGHT: 25
diff --git a/ponies/rainbowshine.pony b/ponies/rainbowshine.pony
index 6574a58b..82e76874 100644
--- a/ponies/rainbowshine.pony
+++ b/ponies/rainbowshine.pony
@@ -1,13 +1,15 @@
 $$$
-APPEARANCE: s1c1m18s43
+APPEARANCE: S01E01 Friendship is Magic part 1
+BALLOON: top
 COAT: blue
+DISPLAY: full, right
 EYE: purple
 FREE: no
 GROUP: mare
 KIND: pegasus
 MANE: pink
-MEDIA: TV series
-NAME: rainbowshine
+NAME: Rainbowshine
+POSE: troting
 SOURCE: desktop ponies
 WIDTH: 41
 HEIGHT: 25
diff --git a/ponies/rainbowsleep.pony b/ponies/rainbowsleep.pony
index 7a5c8c64..099d1cd5 100644
--- a/ponies/rainbowsleep.pony
+++ b/ponies/rainbowsleep.pony
@@ -1,16 +1,16 @@
 $$$
-APPEARANCE: s1c1m9s39
-BASED ON: rainbow
+APPEARANCE: S01E01 Friendship is magic part 1
+BALLOON: top
 COAT: blue
-EYE: purple
+DISPLAY: full, left
+EYE: closed, purple
 FREE: no
-GROUP: mare
-GROUP NAME: mane
+GROUP: mare, mane
 KIND: pegasus
-MANE: rainbow
-MEDIA: TV series
-NAME: rainbow dash
-OTHER NAMES: rainbow, dash, dashie
+MANE: rainbows
+NAME: Rainbow Dash
+OTHER NAMES: Rainbow, Dash, Dashie
+POSE: sleep
 SOURCE: desktop ponies
 WIDTH: 53
 HEIGHT: 21
diff --git a/ponies/raindrops.pony b/ponies/raindrops.pony
index 45ebae66..f2902ff5 100644
--- a/ponies/raindrops.pony
+++ b/ponies/raindrops.pony
@@ -1,13 +1,16 @@
 $$$
-APPEARANCE: s1c1m16s58
+APPEARANCE: S01E01 Friendship is Magic part 1
+BALLOON: top
 COAT: orange
+DISPLAY: full, right
 EYE: cyan
 FREE: no
 GROUP: mare
 KIND: pegasus
 MANE: cyan
-MEDIA: TV series
-NAME: raindrops
+NAME: (not mentioned)
+OTHER NAMES: Raindrops (unofficial)
+POSE: stand
 SOURCE: desktop ponies
 WIDTH: 48
 HEIGHT: 25
diff --git a/ponies/rarity.pony b/ponies/rarity.pony
index ab1a1a61..9d79b9c9 100644
--- a/ponies/rarity.pony
+++ b/ponies/rarity.pony
@@ -1,14 +1,15 @@
 $$$
-APPEARANCE: s1c1m12s2
+APPEARANCE: S01E01 Friendship is Magic part 1
+BALLOON: top
 COAT: white
+DISPLAY: full, left
 EYE: blue
 FREE: no
-GROUP: mare
-GROUP NAME: mane
+GROUP: mare, mane
 KIND: unicorn
 MANE: purple
-MEDIA: TV series
-NAME: rarity
+NAME: Rarity
+POSE: stand
 SOURCE: desktop ponies
 WIDTH: 53
 HEIGHT: 25