make archlinux definitions more similar, preparing for merge