Made the config file a lot more generic.

Just because it makes more sense to me :)