diff --git a/ponies/nightmare.pony b/ponies/nightmare.pony
index ccf0cdc6..c23fe5b6 100644
--- a/ponies/nightmare.pony
+++ b/ponies/nightmare.pony
@@ -1,17 +1,19 @@
 $$$
-APPEARANCE: s2c2m4s43
-COAT: blue
+APPEARANCE: S01E02 Friendship is Magic part 1
+AURA: blue
+BALLOON: top
+COAT: black
+DISPLAY: full, right
 EYE: cyan
 FREE: no
-GROUP: mare
-GROUP NAME: royal, antagonist
+GROUP: mare, antagonist
 KIND: alicorn
-MANE: black
-MEDIA: TV series
-NAME: nightmare moon
-OTHER NAMES: lunija (russian), luna (harmionized)
+MANE: blue
+NAME: Nightmare Moon
+OTHER NAMES: Lunija (russian), Princess Luna (harmonized)
+POSE: stand
 SOURCE: desktop ponies
-WIDTH: 77
+WIDTH: 80
 HEIGHT: 40
 
 
diff --git a/ponies/noi.pony b/ponies/noi.pony
index a3449874..d18c0aea 100644
--- a/ponies/noi.pony
+++ b/ponies/noi.pony
@@ -1,13 +1,16 @@
 $$$
-APPEARANCE: s1c12m00s4
+APPEARANCE: S01E12 00:04
+BALLOON: top
 COAT: brown
+DISPLAY: full, right
 EYE: purple
 FREE: no
 GROUP: filly
 KIND: earth
 MANE: creme
-MEDIA: TV series
-NAME: noi
+NAME: (not mentioned)
+OTHER NAMES: Noi (unofficial)
+POSE: stand
 SOURCE: [jristz]
 WIDTH: 36
 HEIGHT: 21