moved define
changed font handling