Partially switched to 'use-package' and dropped 'shm'