Major changes to defconfig