simplify sun-winter drawing; fix defs injection bug