Hoes and Swords have been added along with configuration file cleanup