Merged latest changes with local changes
Added default configuration for XMonad