Refine patch workflow

See how Paper does it - they do a lot of work with patches.