[xmonad] Two xmonad-contrib patches