significant simplifications, no xmonad anymore...