Update to new macros

Remove patches for l&f since upstream should be able to load custom
packages by now.