Fix sleep and xorg configs
Pulling upstream in after changes :D