Update to use new shared code and mobile settings