Rework Defconfig