Fixed xinitrc and xmonad.hs after refactor