Kconfig and Custom Config updates