Added Water_Orb and fixed config files