Major cleanup of the configs, now easier on the eyes

Signed-off-by: Fernando Barillas <fbis251@gmail.com>