Add app specific settings back in, update app references