#121 Prepared retina / non-retina support