Getting ready for Kethane deprecation
Tons of config changes