Updated settings and include files