fix all except 7 ponies

Signed-off-by: Mattias Andrée <maandree@operamail.com>