Added in all apps correctly to setup and settings