Xmonad + minor changes