diff --git a/extraponies/blueballblitz.pony b/extraponies/blueballblitz.pony
index e1e4f828..1f25bdcf 100644
--- a/extraponies/blueballblitz.pony
+++ b/extraponies/blueballblitz.pony
@@ -1,13 +1,14 @@
 $$$
 COAT: blue
+DISPLAY: full, left
 EYE: purple
 FREE: yes
 GROUP: mare
 GROUP NAME: shadowbolts
 KIND: pegasus
-MANE: blue
+MANE: teal
 MEDIA: [fanfic]
-NAME: blueball blitz
+NAME: Blueball Blitz (on the Fanfics)
 SOURCE: [jristz]
 WIDTH: 51
 HEIGHT: 27
diff --git a/extraponies/bubbleberry.pony b/extraponies/bubbleberry.pony
index 7d045102..2d3ea984 100644
--- a/extraponies/bubbleberry.pony
+++ b/extraponies/bubbleberry.pony
@@ -6,7 +6,8 @@ GROUP: stallion
 GROUP NAME: mane-63
 KIND: earth
 MANE: pink
-NAME: bubble berry
+NAME: Bubble Berry (on the first fanart)
+SOURCE: fanart
 WIDTH: 46
 HEIGHT: 25
 
diff --git a/extraponies/butterscotch.pony b/extraponies/butterscotch.pony
index 4eb084d3..2864104a 100644
--- a/extraponies/butterscotch.pony
+++ b/extraponies/butterscotch.pony
@@ -1,12 +1,13 @@
 $$$
 COAT: yellow
-LICENSE: yes
-GROUP: stallion
 EYE: blue
-KIND: pegasus
+GROUP: stallion
 GROUP NAME: mane6-63
+KIND: pegasus
+LICENSE: yes
 MANE: pink
-NAME: butterscotch
+NAME: Butterscotch (on the first fanart)
+SOURCE: fanart
 WIDTH: 39
 HEIGHT: 25
 
diff --git a/extraponies/doctor.pony b/extraponies/doctor.pony
index 74c1bd57..1614ee31 100644
--- a/extraponies/doctor.pony
+++ b/extraponies/doctor.pony
@@ -1,15 +1,15 @@
 $$$
-APPEARANCE: s1e1m19s56
+APPEARANCE: S01E01 Friendship is Magic part 1
 COAT: brown
+DISPLAY: full, left
 EYE: blue
 FREE: no
 GROUP: stallion
 KIND: earth
 MANE: black
 MASTER: drhooves
-MEDIA: TV series
-NAME: time turner
-OTHER NAMES: dr hooves, doctor hooves
+NAME: Time Turner (official on the Traing cards)
+OTHER NAMES: Dr Hooves (official according to Welovefine), Doctor Hooves (long name)
 SOURCE: desktop ponies
 WIDTH: 42
 HEIGHT: 30
diff --git a/extraponies/doctornohat.pony b/extraponies/doctornohat.pony
index c91054a5..5b26800c 100644
--- a/extraponies/doctornohat.pony
+++ b/extraponies/doctornohat.pony
@@ -1,16 +1,15 @@
 $$$
-APPEARANCE: s1e1m19s56
-BASED ON: doctor
+APPEARANCE: S01E01 Friendship is Magic part 1
 COAT: brown
+DISPLAY: full, left
 EYE: blue
 FREE: no
 GROUP: stallion
 KIND: earth
 MANE: black
 MASTER: drhooves
-MEDIA: TV series
-NAME: time turner
-OTHER NAMES: dr hooves, doctor hooves
+NAME: Time Turner (official on the Traing cards)
+OTHER NAMES: Dr Hooves (official according to Welovefine), Doctor Hooves (long name)
 SOURCE: desktop ponies
 WIDTH: 43
 HEIGHT: 25
diff --git a/extraponies/drhooves1.pony b/extraponies/drhooves1.pony
index 9e1d6610..496ea6d9 100644
--- a/extraponies/drhooves1.pony
+++ b/extraponies/drhooves1.pony
@@ -1,12 +1,13 @@
 $$$
-FREE: yes
-COAT: gray
-GROUP: stallion
-MANE: white
-KIND: eath
-NAME: drhooves1
+COAT: grey
 EYE: brown
-OTHER NAMES: dr whooof, dr whooves
+FREE: yes
+GROUP: stallion
+KIND: earth
+MANE: grey
+NAME: Dr Hooves #1 (mentioned on the fanart)
+OTHER NAMES: Dr Whoof, Dr Whooves (Used on fanfics)
+SOURCE: fanart
 WIDTH: 37
 HEIGHT: 23
 
diff --git a/extraponies/drhooves10.pony b/extraponies/drhooves10.pony
index c521fbe7..c8399f23 100644
--- a/extraponies/drhooves10.pony
+++ b/extraponies/drhooves10.pony
@@ -1,12 +1,13 @@
 $$$
-MANE: black
-NAME: drhooves10
+COAT: brown
 EYE: blue
 FREE: no
-KIND: earth
 GROUP: stallion
-OTHER NAMES: dr hooves, dr whooves, dr whoof
-COAT: brown
+KIND: earth
+MANE: black
+NAME: Dr Hooves #10 (mentioned on the fanfic)
+OTHER NAMES: Dr Hooves (original model), Dr Whooves, Dr Whoof (used on fanfics)
+SOURCE: fanart
 WIDTH: 39
 HEIGHT: 24
 
diff --git a/ponies/orangebird.pony b/ponies/orangebird.pony
index 81ac10e1..b4435e6c 100644
--- a/ponies/orangebird.pony
+++ b/ponies/orangebird.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S3E3 So many Pinkies
+APPEARANCE: S03E03 So many Pinkies
 COAT: orange
 DISPLAY: full, left
 FREE: yes
diff --git a/ponies/orangefrog.pony b/ponies/orangefrog.pony
index 85cfdfa6..3888ecb2 100644
--- a/ponies/orangefrog.pony
+++ b/ponies/orangefrog.pony
@@ -1,5 +1,5 @@
 $$$
-APPEARANCE: S3E3 so many Pinkies
+APPEARANCE: S03E03 so many Pinkies
 COAT: orange
 DISPLAY: full, right
 FREE: yes