Upgraded app-kit