XMonadContrib plus ejt's latest changes