diff --git a/ponies/octavia.pony b/ponies/octavia.pony
index d2aa7f4e..d6960536 100644
--- a/ponies/octavia.pony
+++ b/ponies/octavia.pony
@@ -1,11 +1,15 @@
 $$$
-APPEARANCE: s1c26m10s15
+APPEARANCE: S01E26 The Best Night Ever
+BALLOON: top
 COAT: gray
+DISPLAY: full, left
 EYE: purple
 FREE: no
+GROUP: mare
+KIND: earth
 MANE: black
-MEDIA: TV series
-NAME: octavia
+NAME: Octavia
+POSE: playing
 SOURCE: desktop ponies
 WIDTH: 45
 HEIGHT: 31
diff --git a/ponies/oinkoinkoink.pony b/ponies/oinkoinkoink.pony
index 9d09e6a1..80149c40 100644
--- a/ponies/oinkoinkoink.pony
+++ b/ponies/oinkoinkoink.pony
@@ -1,16 +1,18 @@
 $$$
-APPEARANCE: s1c1m6s59
+APPEARANCE: S01E01 Friendship is Magic part 1
+BALLOON: top
 BASED ON: pinkie
 COAT: pink
+DISPLAY: full, left
 EYE: blue
 FREE: no
-GROUP: mare
-GROUP NAME: mane
+GROUP: mare, mane
 KIND: earth
 MANE: pink
-MEDIA: TV series
-NAME: pinkie pie
-OTHER NAMES: pinkie, pinkamina diane pie
+MASTER: pinkie
+NAME: Pinkie Pie
+OTHER NAMES: Pinkie, Pinkamina Diane Pie
+POSE: oinkoinkoink
 SOURCE: desktop ponies
 WIDTH: 42
 HEIGHT: 23
diff --git a/ponies/opal.pony b/ponies/opal.pony
index dad3abbe..e2f71cc2 100644
--- a/ponies/opal.pony
+++ b/ponies/opal.pony
@@ -1,14 +1,15 @@
 $$$
-APPEARANCE: s1
+APPEARANCE: S01
+BALLOON: top
 COAT: white
+DISPLAY: full, left
 EYE: green
 FREE: no
-GROUP: cat
+GROUP: cat, pet
 GROUP NAME: pet
 KIND: animals
-MEDIA: TV series
-NAME: opalescence
-OTHER NAMES: opal
+NAME: Opalescence
+POSE: walking
 SOURCE: desktop ponies
 WIDTH: 29
 HEIGHT: 18
diff --git a/ponies/orange.pony b/ponies/orange.pony
index 4b8f8526..e6019b3e 100644
--- a/ponies/orange.pony
+++ b/ponies/orange.pony
@@ -1,15 +1,17 @@
 $$$
-APPEARANCE: s1c23m3s33
+APPEARANCE: S01E23 03:33
+BALLOON: top
 COAT: creme
+DISPLAY: full, right
 EYE: cyan
 FREE: no
-GROUP: stallion
+GROUP: stallion, voiced
 GROUP NAME: apple family
 KIND: earth
 MANE: green
-MEDIA: TV series
-NAME: uncle orange
-OTHER NAMES: mosely orange
+NAME: Uncle Orange
+OTHER NAMES: Mosely Orange (unofficial, on toy line)
+POSE: stand
 SOURCE: desktop ponies
 WIDTH: 37
 HEIGHT: 25
diff --git a/ponies/orangebird.pony b/ponies/orangebird.pony
index eba4b83a..3e249402 100644
--- a/ponies/orangebird.pony
+++ b/ponies/orangebird.pony
@@ -1,5 +1,6 @@
 $$$
 APPEARANCE: S03E03 Too Many Pinkie Pies
+BALLOON: top
 COAT: orange
 DISPLAY: full, left
 FREE: yes
@@ -7,6 +8,7 @@ GROUP: bird, fruit
 KIND: animal, item, hybrid
 LICENSE: CC0
 MANE: blue
+POSE: flying
 SOURCE: [jristz]
 WIDTH: 44
 HEIGHT: 28
diff --git a/ponies/orangefrog.pony b/ponies/orangefrog.pony
index fec8952d..cf56a315 100644
--- a/ponies/orangefrog.pony
+++ b/ponies/orangefrog.pony
@@ -1,11 +1,13 @@
 $$$
 APPEARANCE: S03E03 Too Many Pinkie Pies
+BALLOON: top
 COAT: orange
 DISPLAY: full, right
 FREE: yes
 GROUP: frog, orange
 KIND: animal, item, hybrid
 LICENSE: CC0
+POSE: singing
 SOURCE: (screenshoot)
 WIDTH: 58
 HEIGHT: 33
diff --git a/ponies/owl.pony b/ponies/owl.pony
index 6152b6ee..01551ff5 100644
--- a/ponies/owl.pony
+++ b/ponies/owl.pony
@@ -8,8 +8,7 @@ FREE: yes
 GROUP: owl, pet
 KIND: animals
 LICENSE: CC0
-NAME: Owlowiscious
-OTHER NAMES: Owl
+POSE: watching
 SOURCE: imageboard
 WIDTH: 21
 HEIGHT: 23
diff --git a/ponies/owlowiscious.pony b/ponies/owlowiscious.pony
index d442f7be..a22b9e61 100644
--- a/ponies/owlowiscious.pony
+++ b/ponies/owlowiscious.pony
@@ -1,13 +1,15 @@
 $$$
-APPEARANCE: s1
+APPEARANCE: S01E24 Owl's Well That Ends Well
+BALLOON: top
 COAT: brown
+DISPLAY: full, left
 EYE: black
-FREE: no
-GROUP: owl
-GROUP NAME: pet
+FREE: yes
+GROUP: owl, pet
 KIND: animals
-MEDIA: TV series
-NAME: owlowiscious
+LICENSE: CC0
+NAME: Owlowiscious
+POSE: watching
 SOURCE: imageboard
 WIDTH: 30
 HEIGHT: 22