add a separate stage for custom images
add xstroke and match-keyboard
don't set FRAMEBUFFER env variable