sync with hikari defconfig
Merge pull request #6 from MrGezz/evolve-1.19

sync with hikari defconfig