Add better xrandr completion
Clean up