Add xquartz, move totalterminal to end