refactor xorg