Updated Framework/base & settings