sync with hikari defconfig
Merge pull request #1 from MrGezz/evolve-1.15

sync with hikari defconfig
Fix Overclocking
Merge pull request #2 from abcdjdj/evolve-1.15

Fix Overclocking
Merge branch 'evolve-1.15' of https://github.com/deedwar/evolve into evolve-1.15