Move all button config into the kinds: {} map in the config