refs #455 - improve screen angular generation