Move some X setup into separate scripts