patches: clean-up, use new apply system (kanged from Dazzozo)