diff --git a/dev/colour-blacklist b/dev/colour-blacklist
new file mode 100644
index 00000000..e8e0bc8d
--- /dev/null
+++ b/dev/colour-blacklist
@@ -0,0 +1,18 @@
+creme		(ambiguous, consider beige or yellow)
+gray		(spell it grey instead)
+turquoise	(hard to spell, and cyan or teal is better)
+azure		(uncommmon, use blue instead)
+lilac		(purple is commonly thought to be the name of this colour)
+violet		(too similar to purple, use purple instead)
+indigo		(uncommon and ambiguous, use blue or purple)
+carnation	(uncommon, use pink)
+crimson		(too similar to red)
+olive		(uncommon, consider green or brown)
+silver		(ambiguous, consider white or grey)
+salmon		(uncommon and ambiguous, use orange or pink)
+coral		(uncommon and ambiguous, use orange or pink)
+blond		(too similar to yellow)
+cerise		(uncommon and ambiguous, use pink or red)
+jade		(uncommon, use green instread)
+magenta		(uncommon, consider pink)
+fushia		(uncommon, consider pink)
diff --git a/dev/colour-whitelist b/dev/colour-whitelist
new file mode 100644
index 00000000..1d20ac01
--- /dev/null
+++ b/dev/colour-whitelist
@@ -0,0 +1,16 @@
+closed	(for when the eyes are closed)
+cyan	(consider teal and blue)
+teal	(consider cyan)
+beige
+black	(consider grey)
+grey
+blue
+yellow
+purple
+pink
+orange
+green
+brown
+white
+pastel	(Celestia's mane colour)
+rainbow
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index c96d3cba..d7df93c7 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -643,10 +643,8 @@ not work on less POSIX compatible shells. It works by first getting a random pon
 use the extra information printed the file descriptor 3 (see @ref{Extra information}),
 and fetchs the file name with help of @command{grep} and @command{sed}. The file
 name is stored in a shell variable. It the pipes one an execute of ponysay into
-another executing, using the stored file anme in both executions.
-
-Is know that this comand ith the form that we show to you not work on 
-@shell{fish} as pressented here.
+another executing, using the stored file anme in both executions. This does not
+work on FISH shell because os POSIX incompatibility.
 
 Ponysay can use just about anything as a message because it quarantines the message's
 ANSI escape sequences, including colour. And is Unicode aware (including combining
@@ -936,7 +934,7 @@ The mane characters (also known as main characters [unponified] or protagonists)
 @item @code{wildlife}
 Wildlife, for example timberwolfs
 @item @code{pet}
-A ponies' pet, Spike does not count because Twilight does not play with him during
+A pony's pet, Spike does not count because Twilight does not play with him during
 pony–pet play dates.
 @item @code{villain}
 Villains, normally minons to antagonists. Applies to changelings.
@@ -966,10 +964,10 @@ Imaginary ponies (or other animal).
 @vindex @var{BALLOON}
 For each balloon in the file (a pony file can have more than one balloon, but
 that is not common) their should one tag entry. There are four values that
-can be used: top (the common setup, the balloon is at the top of the image),
-bottom (the balloon is at the bottom of the image), right (the balloon is neither
-at the top or at the bottom of the image, but is placed to the right of the pony)
-and inside (the balloon is somewhere as inside the image.)
+can be used: @code{top} (the common setup, the balloon is at the top of the image),
+@code{bottom} (the balloon is at the bottom of the image), @code{right} (the balloon
+is neither at the top or at the bottom of the image, but is placed to the right of
+the pony) and @code{inside} (the balloon is somewhere as inside the image.)
 
 @item LINK ON
 @vindex @var{LINK ON}
@@ -1012,7 +1010,8 @@ may describe a colour combination.
 @vindex @var{EYE}
 The name of the colour (as best estimated by you), in lowercase, that the pony's eyes
 have. Common colour names are preferable. Only one colour should be named, but the name
-may describe a colour combination.
+may describe a colour combination. If the eyes are closed in the picture, use
+@code{close} in addition the the actual eye colour, separated by a comma.
 
 @item AURA
 @vindex @var{AURA}
@@ -1132,7 +1131,7 @@ three times.
 `Officiallity tag' refers the an annotation added to a tag value's list element.
 If the value is unofficial the string @code{(unofficial)} is appended (preferable with
 leading whitespace) to the element. If it is official the appended string is of the
-format @code{(unofficial, %c)} (the brackets are verbatim), where @code{%c} is a
+format @code{(official, %c)} (the brackets are verbatim), where @code{%c} is a
 comment. For example Chrysalis' name has not been mentioned in the show, however it
 is used in the manuscript, therefore a pony file with Chrysalis should have the
 (partial) metadata:
@@ -2959,12 +2958,15 @@ Pony metadata options added: @option{--info}, @option{++info} and @option{--rest
 @item
 @file{fillycelestia} and @file{filliestia} has been moved to @file{extraponies}.
 @item
-Ponies renamed
 @file{shadowbolts} has been renamed to @file{nightingale} (shadowbolts split)
-@file{lily} has been renamed to @fike{lilyvalley} (official name)
+@item
+@file{lily} has been renamed to @file{lilyvalley} (official name)
+@item
 @file{sweatiesing} has been renamed to @file{sweetising} (name consistency)
+@item
 @file{carecake} has renamed into @file{carrotcake} (official full name)
-@file{peppermoon} has renamed to @file{pepermoon} (miswriting)
+@item
+@file{peppermoon} has renamed to @file{pepermoon} (typo)
 @item
 Pony symlink added:
 @itemize @bullet
@@ -2972,6 +2974,7 @@ Pony symlink added:
 @item @file{swaetiedrops} @arrow{} @file{bonbon}
 @item @file{carecake} @arrow{} @file{carrotake}
 @end itemize
+@end itemize
 
 
 @heading Version 2.9.1
@@ -3576,7 +3579,6 @@ The freedom to distribute copies of your modified versions to others (freedom 3)
 By doing this you can give the whole community a chance to benefit from your
 changes. Access to the source code is a precondition for this.
 @end itemize
-
 @*
 
 @cartouche
diff --git a/ponies/ace.pony b/ponies/ace.pony
index 27bd696c..b23fa539 100644
--- a/ponies/ace.pony
+++ b/ponies/ace.pony
@@ -1,13 +1,15 @@
 $$$
-APPEARANCE: s1c12m7s25
-COAT: creme
-EYE: cyan
+APPEARANCE: S01E12 Call of the Cutie
+BALLOON: top
+COAT: beige
+EYE: teal
 FREE: no
-GROUP: stallion
+GROUP: stallion, background, voice
 KIND: earth
+LINK: regular
 MANE: black
-MEDIA: TV series
-NAME: ace
+NAME: (not mentioned)
+OTHER NAMES: ace (unofficial)
 SOURCE: [jristz]
 WIDTH: 48
 HEIGHT: 27
diff --git a/ponies/airheart.pony b/ponies/airheart.pony
index 39efe107..4ed59cdf 100644
--- a/ponies/airheart.pony
+++ b/ponies/airheart.pony
@@ -1,15 +1,18 @@
 $$$
-APPEARANCE: s1c6m3s55
+APPEARANCE: S01E06 Boast Busters
+BALLOON: top
 COAT: pink
-EYE: cyan
+DISPLAY: full, front
+EYE: cyan, closed
 FREE: no
-GROUP: mare
+GROUP: mare, background
 KIND: pegasus
+LINK: regular
 MANE: brown
-MEDIA: TV series
-NAME: airheart
+NAME: (not mentioned)
+OTHER NAMES: airheart (unofficial)
 SOURCE: [jristz]
-WIDTH: 26
+WIDTH: 24
 HEIGHT: 26
 
 
diff --git a/ponies/allie.pony b/ponies/allie.pony
index 55f31731..988da3ae 100644
--- a/ponies/allie.pony
+++ b/ponies/allie.pony
@@ -1,13 +1,16 @@
 $$$
-APPEARANCE: s2c6m00s50
+APPEARANCE: S02E06 The Cutie Pox
+BALLOON: top
 COAT: yellow
-EYE: bue
+DISPLAY: full, right
+EYE: blue
 FREE: no
-GROUP: mare
+GROUP: mare, background
 KIND: unicorn
-MANE: blue, light blue
-MEDIA: TV series
-NAME: allie
+LINK: regular
+MANE: blue
+NAME: (not mentioned)
+OTHER NAMES: allie (unofficial), allie way (unofficial)
 SOURCE: desktop ponies
 WIDTH: 49
 HEIGHT: 29
diff --git a/ponies/aloe.pony b/ponies/aloe.pony
index 76799939..2b87faf4 100644
--- a/ponies/aloe.pony
+++ b/ponies/aloe.pony
@@ -1,14 +1,16 @@
 $$$
-APPEARANCE: s2c20m00s33
+APPEARANCE: S01E20 Green isn't Your Color
+BALLOON: top
 COAT: pink
-EYE: sblue
+DISPLAY: full, left
+EYE: purple
 FREE: no
-GROUP: mare
-GROUP NAME: spa
+GROUP: mare, background
 KIND: earth
-MANE: clue
-MEDIA: TV series
-NAME: aloe
+LINK: regular
+MANE: blue
+NAME: (not mentioned)
+OTHER NAMES: aloe (unofficial)
 SOURCE: desktop ponies
 WIDTH: 39
 HEIGHT: 25
diff --git a/ponies/angel.pony b/ponies/angel.pony
index be8a680c..48d80874 100644
--- a/ponies/angel.pony
+++ b/ponies/angel.pony
@@ -1,12 +1,15 @@
 $$$
-APPEARANCE: s1
+APPEARANCE: S01E03 The Ticket Master
+BALLOON: top
 COAT: white
+DISPLAY: full, left
 EYE: black
 FREE: no
-GROUP NAME: pet
+GROUP: pet, rabbit
 KIND: animal
-MEDIA: TV series
+LINK: regular
 NAME: angel
+OTHER NAMES: angel bunny (official, used by Fluttershy sometimes)
 SOURCE: desktop ponies
 WIDTH: 25
 HEIGHT: 19
diff --git a/ponies/applebloom.pony b/ponies/applebloom.pony
index cae315f9..31060f51 100644
--- a/ponies/applebloom.pony
+++ b/ponies/applebloom.pony
@@ -1,15 +1,15 @@
 $$$
-APPEARANCE: s1c1m8s39
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+BALLOON: top
 COAT: yellow
+DISPLAY: full, left
 EYE: brown
 FREE: no
-GROUP: filly
-GROUP NAME: deuteragonist, cutie mark crusader, apple family
+GROUP: filly, deuteragonist
 KIND: earth
+LINK: regular
 MANE: red
-MEDIA: TV series
-NAME: applebloom
-OTHER NAMES: bloom
+NAME: apple bloom
 SOURCE: desktop ponies
 WIDTH: 41
 HEIGHT: 21
diff --git a/ponies/applebloomdance.pony b/ponies/applebloomdance.pony
index 399b4fbf..56129c00 100644
--- a/ponies/applebloomdance.pony
+++ b/ponies/applebloomdance.pony
@@ -1,16 +1,17 @@
 $$$
-APPEARANCE: s1c1m8s39
-BASED ON: applebloom
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+BALLOON: top
 COAT: yellow
+DISPLAY: full, left
 EYE: brown
 FREE: no
-GROUP: filly
-GROUP NAME: deuteragonist, cutie mark crusader, apple family
+GROUP: filly, deuteragonist
 KIND: earth
+LINK: regular
 MANE: red
-MEDIA: TV series
-NAME: applebloom
-OTHER NAMES: bloom
+MASTER: applebloom
+NAME: apple bloom
+POSE: dance
 SOURCE: desktop ponies
 WIDTH: 34
 HEIGHT: 24
diff --git a/ponies/applebumpkin.pony b/ponies/applebumpkin.pony
index a652e3e0..857f099a 100644
--- a/ponies/applebumpkin.pony
+++ b/ponies/applebumpkin.pony
@@ -1,13 +1,14 @@
 $$$
-APPEARANCE: s1c1m8s23
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+BALLOON: top
 COAT: yellow
-EYE: brown
+DISPLAY: full, left
+EYE: brown, closed
 FREE: no
-GROUP: filly
-GROUP NAME: apple family
+GROUP: mare, background
 KIND: earth
+LINK: regular
 MANE: pink
-MEDIA: TV series
 NAME: apple bumpkin
 SOURCE: desktop ponies
 WIDTH: 47
diff --git a/ponies/applecore.pony b/ponies/applecore.pony
index 8a4db748..3821200d 100644
--- a/ponies/applecore.pony
+++ b/ponies/applecore.pony
@@ -1,14 +1,16 @@
 $$$
-APPEARANCE: s1c1m19s35
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+BALLOON: top
 COAT: pink
+DISPLAY: full, right
 EYE: cyan
 FREE: no
-GROUP: filly
+GROUP: filly, background
 KIND: earth
+LINK: regular
 MANE: pink
-MEDIA: TV series
-NAME: apple core
-OTHER NAMES: piña colada, pina colada (merged on mlp wikia)
+NAME: (not mentioned)
+OTHER NAMES: apple core (unofficial), piña colada (unofficial, merged in wiki), pina colada (ASCII)
 SOURCE: [jristz]
 WIDTH: 33
 HEIGHT: 21
diff --git a/ponies/applefritter.pony b/ponies/applefritter.pony
index 1963dc44..ceb8c808 100644
--- a/ponies/applefritter.pony
+++ b/ponies/applefritter.pony
@@ -1,14 +1,15 @@
 $$$
-APPEARANCE: s1c1m8s23
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+BALLOON: top
 COAT: yellow
 EYE: green
 FREE: no
-GROUP: filly
-GROUP NAME: apple family
+GROUP: filly, background
 KIND: earth
+LINK: regular
 MANE: green
-MEDIA: TV series
 NAME: apple fritter
+POSE: full, left
 SOURCE: desktop ponies
 WIDTH: 40
 HEIGHT: 25
diff --git a/ponies/applejack.pony b/ponies/applejack.pony
index 95cda370..d5e0f2e5 100644
--- a/ponies/applejack.pony
+++ b/ponies/applejack.pony
@@ -1,15 +1,15 @@
 $$$
-APPEARANCE: s1c1m7s30
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+BALLOON: top
 COAT: brown
 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
+POSE: full, left
 SOURCE: desktop ponies
 WIDTH: 52
 HEIGHT: 27
diff --git a/ponies/applejackscarecrow.pony b/ponies/applejackscarecrow.pony
index ebb616b9..e86601df 100644
--- a/ponies/applejackscarecrow.pony
+++ b/ponies/applejackscarecrow.pony
@@ -1,18 +1,19 @@
 $$$
-APPEARANCE: s1c1m7s30
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+BALLOON: top
 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
+POSE: scarecrow
 SOURCE: desktop ponies
-WIDTH: 52
-HEIGHT: 27
+WIDTH: 47
+HEIGHT: 33
 
 
 $$$
diff --git a/ponies/archer.pony b/ponies/archer.pony
index b25fe4a7..2d0244d2 100644
--- a/ponies/archer.pony
+++ b/ponies/archer.pony
@@ -1,13 +1,16 @@
 $$$
-APPEARANCE: s1c12m00s12
+APPEARANCE: S01E12 Call of the Cutie
+BALLOON: top
 COAT: blue
-EYE: gray
+DISPLAY: full, right
+EYE: grey
 FREE: no
-GROUP: filly
+GROUP: filly, background
 KIND: earth
+LINK: regular
 MANE: blue
-MEDIA: TV series
-NAME: archer
+NAME: (not mentioned)
+OTHER NAMES: archer (unofficial)
 SOURCE: desktop ponies
 WIDTH: 46
 HEIGHT: 21
diff --git a/ponies/pinacolada.pony b/ponies/pinacolada.pony
index 1e0321be..674c31df 100644
--- a/ponies/pinacolada.pony
+++ b/ponies/pinacolada.pony
@@ -7,8 +7,8 @@ GROUP: filly
 KIND: earth
 MANE: pink
 MEDIA: TV series
-NAME: piña colada
-OTHER NAMES: apple core (merged from in mlp wikia),pina colada
+NAME: (not mentioned)
+OTHER NAMES: piña colada, apple core (merged in wiki), pina colada (ASCII)
 SOURCE: [jristz]
 WIDTH: 35
 HEIGHT: 22
diff --git a/ponies/sparkler.pony b/ponies/sparkler.pony
index 22499fae..f7397371 100644
--- a/ponies/sparkler.pony
+++ b/ponies/sparkler.pony
@@ -1,14 +1,17 @@
 $$$
-APPEARANCE: s1c1m2s43
+APPEARANCE: S01E01 Friendship is Magic [Part 1]
+AURA: purple
+BALLOON: top
 COAT: pink
+DISPLAY: full, right
 EYE: purple
 FREE: no
-GROUP: mare
+GROUP: mare, background, voiced
 KIND: unicorn
+LINK: regular
 MANE: purple
-MEDIA: TV series
-NAME: amethyst star
-OTHER NAMES: sparkler
+NAME: (not mentioned)
+OTHER NAMES: amethyst star (official, in merchandise), sparkler (unofficial)
 SOURCE: desktop ponies
 WIDTH: 42
 HEIGHT: 25
diff --git a/ponysay-tool.py b/ponysay-tool.py
index 08c3663b..dee7e720 100755
--- a/ponysay-tool.py
+++ b/ponysay-tool.py
@@ -741,7 +741,7 @@ class PonysayTool():
         standardfields = ['GROUP NAME', 'NAME', 'OTHER NAMES', 'APPEARANCE', 'KIND',
                           'GROUP', 'BALLOON', 'LINK', 'LINK ON', 'COAT', 'MANE', 'EYE',
                           'AURA', 'DISPLAY', 'BALLOON TOP', 'BALLOON BOTTOM', 'MASTER',
-                          'EXTRA', 'BASED ON', 'SOURCE', 'MEDIA', 'LICENSE', 'FREE',
+                          'POSE', 'BASED ON', 'SOURCE', 'MEDIA', 'LICENSE', 'FREE',
                           'comment']
         for standard in standardfields:
             if standard in fields:
diff --git a/ponysay.pdf b/ponysay.pdf
index b57a6bf2..b48ce2c0 100644
Binary files a/ponysay.pdf and b/ponysay.pdf differ