continued adaption of templates

Signed-off-by: Mattias Andrée <maandree@operamail.com>
m template fixes + add alicorn seaponies

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