Added machine-specific packages and modified xinit