Changed DB props and added Theme