Switch to new patch syntax
screen: use new patch syntax, fix deps