diff --git a/.gitattributes b/.gitattributes
index 412eeda78d..dfe0770424 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,22 +1,2 @@
 # Auto detect text files and perform LF normalization
 * text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
diff --git a/.travis.yml b/.travis.yml
index c8c468a417..07914721a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 6.9.2
+  - node
 
 sudo: false
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 3b48e78746..0000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1 +0,0 @@
-Please see the [contribution guide](http://definitelytyped.org/guides/contributing.html) at [definitelytyped.org](http://definitelytyped.org/guides/contributing.html) for information on how to contribute to DefinitelyTyped.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
deleted file mode 100644
index c3218efb0a..0000000000
--- a/CONTRIBUTORS.md
+++ /dev/null
@@ -1,1893 +0,0 @@
-# Contributors
-
-This document generated by [dt-contributors-generator](https://github.com/vvakame/dt-contributors-generator).
-(but run scripts are manual operation. please wait :P)
-* [:link:](abs/abs.d.ts) [abs](https://github.com/IonicaBizau/node-abs) by [Aya Morisawa](https://github.com/AyaMorisawa)
-* [:link:](absolute/absolute.d.ts) [absolute](https://github.com/bahamas10/node-absolute) by [Aya Morisawa](https://github.com/AyaMorisawa)
-* [:link:](acc-wizard/acc-wizard.d.ts) [acc-wizard](https://github.com/sathomas/acc-wizard) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](accounting/accounting.d.ts) [accounting.js](http://josscrowcroft.github.io/accounting.js) by [Sergey Gerasimov](https://github.com/gerich-home)
-* [:link:](ace/ace.d.ts) [Ace Ajax.org Cloud9 Editor](http://ace.ajax.org) by [Diullei Gomes](https://github.com/Diullei)
-* [:link:](acorn/acorn.d.ts) [Acorn](https://github.com/marijnh/acorn) by [RReverser](https://github.com/RReverser)
-* [:link:](rails-actioncable/rails-actioncable.d.ts) [ActionCable](https://github.com/rails/rails/tree/master/actioncable) by [Vincent Zhu](https://github.com/zhu1230)
-* [:link:](cordova-plugin-ms-adal/cordova-plugin-ms-adal.d.ts) [Active Directory Authentication Library plugin for Apache Cordova](https://github.com/AzureAD/azure-activedirectory-library-for-cordova) by [Kai Walter](https://github.com/KaiWalter)
-* [:link:](adal-angular/adal-angular.d.ts) [ADAL.JS](https://github.com/AzureAD/azure-activedirectory-library-for-js) by [mmaitre314](https://github.com/mmaitre314)
-* [:link:](adal-angular/adal.d.ts) [ADAL.JS](https://github.com/AzureAD/azure-activedirectory-library-for-js) by [mmaitre314](https://github.com/mmaitre314)
-* [:link:](add2home/add2home.d.ts) [add2home](http://cubiq.org/add-to-home-screen) by [James Wilkins](http://www.codeplex.com/site/users/view/jamesnw)
-* [:link:](adm-zip/adm-zip.d.ts) [adm-zip](https://github.com/cthackers/adm-zip) by [John Vilk](https://github.com/jvilk), [Abner Oliveira](https://github.com/abner)
-* [:link:](ag-grid/ag-grid.d.ts) [ag-grid](http://www.ag-grid.com) by [Niall Crosby](https://github.com/ceolter)
-* [:link:](agenda/agenda.d.ts) [Agenda](https://github.com/rschmukler/agenda) by [Meir Gottlieb](https://github.com/meirgottlieb)
-* [:link:](alertify/alertify.d.ts) [alertify](http://fabien-d.github.io/alertify.js) by [John Jeffery](http://github.com/jjeffery)
-* [:link:](alt/alt.d.ts) [Alt](https://github.com/goatslacker/alt) by [Michael Shearer](https://github.com/Shearerbeard)
-* [:link:](amazon-product-api/amazon-product-api.d.ts) [amazon-product-api](https://github.com/t3chnoboy/amazon-product-api) by [Matti Lehtinen](https://github.com/MattiLehtinen)
-* [:link:](amcharts/AmCharts.d.ts) [amCharts](http://www.amcharts.com) by [aleksey-bykov](https://github.com/aleksey-bykov)
-* [:link:](amplifyjs/amplifyjs.d.ts) [AmplifyJs](http://amplifyjs.com) by [Jonas Eriksson](https://github.com/joeriks)
-* [:link:](amplify-deferred/amplify-deferred.d.ts) [AmplifyJs 1.1.0 using JQuery Deferred](http://amplifyjs.com) by [Jonas Eriksson](https://github.com/joeriks), [Laurentiu Stamate](https://github.com/laurentiustamate94)
-* [:link:](amqp-rpc/amqp-rpc.d.ts) [amqp-rpc](https://github.com/demchenkoe/node-amqp-rpc) by [Wonshik Kim](https://github.com/wokim)
-* [:link:](amqplib/amqplib.d.ts) [amqplib 0.3.x](https://github.com/squaremo/amqp.node) by [Michael Nahkies](https://github.com/mnahkies), [Ab Reitsma](https://github.com/abreits)
-* [:link:](angular-dialog-service/angular-dialog-service.d.ts) [Angular Dialog Service](https://github.com/m-e-conroy/angular-dialog-service) by [William Comartin](https://github.com/wcomartin)
-* [:link:](ng-file-upload/ng-file-upload.d.ts) [Angular File Upload](https://github.com/danialfarid/ng-file-upload) by [John Reilly](https://github.com/johnnyreilly)
-* [:link:](angular-file-upload/angular-file-upload.d.ts) [Angular File Upload](https://github.com/danialfarid/ng-file-upload) by [John Reilly](https://github.com/johnnyreilly)
-* [:link:](angular-growl-v2/angular-growl-v2.d.ts) [Angular Growl 2 v.0.7.5](http://janstevens.github.io/angular-growl-2) by [Tadeusz Hucal](https://github.com/mkp05)
-* [:link:](angularjs/angular.d.ts) [Angular JS](http://angularjs.org) by [Diego Vilar](http://github.com/diegovilar)
-* [:link:](angularjs/angular-animate.d.ts) [Angular JS (ngAnimate module)](http://angularjs.org) by [Michel Salib](https://github.com/michelsalib), [Adi Dahiya](https://github.com/adidahiya), [Raphael Schweizer](https://github.com/rasch), [Cody Schaaf](https://github.com/codyschaaf)
-* [:link:](angularjs/angular-cookies.d.ts) [Angular JS (ngCookies module)](http://angularjs.org) by [Diego Vilar](http://github.com/diegovilar), [Anthony Ciccarello](http://github.com/aciccarello)
-* [:link:](angularjs/angular-mocks.d.ts) [Angular JS (ngMock, ngMockE2E module)](http://angularjs.org) by [Diego Vilar](http://github.com/diegovilar), [Tony Curtis](http://github.com/daltin)
-* [:link:](angularjs/angular-resource.d.ts) [Angular JS (ngResource module)](http://angularjs.org) by [Diego Vilar](http://github.com/diegovilar), [Michael Jess](http://github.com/miffels)
-* [:link:](angularjs/angular-route.d.ts) [Angular JS (ngRoute module)](http://angularjs.org) by [Jonathan Park](https://github.com/park9140)
-* [:link:](angularjs/angular-sanitize.d.ts) [Angular JS (ngSanitize module)](http://angularjs.org) by [Diego Vilar](http://github.com/diegovilar)
-* [:link:](angular-ui-router/angular-ui-router.d.ts) [Angular JS (ui.router module)](https://github.com/angular-ui/ui-router) by [Michel Salib](https://github.com/michelsalib)
-* [:link:](angular-ui-scroll/angular-ui-scroll.d.ts) [Angular JS (ui.scroll module)](https://github.com/angular-ui/ui-scroll) by [Mark Nadig](https://github.com/marknadig)
-* [:link:](angularjs/angular-component-router.d.ts) [Angular JS 1.5 component router](http://angularjs.org) by [David Reher](http://github.com/davidreher)
-* [:link:](angular-meteor/angular-meteor.d.ts) [Angular JS Meteor (angular.meteor module)](https://github.com/Urigo/angular-meteor) by [Peter Grman](https://github.com/pgrm)
-* [:link:](angular-locker/angular-locker.d.ts) [Angular Locker](https://github.com/tymondesigns/angular-locker) by [Niko Kovačič](https://github.com/nkovacic)
-* [:link:](angular-media-queries/match-media.d.ts) [Angular matchMedia (angular.matchMedia module)](https://github.com/jacopotarantino/angular-match-media) by [Joao Monteiro](https://github.com/jpmnteiro)
-* [:link:](angular-material/angular-material.d.ts) [Angular Material (angular.material module)](https://github.com/angular/material) by [Matt Traynham](https://github.com/mtraynham)
-* [:link:](angular-protractor/angular-protractor.d.ts) [Angular Protractor](https://github.com/angular/protractor) by [Bill Armstrong](https://github.com/BillArmstrong)
-* [:link:](angular-scenario/angular-scenario.d.ts) [Angular Scenario Testing (ngScenario module)](http://angularjs.org) by [RomanoLindano](https://github.com/RomanoLindano)
-* [:link:](angular-toastr/angular-toastr.d.ts) [Angular Toastr](https://github.com/Foxandxss/angular-toastr) by [Niko Kovačič](https://github.com/nkovacic)
-* [:link:](angular-toasty/angular-toasty.d.ts) [Angular Toasty](https://github.com/invertase/angular-toasty) by [Dominik Muench](https://github.com/muenchdo)
-* [:link:](angular-touchspin/angular-touchspin.d.ts) [Angular Touchspin](https://github.com/nkovacic/angular-touchspin) by [Niko Kovačič](https://github.com/nkovacic)
-* [:link:](angular-translate/angular-translate.d.ts) [Angular Translate (pascalprecht.translate module)](https://github.com/PascalPrecht/angular-translate) by [Michel Salib](https://github.com/michelsalib)
-* [:link:](angular-ui-bootstrap/angular-ui-bootstrap.d.ts) [Angular UI Bootstrap](https://github.com/angular-ui/bootstrap) by [Brian Surowiec](https://github.com/xt0rted)
-* [:link:](angular-wizard/angular-wizard.d.ts) [Angular Wizard](https://github.com/mgonto/angular-wizard) by [Marko Jurisic](https://github.com/mjurisic), [Ronald Wildenberg](https://github.com/rwwilden)
-* [:link:](angular-bootstrap-calendar/angular-bootstrap-calendar.d.ts) [angular-bootstrap-calendar](https://github.com/mattlewis92/angular-bootstrap-calendar) by [Egor Komarov](https://github.com/Odrin)
-* [:link:](angular-bootstrap-lightbox/angular-bootstrap-lightbox.d.ts) [angular-bootstrap-lightbox](https://github.com/compact/angular-bootstrap-lightbox) by [Roland Zwaga](https://github.com/rolandzwaga)
-* [:link:](angular-breadcrumb/angular-breadcrumb.d.ts) [angular-breadcrumb](https://github.com/ncuillery/angular-breadcrumb) by [Marc Talary](https://github.com/marctalary)
-* [:link:](angular-cookie/angular-cookie.d.ts) [angular-cookie](https://github.com/ivpusic/angular-cookie) by [Borislav Zhivkov](https://github.com/borislavjivkov)
-* [:link:](angular-dynamic-locale/angular-dynamic-locale.d.ts) [angular-dynamic-locale](https://github.com/lgalfaso/angular-dynamic-locale) by [Stephen Lautier](https://github.com/stephenlautier)
-* [:link:](angular-environment/angular-environment.d.ts) [angular-environment](https://github.com/juanpablob/angular-environment) by [Matt Wheatley](https://github.com/terrawheat)
-* [:link:](angular-formly/angular-formly.d.ts) [angular-formly](https://github.com/formly-js/angular-formly) by [Scott Hatcher](https://github.com/scatcher)
-* [:link:](angular-gettext/angular-gettext.d.ts) [angular-gettext](https://angular-gettext.rocketeer.be) by [Ákos Lukács](https://github.com/AkosLukacs)
-* [:link:](angular-google-analytics/angular-google-analytics.d.ts) [angular-google-analytics](https://github.com/revolunet/angular-google-analytics) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](angular-google-analytics/angular-google-analytics-service.d.ts) [angular-google-analytics](https://github.com/revolunet/angular-google-analytics) by [Matt Wheatley](https://github.com/terrawheat)
-* [:link:](angular-hotkeys/angular-hotkeys.d.ts) [angular-hotkeys](https://github.com/chieffancypants/angular-hotkeys) by [Jason Zhao](https://github.com/jlz27), [Stefan Steinhart](https://github.com/reppners)
-* [:link:](angular-http-auth/angular-http-auth.d.ts) [angular-http-auth](https://github.com/witoldsz/angular-http-auth) by [vvakame](https://github.com/vvakame)
-* [:link:](angular-httpi/angular-httpi.d.ts) [angular-httpi](https://github.com/bennadel/httpi) by [Andrew Camilleri](https://github.com/Kukks)
-* [:link:](angular-jwt/angular-jwt.d.ts) [angular-jwt](https://github.com/auth0/angular-jwt) by [Reto Rezzonico](https://github.com/rerezz)
-* [:link:](angular-load/angular-load.d.ts) [angular-load](https://github.com/urish/angular-load) by [david-gang](https://github.com/david-gang)
-* [:link:](angular-loading-bar/angular-loading-bar.d.ts) [angular-loading-bar](https://github.com/chieffancypants/angular-loading-bar) by [Stephen Lautier](https://github.com/stephenlautier)
-* [:link:](angular-local-storage/angular-local-storage.d.ts) [angular-local-storage](https://github.com/grevory/angular-local-storage) by [Ken Fukuyama](https://github.com/kenfdev)
-* [:link:](angular-localForage/angular-localForage.d.ts) [angular-localForage](https://github.com/ocombe/angular-localForage) by [Stefan Steinhart](https://github.com/reppners)
-* [:link:](angular-modal/angular-modal.d.ts) [angular-modal](https://github.com/btford/angular-modal) by [Paul Lessing](https://github.com/paullessing)
-* [:link:](angular-notifications/angular-notifications.d.ts) [angular-notifications](https://github.com/DerekRies/angular-notifications) by [Tomasz Ducin](https://github.com/ducin/DefinitelyTyped)
-* [:link:](angular-notify/angular-notify.d.ts) [angular-notify](https://github.com/cgross/angular-notify) by [Suwato](https://github.com/Suwato/DefinitelyTyped)
-* [:link:](angular-permission/angular-permission.d.ts) [angular-permission](https://github.com/Narzerus/angular-permission) by [Voislav Mishevski](https://github.com/vmishevski)
-* [:link:](angular-scroll/angular-scroll.d.ts) [angular-scroll](https://github.com/oblador/angular-scroll) by [Sam Herrmann](https://github.com/samherrmann)
-* [:link:](angular-signalr-hub/angular-signalr-hub.d.ts) [angular-signalr-hub](https://github.com/JustMaier/angular-signalr-hub) by [Adam Santaniello](https://github.com/AdamSantaniello)
-* [:link:](angular-spinner/angular-spinner.d.ts) [angular-spinner.js](https://github.com/urish/angular-spinner) by [Marcin Biegała](https://github.com/Biegal)
-* [:link:](angular-storage/angular-storage.d.ts) [angular-storage](https://github.com/auth0/angular-storage) by [Matthew DeKrey](https://github.com/mdekrey)
-* [:link:](angular-strap/angular-strap.d.ts) [angular-strap v2.2.x](http://mgcrea.github.io/angular-strap) by [Sam Herrmann](https://github.com/samherrmann)
-* [:link:](angular-ui-tree/angular-ui-tree.d.ts) [angular-ui-tree](https://github.com/angular-ui-tree/angular-ui-tree) by [Calvin Fernandez](https://github.com/CalvinFernandez)
-* [:link:](angular.throttle/angular.throttle.d.ts) [angular.throttle](https://github.com/BaggersIO/angular.throttle) by [Stefan Steinhart](https://github.com/reppners)
-* [:link:](angular-ui-sortable/angular-ui-sortable.d.ts) [angular.ui.sortable module](https://github.com/angular-ui/ui-sortable) by [Thodoris Greasidis](https://github.com/thgreasi)
-* [:link:](angular-agility/angular-agility.d.ts) [AngularAgility](https://github.com/AngularAgility/AngularAgility) by [Roland Zwaga](https://github.com/rolandzwaga)
-* [:link:](angularfire/angularfire.d.ts) [AngularFire](http://angularfire.com) by [Dénes Harmath](http://github.com/thSoft)
-* [:link:](rx-angular/rx.angular.d.ts) [angularjs extensions to rxjs](http://reactivex.io) by [Mick Delaney](https://github.com/mickdelaney)
-* [:link:](angular-fullscreen/angular-fullscreen.d.ts) [AngularJS HTML5 Fullscreen](https://github.com/fabiobiondi/angular-fullscreen) by [Julien Paroche](https://github.com/julienpa)
-* [:link:](angularjs-toaster/angularjs-toaster.d.ts) [angularjs-toaster](https://github.com/jirikavi/AngularJS-Toaster) by [Ben Tesser](https://github.com/btesser)
-* [:link:](angularLocalStorage/angularLocalStorage.d.ts) [AngularLocalStorage](https://github.com/agrublev/angularLocalStorage) by [Horiuchi_H](https://github.com/horiuchi)
-* [:link:](angulartics/angulartics.d.ts) [Angulartics](http://luisfarzati.github.io/angulartics) by [Steven Fan](https://github.com/stevenfan)
-* [:link:](animation-frame/animation-frame.d.ts) [animation-frame](https://github.com/kof/animation-frame) by [Qinfeng Chen](https://github.com/qinfchen)
-* [:link:](ansi-styles/ansi-styles.d.ts) [ansi-styles](https://github.com/sindresorhus/ansi-styles) by [bryn austin bellomy](https://github.com/brynbellomy)
-* [:link:](ansicolors/ansicolors.d.ts) [ansicolors](https://github.com/thlorenz/ansicolors) by [rogierschouten](https://github.com/rogierschouten)
-* [:link:](antd/antd.d.ts) [Antd](http://ant.design) by [bang88](https://github.com/bang88), [Bruce Mitchener](https://github.com/waywardmonkeys)
-* [:link:](any-db/any-db.d.ts) [any-db](https://github.com/grncdr/node-any-db) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](any-db-transaction/any-db-transaction.d.ts) [any-db-transaction](https://github.com/grncdr/node-any-db-transaction) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](anydb-sql/anydb-sql.d.ts) [anydb-sql](https://github.com/doxout/anydb-sql) by [Gorgi Kosev](https://github.com/spion)
-* [:link:](anydb-sql-migrations/anydb-sql-migrations.d.ts) [anydb-sql-migrations](https://github.com/spion/anydb-sql-migrations) by [Gorgi Kosev](https://github.com/spion)
-* [:link:](cordova-plugin-background-mode/cordova-plugin-background-mode.d.ts) [Apache Background Mode plugin](https://github.com/katzer/cordova-plugin-background-mode) by [Paul Thiel](https://github.com/Lordnoname)
-* [:link:](cordova/cordova.d.ts) [Apache Cordova](http://cordova.apache.org) by [Microsoft Open Technologies Inc.](http://msopentech.com)
-* [:link:](cordova-plugin-email-composer/cordova-plugin-email-composer.d.ts) [Apache Cordova Email Composer plugin](https://github.com/katzer/cordova-plugin-email-composer) by [Dave Taylor](http://davetayls.me)
-* [:link:](api-error-handler/api-error-handler.d.ts) [api-error-handler](https://github.com/expressjs/api-error-handler) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](appframework/appframework.d.ts) [AppFramework](http://app-framework-software.intel.com) by [kyo_ago](https://github.com/kyo-ago)
-* [:link:](appletvjs/appletvjs.d.ts) [AppleTVJS](https://developer.apple.com/library/prerelease/tvos/documentation/TVMLJS/Reference/TVJSFrameworkReference/index.html) by [Adam Valverde](https://github.com/brainded)
-* [:link:](applicationinsights/applicationinsights.d.ts) [Application Insights](https://github.com/Microsoft/ApplicationInsights-node.js) by [Scott Southwood](https://github.com/scsouthw)
-* [:link:](arbiter/Arbiter.d.ts) [Arbiter.js](http://arbiterjs.com) by [Arash Shakery](https://github.com/arash16)
-* [:link:](arcgis-js-api/arcgis-js-api.d.ts) [ArcGIS API for JavaScript](http://js.arcgis.com) by [Esri](http://www.esri.com)
-* [:link:](archiver/archiver.d.ts) [archiver](https://github.com/archiverjs/node-archiver) by [Esri](https://github.com/archiverjs/node-archiver)
-* [:link:](archy/archy.d.ts) [archy](https://github.com/substack/node-archy) by [vvakame](https://github.com/vvakame)
-* [:link:](argparse/argparse.d.ts) [argparse](https://github.com/nodeca/argparse) by [Andrew Schurman](http://github.com/arcticwaters)
-* [:link:](asciify/asciify.d.ts) [asciify](https://www.npmjs.org/package/asciify) by [Alan Norbauer](http://alan.norbauer.com)
-* [:link:](aspnet-identity-pw/aspnet-identity-pw.d.ts) [aspnet-identity-pw](https://github.com/Syncbak-Git/aspnet-identity-pw) by [jt000](https://github.com/jt000)
-* [:link:](assert/assert.d.ts) [assert and power-assert](https://github.com/Jxck/assert) by [vvakame](https://github.com/vvakame)
-* [:link:](assertion-error/assertion-error.d.ts) [assertion-error](https://github.com/chaijs/assertion-error) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](assertsharp/assertsharp.d.ts) [assertsharp](https://www.npmjs.com/package/assertsharp) by [Bruno Leonardo Michels](https://github.com/brunolm)
-* [:link:](async/async.d.ts) [Async](https://github.com/caolan/async) by [Boris Yankov](https://github.com/borisyankov), [Arseniy Maximov](https://github.com/kern0), [Joe Herman](https://github.com/Penryn)
-* [:link:](async-lock/async-lock.d.ts) [async-lock](https://github.com/rain1017/async-lock) by [Elisée MAURER](https://github.com/elisee)
-* [:link:](async-writer/async-writer.d.ts) [async-writer](https://github.com/marko-js/async-writer) by [Yuce Tekol](http://yuce.me)
-* [:link:](asyncblock/asyncblock.d.ts) [asyncblock](https://github.com/scriby/asyncblock) by [Hiroki Horiuchi](https://github.com/horiuchi)
-* [:link:](atmosphere/atmosphere.d.ts) [Atmosphere](https://github.com/Atmosphere/atmosphere-javascript) by [Kai Toedter](https://github.com/toedter)
-* [:link:](atom/atom.d.ts) [Atom](https://atom.io) by [vvakame](https://github.com/vvakame)
-* [:link:](atom/api-docs.d.ts) [Atom API docs](https://github.com/atom/atom/blob/master/build/tasks/docs-task.coffee) by [vvakame](https://github.com/vvakame)
-* [:link:](atom-keymap/atom-keymap.d.ts) [atom-keymap](https://github.com/atom/atom-keymap) by [Vadim Macagon](https://github.com/enlight)
-* [:link:](atpl/atpl.d.ts) [atpl](https://github.com/soywiz/atpl.js) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
-* [:link:](auth0-angular/auth0-angular.d.ts) [auth0-angular](https://github.com/auth0/auth0-angular) by [Matt Emory](https://github.com/homesar)
-* [:link:](auth0/auth0.d.ts) [Auth0.js](http://auth0.com) by [Robert McLaws](https://github.com/advancedrei)
-* [:link:](auth0.lock/auth0.lock.d.ts) [Auth0Widget.js](http://auth0.com) by [Robert McLaws](https://github.com/advancedrei)
-* [:link:](auth0.widget/auth0.widget.d.ts) [Auth0Widget.js](http://auth0.com) by [Robert McLaws](https://github.com/advancedrei)
-* [:link:](auto-launch/auto-launch.d.ts) [auto-launch](https://github.com/Teamwork/node-auto-launch) by [rhysd](https://github.com/rhysd)
-* [:link:](autobahn/autobahn.d.ts) [AutobahnJS](http://autobahn.ws/js) by [Elad Zelingher](https://github.com/darkl), [Andy Hawkins](https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com)
-* [:link:](autolinker/autolinker.d.ts) [autolinker](https://github.com/gregjacobs/Autolinker.js) by [Leon Yu](https://github.com/leonyu)
-* [:link:](autoprefixer-core/autoprefixer-core.d.ts) [Autoprefixer Core](https://github.com/postcss/autoprefixer-core) by [Asana](https://asana.com)
-* [:link:](aws-sdk/aws-sdk.d.ts) [aws-sdk](https://github.com/aws/aws-sdk-js) by [midknight41](https://github.com/midknight41)
-* [:link:](axios/axios.d.ts) [axios](https://github.com/mzabriskie/axios) by [Marcel Buesing](https://github.com/marcelbuesing)
-* [:link:](node-azure/azure.d.ts) [Azure SDK for Node](https://github.com/WindowsAzure/azure-sdk-for-node) by [Andrew Gaspar](https://github.com/AndrewGaspar), [Anti Veeranna](https://github.com/antiveeranna), [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](azure-mobile-apps/azure-mobile-apps.d.ts) [azure-mobile-apps](https://github.com/Azure/azure-mobile-apps-node) by [Microsoft Azure](https://github.com/Azure)
-* [:link:](azure-sb/azure-sb.d.ts) [azure-sb](https://github.com/Azure/azure-sdk-for-node/tree/master/lib/services/serviceBus) by [Microsoft Azure](https://github.com/Azure)
-* [:link:](babylonjs/babylon.d.ts) [BabylonJS](http://www.babylonjs.com) by [David Catuhe](https://github.com/deltakosh)
-* [:link:](babyparse/babyparse.d.ts) [babyparse](https://github.com/Rich-Harris/BabyParse) by [Charles Parker](https://github.com/cdiddy77)
-* [:link:](backbone/backbone-global.d.ts) [Backbone](http://backbonejs.org) by [Boris Yankov](https://github.com/borisyankov), [Natan Vivo](https://github.com/nvivo)
-* [:link:](backbone/backbone.d.ts) [Backbone](http://backbonejs.org) by [Boris Yankov](https://github.com/borisyankov), [Natan Vivo](https://github.com/nvivo)
-* [:link:](backbone-associations/backbone-associations.d.ts) [Backbone-associations](https://github.com/dhruvaray/backbone-associations) by [Craig Brett](https://github.com/craigbrett17)
-* [:link:](backbone-relational/backbone-relational.d.ts) [Backbone-relational](http://backbonerelational.org) by [Eirik Hoem](https://github.com/eirikhm)
-* [:link:](backbone.layoutmanager/backbone.layoutmanager.d.ts) [Backbone.LayoutManager](http://layoutmanager.org) by [He Jiang](https://github.com/hejiang2000)
-* [:link:](backbone.localstorage/backbone.localstorage.d.ts) [backbone.localStorage](https://github.com/jeromegn/Backbone.localStorage) by [Louis Grignon](https://github.com/lgrignon)
-* [:link:](backbone.paginator/backbone.paginator.d.ts) [backbone.paginator](https://github.com/backbone-paginator/backbone.paginator) by [Nyamazing](https://github.com/Nyamazing)
-* [:link:](backbone.radio/backbone.radio.d.ts) [Backbone.Radio](https://github.com/marionettejs/backbone.radio) by [Peter Palotas](https://github.com/alphaleonis)
-* [:link:](backgrid/backgrid.d.ts) [Backgrid](http://backgridjs.com) by [Jeremy Lujan](https://github.com/jlujan)
-* [:link:](baconjs/baconjs.d.ts) [Bacon.js](https://baconjs.github.io) by [Alexander Matsievsky](https://github.com/alexander-matsievsky)
-* [:link:](barcode/barcode.d.ts) [barcode](https://github.com/samt/barcode) by [Pascal Vomhoff](https://github.com/pvomhoff)
-* [:link:](bardjs/bardjs.d.ts) [bardjs](https://github.com/wardbell/bardjs) by [Andrew Archibald](https://github.com/TepigMC)
-* [:link:](base-x/base-x.d.ts) [base-x](https://github.com/cryptocoinjs/base-x) by [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](basic-auth/basic-auth.d.ts) [basic-auth](https://github.com/jshttp/basic-auth) by [Clément Bourgeois](https://github.com/moonpyk)
-* [:link:](batch-stream/batch-stream.d.ts) [batch-stream](https://github.com/segmentio/batch-stream) by [Nicholas Penree](http://github.com/drudge)
-* [:link:](bcrypt/bcrypt.d.ts) [bcrypt](https://www.npmjs.org/package/bcrypt) by [Peter Harris](https://github.com/codeanimal)
-* [:link:](bcrypt-nodejs/bcrypt-nodejs.d.ts) [bcrypt-nodejs](https://github.com/shaneGirish/bcrypt-nodejs) by [David Broder-Rodgers](https://github.com/DavidBR-SW)
-* [:link:](bcryptjs/bcryptjs.d.ts) [bcryptjs](https://github.com/dcodeIO/bcrypt.js) by [Joshua Filby](https://github.com/Joshua-F)
-* [:link:](benchmark/benchmark.d.ts) [Benchmark](http://benchmarkjs.com) by [Asana](https://asana.com)
-* [:link:](better-curry/better-curry.d.ts) [better-curry](https://github.com/pocesar/js-bettercurry) by [Paulo Cesar](https://github.com/pocesar)
-* [:link:](bezier-easing/bezier-easing.d.ts) [bezier-easing](https://github.com/gre/bezier-easing) by [brian ridley](https://github.com/ptlis)
-* [:link:](bgiframe/typescript.bgiframe.d.ts) [bgiframe](https://github.com/sumegizoltan/BgiFrame) by [Zoltan Sumegi](https://github.com/sumegizoltan)
-* [:link:](big.js/big.js.d.ts) [big.js](https://github.com/MikeMcl/big.js) by [Steve Ognibene](https://github.com/nycdotnet)
-* [:link:](bigint/bigint.d.ts) [BigInt](https://github.com/Evgenus/BigInt) by [Eugene Chernyshov](https://github.com/Evgenus)
-* [:link:](big-integer/big-integer.d.ts) [BigInteger.js](https://github.com/peterolson/BigInteger.js) by [Ingo Bürk](https://github.com/Airblader), [Roel van Uden](https://github.com/Deathspike)
-* [:link:](bignum/bignum.d.ts) [BigNum](https://github.com/justmoon/node-BigNum) by [Pat Smuk](https://github.com/Patman64)
-* [:link:](bigscreen/bigscreen.d.ts) [BigScreen](http://brad.is/coding/BigScreen) by [Douglas Eichelberger](https://github.com/dduugg)
-* [:link:](bip21/bip21.d.ts) [bip21](https://github.com/bitcoinjs/bip21) by [Stefan Huber](https://github.com/stefanhuber)
-* [:link:](bitwise-xor/bitwise-xor.d.ts) [bitwise-xor](https://github.com/czzarr/node-bitwise-xor) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](blazy/blazy.d.ts) [bLazy](https://github.com/dinbror/blazy) by [Julien Paroche](https://github.com/julienpa)
-* [:link:](blissfuljs/blissfuljs.d.ts) [bliss](http://blissfuljs.com) by [François Skorzec](https://github.com/fskorzec)
-* [:link:](blob-stream/blob-stream.d.ts) [blob-stream](https://github.com/devongovett/blob-stream) by [Eric Hillah](https://github.com/erichillah)
-* [:link:](blue-tape/blue-tape.d.ts) [blue-tape](https://github.com/spion/blue-tape) by [Haoqun Jiang](https://github.com/sodatea)
-* [:link:](bluebird/bluebird.d.ts) [bluebird](https://github.com/petkaantonov/bluebird) by [Bart van der Schoor](https://github.com/Bartvds), [falsandtru](https://github.com/falsandtru)
-* [:link:](bluebird-retry/bluebird-retry.d.ts) [bluebird-retry](https://github.com/jut-io/bluebird-retry) by [Pascal Vomhoff](https://github.com/pvomhoff)
-* [:link:](blueimp-md5/blueimp-md5.d.ts) [blueimp-md5](https://github.com/blueimp/JavaScript-MD5) by [Ray Martone](https://github.com/rmartone)
-* [:link:](body-parser/body-parser.d.ts) [body-parser](http://expressjs.com) by [Santi Albo](https://github.com/santialbo), [VILIC VANE](https://vilic.info), [Jonathan Häberle](https://github.com/dreampulse)
-* [:link:](bookshelf/bookshelf.d.ts) [bookshelfjs](http://bookshelfjs.org) by [Andrew Schurman](http://github.com/arcticwaters)
-* [:link:](boolify-string/boolify-string.d.ts) [boolify-string](https://github.com/sanemat/node-boolify-string) by [Tobias Henöckl](http://www.sisyphus.de)
-* [:link:](boom/boom.d.ts) [boom](http://github.com/hapijs/boom) by [Igor Rogatty](http://github.com/rogatty)
-* [:link:](bootbox/bootbox.d.ts) [Bootbox](https://github.com/makeusabrew/bootbox) by [Vincent Bortone](https://github.com/vbortone), [Kon Pik](https://github.com/konpikwastaken), [Anup Kattel](https://github.com/kanup), [Dominik Schroeter](https://github.com/icereed), [Troy McKinnon](https://github.com/trodi)
-* [:link:](bootstrap/bootstrap.d.ts) [Bootstrap](http://twitter.github.com/bootstrap) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts) [Bootstrap 3 Datepicker](http://eonasdan.github.io/bootstrap-datetimepicker) by [Katona Péter](https://github.com/katonap)
-* [:link:](bootstrap-switch/bootstrap-switch.d.ts) [Bootstrap Switch](http://www.bootstrap-switch.org) by [John M. Baughman](https://github.com/johnmbaughman)
-* [:link:](bootstrap-touchspin/bootstrap-touchspin.d.ts) [Bootstrap TouchSpin](http://www.virtuosoft.eu/code/bootstrap-touchspin) by [Albin Sunnanbo](https://github.com/albinsunnanbo)
-* [:link:](eonasdan-bootstrap-datetimepicker/eonasdan-bootstrap-datetimepicker.d.ts) [Bootstrap v3 Datepicker](http://eonasdan.github.io/bootstrap-datetimepicker) by [Markus Peloso](https://github.com/ToastHawaii)
-* [:link:](bootstrap-maxlength/bootstrap-maxlength.d.ts) [bootstrap-maxlength](https://github.com/mimo84/bootstrap-maxlength) by [Dan Manastireanu](https://github.com/danmana)
-* [:link:](bootstrap-notify/bootstrap-notify.d.ts) [bootstrap-notify](http://bootstrap-notify.remabledesigns.com) by [Blake Niemyjski](https://github.com/niemyjski), [Robert McIntosh](https://github.com/mouse0270), [Robert Voica](https://github.com/robert-voica)
-* [:link:](bootstrap-slider/bootstrap-slider.d.ts) [bootstrap-slider.js](https://github.com/seiyria/bootstrap-slider) by [Daniel Beckwith](https://github.com/dbeckwith)
-* [:link:](bootstrap.datepicker/bootstrap.datepicker.d.ts) [bootstrap.datepicker](https://github.com/eternicode/bootstrap-datepicker) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](bootstrap.paginator/bootstrap.paginator.d.ts) [bootstrap.paginator](https://github.com/lyonlai/bootstrap-paginator) by [derikwhittaker](https://github.com/derikwhittaker)
-* [:link:](box2d/box2dweb.d.ts) [bootstrap.timepicker](http://code.google.com/p/box2dweb) by [jbaldwin](https://github.com/jbaldwin)
-* [:link:](bootstrap.timepicker/bootstrap.timepicker.d.ts) [bootstrap.timepicker](https://github.com/jdewit/bootstrap-timepicker) by [derikwhittaker](https://github.com/derikwhittaker)
-* [:link:](bounce/bounce.d.ts) [Bounce.js](http://github.com/tictail/bounce.js) by [Cherry](http://github.com/cherrry)
-* [:link:](bowser/bowser.d.ts) [Bowser 1.x](https://github.com/ded/bowser) by [Paulo Cesar](https://github.com/pocesar)
-* [:link:](breeze/breeze.d.ts) [Breeze 1.5.x](http://www.breezejs.com) by [Boris Yankov](https://github.com/borisyankov), [IdeaBlade](https://github.com/IdeaBlade/Breeze)
-* [:link:](brorand/brorand.d.ts) [Brorand](https://github.com/indutny/brorand) by [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](browser-harness/browser-harness.d.ts) [Browser Harness](https://github.com/scriby/browser-harness) by [Chris Scribner](https://github.com/scriby)
-* [:link:](browser-sync/browser-sync.d.ts) [browser-sync](http://www.browsersync.io) by [Asana](https://asana.com), [Joe Skeen](http://github.com/joeskeen)
-* [:link:](browserify/browserify.d.ts) [Browserify](http://browserify.org) by [Andrew Gaspar](https://github.com/AndrewGaspar), [John Vilk](https://github.com/jvilk)
-* [:link:](bs58/bs58.d.ts) [bs58](https://github.com/cryptocoinjs/bs58) by [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](bson/bson.d.ts) [bson](https://github.com/mongodb/js-bson) by [Hiroki Horiuchi](https://github.com/horiuchi)
-* [:link:](bucks/bucks.d.ts) [bucks.js](https://github.com/CyberAgent/bucks.js) by [Shunsuke Ohtani](https://github.com/zaneli)
-* [:link:](buffer-compare/buffer-compare.d.ts) [buffer-compare](https://github.com/soldair/node-buffer-compare) by [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](buffer-equal/buffer-equal.d.ts) [buffer-equal](https://github.com/substack/node-buffer-equal) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](bl/bl.d.ts) [BufferList](https://github.com/rvagg/bl) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](buffers/buffers.d.ts) [buffers](https://github.com/substack/node-buffers) by [Robert Hencke](https://github.com/rhencke)
-* [:link:](bufferstream/bufferstream.d.ts) [bufferstream](https://github.com/dodo/node-bufferstream) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](bugsnag/bugsnag.d.ts) [Bugsnag](https://github.com/bugsnag/bugsnag-js) by [Delisa Mason](https://github.com/kattrali)
-* [:link:](bull/bull.d.ts) [bull](https://github.com/OptimalBits/bull) by [Bruno Grieder](https://github.com/bgrieder)
-* [:link:](bunyan-prettystream/bunyan-prettystream.d.ts) [bunyan-prettystream](https://www.npmjs.com/package/bunyan-prettystream) by [Jason Swearingen](https://github.com/jasonswearingen), [Vadim Macagon](https://github.com/enlight)
-* [:link:](business-rules-engine/business-rules-engine.d.ts) [business-rules-engine](https://github.com/rsamec/form) by [Roman Samec](https://github.com/rsamec)
-* [:link:](dw-bxslider-4/dw-bxslider-4.d.ts) [bxSlider](https://github.com/stevenwanderski/bxslider-4) by [Piotr Sałkowski](https://github.com/namerci)
-* [:link:](byline/byline.d.ts) [byline](https://github.com/jahewson/node-byline) by [Stefan Steinhart](https://github.com/reppners)
-* [:link:](bytebuffer/bytebuffer.d.ts) [bytebuffer.js](https://github.com/dcodeIO/bytebuffer.js) by [Denis Cappellin](http://github.com/cappellin)
-* [:link:](bytes/bytes.d.ts) [bytes](https://github.com/visionmedia/bytes.js) by [Zhiyuan Wang](https://github.com/danny8002)
-* [:link:](c3/c3.d.ts) [C3js](http://c3js.org) by [Marc Climent](https://github.com/mcliment)
-* [:link:](cal-heatmap/cal-heatmap.d.ts) [cal-heatmap](https://github.com/wa0x6e/cal-heatmap) by [Chris Baker](https://github.com/RetroChrisB)
-* [:link:](callsite/callsite.d.ts) [callsite](https://github.com/tj/callsite) by [newclear](https://github.com/newclear)
-* [:link:](calq/calq.d.ts) [calq](https://calq.io/docs/client/javascript/reference) by [Eirik Hoem](https://github.com/eirikhm)
-* [:link:](camel-case/camel-case.d.ts) [camel-case](https://github.com/blakeembrey/camel-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](camelcase/camelcase.d.ts) [camelcase](https://github.com/sindresorhus/camelcase) by [Sam Verschueren](https://github.com/samverschueren)
-* [:link:](camljs/camljs.d.ts) [camljs](http://camljs.codeplex.com) by [Andrey Markeev](http://markeev.com)
-* [:link:](camo/camo.d.ts) [camo](https://github.com/scottwrobinson/camo) by [Lucas Matías Ciruzzi](https://github.com/lucasmciruzzi)
-* [:link:](canvasjs/canvasjs.d.ts) [CanvasJS](http://canvasjs.com) by [Mark Overholt](https://github.com/mover5)
-* [:link:](casperjs/casperjs.d.ts) [CasperJS](http://casperjs.org) by [Jed Mao](https://github.com/jedmao)
-* [:link:](chai/chai.d.ts) [chai](http://chaijs.com) by [Jed Mao](https://github.com/jedmao), [Bart van der Schoor](https://github.com/Bartvds), [Andrew Brown](https://github.com/AGBrown), [Olivier Chevet](https://github.com/olivr70), [Matt Wistrand](https://github.com/mwistrand)
-* [:link:](chai-as-promised/chai-as-promised.d.ts) [chai-as-promised](https://github.com/domenic/chai-as-promised) by [jt000](https://github.com/jt000), [Yuki Kokubun](https://github.com/Kuniwak)
-* [:link:](chai-datetime/chai-datetime.d.ts) [chai-datetime](https://github.com/gaslight/chai-datetime.git) by [Cliff Burger](https://github.com/cliffburger)
-* [:link:](chai-fuzzy/chai-fuzzy.d.ts) [chai-fuzzy](http://chaijs.com/plugins/chai-fuzzy) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](chai-http/chai-http.d.ts) [chai-http](https://github.com/chaijs/chai-http) by [Wim Looman](https://github.com/Nemo157)
-* [:link:](chai-jquery/chai-jquery.d.ts) [chai-jquery](https://github.com/chaijs/chai-jquery) by [Kazi Manzur Rashid](https://github.com/kazimanzurrashid)
-* [:link:](chai-string/chai-string.d.ts) [chai-string](https://github.com/onechiporenko/chai-string) by [Nick Malaguti](https://github.com/nmalaguti)
-* [:link:](chai-subset/chai-subset.d.ts) [chai-subset](https://github.com/e-conomic/chai-subset) by [Sam Noedel](https://github.com/delta62), [Andrew Brown](https://github.com/AGBrown)
-* [:link:](chai-things/chai-things.d.ts) [chai-things](https://github.com/chaijs/chai-things) by [David Broder-Rodgers](https://github.com/DavidBR-SW)
-* [:link:](chalk/chalk.d.ts) [chalk](https://github.com/sindresorhus/chalk) by [Diullei Gomes](https://github.com/Diullei), [Bart van der Schoor](https://github.com/Bartvds), [Nico Jansen](https://github.com/nicojs)
-* [:link:](chance/chance.d.ts) [Chance](http://chancejs.com) by [Chris Bowdon](https://github.com/cbowdon)
-* [:link:](change-case/change-case.d.ts) [change-case](https://github.com/blakeembrey/change-case) by [Asana](https://asana.com)
-* [:link:](chartjs/chart.d.ts) [Chart.js](https://github.com/nnnick/Chart.js) by [Steve Fenton](https://github.com/Steve-Fenton)
-* [:link:](chartist/chartist.d.ts) [Chartist](https://github.com/gionkunz/chartist-js) by [Matt Gibbs](https://github.com/mtgibbs)
-* [:link:](checksum/checksum.d.ts) [checksum](https://github.com/dshaw/checksum) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](cheerio/cheerio.d.ts) [Cheerio](https://github.com/cheeriojs/cheerio) by [Bret Little](https://github.com/blittle), [VILIC VANE](http://vilic.info), [Wayne Maurer](https://github.com/wmaurer)
-* [:link:](chocolatechipjs/chocolatechipjs.d.ts) [chocolatechip](https://github.com/chocolatechipui/ChocolateChipJS) by [Robert Biggs](http://chocolatechip-ui.com)
-* [:link:](chokidar/chokidar.d.ts) [chokidar](https://github.com/paulmillr/chokidar) by [Stefan Steinhart](https://github.com/reppners)
-* [:link:](chosen/chosen.jquery.d.ts) [Chosen.JQuery](http://harvesthq.github.com/chosen) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](chroma-js/chroma-js.d.ts) [Chroma.js](https://github.com/gka/chroma.js) by [Sebastian Brückner](https://github.com/invliD)
-* [:link:](chrome/chrome-cast.d.ts) [Chrome Cast application development](https://developers.google.com/cast) by [Thomas Stig Jacobsen](https://github.com/eXeDK)
-* [:link:](chrome/chrome.d.ts) [Chrome extension development](http://developer.chrome.com/extensions) by [Matthew Kimber](https://github.com/matthewkimber), [otiai10](https://github.com/otiai10), [couven92](https://github.com/couven92), [RReverser](https://github.com/rreverser)
-* [:link:](chrome/chrome-app.d.ts) [Chrome packaged application development](http://developer.chrome.com/apps) by [Adam Lay](https://github.com/AdamLay), [MIZUNE Pine](https://github.com/pine613), [MIZUSHIMA Junki](https://github.com/mzsm), [Ingvar Stepanyan](https://github.com/RReverser)
-* [:link:](chui/chui.d.ts) [chui](https://github.com/chocolatechipui/chocolatechip-ui) by [Robert Biggs](http://chocolatechip-ui.com)
-* [:link:](circular-json/circular-json.d.ts) [circular-json](https://github.com/WebReflection/circular-json) by [Jonathan Pevarnek](https://github.com/jpevarnek)
-* [:link:](ckeditor/ckeditor.d.ts) [CKEditor](http://ckeditor.com) by [Ondrej Sevcik](https://github.com/ondrejsevcik)
-* [:link:](classnames/classnames.d.ts) [classnames](https://github.com/JedWatson/classnames) by [Dave Keen](http://www.keendevelopment.ch), [Adi Dahiya](https://github.com/adidahiya), [Jason Killian](https://github.com/JKillian)
-* [:link:](cldr.js/cldr.js-event.d.ts) [Cldr.js](https://github.com/rxaviers/cldrjs) by [Raman But-Husaim](https://github.com/RamanBut-Husaim)
-* [:link:](cldr.js/cldr.js-supplemental.d.ts) [Cldr.js](https://github.com/rxaviers/cldrjs) by [Raman But-Husaim](https://github.com/RamanBut-Husaim)
-* [:link:](cldr.js/cldr.js.d.ts) [Cldr.js](https://github.com/rxaviers/cldrjs) by [Raman But-Husaim](https://github.com/RamanBut-Husaim), [Grégoire Castre](https://github.com/gcastre)
-* [:link:](clean-css/clean-css.d.ts) [clean-css](https://github.com/jakubpawlowicz/clean-css) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](cli/cli.d.ts) [cli](https://www.npmjs.com/package/cli) by [Klaus Reimer](https://github.com/kayahr)
-* [:link:](cli-color/cli-color.d.ts) [cli-color](https://github.com/medikoo/cli-color) by [Joel Spadin](https://github.com/ChaosinaCan)
-* [:link:](clipboard/clipboard.d.ts) [clipboard.js](https://github.com/zenorocha/clipboard.js) by [Andrei Kurosh](https://github.com/impworks)
-* [:link:](clone/clone.d.ts) [clone](https://github.com/pvorb/node-clone) by [Kieran Simpson](https://github.com/kierans/DefinitelyTyped)
-* [:link:](closure-compiler/closure-compiler.d.ts) [closure-compiler](https://github.com/tim-smart/node-closure) by [Martin Probst](https://github.com/mprobst)
-* [:link:](codemirror/codemirror-showhint.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [jacqt](https://github.com/jacqt), [basarat](https://github.com/basarat)
-* [:link:](codemirror/codemirror-matchbrackets.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [Sixin Li](https://github.com/sixinli)
-* [:link:](codemirror/codemirror-runmode.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [Joseph Vaughan](https://github.com/Joev-)
-* [:link:](codemirror/searchcursor.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [jacqt](https://github.com/jacqt)
-* [:link:](codemirror/codemirror.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [mihailik](https://github.com/mihailik)
-* [:link:](coffeeify/coffeeify.d.ts) [coffeeify](https://github.com/jnordberg/coffeeify) by [Qubo](https://github.com/tkQubo)
-* [:link:](colorbrewer/colorbrewer.d.ts) [colorbrewer](https://github.com/jeanlauliac/colorbrewer) by [Matt Traynham](https://github.com/mtraynham)
-* [:link:](colors/colors.d.ts) [Colors.js 0.6.0-1](https://github.com/Marak/colors.js) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](cometd/cometd.d.ts) [CometD](http://cometd.org) by [Derek Cicerone](https://github.com/derekcicerone)
-* [:link:](commander/commander.d.ts) [commanderjs](https://github.com/visionmedia/commander.js) by [Marcelo Dezem](http://github.com/mdezem), [vvakame](http://github.com/vvakame)
-* [:link:](commonmark/commonmark.d.ts) [commonmark.js](https://github.com/jgm/commonmark.js) by [Nico Jansen](https://github.com/nicojs)
-* [:link:](compare-version/compare-version.d.ts) [compare-version](https://www.npmjs.com/package/compare-version) by [Jonathan Pevarnek](https://github.com/jpevarnek)
-* [:link:](complex/complex.d.ts) [Complex](https://github.com/arian/Complex) by [Aya Morisawa](https://github.com/AyaMorisawa)
-* [:link:](debounce/debounce.d.ts) [compose-function](https://github.com/component/debounce) by [Denis Sokolov](https://github.com/denis-sokolov)
-* [:link:](compose-function/compose-function.d.ts) [compose-function](https://github.com/stoeffel/compose-function) by [Denis Sokolov](https://github.com/denis-sokolov)
-* [:link:](compression/compression.d.ts) [compression](https://github.com/expressjs/compression) by [Santi Albo](https://github.com/santialbo)
-* [:link:](confidence/confidence.d.ts) [Confidence](https://github.com/hapijs/confidence.git) by [Jean-Philippe Pellerin](https://github.com/jppellerin)
-* [:link:](configstore/configstore.d.ts) [configstore](https://github.com/yeoman/configstore) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](connect/connect.d.ts) [connect](https://github.com/senchalabs/connect) by [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](connect-flash/connect-flash.d.ts) [connect-flash](https://github.com/jaredhanson/connect-flash) by [Andreas Gassmann](https://github.com/AndreasGassmann)
-* [:link:](connect-livereload/connect-livereload.d.ts) [connect-livereload](https://github.com/intesso/connect-livereload) by [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](connect-modrewrite/connect-modrewrite.d.ts) [connect-modrewrite](https://github.com/tinganho/connect-modrewrite) by [Tingan Ho](https://github.com/tinganho)
-* [:link:](connect-mongo/connect-mongo.d.ts) [connect-mongo](https://github.com/kcbanner/connect-mongo) by [Mizuki Yamamoto](https://github.com/Syati)
-* [:link:](connect-slashes/connect-slashes.d.ts) [connect-slashes](https://github.com/avinoamr/connect-slashes) by [Sam Herrmann](https://github.com/samherrmann)
-* [:link:](connect-timeout/connect-timeout.d.ts) [connect-timeout](https://github.com/expressjs/timeout) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](console-stamp/console-stamp.d.ts) [console-stamp](https://github.com/starak/node-console-stamp) by [Eric Byers](https://github.com/ericbyers)
-* [:link:](consolidate/consolidate.d.ts) [consolidate](https://github.com/visionmedia/consolidate.js) by [Carlos Ballesteros Velasco](https://github.com/soywiz), [Theo Sherry](https://github.com/theosherry)
-* [:link:](constant-case/constant-case.d.ts) [constant-case](https://github.com/blakeembrey/constant-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](consul/consul.d.ts) [Consul](https://github.com/silas/node-consul) by [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](content-type/content-type.d.ts) [content-type](https://github.com/deoxxa/content-type) by [Pine Mizune](https://github.com/pine613)
-* [:link:](contentful-resolve-response/contentful-resolve-response.d.ts) [contentful-resolve-response](https://github.com/contentful/contentful-resolve-response) by [Anton Karsten](https://github.com/antonkarsten)
-* [:link:](contextjs/contextjs.d.ts) [contextjs](https://github.com/jakiestfu/Context.js) by [Kern Handa](https://github.com/kernhanda)
-* [:link:](convert-source-map/convert-source-map.d.ts) [convert-source-map](https://github.com/thlorenz/convert-source-map) by [Andrew Gaspar](https://github.com/AndrewGaspar)
-* [:link:](cookie/cookie.d.ts) [cookie](https://github.com/jshttp/cookie) by [Pine Mizune](https://github.com/pine613)
-* [:link:](cookies/cookies.d.ts) [cookie-parser](https://github.com/pillarjs/cookies) by [Wang Zishi](https://github.com/WangZishi)
-* [:link:](cookie-parser/cookie-parser.d.ts) [cookie-parser](https://github.com/expressjs/cookie-parser) by [Santi Albo](https://github.com/santialbo)
-* [:link:](cookie-session/cookie-session.d.ts) [cookie-session](https://github.com/expressjs/cookie-session) by [Borislav Zhivkov](https://github.com/borislavjivkov)
-* [:link:](cookiejs/cookiejs.d.ts) [cookie.js](https://github.com/js-coder/cookie.js) by [Boltmade](https://github.com/Boltmade)
-* [:link:](copy-paste/copy-paste.d.ts) [copy-paste](https://github.com/xavi-/node-copy-paste) by [Tobias Kahlert](https://github.com/SrTobi)
-* [:link:](cordova-ionic/plugins/keyboard.d.ts) [Cordova Keyboard plugin](https://github.com/driftyco/ionic-plugins-keyboard) by [Hendrik Maus](https://github.com/hendrikmaus)
-* [:link:](cordova-plugin-app-version/cordova-plugin-app-version.d.ts) [cordova-plugin-app-version](https://github.com/whiteoctober/cordova-plugin-app-version) by [Markus Wagner](https://github.com/Ritzlgrmft)
-* [:link:](cordova-plugin-ibeacon/cordova-plugin-ibeacon.d.ts) [cordova-plugin-ibeacon](https://github.com/petermetz/cordova-plugin-ibeacon) by [Markus Wagner](https://github.com/Ritzlgrmft)
-* [:link:](cordova-plugin-mapsforge/cordova-plugin-mapsforge.d.ts) [cordova-plugin-mapsforge](https://github.com/afsuarez/mapsforge-cordova-plugin) by [rafw87](https://github.com/rafw87)
-* [:link:](cordova-plugin-ouralabs/cordova-plugin-ouralabs.d.ts) [cordova-plugin-ouralabs](https://github.com/Justin-Credible/cordova-plugin-ouralabs) by [Justin Unterreiner](https://github.com/Justin-Credible)
-* [:link:](cordova-plugin-qrscanner/cordova-plugin-qrscanner.d.ts) [cordova-plugin-qrscanner](https://github.com/bitpay/cordova-plugin-qrscanner) by [Jason Dreyzehner](https://github.com/bitjson)
-* [:link:](cordova-plugin-spinner/cordova-plugin-spinner.d.ts) [cordova-plugin-spinner](https://github.com/Justin-Credible/cordova-plugin-spinner) by [Justin Unterreiner](https://github.com/Justin-Credible)
-* [:link:](cordovarduino/cordovarduino.d.ts) [Cordovarduino plugin](https://github.com/stereolux/cordovarduino) by [Hendrik Maus](https://github.com/hendrikmaus)
-* [:link:](core-decorators/core-decorators.d.ts) [core-decorators.js](https://github.com/jayphelps/core-decorators.js) by [Qubo](https://github.com/tkqubo)
-* [:link:](core-js/core-js.d.ts) [core-js](https://github.com/zloirock/core-js) by [Ron Buckton](http://github.com/rbuckton)
-* [:link:](cors/cors.d.ts) [cors](https://github.com/troygoode/node-cors) by [Mihhail Lapushkin](https://github.com/mihhail-lapushkin)
-* [:link:](couchbase/couchbase.d.ts) [Couchbase Node.js SDK](https://github.com/couchbase/couchnode) by [Marwan Aouida](https://github.com/maouida)
-* [:link:](cradle/cradle.d.ts) [cradle](https://github.com/flatiron/cradle) by [Panu Horsmalahti](https://github.com/panuhorsmalahti)
-* [:link:](create-error/create-error.d.ts) [create-error.js](https://github.com/tgriesser/create-error) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](createjs/createjs.d.ts) [CreateJS](http://www.createjs.com) by [Pedro Ferreira](https://bitbucket.org/drk4), [Chris Smith](https://github.com/evilangelist), [Satoru Kimura](https://github.com/gyohk)
-* [:link:](credential/credential.d.ts) [credential](https://github.com/ericelliott/credential) by [Phú](https://github.com/phuvo)
-* [:link:](cron/cron.d.ts) [cron](https://www.npmjs.com/package/cron) by [Hiroki Horiuchi](https://github.com/horiuchi)
-* [:link:](cropperjs/cropperjs.d.ts) [cropperjs](https://github.com/fengyuanchen/cropperjs) by [Stepan Mikhaylyuk](https://github.com/stepancar)
-* [:link:](cross-storage/cross-storage.d.ts) [cross-storage](https://github.com/zendesk/cross-storage) by [Daniel Chao](http://dchao.co)
-* [:link:](crossfilter/crossfilter.d.ts) [CrossFilter](https://github.com/square/crossfilter) by [Schmulik Raskin](https://github.com/schmuli)
-* [:link:](crossroads/crossroads.d.ts) [Crossroads.js](http://millermedeiros.github.io/crossroads.js) by [Diullei Gomes](https://github.com/diullei)
-* [:link:](crypto-js/crypto-js.d.ts) [crypto-js](https://github.com/evanvosberg/crypto-js) by [Michael Zabka](https://github.com/misak113)
-* [:link:](cryptojs/cryptojs.d.ts) [CryptoJS](https://code.google.com/p/crypto-js) by [Gia Bảo @ Sân Đình](https://github.com/giabao)
-* [:link:](cson/cson.d.ts) [CSON](https://github.com/bevry/cson) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](css/css.d.ts) [css](https://github.com/reworkcss/css) by [Ilya Verbitskiy](https://github.com/ilich)
-* [:link:](googlemaps.infobubble/google.maps.infobubble.d.ts) [CSS3 InfoBubble with tabs for Google Maps API V3](http://google-maps-utility-library-v3.googlecode.com/svn/trunk/infobubble/src) by [Johan Nilsson](https://github.com/Dashue)
-* [:link:](csurf/csurf.d.ts) [csurf](https://www.npmjs.org/package/csurf) by [Hiroki Horiuchi](https://github.com/horiuchi)
-* [:link:](csv-stringify/csv-stringify.d.ts) [csv-stringify](https://github.com/wdavidw/node-csv-stringify) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](cucumber/cucumber.d.ts) [cucumber-js](https://github.com/cucumber/cucumber-js) by [Abraão Alves](https://github.com/abraaoalves)
-* [:link:](cuid/cuid.d.ts) [cuid](https://github.com/ericelliott/cuid) by [Dave Keen](http://www.keendevelopment.ch)
-* [:link:](custom-error-generator/custom-error-generator.d.ts) [custom-error-generator](https://github.com/jproulx/node-custom-error) by [Thierry Miceli](https://github.com/thmiceli)
-* [:link:](md5/md5.d.ts) [CybozuLabs.MD5](http://labs.cybozu.co.jp/blog/mitsunari/2007/07/md5js_1.html) by [MIZUNE Pine](https://github.com/pine613)
-* [:link:](d3-dsv/d3-dsv.d.ts) [d3-dsv](https://www.npmjs.com/package/d3-dsv) by [Jason Swearingen](https://jasonswearingen.github.io)
-* [:link:](d3/d3.d.ts) [d3JS](http://d3js.org) by [Alex Ford](https://github.com/gustavderdrache), [Boris Yankov](https://github.com/borisyankov)
-* [:link:](d3.cloud.layout/d3.cloud.layout.d.ts) [d3JS cloud layout plugin by Jason Davies](https://github.com/jasondavies/d3-cloud) by [hans windhoff](https://github.com/hansrwindhoff)
-* [:link:](dagre/dagre.d.ts) [dagre](https://github.com/cpettitt/dagre) by [Qinfeng Chen](https://github.com/qinfchen)
-* [:link:](dagre-d3/dagre-d3.d.ts) [dagre-d3.core.js](https://github.com/cpettitt/dagre-d3) by [Mark Wong Siang Kai](https://github.com/markwongsk)
-* [:link:](dat-gui/dat-gui.d.ts) [dat.GUI](https://github.com/dataarts/dat.gui) by [Satoru Kimura](https://github.com/gyohk)
-* [:link:](data-driven/data-driven.d.ts) [data-driven.js](https://github.com/fluentsoftware/data-driven) by [Adam Babcock](https://github.com/mrhen)
-* [:link:](DataStream.js/DataStream.js.d.ts) [DataStream.js](https://github.com/kig/DataStream.js) by [Tat](https://github.com/tatchx)
-* [:link:](date.format.js/date.format.d.ts) [Date Format](http://blog.stevenlevithan.com/archives/date-time-format) by [Rob Stutton](https://github.com/balrob)
-* [:link:](datejs/datejs.d.ts) [DateJS](http://www.datejs.com) by [David Khristepher Santos](http://github.com/rupertavery)
-* [:link:](dcjs/dc.d.ts) [DCJS](https://github.com/dc-js/dc.js) by [hans windhoff](https://github.com/hansrwindhoff), [matt traynham](https://github.com/mtraynham)
-* [:link:](debug/debug.d.ts) [debug](https://github.com/visionmedia/debug) by [Seon-Wook Park](https://github.com/swook), [Gal Talmor](https://github.com/galtalmor)
-* [:link:](decamelize/decamelize.d.ts) [decamelize](https://github.com/sindresorhus/decamelize) by [Sam Verschueren](https://github.com/samverschueren)
-* [:link:](decimal.js/decimal.js.d.ts) [decimal.js](http://mikemcl.github.io/decimal.js) by [Joseph Rossi](http://github.com/musicist288)
-* [:link:](decorum/decorum.d.ts) [Decorum JS](https://github.com/dflor003/decorum) by [Danil Flores](https://github.com/dflor003)
-* [:link:](deep-diff/deep-diff.d.ts) [deep-diff](https://github.com/flitbit/diff) by [ZauberNerd](https://github.com/ZauberNerd)
-* [:link:](deep-equal/deep-equal.d.ts) [deep-equal](https://github.com/substack/node-deep-equal) by [remojansen](https://github.com/remojansen)
-* [:link:](deep-freeze/deep-freeze.d.ts) [deep-freeze](https://github.com/substack/deep-freeze) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](del/del.d.ts) [del](https://github.com/sindresorhus/del) by [Asana](https://asana.com), [Aya Morisawa](https://github.com/AyaMorisawa)
-* [:link:](denodeify/denodeify.d.ts) [denodeify](https://github.com/matthew-andrews/denodeify) by [joaomoreno](https://github.com/joaomoreno)
-* [:link:](depd/depd.d.ts) [depd](https://github.com/dougwilson/nodejs-depd) by [Zhiyuan Wang](https://github.com/danny8002)
-* [:link:](deployJava/deployJava.d.ts) [deployJava.js](https://www.java.com/js/deployJava.txt) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](detect-indent/detect-indent.d.ts) [detect-indent](https://github.com/sindresorhus/detect-indent) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](devexpress-web/devexpress-web.d.ts) [DevExpress ASP.NET web controls (Classic and MVC)](https://www.devexpress.com/Products/NET/Controls/ASP/MVC) by [Sheron Benedict](https://github.com/INullable)
-* [:link:](devextreme/devextreme.d.ts) [DevExtreme](http://js.devexpress.com) by [DevExpress Inc.](http://devexpress.com)
-* [:link:](dexie/dexie.d.ts) [Dexie](https://github.com/dfahlander/Dexie.js) by [David Fahlander](http://github.com/dfahlander)
-* [:link:](dhtmlxgantt/dhtmlxgantt.d.ts) [dhtmlxGantt](http://dhtmlx.com/docs/products/dhtmlxGantt) by [Maksim Kozhukh](http://github.com/mkozhukh)
-* [:link:](dhtmlxscheduler/dhtmlxscheduler.d.ts) [dhtmlxScheduler](http://dhtmlx.com/docs/products/dhtmlxScheduler) by [Maksim Kozhukh](http://github.com/mkozhukh)
-* [:link:](di-lite/di-lite.d.ts) [di-lite](https://github.com/NickQiZhu/di.js) by [Timothy Morris](https://github.com/dcrusader)
-* [:link:](diff/diff.d.ts) [diff](https://github.com/kpdecker/jsdiff) by [vvakame](https://github.com/vvakame)
-* [:link:](diff-match-patch/diff-match-patch.d.ts) [diff-match-patch](https://www.npmjs.com/package/diff-match-patch) by [Asana](https://asana.com)
-* [:link:](docCookies/docCookies.d.ts) [docCookies](https://developer.mozilla.org/en-US/docs/Web/API/document.cookie) by [Jon Egerton](https://github.com/jonegerton)
-* [:link:](dock-spawn/dock-spawn.d.ts) [Dock Spawn](http://dockspawn.com) by [Drew Noakes](https://drewnoakes.com)
-* [:link:](docopt/docopt.d.ts) [Docopt](http://docopt.org) by [Giovanni Bassi](https://github.com/giggio)
-* [:link:](documentdb/documentdb.d.ts) [DocumentDB](https://github.com/Azure/azure-documentdb-node) by [Noel Abrahams](https://github.com/NoelAbrahams), [Brett Gutstein](https://github.com/brettferdosi)
-* [:link:](documentdb-server/documentdb-server.d.ts) [DocumentDB server side JavaScript SDK](http://dl.windowsazure.com/documentDB/jsserverdocs) by [François Nguyen](https://github.com/lith-light-g)
-* [:link:](dojo/dojo.d.ts) [Dojo](http://dojotoolkit.org) by [Michael Van Sickle](https://github.com/vansimke)
-* [:link:](dompurify/dompurify.d.ts) [DOM Purify](https://github.com/cure53/DOMPurify) by [Dave Taylor](http://davetayls.me), [Samira Bazuzi](https://github.com/bazuzi)
-* [:link:](dom4/dom4.d.ts) [dom4](https://github.com/WebReflection/dom4) by [Adi Dahiya](https://github.com/adidahiya), [Gilad Gray](https://github.com/giladgray)
-* [:link:](domo/domo.d.ts) [Domo](http://domo-js.com) by [Steve Fenton](https://github.com/Steve-Fenton)
-* [:link:](domready/domready.d.ts) [domready](https://github.com/ded/domready) by [Christian Holm Nielsen](https://github.com/dotnetnerd)
-* [:link:](requirejs-domready/domready.d.ts) [domReady](https://github.com/requirejs/domReady) by [Nobuhiro Nakamura](https://github.com/lefb766)
-* [:link:](donna/donna.d.ts) [donna](https://github.com/atom/donna) by [vvakame](https://github.com/vvakame)
-* [:link:](dot/dot.d.ts) [doT](https://github.com/olado/doT) by [ZombieHunter](https://github.com/ZombieHunter)
-* [:link:](dot-case/dot-case.d.ts) [dot-case](https://github.com/blakeembrey/dot-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](dot-prop/dot-prop.d.ts) [dot-prop](https://github.com/sindresorhus/dot-prop) by [Sam Verschueren](https://github.com/samverschueren)
-* [:link:](dotdotdot/dotdotdot.d.ts) [dotdotdot](http://dotdotdot.frebsite.nl) by [Milan Jaros](https://github.com/milanjaros)
-* [:link:](dotenv/dotenv.d.ts) [dotenv](https://github.com/motdotla/dotenv) by [Jussi Kinnula](https://github.com/jussikinnula)
-* [:link:](doublearray/doublearray.d.ts) [doublearray](https://github.com/takuyaa/doublearray) by [MIZUSHIMA Junki](https://github.com/mzsm)
-* [:link:](draft-js/draft-js.d.ts) [draft-js](https://github.com/facebook/draft-js) by [Pavel Evsegneev](https://github.com/Ahineya)
-* [:link:](dragula/dragula.d.ts) [dragula](http://bevacqua.github.io/dragula) by [Paul Welter](https://github.com/pwelter34)
-* [:link:](hystrixjs/hystrixjs.d.ts) [dragula](https://bitbucket.org/igor_sechyn/hystrixjs) by [Igor Sechyn](https://github.com/igorsechyn)
-* [:link:](drop/drop.d.ts) [Drop](http://github.hubspot.com/drop) by [Adi Dahiya](https://github.com/adidahiya)
-* [:link:](dropboxjs/dropboxjs.d.ts) [dropbox-js](https://github.com/dropbox/dropbox-js) by [Steve Fenton](https://github.com/Steve-Fenton), [Pedro Casaubon](https://github.com/xperiments)
-* [:link:](dropzone/dropzone.d.ts) [Dropzone](http://www.dropzonejs.com) by [Natan Vivo](https://github.com/nvivo), [Andy Hawkins](https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com), [Vasya Aksyonov](https://github.com/outring), [Simon Huber](https://github.com/renuo)
-* [:link:](dsv/dsv.d.ts) [dsv](https://www.npmjs.com/package/dsv) by [Jason Swearingen](https://jasonswearingen.github.io)
-* [:link:](dts-bundle/dts-bundle.d.ts) [dts-bundle](https://github.com/TypeStrong/dts-bundle) by [Asana](https://asana.com)
-* [:link:](durandal/durandal.d.ts) [Durandal](http://durandaljs.com) by [Blue Spire](https://github.com/BlueSpire)
-* [:link:](dymo-label-framework/dymo-label-framework.d.ts) [DYMO Label Framework](http://www.labelwriter.com/software/dls/sdk/docs/DYMOLabelFrameworkJavaScriptHelp/index.html) by [Thijs Kuipers](https://github.com/thijskuipers)
-* [:link:](easeljs/easeljs.d.ts) [EaselJS](http://www.createjs.com/#!/EaselJS) by [Pedro Ferreira](https://bitbucket.org/drk4), [Chris Smith](https://github.com/evilangelist)
-* [:link:](easy-api-request/easy-api-request.d.ts) [easy-api-request](https://github.com/DeadAlready/easy-api-request) by [Karl Düüna](https://github.com/DeadAlready)
-* [:link:](easy-jsend/easy-jsend.d.ts) [easy-jsend](https://github.com/DeadAlready/easy-jsend) by [Karl Düüna](https://github.com/DeadAlready)
-* [:link:](easy-session/easy-session.d.ts) [easy-session](https://github.com/DeadAlready/node-easy-session) by [Karl Düüna](https://github.com/DeadAlready)
-* [:link:](easy-table/easy-table.d.ts) [easy-table](https://github.com/eldargab/easy-table) by [Niklas Mollenhauer](https://github.com/nikeee)
-* [:link:](easy-xapi-supertest/easy-xapi-supertest.d.ts) [easy-x-headers](https://github.com/DeadAlready/easy-x-headers) by [Karl Düüna](https://github.com/DeadAlready)
-* [:link:](easy-x-headers/easy-x-headers.d.ts) [easy-x-headers](https://github.com/DeadAlready/easy-x-headers) by [Karl Düüna](https://github.com/DeadAlready)
-* [:link:](easy-xapi/easy-xapi.d.ts) [easy-xapi](https://github.com/DeadAlready/easy-xapi) by [Karl Düüna](https://github.com/DeadAlready)
-* [:link:](easy-xapi-utils/easy-xapi-utils.d.ts) [easy-xapi-utils](https://github.com/DeadAlready/easy-xapi-utils) by [Karl Düüna](https://github.com/DeadAlready)
-* [:link:](easystarjs/easystarjs.d.ts) [EasyStar.js](http://easystarjs.com) by [Magnus Gustafsson](https://github.com/borundin)
-* [:link:](egg.js/egg.js.d.ts) [Egg.js](https://github.com/mikeflynn/egg.js) by [Markus Peloso](https://github.com/ToastHawaii)
-* [:link:](ejs-locals/ejs-locals.d.ts) [ejs-locals](https://github.com/randometc/ejs-locals) by [jt000](https://github.com/jt000)
-* [:link:](ejs/ejs.d.ts) [ejs.js](http://ejs.co) by [Ben Liddicott](https://github.com/benliddicott/DefinitelyTyped)
-* [:link:](ejson/ejson.d.ts) [ejson](https://www.npmjs.com/package/ejson) by [Shantanu Bhadoria](https://github.com/shantanubhadoria)
-* [:link:](elasticsearch/elasticsearch.d.ts) [elasticsearch](https://www.elastic.co) by [Casper Skydt](https://github.com/CasperSkydt/DefinitelyTyped), [Blake Smith](https://github.com/bfsmith/DefinitelyTyped)
-* [:link:](jquery.elang/jquery.elang.d.ts) [eLang](https://github.com/sumegizoltan/ELang) by [Zoltan Sumegi](https://github.com/sumegizoltan)
-* [:link:](github-electron/github-electron.d.ts) [Electron](http://electron.atom.io) by [jedmao](https://github.com/jedmao), [rhysd](https://rhysd.github.io), [Milan Burda](https://github.com/miniak)
-* [:link:](electron-builder/electron-builder.d.ts) [electron-builder](https://github.com/loopline-systems/electron-builder) by [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](electron-json-storage/electron-json-storage.d.ts) [electron-json-storage](https://github.com/jviotti/electron-json-storage) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](electron-packager/electron-packager.d.ts) [electron-packager](https://github.com/maxogden/electron-packager) by [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](github-electron/electron-prebuilt.d.ts) [electron-prebuilt](https://github.com/mafintosh/electron-prebuilt) by [rhysd](https://github.com/rhysd)
-* [:link:](electron-window-state/electron-window-state.d.ts) [electron-window-state](https://github.com/mawie81/electron-window-state) by [rhysd](https://github.com/rhysd)
-* [:link:](element-resize-event/element-resize-event.d.ts) [element-resize-event](https://github.com/KyleAMathews/element-resize-event) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](elm/elm.d.ts) [Elm](http://elm-lang.org) by [Dénes Harmath](https://github.com/thSoft)
-* [:link:](email-addresses/email-addresses.d.ts) [email-addresses](https://github.com/jackbowman/email-addresses) by [John Grimsey](https://github.com/johngrimsey)
-* [:link:](email-validator/email-validator.d.ts) [email-validator](https://github.com/Sembiance/email-validator) by [Paul Lessing](https://github.com/paullessing)
-* [:link:](ember/ember.d.ts) [Ember.js](http://emberjs.com) by [Jed Mao](https://github.com/jedmao)
-* [:link:](emissary/emissary.d.ts) [emissary](https://github.com/atom/emissary) by [vvakame](https://github.com/vvakame)
-* [:link:](empower/empower.d.ts) [empower](https://github.com/twada/empower) by [vvakame](https://github.com/vvakame)
-* [:link:](emscripten/emscripten.d.ts) [Emscripten](http://kripken.github.io/emscripten-site/index.html) by [Kensuke Matsuzaki](https://github.com/zakki)
-* [:link:](encoding-japanese/encoding-japanese.d.ts) [encoding-japanese](https://github.com/polygonplanet/encoding.js) by [rhysd](https://rhysd.github.io)
-* [:link:](envify/envify.d.ts) [envify](https://github.com/hughsk/envify) by [Qubo](https://github.com/tkQubo)
-* [:link:](enzyme/enzyme.d.ts) [Enzyme](https://github.com/airbnb/enzyme) by [Marian Palkus](https://github.com/MarianPalkus), [Cap3](http://www.cap3.de)
-* [:link:](epiceditor/epiceditor.d.ts) [EpicEditor](http://epiceditor.com) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](eq.js/eq.js.d.ts) [eq.js](https://github.com/Snugug/eq.js) by [Stephen Lautier](https://github.com/stephenlautier)
-* [:link:](errorhandler/errorhandler.d.ts) [errorhandler](https://github.com/expressjs/errorhandler) by [Santi Albo](https://github.com/santialbo)
-* [:link:](error-stack-parser/error-stack-parser.d.ts) [ErrorStackParser](https://github.com/stacktracejs/error-stack-parser) by [Eric Wendelin](https://www.eriwen.com)
-* [:link:](es6-collections/es6-collections.d.ts) [es6-collections](https://github.com/WebReflection/es6-collections) by [Ron Buckton](http://github.com/rbuckton)
-* [:link:](es6-promise/es6-promise.d.ts) [es6-promise](https://github.com/jakearchibald/ES6-Promise) by [François de Campredon](https://github.com/fdecampredon), [vvakame](https://github.com/vvakame)
-* [:link:](es6-shim/es6-shim.d.ts) [es6-shim](https://github.com/paulmillr/es6-shim) by [Ron Buckton](http://github.com/rbuckton)
-* [:link:](escape-html/escape-html.d.ts) [escape-html](https://github.com/component/escape-html) by [Elisée MAURER](https://github.com/elisee)
-* [:link:](escape-latex/escape-latex.d.ts) [escape-latex](https://github.com/dangmai/escape-latex) by [Oliver Schneider](https://github.com/olsio)
-* [:link:](escape-string-regexp/escape-string-regexp.d.ts) [escape-string-regexp](https://github.com/sindresorhus/escape-string-regexp) by [kruncher](https://github.com/kruncher)
-* [:link:](esprima/esprima.d.ts) [Esprima](http://esprima.org) by [teppeis](https://github.com/teppeis), [RReverser](https://github.com/RReverser)
-* [:link:](estree/flow.d.ts) [ESTree AST extensions for Facebook Flow](https://github.com/estree/estree) by [RReverser](https://github.com/RReverser)
-* [:link:](estree/estree.d.ts) [ESTree AST specification](https://github.com/estree/estree) by [RReverser](https://github.com/RReverser)
-* [:link:](evaporate/evaporate.d.ts) [EvaporateJS](https://github.com/TTLabs/EvaporateJS) by [Andrew Kuklewicz](https://github.com/kookster), [Chris Rhoden](https://github.com/chrisrhoden)
-* [:link:](event-kit/event-kit.d.ts) [event-kit](https://github.com/atom/event-kit) by [Vadim Macagon](https://github.com/enlight)
-* [:link:](event-loop-lag/event-loop-lag.d.ts) [event-loop-lag](https://github.com/pebble/event-loop-lag) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](event-stream/event-stream.d.ts) [event-stream](https://github.com/dominictarr/event-stream) by [David Gardiner](https://github.com/flcdrg)
-* [:link:](eventemitter2/eventemitter2.d.ts) [EventEmitter2](https://github.com/asyncly/EventEmitter2) by [ryiwamoto](https://github.com/ryiwamoto)
-* [:link:](eventemitter3/eventemitter3.d.ts) [EventEmitter3](https://github.com/primus/eventemitter3) by [Yuichi Murata](https://github.com/mrk21), [Leon Yu](https://github.com/leonyu)
-* [:link:](evernote/evernote.d.ts) [evernote v](https://www.npmjs.com/package/evernote) by [Zachary Collins](https://github.com/corps)
-* [:link:](exit/exit.d.ts) [exit](https://github.com/cowboy/node-exit) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](expect/expect.d.ts) [Expect](https://github.com/mjackson/expect) by [Justin Reidy](https://github.com/jmreidy)
-* [:link:](expect.js/expect.js.d.ts) [expect.js](https://github.com/Automattic/expect.js) by [Teppei Sato](https://github.com/teppeis)
-* [:link:](expectations/expectations.d.ts) [expectations.js](https://github.com/spmason/expectations) by [vvakame](https://github.com/vvakame)
-* [:link:](express-serve-static-core/express-serve-static-core.d.ts) [Express 4.x](http://expressjs.com) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](express/express.d.ts) [Express 4.x](http://expressjs.com) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](express-brute/express-brute.d.ts) [express-brute](https://github.com/AdamPflug/express-brute) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](express-brute-memcached/express-brute-memcached.d.ts) [express-brute-memcached](https://github.com/AdamPflug/express-brute-memcached) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](express-brute-mongo/express-brute-mongo.d.ts) [express-brute-mongo](https://github.com/auth0/express-brute-mongo) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](express-debug/express-debug.d.ts) [express-debug](https://github.com/devoidfury/express-debug) by [Federico Bond](https://github.com/federicobond)
-* [:link:](express-graphql/express-graphql.d.ts) [express-graphql](https://www.npmjs.org/package/express-graphql) by [Isman Usoh](https://github.com/isman-usoh), [Nitin Tutlani](https://github.com/nitintutlani)
-* [:link:](express-handlebars/express-handlebars.d.ts) [express-handlebars](https://github.com/ericf/express-handlebars) by [Sam Saint-Pettersen](https://github.com/stpettersens), [Igor Dultsev](https://github.com/yhaskell)
-* [:link:](express-jwt/express-jwt.d.ts) [express-jwt](https://www.npmjs.org/package/express-jwt) by [Wonshik Kim](https://github.com/wokim)
-* [:link:](express-less/express-less.d.ts) [express-less](https://www.npmjs.com/package/express-less) by [xyb](https://github.com/xieyubo)
-* [:link:](express-minify/express-minify.d.ts) [express-minify](https://github.com/SummerWish/express-minify) by [Borislav Zhivkov](https://github.com/borislavjivkov)
-* [:link:](express-myconnection/express-myconnection.d.ts) [express-myconnection](https://www.npmjs.org/package/express-myconnection) by [Michael Ferris](https://github.com/Cellule)
-* [:link:](express-openapi/express-openapi.d.ts) [express-openapi 0.11.x](https://github.com/kogosoftwarellc/express-openapi) by [TANAKA Koichi](https://github.com/mugeso)
-* [:link:](express-partials/express-partials.d.ts) [express-partials](https://github.com/publicclass/express-partials) by [jt000](https://github.com/jt000)
-* [:link:](express-route-fs/express-route-fs.d.ts) [express-route-fs](https://github.com/kripod/express-route-fs) by [Kristóf Poduszló](https://github.com/kripod)
-* [:link:](express-session/express-session.d.ts) [express-session](https://www.npmjs.org/package/express-session) by [Hiroki Horiuchi](https://github.com/horiuchi)
-* [:link:](express-unless/express-unless.d.ts) [express-unless](https://www.npmjs.org/package/express-unless) by [Wonshik Kim](https://github.com/wokim)
-* [:link:](express-useragent/express-useragent.d.ts) [express-useragent](https://www.npmjs.org/package/express-useragent) by [Isman Usoh](https://github.com/isman-usoh)
-* [:link:](express-validator/express-validator.d.ts) [express-validator](https://github.com/ctavan/express-validator) by [Nathan Ridley](https://github.com/axefrog), [Jonathan Häberle](http://dreampulse.de)
-* [:link:](extend/extend.d.ts) [extend](https://www.npmjs.com/package/extend) by [Stefan Steinhart](https://github.com/reppners)
-* [:link:](wiiu/wiiu.d.ts) [Extended Functionality of Wii U Internet Browser](https://www.nintendo.co.jp/wiiu/hardware/internetbrowser/extended_functionality.html) by [MIZUSHIMA Junki](https://github.com/mzsm)
-* [:link:](extended-listbox/extended-listbox.d.ts) [extended-listbox 1.1.x](https://github.com/code-chris/extended-listbox) by [Christian Kotzbauer](https://github.com/code-chris)
-* [:link:](extjs/ExtJS.d.ts) [ExtJS](http://www.sencha.com/products/extjs) by [Brian Kotek](https://github.com/brian428)
-* [:link:](eyes/eyes.d.ts) [eyes](https://github.com/cloudhead/eyes.js) by [bryn austin bellomy](https://github.com/brynbellomy)
-* [:link:](fabricjs/fabricjs.d.ts) [FabricJS](http://fabricjs.com) by [Oliver Klemencic](https://github.com/oklemencic), [Joseph Livecchi](https://github.com/joewashear007), [Michael Randolph](https://github.com/mrand01)
-* [:link:](fbsdk/fbsdk.d.ts) [Facebook Javascript SDK](https://developers.facebook.com/docs/javascript) by [Joshua Strobl](https://github.com/JoshStrobl)
-* [:link:](fbemitter/fbemitter.d.ts) [Facebook's EventEmitter](https://github.com/facebook/emitter) by [kmxz](https://github.com/kmxz)
-* [:link:](faker/faker.d.ts) [faker](http://marak.com/faker.js) by [Bas Pennings](https://github.com/basp), [Yuki Kokubun](https://github.com/Kuniwak)
-* [:link:](falcor/falcor-browser.d.ts) [falcor](http://netflix.github.io/falcor) by [Quramy](https://github.com/Quramy)
-* [:link:](falcor/falcor.d.ts) [falcor](http://netflix.github.io/falcor) by [Quramy](https://github.com/Quramy)
-* [:link:](falcor-express/falcor-express.d.ts) [falcor-express](https://github.com/Netflix/falcor-express) by [Quramy](https://github.com/Quramy)
-* [:link:](falcor-http-datasource/falcor-http-datasource.d.ts) [falcor-http-datasource](https://github.com/Netflix/falcor-http-datasource) by [Quramy](https://github.com/Quramy)
-* [:link:](falcor-json-graph/falcor-json-graph.d.ts) [falcor-json-graph](https://github.com/Netflix/falcor-json-graph) by [Quramy](https://github.com/Quramy)
-* [:link:](falcor-router/falcor-router.d.ts) [falcor-router](https://github.com/Netflix/falcor-router) by [Quramy](https://github.com/Quramy)
-* [:link:](famous/famous.d.ts) [Famous Engine](http://famous.org) by [Boris Vasilenko](https://github.com/borisvasilenko)
-* [:link:](fancybox/fancybox.d.ts) [fancyBox](https://github.com/fancyapps/fancyBox) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](farbtastic/farbtastic.d.ts) [Farbtastic: jQuery Color Wheel](http://mattfarina.github.io/farbtastic) by [Matt Brooks](https://github.com/EnableSoftware)
-* [:link:](fast-stats/fast-stats.d.ts) [fast-stats](https://github.com/bluesmoon/node-faststats) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](fastclick/fastclick.d.ts) [FastClick](https://github.com/ftlabs/fastclick) by [Shinnosuke Watanabe](https://github.com/shinnn)
-* [:link:](favico.js/favico.js.d.ts) [favico.js](http://lab.ejci.net/favico.js) by [Yu Matsushita](https://github.com/drowse314-dev-ymat)
-* [:link:](featherlight/featherlight.d.ts) [Featherlight](https://noelboss.github.io/featherlight) by [Kaur Kuut](https://github.com/xStrom)
-* [:link:](whatwg-fetch/whatwg-fetch.d.ts) [fetch API](https://github.com/github/fetch) by [Ryan Graham](https://github.com/ryan-codingintrigue)
-* [:link:](fhir/fhir.d.ts) [FHIR DSTU2](http://www.hl7.org/fhir/2015Sep/index.html) by [Artifact Health](http://www.artifacthealth.com)
-* [:link:](fibers/fibers.d.ts) [fibers](https://github.com/laverdet/node-fibers) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
-* [:link:](field/field.d.ts) [field](https://www.npmjs.com/package/field) by [Leo Liang](https://github.com/aleung/DefinitelyTyped)
-* [:link:](filewriter/filewriter.d.ts) [File API: Writer](http://www.w3.org/TR/file-writer-api) by [Kon](http://phyzkit.net)
-* [:link:](filesystem/filesystem.d.ts) [File System API](http://www.w3.org/TR/file-system-api) by [Kon](http://phyzkit.net)
-* [:link:](file-url/file-url.d.ts) [file-url](https://github.com/sindresorhus/file-url) by [MEDIA CHECK s.r.o.](http://www.mediacheck.cz)
-* [:link:](FileSaver/FileSaver.d.ts) [FileSaver.js](https://github.com/eligrey/FileSaver.js) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](filesize/filesize.d.ts) [filesize](https://github.com/avoidwork/filesize.js) by [Giedrius Grabauskas](https://github.com/GiedriusGrabauskas)
-* [:link:](finalhandler/finalhandler.d.ts) [finalhandler](https://github.com/pillarjs/finalhandler) by [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](Finch/Finch.d.ts) [Finch](https://github.com/stoodder/finchjs) by [David Sichau](https://github.com/DavidSichau)
-* [:link:](findup-sync/findup-sync.d.ts) [findup-sync](https://github.com/cowboy/node-findup-sync) by [Bart van der Schoor](https://github.com/Bartvds), [Nathan Brown](https://github.com/ngbrown)
-* [:link:](fingerprintjs/fingerprint.d.ts) [fingerprintjs](https://github.com/Valve/fingerprintjs) by [Shunsuke Ohtani](https://github.com/zaneli)
-* [:link:](state-machine/state-machine.d.ts) [Finite State Machine](https://github.com/jakesgordon/javascript-state-machine) by [Boris Yankov](https://github.com/borisyankov), [Maarten Docter](https://github.com/mdocter), [William Sears](https://github.com/MrBigDog2U)
-* [:link:](firebase/firebase.d.ts) [Firebase API](https://www.firebase.com/docs/javascript/firebase) by [Vincent Botone](https://github.com/vbortone), [Shin1 Kashimura](https://github.com/in-async), [Sebastien Dubois](https://github.com/dsebastien), [Szymon Stasik](https://github.com/ciekawy)
-* [:link:](firebase-client/firebase-client.d.ts) [Firebase Client](https://www.github.com/jpstevens/firebase-client) by [Andrew Breen](https://github.com/fpsscarecrow)
-* [:link:](firebase/firebase-simplelogin.d.ts) [Firebase Simple Login](https://www.firebase.com/docs/security/simple-login-overview.html) by [Wilker Lucio](http://github.com/wilkerlucio)
-* [:link:](firebase-token-generator/firebase-token-generator.d.ts) [firebase-token-generator](https://github.com/firebase/firebase-token-generator-node) by [Hans Van den Keybus](https://github.com/dotdotcommadot)
-* [:link:](first-mate/first-mate.d.ts) [first-mate](https://github.com/atom/first-mate) by [Vadim Macagon](https://github.com/enlight)
-* [:link:](fixed-data-table/fixed-data-table.d.ts) [fixed-data-table](https://github.com/facebook/fixed-data-table) by [Petar Paar](https://github.com/pepaar), [Stephen Jelfs](https://github.com/stephenjelfs)
-* [:link:](flake-idgen/flake-idgen.d.ts) [flakge-idgen](https://github.com/T-PWK/flake-idgen) by [Yuce Tekol](http://yuce.me)
-* [:link:](flat/flat.d.ts) [flat](https://github.com/hughsk/flat) by [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](flexSlider/flexSlider.d.ts) [FlexSlider 2 jquery plugin](https://github.com/woothemes/FlexSlider) by [Diullei Gomes](https://github.com/diullei)
-* [:link:](flickity/flickity.d.ts) [Flickity](http://flickity.metafizzy.co) by [Chris McGrath](https://www.github.com/clmcgrath)
-* [:link:](flight/flight.d.ts) [Flight](http://flightjs.github.com/flight) by [Jonathan Hedrén](https://github.com/jonathanhedren)
-* [:link:](flightplan/flightplan.d.ts) [flightplan](https://github.com/pstadler/flightplan) by [Borislav Zhivkov](https://github.com/borislavjivkov)
-* [:link:](flipsnap/flipsnap.d.ts) [flipsnap.js](http://pxgrid.github.io/js-flipsnap) by [kubosho](https://github.com/kubosho), [gsino](https://github.com/gsino), [Mayuki Sawatari](https://github.com/mayuki)
-* [:link:](flot/jquery.flot.d.ts) [Flot](http://www.flotcharts.org) by [Matt Burland](https://github.com/burlandm)
-* [:link:](flowjs/flowjs.d.ts) [flowjs](https://github.com/flowjs/flow.js) by [Ryan McNamara](https://github.com/ryan10132)
-* [:link:](flux/flux.d.ts) [Flux](http://facebook.github.io/flux) by [Steve Baker](https://github.com/stkb), [Giedrius Grabauskas](https://github.com/QuatroDevOfficial)
-* [:link:](flux-standard-action/flux-standard-action.d.ts) [flux-standard-action](https://github.com/acdlite/flux-standard-action) by [Qubo](https://github.com/tkqubo)
-* [:link:](fluxxor/fluxxor.d.ts) [Fluxxor](https://github.com/BinaryMuse/fluxxor) by [Yuichi Murata](https://github.com/mrk21)
-* [:link:](fontoxml/fontoxml.d.ts) [FontoXML](http://www.fontoxml.com) by [Roland Zwaga](https://github.com/rolandzwaga)
-* [:link:](ion.rangeSlider/ion.rangeSlider.d.ts) [for Ion.RangeSlider](https://github.com/IonDen/ion.rangeSlider) by [Sixin Li](https://github.com/sixinli)
-* [:link:](jee-jsf/jsf.d.ts) [for the JSF 2.0 Ajax request API](https://docs.oracle.com/cd/E17802_01/j2ee/javaee/javaserverfaces/2.0/docs/js-api/symbols/jsf.ajax.html) by [Lars Michaelis and Stephan Zerhusen](https://github.com/ButterFaces/ButterFaces)
-* [:link:](forge-di/forge-di.d.ts) [forge-di](https://github.com/nkohari/forge) by [Adam Carr](https://github.com/adamcarr)
-* [:link:](form-data/form-data.d.ts) [form-data](https://github.com/felixge/node-form-data) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
-* [:link:](format-unicorn/format-unicorn.d.ts) [format-unicorn](https://github.com/tallesl/format-unicorn) by [kruncher](https://github.com/kruncher)
-* [:link:](format-unicorn/format-unicorn-safe.d.ts) [format-unicorn](https://github.com/tallesl/format-unicorn) by [kruncher](https://github.com/kruncher)
-* [:link:](formidable/formidable.d.ts) [Formidable](https://github.com/felixge/node-formidable) by [Wim Looman](https://github.com/Nemo157)
-* [:link:](foundation/foundation.d.ts) [Foundation](http://foundation.zurb.com) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](foundation-sites/foundation-sites.d.ts) [Foundation Sites](http://foundation.zurb.com) by [Sam Vloeberghs](https://github.com/samvloeberghs)
-* [:link:](fpsmeter/FPSMeter.d.ts) [FPSmeter](http://darsa.in/fpsmeter) by [Aaron Lampros](http://github.com/alampros)
-* [:link:](freedom/freedom-core-env.d.ts) [freedom](https://github.com/freedomjs/freedom) by [Jonathan Pevarnek](https://github.com/jpevarnek)
-* [:link:](freedom/freedom.d.ts) [freedom](https://github.com/freedomjs/freedom) by [Jonathan Pevarnek](https://github.com/jpevarnek)
-* [:link:](freedom/freedom-module-env.d.ts) [freedom](https://github.com/freedomjs/freedom) by [Jonathan Pevarnek](https://github.com/jpevarnek)
-* [:link:](freeport/freeport.d.ts) [freeport](https://github.com/daaku/nodejs-freeport) by [Arne Schubert](https://github.com/atd-schubert)
-* [:link:](from/from.d.ts) [from](https://github.com/dominictarr/from) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](fromjs/fromjs.d.ts) [fromjs](https://github.com/suckgamony/fromjs) by [Glenn Dierckx](https://github.com/glenndierckx)
-* [:link:](fromnow/fromnow.d.ts) [fromnow](https://github.com/lukeed/fromNow) by [Martin Bukovics](https://github.com/marinewater)
-* [:link:](fs-ext/fs-ext.d.ts) [fs-ext](https://github.com/baudehlo/node-fs-ext) by [Oguzhan Ergin](https://github.com/OguzhanE)
-* [:link:](fs-extra/fs-extra.d.ts) [fs-extra](https://github.com/jprichardson/node-fs-extra) by [midknight41](https://github.com/midknight41)
-* [:link:](fs-extra-promise/fs-extra-promise.d.ts) [fs-extra-promise](https://github.com/overlookmotel/fs-extra-promise) by [midknight41](https://github.com/midknight41), [Jason Swearingen](https://github.com/jasonswearingen)
-* [:link:](fs-finder/fs-finder.d.ts) [fs-finder](https://github.com/sakren/node-fs-finder) by [Michael Zabka](https://github.com/misak113)
-* [:link:](fs-mock/fs-mock.d.ts) [fs-mock](https://github.com/sakren/node-fs-mock) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](ftdomdelegate/ftdomdelegate.d.ts) [ftdomdelegate](https://github.com/ftlabs/ftdomdelegate) by [Christian Holm Nielsen](https://github.com/dotnetnerd)
-* [:link:](ftp/ftp.d.ts) [ftp](https://github.com/mscdex/node-ftp) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](ftpd/ftpd.d.ts) [ftpd](https://github.com/sstur/nodeftpd) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](fullCalendar/fullCalendar.d.ts) [FullCalendar](http://arshaw.com/fullcalendar) by [Neil Stalker](https://github.com/nestalk), [Marcelo Camargo](https://github.com/hasellcamargo)
-* [:link:](fullname/fullname.d.ts) [fullname](https://www.npmjs.com/package/fullname) by [Klaus Reimer](https://github.com/kayahr)
-* [:link:](fuse/fuse.d.ts) [Fuse.js](https://github.com/krisk/Fuse) by [Greg Smith](https://github.com/smrq)
-* [:link:](jquery-galleria/jquery-galleria.d.ts) [galleria.js](https://github.com/aino/galleria) by [Robert Imig](https://github.com/rimig)
-* [:link:](gamepad/gamepad.d.ts) [Gamepad API](http://www.w3.org/TR/gamepad) by [Kon](http://phyzkit.net)
-* [:link:](gamequery/gamequery.d.ts) [gameQuery](http://gamequeryjs.com) by [David Laubreiter](https://github.com/Laubi)
-* [:link:](gandi-livedns/gandi-livedns.d.ts) [Gandi LiveDNS](http://doc.livedns.gandi.net) by [Xavier Stouder](https://github.com/xstoudi)
-* [:link:](gently/gently.d.ts) [gently](https://www.npmjs.org/package/gently) by [bonnici](https://github.com/bonnici)
-* [:link:](geoip-lite/geoip-lite.d.ts) [GeoIP-lite](https://github.com/bluesmoon/node-geoip) by [Yuce Tekol](http://yuce.me)
-* [:link:](geojson/geojson.d.ts) [GeoJSON Format Specification](http://geojson.org) by [Jacob Bruun](https://github.com/cobster)
-* [:link:](geometry-dom/geometry-dom.d.ts) [Geometry Format Specification](http://www.w3.org/TR/geometry-1) by [Toshiya Nakakura](https://github.com/nakakura)
-* [:link:](giraffe/giraffe.d.ts) [Giraffe](https://github.com/barc/backbone.giraffe) by [Matt McCray](https://github.com/darthapo)
-* [:link:](git-config/git-config.d.ts) [git-config](https://github.com/eugeneware/git-config) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](gl-matrix/gl-matrix.d.ts) [gl-matrix](https://github.com/toji/gl-matrix) by [Tat](https://github.com/tatchx)
-* [:link:](gldatepicker/gldatepicker.d.ts) [glDatePicker](http://glad.github.com/glDatePicker) by [Dániel Tar](https://github.com/qcz)
-* [:link:](glidejs/glidejs.d.ts) [Glide.js](http://glide.jedrzejchalubek.com) by [Milan Jaros](https://github.com/milanjaros)
-* [:link:](glob/glob.d.ts) [Glob](https://github.com/isaacs/node-glob) by [vvakame](https://github.com/vvakame)
-* [:link:](glob-expand/glob-expand.d.ts) [glob-expand](https://github.com/anodynos/node-glob-expand) by [vvakame](https://github.com/vvakame)
-* [:link:](glob-stream/glob-stream.d.ts) [glob-stream](http://github.com/wearefractal/glob-stream) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](globalize/globalize.d.ts) [Globalize](https://github.com/jquery/globalize) by [Aram Taieb](https://github.com/afromogli)
-* [:link:](gm/gm.d.ts) [gm](https://github.com/aheckmann/gm) by [Joel Spadin](https://github.com/ChaosinaCan)
-* [:link:](goJS/goJS.d.ts) [GoJS](http://gojs.net) by [Northwoods Software](https://github.com/NorthwoodsSoftware)
-* [:link:](google.analytics/ga.d.ts) [Google Analytics (Classic and Universal)](https://developers.google.com/analytics/devguides/collection/gajs) by [Ronnie Haakon Hegelund](http://ronniehegelund.blogspot.dk), [Pat Kujawa](http://patkujawa.com)
-* [:link:](gapi/gapi.d.ts) [Google API Client](https://code.google.com/p/google-api-javascript-client) by [Frank M](https://github.com/sgtfrankieboy)
-* [:link:](google-apps-script/google-apps-script.content.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.maps.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.mail.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.lock.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.language.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.contacts.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.charts.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.calendar.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.cache.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.base.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.script.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.jdbc.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.gmail.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.forms.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.html.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.xml-service.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.utilities.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.url-fetch.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.ui.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.types.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.spreadsheet.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.sites.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.properties.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.document.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.optimization.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.groups.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.drive.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google.feeds/google.feed.api.d.ts) [Google Feed Apis](https://developers.google.com/feed) by [RodneyJT](https://github.com/RodneyJT)
-* [:link:](google.geolocation/google.geolocation.d.ts) [Google Geolocation](https://code.google.com/p/geo-location-javascript) by [Vincent Bortone](https://github.com/vbortone)
-* [:link:](googlemaps/google.maps.d.ts) [Google Maps JavaScript API](https://developers.google.com/maps) by [Folia A/S](http://www.folia.dk), [Chris Wrench](https://github.com/cgwrench)
-* [:link:](gapi.pagespeedonline/gapi.pagespeedonline.d.ts) [Google Page Speed Online Api](https://developers.google.com/speed/pagespeed) by [Frank M](https://github.com/sgtfrankieboy)
-* [:link:](google.picker/google.picker.d.ts) [Google Picker API](https://developers.google.com/picker) by [grapswiz](https://github.com/grapswiz)
-* [:link:](google-drive-realtime-api/google-drive-realtime-api.d.ts) [Google Realtime API](https://developers.google.com/google-apps/realtime) by [Dustin Wehr](http://cs.toronto.edu/~wehr)
-* [:link:](recaptcha/recaptcha.d.ts) [Google Recaptcha](https://www.google.com/recaptcha) by [Brent Jenkins](https://github.com/brentj73)
-* [:link:](grecaptcha/grecaptcha.d.ts) [Google Recaptcha v2](https://www.google.com/recaptcha) by [Kristof Mattei](http://kristofmattei.be)
-* [:link:](gapi.auth2/gapi.auth2.d.ts) [Google Sign-In API](https://developers.google.com/identity/sign-in/web) by [Derek Lawless](https://github.com/flawless2011)
-* [:link:](gapi.translate/gapi.translate.d.ts) [Google Translate API](https://developers.google.com/translate) by [Frank M](https://github.com/sgtfrankieboy)
-* [:link:](gapi.urlshortener/gapi.urlshortener.d.ts) [Google Url Shortener API](https://developers.google.com/url-shortener) by [Frank M](https://github.com/sgtfrankieboy)
-* [:link:](google.visualization/google.visualization.d.ts) [Google Visualisation Apis](https://developers.google.com/chart) by [Dan Ludwig](https://github.com/danludwig)
-* [:link:](google-closure-compiler/google-closure-compiler.d.ts) [google-closure-compiler](https://github.com/chadkillingsworth/closure-compiler-npm) by [Evan Martin](http://neugierig.org)
-* [:link:](google-maps/google-maps.d.ts) [google-maps](https://www.npmjs.com/package/google-maps) by [Deividas Bakanas](https://github.com/DeividasBakanas), [Giedrius Grabauskas](https://github.com/GiedriusGrabauskas)
-* [:link:](gae.channel.api/gae.channel.api.d.ts) [GoogleAppEngine's Channel API](https://developers.google.com/appengine/docs/java/channel/javascript) by [vvakame](https://github.com/vvakame)
-* [:link:](graceful-fs/graceful-fs.d.ts) [graceful-fs](https://github.com/cowboy/graceful-fs) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](graham_scan/graham_scan.d.ts) [graham_scan](https://github.com/brian3kb/graham_scan_js) by [Harm Berntsen](https://github.com/hberntsen)
-* [:link:](graphene-pk11/graphene-pk11.d.ts) [graphene-pk11](https://github.com/PeculiarVentures/graphene) by [Stepan Miroshin](https://github.com/microshine)
-* [:link:](graphviz/graphviz.d.ts) [Graphviz](https://github.com/glejeune/node-graphviz) by [Matt Frantz](https://github.com/mhfrantz)
-* [:link:](gravatar/gravatar.d.ts) [gravatar](https://github.com/emerleite/node-gravatar) by [Denis Sokolov](https://github.com/denis-sokolov)
-* [:link:](qrcode-generator/qrcode-generator.d.ts) [grcode-generator](https://github.com/kazuhikoarase/qrcode-generator) by [Stefan Huber](https://github.com/stefanhuber)
-* [:link:](greasemonkey/greasemonkey.d.ts) [Greasemonkey](http://www.greasespot.net) by [Kota Saito](https://github.com/kotas)
-* [:link:](greensock/greensock.d.ts) [GreenSock Animation Platform](http://www.greensock.com/get-started-js) by [Robert S](https://github.com/codebelt)
-* [:link:](gridfs-stream/gridfs-stream.d.ts) [gridfs-stream](https://github.com/aheckmann/gridfs-stream) by [Lior Mualem](https://github.com/liorm)
-* [:link:](gridstack/gridstack.d.ts) [Gridstack](http://troolee.github.io/gridstack.js) by [Pascal Senn](https://github.com/PascalSenn)
-* [:link:](gruntjs/gruntjs.d.ts) [Grunt 0.4.x](http://gruntjs.com) by [Jeff May](https://github.com/jeffmay), [Basarat Ali Syed](https://github.com/basarat)
-* [:link:](gsap/Ease.d.ts) [GSAP](http://greensock.com) by [VILIC VANE](https://vilic.github.io)
-* [:link:](gsap/Core.d.ts) [GSAP](http://greensock.com) by [VILIC VANE](https://vilic.github.io)
-* [:link:](gsap/TweenLite.d.ts) [GSAP](http://greensock.com) by [VILIC VANE](https://vilic.github.io)
-* [:link:](gulp/gulp.d.ts) [Gulp v3.8.x](http://gulpjs.com) by [Drew Noakes](https://drewnoakes.com)
-* [:link:](gulp-autoprefixer/gulp-autoprefixer.d.ts) [gulp-autoprefixer](https://github.com/sindresorhus/gulp-autoprefixer) by [Asana](https://asana.com)
-* [:link:](gulp-babel/gulp-babel.d.ts) [gulp-babel](https://github.com/babel/gulp-babel) by [Aya Morisawa](https://github.com/AyaMorisawa)
-* [:link:](gulp-cached/gulp-cached.d.ts) [gulp-cached](https://github.com/wearefractal/gulp-cached) by [Thomas Corbière](https://github.com/tomc974)
-* [:link:](gulp-changed/gulp-changed.d.ts) [gulp-changed](https://github.com/sindresorhus/gulp-changed) by [Thomas Corbière](https://github.com/tomc974)
-* [:link:](gulp-cheerio/gulp-cheerio.d.ts) [gulp-cheerio](https://github.com/KenPowers/gulp-cheerio) by [Qubo](https://github.com/tkQubo)
-* [:link:](gulp-coffeeify/gulp-coffeeify.d.ts) [gulp-coffeeify](https://github.com/nariyu/gulp-coffeeify) by [Qubo](https://github.com/tkQubo)
-* [:link:](gulp-coffeelint/gulp-coffeelint.d.ts) [gulp-coffeelint](https://github.com/janraasch/gulp-coffeelint) by [Qubo](https://github.com/tkQubo)
-* [:link:](gulp-concat/gulp-concat.d.ts) [gulp-concat](http://github.com/wearefractal/gulp-concat) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
-* [:link:](gulp-csso/gulp-csso.d.ts) [gulp-csso](https://github.com/ben-eb/gulp-csso) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](gulp-debug/gulp-debug.d.ts) [gulp-debug](https://github.com/sindresorhus/gulp-debug) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](gulp-dtsm/gulp-dtsm.d.ts) [gulp-dtsm](https://github.com/9joneg/gulp-dtsm) by [Aya Morisawa](https://github.com/AyaMorisawa)
-* [:link:](gulp-espower/gulp-espower.d.ts) [gulp-espower](https://github.com/power-assert-js/gulp-espower) by [Qubo](https://github.com/tkQubo)
-* [:link:](gulp-filter/gulp-filter.d.ts) [gulp-filter](https://github.com/sindresorhus/gulp-filter) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](gulp-flatten/gulp-flatten.d.ts) [gulp-flatten](https://github.com/armed/gulp-flatten) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
-* [:link:](gulp-gh-pages/gulp-gh-pages.d.ts) [gulp-gh-pages](https://github.com/rowoot/gulp-gh-pages) by [Asana](https://asana.com)
-* [:link:](gulp-gzip/gulp-gzip.d.ts) [gulp-gzip](https://github.com/jstuckey/gulp-gzip) by [Qubo](https://github.com/tkQubo)
-* [:link:](gulp-help/gulp-help.d.ts) [gulp-help](https://github.com/chmontgomery/gulp-help) by [Qubo](https://github.com/tkQubo)
-* [:link:](gulp-html-replace/gulp-html-replace.d.ts) [gulp-html-replace](https://www.npmjs.com/package/gulp-html-replace) by [Peter Juras](https://github.com/peterjuras)
-* [:link:](gulp-htmlmin/gulp-htmlmin.d.ts) [gulp-htmlmin](https://github.com/jonschlinkert/gulp-htmlmin) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](gulp-if/gulp-if.d.ts) [gulp-if](https://github.com/robrich/gulp-if) by [Asana](https://asana.com), [Joe Skeen](http://github.com/joeskeen)
-* [:link:](gulp-inject/gulp-inject.d.ts) [gulp-inject](https://github.com/klei/gulp-inject) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
-* [:link:](gulp-install/gulp-install.d.ts) [gulp-install](https://www.npmjs.com/package/gulp-install) by [Peter Juras](https://github.com/peterjuras)
-* [:link:](gulp-istanbul/gulp-istanbul.d.ts) [gulp-istanbul](https://github.com/SBoudrias/gulp-istanbul) by [Asana](https://asana.com)
-* [:link:](gulp-jade/gulp-jade.d.ts) [gulp-jade](https://github.com/phated/gulp-jade) by [berwyn](https://github.com/berwyn)
-* [:link:](gulp-jasmine-browser/gulp-jasmine-browser.d.ts) [gulp-jasmine-browser](https://github.com/jasmine/gulp-jasmine-browser) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](gulp-json-editor/gulp-json-editor.d.ts) [gulp-json-editor](https://www.npmjs.com/package/gulp-json-editor) by [Peter Juras](https://github.com/peterjuras)
-* [:link:](gulp-jspm/gulp-jspm.d.ts) [gulp-jspm](https://www.npmjs.com/package/gulp-jspm) by [Peter Juras](https://github.com/peterjuras)
-* [:link:](gulp-less/gulp-less.d.ts) [gulp-less](https://github.com/plus3network/gulp-less) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
-* [:link:](gulp-load-plugins/gulp-load-plugins.d.ts) [gulp-load-plugins](https://github.com/jackfranklin/gulp-load-plugins) by [Joe Skeen](http://github.com/joeskeen)
-* [:link:](gulp-minify-css/gulp-minify-css.d.ts) [gulp-minify-css](https://github.com/jonathanepollack/gulp-minify-css) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
-* [:link:](gulp-minify-html/gulp-minify-html.d.ts) [gulp-minify-html](https://github.com/murphydanger/gulp-minify-html) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](gulp-mocha/gulp-mocha.d.ts) [gulp-mocha](https://github.com/sindresorhus/gulp-mocha) by [Asana](https://asana.com)
-* [:link:](gulp-newer/gulp-newer.d.ts) [gulp-newer](https://github.com/tschaub/gulp-newer) by [Thomas Corbière](https://github.com/tomc974)
-* [:link:](gulp-ng-annotate/gulp-ng-annotate.d.ts) [gulp-ng-annotate](https://github.com/Kagami/gulp-ng-annotate) by [Qubo](https://github.com/tkQubo)
-* [:link:](gulp-nodemon/gulp-nodemon.d.ts) [gulp-nodemon](https://github.com/JacksonGariety/gulp-nodemon) by [Qubo](https://github.com/tkQubo)
-* [:link:](gulp-plumber/gulp-plumber.d.ts) [gulp-plumber](https://github.com/floatdrop/gulp-plumber) by [Joe Skeen](http://github.com/joeskeen)
-* [:link:](gulp-protractor/gulp-protractor.d.ts) [gulp-protractor](https://github.com/mllrsohn/gulp-protractor) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](gulp-remember/gulp-remember.d.ts) [gulp-remember](https://github.com/ahaurw01/gulp-remember) by [Thomas Corbière](https://github.com/tomc974)
-* [:link:](gulp-rename/gulp-rename.d.ts) [gulp-rename](https://github.com/hparra/gulp-rename) by [Asana](https://asana.com)
-* [:link:](gulp-replace/gulp-replace.d.ts) [gulp-replace](https://github.com/lazd/gulp-replace) by [Asana](https://asana.com)
-* [:link:](gulp-rev/gulp-rev.d.ts) [gulp-rev](https://github.com/sindresorhus/gulp-rev) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](gulp-rev-replace/gulp-rev-replace.d.ts) [gulp-rev-replace](https://github.com/jamesknelson/gulp-rev-replace) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](gulp-ruby-sass/gulp-ruby-sass.d.ts) [gulp-ruby-sass](https://github.com/sindresorhus/gulp-ruby-sass) by [Agnislav Onufrijchuk](https://github.com/agnislav)
-* [:link:](gulp-sass/gulp-sass.d.ts) [gulp-sass](https://github.com/dlmanning/gulp-sass) by [Asana](https://asana.com)
-* [:link:](gulp-shell/gulp-shell.d.ts) [gulp-shell](https://github.com/sun-zheng-an/gulp-shell) by [Qubo](https://github.com/tkqubo)
-* [:link:](gulp-size/gulp-size.d.ts) [gulp-size](https://github.com/sindresorhus/gulp-size) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](gulp-sort/gulp-sort.d.ts) [gulp-sort](https://github.com/pgilad/gulp-sort) by [Joe Skeen](http://github.com/joeskeen)
-* [:link:](gulp-sourcemaps/gulp-sourcemaps.d.ts) [gulp-sourcemaps](https://github.com/floridoo/gulp-sourcemaps) by [Asana](https://asana.com)
-* [:link:](gulp-strip-debug/gulp-strip-debug.d.ts) [gulp-strip-debug](https://www.npmjs.com/package/gulp-strip-debug) by [Peter Juras](https://github.com/peterjuras)
-* [:link:](gulp-svg-sprite/gulp-svg-sprite.d.ts) [gulp-svg-sprite](https://github.com/jkphl/gulp-svg-sprite) by [Qubo](https://github.com/tkqubo)
-* [:link:](gulp-task-listing/gulp-task-listing.d.ts) [gulp-task-listing](https://github.com/OverZealous/gulp-task-listing) by [Joe Skeen](http://github.com/joeskeen)
-* [:link:](gulp-tsd/gulp-tsd.d.ts) [gulp-tsd](https://github.com/moznion/gulp-tsd) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
-* [:link:](gulp-tslint/gulp-tslint.d.ts) [gulp-tslint](https://github.com/panuhorsmalahti/gulp-tslint) by [Asana](https://asana.com)
-* [:link:](gulp-typedoc/gulp-typedoc.d.ts) [gulp-typedoc](https://github.com/rogierschouten/gulp-typedoc) by [Asana](https://asana.com)
-* [:link:](gulp-typescript/gulp-typescript.d.ts) [gulp-typescript](https://github.com/ivogabe/gulp-typescript) by [Asana](https://asana.com), [Thomas Corbière](https://github.com/tomc974)
-* [:link:](gulp-uglify/gulp-uglify.d.ts) [gulp-uglify](https://github.com/terinjokes/gulp-uglify) by [Christopher Haws](https://github.com/ChristopherHaws)
-* [:link:](gulp-useref/gulp-useref.d.ts) [gulp-useref](https://github.com/jonkemp/gulp-useref) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](gulp-util/gulp-util.d.ts) [gulp-util v3.0.x](https://github.com/gulpjs/gulp-util) by [jedmao](https://github.com/jedmao)
-* [:link:](gulp-watch/gulp-watch.d.ts) [gulp-watch](https://github.com/floatdrop/gulp-watch) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](hammerjs/hammerjs.d.ts) [Hammer.js](http://hammerjs.github.io) by [Philip Bulley](https://github.com/milkisevil), [Han Lin Yap](https://github.com/codler)
-* [:link:](handlebars/handlebars.d.ts) [Handlebars](http://handlebarsjs.com) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](handsontable/handsontable.d.ts) [Handsontable](https://handsontable.com) by [Handsoncode sp. z o.o.](http://handsoncode.net)
-* [:link:](hapi/hapi.d.ts) [hapi](http://github.com/spumko/hapi) by [Jason Swearingen](http://github.com/jasonswearingen)
-* [:link:](harmony-proxy/harmony-proxy.d.ts) [harmony-proxy](https://www.npmjs.com/package/harmony-proxy) by [Remo Jansen](https://github.com/remojansen)
-* [:link:](hasher/hasher.d.ts) [Hasher.js](https://github.com/millermedeiros/hasher) by [flyfishMT](https://github.com/flyfishMT)
-* [:link:](hashids/hashids.d.ts) [Hashids.js 1.x](https://github.com/ivanakimov/hashids.node.js) by [Paulo Cesar](https://github.com/pocesar)
-* [:link:](hashmap/hashmap.d.ts) [HashMap](https://github.com/flesler/hashmap) by [Rafał Wrzeszcz](http://wrzasq.pl), [Vasya Aksyonov](https://github.com/outring)
-* [:link:](he/he.d.ts) [he](https://github.com/mathiasbynens/he) by [Simon Edwards](https://github.com/sedwards2009)
-* [:link:](Headroom/headroom.d.ts) [headroom.js](http://wicky.nillia.ms/headroom.js) by [Jakub Olek](https://github.com/hakubo)
-* [:link:](heap/heap.d.ts) [heap](https://github.com/qiao/heap.js) by [Ryan McNamara](https://github.com/ryan10132)
-* [:link:](heatmap.js/heatmap.d.ts) [heatmap.js](https://github.com/pa7/heatmap.js) by [Yang Guan](https://github.com/lookuptable)
-* [:link:](hellojs/hellojs.d.ts) [hello.js](http://adodson.com/hello.js) by [Pavel Zika](https://github.com/PavelPZ)
-* [:link:](helmet/helmet.d.ts) [helmet](https://github.com/helmetjs/helmet) by [Cyril Schumacher](https://github.com/cyrilschumacher), [Evan Hahn](https://github.com/EvanHahn)
-* [:link:](highcharts/highcharts.d.ts) [Highcharts](http://www.highcharts.com) by [Damiano Gambarotto](http://github.com/damianog), [Dan Lewi Harkestad](http://github.com/baltie)
-* [:link:](highcharts-ng/highcharts-ng.d.ts) [highcharts-ng](https://github.com/pablojim/highcharts-ng) by [Scott Hatcher](https://github.com/scatcher)
-* [:link:](highland/highland.d.ts) [Highland](http://highlandjs.org) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](highlightjs/highlightjs.d.ts) [highlight.js](https://github.com/isagalaev/highlight.js) by [Niklas Mollenhauer](https://github.com/nikeee), [Jeremy Hull](https://github.com/sourrust)
-* [:link:](highcharts/highstock.d.ts) [Highstock](http://www.highcharts.com) by [David Deutsch](http://github.com/DavidKDeutsch)
-* [:link:](react-router/history.d.ts) [history](https://github.com/rackt/history) by [Sergey Buturlakin](https://github.com/sergey-buturlakin), [Nathan Brown](https://github.com/ngbrown)
-* [:link:](history/history.d.ts) [History.js](https://github.com/browserstate/history.js) by [Boris Yankov](https://github.com/borisyankov), [Gidon Junge](https://github.com/gjunge)
-* [:link:](hopscotch/hopscotch.d.ts) [Hopscotch](http://linkedin.github.io/hopscotch) by [Tim Perry](https://github.com/pimterry)
-* [:link:](howlerjs/howler.d.ts) [howler.js](https://github.com/goldfire/howler.js) by [Pedro Casaubon](https://github.com/xperiments)
-* [:link:](touch-events/touch-events.d.ts) [HTML Touch Events](http://www.w3.org/TR/touch-events) by [Kevin Barabash](https://github.com/kevinb7)
-* [:link:](html-entities/html-entities.d.ts) [html-entities](https://www.npmjs.com/package/html-entities) by [Xavier Stouder](https://github.com/xstoudi)
-* [:link:](html-to-text/html-to-text.d.ts) [html-to-text](https://github.com/werk85/node-html-to-text) by [Eryk Warren](https://github.com/erykwarren)
-* [:link:](html2canvas/html2canvas.d.ts) [html2canvas.js](https://github.com/niklasvh/html2canvas) by [Richard Hepburn](https://github.com/rwhepburn)
-* [:link:](html-minifier/html-minifier.d.ts) [HTMLMinifier](https://github.com/kangax/html-minifier) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](htmlparser2/htmlparser2.d.ts) [htmlparser2 v3.7.x](https://github.com/fb55/htmlparser2) by [James Roland Cabresos](https://github.com/staticfunction)
-* [:link:](htmltojsx/htmltojsx.d.ts) [htmltojsx](https://www.npmjs.com/package/htmltojsx) by [Basarat Ali Syed](https://github.com/basarat)
-* [:link:](http-errors/http-errors.d.ts) [http-errors](https://github.com/jshttp/http-errors) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](http-status/http-status.d.ts) [http-status](https://github.com/wdavidw/node-http-status) by [Michael Zabka](https://github.com/misak113)
-* [:link:](http-string-parser/http-string-parser.d.ts) [http-string-parser](https://github.com/apiaryio/http-string-parser) by [MIZUNE Pine](https://github.com/pine613)
-* [:link:](httperr/httperr.d.ts) [httperr](https://github.com/pluma/httperr) by [Troy Gerwien](https://github.com/yortus)
-* [:link:](humane/humane.d.ts) [Humane](http://wavded.github.com/humane-js) by [jmvrbanac](https://github.com/jmvrbanac)
-* [:link:](hypertext-application-language/hypertext-application-language.d.ts) [Hypertext Application Language Draft 6](https://tools.ietf.org/html/draft-kelly-json-hal-06) by [Maks3w](https://github.com/maks3w)
-* [:link:](i18n-node/i18n-node.d.ts) [i18n-node](https://github.com/mashpie/i18n-node) by [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](i18next/i18next.d.ts) [i18next](http://i18next.com) by [Michael Ledin](https://github.com/mxl)
-* [:link:](ng-i18next/ng-i18next.d.ts) [i18next](https://github.com/i18next/ng-i18next) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](i18next-browser-languagedetector/i18next-browser-languagedetector.d.ts) [i18next-browser-languagedetector](http://i18next.com) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](i18next-express-middleware/i18next-express-middleware.d.ts) [i18next-express-middleware](http://i18next.com) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](i18next-node-fs-backend/i18next-node-fs-backend.d.ts) [i18next-node-fs-backend](https://github.com/i18next/i18next-node-fs-backend) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](i18next-sprintf-postprocessor/i18next-sprintf-postprocessor.d.ts) [i18next-sprintf-postProcessor](https://github.com/i18next/i18next-sprintf-postProcessor) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](iban/iban.d.ts) [iban.js](https://github.com/arhs/iban.js) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](ibm-mobilefirst/ibm-mobilefirst.d.ts) [IBM MobileFirst Platform Foundation](http://www.ibm.com/software/products/en/mobilefirstfoundation) by [Guillermo Ignacio Enriquez Gutierrez](https://github.com/nacho4d)
-* [:link:](icepick/icepick.d.ts) [icepick](https://github.com/aearly/icepick) by [Nathan Brown](https://github.com/ngbrown)
-* [:link:](icheck/icheck.d.ts) [iCheck](http://damirfoy.com/iCheck) by [Dániel Tar](https://github.com/qcz)
-* [:link:](iconv/iconv.d.ts) [iconv](https://github.com/bnoordhuis/node-iconv) by [delphinus](https://github.com/delphinus35)
-* [:link:](image-size/image-size.d.ts) [image-size](https://github.com/image-size/image-size) by [Elisée MAURER](https://github.com/elisee)
-* [:link:](imagemagick/imagemagick.d.ts) [imagemagick](http://github.com/rsms/node-imagemagick) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
-* [:link:](imagemagick-native/imagemagick-native.d.ts) [imagemagick-native](https://www.npmjs.org/package/imagemagick-native) by [Hiroki Horiuchi](https://github.com/horiuchi)
-* [:link:](imagesloaded/imagesloaded.d.ts) [imagesLoaded](https://github.com/desandro/imagesloaded) by [Chris Charabaruk](http://github.com/coldacid)
-* [:link:](imap/imap.d.ts) [imap](https://www.npmjs.com/package/imap) by [Peter Snider](https://github.com/psnider)
-* [:link:](imgur-rest-api/imgur-rest-api.d.ts) [Imgur REST API v3](https://api.imgur.com) by [Luke William Westby](http://github.com/lukewestby)
-* [:link:](immutability-helper/immutability-helper.d.ts) [immutability-helper](https://github.com/kolodny/immutability-helper) by [Sean Kelley](https://github.com/seansfkelley)
-* [:link:](impress/impress.d.ts) [Impress.js](https://github.com/bartaz/impress.js) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](incremental-dom/incremental-dom.d.ts) [Incremetal DOM](https://github.com/google/incremental-dom) by [Basarat Ali Syed](https://github.com/basarat), [Markus Lanthaler](https://github.com/lanthaler)
-* [:link:](inflected/inflected.d.ts) [inflected](https://github.com/martinandert/inflected) by [Daniel Schmidt](https://github.com/dsci)
-* [:link:](inflection/inflection.d.ts) [inflection](https://github.com/dreamerslab/node.inflection) by [Shogo Iwano](https://github.com/shiwano)
-* [:link:](inherits/inherits.d.ts) [inherits](https://github.com/isaacs/inherits) by [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](ini/ini.d.ts) [ini](https://github.com/isaacs/ini) by [Marcin Porębski](https://github.com/marcinporebski)
-* [:link:](iniparser/iniparser.d.ts) [iniparser](https://github.com/shockie/node-iniparser) by [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](inline-css/inline-css.d.ts) [inline-css](https://github.com/jonkemp/inline-css) by [Philip Spain](https://github.com/philipisapain)
-* [:link:](inquirer/inquirer.d.ts) [Inquirer.js](https://github.com/SBoudrias/Inquirer.js) by [Qubo](https://github.com/tkQubo)
-* [:link:](insight/insight.d.ts) [insight](https://github.com/yeoman/insight) by [vvakame](http://github.com/vvakame)
-* [:link:](cordova-plugin-insomnia/cordova-plugin-insomnia.d.ts) [Insomnia-PhoneGap-Plugin](https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin) by [Markus Wagner](https://github.com/Ritzlgrmft)
-* [:link:](interactjs/interact.d.ts) [Interacting for interact.js](https://github.com/taye/interact.js) by [Douglas Eichelberger](https://github.com/dduugg), [Adi Dahiya](https://github.com/adidahiya), [Tom Hasner](https://github.com/thasner)
-* [:link:](intercomjs/intercom.d.ts) [intercom.js](https://github.com/diy/intercom.js) by [spencerwi](http://github.com/spencerwi)
-* [:link:](intro.js/intro.js.d.ts) [intro.js](https://github.com/usablica/intro.js) by [Maxime Fabre](https://github.com/anahkiasen)
-* [:link:](invariant/invariant.d.ts) [invariant](https://github.com/zertosh/invariant) by [MichaelBennett](https://github.com/bennett000)
-* [:link:](inversify/inversify.d.ts) [inversify](https://github.com/inversify/InversifyJS) by [inversify](https://github.com/inversify)
-* [:link:](ionic/ionic.d.ts) [Ionic](http://ionicframework.com) by [Spencer Williams](https://github.com/spencerwi)
-* [:link:](cordova-ionic/cordova-ionic.d.ts) [Ionic Cordova plugins](https://github.com/driftyco) by [Hendrik Maus](https://github.com/hendrikmaus)
-* [:link:](ioredis/ioredis.d.ts) [ioredis](https://github.com/luin/ioredis) by [York Yao](https://github.com/plantain-00)
-* [:link:](irc/irc.d.ts) [irc](https://github.com/martynsmith/node-irc) by [phillips1012](https://github.com/phillips1012)
-* [:link:](is-lower-case/is-lower-case.d.ts) [is-lower-case](https://github.com/blakeembrey/is-lower-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](is-my-json-valid/is-my-json-valid.d.ts) [is-my-json-valid](https://github.com/mafintosh/is-my-json-valid) by [kruncher](https://github.com/kruncher)
-* [:link:](is-upper-case/is-upper-case.d.ts) [is-upper-case](https://github.com/blakeembrey/is-upper-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](is-url/is-url.d.ts) [is-url](https://github.com/segmentio/is-url) by [Ryota Murohoshi](https://github.com/RyotaMurohoshi)
-* [:link:](is_js/is_js.d.ts) [is.js](http://arasatasaygin.github.io/is.js) by [Rodrigo Cabral](https://github.com/cabralRodrigo)
-* [:link:](iscroll/iscroll.d.ts) [iScroll](http://cubiq.org/iscroll-4) by [Boris Yankov](https://github.com/borisyankov), [Christiaan Rakowski](https://github.com/csrakowski)
-* [:link:](iscroll/iscroll-5.d.ts) [iScroll 5](http://cubiq.org/iscroll-5-ready-for-beta-test) by [Christiaan Rakowski](https://github.com/csrakowski)
-* [:link:](iscroll/iscroll-lite.d.ts) [iScroll Lite](http://cubiq.org/iscroll-4) by [Boris Yankov](https://github.com/borisyankov), [Christiaan Rakowski](https://github.com/csrakowski)
-* [:link:](iscroll/iscroll-5-lite.d.ts) [iScroll Lite 5](http://cubiq.org/iscroll-5-ready-for-beta-test) by [Christiaan Rakowski](https://github.com/csrakowski)
-* [:link:](iso8601-localizer/iso8601-localizer.d.ts) [ISO8601-Localizer](https://github.com/avielfedida/ISO8601-Localizer) by [Aviel Fedida](https://github.com/avielfedida)
-* [:link:](isomorphic-fetch/isomorphic-fetch.d.ts) [isomorphic-fetch](https://github.com/matthew-andrews/isomorphic-fetch) by [Todd Lucas](https://github.com/toddlucas)
-* [:link:](istanbul/istanbul.d.ts) [Istanbul](https://github.com/gotwarlost/istanbul) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](ix.js/ix.d.ts) [IxJS 1.0.6 / ix.js](https://github.com/Reactive-Extensions/IxJS) by [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](ix.js/l2o.d.ts) [IxJS 1.0.6 / l2o.js](https://github.com/Reactive-Extensions/IxJS) by [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](jade/jade.d.ts) [jade](https://github.com/jadejs/jade) by [Panu Horsmalahti](https://github.com/panuhorsmalahti)
-* [:link:](jake/jake.d.ts) [jake](https://github.com/mde/jake) by [Kon](http://phyzkit.net)
-* [:link:](jasmine/jasmine.d.ts) [Jasmine](http://jasmine.github.io) by [Boris Yankov](https://github.com/borisyankov), [Theodore Brown](https://github.com/theodorejb), [David Pärsson](https://github.com/davidparsson)
-* [:link:](jasmine-data_driven_tests/jasmine-data_driven_tests.d.ts) [Jasmine Data Driven Tests](https://github.com/gburghardt/jasmine-data_driven_tests) by [Anthony MacKinnon](https://github.com/AnthonyMacKinnon)
-* [:link:](jasmine-ajax/jasmine-ajax.d.ts) [jasmine-ajax](https://github.com/jasmine/jasmine-ajax) by [Louis Grignon](https://github.com/lgrignon)
-* [:link:](jasmine-es6-promise-matchers/jasmine-es6-promise-matchers.d.ts) [jasmine-es6-promise-matchers](https://github.com/bvaughn/jasmine-es6-promise-matchers) by [Stephen Lautier](https://github.com/stephenlautier)
-* [:link:](jasmine-expect/jasmine-expect.d.ts) [jasmine-expect](https://github.com/JamieMason/Jasmine-Matchers) by [UserPixel](https://github.com/UserPixel)
-* [:link:](jasmine-fixture/jasmine-fixture.d.ts) [Jasmine-fixture](https://github.com/searls/jasmine-fixture) by [Craig Brett](https://github.com/craigbrett17)
-* [:link:](jasmine-jquery/jasmine-jquery.d.ts) [Jasmine-JQuery](https://github.com/velesin/jasmine-jquery) by [Gregor Stamac](https://github.com/gstamac)
-* [:link:](jasmine-matchers/jasmine-matchers.d.ts) [jasmine-matchers](https://github.com/uxebu/jasmine-matchers) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](jasmine-node/jasmine-node.d.ts) [jasmine-node](https://github.com/mhevery/jasmine-node) by [Sven Reglitzki](https://github.com/svi3c)
-* [:link:](jasmine-promise-matchers/jasmine-promise-matchers.d.ts) [jasmine-promise-matchers](https://github.com/bvaughn/jasmine-promise-matchers) by [Matthew Hill](https://github.com/matthewjh)
-* [:link:](java/java.d.ts) [java](https://github.com/joeferner/node-java) by [Jim Lloyd](https://github.com/jimlloyd)
-* [:link:](java-applet/java-applet.d.ts) [Java Applet](https://www.java.com) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](hooker/hooker.d.ts) [JavaScript Hooker](https://github.com/cowboy/javascript-hooker) by [Michael Zabka](https://github.com/misak113)
-* [:link:](oauth.js/oauth.js.d.ts) [JavaScript software for implementing an OAuth consumer](https://code.google.com/p/oauth) by [NOBUOKA Yu](https://github.com/nobuoka)
-* [:link:](javascript-astar/javascript-astar.d.ts) [javascript-astar](https://github.com/bgrins/javascript-astar) by [brian ridley](https://github.com/ptlis)
-* [:link:](javascript-bignum/javascript-bignum.d.ts) [javascript-bignum](https://github.com/jtobey/javascript-bignum) by [Nathan Shively-Sanders](https://github.com/sandersn)
-* [:link:](jbinary/jbinary.d.ts) [jBinary](https://github.com/jDataView/jBinary) by [Tim Bureck](https://github.com/tbureck)
-* [:link:](meteor-jboulhous-dev/meteor-jboulhous-dev.d.ts) [jboulhous:dev](https://github.com/jboulhous/dev) by [Robbie Van Gorkom](https://github.com/vangorra)
-* [:link:](jdataview/jdataview.d.ts) [jDataView](https://github.com/jDataView/jDataView) by [Ingvar Stepanyan](https://github.com/RReverser)
-* [:link:](jest/jest.d.ts) [Jest](http://facebook.github.io/jest) by [Asana](https://asana.com)
-* [:link:](jfp/jfp.d.ts) [JFP](http://cmstead.github.io/JFP) by [Chris Stead](http://www.chrisstead.com)
-* [:link:](jjv/jjv.d.ts) [JJV](https://github.com/acornejo/jjv) by [Wim Looman](https://github.com/Nemo157)
-* [:link:](jjve/jjve.d.ts) [JJVE](https://github.com/silas/jjve) by [Wim Looman](https://github.com/Nemo157)
-* [:link:](joData/joData.d.ts) [joData](https://github.com/mccow002/joData) by [Chris Wrench](https://github.com/cgwrench)
-* [:link:](johnny-five/johnny-five.d.ts) [johnny-five](https://github.com/rwaldron/johnny-five) by [Toshiya Nakakura](https://github.com/nakakura)
-* [:link:](joi/joi.d.ts) [joi](https://github.com/spumko/joi) by [Bart van der Schoor](https://github.com/Bartvds), [Laurence Dougal Myers](https://github.com/laurence-myers), [Christopher Glantschnig](https://github.com/cglantschnig), [David Broder-Rodgers](https://github.com/DavidBR-SW)
-* [:link:](jointjs/jointjs.d.ts) [Joint JS](http://www.jointjs.com) by [Aidan Reel](http://github.com/areel), [David Durman](http://github.com/DavidDurman), [Ewout Van Gossum](https://github.com/DenEwout)
-* [:link:](jqrangeslider/jqrangeslider.d.ts) [jQRangeSlider](http://ghusse.github.com/jQRangeSlider) by [Dániel Tar](https://github.com/qcz)
-* [:link:](jquery/jquery.d.ts) [jQuery 1.10.x / 2.0.x](http://jquery.com) by [Boris Yankov](https://github.com/borisyankov), [Christian Hoffmeister](https://github.com/choffmeister), [Steve Fenton](https://github.com/Steve-Fenton), [Diullei Gomes](https://github.com/Diullei), [Tass Iliopoulos](https://github.com/tasoili), [Jason Swearingen](https://github.com/jasons-novaleaf), [Sean Hill](https://github.com/seanski), [Guus Goossens](https://github.com/Guuz), [Kelly Summerlin](https://github.com/ksummerlin), [Basarat Ali Syed](https://github.com/basarat), [Nicholas Wolverson](https://github.com/nwolverson), [Derek Cicerone](https://github.com/derekcicerone), [Andrew Gaspar](https://github.com/AndrewGaspar), [James Harrison Fisher](https://github.com/jameshfisher), [Seikichi Kondo](https://github.com/seikichi), [Benjamin Jackman](https://github.com/benjaminjackman), [Poul Sorensen](https://github.com/s093294), [Josh Strobl](https://github.com/JoshStrobl), [John Reilly](https://github.com/johnnyreilly), [Dick van den Brink](https://github.com/DickvdBrink)
-* [:link:](jquery.blockUI/jquery.blockUI.d.ts) [jQuery BlockUI Plugin](http://malsup.com/jquery/block) by [Jeffrey Lee](http://blog.darkthread.net)
-* [:link:](jquery.cleditor/jquery.cleditor.d.ts) [jQuery CLEditor Plugin](http://premiumsoftware.net/CLEditor) by [Jeffery Grajkowski](https://github.com/pushplay)
-* [:link:](jquery.colorpicker/jquery.colorpicker.d.ts) [jQuery Colorpicker Plugin](https://github.com/vanderlee/colorpicker) by [Jeffery Grajkowski](https://github.com/pushplay)
-* [:link:](jquery.contextMenu/jquery.contextMenu.d.ts) [jQuery contextMenu](http://medialize.github.com/jQuery-contextMenu) by [Natan Vivo](https://github.com/nvivo)
-* [:link:](jquery.cookie/jquery.cookie.d.ts) [jQuery Cookie Plugin](https://github.com/carhartl/jquery-cookie) by [Roy Goode](https://github.com/RoyGoode), [Ben Lorantfy](https://github.com/BenLorantfy)
-* [:link:](jquery-cropbox/jquery-cropbox.d.ts) [jQuery cropbox](https://github.com/acornejo/jquery-cropbox) by [Per Kastman](https://github.com/PerKastman)
-* [:link:](jquery.cycle2/jquery.cycle2.d.ts) [jQuery Cycle2 version (build 20140216)](http://jquery.malsup.com/cycle2) by [Donny Nadolny](https://github.com/dnadolny)
-* [:link:](datatables.net/index.d.ts) [JQuery DataTables](http://www.datatables.net) by [Kiarash Ghiaseddin](https://github.com/Silver-Connection/DefinitelyTyped), [Omid Rad](https://github.com/omidkrad), [Armin Sander](https://github.com/pragmatrix)
-* [:link:](datatables.net-buttons/index.d.ts) [JQuery DataTables Buttons extension](http://datatables.net/extensions/buttons) by [Sam Germano](https://github.com/SammyG4Free)
-* [:link:](jquery.fileupload/jquery.fileupload.d.ts) [jQuery File Upload Plugin](https://github.com/blueimp/jQuery-File-Upload) by [Rob Alarcon](https://github.com/rob-alarcon)
-* [:link:](jquery.joyride/jquery.joyride.d.ts) [jQuery JoyRide Plugin](https://github.com/zurb/joyride) by [Vincent Bortone](https://github.com/vbortone)
-* [:link:](jqgrid/jqgrid.d.ts) [jQuery jqgrid Plugin](https://github.com/tonytomov/jqGrid) by [Lokesh Peta](https://github.com/lokeshpeta)
-* [:link:](jquery-knob/jquery-knob.d.ts) [jQuery Knob](http://anthonyterrien.com/knob) by [Iain Buchanan](https://github.com/iain8)
-* [:link:](jquery.mmenu/jquery.mmenu.d.ts) [jQuery mmenu](http://mmenu.frebsite.nl) by [John Gouigouix](https://github.com/orchestra-ts/DefinitelyTyped)
-* [:link:](jquerymobile/jquerymobile.d.ts) [jQuery Mobile](http://jquerymobile.com) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](jquery-mockjax/jquery-mockjax.d.ts) [jQuery Mockjax](https://github.com/jakerella/jquery-mockjax) by [Laszlo Jakab](https://github.com/laszlojakab), [Vladimir Đokić](https://github.com/vladeck)
-* [:link:](jquery.notifyBar/jquery.notifyBar.d.ts) [jQuery Notify Bar](http://www.whoop.ee/posts/2013-04-05-the-resurrection-of-jquery-notify-bar) by [Shunsuke Ohtani](https://github.com/zaneli)
-* [:link:](jquery.base64/jquery.base64.d.ts) [jQuery Plugin - base64 codec](https://github.com/yatt/jquery.base64) by [Shinya Mochizuki](https://github.com/enrapt-mochizuki)
-* [:link:](jquery.postMessage/jquery.postMessage.d.ts) [jQuery postMessage](http://benalman.com/projects/jquery-postmessage-plugin) by [Junle Li](https://github.com/lijunle)
-* [:link:](jquery.prettyphoto/jquery.prettyphoto.d.ts) [jQuery prettyPhoto](https://github.com/scaron/prettyphoto) by [pgaske](https://github.com/pgaske)
-* [:link:](jquery.rowGrid/jquery.rowGrid.d.ts) [jQuery rowGrid.js plugin (v1.0.2)](https://github.com/brunjo/rowGrid.js) by [Vinayak Garg](https://github.com/vinayak-garg)
-* [:link:](royalslider/royalslider.d.ts) [jQuery royal-slider](http://dimsemenov.com/plugins/royal-slider/documentation) by [Christiaan Rakowski](https://github.com/csrakowski)
-* [:link:](jquery.simplePagination/jquery.simplePagination.d.ts) [jQuery simplePagination.js](https://github.com/flaviusmatis/simplePagination.js) by [Natan Vivo](https://github.com/nvivo)
-* [:link:](jquery-sortable/jquery-sortable.d.ts) [jQuery Sortable](http://johnny.github.io/jquery-sortable) by [Nathan Pitman](https://github.com/Seltzer)
-* [:link:](succinct/succinct.d.ts) [jQuery Succinct](http://mikeking.io/succinct) by [Matt Brooks](https://github.com/EnableSoftware)
-* [:link:](jquery.tagsmanager/jquery.tagsmanager.d.ts) [jQuery Tags Manager](http://welldonethings.com/tags/manager) by [Vincent Bortone](https://github.com/vbortone)
-* [:link:](jquery.tinycarousel/jquery.tinycarousel.d.ts) [jQuery tinycarousel](http://baijs.nl/tinycarousel) by [Christiaan Rakowski](https://github.com/csrakowski)
-* [:link:](jquery.tinyscrollbar/jquery.tinyscrollbar.d.ts) [jQuery tinyscrollbar](http://baijs.nl/tinyscrollbar) by [Christiaan Rakowski](https://github.com/csrakowski)
-* [:link:](jquery.tooltipster/jquery.tooltipster.d.ts) [jQuery Tooltipster](https://github.com/iamceege/tooltipster) by [Patrick Magee](https://github.com/pjmagee)
-* [:link:](jquery.ui.datetimepicker/jquery.ui.datetimepicker.d.ts) [jQuery UI DateTimePicker](http://trentrichardson.com/examples/timepicker) by [dougajmcdonald](https://github.com/dougajmcdonald)
-* [:link:](jquery.ui.layout/jquery.ui.layout.d.ts) [jQuery UI Layout Plug-in](http://layout.jquery-dev.net) by [Steve Fenton](https://github.com/Steve-Fenton), [Douglas Armstrong](https://github.com/drarmstr)
-* [:link:](jquery.timepicker/jquery.timepicker.d.ts) [jQuery UI Timepicker](http://fgelinas.com/code/timepicker) by [Anwar Javed](https://github.com/anwarjaved)
-* [:link:](jquery-ajax-chain/jquery-ajax-chain.d.ts) [jquery-ajax-chain v](https://github.com/humana-fragilitas/jQuery-Ajax-Chain) by [Andrea Blasio](https://github.com/humana-fragilitas)
-* [:link:](bootpag/bootpag.d.ts) [jQuery-Bootpag](http://botmonster.com/jquery-bootpag) by [MAF.DAP / Romain Deneau](https://github.com/rdeneau)
-* [:link:](jquery-easy-loading/jquery-easy-loading.d.ts) [jquery-easy-loading](http://carlosbonetti.github.io/jquery-loading) by [delphinus](https://github.com/delphinus35)
-* [:link:](jquery-fullscreen/jquery-fullscreen.d.ts) [jquery-fullscreen](https://github.com/kayahr/jquery-fullscreen-plugin) by [Bruno Grieder](https://github.com/bgrieder)
-* [:link:](jquery-handsontable/jquery-handsontable.d.ts) [jquery-handsontable](http://handsontable.com) by [Ted John](https://github.com/intelorca)
-* [:link:](jquery.menuaim/jquery.menuaim.d.ts) [jQuery-menu-aim](https://github.com/kamens/jQuery-menu-aim) by [Robert Fonseca-Ensor](http://www.robfe.com)
-* [:link:](jquery.pjax/jquery.pjax.d.ts) [jquery-pjax](https://github.com/defunkt/jquery-pjax) by [Junle Li](https://github.com/lijunle)
-* [:link:](jquery-timeentry/jquery-timeentry.d.ts) [jQuery-timeentry.js](https://github.com/kbwood/timeentry) by [Mark Nadig](https://github.com/marknadig)
-* [:link:](jquery-urlparam/jquery-urlparam.d.ts) [jquery-urlparam](https://gist.github.com/stpettersens/e1f4478f299b6f4905c1) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](jquery.address/jquery.address.d.ts) [jQuery.Address](https://github.com/asual/jquery-address) by [Martin Duparc](https://github.com/martinduparc), [Tim Klingeleers](https://github.com/mardaneus86)
-* [:link:](jquery.ajaxfile/jquery.ajaxFile.d.ts) [jquery.ajaxfile](https://github.com/fpellet/jquery.ajaxFile) by [Florent PELLET](https://github.com/fpellet)
-* [:link:](jquery.are-you-sure/jquery.are-you-sure.d.ts) [jquery.are-you-sure.js](https://github.com/codedance/jquery.AreYouSure) by [Jon Egerton](https://github.com/jonegerton)
-* [:link:](jquery.autosize/jquery.autosize.d.ts) [jquery.autosize](http://www.jacklmoore.com/autosize) by [Aaron T. King](https://github.com/kingdango)
-* [:link:](jquery.bbq/jquery.bbq.d.ts) [jquery.bbq](http://benalman.com/projects/jquery-bbq-plugin) by [Adam R. Smith](https://github.com/sunetos)
-* [:link:](jquery.clientSideLogging/jquery.clientSideLogging.d.ts) [jquery.clientSideLogging](https://github.com/remybach/jQuery.clientSideLogging) by [Diullei Gomes](https://github.com/diullei)
-* [:link:](jquery.color/jquery.color.d.ts) [jquery.color.js](https://github.com/jquery/jquery-color) by [Derek Cicerone](https://github.com/derekcicerone)
-* [:link:](jquery.colorbox/jquery.colorbox.d.ts) [jQuery.Colorbox](http://www.jacklmoore.com/colorbox) by [Gidon Junge](https://github.com/gjunge)
-* [:link:](jquery.customSelect/jquery.customSelect.d.ts) [jquery.customSelect.js](http://adam.co/lab/jquery/customselect/) by [adamcoulombe](https://github.com/adamcoulombe)
-* [:link:](jquery.cycle/jquery.cycle.d.ts) [jQuery.cycle.js](http://jquery.malsup.com/cycle) by [François Guillot](http://fguillot.developpez.com)
-* [:link:](jquery.dropotron/jquery.dropotron.d.ts) [jquery.dropotron](https://github.com/n33/jquery.dropotron) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](dynatable/dynatable.d.ts) [jquery.dynatable](http://www.dynatable.com) by [François Massart](https://github.com/francoismassart)
-* [:link:](jquery.dynatree/jquery.dynatree.d.ts) [jquery.dynatree](http://code.google.com/p/dynatree) by [François de Campredon](https://github.com/fdecampredon)
-* [:link:](jquery.fancytree/jquery.fancytree.d.ts) [jquery.fancytree](https://github.com/mar10/fancytree) by [Peter Palotas](https://github.com/alphaleonis)
-* [:link:](jquery.finger/jquery.finger.d.ts) [jquery.finger.js](http://ngryman.sh/jquery.finger) by [Max Ackley](https://github.com/maxackley)
-* [:link:](jquery.form/jquery.form.d.ts) [jQuery.form.js 3.26.0](http://malsup.com/jquery/form) by [François Guillot](http://fguillot.developpez.com)
-* [:link:](jquery.fullscreen/jquery.fullscreen.d.ts) [jquery.fullscreen](https://github.com/private-face/jquery.fullscreen) by [Piraveen Kamalathas](https://github.com/piraveen)
-* [:link:](jquery.gridster/gridster.d.ts) [jQuery.gridster](https://github.com/jbaldwin/gridster) by [Josh Baldwin](https://github.com/jbaldwin)
-* [:link:](jquery.highlight-bartaz/jquery.highlight-bartaz.d.ts) [jquery.highlight.js](https://github.com/bartaz/sandbox.js/blob/master/jquery.highlight.js) by [Stefan Profanter](https://github.com/Pro)
-* [:link:](jquery.jnotify/jquery.jnotify.d.ts) [jQuery.jNotify](http://jnotify.codeplex.com) by [James Curran](https://github.com/jamescurran)
-* [:link:](jquery.jsignature/jquery.jsignature.d.ts) [jQuery.jsignature v2](https://github.com/willowsystems/jSignature) by [Patrick Magee](https://github.com/pjmagee)
-* [:link:](jquery-jsonrpcclient/jquery-jsonrpcclient.d.ts) [jquery.jsonrpc](https://github.com/Textalk/jquery.jsonrpcclient.js) by [Maksim Karelov](https://github.com/Ty3uK)
-* [:link:](jquery.noty/jquery.noty.d.ts) [jQuery.noty](http://needim.github.io/noty) by [Aaron King](https://github.com/kingdango)
-* [:link:](jquery.payment/jquery.payment.d.ts) [jQuery.payment](https://github.com/stripe/jquery.payment) by [Eric J. Smith](https://github.com/ejsmith), [John Rutherford](https://github.com/johnrutherford)
-* [:link:](jquery.pjax.falsandtru/jquery.pjax.d.ts) [jquery.pjax.ts by falsandtru](https://github.com/falsandtru/jquery.pjax.js) by [新ゝ月 NewNotMoon](http://new.not-moon.net)
-* [:link:](jquery.placeholder/jquery.placeholder.d.ts) [jquery.placeholder.js](https://github.com/mathiasbynens/jquery-placeholder) by [Peter Gill](https://github.com/majorsilence), [Neil Culver](https://github.com/EnableSoftware)
-* [:link:](jquery.pnotify/jquery.pnotify.d.ts) [jquery.pnotify 2.x](https://github.com/sciactive/pnotify) by [David Sichau](https://github.com/DavidSichau)
-* [:link:](jquery.qrcode/jquery.qrcode.d.ts) [jQuery.qrcode](https://github.com/lrsjng/jquery-qrcode) by [Dan Manastireanu](https://github.com/danmana)
-* [:link:](raty/raty.d.ts) [jQuery.raty](https://github.com/wbotelhos/raty) by [Matt Wheatley](http://github.com/terrawheat)
-* [:link:](jquery.scrollTo/jquery.scrollTo.d.ts) [jQuery.scrollTo.js](https://github.com/flesler/jquery.scrollTo) by [Neil Stalker](https://github.com/nestalk)
-* [:link:](form-serializer/form-serializer.d.ts) [jquery.serialize-object](https://github.com/macek/jquery-serialize-object) by [Florian Wagner](https://github.com/flqw)
-* [:link:](jquery.simulate/jquery.simulate.d.ts) [jquery.simulate.js](https://github.com/jquery/jquery-simulate) by [Derek Cicerone](https://github.com/derekcicerone)
-* [:link:](jquery.slimScroll/jquery.slimScroll.d.ts) [jQuery.slimScroll](https://github.com/rochal/jQuery-slimScroll) by [Chintan Shah](https://github.com/Promact)
-* [:link:](jquery.soap/jquery.soap.d.ts) [jQuery.SOAP](https://github.com/doedje/jquery.soap) by [Roland Greim](https://github.com/tigerxy)
-* [:link:](jquery.sortElements/jquery.sortElement.d.ts) [jQuery.sortElements](http://james.padolsey.com/javascript/sorting-elements-with-jquery) by [Tim Bureck](https://github.com/tbureck)
-* [:link:](jquery.superLink/jquery.superLink.d.ts) [jquery.superLink](http://james.padolsey.com/demos/plugins/jQuery/superLink/superlink.jquery.js) by [Blake Niemyjski](https://github.com/niemyjski)
-* [:link:](jquery.tile/jquery.tile.d.ts) [jquery.tile.js](https://github.com/urin/jquery.tile.js) by [Shunsuke Ohtani](https://github.com/zaneli)
-* [:link:](jquery.timeago/jquery.timeago.d.ts) [jQuery.timeago.js](http://timeago.yarp.com) by [François Guillot](http://fguillot.developpez.com)
-* [:link:](jquery.tipsy/jquery.tipsy.d.ts) [jQuery.tipsy](http://onehackoranother.com/projects/jquery/tipsy) by [Brian Dukes](https://github.com/bdukes)
-* [:link:](jquery.transit/jquery.transit.d.ts) [jQuery.transit.js](http://ricostacruz.com/jquery.transit) by [MrBigDog2U](https://github.com/MrBigDog2U)
-* [:link:](jquery.validation/jquery.validation.d.ts) [jquery.validation](http://jqueryvalidation.org) by [François de Campredon](https://github.com/fdecampredon), [John Reilly](https://github.com/johnnyreilly)
-* [:link:](jquery.timer/jquery.timer.d.ts) [jQueryTimer](https://github.com/jchavannes/jquery-timer) by [Joshua Strobl](https://github.com/JoshStrobl)
-* [:link:](jquery.total-storage/jquery.total-storage.d.ts) [jQueryTotalStorage](https://github.com/Upstatement/jquery-total-storage) by [Jeremy Brooks](https://github.com/JeremyCBrooks)
-* [:link:](jqueryui/jqueryui.d.ts) [jQueryUI](http://jqueryui.com) by [Boris Yankov](https://github.com/borisyankov), [John Reilly](https://github.com/johnnyreilly)
-* [:link:](js-beautify/js-beautify.d.ts) [js_beautify](https://github.com/beautify-web/js-beautify) by [Josh Goldberg](https://github.com/JoshuaKGoldberg)
-* [:link:](js-clipper/js-clipper.d.ts) [js-clipper](https://github.com/mathisonian/JsClipper) by [Hou Chunlei](https://github.com/omni360)
-* [:link:](js-combinatorics/js-combinatorics.d.ts) [js-combinatorics](https://github.com/dankogai/js-combinatorics) by [Vasya Aksyonov](https://github.com/outring)
-* [:link:](js-combinatorics/js-combinatorics-global.d.ts) [js-combinatorics (global)](https://github.com/dankogai/js-combinatorics) by [Vasya Aksyonov](https://github.com/outring)
-* [:link:](js-cookie/js-cookie.d.ts) [js-cookie](https://github.com/js-cookie/js-cookie) by [Theodore Brown](https://github.com/theodorejb)
-* [:link:](js-fixtures/fixtures.d.ts) [js-fixtures](https://github.com/badunk/js-fixtures) by [Kazi Manzur Rashid](https://github.com/kazimanzurrashid)
-* [:link:](js-git/js-git.d.ts) [js-git](https://github.com/creationix/js-git) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](js-md5/md5.d.ts) [js-md5](https://github.com/emn178/js-md5) by [Roland Greim](https://github.com/tigerxy)
-* [:link:](js-schema/js-schema.d.ts) [js-schema](https://github.com/molnarg/js-schema) by [Marcin Porebski](https://github.com/marcinporebski)
-* [:link:](js-signals/js-signals.d.ts) [JS-Signals](http://millermedeiros.github.io/js-signals) by [Diullei Gomes](https://github.com/diullei)
-* [:link:](js-yaml/js-yaml.d.ts) [js-yaml](https://github.com/nodeca/js-yaml) by [Bart van der Schoor](https://github.com/Bartvds), [Sebastian Clausen](https://github.com/sclausen)
-* [:link:](blocks/blocks.d.ts) [jsblocks](http://jsblocks.com) by [Krzysztof Śmigiel](https://github.com/ksmigiel)
-* [:link:](jsbn/jsbn.d.ts) [jsbn](http://www-cs-students.stanford.edu/%7Etjw/jsbn) by [Eugene Chernyshov](https://github.com/Evgenus)
-* [:link:](jscrollpane/jscrollpane.d.ts) [jScrollPane](http://jscrollpane.kelvinluck.com) by [Dániel Tar](https://github.com/qcz)
-* [:link:](js-data/js-data.d.ts) [JSData](https://github.com/js-data/js-data) by [Stefan Steinhart](https://github.com/reppners)
-* [:link:](js-data-http/js-data-http.d.ts) [JSData Http Adapter](https://github.com/js-data/js-data-http) by [Stefan Steinhart](https://github.com/reppners)
-* [:link:](js-data-angular/js-data-angular.d.ts) [JSDataAngular](https://github.com/js-data/js-data-angular) by [Stefan Steinhart](https://github.com/reppners)
-* [:link:](jsdeferred/jsdeferred.d.ts) [JSDeferred](https://github.com/cho45/jsdeferred) by [Daisuke Mino](https://github.com/minodisk)
-* [:link:](jsdom/jsdom.d.ts) [jsdom](https://github.com/tmpvar/jsdom) by [Asana](https://asana.com)
-* [:link:](jsen/jsen.d.ts) [jsen (JSON Sentinel)](https://github.com/bugventure/jsen) by [Vladimir Đokić](https://github.com/vladeck)
-* [:link:](jsend/jsend.d.ts) [jsend](https://github.com/Prestaul/jsend) by [Federico Caselli](https://github.com/CaselIT)
-* [:link:](jsesc/jsesc.d.ts) [jsesc](https://github.com/mathiasbynens/jsesc) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](jsfl/jsfl.d.ts) [JSFL](https://adobe.com) by [soywiz](https://github.com/soywiz)
-* [:link:](jshamcrest/jshamcrest.d.ts) [JsHamcrest](https://github.com/danielfm/jshamcrest) by [David Harkness](https://github.com/dharkness)
-* [:link:](hashset/hashset.d.ts) [jshashset](http://www.timdown.co.uk/jshashtable/jshashset.html) by [Sergey Gerasimov](https://github.com/gerich-home)
-* [:link:](hashtable/hashtable.d.ts) [jshashtable](http://www.timdown.co.uk/jshashtable) by [Sergey Gerasimov](https://github.com/gerich-home)
-* [:link:](jsmockito/jsmockito.d.ts) [JsMockito](http://github.com/chrisleishman/jsmockito) by [Karl Bennett](https://github.com/shiver-me-timbers)
-* [:link:](jsnlog/jsnlog.d.ts) [JSNLog](https://github.com/mperdeck/jsnlog.js) by [Mattijs Perdeck](https://github.com/mperdeck)
-* [:link:](jsnox/jsnox.d.ts) [JSnoX](https://github.com/af/jsnox) by [Steve Baker](https://github.com/stkb)
-* [:link:](json-patch/json-patch.d.ts) [json-patch](https://github.com/bruth/jsonpatch-js) by [vvakame](https://github.com/vvakame)
-* [:link:](json-pointer/json-pointer.d.ts) [json-pointer 1.0 l](https://www.npmjs.org/package/json-pointer) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](json-socket/json-socket.d.ts) [json-socket](https://github.com/sebastianseilund/node-json-socket) by [Sven Reglitzki](https://github.com/svi3c)
-* [:link:](json-stable-stringify/json-stable-stringify.d.ts) [json-stable-stringify](https://github.com/substack/json-stable-stringify) by [Matt Frantz](https://github.com/mhfrantz)
-* [:link:](json5/json5.d.ts) [JSON5](http://json5.org) by [Jason Swearingen](https://jasonswearingen.github.io)
-* [:link:](jsoneditoronline/jsoneditoronline.d.ts) [JSONEditorOnline](https://github.com/josdejong/jsoneditoronline) by [Vincent Bortone](https://github.com/vbortone)
-* [:link:](jsonpath/jsonpath.d.ts) [jsonpath](https://www.npmjs.org/package/jsonpath) by [Hiroki Horiuchi](https://github.com/horiuchi)
-* [:link:](JSONStream/JSONStream.d.ts) [JSONStream](http://github.com/dominictarr/JSONStream) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](jsonwebtoken/jsonwebtoken.d.ts) [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken) by [Maxime LUCE](https://github.com/SomaticIT), [Daniel Heim](https://github.com/danielheim)
-* [:link:](jspdf/jspdf.d.ts) [jsPDF](https://github.com/MrRio/jsPDF) by [Amber Schühmacher](https://github.com/amberjs)
-* [:link:](jsplumb/jquery.jsPlumb.d.ts) [jsPlumb 1.3.16 jQuery adapter](http://jsplumb.org) by [Steve Shearn](https://github.com/shearnie)
-* [:link:](jsrender/jsrender.d.ts) [JsRender](http://www.jsviews.com/#jsrender) by [Kensuke Matsuzaki](https://github.com/zakki)
-* [:link:](jss/jss.d.ts) [jss](https://github.com/Box9/jss) by [Valentin Robert](https://github.com/Ptival)
-* [:link:](jssha/jssha.d.ts) [jsSHA](https://github.com/Caligatio/jsSHA) by [David Li](https://github.com/randombk), [Tobias Kahlert](https://github.com/SrTobi)
-* [:link:](jstorage/jstorage.d.ts) [jStorage](http://www.jstorage.info) by [Danil Flores](https://github.com/dflor003)
-* [:link:](jstree/jstree.d.ts) [jsTree](http://www.jstree.com) by [Adam Pluciński](https://github.com/adaskothebeast)
-* [:link:](jsts/jsts.d.ts) [jsts](https://github.com/bjornharrtell/jsts) by [Stephane Alie](https://github.com/StephaneAlie)
-* [:link:](jsuri/jsuri.d.ts) [jsUri](https://github.com/derek-watson/jsUri) by [Chris Charabaruk](http://github.com/coldacid), [Florian Wagner](http://github.com/flqw)
-* [:link:](jsurl/jsurl.d.ts) [jsurl](https://github.com/Mikhus/jsurl) by [Alexey Gorshkov](https://github.com/agorshkov23)
-* [:link:](jsx-chai/jsx-chai.d.ts) [jsx-chai](https://github.com/bkonkle/jsx-chai) by [Philipp Holzer](https://github.com/nupplaphil)
-* [:link:](jszip/jszip.d.ts) [JSZip](http://stuk.github.com/jszip) by [mzeiher](https://github.com/mzeiher)
-* [:link:](jug/jug.d.ts) [jug](https://github.com/kaiquewdev/Graph) by [yevt](https://github.com/yevt)
-* [:link:](jwplayer/jwplayer.d.ts) [JW Player](http://developer.longtailvideo.com/trac) by [Martin Duparc](https://github.com/martinduparc)
-* [:link:](jwt-decode/jwt-decode.d.ts) [jwt-decode](https://github.com/auth0/jwt-decode) by [Giedrius Grabauskas](https://github.com/QuatroDevOfficial)
-* [:link:](jwt-simple/jwt-simple.d.ts) [jwt-simple](https://github.com/hokaccha/node-jwt-simple) by [Ken Fukuyama](https://github.com/kenfdev)
-* [:link:](kafka-node/kafka-node.d.ts) [kafka-node](https://github.com/SOHU-Co/kafka-node) by [Daniel Imrie-Situnayake](https://github.com/dansitu)
-* [:link:](karma/karma.d.ts) [karma](https://github.com/karma-runner/karma) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](karma-coverage/karma-coverage.d.ts) [karma-coverage](https://github.com/karma-runner/karma-coverage) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](karma-jasmine/karma-jasmine.d.ts) [karma-jasmine plugin](https://github.com/karma-runner/karma-jasmine) by [Michel Salib](https://github.com/michelsalib)
-* [:link:](katex/katex.d.ts) [KaTeX v.0.5.0](http://khan.github.io/KaTeX) by [Michael Randolph](https://github.com/mrand01)
-* [:link:](kefir/kefir.d.ts) [Kefir](http://rpominov.github.io/kefir) by [Aya Morisawa](https://github.com/AyaMorisawa)
-* [:link:](kendo-ui/kendo-ui.d.ts) [Kendo UI Professional](http://www.telerik.com/kendo-ui) by [Telerik](https://github.com/telerik)
-* [:link:](keyboardjs/keyboardjs.d.ts) [KeyboardJS](https://github.com/RobertWHurst/KeyboardJS) by [Vincent Bortone](https://github.com/vbortone), [David Asmuth](https://github.com/piranha771)
-* [:link:](keymaster/keymaster.d.ts) [keymaster](https://github.com/madrobby/keymaster) by [Martin W. Kirst](https://github.com/nitram509)
-* [:link:](keypress/keypress.d.ts) [Keypress](https://github.com/dmauro/Keypress) by [Roger Chen](https://github.com/rcchen)
-* [:link:](keytar/keytar.d.ts) [keytar](http://atom.github.io/node-keytar) by [Milan Burda](https://github.com/miniak)
-* [:link:](kii-cloud-sdk/kii-cloud-sdk.d.ts) [Kii Cloud SDK](http://en.kii.com) by [Kii Consortium](http://jp.kii.com/consortium)
-* [:link:](kineticjs/kineticjs.d.ts) [KineticJS](http://kineticjs.com) by [Basarat Ali Syed](http://www.github.com/basarat), [Ralph de Ruijter](http://www.superdopey.nl/techblog)
-* [:link:](knex/knex.d.ts) [Knex.js](https://github.com/tgriesser/knex) by [Qubo](https://github.com/tkQubo)
-* [:link:](knockback/knockback.d.ts) [Knockback.js](http://kmalakoff.github.io/knockback) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](knockout/knockout.d.ts) [Knockout](http://knockoutjs.com) by [Boris Yankov](https://github.com/borisyankov), [Igor Oleinikov](https://github.com/Igorbek), [Clément Bourgeois](https://github.com/moonpyk)
-* [:link:](knockout.deferred.updates/knockout.deferred.updates.d.ts) [Knockout Deferred Updates](https://github.com/mbest/knockout-deferred-updates) by [Sebastián Galiano](https://github.com/sgaliano)
-* [:link:](knockout/tests/jasmine.extensions.d.ts) [Knockout specs](http://knockoutjs.com) by [Boris Yankov](https://github.com/borisyankov), [Igor Oleinikov](https://github.com/Igorbek), [Clément Bourgeois](https://github.com/moonpyk)
-* [:link:](knockout.validation/knockout.validation.d.ts) [Knockout Validation](https://github.com/ericmbarnard/Knockout-Validation) by [Dan Ludwig](https://github.com/danludwig)
-* [:link:](knockout.viewmodel/knockout.viewmodel.d.ts) [Knockout Viewmodel](http://coderenaissance.github.com/knockout.viewmodel) by [Oisin Grehan](https://github.com/oising)
-* [:link:](knockout.amd.helpers/knockout-amd-helpers.d.ts) [knockout-amd-helpers](https://github.com/rniemeyer/knockout-amd-helpers) by [David Sichau](https://github.com/DavidSichau)
-* [:link:](knockout.editables/ko.editables.d.ts) [knockout-editables](http://romanych.github.com/ko.editables) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](knockout.es5/knockout.es5.d.ts) [Knockout-ES5](https://github.com/SteveSanderson/knockout-es5) by [Sebastián Galiano](https://github.com/sgaliano)
-* [:link:](knockout-paging/knockout-paging.d.ts) [knockout-paging](https://github.com/ErikSchierboom/knockout-paging) by [Erik Schierboom](https://github.com/ErikSchierboom)
-* [:link:](knockout.postbox/knockout-postbox.d.ts) [knockout-postbox](https://github.com/rniemeyer/knockout-postbox) by [Judah Gabriel Himango](https://debuggerdotbreak.wordpress.com)
-* [:link:](knockout-pre-rendered/knockout-pre-rendered.d.ts) [knockout-pre-rendered](https://github.com/ErikSchierboom/knockout-pre-rendered) by [Erik Schierboom](https://github.com/ErikSchierboom)
-* [:link:](knockout.projections/knockout.projections.d.ts) [knockout-projections](https://github.com/stevesanderson/knockout-projections) by [John Reilly](https://github.com/johnnyreilly)
-* [:link:](knockout-secure-binding/knockout-secure-binding.d.ts) [knockout-secure-binding](https://github.com/brianmhunt/knockout-secure-binding) by [Pine Mizune](https://github.com/pine613)
-* [:link:](knockout-transformations/knockout-transformations.d.ts) [knockout-transformations](https://github.com/One-com/knockout-transformations) by [John Reilly](https://github.com/johnnyreilly), [Wim Looman](https://github.com/Nemo157)
-* [:link:](knockout.mapper/knockout.mapper.d.ts) [Knockout.Mapper](https://github.com/LucasLorentz/knockout.mapper) by [Brandon Meyer](https://github.com/BMeyerKC)
-* [:link:](knockout.mapping/knockout.mapping.d.ts) [Knockout.Mapping](https://github.com/SteveSanderson/knockout.mapping) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](knockout.punches/knockout.punches.d.ts) [knockout.punches](https://github.com/mbest/knockout.punches) by [Stephen Lautier](https://github.com/johnnyreilly)
-* [:link:](knockout.rx/knockout.rx.d.ts) [knockout.rx](https://github.com/Igorbek/knockout.rx) by [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](knockstrap/knockstrap.d.ts) [Knockstrap](http://faulknercs.github.io/Knockstrap) by [Adam Pluciński](https://github.com/adaskothebeast)
-* [:link:](knockout.kogrid/ko-grid.d.ts) [ko-grid](http://knockout-contrib.github.io/KoGrid) by [huer12](https://github.com/huer12)
-* [:link:](ko.plus/ko.plus.d.ts) [ko.plus](https://github.com/stevegreatrex/ko.plus) by [Howard Richards](https://github.com/conficient)
-* [:link:](koa-compose/koa-compose.d.ts) [koa](https://github.com/koajs/compose) by [jKey Lu](https://github.com/jkeylu)
-* [:link:](koa/koa.d.ts) [Koa 2.x](http://koajs.com) by [DavidCai1993](https://github.com/DavidCai1993)
-* [:link:](koa-bodyparser/koa-bodyparser.d.ts) [koa-bodyparser v3.x](https://github.com/koajs/bodyparser) by [Jerry Chin](https://github.com/hellopao)
-* [:link:](koa-favicon/koa-favicon.d.ts) [koa-favicon v2.x](https://github.com/koajs/favicon) by [Jerry Chin](https://github.com/hellopao)
-* [:link:](koa-json/koa-json.d.ts) [koa-json v2.x](https://github.com/koajs/json) by [Alex Friedman](https://github.com/brooklyndev)
-* [:link:](koa-router/koa-router.d.ts) [koa-router v7.x](https://github.com/alexmingoia/koa-router) by [Jerry Chin](https://github.com/hellopao)
-* [:link:](koa-static/koa-static.d.ts) [koa-static v2.x](https://github.com/koajs/static) by [Jerry Chin](https://github.com/hellopao)
-* [:link:](kolite/kolite.d.ts) [KoLite](https://github.com/CodeSeven/kolite) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](kolite/knockout.activity.d.ts) [KoLite](https://github.com/CodeSeven/kolite) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](kolite/knockout.command.d.ts) [KoLite](https://github.com/CodeSeven/kolite) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](kolite/knockout.dirtyFlag.d.ts) [KoLite](https://github.com/CodeSeven/kolite) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](konami.js/konami.d.ts) [Konami-js](https://github.com/snaptortoise/konami-js) by [Matthieu Mourisson](https://github.com/mareek)
-* [:link:](kue/kue.d.ts) [kue 0.9.x](https://github.com/Automattic/kue) by [Nicholas Penree](http://github.com/drudge)
-* [:link:](kuromoji/kuromoji.d.ts) [kuromoji.js](https://github.com/takuyaa/kuromoji.js) by [MIZUSHIMA Junki](https://github.com/mzsm)
-* [:link:](ladda/ladda.d.ts) [Ladda](https://github.com/hakimel/Ladda) by [Danil Flores](https://github.com/dflor003), [Michael Lee](https://github.com/leemicw)
-* [:link:](lls/lls.d.ts) [LargeLocalStorage](https://github.com/tantaman/LargeLocalStorage) by [Borislav Zhivkov](https://github.com/borislavjivkov)
-* [:link:](later/later.d.ts) [LaterJS](http://bunkat.github.io/later) by [Jason D Dryhurst-Smith](http://jasonds.co.uk)
-* [:link:](latinize/latinize.d.ts) [latinize](https://github.com/dundalek/latinize) by [Giedrius Grabauskas](https://github.com/GiedriusGrabauskas)
-* [:link:](lazy.js/lazy.js.d.ts) [Lazy.js](https://github.com/dtao/lazy.js) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](lazypipe/lazypipe.d.ts) [lazypipe](https://github.com/OverZealous/lazypipe) by [Thomas Corbière](https://github.com/tomc974)
-* [:link:](leaflet-curve/leaflet-curve.d.ts) [leaflet-curve](https://github.com/onikiienko/Leaflet.curve) by [Onikiienko](https://github.com/onikiienko)
-* [:link:](leaflet-draw/leaflet-draw.d.ts) [leaflet-draw](https://github.com/Leaflet/Leaflet.draw) by [Matt Guest](https://github.com/matt-guest)
-* [:link:](leaflet.awesome-markers/leaflet.awesome-markers.d.ts) [Leaflet.awesome-markers plugin](https://github.com/lvoogdt/Leaflet.awesome-markers) by [Egor Komarov](https://github.com/Odrin)
-* [:link:](leaflet-editable/leaflet-editable.d.ts) [Leaflet.Editable](https://github.com/yohanboniface/Leaflet.Editable) by [Dominic Alie](https://github.com/dalie)
-* [:link:](leaflet.fullscreen/leaflet.fullscreen.d.ts) [Leaflet.fullscreen](https://github.com/brunob/leaflet.fullscreen) by [William Comartin](https://github.com/wcomartin)
-* [:link:](leaflet/leaflet.d.ts) [Leaflet.js](https://github.com/Leaflet/Leaflet) by [Vladimir Zotov](https://github.com/rgripper)
-* [:link:](leaflet-label/leaflet-label.d.ts) [Leaflet.label](https://github.com/Leaflet/Leaflet.label) by [Wim Looman](https://github.com/Nemo157)
-* [:link:](leaflet-markercluster/leaflet-markercluster.d.ts) [Leaflet.markercluster](https://github.com/Leaflet/Leaflet.markercluster) by [Robert Imig](https://github.com/rimig)
-* [:link:](jquery.leanModal/jquery.leanModal.d.ts) [leanModal.js](http://leanmodal.finelysliced.com.au) by [FinelySliced](https://github.com/FinelySliced)
-* [:link:](leapmotionTS/LeapMotionTS.d.ts) [Leap Motion TS](https://github.com/logotype/LeapMotionTS) by [Victor Norgren](https://github.com/logotype)
-* [:link:](less/less.d.ts) [LESS](http://lesscss.org) by [Tom Hasner](https://github.com/thasner)
-* [:link:](less-middleware/less-middleware.d.ts) [less-middleware](https://github.com/emberfeather/less.js-middleware) by [Federico Bond](https://github.com/federicobond)
-* [:link:](lestate/lestate.d.ts) [LeState](https://github.com/LeTools/LeState) by [Hadrian Oliveira](https://github.com/thelambdaparty)
-* [:link:](level-sublevel/level-sublevel.d.ts) [level-sublevel](https://github.com/dominictarr/level-sublevel) by [Bas Pennings](https://github.com/basp)
-* [:link:](levelup/levelup.d.ts) [LevelUp](https://github.com/rvagg/node-levelup) by [Bret Little](https://github.com/blittle)
-* [:link:](libxmljs/libxmljs.d.ts) [Libxmljs](https://github.com/polotek/libxmljs) by [François de Campredon](https://github.com/fdecampredon)
-* [:link:](lwip/lwip.d.ts) [Light-weight image processor](https://github.com/EyalAr/lwip) by [Aya Morisawa](https://github.com/AyaMorisawa)
-* [:link:](lime-js/lime-js.d.ts) [lime-js](https://github.com/takenet/lime-js) by [Arthur Xavier](https://github.com/arthur-xavier)
-* [:link:](line-reader/line-reader.d.ts) [line-reader](https://github.com/nickewing/line-reader) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](dustjs-linkedin/dustjs-linkedin.d.ts) [linkedin dustjs](https://github.com/linkedin/dustjs) by [Marcelo Dezem](http://github.com/mdezem)
-* [:link:](linq/linq.jquery.d.ts) [linq.jquery (from linq.js)](http://linqjs.codeplex.com) by [neuecc](http://www.codeplex.com/site/users/view/neuecc)
-* [:link:](linq/linq.d.ts) [linq.js](http://linqjs.codeplex.com) by [Marcin Najder](https://github.com/marcinnajder), [Sebastiaan Dammann](https://github.com/Sebazzz)
-* [:link:](linqsharp/linqsharp.d.ts) [linqsharp](https://www.npmjs.com/package/linqsharp) by [Bruno Leonardo Michels](https://github.com/brunolm)
-* [:link:](jquery.livestampjs/jquery.livestampjs.d.ts) [Livestamp.js](http://mattbradley.github.com/livestampjs) by [Vincent Bortone](https://github.com/vbortone)
-* [:link:](lodash/lodash.d.ts) [Lo-Dash](http://lodash.com) by [Brian Zengel](https://github.com/bczengel), [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](lobibox/lobibox.d.ts) [lobibox](https://github.com/arboshiki/lobibox) by [Sabeeh Ul Hussnain](https://github.com/itboy87)
-* [:link:](lockfile/lockfile.d.ts) [lockfile](https://github.com/isaacs/lockfile) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](lodash-decorators/lodash-decorators.d.ts) [lodash-decorators](https://github.com/steelsojka/lodash-decorators) by [Qubo](https://github.com/tkqubo)
-* [:link:](log4javascript/log4javascript.d.ts) [log4javascript](http://log4javascript.org) by [Markus Wagner](https://github.com/Ritzlgrmft)
-* [:link:](log4js/log4js.d.ts) [log4js](https://github.com/nomiddlename/log4js-node) by [Kentaro Okuno](http://github.com/armorik83)
-* [:link:](logg/logg.d.ts) [logg](https://github.com/dpup/node-logg) by [Bret Little](https://github.com/blittle)
-* [:link:](loggly/loggly.d.ts) [loggly](https://github.com/nodejitsu/node-loggly) by [Ray Martone](https://github.com/rmartone)
-* [:link:](loglevel/loglevel.d.ts) [loglevel](https://github.com/pimterry/loglevel) by [Stefan Profanter](https://github.com/Pro), [Florian Wagner](https://github.com/flqw), [Gabor Szmetanko](https://github.com/szmeti)
-* [:link:](logrotate-stream/logrotate-stream.d.ts) [logrotate-stream](https://github.com/dstokes/logrotate-stream) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](lokijs/lokijs.d.ts) [lokijs](https://github.com/techfort/LokiJS) by [TeamworkGuy2](https://github.com/TeamworkGuy2)
-* [:link:](lolex/lolex.d.ts) [lolex](https://github.com/sinonjs/lolex) by [Wim Looman](https://github.com/Nemo157)
-* [:link:](long/long.d.ts) [long.js](https://github.com/dcodeIO/long.js) by [Peter Kooijmans](https://github.com/peterkooijmans)
-* [:link:](lory.js/lory.js.d.ts) [lory](https://github.com/meandmax/lory) by [kubosho](https://github.com/kubosho)
-* [:link:](lovefield/lovefield.d.ts) [Lovefield](http://google.github.io/lovefield) by [freshp86](https://github.com/freshp86)
-* [:link:](lower-case/lower-case.d.ts) [lower-case](https://github.com/blakeembrey/lower-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](lower-case-first/lower-case-first.d.ts) [lower-case-first](https://github.com/blakeembrey/lower-case-first) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](lru-cache/lru-cache.d.ts) [lru-cache](https://github.com/isaacs/node-lru-cache) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](lscache/lscache.d.ts) [lscache](https://github.com/pamelafox/lscache) by [Chris Martinez](https://github.com/Chris-Martinezz)
-* [:link:](luaparse/luaparse.d.ts) [luaparse](https://github.com/oxyc/luaparse) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](lunr/lunr.d.ts) [lunr.js](https://github.com/olivernn/lunr.js) by [Sebastian Lenz](https://github.com/sebastian-lenz)
-* [:link:](lz-string/lz-string.d.ts) [lz-string](https://github.com/pieroxy/lz-string) by [Roman Nikitin](https://github.com/M0ns1gn0r)
-* [:link:](magic-number/magic-number.d.ts) [magic-number](https://github.com/stpettersens/node-magic-number) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](magicsuggest/magicsuggest.d.ts) [MagicSuggest](http://nicolasbize.com/magicsuggest) by [Leonardo Chaia](http://github.com/leonardochaia)
-* [:link:](mailcheck/mailcheck.d.ts) [Mailcheck](https://github.com/mailcheck/mailcheck) by [Paulo Cesar](http://github.com/pocesar)
-* [:link:](maildev/maildev.d.ts) [maildev](https://github.com/djfarrelly/maildev) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](mailparser/mailparser.d.ts) [mailparser](https://www.npmjs.com/package/mailparser) by [Peter Snider](https://github.com/psnider)
-* [:link:](main-bower-files/main-bower-files.d.ts) [main-bower-files](https://github.com/ck86/main-bower-files) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
-* [:link:](maker.js/makerjs.d.ts) [Maker.js](https://github.com/Microsoft/maker.js) by [Dan Marshall](https://github.com/danmarshall)
-* [:link:](mandrill-api/mandrill-api.d.ts) [Mandrill API 1.x](http://mandrill.com) by [Paulo Cesar](https://github.com/pocesar)
-* [:link:](mapbox/mapbox.d.ts) [Mapbox](https://www.mapbox.com/mapbox.js) by [Maxime Fabre](https://github.com/anahkiasen)
-* [:link:](mapsjs/mapsjs.d.ts) [Mapsjs](https://github.com/mapsjs) by [Matthew James Davis](https://github.com/davismj)
-* [:link:](maquette/maquette.d.ts) [maquette](http://maquettejs.org) by [Johan Gorter](https://github.com/johan-gorter)
-* [:link:](mariasql/mariasql.d.ts) [mariasql](https://github.com/mscdex/node-mariasql) by [MichaelBennett](https://github.com/bennett000)
-* [:link:](marionette/marionette.d.ts) [Marionette](https://github.com/marionettejs) by [Zeeshan Hamid](https://github.com/zhamid), [Natan Vivo](https://github.com/nvivo), [Sven Tschui](https://github.com/sventschui)
-* [:link:](ngwysiwyg/ngwysiwyg.d.ts) [Marked](https://github.com/psergus/ngWYSIWYG) by [Patrick Mac Kay](https://github.com/patrick-mackay)
-* [:link:](marked/marked.d.ts) [Marked](https://github.com/chjj/marked) by [William Orr](https://github.com/worr)
-* [:link:](markerclustererplus/markerclustererplus.d.ts) [MarkerClustererPlus for Google Maps V3](http://github.com/mahnunchik/markerclustererplus) by [Mathias Rodriguez](http://github.com/enanox)
-* [:link:](markitup/markitup.d.ts) [markitup 1.x](https://github.com/markitup/1.x) by [drillbits](https://github.com/drillbits)
-* [:link:](maskedinput/maskedinput.d.ts) [Masked Input plugin for jQuery](http://digitalbush.com/projects/masked-input-plugin) by [Lokesh Peta](https://github.com/lokeshpeta)
-* [:link:](material-ui/material-ui.d.ts) [material-ui](https://github.com/callemall/material-ui) by [Nathan Brown](https://github.com/ngbrown), [Oliver Herrmann](https://github.com/herrmanno)
-* [:link:](materialize-css/materialize-css.d.ts) [materialize-css](http://materializecss.com) by [Erik Lieben](https://github.com/eriklieben), [Leon Yu](https://github.com/leonyu)
-* [:link:](mathjax/mathjax.d.ts) [MathJax](https://github.com/mathjax/MathJax) by [Roland Zwaga](https://github.com/rolandzwaga)
-* [:link:](mathjs/mathjs.d.ts) [mathjs](http://mathjs.org) by [Ilya Shestakov](https://github.com/siavol)
-* [:link:](matter-js/matter-js.d.ts) [Matter.js -](https://github.com/liabru/matter-js) by [Ivane Gegia](https://twitter.com/ivanegegia), [David Asmuth](https://github.com/piranha771)
-* [:link:](mCustomScrollbar/mCustomScrollbar.d.ts) [mCustomScrollbar](https://github.com/malihu/malihu-custom-scrollbar-plugin) by [Sarah Williams](https://github.com/flurg)
-* [:link:](memory-cache/memory-cache.d.ts) [memory-cache](http://github.com/ptarjan/node-cache) by [Jeff Goddard](https://github.com/jedigo)
-* [:link:](mendixmodelsdk/mendixmodelsdk.d.ts) [mendixmodelsdk](http://www.mendix.com) by [Mendix](https://github.com/mendix)
-* [:link:](merge-descriptors/merge-descriptors.d.ts) [merge-descriptors](https://github.com/component/merge-descriptors) by [Zhiyuan Wang](https://github.com/danny8002)
-* [:link:](merge-stream/merge-stream.d.ts) [merge-stream](https://github.com/grncdr/merge-stream) by [Keita Kagurazaka](https://github.com/k-kagurazaka), [Tom X. Tobin](http://tomxtobin.com)
-* [:link:](merge2/merge2.d.ts) [merge2](https://github.com/teambition/merge2) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](meshblu/meshblu.d.ts) [meshblu.js](https://github.com/octoblu/meshblu-npm) by [Felipe Nipo](https://github.com/fnipo)
-* [:link:](mess/mess.d.ts) [mess](https://github.com/bobrik/node-mess) by [Wim Looman](https://github.com/Nemo157)
-* [:link:](messenger/messenger.d.ts) [Messenger.js](https://github.com/HubSpot/messenger) by [Derek Cicerone](https://github.com/derekcicerone)
-* [:link:](meteor/meteor.d.ts) [Meteor](http://www.meteor.com) by [Dave Allen](https://github.com/fullflavedave)
-* [:link:](meteor-roles/meteor-roles.d.ts) [Meteor Roles](https://github.com/alanning/meteor-roles) by [Robbie Van Gorkom](https://github.com/vangorra)
-* [:link:](meteor-publish-composite/meteor-publish-composite.d.ts) [meteor-publish-composite](https://github.com/englue/meteor-publish-composite) by [Robert Van Gorkom](https://github.com/vangorra)
-* [:link:](node-mysql-wrapper/my-meteor.d.ts) [meteorjs for node-mysql-wrapper which helps in development](https://github.com/nodets/node-mysql-wrapper) by [Makis Maropoulos](https://github.com/kataras)
-* [:link:](method-override/method-override.d.ts) [method-override](https://github.com/expressjs/method-override) by [Santi Albo](https://github.com/santialbo)
-* [:link:](metismenu/metismenu.d.ts) [metisMenu](http://github.com/onokumus/metisMenu) by [onokums](https://github.com/onokumus)
-* [:link:](microgears/microgears.d.ts) [microgears](http://github.com/marcusdb/microgears) by [Marcus David Bronstein](https://github.com/marcusdb)
-* [:link:](micromatch/micromatch.d.ts) [micromatch](https://github.com/jonschlinkert/micromatch) by [glen-84](https://github.com/glen-84)
-* [:link:](microsoft-ajax/microsoft.ajax.d.ts) [Microsoft ASP.NET Ajax client side library](http://msdn.microsoft.com/en-us/library/ee341002(v=vs.100).aspx) by [Patrick Magee](https://github.com/pjmagee)
-* [:link:](xrm/xrm.d.ts) [Microsoft Dynamics xRM API](http://www.microsoft.com/en-us/download/details.aspx?id=44567) by [David Berry](https://github.com/6ix4our), [Matt Ngan](https://github.com/mattngan), [Markus Mauch](https://github.com/markusmauch)
-* [:link:](xrm/xrm-6.d.ts) [Microsoft Dynamics xRM API v6](http://msdn.microsoft.com/en-us/library/gg328255.aspx) by [David Berry](https://github.com/6ix4our)
-* [:link:](jquery-validation-unobtrusive/jquery-validation-unobtrusive.d.ts) [Microsoft jQuery Unobtrusive Validation](http://aspnetwebstack.codeplex.com) by [Matt Brooks](https://github.com/EnableSoftware)
-* [:link:](microsoft-live-connect/microsoft-live-connect.d.ts) [Microsoft Live Connect](http://msdn.microsoft.com/en-us/library/live/hh243643.aspx) by [John Vilk](https://github.com/jvilk)
-* [:link:](xrm/parature.d.ts) [Microsoft Parature extentions to Xrm.Page - available for CRM Online Only](http://msdn.microsoft.com/en-us/library/gg328255.aspx) by [David Berry](https://github.com/6ix4our)
-* [:link:](azure-mobile-services-client/AzureMobileServicesClient.d.ts) [Microsoft Windows AzureMobile Service](http://www.windowsazure.com/en-us/develop/mobile) by [Morosinotto Daniele](https://github.com/dmorosinotto)
-* [:link:](bingmaps/Microsoft.Maps.d.ts) [Microsoft.Maps](http://msdn.microsoft.com/en-us/library/gg427611.aspx) by [Eric Todd](https://github.com/ericrtodd)
-* [:link:](bingmaps/Microsoft.Maps.AdvancedShapes.d.ts) [Microsoft.Maps.AdvancedShapes](http://msdn.microsoft.com/en-us/library/hh921952.aspx) by [Eric Todd](https://github.com/ericrtodd)
-* [:link:](bingmaps/Microsoft.Maps.Directions.d.ts) [Microsoft.Maps.Directions](http://msdn.microsoft.com/en-us/library/hh312813.aspx) by [Eric Todd](https://github.com/ericrtodd)
-* [:link:](bingmaps/Microsoft.Maps.Search.d.ts) [Microsoft.Maps.Search](http://msdn.microsoft.com/en-us/library/hh868061.aspx) by [Eric Todd](https://github.com/ericrtodd)
-* [:link:](bingmaps/Microsoft.Maps.Themes.BingTheme.d.ts) [Microsoft.Maps.Themes](http://msdn.microsoft.com/en-us/library/hh868061.aspx) by [Eric Todd](https://github.com/ericrtodd)
-* [:link:](bingmaps/Microsoft.Maps.Traffic.d.ts) [Microsoft.Maps.Traffic](http://msdn.microsoft.com/en-us/library/hh312840.aspx) by [Eric Todd](https://github.com/ericrtodd)
-* [:link:](bingmaps/Microsoft.Maps.VenueMaps.d.ts) [Microsoft.Maps.VenueMaps](http://msdn.microsoft.com/en-us/library/hh312797.aspx) by [Eric Todd](https://github.com/ericrtodd)
-* [:link:](milkcocoa/milkcocoa.d.ts) [Milkcocoa](https://mlkcca.com) by [odangosan](https://github.com/odangosan)
-* [:link:](milliseconds/milliseconds.d.ts) [milliseconds](http://npmjs.com/milliseconds) by [Elmar Burke](github.com/elmarburke)
-* [:link:](mime/mime.d.ts) [mime](https://github.com/broofa/node-mime) by [Jeff Goddard](https://github.com/jedigo)
-* [:link:](minilog/minilog.d.ts) [minilog v2](https://github.com/mixu/minilog) by [Guido](http://guido.io)
-* [:link:](minimatch/minimatch.d.ts) [Minimatch](https://github.com/isaacs/minimatch) by [vvakame](https://github.com/vvakame)
-* [:link:](minimist/minimist.d.ts) [minimist](https://github.com/substack/minimist) by [Bart van der Schoor](https://github.com/Bartvds), [Necroskillz](https://github.com/Necroskillz)
-* [:link:](mithril/mithril.d.ts) [Mithril](http://lhorie.github.io/mithril) by [Leo Horie](https://github.com/lhorie), [Chris Bowdon](https://github.com/cbowdon)
-* [:link:](mixpanel/mixpanel.d.ts) [Mixpanel](https://mixpanel.com) by [Knut Eirik Leira Hjelle](https://github.com/hjellek)
-* [:link:](mixto/mixto.d.ts) [mixto](https://github.com/atom/mixto) by [vvakame](https://github.com/vvakame)
-* [:link:](mkdirp/mkdirp.d.ts) [mkdirp](http://github.com/substack/node-mkdirp) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](mkpath/mkpath.d.ts) [mkpath](https://www.npmjs.com/package/mkpath) by [Jared Klopper](https://github.com/optical)
-* [:link:](mmmagic/mmmagic.d.ts) [mmmagic](https://github.com/mscdex/mmmagic) by [Andrei Sebastian Cîmpean](http://andreime.com)
-* [:link:](mobile-detect/mobile-detect.d.ts) [mobile-detect](http://hgoebl.github.io/mobile-detect.js) by [Martin McWhorter](https://github.com/martinmcwhorter)
-* [:link:](mobservable/mobservable.d.ts) [mobservable](https://mweststrate.github.io/mobservable) by [Michel Weststrate](https://github.com/mweststrate)
-* [:link:](mobservable-react/mobservable-react.d.ts) [mobservable](https://github.com/mweststrate/mobservable-react) by [Michel Weststrate](https://github.com/mweststrate)
-* [:link:](mocha/mocha-node.d.ts) [mocha](http://mochajs.org) by [Vadim Macagon](https://github.com/enlight), [vvakame](https://github.com/vvakame)
-* [:link:](mocha/mocha.d.ts) [mocha](http://mochajs.org) by [Kazi Manzur Rashid](https://github.com/kazimanzurrashid), [otiai10](https://github.com/otiai10), [jt000](https://github.com/jt000), [Vadim Macagon](https://github.com/enlight)
-* [:link:](mocha-phantomjs/mocha-phantomjs.d.ts) [mocha-phantomjs](http://metaskills.net/mocha-phantomjs) by [Erik Schierboom](https://github.com/ErikSchierboom)
-* [:link:](mock-fs/mock-fs.d.ts) [mock-fs](https://github.com/tschaub/mock-fs) by [Wim Looman](https://github.com/Nemo157), [Qubo](https://github.com/tkqubo)
-* [:link:](mockery/mockery.d.ts) [mockery](https://github.com/mfncooper/mockery) by [jt000](https://github.com/jt000)
-* [:link:](modernizr/modernizr.d.ts) [Modernizr](http://modernizr.com) by [Boris Yankov](https://github.com/borisyankov), [Theodore Brown](https://github.com/theodorejb), [Leon Yu](https://github.com/leonyu)
-* [:link:](moment-timezone/moment-timezone.d.ts) [moment-timezone.js](http://momentjs.com/timezone) by [Michel Salib](https://github.com/michelsalib)
-* [:link:](moment/moment-node.d.ts) [Moment.js](https://github.com/timrwood/moment) by [Michael Lakerveld](https://github.com/Lakerfield), [Aaron King](https://github.com/kingdango), [Hiroki Horiuchi](https://github.com/horiuchi), [Dick van den Brink](https://github.com/DickvdBrink), [Adi Dahiya](https://github.com/adidahiya), [Matt Brooks](https://github.com/EnableSoftware), [Gal Talmor](https://github.com/galtalmor)
-* [:link:](moment/moment.d.ts) [Moment.js](https://github.com/timrwood/moment) by [Michael Lakerveld](https://github.com/Lakerfield), [Aaron King](https://github.com/kingdango), [Hiroki Horiuchi](https://github.com/horiuchi), [Dick van den Brink](https://github.com/DickvdBrink), [Adi Dahiya](https://github.com/adidahiya), [Matt Brooks](https://github.com/EnableSoftware)
-* [:link:](moment-range/moment-range.d.ts) [Moment.js](https://github.com/gf3/moment-range) by [Bart van den Burg](https://github.com/Burgov), [Wilgert Velinga](https://github.com/wilgert)
-* [:link:](mongodb/mongodb.d.ts) [MongoDB](https://github.com/mongodb/node-mongodb-native/tree/2.1) by [Federico Caselli](https://github.com/CaselIT)
-* [:link:](mongoose/mongoose.d.ts) [Mongoose](http://mongoosejs.com) by [simonxca](https://github.com/simonxca), [horiuchi](https://github.com/horiuchi)
-* [:link:](mongoose-auto-increment/mongoose-auto-increment.d.ts) [mongoose-auto-increment](https://github.com/codetunnel/mongoose-auto-increment) by [Aya Morisawa](https://github.com/AyaMorisawa)
-* [:link:](mongoose-deep-populate/mongoose-deep-populate.d.ts) [mongoose-deep-populate](https://github.com/buunguyen/mongoose-deep-populate) by [Aya Morisawa](https://github.com/AyaMorisawa)
-* [:link:](mongoose-mock/mongoose-mock.d.ts) [mongoose-mock](https://github.com/JohanObrink/mongoose-mock) by [jt000](https://github.com/jt000)
-* [:link:](mongoose-promise/mongoose-promise.d.ts) [mongoose-promise](http://mongoosejs.com/docs/api.html#promise-js) by [simonxca](https://github.com/simonxca)
-* [:link:](morgan/morgan.d.ts) [morgan](https://github.com/expressjs/morgan) by [James Roland Cabresos](https://github.com/staticfunction)
-* [:link:](mousetrap/mousetrap-global-bind.d.ts) [Mousetrap 1.4.6's global-bind extension](http://craig.is/killing/mice#extensions.global) by [Andrew Bradley](https://github.com/cspotcode)
-* [:link:](mousetrap/mousetrap.d.ts) [Mousetrap 1.5.x](http://craig.is/killing/mice) by [Dániel Tar](https://github.com/qcz)
-* [:link:](moviedb/moviedb.d.ts) [MovieDB](https://github.com/danzajdband/moviedb) by [Basarat Ali Syed](https://github.com/basarat)
-* [:link:](firefox/firefox.d.ts) [Mozilla Web API](https://developer.mozilla.org/en-US/docs/Web/API) by [vvakame](https://github.com/vvakame)
-* [:link:](localForage/localForage.d.ts) [Mozilla's localForage](https://github.com/mozilla/localforage) by [yuichi david pichsenmeister](https://github.com/3x14159265)
-* [:link:](mpromise/mpromise.d.ts) [mpromise](https://github.com/aheckmann/mpromise) by [Seulgi Kim](https://github.com/sgkim126)
-* [:link:](mqtt/mqtt.d.ts) [MQTT](https://github.com/mqttjs/MQTT.js) by [Pekka Leppänen](https://github.com/PekkaPLeppanen)
-* [:link:](ms/ms.d.ts) [ms](https://github.com/guille/ms.js) by [Zhiyuan Wang](https://github.com/danny8002)
-* [:link:](msgpack/msgpack.d.ts) [msgpack.js - MessagePack JavaScript Implementation](https://github.com/uupaa/msgpack.js) by [Shinya Mochizuki](https://github.com/enrapt-mochizuki)
-* [:link:](msnodesql/msnodesql.d.ts) [msnodesql](https://github.com/WindowsAzure/node-sqlserver) by [Boris Yankov](https://github.com/borisyankov), [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](msportalfx-test/msportalfx-test.d.ts) [msportalfx-test](https://msazure.visualstudio.com/DefaultCollection/AzureUX/_git/portalfx-msportalfx-test) by [Julio Casal](https://github.com/julioct)
-* [:link:](mssql/mssql.d.ts) [mssql](https://www.npmjs.com/package/mssql) by [COLSA Corporation](http://www.colsa.com), [Ben Farr](https://github.com/jaminfarr), [Vitor Buzinaro](https://github.com/buzinas)
-* [:link:](mu2/mu2.d.ts) [mu2](http://github.com/raycmorgan/mu) by [Jeff Goddard](https://github.com/jedigo)
-* [:link:](multer/multer.d.ts) [multer](https://github.com/expressjs/multer) by [jt000](https://github.com/jt000), [vilicvane](https://vilic.github.io), [David Broder-Rodgers](https://github.com/DavidBR-SW)
-* [:link:](multiplexjs/multiplexjs.d.ts) [Multiplex.js](http://github.com/multiplex/multiplex.js) by [Kamyar Nazeri](http://github.com/KamyarNazeri)
-* [:link:](mustache/mustache.d.ts) [Mustache](https://github.com/janl/mustache.js) by [Mark Ashley Bell](https://github.com/markashleybell)
-* [:link:](mz/mz.d.ts) [mz](https://github.com/normalize/mz) by [Thomas Hickman](https://github.com/ThomasHickman)
-* [:link:](nanoajax/nanoajax.d.ts) [nanoajax](https://github.com/yanatan16/nanoajax) by [Nathan Cahill](https://github.com/nathancahill)
-* [:link:](natural/natural.d.ts) [Natural](https://github.com/NaturalNode/natural) by [Dylan R. E. Moonfire](https://github.com/dmoonfire)
-* [:link:](natural-sort/natural-sort.d.ts) [NaturalSort](https://github.com/studio-b12/natural-sort) by [Antonio Morales](https://github.com/a-morales)
-* [:link:](navigation/navigation.d.ts) [Navigation](http://grahammendick.github.io/navigation) by [Graham Mendick](https://github.com/grahammendick)
-* [:link:](nconf/nconf.d.ts) [nconf](https://github.com/flatiron/nconf) by [Jeff Goddard](https://github.com/jedigo), [Jean-Martin Thibault](https://github.com/jmthibault)
-* [:link:](ncp/ncp.d.ts) [ncp](https://github.com/AvianFlu/ncp) by [Bart van der Schoor](https://github.com/bartvds)
-* [:link:](nedb/nedb.d.ts) [NeDB](https://github.com/louischatriot/nedb) by [Stefan Steinhart](https://github.com/reppners)
-* [:link:](needle/needle.d.ts) [needle](https://github.com/tomas/needle) by [San Chen](https://github.com/bigsan)
-* [:link:](netmask/netmask.d.ts) [Netmask](https://github.com/rs/node-netmask) by [Matt Frantz](https://github.com/mhfrantz)
-* [:link:](nexpect/nexpect.d.ts) [nexpect](https://github.com/nodejitsu/nexpect) by [vvakame](http://github.com/vvakame)
-* [:link:](ng-command/ng-command.d.ts) [ng-command](https://github.com/stephenlautier/ng-command) by [Stephen Lautier](https://github.com/stephenlautier)
-* [:link:](ng-facebook/ng-facebook.d.ts) [ng-facebook](https://github.com/GoDisco/ngFacebook) by [Crevil](https://github.com/Crevil)
-* [:link:](ng-flow/ng-flow.d.ts) [ng-flow](https://github.com/flowjs/ng-flow) by [Ryan McNamara](https://github.com/ryan10132)
-* [:link:](ng-grid/ng-grid.d.ts) [ng-grid](http://angular-ui.github.io/ng-grid) by [Ken Smith](https://github.com/smithkl42), [Roland Zwaga](https://github.com/rolandzwaga), [Kent Cooper](https://github.com/kentcooper)
-* [:link:](angular-idle/angular-idle.d.ts) [ng-idle](http://hackedbychinese.github.io/ng-idle) by [mthamil](https://github.com/mthamil)
-* [:link:](ng-notify/ng-notify.d.ts) [ng-notify](https://github.com/matowens/ng-notify) by [Nick Zamosenchuk](https://github.com/nzamosenchuk)
-* [:link:](ng-table/ng-table.d.ts) [ng-table](https://github.com/esvit/ng-table) by [Christian Crowhurst](https://github.com/christianacca)
-* [:link:](ngbootbox/ngbootbox.d.ts) [ngbootbox](https://github.com/eriktufvesson/ngBootbox) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](ng-cordova/actionSheet.d.ts) [ngCordova Action Sheet plugin](https://github.com/driftyco/ng-cordova) by [Phil McCloghry-Laing](https://github.com/pmccloghrylaing)
-* [:link:](ng-cordova/appAvailability.d.ts) [ngCordova AppAvailability plugin](https://github.com/driftyco/ng-cordova) by [Kapil Sachdeva](https://github.com/ksachdeva)
-* [:link:](ng-cordova/badge.d.ts) [ngCordova badge plugin](https://github.com/driftyco/ng-cordova) by [Phil McCloghry-Laing](https://github.com/pmccloghrylaing)
-* [:link:](ng-cordova/datepicker.d.ts) [ngCordova datepicker plugin](https://github.com/VitaliiBlagodir/cordova-plugin-datepicker) by [Jacques Kang](https://www.linkedin.com/in/jacqueskang)
-* [:link:](ng-cordova/app-version.d.ts) [ngCordova datepicker plugin](https://github.com/driftyco/ng-cordova) by [Jacques Kang](https://www.linkedin.com/in/jacqueskang)
-* [:link:](ng-cordova/deviceMotion.d.ts) [ngCordova device motion plugin](https://github.com/driftyco/ng-cordova) by [Michel Vidailhet](https://github.com/mvidailhet), [Kapil Sachdeva](https://github.com/ksachdeva)
-* [:link:](ng-cordova/deviceOrientation.d.ts) [ngCordova device orientation plugin](https://github.com/driftyco/ng-cordova) by [Michel Vidailhet](https://github.com/mvidailhet), [Kapil Sachdeva](https://github.com/ksachdeva)
-* [:link:](ng-cordova/device.d.ts) [ngCordova device plugin](https://github.com/driftyco/ng-cordova) by [Kapil Sachdeva](https://github.com/ksachdeva)
-* [:link:](ng-cordova/dialogs.d.ts) [ngCordova dialogs plugin](https://github.com/driftyco/ng-cordova) by [Michel Vidailhet](https://github.com/mvidailhet), [Kapil Sachdeva](https://github.com/ksachdeva)
-* [:link:](ng-cordova/emailComposer.d.ts) [ngCordova emailComposer plugin](https://github.com/driftyco/ng-cordova) by [Kapil Sachdeva](https://github.com/ksachdeva)
-* [:link:](ng-cordova/file.d.ts) [ngCordova file plugin](https://github.com/driftyco/ng-cordova) by [Phil McCloghry-Laing](https://github.com/pmccloghrylaing)
-* [:link:](ng-cordova/fileTransfer.d.ts) [ngCordova file-transfer plugin](https://github.com/driftyco/ng-cordova) by [Phil McCloghry-Laing](https://github.com/pmccloghrylaing)
-* [:link:](ng-cordova/geolocation.d.ts) [ngCordova geolocation plugin](https://github.com/driftyco/ng-cordova) by [Kapil Sachdeva](https://github.com/ksachdeva)
-* [:link:](ng-cordova/network.d.ts) [ngCordova network plugin](https://github.com/driftyco/ng-cordova) by [Kapil Sachdeva](https://github.com/ksachdeva)
-* [:link:](ng-cordova/tsd.d.ts) [ngCordova plugins](https://github.com/driftyco/ng-cordova) by [Kapil Sachdeva](https://github.com/ksachdeva)
-* [:link:](ng-cordova/toast.d.ts) [ngCordova toast plugin](https://github.com/driftyco/ng-cordova) by [Kapil Sachdeva](https://github.com/ksachdeva)
-* [:link:](ng-cordova/camera.d.ts) [ngCordova.plugins.camera](https://github.com/driftyco/ng-cordova) by [Jacques Kang](https://www.linkedin.com/in/jacqueskang)
-* [:link:](ng-dialog/ng-dialog.d.ts) [ngDialog](https://github.com/likeastore/ngDialog) by [Stephen Lautier](https://github.com/stephenlautier)
-* [:link:](ngkookies/ngkookies.d.ts) [ngKookes](https://github.com/voronianski/ngKookies) by [Martin McWhorter](https://github.com/martinmcwhorter)
-* [:link:](ngprogress/ngprogress.d.ts) [ngProgress](http://victorbjelkholm.github.io/ngProgress) by [Martin McWhorter](https://github.com/martinmcwhorter)
-* [:link:](ngprogress-lite/ngprogress-lite.d.ts) [ngprogress-lite](https://github.com/voronianski/ngprogress-lite) by [Luke Forder](https://github.com/LukeForder)
-* [:link:](ng-stomp/ng-stomp.d.ts) [ngStomp](https://github.com/beevelop/ng-stomp) by [Lukasz Potapczuk](https://github.com/lpotapczuk)
-* [:link:](ngstorage/ngstorage.d.ts) [ngstorage](https://github.com/gsklee/ngStorage) by [Jakub Pistek](https://github.com/kubiq)
-* [:link:](nightmare/nightmare.d.ts) [Nightmare](https://github.com/segmentio/nightmare) by [horiuchi](https://github.com/horiuchi)
-* [:link:](noble/noble.d.ts) [noble](https://github.com/sandeepmistry/noble) by [Seon-Wook Park](https://github.com/swook), [Hans Bakker](https://github.com/wind-rider), [Shantanu Bhadoria](https://github.com/shantanubhadoria)
-* [:link:](nock/nock.d.ts) [nock](https://github.com/pgte/nock) by [bonnici](https://github.com/bonnici)
-* [:link:](node-imap/imap.d.ts) [node imap](https://github.com/mscdex/node-imap) by [Steve Fenton](https://github.com/Steve-Fenton)
-* [:link:](oauth2-server/oauth2-server.d.ts) [Node OAuth2 Server](https://github.com/thomseddon/node-oauth2-server) by [Robbie Van Gorkom](https://github.com/vangorra)
-* [:link:](node-sass/node-sass.d.ts) [Node Sass](https://github.com/sass/node-sass) by [Asana](https://asana.com)
-* [:link:](acl/acl.d.ts) [node_acl](https://github.com/optimalbits/node_acl) by [Qubo](https://github.com/tkQubo)
-* [:link:](mdns/mdns.d.ts) [node_mdns](https://github.com/agnat/node_mdns) by [Stefan Steinhart](https://github.com/reppners)
-* [:link:](node_redis/node_redis.d.ts) [node_redis](https://github.com/mranney/node_redis) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](apn/apn.d.ts) [node-apn](https://github.com/argon/node-apn) by [Zenorbi](https://github.com/zenorbi)
-* [:link:](node-array-ext/node-array-ext.d.ts) [node-array-ext](https://github.com/Beng89/node-array-ext) by [Ben Goltz](https://github.com/Beng89)
-* [:link:](asana/asana.d.ts) [node-asana](https://github.com/Asana/node-asana) by [Qubo](https://github.com/tkqubo)
-* [:link:](bunyan/bunyan.d.ts) [node-bunyan](https://github.com/trentm/node-bunyan) by [Alex Mikhalev](https://github.com/amikhalev)
-* [:link:](bunyan-logentries/bunyan-logentries.d.ts) [node-bunyan-logentries](https://github.com/nemtsov/node-bunyan-logentries) by [Aymeric Beaumet](http://aymericbeaumet.me)
-* [:link:](node-cache/node-cache.d.ts) [node-cache](https://github.com/tcs-de/nodecache) by [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](node-calendar/node-calendar.d.ts) [node-calendar](https://www.npmjs.com/package/node-calendar) by [Luzian Zagadinow](https://github.com/luzianz)
-* [:link:](config/config.d.ts) [node-config](https://github.com/lorenwest/node-config) by [Roman Korneev](https://github.com/RWander)
-* [:link:](node-config-manager/node-config-manager.d.ts) [node-config-manager](https://www.npmjs.com/package/node-config-manager) by [TANAKA Koichi](https://gitnub.com/mugeso)
-* [:link:](convict/convict.d.ts) [node-convict](https://github.com/mozilla/node-convict) by [Wim Looman](https://github.com/Nemo157)
-* [:link:](node-dir/node-dir.d.ts) [node-dir](https://github.com/fshost/node-dir) by [Panu Horsmalahti](https://github.com/panuhorsmalahti)
-* [:link:](email-templates/email-templates.d.ts) [node-email-templates](https://github.com/niftylettuce/node-email-templates) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](node-ffi/node-ffi.d.ts) [node-ffi](https://github.com/rbranson/node-ffi) by [Paul Loyd](https://github.com/loyd)
-* [:link:](node-fibers/node-fibers.d.ts) [node-fibers](https://github.com/laverdet/node-fibers) by [Cary Haynie](https://github.com/caryhaynie)
-* [:link:](node-form/node-form.d.ts) [node-form](https://github.com/rsamec/form) by [Roman Samec](https://github.com/rsamec)
-* [:link:](node-gcm/node-gcm.d.ts) [node-gcm](https://www.npmjs.org/package/node-gcm) by [Hiroki Horiuchi](https://github.com/horiuchi)
-* [:link:](node-getopt/node-getopt.d.ts) [node-getopt](https://github.com/jiangmiao/node-getopt) by [Karl.M.Cauchy](https://github.com/kcauchy)
-* [:link:](node-git/node-git.d.ts) [node-git](https://github.com/christkv/node-git) by [vvakame](https://github.com/vvakame)
-* [:link:](node-int64/node-int64.d.ts) [node-int64](https://github.com/broofa/node-int64) by [Benno Dreissig](https://github.com/x3cion)
-* [:link:](ip/ip.d.ts) [node-ip](https://github.com/indutny/node-ip) by [Peter Harris](https://github.com/codeanimal)
-* [:link:](node-jsfl-runner/node-jsfl-runner.d.ts) [node-jsfl-runner](https://www.npmjs.com/package/node-jsfl-runner) by [Michael Randolph](https://github.com/mrand01)
-* [:link:](multiparty/multiparty.d.ts) [node-multiparty](https://github.com/andrewrk/node-multiparty) by [Ken Fukuyama](https://github.com/kenfdev)
-* [:link:](mysql/mysql.d.ts) [node-mysql](https://github.com/felixge/node-mysql) by [William Johnston](https://github.com/wjohnsto)
-* [:link:](node-mysql-wrapper/node-mysql-wrapper.d.ts) [node-mysql-wrapper](https://github.com/nodets/node-mysql-wrapper) by [Makis Maropoulos](https://github.com/kataras)
-* [:link:](node-notifier/node-notifier.d.ts) [node-notifier](https://github.com/mikaelbr/node-notifier) by [Qubo](https://github.com/tkQubo)
-* [:link:](node-persist/node-persist.d.ts) [node-persist](https://github.com/simonlast/node-persist) by [Spencer Williams](http://spencerwi.com)
-* [:link:](node-polyglot/node-polyglot.d.ts) [node-polyglot](https://github.com/airbnb/polyglot.js) by [Tim Jackson-Kiely](https://github.com/timjk)
-* [:link:](progress/progress.d.ts) [node-progress](https://github.com/tj/node-progress) by [Sebastian Lenz](https://github.com/sebastian-lenz)
-* [:link:](promptly/promptly.d.ts) [node-promptly](https://github.com/IndigoUnited/node-promptly) by [Dan Spencer](https://github.com/danrspencer)
-* [:link:](radius/radius.d.ts) [node-radius](https://github.com/retailnext/node-radius) by [Peter Harris](https://github.com/codeanimal)
-* [:link:](rsync/rsync.d.ts) [node-rsync](https://github.com/mattijs/node-rsync) by [Philipp Stucki](https://github.com/philippstucki)
-* [:link:](node-sass-middleware/node-sass-middleware.d.ts) [node-sass-middleware](https://github.com/sass/node-sass-middleware) by [Pascal Garber](http://www.jumplink.eu)
-* [:link:](node-schedule/node-schedule.d.ts) [node-schedule](https://github.com/tejasmanohar/node-schedule) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](node-slack/node-slack.d.ts) [node-slack](https://github.com/xoxco/node-slack) by [Qubo](https://github.com/tkQubo)
-* [:link:](node-snap7/node-snap7.d.ts) [node-snap7](https://github.com/mathiask88/node-snap7) by [Heilingbrunner](https://github.com/heilingbrunner)
-* [:link:](srp/srp.d.ts) [node-srp](https://github.com/mozilla/node-srp) by [Pat Smuk](https://github.com/Patman64)
-* [:link:](stack-trace/stack-trace.d.ts) [node-stack-trace](https://github.com/felixge/node-stack-trace) by [Exceptionless](https://github.com/exceptionless)
-* [:link:](node-uuid/node-uuid-global.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
-* [:link:](node-uuid/node-uuid-cjs.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
-* [:link:](node-uuid/node-uuid-base.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
-* [:link:](node-uuid/node-uuid.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
-* [:link:](node-validator/node-validator.d.ts) [node-validator](https://www.npmjs.com/package/node-validator) by [Ken Gorab](https://github.com/kengorab)
-* [:link:](node-webkit/node-webkit.d.ts) [node-webkit](https://github.com/rogerwang/node-webkit) by [Pedro Casaubon](https://github.com/xperiments)
-* [:link:](xml2js/xml2js.d.ts) [node-xml2js](https://github.com/Leonidas-from-XIV/node-xml2js) by [Michel Salib](https://github.com/michelsalib), [Jason McNeil](https://github.com/jasonrm), [Christopher Currens](https://github.com/ccurrens)
-* [:link:](_debugger/_debugger.d.ts) [Node.js debugger API](http://nodejs.org) by [Basarat Ali Syed](https://github.com/basarat)
-* [:link:](http-status-codes/http-status-codes.d.ts) [Node.JS package http-status-codes](https://github.com/prettymuchbryce/node-http-status) by [Josh McCullough](https://github.com/JoshMcCullough)
-* [:link:](restify/restify.d.ts) [node.js REST framework](https://github.com/mcavage/node-restify) by [Bret Little](https://github.com/blittle)
-* [:link:](node/node.d.ts) [Node.js v4.x](http://nodejs.org) by [Microsoft TypeScript](http://typescriptlang.org), [DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped)
-* [:link:](each/each.d.ts) [NodeEach](http://www.adaltas.com/projects/node-each) by [Michael Zabka](https://github.com/misak113)
-* [:link:](yandex-money-sdk/yandex-money-sdk.d.ts) [NodeJS Yandex.Money API SDK](https://github.com/yandex-money/yandex-money-sdk-nodejs) by [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](nodemailer/nodemailer-types.d.ts) [Nodemailer](https://github.com/andris9/Nodemailer) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](nodemailer/nodemailer.d.ts) [Nodemailer](https://github.com/andris9/Nodemailer) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](nodemailer-direct-transport/nodemailer-direct-transport.d.ts) [nodemailer-direct-transport](https://github.com/andris9/nodemailer-direct-transport) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](nodemailer-pickup-transport/nodemailer-pickup-transport.d.ts) [nodemailer-pickup-transport](https://www.npmjs.com/package/nodemailer-pickup-transport) by [Peter Snider](https://github.com/psnider)
-* [:link:](nodemailer-smtp-pool/nodemailer-smtp-pool.d.ts) [nodemailer-smtp-pool](https://github.com/andris9/nodemailer-smtp-pool) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts) [nodemailer-smtp-transport](https://github.com/andris9/nodemailer-smtp-transport) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](nodeunit/nodeunit.d.ts) [nodeunit](https://github.com/caolan/nodeunit) by [Jeff Goddard](https://github.com/jedigo)
-* [:link:](noisejs/noisejs.d.ts) [noisejs](https://github.com/xixixao/noisejs) by [Atsushi Izumihara](https://github.com/izmhr)
-* [:link:](nomnom/nomnom.d.ts) [nomnom](https://github.com/harthur/nomnom) by [Paul Vick](https://github.com/panopticoncentral)
-* [:link:](nopt/nopt.d.ts) [nopt](https://github.com/npm/nopt) by [jbondc](https://github.com/jbondc)
-* [:link:](notie/notie.d.ts) [notie.js](https://github.com/jaredreich/notie.js) by [Mateus Demboski](https://github.com/mateusdemboski)
-* [:link:](notify/notify.d.ts) [Notify.js](https://github.com/jpillora/notifyjs) by [Xiaohan Zhang](https://github.com/hellochar)
-* [:link:](notifyjs/notifyjs.d.ts) [notify.js](https://github.com/alexgibson/notify.js) by [soundTricker](https://github.com/soundTricker)
-* [:link:](nouislider/nouislider.d.ts) [nouislider](https://github.com/leongersen/noUiSlider) by [Patrick Davies](https://github.com/bleuarg)
-* [:link:](wnumb/wnumb.d.ts) [nouislider](https://github.com/leongersen/wnumb) by [Corey Jepperson](https://github.com/acoreyj)
-* [:link:](noVNC/noVNC.d.ts) [noVNC](https://github.com/kanaka/noVNC) by [Ken Smith](https://github.com/smithkl42)
-* [:link:](npm/npm.d.ts) [npm](https://github.com/npm/npm) by [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](nprogress/NProgress.d.ts) [NProgress](https://github.com/rstacruz/nprogress) by [Judah Gabriel Himango](http://debuggerdotbreak.wordpress.com)
-* [:link:](numbro/numbro.d.ts) [Numbro.js](https://github.com/foretagsplatsen/numbro) by [Vincent Bortone](https://github.com/vbortone)
-* [:link:](numeraljs/numeraljs.d.ts) [Numeral.js](https://github.com/adamwdraper/Numeral-js) by [Vincent Bortone](https://github.com/vbortone)
-* [:link:](nunjucks/nunjucks.d.ts) [nunjucks](http://mozilla.github.io/nunjucks) by [Ruben Slabbert](https://github.com/RubenSlabbert)
-* [:link:](nvd3/nvd3.d.ts) [nvd3](https://github.com/novus/nvd3) by [Peter Mitchell](https://github.com/PjMitchell)
-* [:link:](obelisk.js/obelisk.js.d.ts) [obelisk.js](https://github.com/nosir/obelisk.js) by [Brian Drupieski](https://github.com/bdrupieski)
-* [:link:](object-assign/object-assign.d.ts) [object-assign](https://github.com/sindresorhus/object-assign) by [Christopher Brown](https://github.com/chbrown)
-* [:link:](object-hash/object-hash.d.ts) [object-hash](https://github.com/puleos/object-hash) by [Michael Zabka](https://github.com/misak113)
-* [:link:](object-path/object-path.d.ts) [objectPath v0.9.x](https://github.com/mariocasciaro/object-path) by [Paulo Cesar](https://github.com/pocesar)
-* [:link:](oblo-util/oblo-util.d.ts) [oblo-util](https://github.com/Oblosys/oblo-util) by [Martijn Schrage](https://github.com/Oblosys)
-* [:link:](oboe/oboe.d.ts) [oboe](https://github.com/jimhigson/oboe.js) by [Jared Klopper](https://github.com/optical)
-* [:link:](observe-js/observe-js.d.ts) [observe-js](https://github.com/Polymer/observe-js) by [Oliver Herrmann](https://github.com/herrmanno)
-* [:link:](oclazyload/oclazyload.d.ts) [oc.LazyLoad](https://github.com/ocombe/ocLazyLoad) by [Roland Zwaga](https://github.com/rolandzwaga)
-* [:link:](angular-odata-resources/angular-odata-resources.d.ts) [OData Angular Resources](https://github.com/devnixs/ODataAngularResources) by [Raphael ATALLAH](http://raphael.atallah.me)
-* [:link:](office-js/office-js.d.ts) [Office.js](http://dev.office.com) by [OfficeDev](https://github.com/OfficeDev)
-* [:link:](offline-js/offline-js.d.ts) [Offline](https://github.com/HubSpot/offline) by [Chris Wrench](https://github.com/cgwrench)
-* [:link:](oidc-token-manager/oidc-token-manager.d.ts) [oidc-token-manager](https://github.com/IdentityModel/oidc-token-manager) by [Sławomir Rosiek](https://github.com/rosieks)
-* [:link:](on-finished/on-finished.d.ts) [on-finished](https://github.com/jshttp/on-finished) by [Honza Dvorsky](http://github.com/czechboy0)
-* [:link:](once/once.d.ts) [once](https://github.com/isaacs/once) by [Denis Sokolov](https://github.com/denis-sokolov)
-* [:link:](onoff/onoff.d.ts) [onoff](https://github.com/fivdi/onoff) by [Marcel Ernst](https://github.com/marcel-ernst)
-* [:link:](onsenui/onsenui.d.ts) [Onsen UI](http://onsen.io) by [Fran Dios](https://github.com/frankdiox)
-* [:link:](open/open.d.ts) [open](https://github.com/jjrdn/node-open) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](deep-extend/deep-extend.d.ts) [open](https://github.com/unclechu/node-deep-extend) by [rhysd](https://github.com/rhysd)
-* [:link:](OpenJsCad/openjscad.d.ts) [OpenJsCad.js](https://github.com/joostn/OpenJsCad) by [Dan Marshall](https://github.com/danmarshall)
-* [:link:](openlayers/openlayers.d.ts) [OpenLayers](http://openlayers.org) by [Wouter Goedhart](https://github.com/woutergd)
-* [:link:](openpgp/openpgp.d.ts) [openpgpjs](http://openpgpjs.org) by [Guillaume Lacasa](https://blog.lacasa.fr)
-* [:link:](opn/opn.d.ts) [opn](https://github.com/sindresorhus/opn) by [Shinnosuke Watanabe](https://github.com/shinnn), [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](optimist/optimist.d.ts) [optimist](https://github.com/substack/node-optimist) by [Carlos Ballesteros Velasco](https://github.com/soywiz), [Christopher Brown](https://github.com/chbrown)
-* [:link:](ora/ora.d.ts) [ora](https://github.com/sindresorhus/ora) by [Basarat Ali Syed](https://github.com/basarat)
-* [:link:](oracledb/oracledb.d.ts) [oracledb](https://github.com/oracle/node-oracledb) by [Richard Natal](https://github.com/Bigous)
-* [:link:](orchestrator/orchestrator.d.ts) [Orchestrator](https://github.com/orchestrator/orchestrator) by [Qubo](https://github.com/tkQubo)
-* [:link:](os-locale/os-locale.d.ts) [os-locale](https://github.com/sindresorhus/os-locale) by [Aya Morisawa](https://github.com/AyaMorisawa)
-* [:link:](osmtogeojson/osmtogeojson.d.ts) [osmtogeojson](https://github.com/tyrasd/osmtogeojson.git) by [Qubo](https://github.com/tkqubo)
-* [:link:](owlcarousel/owlcarousel.d.ts) [OwlCarousel v.1.3.3](https://github.com/OwlFonk/OwlCarousel) by [Damian Piątkowski](https://github.com/dpiatkowski)
-* [:link:](p2/p2.d.ts) [p2.js](https://github.com/schteppe/p2.js) by [Clark Stevenson](https://github.com/clark-stevenson)
-* [:link:](HubSpot-pace/HubSpot-pace.d.ts) [pace](https://github.com/HubSpot/pace) by [Borislav Zhivkov](https://github.com/borislavjivkov)
-* [:link:](packery/packery.d.ts) [Packery](http://packery.metafizzy.co) by [Piraveen Kamalathas from Kilix](https://github.com/piraveen)
-* [:link:](page/page.d.ts) [page](http://visionmedia.github.io/page.js) by [Alan Norbauer](http://alan.norbauer.com)
-* [:link:](pako/pako.d.ts) [pako](https://github.com/nodeca/pako) by [Denis Cappellin](http://github.com/cappellin)
-* [:link:](papaparse/papaparse.d.ts) [PapaParse](https://github.com/mholt/PapaParse) by [Pedro Flemming](https://github.com/torpedro)
-* [:link:](parallel/parallel.d.ts) [parallel.js](http://adambom.github.io/parallel.js) by [Josh Baldwin](https://github.com/jbaldwin)
-* [:link:](param-case/param-case.d.ts) [param-case](https://github.com/blakeembrey/param-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](parse/parse.d.ts) [Parse](https://parse.com) by [Ullisen Media Group](http://ullisenmedia.com)
-* [:link:](parse-glob/parse-glob.d.ts) [parse-glob](https://github.com/jonschlinkert/parse-glob) by [glen-84](https://github.com/glen-84)
-* [:link:](parse-torrent/parse-torrent.d.ts) [parse-torrent](https://github.com/feross/parse-torrent) by [Bazyli Brzóska](https://invent.life)
-* [:link:](parse5/parse5.d.ts) [parse5](https://github.com/inikulin/parse5) by [Nico Jansen](https://github.com/nicojs)
-* [:link:](parsimmon/parsimmon.d.ts) [Parsimmon](https://github.com/jneen/parsimmon) by [Bart van der Schoor](https://github.com/Bartvds), [Mizunashi Mana](https://github.com/mizunashi-mana)
-* [:link:](pascal-case/pascal-case.d.ts) [pascal-case](https://github.com/blakeembrey/pascal-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](passport/passport.d.ts) [Passport](http://passportjs.org) by [Horiuchi_H](https://github.com/horiuchi)
-* [:link:](passport-strategy/passport-strategy.d.ts) [Passport Strategy module](https://github.com/jaredhanson/passport-strategy) by [Lior Mualem](https://github.com/liorm)
-* [:link:](passport-facebook/passport-facebook.d.ts) [passport-facebook](https://github.com/jaredhanson/passport-facebook) by [James Roland Cabresos](https://github.com/staticfunction)
-* [:link:](passport-google-oauth/passport-google-oauth.d.ts) [passport-facebook](https://github.com/jaredhanson/passport-facebook) by [James Roland Cabresos](https://github.com/staticfunction)
-* [:link:](passport-twitter/passport-twitter.d.ts) [passport-facebook](https://github.com/jaredhanson/passport-facebook) by [James Roland Cabresos](https://github.com/staticfunction)
-* [:link:](passport-facebook-token/passport-facebook-token.d.ts) [passport-facebook-token](https://github.com/drudge/passport-facebook-token) by [Ray Martone](https://github.com/rmartone)
-* [:link:](passport-http-bearer/passport-http-bearer.d.ts) [passport-http-bearer](https://github.com/jaredhanson/passport-http-bearer) by [Isman Usoh](https://github.com/isman-usoh)
-* [:link:](passport-jwt/passport-jwt.d.ts) [passport-jwt](https://github.com/themikenicholson/passport-jwt) by [TANAKA Koichi](https://github.com/mugeso)
-* [:link:](passport-local/passport-local.d.ts) [passport-local](https://github.com/jaredhanson/passport-local) by [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](password-hash/password-hash.d.ts) [password-hash 1.2.x](https://github.com/davidwood/node-password-hash) by [TANAKA Koichi](https://github.com/mugeso)
-* [:link:](path-case/path-case.d.ts) [path-case](https://github.com/blakeembrey/path-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](path-exists/path-exists.d.ts) [path-exists](https://github.com/sindresorhus/path-exists) by [Shogo Iwano](https://github.com/shiwano)
-* [:link:](path-parse/path-parse.d.ts) [path-parse](https://github.com/jbgutierrez/path-parse) by [Dan Chao](http://dchao.co)
-* [:link:](path-to-regexp/path-to-regexp.d.ts) [path-to-regexp](https://github.com/pillarjs/path-to-regexp) by [xica](https://github.com/xica)
-* [:link:](pathjs/pathjs.d.ts) [Pathjs](https://github.com/mtrpcic/pathjs) by [Lokesh Peta](https://github.com/lokeshpeta)
-* [:link:](pathwatcher/pathwatcher.d.ts) [pathwatcher](https://github.com/atom/node-pathwatcher) by [vvakame](https://github.com/vvakame)
-* [:link:](PayPal-Cordova-Plugin/PayPal-Cordova-Plugin.d.ts) [PayPal-Cordova-Plugin](https://github.com/paypal/PayPal-Cordova-Plugin) by [Justin Unterreiner](https://github.com/Justin-Credible)
-* [:link:](pdf/pdf.d.ts) [PDF.js](https://github.com/mozilla/pdf.js) by [Josh Baldwin](https://github.com/jbaldwin)
-* [:link:](pdfkit/pdfkit.d.ts) [Pdfkit](http://pdfkit.org) by [Eric Hillah](https://github.com/erichillah)
-* [:link:](pebblekitjs/pebblekitjs.d.ts) [PebbleKit JS](https://developer.pebble.com/docs/js/Pebble) by [Makoto Kawasaki](https://github.com/makotokw)
-* [:link:](peerjs/peerjs.d.ts) [PeerJS](http://peerjs.com) by [Toshiya Nakakura](https://github.com/nakakura)
-* [:link:](pegjs/pegjs.d.ts) [PEG.js](http://pegjs.org) by [vvakame](https://github.com/vvakame), [Tobias Kahlert](https://github.com/SrTobi)
-* [:link:](persona/persona.d.ts) [Persona](http://www.mozilla.org/en-US/persona) by [James Frasca](https://github.com/Nycto)
-* [:link:](pg/pg.d.ts) [pg](https://github.com/brianc/node-postgres) by [Phips Peter](http://pspeter3.com)
-* [:link:](pg-promise/pg-promise.d.ts) [pg-promise](https://github.com/vitaly-t/pg-promise) by [vvakame](https://github.com/vvakame)
-* [:link:](pgwmodal/pgwmodal.d.ts) [PgwModal](http://pgwjs.com/pgwmodal) by [Pine Mizune](https://github.com/pine613)
-* [:link:](phantomcss/phantomcss.d.ts) [PhantomCSS](https://github.com/Huddle/PhantomCSS) by [Amaury Bauzac](https://github.com/abauzac)
-* [:link:](phantom/phantom.d.ts) [PhantomJS bridge for NodeJS](https://github.com/sgentle/phantomjs-node) by [horiuchi](https://github.com/horiuchi), [Random](https://github.com/llRandom)
-* [:link:](phantomjs/phantomjs.d.ts) [PhantomJS v1.9.0 API](https://github.com/ariya/phantomjs/wiki/API-Reference) by [Jed Hunsaker](https://github.com/jedhunsaker), [Mike Keesey](https://github.com/keesey)
-* [:link:](phonegap/phonegap.d.ts) [PhoneGap](http://phonegap.com) by [Boris Yankov](https://github.com/borisyankov), [Dick van den Brink](https://github.com/DickvdBrink)
-* [:link:](phonegap-nfc/phonegap-nfc.d.ts) [Phonegap NFC Plugin](https://github.com/chariotsolutions/phonegap-nfc) by [Michael Desigaud](https://github.com/michaeldesigaud)
-* [:link:](phonegap-facebook-plugin/phonegap-facebook-plugin.d.ts) [phonegap-facebook-plugin](https://github.com/Wizcorp/phonegap-facebook-plugin) by [Justin Unterreiner](https://github.com/Justin-Credible)
-* [:link:](phonegap-plugin-push/phonegap-plugin-push.d.ts) [phonegap-plugin-push](https://github.com/phonegap/phonegap-plugin-push) by [Frederico Galvão](https://github.com/fredgalvao)
-* [:link:](urbanairship-cordova/urbanairship-cordova.d.ts) [phonegap-ua-push](https://github.com/urbanairship/phonegap-ua-push) by [Justin Unterreiner](https://github.com/Justin-Credible)
-* [:link:](photonui/photonui.d.ts) [PhotonUI](https://github.com/wanadev/PhotonUI) by [Florent Poujol](https://github.com/florentpoujol)
-* [:link:](photoswipe/photoswipe.d.ts) [PhotoSwipe](http://photoswipe.com) by [Xiaohan Zhang](https://github.com/hellochar)
-* [:link:](physijs/physijs.d.ts) [Physijs](http://chandlerprall.github.io/Physijs) by [Satoru Kimura](https://github.com/gyohk)
-* [:link:](pi-spi/pi-spi.d.ts) [pi-spi](https://github.com/natevw/pi-spi) by [Marcel Ernst](https://github.com/marcel-ernst)
-* [:link:](pickadate/pickadate.d.ts) [pickadate.js](https://github.com/amsul/pickadate.js) by [Theodore Brown](https://github.com/theodorejb)
-* [:link:](pify/pify.d.ts) [pify](https://github.com/sindresorhus/pify) by [Sam Verschueren](https://github.com/samverschueren)
-* [:link:](pikaday/pikaday.d.ts) [pikaday](https://github.com/dbushell/Pikaday) by [Rudolph Gottesheim](http://midnight-design.at)
-* [:link:](pinkyswear/pinkyswear.d.ts) [PinkySwear](https://github.com/timjansen/PinkySwear.js) by [Chance Snow](https://github.com/chances)
-* [:link:](pinterest-sdk/pinterest-sdk.d.ts) [pinterest-sdk](https://assets.pinterest.com/sdk/sdk.js) by [Adam Burmister](https://github.com/adamburmister)
-* [:link:](piwik-tracker/piwik-tracker.d.ts) [PiwikTracker](https://www.npmjs.com/package/piwik-tracker) by [Guilherme Bernal](https://github.com/lbguilherme)
-* [:link:](pixi-spine/pixi-spine.d.ts) [pixi-spine](https://github.com/pixijs/pixi-spine) by [martijncroezen](https://github.com/pixijs/pixi-typescript)
-* [:link:](pixi.js/pixi.js.d.ts) [Pixi.js 3.0.9 dev](https://github.com/GoodBoyDigital/pixi.js) by [clark-stevenson](https://github.com/pixijs/pixi-typescript)
-* [:link:](platform/platform.d.ts) [Platform](https://github.com/bestiejs/platform.js) by [Jake Hickman](https://github.com/JakeH)
-* [:link:](playerframework/playerFramework.d.ts) [Player Framework (MMPPF)](https://playerframework.codeplex.com) by [Ricardo Sabino](https://github.com/ricardosabino)
-* [:link:](pleasejs/please.d.ts) [PleaseJS](http://www.checkman.io/please) by [Toshiya Nakakura](https://github.com/nakakura)
-* [:link:](plottable/plottable.d.ts) [Plottable](http://plottablejs.org) by [Plottable Team](https://github.com/palantir/plottable)
-* [:link:](pluralize/pluralize.d.ts) [pluralize](https://www.npmjs.com/package/pluralize) by [Syu Kato](https://github.com/ukyo)
-* [:link:](png-async/png-async.d.ts) [png-async](https://github.com/kanreisa/node-png-async) by [Yuki KAN](https://github.com/kanreisa)
-* [:link:](pngjs2/pngjs2.d.ts) [pngjs2](https://www.npmjs.com/package/pngjs2) by [Elisée Maurer](https://sparklinlabs.com)
-* [:link:](podcast/podcast.d.ts) [podcast](http://github.com/maxnowack/node-podcast) by [Niklas Mollenhauer](https://github.com/nikeee)
-* [:link:](poly2tri/poly2tri.d.ts) [poly2tri](http://github.com/r3mi/poly2tri.js) by [Elemar Junior](https://github.com/elemarjr)
-* [:link:](polyline/polyline.d.ts) [Polyline](https://github.com/mapbox/polyline) by [Arseniy Maximov](https://github.com/Kern0)
-* [:link:](polymer/polymer.d.ts) [polymer](https://github.com/Polymer/polymer) by [Louis Grignon](https://github.com/lgrignon), [Suguru Inatomi](https://github.com/laco0416)
-* [:link:](polymer-ts/polymer-ts.d.ts) [PolymerTS](https://github.com/nippur72/PolymerTS) by [Louis Grignon](https://github.com/lgrignon)
-* [:link:](popcorn/popcorn.d.ts) [Popcorn](https://github.com/mozilla/popcorn-js) by [grapswiz](https://github.com/grapswiz)
-* [:link:](postal/postal.d.ts) [Postal](https://github.com/postaljs/postal.js) by [Lokesh Peta](https://github.com/lokeshpeta), [Paul Jolly](https://github.com/myitcv)
-* [:link:](pouchDB/pouch.d.ts) [Pouch](http://pouchdb.com) by [Bill Sears](https://github.com/MrBigDog2U)
-* [:link:](power-assert/power-assert.d.ts) [power-assert](https://github.com/twada/power-assert) by [vvakame](https://github.com/vvakame)
-* [:link:](power-assert-formatter/power-assert-formatter.d.ts) [power-assert-formatter](https://github.com/twada/power-assert-formatter) by [vvakame](https://github.com/vvakame)
-* [:link:](precise/precise.d.ts) [precise](https://www.npmjs.org/package/precise) by [Peter Harris](https://github.com/codeanimal)
-* [:link:](precond/precond.d.ts) [precond](https://github.com/MathieuTurcotte/node-precond) by [Oliver Schneider](https://github.com/olsio)
-* [:link:](preloadjs/preloadjs.d.ts) [PreloadJS](http://www.createjs.com/#!/PreloadJS) by [Pedro Ferreira](https://bitbucket.org/drk4)
-* [:link:](prelude-ls/prelude-ls.d.ts) [prelude.ls](http://www.preludels.com) by [Aya Morisawa](https://github.com/AyaMorisawa)
-* [:link:](prettyjson/prettyjson.d.ts) [prettyjson](https://github.com/rafeca/prettyjson) by [Wael BEN ZID EL GUEBSI](https://github.com/benzid-wael)
-* [:link:](meteor-prime8consulting-oauth2/meteor-prime8consulting-oauth2.d.ts) [prime8consulting:meteor-oauth2](https://github.com/prime-8-consulting/meteor-oauth2) by [Robbie Van Gorkom](https://github.com/vangorra)
-* [:link:](prismjs/prism.d.ts) [prism](http://prismjs.com) by [Erik Lieben](https://github.com/eriklieben)
-* [:link:](progressjs/progress.d.ts) [ProgressJs](http://usablica.github.io/progress.js) by [Shunsuke Ohtani](https://github.com/zaneli)
-* [:link:](project-oxford/project-oxford.d.ts) [project-oxford](https://github.com/felixrieseberg/project-oxford) by [Scott Southwood](https://github.com/scsouthw)
-* [:link:](promise/promise.d.ts) [promise](https://www.promisejs.org) by [Manuel Rueda](https://github.com/ManRueda)
-* [:link:](promise-pg/promise-pg.d.ts) [promise-pg](https://bitbucket.org/lplabs/promise-pg) by [Chris Charabaruk](http://github.com/coldacid)
-* [:link:](promise-pool/promise-pool.d.ts) [promise-pool](https://github.com/vilic/promise-pool) by [VILIC VANE](https://github.com/vilic)
-* [:link:](promises-a-plus/promises-a-plus.d.ts) [promises-a-plus](http://promisesaplus.com) by [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](promisify-supertest/promisify-supertest.d.ts) [promisify-supertest](https://www.npmjs.com/package/promisify-supertest) by [Leo Liang](https://github.com/aleung)
-* [:link:](protobufjs/protobufjs.d.ts) [ProtoBuf.js](https://github.com/dcodeIO/ProtoBuf.js) by [Panu Horsmalahti](https://github.com/panuhorsmalahti)
-* [:link:](protractor-helpers/protractor-helpers.d.ts) [protractor-helpers](https://github.com/wix/protractor-helpers) by [John Cant](https://github.com/johncant)
-* [:link:](protractor-http-mock/protractor-http-mock.d.ts) [protractor-http-mock](https://github.com/atecarlos/protractor-http-mock) by [Crevil](https://github.com/Crevil)
-* [:link:](proxyquire/proxyquire.d.ts) [Proxyquire](https://github.com/thlorenz/proxyquire) by [jt000](https://github.com/jt000)
-* [:link:](pty.js/pty.js.d.ts) [pty.js 0.2.7-1](https://github.com/chjj/pty.js) by [Vadim Macagon](https://github.com/enlight)
-* [:link:](pubsubjs/pubsub.d.ts) [PubSubJS](https://github.com/mroderick/PubSubJS) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](pure-render-decorator/pure-render-decorator.d.ts) [pure-render-decorator](https://github.com/felixgirault/pure-render-decorator) by [Sean Kelley](https://github.com/seansfkelley)
-* [:link:](purl/purl.d.ts) [Purl](https://github.com/allmarkedup/purl) by [Daniel Ferreira Monteiro Alves](https://github.com/danfma)
-* [:link:](pusher-js/pusher-js.d.ts) [pusher-js](https://github.com/pusher/pusher-js) by [Qubo](https://github.com/tkqubo)
-* [:link:](q/Q.d.ts) [Q](https://github.com/kriskowal/q) by [Barrie Nemetchek](https://github.com/bnemetchek), [Andrew Gaspar](https://github.com/AndrewGaspar), [John Reilly](https://github.com/johnnyreilly)
-* [:link:](q-io/Q-io.d.ts) [Q-io](https://github.com/kriskowal/q-io) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](q-retry/q-retry.d.ts) [q-retry](https://github.com/vilic/q-retry) by [VILIC VANE](https://github.com/vilic)
-* [:link:](qajax/qajax.d.ts) [Qajax](https://github.com/gre/qajax) by [Boltmade](https://github.com/Boltmade)
-* [:link:](qs/qs.d.ts) [qs](https://github.com/hapijs/qs) by [Roman Korneev](https://github.com/RWander)
-* [:link:](qtip2/qtip2.d.ts) [qtip2](http://qtip2.com) by [Nathan Pitman](https://github.com/Seltzer)
-* [:link:](query-string/query-string.d.ts) [query-string](https://github.com/sindresorhus/query-string) by [Sam Verschueren](https://github.com/SamVerschueren)
-* [:link:](quill/quill.d.ts) [Quill](http://quilljs.com) by [Sumit](https://github.com/sumitkm)
-* [:link:](quixote/quixote.d.ts) [quixote](http://quixote-css.com) by [Aleksandr Filatov](https://github.com/greybax)
-* [:link:](qunit/qunit.d.ts) [QUnit](http://qunitjs.com) by [Diullei Gomes](https://github.com/diullei)
-* [:link:](qwest/qwest.d.ts) [qwest](https://github.com/pyrsmk/qwest) by [Lindsay Evans](https://github.com/lindsayevans)
-* [:link:](rabbit.js/rabbit.js.d.ts) [rabbit.js](https://github.com/squaremo/rabbit.js) by [Wonshik Kim](https://github.com/wokim)
-* [:link:](ractive/ractive.d.ts) [Ractive](http://ractivejs.org) by [Han Lin Yap](http://yap.nu)
-* [:link:](radium/radium.d.ts) [radium](https://github.com/formidablelabs/radium) by [Alex Gorbatchev](https://github.com/alexgorbatchev), [Philipp Holzer](https://github.com/nupplaphil)
-* [:link:](random-js/random-js.d.ts) [random-js](https://github.com/ckknight/random-js) by [Gustavo Di Pietro](https://github.com/pistacchio)
-* [:link:](random-string/random-string.d.ts) [random-string](https://github.com/valiton/node-random-string) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](rangy/rangy.d.ts) [Rangy](https://github.com/timdown/rangy) by [Rudolph Gottesheim](http://www.midnight-design.at)
-* [:link:](raphael/raphael.d.ts) [Raphael](http://raphaeljs.com) by [CheCoxshall](https://github.com/CheCoxshall)
-* [:link:](rappid/rappid.d.ts) [Rappid](http://jointjs.com/about-rappid) by [Ewout Van Gossum](https://github.com/DenEwout)
-* [:link:](ratelimiter/ratelimiter.d.ts) [ratelimiter](https://github.com/tj/node-ratelimiter) by [Aya Morisawa](https://github.com/AyaMorisawa)
-* [:link:](ravenjs/ravenjs.d.ts) [Raven.js](https://github.com/getsentry/raven-js) by [Santi Albo](https://github.com/santialbo), [Benjamin Pannell](http://github.com/spartan563)
-* [:link:](raygun4js/raygun4js.d.ts) [raygun4js](https://github.com/MindscapeHQ/raygun4js) by [Brian Surowiec](https://github.com/xt0rted)
-* [:link:](rcloader/rcloader.d.ts) [rcloader](https://github.com/spalger/rcloader) by [Panu Horsmalahti](https://github.com/panuhorsmalahti)
-* [:link:](react/react.d.ts) [React](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
-* [:link:](react/react-global.d.ts) [React (namespace)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
-* [:link:](react/react-addons-create-fragment.d.ts) [React (react-addons-create-fragment)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
-* [:link:](react/react-addons-css-transition-group.d.ts) [React (react-addons-css-transition-group)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
-* [:link:](react/react-addons-shallow-compare.d.ts) [React (react-addons-css-transition-group)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
-* [:link:](react/react-addons-linked-state-mixin.d.ts) [React (react-addons-linked-state-mixin)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
-* [:link:](react/react-addons-perf.d.ts) [React (react-addons-perf)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
-* [:link:](react/react-addons-pure-render-mixin.d.ts) [React (react-addons-pure-render-mixin)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
-* [:link:](react/react-addons-test-utils.d.ts) [React (react-addons-test-utils)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
-* [:link:](react/react-addons-transition-group.d.ts) [React (react-addons-transition-group)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
-* [:link:](react/react-addons-update.d.ts) [React (react-addons-update)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
-* [:link:](react/react-dom.d.ts) [React (react-dom)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
-* [:link:](react-dnd/react-dnd.d.ts) [React DnD](https://github.com/gaearon/react-dnd) by [Asana](https://asana.com)
-* [:link:](react-notification-system/react-notification-system.d.ts) [React Notification System](https://www.npmjs.com/package/react-notification-system) by [Giedrius Grabauskas](https://github.com/GiedriusGrabauskas), [Deividas Bakanas](https://github.com/DeividasBakanas)
-* [:link:](rc-select/rc-select.d.ts) [React Select](https://github.com/react-component/select) by [Denis Tirilis](https://github.com/DenisTirilis)
-* [:link:](react-bootstrap/react-bootstrap.d.ts) [react-bootstrap](https://github.com/react-bootstrap/react-bootstrap) by [Walker Burgin](https://github.com/walkerburgin), [Vincent Siao](https://github.com/vsiao)
-* [:link:](react-bootstrap-table/react-bootstrap-table.d.ts) [react-bootstrap-table](https://github.com/AllenFang/react-bootstrap-table) by [Frank Laub](https://github.com/flaub)
-* [:link:](react-cropper/react-cropper.d.ts) [react-cropper](https://github.com/roadmanfong/react-cropper) by [Stepan Mikhaylyuk](https://github.com/stepancar)
-* [:link:](react-datagrid/react-datagrid.d.ts) [react-datagrid](https://github.com/zippyui/react-datagrid.git) by [Stephen Jelfs](https://github.com/stephenjelfs)
-* [:link:](react-day-picker/react-day-picker.d.ts) [react-day-picker](https://github.com/gpbl/react-day-picker) by [Giampaolo Bellavite](https://github.com/gpbl), [Jason Killian](https://github.com/jkillian)
-* [:link:](react-dropzone/react-dropzone.d.ts) [react-dropzone](https://github.com/paramaggarwal/react-dropzone) by [Mathieu Larouche Dube](https://github.com/matdube)
-* [:link:](react-fa/react-fa.d.ts) [react-fa](https://github.com/andreypopp/react-fa) by [Frank Laub](https://github.com/flaub)
-* [:link:](react-helmet/react-helmet.d.ts) [react-helmet](https://github.com/nfl/react-helmet) by [Evan Bremer](https://github.com/evanbb)
-* [:link:](react-holder/react-holder.d.ts) [react-holder](https://github.com/Moeriki/react-holder) by [Isman Usoh](https://github.com/isman-usoh)
-* [:link:](react-infinite/react-infinite.d.ts) [react-infinite](https://github.com/seatgeek/react-infinite) by [rhysd](https://github.com/rhysd)
-* [:link:](react-input-calendar/react-input-calendar.d.ts) [react-input-calendar](https://github.com/Rudeg/react-input-calendar) by [Stepan Mikhaylyuk](https://github.com/stepancar)
-* [:link:](react-intl/react-intl.d.ts) [react-intl](http://formatjs.io/react) by [Bruno Grieder](https://github.com/bgrieder), [Christian Droulers](https://github.com/cdroulers)
-* [:link:](react-mixin/react-mixin.d.ts) [react-mixin](https://github.com/brigand/react-mixin) by [Qubo](https://github.com/tkqubo)
-* [:link:](react-motion/react-motion.d.ts) [react-motion](https://github.com/chenglou/react-motion) by [Stepan Mikhaylyuk](https://github.com/stepancar)
-* [:link:](react-native/react-native.d.ts) [react-native](https://github.com/facebook/react-native) by [Bruno Grieder](https://github.com/bgrieder)
-* [:link:](react-props-decorators/react-props-decorators.d.ts) [react-props-decorators](https://github.com/popkirby/react-props-decorators) by [Qubo](https://github.com/tkqubo)
-* [:link:](react-redux/react-redux.d.ts) [react-redux](https://github.com/rackt/react-redux) by [Qubo](https://github.com/tkqubo), [Sean Kelley](https://github.com/seansfkelley)
-* [:link:](react-router/react-router.d.ts) [react-router](https://github.com/rackt/react-router) by [Sergey Buturlakin](https://github.com/sergey-buturlakin), [Yuichi Murata](https://github.com/mrk21), [Václav Ostrožlík](https://github.com/vasek17), [Nathan Brown](https://github.com/ngbrown)
-* [:link:](react-router-bootstrap/react-router-bootstrap.d.ts) [react-router-bootstrap](https://github.com/react-bootstrap/react-router-bootstrap) by [Vincent Lesierse](https://github.com/vlesierse)
-* [:link:](react-router-redux/react-router-redux.d.ts) [react-router-redux](https://github.com/rackt/react-router-redux) by [Isman Usoh](http://github.com/isman-usoh), [Noah Shipley](https://github.com/noah79), [Dimitri Rosenberg](https://github.com/rosendi)
-* [:link:](redux-immutable-state-invariant/redux-immutable-state-invariant.d.ts) [react-router-redux](https://github.com/leoasis/redux-immutable-state-invariant) by [Remo H. Jansen](https://github.com/remojansen)
-* [:link:](react-select/react-select.d.ts) [react-select](https://github.com/JedWatson/react-select) by [ESQUIBET Hugo](https://github.com/Hesquibet), [Gilad Gray](https://github.com/giladgray)
-* [:link:](react-spinkit/react-spinkit.d.ts) [react-spinkit](https://github.com/KyleAMathews/react-spinkit) by [Qubo](https://github.com/tkqubo)
-* [:link:](react-swf/react-swf.d.ts) [react-swf](https://github.com/syranide/react-swf) by [Stepan Mikhaylyuk](https://github.com/stepancar)
-* [:link:](react-swipeable-views/react-swipeable-views.d.ts) [react-swipeable-views](https://github.com/oliviertassinari/react-swipeable-views) by [Michael Ledin](https://github.com/mxl)
-* [:link:](react-tabs/react-tabs.d.ts) [react-tabs](https://github.com/reactjs/react-tabs) by [Yuu Igarashi](https://github.com/yu-i9)
-* [:link:](react-tagcloud/react-tagcloud.d.ts) [react-tagcloud](https://github.com/madox2/react-tagcloud) by [wassname](https://github.com/wassname)
-* [:link:](react-tap-event-plugin/react-tap-event-plugin.d.ts) [react-tap-event-plugin](https://github.com/zilverline/react-tap-event-plugin) by [Michael Ledin](https://github.com/mxl)
-* [:link:](react-widgets/react-widgets.d.ts) [react-widgets](https://github.com/jquense/react-widgets) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](read/read.d.ts) [read](https://github.com/isaacs/read) by [Tim JK](https://github.com/timjk)
-* [:link:](readdir-stream/readdir-stream.d.ts) [readdir-stream](https://github.com/logicalparadox/readdir-stream) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](rebass/rebass.d.ts) [Rebass](https://github.com/jxnblk/rebass) by [rhysd](https://rhysd.github.io)
-* [:link:](recursive-readdir/recursive-readdir.d.ts) [recursive-readdir](https://github.com/jergason/recursive-readdir) by [Elisée Maurer](https://github.com/elisee)
-* [:link:](redis/redis.d.ts) [redis](https://github.com/mranney/node_redis) by [Carlos Ballesteros Velasco](https://github.com/soywiz), [Peter Harris](https://github.com/CodeAnimal), [TANAKA Koichi](https://github.com/MugeSo)
-* [:link:](redlock/redlock.d.ts) [Redlock](https://github.com/mike-marcacci/node-redlock) by [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](redux/redux.d.ts) [Redux](https://github.com/rackt/redux) by [William Buchwalter](https://github.com/wbuchwalter), [Vincent Prouillet](https://github.com/Keats)
-* [:link:](redux-action-utils/redux-action-utils.d.ts) [redux-action-utils](https://github.com/insin/redux-action-utils) by [Qubo](https://github.com/tkqubo)
-* [:link:](redux-actions/redux-actions.d.ts) [redux-actions](https://github.com/acdlite/redux-actions) by [Jack Hsu](https://github.com/jaysoo)
-* [:link:](redux-debounced/redux-debounced.d.ts) [redux-debounced](https://github.com/ryanseddon/redux-debounced) by [Sean Kelley](https://github.com/seansfkelley)
-* [:link:](redux-devtools/redux-devtools.d.ts) [redux-devtools](https://github.com/gaearon/redux-devtools) by [Petryshyn Sergii](https://github.com/mc-petry)
-* [:link:](redux-devtools-dock-monitor/redux-devtools-dock-monitor.d.ts) [redux-devtools-dock-monitor](https://github.com/gaearon/redux-devtools-dock-monitor) by [Petryshyn Sergii](https://github.com/mc-petry)
-* [:link:](redux-devtools-log-monitor/redux-devtools-log-monitor.d.ts) [redux-devtools-log-monitor](https://github.com/gaearon/redux-devtools-log-monitor) by [Petryshyn Sergii](https://github.com/mc-petry)
-* [:link:](redux-form/redux-form.d.ts) [redux-form](https://github.com/erikras/redux-form) by [Daniel Lytkin](https://github.com/aikoven)
-* [:link:](react-scroll/react-scroll.d.ts) [redux-immutable](https://github.com/fisshy/react-scroll) by [Pedro Pereira](https://github.com/oizie)
-* [:link:](redux-immutable/redux-immutable.d.ts) [redux-immutable](https://github.com/gajus/redux-immutable) by [Pedro Pereira](https://github.com/oizie)
-* [:link:](redux-logger/redux-logger.d.ts) [redux-logger](https://github.com/fcomb/redux-logger) by [Alexander Rusakov](https://github.com/arusakov)
-* [:link:](redux-promise/redux-promise.d.ts) [redux-promise](https://github.com/acdlite/redux-promise) by [Rogelio Morrell Caballero](https://github.com/molekilla)
-* [:link:](redux-router/redux-router.d.ts) [redux-router](https://github.com/rackt/redux-router) by [Stepan Mikhaylyuk](http://github.com/stepancar)
-* [:link:](redux-saga/redux-saga.d.ts) [redux-saga](https://github.com/yelouafi/redux-saga) by [Daniel Lytkin](https://github.com/aikoven), [Dimitri Rosenberg](https://github.com/rosendi)
-* [:link:](redux-thunk/redux-thunk.d.ts) [redux-thunk](https://github.com/gaearon/redux-thunk) by [Qubo](https://github.com/tkqubo)
-* [:link:](ref/ref.d.ts) [ref](https://github.com/TooTallNate/ref) by [Paul Loyd](https://github.com/loyd)
-* [:link:](ref-array/ref-array.d.ts) [ref-array](https://github.com/TooTallNate/ref-array) by [Paul Loyd](https://github.com/loyd)
-* [:link:](ref-struct/ref-struct.d.ts) [ref-struct](https://github.com/TooTallNate/ref-struct) by [Paul Loyd](https://github.com/loyd)
-* [:link:](ref-union/ref-union.d.ts) [ref-union](https://github.com/TooTallNate/ref-union) by [Paul Loyd](https://github.com/loyd)
-* [:link:](reflux/reflux.d.ts) [RefluxJS](https://github.com/reflux/refluxjs) by [Maurice de Beijer](https://github.com/mauricedb)
-* [:link:](relateurl/relateurl.d.ts) [relateurl](https://github.com/stevenvachon/relateurl) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](replace-ext/replace-ext.d.ts) [replace-ext](https://github.com/wearefractal/replace-ext) by [Deividas Bakanas](https://github.com/DeividasBakanas)
-* [:link:](request/request.d.ts) [request](https://github.com/mikeal/request) by [Carlos Ballesteros Velasco](https://github.com/soywiz), [bonnici](https://github.com/bonnici), [Bart van der Schoor](https://github.com/Bartvds), [Joe Skeen](http://github.com/joeskeen), [Christopher Currens](https://github.com/ccurrens)
-* [:link:](request-ip/request-ip.d.ts) [request-ip](https://github.com/pbojinov/request-ip) by [Adam Babcock](https://github.com/mrhen)
-* [:link:](request-promise/request-promise.d.ts) [request-promise](https://www.npmjs.com/package/request-promise) by [Christopher Glantschnig](https://github.com/cglantschnig), [Joe Skeen](http://github.com/joeskeen)
-* [:link:](requirejs/require.d.ts) [RequireJS](http://requirejs.org) by [Josh Baldwin](https://github.com/jbaldwin)
-* [:link:](reselect/reselect.d.ts) [reselect](https://github.com/rackt/reselect) by [Ian Ker-Seymer](https://github.com/ianks)
-* [:link:](resemblejs/resemblejs.d.ts) [Resemble.js](http://huddle.github.io/Resemble.js) by [Tim Perry](https://github.com/pimterry)
-* [:link:](resolve-from/resolve-from.d.ts) [resolve-from](https://github.com/sindresorhus/resolve-from) by [unional](https://github.com/unional)
-* [:link:](response-time/response-time.d.ts) [response-time](https://github.com/expressjs/response-time) by [Uros Smolnik](https://github.com/urossmolnik)
-* [:link:](rest-io/rest-io.d.ts) [rest-io](https://github.com/EnoF/rest-io) by [Andy Tang](https://github.com/EnoF), [Stefan Schacherl](https://github.com/TheBay0r)
-* [:link:](rest/rest.d.ts) [rest.js](https://github.com/cujojs/rest) by [Wim Looman](https://github.com/Nemo157)
-* [:link:](restangular/restangular.d.ts) [Restangular](https://github.com/mgonto/restangular) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](restful.js/restful.js.d.ts) [restful.js](https://github.com/marmelab/restful.js) by [Qubo](https://github.com/tkqubo)
-* [:link:](rethinkdb/rethinkdb.d.ts) [Rethinkdb](http://rethinkdb.com) by [Sean Hess](https://seanhess.github.io)
-* [:link:](reveal/reveal.d.ts) [Reveal](https://github.com/hakimel/reveal.js) by [grapswiz](https://github.com/grapswiz)
-* [:link:](rewire/rewire.d.ts) [rewire](https://github.com/jhnns/rewire) by [Borislav Zhivkov](https://github.com/borislavjivkov)
-* [:link:](rickshaw/rickshaw.d.ts) [Rickshaw](http://code.shutterstock.com/rickshaw) by [Blake Niemyjski](https://github.com/niemyjski)
-* [:link:](rimraf/rimraf.d.ts) [rimraf](https://github.com/isaacs/rimraf) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
-* [:link:](riot-api-nodejs/riot-api-nodejs.d.ts) [Riot Games API](https://developer.riotgames.com) by [Luca Laissue](https://github.com/zafixlrp)
-* [:link:](riot-games-api/riot-games-api.d.ts) [Riot Games API](https://developer.riotgames.com) by [Xavier Stouder](https://github.com/xstoudi)
-* [:link:](riotjs/riotjs.d.ts) [riot.js](https://github.com/moot/riotjs) by [vvakame](https://github.com/vvakame)
-* [:link:](riotcontrol/riotcontrol.d.ts) [RiotControl](https://github.com/jimsparkman/RiotControl) by [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](rivets/rivets.d.ts) [rivets](http://rivetsjs.com) by [Trevor Baron](https://github.com/TrevorDev)
-* [:link:](rosie/rosie.d.ts) [rosie](https://github.com/rosiejs/rosie) by [Abner Oliveira](https://github.com/abner)
-* [:link:](roslib/roslib.d.ts) [roslib.js](http://wiki.ros.org/roslibjs) by [Stefan Profanter](https://github.com/Pro)
-* [:link:](route-recognizer/route-recognizer.d.ts) [route-recognizer](https://github.com/tildeio/route-recognizer) by [Dave Keen](http://www.keendevelopment.ch)
-* [:link:](router5/router5.d.ts) [router5](https://github.com/router5/router5) by [Matthew Dahl](https://github.com/sandersky)
-* [:link:](routie/routie.d.ts) [routie](https://github.com/jgallen23/routie) by [Adilson](https://github.com/Adilson)
-* [:link:](rsmq/rsmq.d.ts) [rsmq](http://smrchy.github.io/rsmq) by [Qubo](https://github.com/MugeSo)
-* [:link:](rsmq-worker/rsmq-worker.d.ts) [rsmq-worker](http://smrchy.github.io/rsmq/rsmq-worker) by [TANAKA Koichi](https://github.com/MugeSo)
-* [:link:](rss/rss.d.ts) [rss](https://github.com/dylang/node-rss) by [Second Datke](https://github.com/secondwtq)
-* [:link:](rtree/rtree.d.ts) [rtree](https://github.com/leaflet-extras/RTree) by [Omede Firouz](https://github.com/oefirouz)
-* [:link:](run-sequence/run-sequence.d.ts) [run-sequence](https://github.com/OverZealous/run-sequence) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
-* [:link:](rx/rx.d.ts) [RxJS](http://rx.codeplex.com) by [gsino](http://www.codeplex.com/site/users/view/gsino), [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](rx-dom/rx-dom.d.ts) [RxJS](https://github.com/Reactive-Extensions/RxJS-DOM) by [oliver Weichhold](https://github.com/oliverw)
-* [:link:](rx/rx.aggregates.d.ts) [RxJS-Aggregates](http://rx.codeplex.com) by [Carl de Billy](http://carl.debilly.net), [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](rx/rx.all.d.ts) [RxJS-All](http://rx.codeplex.com) by [Carl de Billy](http://carl.debilly.net), [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](rx/rx.async.d.ts) [RxJS-Async](http://rx.codeplex.com) by [zoetrope](https://github.com/zoetrope), [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](rx/rx.backpressure.d.ts) [RxJS-BackPressure](http://rx.codeplex.com) by [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](rx/rx.binding.d.ts) [RxJS-Binding](http://rx.codeplex.com) by [Carl de Billy](http://carl.debilly.net), [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](rx/rx.coincidence.d.ts) [RxJS-Coincidence](http://rx.codeplex.com) by [Carl de Billy](http://carl.debilly.net), [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](rx/rx.experimental.d.ts) [RxJS-Experimental](https://github.com/Reactive-Extensions/RxJS) by [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](rx/rx.joinpatterns.d.ts) [RxJS-Join](http://rx.codeplex.com) by [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](rx-jquery/rx.jquery.d.ts) [RxJS-jQuery](https://github.com/Reactive-Extensions/RxJS-jQuery) by [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](rx/rx.lite.d.ts) [RxJS-Lite](http://rx.codeplex.com) by [gsino](http://www.codeplex.com/site/users/view/gsino), [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](rx/rx.testing.d.ts) [RxJS-Testing](https://github.com/Reactive-Extensions/RxJS) by [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](rx/rx.time.d.ts) [RxJS-Time](http://rx.codeplex.com) by [Carl de Billy](http://carl.debilly.net), [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](rx/rx.virtualtime.d.ts) [RxJS-VirtualTime](http://rx.codeplex.com) by [gsino](http://www.codeplex.com/site/users/view/gsino), [Igor Oleinikov](https://github.com/Igorbek)
-* [:link:](s3-uploader/s3-uploader.d.ts) [s3-uploader](https://www.npmjs.com/package/s3-uploader) by [COLSA Corporation](http://www.colsa.com)
-* [:link:](s3rver/s3rver.d.ts) [S3rver](https://github.com/jamhall/s3rver) by [David Broder-Rodgers](https://github.com/DavidBR-SW)
-* [:link:](safari-extension/safari-extension.d.ts) [Safari extension development](https://developer.apple.com/library/safari/documentation/Tools/Conceptual/SafariExtensionGuide/Introduction/Introduction.html#//apple_ref/doc/uid/TP40009977-CH1-SW1) by [Luuk](https://github.com/luukd)
-* [:link:](safari-extension/safari-extension-content.d.ts) [Safari extension development (content-scripts)](https://developer.apple.com/library/safari/documentation/Tools/Conceptual/SafariExtensionGuide/InjectingScripts/InjectingScripts.html#//apple_ref/doc/uid/TP40009977-CH6-SW1) by [Luuk](https://github.com/luukd)
-* [:link:](sammyjs/sammyjs.d.ts) [Sammy.js](http://sammyjs.org) by [Boris Yankov](https://github.com/borisyankov), [Oisin Grehan](https://github.com/oising)
-* [:link:](sandboxed-module/sandboxed-module.d.ts) [sandboxed-module](https://github.com/felixge/node-sandboxed-module) by [Sven Reglitzki](https://github.com/svi3c)
-* [:link:](sanitize-filename/sanitize-filename.d.ts) [sanitize-filename](https://github.com/parshap/node-sanitize-filename) by [Wim Looman](https://github.com/Nemo157)
-* [:link:](sanitize-html/sanitize-html.d.ts) [sanitize-html](https://github.com/punkave/sanitize-html) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](sanitizer/sanitizer.d.ts) [Sanitizer](https://github.com/theSmaw/Caja-HTML-Sanitizer) by [Dave Taylor](http://davetayls.me)
-* [:link:](sat/sat.d.ts) [sat.js](https://github.com/jriecken/sat-js) by [Hou Chunlei](https://github.com/omni360)
-* [:link:](satnav/satnav.d.ts) [satnav](https://github.com/f5io/satnav-js) by [Christian Holm Diget](https://github.com/DotNetNerd)
-* [:link:](sax/sax.d.ts) [sax js](https://github.com/isaacs/sax-js) by [Asana](https://asana.com)
-* [:link:](scalike/scalike.d.ts) [scalike API](https://github.com/ryoppy/scalike-typescript) by [ryoppy](https://github.com/ryoppy)
-* [:link:](screenfull/screenfull.d.ts) [screenfull.js](https://github.com/sindresorhus/screenfull.js) by [Ilia Choly](http://github.com/icholy)
-* [:link:](scrolltofixed/scrolltofixed.d.ts) [ScrollToFixed](https://github.com/bigspotteddog/ScrollToFixed) by [Ben Dixon](https://github.com/bmdixon)
-* [:link:](scrypt-async/scrypt-async.d.ts) [scrypt-async](https://github.com/dchest/scrypt-async-js) by [Kaur Kuut](https://github.com/xStrom)
-* [:link:](microsoft-sdk-soap/microsoft-sdk-soap.d.ts) [Sdk.Soap.js](https://code.msdn.microsoft.com/SdkSoapjs-9b51b99a) by [Markus Mauch](https://github.com/markusmauch)
-* [:link:](seedrandom/seedrandom.d.ts) [seedrandom](https://github.com/davidbau/seedrandom) by [Kern Handa](https://github.com/kernhanda)
-* [:link:](segment-analytics/segment-analytics.d.ts) [Segment's analytics.js](https://segment.com/docs/libraries/analytics.js) by [Andrew Fong](https://github.com/fongandrew)
-* [:link:](analytics-node/analytics-node.d.ts) [Segment's analytics.js for Node.js](https://segment.com/docs/libraries/node) by [Andrew Fong](https://github.com/fongandrew)
-* [:link:](select2/select2.d.ts) [Select2](http://ivaynberg.github.com/select2) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](selectize/selectize.d.ts) [Selectize](https://github.com/brianreavis/selectize.js) by [Adi Dahiya](https://github.com/adidahiya)
-* [:link:](selenium-webdriver/selenium-webdriver.d.ts) [Selenium WebDriverJS](https://code.google.com/p/selenium) by [Bill Armstrong](https://github.com/BillArmstrong), [Yuki Kokubun](https://github.com/Kuniwak)
-* [:link:](semaphore/semaphore.d.ts) [semaphore](https://github.com/abrkn/semaphore.js) by [Matt Frantz](https://github.com/mhfrantz)
-* [:link:](semver/semver.d.ts) [semver](https://github.com/npm/node-semver) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](sendgrid/sendgrid.d.ts) [sendgrid](https://github.com/sendgrid/sendgrid-nodejs) by [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](sentence-case/sentence-case.d.ts) [sentence-case](https://github.com/blakeembrey/sentence-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](sequelize/sequelize.d.ts) [Sequelize](http://sequelizejs.com) by [samuelneff](https://github.com/samuelneff), [Peter Harris](https://github.com/codeanimal), [Ivan Drinchev](https://github.com/drinchev)
-* [:link:](sequelize-fixtures/sequelize-fixtures.d.ts) [Sequelize-Fixtures](https://github.com/domasx2/sequelize-fixtures) by [Christian Schwarz](https://github.com/cschwarz)
-* [:link:](on-headers/on-headers.d.ts) [serve-favicon](https://github.com/jshttp/on-headers) by [John Jeffery](https://github.com/jjeffery)
-* [:link:](serve-favicon/serve-favicon.d.ts) [serve-favicon](https://github.com/expressjs/serve-favicon) by [Uros Smolnik](https://github.com/urossmolnik)
-* [:link:](serve-index/serve-index.d.ts) [serve-index](https://github.com/expressjs/serve-index) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](serve-static/serve-static.d.ts) [serve-static](https://github.com/expressjs/serve-static) by [Uros Smolnik](https://github.com/urossmolnik)
-* [:link:](ss-utils/ss-utils.d.ts) [ServiceStack Utils](https://servicestack.net) by [Demis Bellot](https://github.com/mythz)
-* [:link:](sharedworker/SharedWorker.d.ts) [SharedWorker](http://www.w3.org/TR/workers) by [Toshiya Nakakura](https://github.com/nakakura)
-* [:link:](sharepoint/SharePoint.d.ts) [SharePoint 2010 and 2013](https://github.com/gandjustas/sptypescript) by [Stanislav Vyshchepan](http://blog.gandjustas.ru), [Andrey Markeev](http://markeev.com)
-* [:link:](shelljs/shelljs.d.ts) [ShellJS](http://shelljs.org) by [Niklas Mollenhauer](https://github.com/nikeee)
-* [:link:](shortid/shortid.d.ts) [shortid](https://github.com/dylang/shortid) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](should-promised/should-promised.d.ts) [should-promised](https://github.com/shouldjs/promised) by [Yaroslav Admin](https://github.com/devoto13)
-* [:link:](should/should.d.ts) [should.js](https://github.com/shouldjs/should.js) by [Alex Varju](https://github.com/varju), [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](showdown/showdown.d.ts) [Showdown](https://github.com/coreyti/showdown) by [cbowdon](https://github.com/cbowdon)
-* [:link:](shuffle-array/shuffle-array.d.ts) [shuffle-array](https://github.com/pazguille/shuffle-array) by [rhysd](https://rhysd.github.io)
-* [:link:](siesta/siesta.d.ts) [Siesta](http://www.bryntum.com/products/siesta) by [bquarmby](https://github.com/bquarmby)
-* [:link:](sigmajs/sigmajs.d.ts) [sigma.js](https://github.com/jacomyal/sigma.js) by [Qinfeng Chen](https://github.com/qinfchen)
-* [:link:](signalr/signalr.d.ts) [SignalR](http://www.asp.net/signalr) by [Boris Yankov](https://github.com/borisyankov), [T. Michael Keesey](https://github.com/keesey), [Giedrius Grabauskas](https://github.com/GiedriusGrabauskas)
-* [:link:](signature_pad/signature_pad.d.ts) [signature_pad](https://github.com/szimek/signature_pad) by [Abubaker Bashir](https://github.com/AbubakerB)
-* [:link:](simple-cw-node/simple-cw-node.d.ts) [simple-cw-node](https://github.com/astronaughts/simple-cw-node) by [vvakame](https://github.com/vvakame)
-* [:link:](simple-mock/simple-mock.d.ts) [simple-mock](https://github.com/jupiter/simple-mock) by [Leon Yu](https://github.com/leonyu)
-* [:link:](simplebar/simplebar.d.ts) [simplebar.js](https://github.com/Grsmto/simplebar) by [Gregor Woiwode](https://github.com/gregonnet)
-* [:link:](jquery.simplemodal/jquery.simplemodal.d.ts) [SimpleModal](http://www.ericmmartin.com/projects/simplemodal) by [Friedrich von Never](https://github.com/ForNeVeR)
-* [:link:](simplestorage.js/simplestorage.js.d.ts) [simpleStorage](https://github.com/andris9/simpleStorage) by [Áxel Costas Pena](https://github.com/axelcostaspena)
-* [:link:](sinon/sinon.d.ts) [Sinon](http://sinonjs.org) by [William Sears](https://github.com/mrbigdog2u)
-* [:link:](sinon-chai/sinon-chai.d.ts) [sinon-chai](https://github.com/domenic/sinon-chai) by [Kazi Manzur Rashid](https://github.com/kazimanzurrashid), [Jed Mao](https://github.com/jedmao)
-* [:link:](sinon-chrome/sinon-chrome.d.ts) [Sinon-Chrome](https://github.com/vitalets/sinon-chrome) by [Tim Perry](https://github.com/pimterry)
-* [:link:](sinon-stub-promise/sinon-stub-promise.d.ts) [sinon-stub-promise](https://github.com/substantial/sinon-stub-promise) by [Thiago Temple](https://github.com/vintem)
-* [:link:](sipml/sipml.d.ts) [SIPml5](http://sipml5.org) by [A. Groenenboom](https://github.com/chookies)
-* [:link:](sjcl/sjcl.d.ts) [sjcl](http://crypto.stanford.edu/sjcl) by [Eugene Chernyshov](https://github.com/Evgenus)
-* [:link:](ski/ski.d.ts) [ski](https://github.com/jden/ski) by [Aya Morisawa](https://github.com/AyaMorisawa)
-* [:link:](skyway/skyway.d.ts) [SkyWay](http://nttcom.github.io/skyway) by [Toshiya Nakakura](https://github.com/nakakura)
-* [:link:](slate-irc/slate-irc.d.ts) [slate-irc](https://github.com/slate/slate-irc) by [Elisée MAURER](https://github.com/elisee)
-* [:link:](slickgrid/SlickGrid.d.ts) [SlickGrid](https://github.com/mleibman/SlickGrid) by [Josh Baldwin](https://github.com/jbaldwin)
-* [:link:](slickgrid/slick.autotooltips.d.ts) [SlickGrid AutoToolTips Plugin](https://github.com/mleibman/SlickGrid) by [Ryo Iwamoto](https://github.com/ryiwamoto)
-* [:link:](slickgrid/slick.headerbuttons.d.ts) [SlickGrid HeaderButtons Plugin](https://github.com/mleibman/SlickGrid) by [Derek Cicerone](https://github.com/derekcicerone)
-* [:link:](slickgrid/slick.rowselectionmodel.d.ts) [SlickGrid RowSelectionModel Plugin](https://github.com/mleibman/SlickGrid) by [Derek Cicerone](https://github.com/derekcicerone)
-* [:link:](slideout/slideout.d.ts) [Slideout](https://github.com/mango/slideout) by [Markus Peloso](https://github.com/ToastHawaii)
-* [:link:](smoothie/smoothie.d.ts) [Smoothie Charts](https://github.com/joewalnes/smoothie) by [Drew Noakes](https://drewnoakes.com), [Mike H. Hawley](https://github.com/mikehhawley)
-* [:link:](smtpapi/smtpapi.d.ts) [smtpapi-nodejs](https://github.com/sendgrid/smtpapi-nodejs) by [Antonio Morales](https://github.com/a-morales)
-* [:link:](snake-case/snake-case.d.ts) [snake-case](https://github.com/blakeembrey/snake-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](snapsvg/snapsvg.d.ts) [Snap-SVG](https://github.com/adobe-webplatform/Snap.svg) by [Lars Klein](https://github.com/lhk), [Mattanja Kern](https://github.com/mattanja)
-* [:link:](soap/soap.d.ts) [soap](https://www.npmjs.com/package/soap) by [Nicole Wang](https://github.com/nicoleWjie)
-* [:link:](cordova-plugin-x-socialsharing/cordova-plugin-x-socialsharing.d.ts) [SocialSharing-PhoneGap-Plugin](https://github.com/EddyVerbruggen/SocialSharing-PhoneGap-Plugin) by [Markus Wagner](https://github.com/Ritzlgrmft)
-* [:link:](socket.io/socket.io.d.ts) [socket.io](http://socket.io) by [PROGRE](https://github.com/progre), [Damian Connolly](https://github.com/divillysausages), [Florent Poujol](https://github.com/florentpoujol)
-* [:link:](socket.io-client/socket.io-client.d.ts) [socket.io-client](http://socket.io) by [PROGRE](https://github.com/progre), [Damian Connolly](https://github.com/divillysausages), [Florent Poujol](https://github.com/florentpoujol)
-* [:link:](socket.io-redis/socket.io-redis.d.ts) [socket.io-redis](https://github.com/socketio/socket.io-redis) by [Philipp Holzer](https://github.com/nupplaphil)
-* [:link:](socket.io.users/socket.io.users.d.ts) [socket.io.users](https://github.com/nodets/socket.io.users) by [Makis Maropoulos](https://github.com/kataras)
-* [:link:](socketty/socketty.d.ts) [Socketty](https://www.npmjs.com/package/socketty) by [Nax](https://github.com/Nax)
-* [:link:](sockjs/sockjs.d.ts) [SockJS 0.3.x](https://github.com/sockjs/sockjs-client) by [Emil Ivanov](https://github.com/vladev)
-* [:link:](sockjs-client/sockjs-client.d.ts) [sockjs-client](https://github.com/sockjs/sockjs-client) by [Emil Ivanov](https://github.com/vladev), [Alexander Rusakov](https://github.com/arusakov)
-* [:link:](sockjs-node/sockjs-node.d.ts) [sockjs-node 0.3.x](https://github.com/sockjs/sockjs-node) by [Phil McCloghry-Laing](https://github.com/pmccloghrylaing)
-* [:link:](sortablejs/sortablejs.d.ts) [Sortable.js](https://github.com/RubaXa/Sortable) by [Maw-Fox](http://github.com/Maw-Fox)
-* [:link:](soundjs/soundjs.d.ts) [SoundJS](http://www.createjs.com/#!/SoundJS) by [Pedro Ferreira](https://bitbucket.org/drk4)
-* [:link:](source-map/source-map.d.ts) [source-map](https://github.com/mozilla/source-map) by [Morten Houston Ludvigsen](https://github.com/MortenHoustonLudvigsen)
-* [:link:](source-map-support/source-map-support.d.ts) [source-map-support](https://github.com/evanw/source-map-support) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](space-pen/space-pen.d.ts) [SpacePen](https://github.com/atom/space-pen) by [vvakame](https://github.com/vvakame)
-* [:link:](speakeasy/speakeasy.d.ts) [speakeasy](https://github.com/markbao/speakeasy) by [Lucas Woo](https://github.com/legendecas)
-* [:link:](spectrum/spectrum.d.ts) [spectrum](https://github.com/bgrins/spectrum) by [Mordechai Zuber](https://github.com/M-Zuber)
-* [:link:](spin/spin.d.ts) [Spin.js](http://fgnass.github.com/spin.js) by [Boris Yankov](https://github.com/borisyankov), [Theodore Brown](https://github.com/theodorejb)
-* [:link:](split/split.d.ts) [split](https://github.com/dominictarr/split) by [Marcin Porębski](https://github.com/marcinporebski)
-* [:link:](spotify-web-api-js/spotify-web-api-js.d.ts) [spotify-web-api-js](https://github.com/JMPerez/spotify-web-api-js) by [Niels Kristian Hansen Skovmand](https://github.com/skovmand)
-* [:link:](sprintf-js/sprintf-js.d.ts) [sprintf-js](https://www.npmjs.com/package/sprintf-js) by [Jason Swearingen](https://jasonswearingen.github.io)
-* [:link:](sprintf/sprintf.d.ts) [sprintff](https://github.com/maritz/node-sprintff) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
-* [:link:](sql.js/sql.js.d.ts) [sql.js](https://github.com/kripken/sql.js) by [George Wu](https://github.com/Hozuki)
-* [:link:](sqlite3/sqlite3.d.ts) [sqlite3](https://github.com/mapbox/node-sqlite3) by [Nick Malaguti](https://github.com/nmalaguti)
-* [:link:](squirejs/squirejs.d.ts) [Squire](https://github.com/iammerrick/Squire.js) by [Bradley Ayers](https://github.com/bradleyayers)
-* [:link:](ssh2/ssh2.d.ts) [ssh2](https://github.com/mscdex/ssh2) by [Qubo](https://github.com/tkQubo)
-* [:link:](stack-mapper/stack-mapper.d.ts) [stack-mapper](https://github.com/thlorenz/stack-mapper) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](stacktrace-js/stacktrace-js.d.ts) [stacktrace.js](https://github.com/stacktracejs/stacktrace.js) by [Exceptionless](https://github.com/exceptionless)
-* [:link:](stampit/stampit.d.ts) [stampit](https://github.com/stampit-org/stampit) by [Vasyl Boroviak](https://github.com/koresar)
-* [:link:](stamplay-js-sdk/stamplay-js-sdk.d.ts) [stamplay-js-sdk](https://github.com/Stamplay/stamplay-js-sdk) by [Riderman de Sousa Barbosa](https://github.com/ridermansb)
-* [:link:](static-eval/static-eval.d.ts) [static-eval](https://github.com/substack/static-eval) by [Ben Liddicott](https://github.com/benliddicott/DefinitelyTyped)
-* [:link:](stats/stats.d.ts) [Stats.js r12](http://github.com/mrdoob/stats.js) by [Gregory Dalton](https://github.com/gregolai)
-* [:link:](statsd-client/statsd-client.d.ts) [statsd-client](https://github.com/msiebuhr/node-statsd-client) by [Peter Kooijmans](https://github.com/peterkooijmans)
-* [:link:](status-bar/status-bar.d.ts) [status-bar](https://github.com/atom/status-bar) by [vvakame](https://github.com/vvakame)
-* [:link:](statuses/statuses.d.ts) [statuses](https://github.com/jshttp/statuses) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](steam/steam.d.ts) [steam](https://github.com/seishun/node-steam) by [Andrey Kurdyumov](https://github.com/kant2002)
-* [:link:](slick-carousel/slick-carousel.d.ts) [stick](http://kenwheeler.github.io/slick) by [John Gouigouix](https://github.com/orchestra-ts/DefinitelyTyped)
-* [:link:](storejs/storejs.d.ts) [store.js](https://github.com/marcuswestin/store.js) by [Vincent Bortone](https://github.com/vbortone)
-* [:link:](stream-meter/stream-meter.d.ts) [stream-meter](https://github.com/brycebaril/node-stream-meter) by [TANAKA Koichi](https://github.com/mugeso)
-* [:link:](stream-series/stream-series.d.ts) [stream-series](https://github.com/rschmukler/stream-series) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
-* [:link:](stream-to-array/stream-to-array.d.ts) [stream-to-array](https://github.com/stream-utils/stream-to-array) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](streamjs/streamjs.d.ts) [streamjs](http://winterbe.github.io/streamjs) by [Bence Eros](https://github.com/erosb)
-* [:link:](string_score/string_score.d.ts) [string_score](https://github.com/joshaven/string_score) by [Marcin Porębski](https://github.com/marcinporebski)
-* [:link:](string/string.d.ts) [string.js](http://stringjs.com) by [Bas Pennings](https://github.com/basp)
-* [:link:](strip-json-comments/strip-json-comments.d.ts) [strip-json-comments](https://github.com/sindresorhus/strip-json-comments) by [Dylan R. E. Moonfire](https://github.com/dmoonfire)
-* [:link:](stripe/stripe.d.ts) [stripe](https://stripe.com) by [Andy Hawkins](https://github.com/a904guy/,http://a904guy.com), [Eric J. Smith](https://github.com/ejsmith), [Amrit Kahlon](https://github.com/amritk)
-* [:link:](stripe-checkout/stripe-checkout.d.ts) [Stripe Checkout](https://stripe.com/checkout) by [Chris Wrench](https://github.com/cgwrench)
-* [:link:](stripe/stripe-node.d.ts) [stripe-node](https://github.com/stripe/stripe-node) by [William Johnston](https://github.com/wjohnsto), [Peter Harris](https://github.com/codeanimal)
-* [:link:](strophe/strophe.d.ts) [Strophe.js](http://strophe.im/strophejs) by [David Deutsch](https://github.com/DavidKDeutsch)
-* [:link:](stylus/stylus.d.ts) [stylus](https://github.com/LearnBoost/stylus) by [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](sugar/sugar.d.ts) [Sugar](http://sugarjs.com) by [Josh Baldwin](https://github.com/jbaldwin)
-* [:link:](superagent/superagent.d.ts) [SuperAgent](https://github.com/visionmedia/superagent) by [Alex Varju](https://github.com/varju)
-* [:link:](supertest/supertest.d.ts) [SuperTest](https://github.com/visionmedia/supertest) by [Alex Varju](https://github.com/varju)
-* [:link:](supertest-as-promised/supertest-as-promised.d.ts) [SuperTest as Promised](https://github.com/WhoopInc/supertest-as-promised) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](svg-injector/svg-injector.d.ts) [SVG Injector](https://github.com/iconic/SVGInjector) by [Patrick Westerhoff](https://github.com/poke)
-* [:link:](svg-pan-zoom/svg-pan-zoom-2.3.9.d.ts) [svg-pan-zoom](https://github.com/ariutta/svg-pan-zoom) by [Chintan Shah](https://github.com/Promact)
-* [:link:](svg-pan-zoom/svg-pan-zoom.d.ts) [svg-pan-zoom](https://github.com/ariutta/svg-pan-zoom) by [César Vidril](https://github.com/Yimiprod)
-* [:link:](svg-sprite/svg-sprite.d.ts) [svg-sprite](https://github.com/jkphl/svg-sprite) by [Qubo](https://github.com/tkqubo)
-* [:link:](svgjs/svgjs.d.ts) [svg.js](http://www.svgjs.com) by [Sean Hess](https://seanhess.github.io)
-* [:link:](svg2png/svg2png.d.ts) [svg2png node package](https://github.com/domenic/svg2png) by [hans windhoff](https://github.com/hansrwindhoff)
-* [:link:](svgjs.draggable/svgjs.draggable.d.ts) [svgjs.draggable](http://www.svgjs.com) by [Luigi Trabacchin](https://github.com/LiFeleSs)
-* [:link:](swag/swag.d.ts) [swag](https://github.com/elving/swag) by [Shogo Iwano](https://github.com/shiwano)
-* [:link:](swaggerize-express/swaggerize-express.d.ts) [swaggerize-express 4.x](https://github.com/krakenjs/swaggerize-express) by [TANAKA Koichi](https://github.com/mugeso)
-* [:link:](swap-case/swap-case.d.ts) [swap-case](https://github.com/blakeembrey/swap-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](sweetalert/sweetalert.d.ts) [SweetAlert](https://github.com/t4t5/sweetalert) by [Markus Peloso](https://github.com/ToastHawaii)
-* [:link:](swfobject/swfobject.d.ts) [swfobject](https://code.google.com/p/swfobject) by [rou](https://github.com/rou)
-* [:link:](swiftclick/swiftclick.d.ts) [SwiftClick](https://github.com/munkychop/swiftclick) by [Laurence C](https://github.com/Laurence-C)
-* [:link:](swig/swig.d.ts) [swig](http://github.com/paularmstrong/swig) by [Peter Harris](https://github.com/CodeAnimal), [Carlos Ballesteros Velasco](https://github.com/soywiz)
-* [:link:](swig-email-templates/swig-email-templates.d.ts) [swig-email-templates](https://github.com/andrewrk/swig-email-templates) by [Adam Babcock](https://github.com/mrhen)
-* [:link:](swipe/swipe.d.ts) [Swipe](https://github.com/thebird/Swipe) by [Andrey Kurdyumov](https://github.com/kant2002)
-* [:link:](swiper/swiper.d.ts) [Swiper](https://github.com/nolimits4web/Swiper) by [Sebastián Galiano](https://github.com/sgaliano), [Luca Trazzi](https://github.com/lucax88x)
-* [:link:](swipeview/swipeview.d.ts) [SwipeView](http://cubiq.org/swipeview) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](switchery/switchery.d.ts) [switchery](https://github.com/abpetkov/switchery) by [Bruno Grieder](https://github.com/bgrieder), [Clayton Lautier](https://github.com/claylaut)
-* [:link:](swiz/swiz.d.ts) [swiz](https://github.com/racker/node-swiz) by [Jeff Goddard](https://github.com/jedigo)
-* [:link:](systemjs/systemjs.d.ts) [System.js](https://github.com/systemjs/systemjs) by [Ludovic HENIN](https://github.com/ludohenin), [Nathan Walker](https://github.com/NathanWalker)
-* [:link:](tabris/tabris.d.ts) [Tabris.js](http://tabrisjs.com) by [Tabris.js team](http://github.com/eclipsesource/tabris)
-* [:link:](tabtab/tabtab.d.ts) [tabtab](https://github.com/mklabs/node-tabtab) by [Vojtěch Habarta](https://github.com/vojtechhabarta)
-* [:link:](tape/tape.d.ts) [tape](https://github.com/substack/tape) by [Bart van der Schoor](https://github.com/Bartvds), [Haoqun Jiang](https://github.com/sodatea)
-* [:link:](tar/tar.d.ts) [tar](https://github.com/npm/node-tar) by [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](tcomb/tcomb.d.ts) [tcomb](http://gcanti.github.io/tcomb/guide/index.html) by [Hans Windhoff](https://github.com/hansrwindhoff)
-* [:link:](tea-merge/tea-merge.d.ts) [tea-merge](https://github.com/qualiancy/tea-merge) by [Mihhail Lapushkin](https://github.com/mihhail-lapushkin)
-* [:link:](tedious/tedious.d.ts) [tedious](https://pekim.github.io/tedious) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](tedious-connection-pool/tedious-connection-pool.d.ts) [tedious-connection-pool](https://github.com/pekim/tedious-connection-pool) by [Cyprien Autexier](https://github.com/sandorfr)
-* [:link:](teechart/teechart.d.ts) [TeeChart](http://www.steema.com) by [Steema Software](https://steema.com)
-* [:link:](temp/temp.d.ts) [temp](https://www.npmjs.com/package/temp) by [Daniel Rosenwasser](https://github.com/DanielRosenwasser)
-* [:link:](temp-fs/temp-fs.d.ts) [temp-fs](https://github.com/jakwings/node-temp-fs) by [MEDIA CHECK s.r.o.](http://www.mediacheck.cz)
-* [:link:](tether/tether.d.ts) [Tether](http://github.hubspot.com/tether) by [Adi Dahiya](https://github.com/adidahiya)
-* [:link:](tether-shepherd/tether-shepherd.d.ts) [Tether-Shepherd](http://github.hubspot.com/shepherd) by [Matt Gibbs](https://github.com/mtgibbs)
-* [:link:](text-buffer/text-buffer.d.ts) [text-buffer](https://github.com/atom/text-buffer) by [vvakame](https://github.com/vvakame)
-* [:link:](text-encoding/text-encoding.d.ts) [text-encoding](https://github.com/inexorabletash/text-encoding) by [MIZUNE Pine](https://github.com/pine613)
-* [:link:](facebook-js-sdk/facebook-js-sdk.d.ts) [the Facebook Javascript SDK](https://developers.facebook.com/docs/javascript) by [Amrit Kahlon](https://github.com/amritk)
-* [:link:](facebook-pixel/facebook-pixel.d.ts) [the Facebook Pixel Tag API](https://developers.facebook.com/docs/ads-for-websites/tag-api) by [Noctis Hsu](https://github.com/noctishsu)
-* [:link:](spotify-api/spotify-api.d.ts) [The Spotify Web API](https://developer.spotify.com/web-api) by [Niels Kristian Hansen Skovmand](https://github.com/skovmand)
-* [:link:](threejs/three-FirstPersonControls.d.ts) [three.js](http://mrdoob.github.com/three.js) by [Poul Kjeldager Sørensen](https://github.com/s093294)
-* [:link:](threejs/three-canvasrenderer.d.ts) [three.js (CanvasRenderer.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/renderers/CanvasRenderer.js) by [Satoru Kimura](https://github.com/gyohk)
-* [:link:](threejs/three-copyshader.d.ts) [three.js (CopyShader.js)](https://github.com/mrdoob/three.js/blob/r68/examples/js/shaders/CopyShader.js) by [Satoru Kimura](https://github.com/gyohk)
-* [:link:](threejs/three-css3drenderer.d.ts) [three.js (CSS3DRenderer.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/renderers/CSS3DRenderer.js) by [Satoru Kimura](https://github.com/gyohk)
-* [:link:](threejs/detector.d.ts) [three.js (Detector.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/Detector.js) by [Satoru Kimura](https://github.com/gyohk)
-* [:link:](threejs/three-editorcontrols.d.ts) [three.js (EditorControls.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/controls/EditorControls.js) by [Qinsi ZHU](https://github.com/qszhusightp)
-* [:link:](threejs/three-effectcomposer.d.ts) [three.js (EffectComposer.js)](https://github.com/mrdoob/three.js/blob/r68/examples/js/postprocessing/EffectComposer.js) by [Satoru Kimura](https://github.com/gyohk)
-* [:link:](threejs/three-maskpass.d.ts) [three.js (MaskPass.js)](https://github.com/mrdoob/three.js/blob/r68/examples/js/postprocessing/MaskPass.js) by [Satoru Kimura](https://github.com/gyohk)
-* [:link:](threejs/three-orbitcontrols.d.ts) [three.js (OrbitControls.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/controls/OrbitControls.js) by [Satoru Kimura](https://github.com/gyohk)
-* [:link:](threejs/three-orthographictrackballcontrols.d.ts) [three.js (OrthographicTrackballControls.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/controls/OrthographicTrackballControls.js) by [Stefan Profanter](https://github.com/pro)
-* [:link:](threejs/three-projector.d.ts) [three.js (Projector.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/renderers/Projector.js) by [Satoru Kimura](https://github.com/gyohk)
-* [:link:](threejs/three-renderpass.d.ts) [three.js (RenderPass.js)](https://github.com/mrdoob/three.js/blob/r68/examples/js/postprocessing/RenderPass.js) by [Satoru Kimura](https://github.com/gyohk)
-* [:link:](threejs/three-shaderpass.d.ts) [three.js (ShaderPass.js)](https://github.com/mrdoob/three.js/blob/r68/examples/js/postprocessing/ShaderPass.js) by [Satoru Kimura](https://github.com/gyohk)
-* [:link:](threejs/three-trackballcontrols.d.ts) [three.js (TrackballControls.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/controls/TrackballControls.js) by [Satoru Kimura](https://github.com/gyohk)
-* [:link:](threejs/three-transformcontrols.d.ts) [three.js (TransformControls.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/controls/TransformControls.js) by [Stefan Profanter](https://github.com/Pro)
-* [:link:](threejs/three-vrcontrols.d.ts) [three.js (VRControls.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/controls/VRControls.js) by [Toshiya Nakakura](https://github.com/nakakura)
-* [:link:](threejs/three-vreffect.d.ts) [three.js (VREffect.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/effects/VREffect.js) by [Toshiya Nakakura](https://github.com/nakakura)
-* [:link:](threejs/three.d.ts) [three.js r75](http://mrdoob.github.com/three.js) by [Kon](http://phyzkit.net), [Satoru Kimura](https://github.com/gyohk), [Florent Poujol](https://github.com/florentpoujol), [SereznoKot](https://github.com/SereznoKot)
-* [:link:](thrift/thrift.d.ts) [thrift](https://www.npmjs.com/package/thrift) by [Zachary Collins](https://github.com/corps)
-* [:link:](through/through.d.ts) [through](https://github.com/dominictarr/through) by [Andrew Gaspar](https://github.com/AndrewGaspar)
-* [:link:](through2/through2.d.ts) [through2 v](https://github.com/rvagg/through2) by [Bart van der Schoor](https://github.com/Bartvds), [jedmao](https://github.com/jedmao), [Georgios Valotasios](https://github.com/valotas)
-* [:link:](timelinejs/timelinejs.d.ts) [timelinejs](https://github.com/NUKnightLab/TimelineJS) by [Roland Zwaga](https://github.com/rolandzwaga)
-* [:link:](timezone-js/timezone-js.d.ts) [timezone-js](https://github.com/mde/timezone-js) by [bonnici](https://github.com/bonnici)
-* [:link:](timezonecomplete/timezonecomplete.d.ts) [timezonecomplete](https://github.com/SpiritIT/timezonecomplete) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](tv4/tv4.d.ts) [Tiny Validator tv4](https://github.com/geraintluff/tv4) by [Bart van der Schoor](https://github.com/Bartvds), [Peter Snider](https://github.com/psnider)
-* [:link:](tinycolor/tinycolor.d.ts) [tinycolor](https://github.com/bgrins/TinyColor) by [Mordechai Zuber](https://github.com/M-Zuber)
-* [:link:](titanium/titanium.d.ts) [Titanium Mobile](http://www.appcelerator.com) by [Craig Younkins](https://github.com/cyounkins)
-* [:link:](title-case/title-case.d.ts) [title-case](https://github.com/blakeembrey/title-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](tmp/tmp.d.ts) [tmp](https://www.npmjs.com/package/tmp) by [Jared Klopper](https://github.com/optical)
-* [:link:](to-title-case-gouch/to-title-case-gouch.d.ts) [to-title-case](https://github.com/gouch/to-title-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](toastr/toastr.d.ts) [Toastr](https://github.com/CodeSeven/toastr) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](tooltipster/tooltipster.d.ts) [tooltipster](https://github.com/iamceege/tooltipster) by [Stephen Lautier](https://github.com/stephenlautier)
-* [:link:](sencha_touch/SenchaTouch.d.ts) [Touch](http://www.sencha.com/products/touch) by [Brian Kotek](https://github.com/brian428)
-* [:link:](traceback/traceback.d.ts) [Traceback](http://github.com/iriscouch/traceback) by [Michael Zabka](https://github.com/misak113)
-* [:link:](tracking/tracking.d.ts) [Tracking.js](https://github.com/eduardolundgren/tracking.js) by [Tim Perry](https://github.com/pimterry)
-* [:link:](traverse/traverse.d.ts) [traverse](https://github.com/substack/js-traverse) by [newclear](https://github.com/newclear)
-* [:link:](traverson/traverson.d.ts) [Traverson](https://github.com/basti1302/traverson) by [Marcin Porębski](https://github.com/marcinporebski)
-* [:link:](trunk8/trunk8.d.ts) [trunk8](https://github.com/rviscomi/trunk8) by [Blake Niemyjski](https://github.com/niemyjski)
-* [:link:](tsmonad/tsmonad.d.ts) [TsMonad](https://github.com/cbowdon/TsMonad) by [Chris Bowdon](https://github.com/cbowdon)
-* [:link:](tspromise/tspromise.d.ts) [tspromise](https://github.com/soywiz/tspromise) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
-* [:link:](turf/turf.d.ts) [Turf](http://turfjs.org) by [Guillaume Croteau](https://github.com/gcroteau)
-* [:link:](tween.js/tween.js.d.ts) [tween.js r12](https://github.com/sole/tween.js) by [sunetos](https://github.com/sunetos), [jzarnikov](https://github.com/jzarnikov)
-* [:link:](tweenjs/tweenjs.d.ts) [TweenJS](http://www.createjs.com/#!/TweenJS) by [Pedro Ferreira](https://bitbucket.org/drk4), [Chris Smith](https://github.com/evilangelist)
-* [:link:](twig/twig.d.ts) [twig](https://github.com/justjohn/twig.js) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
-* [:link:](twitter/twitter.d.ts) [Twitter for Websites](https://dev.twitter.com/web) by [Chitoku](https://github.com/chitoku-k)
-* [:link:](jquery.bootstrap.wizard/jquery.bootstrap.wizard.d.ts) [twitter-bootstrap-wizard](https://github.com/VinceG/twitter-bootstrap-wizard) by [Blake Niemyjski](https://github.com/niemyjski)
-* [:link:](twitter-text/twitter-text.d.ts) [twitter-text](https://github.com/twitter/twitter-text) by [rhysd](https://rhysd.github.io)
-* [:link:](twix/twix.d.ts) [twix.js](https://github.com/icambron/twix.js) by [j3ko](https://github.com/j3ko)
-* [:link:](type-check/type-check.d.ts) [type-check](https://github.com/gkz/type-check) by [Hans Windhoff](https://github.com/hansrwindhoff)
-* [:link:](type-detect/type-detect.d.ts) [type-detect](https://github.com/chaijs/type-detect) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](type-name/type-name.d.ts) [type-name](https://github.com/twada/type-name) by [OKUNOKENTARO](https://github.com/armorik83)
-* [:link:](typeahead/typeahead.d.ts) [typeahead.js](http://twitter.github.io/typeahead.js) by [Ivaylo Gochkov](https://github.com/igochkov), [Gidon Junge](https://github.com/gjunge)
-* [:link:](webfontloader/webfontloader.d.ts) [typekit-webfontloader](https://github.com/typekit/webfontloader) by [doskallemaskin](https://github.com/doskallemaskin)
-* [:link:](typescript-services/typescriptServices.d.ts) [TypeScript API](http://www.typescriptlang.org) by [Microsoft TypeScript](http://typescriptlang.org)
-* [:link:](typescript/typescript.d.ts) [TypeScript API](http://www.typescriptlang.org) by [Microsoft TypeScript](http://typescriptlang.org)
-* [:link:](typescript-deferred/typescript-deferred.d.ts) [typescript-deferred](https://github.com/DirtyHairy/typescript-deferred) by [Christian Speckner](https://github.com/DirtyHairy)
-* [:link:](meteor-persistent-session/meteor-persistent-session.d.ts) [u2622:persistent-session](https://github.com/okgrow/meteor-persistent-session) by [Robbie Van Gorkom](https://github.com/vangorra)
-* [:link:](ua-parser-js/ua-parser-js.d.ts) [ua-parser-js](https://github.com/faisalman/ua-parser-js) by [Viktor Miroshnikov](https://github.com/superduper), [Lucas Woo](https://github.com/legendecas)
-* [:link:](unity-webapi/unity-webapi.d.ts) [Ubuntu Unity Web API](https://launchpad.net/libunity-webapps) by [John Vrbanac](https://github.com/jmvrbanac)
-* [:link:](uglify-js/uglify-js.d.ts) [UglifyJS 2](https://github.com/mishoo/UglifyJS2) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](ui-grid/ui-grid.d.ts) [ui-grid](http://www.ui-grid.info) by [Ben Tesser](https://github.com/btesser), [Joe Skeen](http://github.com/joeskeen)
-* [:link:](ui-router-extras/ui-router-extras.d.ts) [UI-Router Extras (ct.ui.router.extras module)](https://github.com/christopherthielen/ui-router-extras) by [Michael Putters](https://github.com/mputters), [Marcel van de Kamp](https://github.com/marcel-k)
-* [:link:](ui-select/ui-select.d.ts) [ui-select](https://github.com/angular-ui/ui-select) by [Niko Kovačič](https://github.com/nkovacic)
-* [:link:](uikit/uikit.d.ts) [uikit](http://getuikit.org) by [Giovanni Silva](https://github.com/giovannicandido)
-* [:link:](umbraco/umbraco-resources.d.ts) [Umbraco](https://github.com/umbraco) by [DeCareSystemsIreland](https://github.com/DeCareSystemsIreland)
-* [:link:](umbraco/umbraco-services.d.ts) [Umbraco](https://github.com/umbraco) by [DeCareSystemsIreland](https://github.com/DeCareSystemsIreland)
-* [:link:](umbraco/umbraco.d.ts) [Umbraco](https://github.com/umbraco) by [DeCareSystemsIreland](https://github.com/DeCareSystemsIreland)
-* [:link:](umzug/umzug.d.ts) [Umzug](https://github.com/sequelize/umzug) by [Ivan Drinchev](https://github.com/drinchev)
-* [:link:](underscore/underscore.d.ts) [Underscore](http://underscorejs.org) by [Boris Yankov](https://github.com/borisyankov), [Josh Baldwin](https://github.com/jbaldwin), [Christopher Currens](https://github.com/ccurrens)
-* [:link:](underscore-ko/underscore-ko.d.ts) [Underscore-ko 1.2.2 with underscore](https://github.com/kamranayub/UnderscoreKO) by [Maurits Elbers](https://github.com/MagicMau)
-* [:link:](underscore.string/underscore.string.d.ts) [underscore.string](https://github.com/epeli/underscore.string) by [Ry Racherbaumer](http://github.com/rygine)
-* [:link:](undertaker/undertaker.d.ts) [undertaker](https://github.com/phated/undertaker) by [Qubo](https://github.com/tkqubo)
-* [:link:](jquery.uniform/jquery.uniform.d.ts) [Uniform.js](https://github.com/pixelmatrix/uniform) by [flyfishMT](https://github.com/flyfishMT)
-* [:link:](uniq/uniq.d.ts) [uniq](https://www.npmjs.com/package/uniq) by [Hans Windhoff](https://github.com/hansrwindhoff)
-* [:link:](unique-random/unique-random.d.ts) [unique-random](https://github.com/sindresorhus/unique-random) by [Yuki Kokubun](https://github.com/Kuniwak)
-* [:link:](winrt/winrt-uwp.d.ts) [Universal Windows Platform](http://msdn.microsoft.com/en-us/library/windows/apps/br211377.aspx) by [Kagami Sascha Rosylight](https://github.com/saschanaz), [Taylor Starfield](https://github.com/taylor224)
-* [:link:](universal-analytics/universal-analytics.d.ts) [universal-analytics](https://github.com/peaksandpies/universal-analytics) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](unorm/unorm.d.ts) [unorm](https://github.com/walling/unorm) by [Christopher Brown](https://github.com/chbrown)
-* [:link:](update-notifier/update-notifier.d.ts) [update-notifier](https://github.com/yeoman/update-notifier) by [vvakame](https://github.com/vvakame)
-* [:link:](upper-case/upper-case.d.ts) [upper-case](https://github.com/blakeembrey/upper-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](upper-case-first/upper-case-first.d.ts) [upper-case-first](https://github.com/blakeembrey/upper-case-first) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](uri-templates/uri-templates.d.ts) [uri-templates](https://github.com/geraintluff/uri-templates) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](urijs/URIjs.d.ts) [URI.js](https://github.com/medialize/URI.js) by [RodneyJT](https://github.com/RodneyJT), [Brian Surowiec](https://github.com/xt0rted)
-* [:link:](js-url/js-url.d.ts) [url](https://github.com/websanova/js-url) by [MIZUNE Pine](https://github.com/pine613)
-* [:link:](url-template/url-template.d.ts) [url-template](https://github.com/bramstein/url-template) by [Marcin Porębski](https://github.com/marcinporebski)
-* [:link:](urlrouter/urlrouter.d.ts) [urlrouter](https://github.com/fengmk2/urlrouter) by [soywiz](https://github.com/soywiz)
-* [:link:](urlsafe-base64/urlsafe-base64.d.ts) [urlsafe-base64](https://github.com/RGBboy/urlsafe-base64) by [Tanguy Krotoff](https://github.com/tkrotoff)
-* [:link:](usage/usage.d.ts) [usage](https://github.com/arunoda/node-usage) by [Pascal Vomhoff](https://github.com/pvomhoff)
-* [:link:](username/username.d.ts) [username](https://www.npmjs.com/package/username) by [Klaus Reimer](https://github.com/kayahr)
-* [:link:](utils-merge/utils-merge.d.ts) [utils-merge](https://github.com/jaredhanson/utils-merge) by [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](uuid-1345/uuid-1345.d.ts) [uuid-1345](https://github.com/scravy/uuid-1345) by [TANAKA Koichi](https://github.com/mugeso)
-* [:link:](uuid/UUID.d.ts) [UUID.js](https://github.com/LiosK/UUID.js) by [Jason Jarrett](https://github.com/staxmanade)
-* [:link:](valerie/valerie.d.ts) [valerie](https://github.com/davewatts/valerie) by [Howard Richards](https://github.com/conficient)
-* [:link:](validator/validator.d.ts) [validator.js](https://github.com/chriso/validator.js) by [tgfjt](https://github.com/tgfjt), [Ilya Mochalov](https://github.com/chrootsu)
-* [:link:](vec3/vec3.d.ts) [Vec3 Librairy](https://www.npmjs.com/package/vec3) by [Xavier Stouder](https://github.com/xstoudi)
-* [:link:](vega/vega.d.ts) [Vega](http://trifacta.github.io/vega) by [Tom Crockett](http://github.com/pelotom)
-* [:link:](velocity-animate/velocity-animate.d.ts) [Velocity](http://velocityjs.org) by [Greg Smith](https://github.com/smrq)
-* [:link:](verror/verror.d.ts) [verror](https://github.com/davepacheco/node-verror) by [Sven Reglitzki](https://github.com/svi3c)
-* [:link:](vex-js/vex-js.d.ts) [Vex](https://github.com/HubSpot/vex) by [Greg Cohan](https://github.com/gdcohan)
-* [:link:](vexflow/vexflow.d.ts) [VexFlow](http://vexflow.com) by [Roman Quiring](https://github.com/rquiring)
-* [:link:](victor/victor.d.ts) [Victor.js](http://victorjs.org) by [Ivane Gegia](https://twitter.com/ivanegegia)
-* [:link:](videojs/videojs.d.ts) [Video.js](https://github.com/zencoder/video-js) by [Vincent Bortone](https://github.com/vbortone)
-* [:link:](vimeo/froogaloop.d.ts) [Vimeo](http://developer.vimeo.com/player/js-api) by [Daz Wilkin](https://github.com/DazWilkin)
-* [:link:](vinyl/vinyl.d.ts) [vinyl](https://github.com/wearefractal/vinyl) by [vvakame](https://github.com/vvakame), [jedmao](https://github.com/jedmao)
-* [:link:](vinyl-buffer/vinyl-buffer.d.ts) [vinyl-buffer](https://github.com/hughsk/vinyl-buffer) by [Qubo](https://github.com/tkQubo)
-* [:link:](vinyl-fs/vinyl-fs.d.ts) [vinyl-fs](https://github.com/wearefractal/vinyl-fs) by [vvakame](https://github.com/vvakame)
-* [:link:](vinyl-paths/vinyl-paths.d.ts) [vinyl-paths](https://github.com/sindresorhus/vinyl-paths) by [Qubo](https://github.com/tkQubo)
-* [:link:](vinyl-source-stream/vinyl-source-stream.d.ts) [vinyl-source-stream](https://github.com/hughsk/vinyl-source-stream) by [Asana](https://asana.com)
-* [:link:](virtual-dom/virtual-dom.d.ts) [virtual-dom](https://github.com/Matt-Esch/virtual-dom) by [Christopher Brown](https://github.com/chbrown)
-* [:link:](vortex-web-client/vortex-web-client.d.ts) [Vortex Web 1.2.0p1](http://www.prismtech.com/vortex/vortex-web) by [Stefan Profanter](https://github.com/Pro)
-* [:link:](voximplant-websdk/voximplant-websdk.d.ts) [VoxImplant Web SDK 3.0.x](http://voximplant.com) by [Alexey Aylarov](https://github.com/aylarov)
-* [:link:](vso-node-api/vso-node-api.d.ts) [vso-node-api](https://github.com/Microsoft/vso-node-api) by [Teddy Ward](https://github.com/teddyward)
-* [:link:](vue-resource/vue-resource.d.ts) [vue-resoure](https://github.com/vuejs/vue-resource) by [kaorun343](https://github.com/kaorun343)
-* [:link:](vue-router/vue-router.d.ts) [vue-router](https://github.com/vuejs/vue-router) by [kaorun343](https://github.com/kaorun343)
-* [:link:](vue/vue.d.ts) [vuejs](https://github.com/vuejs/vue) by [odangosan](https://github.com/odangosan), [kaorun343](https://github.com/kaorun343)
-* [:link:](w2ui/w2ui.d.ts) [w2ui](http://w2ui.com) by [Valentin Robert](https://github.com/Ptival)
-* [:link:](wake_on_lan/wake_on_lan.d.ts) [wake_on_lan](https://github.com/agnat/node_wake_on_lan) by [Tobias Kahlert](https://github.com/SrTobi)
-* [:link:](wampy/wampy.d.ts) [wampy.js](https://github.com/KSDaemon/wampy.js) by [Konstantin Burkalev](https://github.com/KSDaemon)
-* [:link:](watch/watch.d.ts) [watch](https://github.com/mikeal/watch) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
-* [:link:](jquery.watermark/jquery.watermark.d.ts) [Watermark plugin for jQuery](http://jquery-watermark.googlecode.com) by [Anwar Javed](https://github.com/anwarjaved)
-* [:link:](webaudioapi/waa.d.ts) [Web Audio API](http://www.w3.org/TR/webaudio) by [Baruch Berger](https://github.com/bbss), [Kon](http://phyzkit.net), [kubosho](https://github.com/kubosho)
-* [:link:](webmidi/webmidi.d.ts) [Web MIDI API](http://www.w3.org/TR/webmidi) by [Toshiya Nakakura](https://github.com/nakakura)
-* [:link:](webspeechapi/webspeechapi.d.ts) [Web Speech API](https://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html) by [SaschaNaz](https://github.com/saschanaz)
-* [:link:](webcl/webcl.d.ts) [WebCL](https://www.khronos.org/registry/webcl/specs/1.0.0) by [Ralph Brown](https://github.com/NCARalph)
-* [:link:](webcola/webcola.d.ts) [webcola](https://github.com/tgdwyer/WebCola) by [Qinfeng Chen](https://github.com/qinfchen), [Tim Dwyer](https://github.com/tgdwyer), [Noah Chen](https://github.com/nchen63)
-* [:link:](webcomponents.js/webcomponents.js.d.ts) [webcomponents.js](https://github.com/webcomponents/webcomponentsjs) by [Adi Dahiya](https://github.com/adidahiya)
-* [:link:](webcrypto/WebCrypto.d.ts) [WebCrypto](http://www.w3.org/TR/WebCryptoAPI) by [Lucas Dixon](https://github.com/iislucas)
-* [:link:](webdriverio/webdriverio.d.ts) [webdriverio](http://www.webdriver.io) by [Nick Malaguti](https://github.com/nmalaguti)
-* [:link:](webgl-ext/webgl-ext.d.ts) [WebGL Extensions](http://webgl.org) by [Arthur Langereis](https://github.com/zenmumbler)
-* [:link:](webix/webix.d.ts) [Webix UI](http://webix.com) by [Maksim Kozhukh](http://github.com/mkozhukh)
-* [:link:](webpack/webpack.d.ts) [webpack](https://github.com/webpack/webpack) by [Qubo](https://github.com/tkqubo)
-* [:link:](webpack/webpack-env.d.ts) [webpack (module API)](https://github.com/webpack/webpack) by [use-strict](https://github.com/use-strict)
-* [:link:](webrtc/MediaStream.d.ts) [WebRTC](http://dev.w3.org/2011/webrtc) by [Ken Smith](https://github.com/smithkl42)
-* [:link:](websocket/websocket.d.ts) [websocket](https://github.com/Worlize/WebSocket-Node) by [Paul Loyd](https://github.com/loyd)
-* [:link:](websql/websql.d.ts) [websql](http://www.w3.org/TR/webdatabase) by [TeamworkGuy2](https://github.com/TeamworkGuy2)
-* [:link:](webtorrent/webtorrent.d.ts) [WebTorrent](https://webtorrent.io) by [Bazyli Brzóska](https://invent.life)
-* [:link:](webvr-api/webvr-api.d.ts) [WebVR API](http://mozvr.github.io/webvr-spec/webvr.html) by [Toshiya Nakakura](https://github.com/nakakura)
-* [:link:](when/when.d.ts) [When](https://github.com/cujojs/when) by [Derek Cicerone](https://github.com/derekcicerone), [Wim Looman](https://github.com/Nemo157)
-* [:link:](which/which.d.ts) [which](https://github.com/isaacs/node-which) by [vvakame](https://github.com/vvakame)
-* [:link:](jquery.window/jquery.window.d.ts) [Window plugin for jQuery](http://fstoke.me/jquery/window) by [Ryan Graham](https://github.com/ryan-codingintrigue)
-* [:link:](windows-1251/windows-1251.d.ts) [windows-1251](https://github.com/mathiasbynens/windows-1251) by [RomanGolovanov](https://github.com/RomanGolovanov)
-* [:link:](windows-service/windows-service.d.ts) [windows-service](https://bitbucket.org/stephenwvickers/node-windows-service) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](winjs/winjs.d.ts) [WinJS](http://try.buildwinjs.com) by [TypeScript samples](https://www.typescriptlang.org), [Adam Hewitt](https://github.com/adamhewitt627), [Craig Treasure](https://github.com/craigktreasure), [Jeff Fisher](https://github.com/xirzec)
-* [:link:](winreg/winreg.d.ts) [Winreg](https://github.com/fresc81/node-winreg) by [RX14](https://github.com/RX14)
-* [:link:](winrt/winrt.d.ts) [WinRT](http://msdn.microsoft.com/en-us/library/windows/apps/br211377.aspx) by [TypeScript samples](https://www.typescriptlang.org)
-* [:link:](winston/winston.d.ts) [winston](https://github.com/flatiron/winston) by [bonnici](https://github.com/bonnici), [Peter Harris](https://github.com/codeanimal)
-* [:link:](wiredep/wiredep.d.ts) [Wiredep v3.0.x](https://github.com/taptapship/wiredep) by [Abraão Alves](http://abraaoalves.github.io)
-* [:link:](wolfy87-eventemitter/wolfy87-eventemitter.d.ts) [wolfy87-eventemitter](https://github.com/Wolfy87/EventEmitter) by [ryiwamoto](https://github.com/ryiwamoto)
-* [:link:](wordcloud/wordcloud.d.ts) [wordcloud](https://github.com/timdream/wordcloud2.js) by [Joe Skeen](http://github.com/joeskeen)
-* [:link:](wreck/wreck.d.ts) [wreck](https://github.com/hapijs/wreck) by [Marcin Porębski](http://github.com/marcinporebski)
-* [:link:](wrench/wrench.d.ts) [wrench](https://github.com/ryanmcgrath/wrench-js) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
-* [:link:](ws/ws.d.ts) [ws](https://github.com/einaros/ws) by [Paul Loyd](https://github.com/loyd)
-* [:link:](wu/wu.d.ts) [wu.js](https://fitzgen.github.io/wu.js) by [phiresky](https://github.com/phiresky)
-* [:link:](x-editable/x-editable.d.ts) [X-Editable](http://vitalets.github.io/x-editable/index.html) by [Chris Kirby](https://github.com/sirkirby)
-* [:link:](x2js/xml2json.d.ts) [x2js](https://code.google.com/p/x2js) by [Horiuchi_H](https://github.com/horiuchi)
-* [:link:](xdate/xdate.d.ts) [XDate](http://arshaw.com/xdate) by [yamada28go](https://github.com/yamada28go)
-* [:link:](xdomain/xdomain.d.ts) [xdomain](http://jpillora.com/xdomain) by [Dan Chao](http://dchao.co)
-* [:link:](jsfl/xJSFL.d.ts) [xJSFL](http://www.xjsfl.com) by [soywiz](https://github.com/soywiz)
-* [:link:](xlsx/xlsx.d.ts) [xlsx](https://github.com/SheetJS/js-xlsx) by [themauveavenger](https://github.com/themauveavenger)
-* [:link:](xml-parser/xml-parser.d.ts) [xml-parser](https://github.com/segmentio/xml-parser) by [Matt Frantz](https://github.com/mhfrantz)
-* [:link:](xmlbuilder/xmlbuilder.d.ts) [xmlbuilder](https://github.com/oozcitak/xmlbuilder-js) by [Wallymathieu](http://github.com/wallymathieu)
-* [:link:](xmldom/xmldom.d.ts) [xmldom](https://github.com/jindw/xmldom.git) by [Qubo](https://github.com/tkqubo)
-* [:link:](xmltojson/xmltojson.d.ts) [xmltojson](https://github.com/metatribal/xmlToJSON) by [Travis Crowe](https://github.com/traviscrowe)
-* [:link:](xpath/xpath.d.ts) [xpath](https://github.com/goto100/xpath) by [Andrew Bradley](https://github.com/cspotcode)
-* [:link:](xregexp/xregexp.d.ts) [XRegExp](http://xregexp.com) by [Bart van der Schoor](https://github.com/Bartvds), [Johannes Fahrenkrug](https://github.com/jfahrenkrug)
-* [:link:](xsockets/XSockets.d.ts) [XSockets.NET](http://xsockets.net) by [Jeffery Grajkowski](https://github.com/pushplay)
-* [:link:](xss-filters/xss-filters.d.ts) [Yahoo XSS Filters](https://github.com/yahoo/xss-filters) by [Dave Taylor](http://davetayls.me)
-* [:link:](yamljs/yamljs.d.ts) [yamljs](https://github.com/jeremyfa/yaml.js) by [Tim Jonischkat](http://www.tim-jonischkat.de)
-* [:link:](yargs/yargs.d.ts) [yargs](https://github.com/chevex/yargs) by [Martin Poelstra](https://github.com/poelstra)
-* [:link:](ydn-db/ydn-db.d.ts) [YDN-DB version 1](http://dev.yathit.com/ydn-db/index.html) by [Kyaw Tun](https://github.com/yathit), [Gabriel Monteagudo](https://github.com/gabrielmaldi)
-* [:link:](yeoman-generator/yeoman-generator.d.ts) [yeoman-generator](https://github.com/yeoman/generator) by [Kentaro Okuno](http://github.com/armorik83)
-* [:link:](yfiles/yfiles.d.ts) [yFiles for HTML](http://www.yworks.com/products/yfiles-for-html) by [yWorks GmbH](http://www.yworks.com)
-* [:link:](yosay/yosay.d.ts) [yosay](https://github.com/yeoman/yosay) by [Kentaro Okuno](http://github.com/armorik83)
-* [:link:](youtube/youtube.d.ts) [YouTube](https://developers.google.com/youtube) by [Daz Wilkin](https://github.com/DazWilkin), [Ian Obermiller](http://ianobermiller.com)
-* [:link:](gapi.youtubeAnalytics/gapi.youtubeAnalytics.d.ts) [YouTube Analytics API](https://developers.google.com/youtube/analytics) by [Frank M](https://github.com/sgtfrankieboy)
-* [:link:](gapi.youtube/gapi.youtube.d.ts) [YouTube Data API v3](https://developers.google.com/youtube/v3) by [Frank M](https://github.com/sgtfrankieboy)
-* [:link:](yui/yui.d.ts) [yui](https://github.com/yui/yui3) by [Gia Bảo @ Sân Đình](https://github.com/giabao)
-* [:link:](z-schema/z-schema.d.ts) [z-schema](https://github.com/zaggino/z-schema) by [Adam Meadows](https://github.com/job13er)
-* [:link:](zepto/zepto.d.ts) [Zepto](http://zeptojs.com) by [Josh Baldwin](https://github.com/jbaldwin)
-* [:link:](zeroclipboard/zeroclipboard.d.ts) [ZeroClipboard v2.x.x](https://github.com/zeroclipboard/zeroclipboard) by [Eric J. Smith](https://github.com/ejsmith), [Blake Niemyjski](https://github.com/niemyjski), [György Balássy](https://github.com/balassy), [Leon Yu](https://github.com/leonyu)
-* [:link:](node_zeromq/zmq.d.ts) [ZeroMQ Node](https://github.com/JustinTulloss/zeromq.node) by [Dave McKeown](http://github.com/davemckeown)
-* [:link:](zip.js/zip.js.d.ts) [zip.js 2.x](https://github.com/gildas-lormeau/zip.js) by [Louis Grignon](https://github.com/lgrignon)
-* [:link:](zone.js/zone.js.d.ts) [Zone.js](https://github.com/angular/zone.js) by [angular team](https://github.com/angular)
-* [:link:](scroller/easyscroller.d.ts) [Zynga EasyScroller](https://github.com/zynga/scroller) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](scroller/scroller.d.ts) [Zynga Scroller](https://github.com/zynga/scroller) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](zynga-scroller/zynga-scroller.d.ts) [Zynga Scroller](http://zynga.github.com/scroller) by [Marcelo Haskell Camargo](https://github.com/haskellcamargo)
-* [:link:](viewporter/viewporter.d.ts) [Zynga Viewporter](https://github.com/zynga/viewporter) by [Boris Yankov](https://github.com/borisyankov)
-
diff --git a/acorn/acorn-tests.ts b/acorn/acorn-tests.ts
index bda6844c84..72ca71d2f6 100644
--- a/acorn/acorn-tests.ts
+++ b/acorn/acorn-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="estree" />
-
 import acorn = require('acorn');
 import * as ESTree from 'estree';
 
diff --git a/amplify/amplify-tests.ts b/amplify/amplify-tests.ts
index edf2988122..b4f98ccd5b 100644
--- a/amplify/amplify-tests.ts
+++ b/amplify/amplify-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="jquery" />
-
 import amplify = require("amplify");
 
 // Copied examples directly from AmplifyJs site
diff --git a/angular-bootstrap-calendar/angular-bootstrap-calendar-tests.ts b/angular-bootstrap-calendar/angular-bootstrap-calendar-tests.ts
index 4ff5b4cf19..1efc5d0391 100644
--- a/angular-bootstrap-calendar/angular-bootstrap-calendar-tests.ts
+++ b/angular-bootstrap-calendar/angular-bootstrap-calendar-tests.ts
@@ -1,6 +1,3 @@
-///<reference path='index.d.ts'/>
-///<reference types="angular"/>
-
 var myApp = angular.module('testModule');
 
 interface MyAppScope extends ng.IScope {
diff --git a/angular-feature-flags/angular-feature-flags-tests.ts b/angular-feature-flags/angular-feature-flags-tests.ts
index 8ca17e4962..ac956dd657 100644
--- a/angular-feature-flags/angular-feature-flags-tests.ts
+++ b/angular-feature-flags/angular-feature-flags-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="angular" />
-
 import * as angular from "angular";
 
 let myApp = angular.module('myApp', ['feature-flags']);
diff --git a/angular-hotkeys/angular-hotkeys-tests.ts b/angular-hotkeys/angular-hotkeys-tests.ts
index 1f87ecefdf..c0bd9b974d 100644
--- a/angular-hotkeys/angular-hotkeys-tests.ts
+++ b/angular-hotkeys/angular-hotkeys-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="angular" />
-
 var scope: ng.IScope;
 var hotkeyProvider: ng.hotkeys.HotkeysProvider;
 var hotkeyObj: ng.hotkeys.Hotkey;
diff --git a/angular-jwt/angular-jwt-tests.ts b/angular-jwt/angular-jwt-tests.ts
index b20b2eea9d..88b177ba74 100644
--- a/angular-jwt/angular-jwt-tests.ts
+++ b/angular-jwt/angular-jwt-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="angular" />
-
 var app = angular.module("angular-jwt-tests", ["angular-jwt"]);
 
 var $jwtHelper: ng.jwt.IJwtHelper;
diff --git a/angular-material/index.d.ts b/angular-material/index.d.ts
index 0e27fe3b60..a8196269a4 100644
--- a/angular-material/index.d.ts
+++ b/angular-material/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Angular Material (angular.material module) 1.1
 // Project: https://github.com/angular/material
-// Definitions by: Blake Bigelow <https://github.com/blbigelow>, Peter Hajdu <https://github.com/PeterHajdu>, Davide Donadello <https://github.com/Dona278>
+// Definitions by: Blake Bigelow <https://github.com/blbigelow>, Peter Hajdu <https://github.com/PeterHajdu>, Davide Donadello <https://github.com/Dona278>, Geert Jansen <https://github.com/geertjansen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as angular from 'angular';
@@ -18,6 +18,7 @@ declare module 'angular' {
             controller?: string | Function;
             locals?: { [index: string]: any };
             clickOutsideToClose?: boolean;
+            bindToController?: boolean; // default: false
             disableBackdrop?: boolean;
             escapeToClose?: boolean;
             resolve?: { [index: string]: () => angular.IPromise<any> };
diff --git a/angular-modal/angular-modal-tests.ts b/angular-modal/angular-modal-tests.ts
index 5be313840b..edb4d7e6ef 100644
--- a/angular-modal/angular-modal-tests.ts
+++ b/angular-modal/angular-modal-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery" />
-
 var btfModal: angularModal.AngularModalFactory;
 
 // Using template URL
diff --git a/angular-oauth2/angular-oauth2-tests.ts b/angular-oauth2/angular-oauth2-tests.ts
index 2b2328d5ee..042fe537aa 100644
--- a/angular-oauth2/angular-oauth2-tests.ts
+++ b/angular-oauth2/angular-oauth2-tests.ts
@@ -1,7 +1,7 @@
 import * as angular from 'angular';
 
 angular.module('angular-oauth2-test', ['angular-oauth2'])
-       .config(['OAuthProvider', function(OAuthProvider:angular.oauth2.OAuthProvider){
+       .config(['OAuthProvider', (OAuthProvider: angular.oauth2.OAuthProvider) => {
             OAuthProvider.configure({
                 baseUrl: 'https://api.website.com',
                 clientId: 'CLIENT_ID',
diff --git a/angular-oauth2/tsconfig.json b/angular-oauth2/tsconfig.json
index 717721bf79..e8a5250748 100644
--- a/angular-oauth2/tsconfig.json
+++ b/angular-oauth2/tsconfig.json
@@ -2,6 +2,10 @@
     "compilerOptions": {
         "module": "commonjs",
         "target": "es6",
+        "lib": [
+            "es6",
+            "dom"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
diff --git a/angular-ui-bootstrap/index.d.ts b/angular-ui-bootstrap/index.d.ts
index bc80d96b5a..1e4d15d282 100644
--- a/angular-ui-bootstrap/index.d.ts
+++ b/angular-ui-bootstrap/index.d.ts
@@ -15,6 +15,7 @@ export type IDropdownConfig = angular.ui.bootstrap.IDropdownConfig;
 export type IModalProvider = angular.ui.bootstrap.IModalProvider;
 export type IModalService = angular.ui.bootstrap.IModalService;
 export type IModalServiceInstance = angular.ui.bootstrap.IModalServiceInstance;
+export type IModalInstanceService = angular.ui.bootstrap.IModalInstanceService;
 export type IModalScope = angular.ui.bootstrap.IModalScope;
 export type IModalSettings = angular.ui.bootstrap.IModalSettings;
 export type IModalStackService = angular.ui.bootstrap.IModalStackService;
@@ -320,12 +321,12 @@ declare module 'angular' {
         interface IModalService {
             /**
              * @param {IModalSettings} options
-             * @returns {IModalServiceInstance}
+             * @returns {IModalInstanceService}
              */
-            open(options: IModalSettings): IModalServiceInstance;
+            open(options: IModalSettings): IModalInstanceService;
         }
 
-        interface IModalServiceInstance {
+        interface IModalInstanceService {
             /**
              * A method that can be used to close a modal, passing a result. If `preventDefault` is called on the `modal.closing` event then the modal will remain open.
              */
@@ -357,6 +358,11 @@ declare module 'angular' {
             closed: angular.IPromise<any>;
         }
 
+        /**
+         * @deprecated use IModalInstanceService instead.
+         */
+        interface IModalServiceInstance extends IModalInstanceService { }
+
         interface IModalScope extends angular.IScope {
             /**
              * Dismiss the dialog without assigning a value to the promise output. If `preventDefault` is called on the `modal.closing` event then the modal will remain open.
@@ -512,17 +518,17 @@ declare module 'angular' {
             /**
              * Opens a new modal instance.
              */
-            open(modalInstance: IModalServiceInstance, modal: any): void;
+            open(modalInstance: IModalInstanceService, modal: any): void;
 
             /**
              * Closes a modal instance with an optional result.
              */
-            close(modalInstance: IModalServiceInstance, result?: any): void;
+            close(modalInstance: IModalInstanceService, result?: any): void;
 
             /**
              * Dismisses a modal instance with an optional reason.
              */
-            dismiss(modalInstance: IModalServiceInstance, reason?: any): void;
+            dismiss(modalInstance: IModalInstanceService, reason?: any): void;
 
             /**
              * Dismiss all open modal instances with an optional reason that will be passed to each instance.
@@ -536,7 +542,7 @@ declare module 'angular' {
         }
 
         interface IModalStackedMapKeyValuePair {
-            key: IModalServiceInstance;
+            key: IModalInstanceService;
             value: any;
         }
 
diff --git a/angular/index.d.ts b/angular/index.d.ts
index 05b6ce92ff..5d47751844 100644
--- a/angular/index.d.ts
+++ b/angular/index.d.ts
@@ -1332,9 +1332,19 @@ declare namespace angular {
     // see http://docs.angularjs.org/api/ng.$controller
     // see http://docs.angularjs.org/api/ng.$controllerProvider
     ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * The minimal local definitions required by $controller(ctrl, locals) calls.
+     */
+    interface IControllerLocals {
+        $scope: ng.IScope;
+        $element: JQuery;
+    }
+
     interface IControllerService {
         // Although the documentation doesn't state this, locals are optional
         <T>(controllerConstructor: new (...args: any[]) => T, locals?: any, later?: boolean, ident?: string): T;
+        <T>(controllerConstructor: Function, locals?: IControllerLocals, later?: boolean, ident?: string): T;
         <T>(controllerConstructor: Function, locals?: any, later?: boolean, ident?: string): T;
         <T>(controllerName: string, locals?: any, later?: boolean, ident?: string): T;
     }
diff --git a/arcgis-js-api/index.d.ts b/arcgis-js-api/index.d.ts
index 87df41a8d8..293c5190e9 100644
--- a/arcgis-js-api/index.d.ts
+++ b/arcgis-js-api/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ArcGIS API for JavaScript 4.2
+// Type definitions for ArcGIS API for JavaScript 4.3
 // Project: http://js.arcgis.com
 // Definitions by: Esri <https://github.com/Esri>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -32,14 +32,19 @@ declare namespace JSX {
 
 declare namespace __esri {
   export class Accessor {
+    constructor(obj?: any);
+
     destroyed: boolean;
     initialized: boolean;
     declaredClass: string;
     destroy(): void;
+
     get<T>(propertyName: string): T;
     get(propertyName: string): any;
     set<T>(propertyName: string, value: T): this;
     set(props: HashMap<any>): this;
+    watch(path: string | string[], callback: WatchCallback, sync?: boolean): WatchHandle;
+
     protected notifyChange(propertyName: string): void;
     protected _get(propertyName: string): any;
     protected _get<T>(propertyName: string): T;
@@ -69,18 +74,521 @@ declare namespace __esri {
     remove(): void;
   }
 
+  export interface EachAlwaysResult {
+    promise: IPromise<any>;
+    value: any;
+    error: any;
+  }
+
   export interface PausableWatchHandle {
     remove(): void;
     pause(): void;
     resume(): void;
   }
 
+  export interface FeatureEditResult {
+    objectId: number;
+    error: any;
+  }
+
   export interface AttributeParamValue {
     attributeName: string;
     parameterName: string;
     value: string;
   }
 
+  export interface DataWorkspace {
+    id: string;
+    name: string;
+  }
+
+  export interface GroupMembership {
+    id: number;
+    name: string;
+  }
+
+  export interface HoldType {
+    description: string;
+    id: number;
+    name: string;
+  }
+
+  export interface JobPriority {
+    description: string;
+    name: string;
+    value: number;
+  }
+
+  export interface JobQuery {
+    id: number;
+    name: string;
+  }
+
+  export interface JobStatus {
+    caption: string;
+    description: string;
+    id: number;
+    name: string;
+  }
+
+  export interface JobQueryContainer {
+    containers: JobQueryContainer[];
+    id: number;
+    name: string;
+    queries: JobQuery[];
+  }
+
+  export interface JobQueryDetails {
+    aliases: string[];
+    fields: string[];
+    id: number;
+    name: string;
+    orderBy: string;
+    tables: string[];
+    where: string;
+  }
+
+  export interface Privilege {
+    description: string;
+    id: number;
+    name: string;
+  }
+
+  export interface UserDetails {
+    lastName: string;
+    address: string;
+    faxNumber: string;
+    firstName: string;
+    fullName: string;
+    groups: GroupMembership[];
+    email: string;
+    phoneNumber: string;
+    privileges: Privilege[];
+    roomNumber: string;
+    userName: string;
+    userQueries: JobQueryContainer[];
+    zipCode: string;
+  }
+
+  export interface VersionInfo {
+    access: string;
+    name: string;
+    parent: string;
+  }
+
+  export interface WorkflowManagerServiceInfo {
+    jobPriorities: JobPriority[];
+    activityTypes: ActivityType[];
+    currentVersion: number;
+    dataWorkspaces: DataWorkspace[];
+    holdTypes: HoldType[];
+    configProperties: any;
+    jobStatuses: JobStatus[];
+    jobTypes: JobType[];
+    notificationTypes: NotificationType[];
+    privileges: Privilege[];
+    publicQueries: JobQueryContainer[];
+  }
+
+  export interface JobType {
+    category: string;
+    description: string;
+    id: string;
+    name: string;
+    state: string;
+  }
+
+  export interface JobTypeDetails {
+    defaultParentVersionName: string;
+    autoExecuteCreatedJobs: boolean;
+    category: string;
+    defaultAssignedTo: string;
+    defaultAssignedType: string;
+    defaultDataWorkspaceId: string;
+    defaultDescription: string;
+    defaultDueDate: string;
+    defaultJobDuration: number;
+    canDataWorkspaceChange: boolean;
+    defaultPriority: string;
+    defaultStartDate: Date;
+    description: string;
+    id: string;
+    jobNamingScheme: string;
+    jobVersionNamingScheme: string;
+    mxdNamingScheme: string;
+    name: string;
+    state: string;
+  }
+
+  export interface TableRelationship {
+    cardinality: string;
+    linkField: string;
+    tableAlias: string;
+    tableName: string;
+  }
+
+  export interface JobCreationParameters {
+    loi: Geometry;
+    assignedTo: string;
+    autoCommitWorkflow: boolean;
+    autoExecute: boolean;
+    dataWorkspaceId: string;
+    description: string;
+    dueDate: Date;
+    jobTypeId: number;
+    assignedType: string;
+    name: string;
+    numJobs: string;
+    ownedBy: string;
+    parentJobId: number;
+    parentVersion: string;
+    priority: number;
+    startDate: Date;
+    user: string;
+  }
+
+  export interface JobQueryParameters {
+    aliases: string;
+    fields: string;
+    orderBy: string;
+    tables: string;
+    where: string;
+    user: string;
+  }
+
+  export interface JobUpdateParameters {
+    ownedBy: string;
+    assignedTo: string;
+    dataWorkspaceId: string;
+    description: string;
+    dueDate: Date;
+    loi: Geometry;
+    jobId: number;
+    name: string;
+    assignedType: string;
+    parentJobId: number;
+    parentVersion: string;
+    percent: number;
+    priority: number;
+    startDate: Date;
+    status: number;
+    versionName: string;
+    user: string;
+  }
+
+  export interface AuxRecordDescription {
+    properties: any;
+    recordId: number;
+    tableName: string;
+  }
+
+  export interface ActivityType {
+    desription: string;
+    id: number;
+    message: string;
+    name: string;
+  }
+
+  export interface AuxRecordContainer {
+    records: AuxRecord;
+    relationshipType: string;
+    tableAlias: string;
+    tableName: string;
+  }
+
+  export interface JobTaskJobInfo {
+    name: string;
+    assignedTo: string;
+    childJobIds: number[];
+    createdBy: string;
+    createdDate: Date;
+    dataWorkspaceId: string;
+    description: string;
+    dueDate: Date;
+    endDate: Date;
+    id: number;
+    jobTypeId: number;
+    loi: Geometry;
+    assignedType: string;
+    ownedBy: string;
+    parentJobId: number;
+    parentVersion: string;
+    pendingDays: number;
+    percentageComplete: number;
+    priority: number;
+    stage: string;
+    startDate: Date;
+    status: number;
+    versionExists: boolean;
+    versionInfo: JobVersionInfo;
+    versionName: string;
+  }
+
+  export interface QueryResult {
+    fields: QueryFieldInfo[];
+    rows: string[];
+  }
+
+  export interface AuxRecord {
+    displayProperty: any;
+    id: number;
+    recordvalues: AuxRecordValue;
+  }
+
+  export interface AuxRecordValue {
+    filter: string;
+    alias: string;
+    data: any;
+    dataType: string;
+    displayOrder: number;
+    displayType: string;
+    domain: string;
+    canUpdate: boolean;
+    length: number;
+    name: string;
+    required: boolean;
+    tableListClass: string;
+    tableListDisplayField: string;
+    tableListStoreField: string;
+    userVisible: boolean;
+  }
+
+  export interface FieldValue {
+    description: string;
+    value: any;
+  }
+
+  export interface JobVersionInfo {
+    dataWorkspaceId: string;
+    name: string;
+    parent: string;
+    created: boolean;
+    owner: string;
+  }
+
+  export interface QueryFieldInfo {
+    alias: string;
+    length: string;
+    name: string;
+    type: string;
+  }
+
+  export interface JobAttachment {
+    filename: string;
+    folder: string;
+    id: number;
+    storageType: string;
+  }
+
+  export interface JobDependency {
+    depJobId: number;
+    depOnType: string;
+    depOnValue: string;
+    heldOnValue: number;
+    holdOnType: string;
+    id: number;
+    jobID: string;
+  }
+
+  export interface ChangeRule {
+    description: string;
+    evaluators: any[];
+    id: number;
+    name: string;
+    notifier: any;
+    summarize: boolean;
+  }
+
+  export interface DataSetEvaluator {
+    dataSetConfigurations: DatasetConfiguration[];
+    name: string;
+    type: string;
+  }
+
+  export interface AOIEvaluator {
+    aoi: Polygon;
+    inverse: boolean;
+    name: string;
+    relation: string;
+    type: string;
+    useJobAOI: boolean;
+  }
+
+  export interface DatasetConfiguration {
+    changeCondition: number;
+    changeFields: string;
+    dataset: string;
+    dataWorkspaceId: string;
+    name: string;
+    whereConditions: WhereCondition[];
+  }
+
+  export interface EmailNotifier {
+    attachJobAttachments: boolean;
+    message: string;
+    name: string;
+    senderEmail: string;
+    senderName: string;
+    subject: string;
+    subscribers: string[];
+    type: string;
+  }
+
+  export interface WhereCondition {
+    compareValue: any;
+    field: string;
+    operator: string;
+  }
+
+  export interface NotificationType {
+    attachJobAttachments: boolean;
+    id: number;
+    message: string;
+    senderEmail: string;
+    senderName: string;
+    subject: string;
+    subscribers: string[];
+    type: string;
+  }
+
+  export interface ChangeRuleMatch {
+    changeTime: Date;
+    changeType: string;
+    dataset: string;
+    dataWorkspaceId: string;
+    id: string;
+    jobID: string;
+    ruleID: string;
+  }
+
+  export interface ReportDataGroup {
+    aggregateLabel: string;
+    aggregateValue: string;
+    row: string[];
+    value: string;
+  }
+
+  export interface ReportData {
+    columns: string[];
+    description: string;
+    groups: ReportDataGroup[];
+    title: string;
+  }
+
+  export interface Report {
+    description: string;
+    hierarchy: string;
+    id: number;
+    name: string;
+    title: string;
+  }
+
+  export interface ExecuteInfo {
+    conflicts: WorkflowConflicts;
+    errorCode: number;
+    errorDescription: string;
+    executionResult: string;
+    hasConflicts: boolean;
+    hasReturnCode: boolean;
+    jobID: number;
+    returnCode: number;
+    stepID: number;
+    threwError: boolean;
+  }
+
+  export interface Step {
+    hasBeenExecuted: boolean;
+    assignedTo: string;
+    async: boolean;
+    autoRun: boolean;
+    canSkip: boolean;
+    canSpawnConcurrency: boolean;
+    commonId: number;
+    defaultPercentComplete: number;
+    assignedType: string;
+    hasBeenStarted: boolean;
+    id: number;
+    name: string;
+    selfCheck: boolean;
+    statusId: number;
+    stepPercentComplete: number;
+    notificationType: string;
+    stepType: StepType;
+  }
+
+  export interface StepType {
+    program: string;
+    arguments: string;
+    executionType: string;
+    id: number;
+    name: string;
+    description: string;
+    stepDescriptionLink: string;
+    stepDescriptionType: string;
+    stepIndicatorType: string;
+    supportedPlatform: string;
+    visible: boolean;
+  }
+
+  export interface WorkflowDisplayDetails {
+    annotations: WorkflowAnnotationDisplayDetails[];
+    paths: WorkflowPathDisplayDetails[];
+    steps: WorkflowStepDisplayDetails[];
+  }
+
+  export interface WorkflowOption {
+    returnCode: number;
+    steps: WorkflowStepInfo[];
+  }
+
+  export interface WorkflowStepInfo {
+    id: number;
+    name: string;
+  }
+
+  export interface WorkflowAnnotationDisplayDetails {
+    centerX: number;
+    centerY: number;
+    fillColor: any;
+    height: number;
+    label: string;
+    labelColor: any;
+    OutlineColor: any;
+    width: number;
+  }
+
+  export interface WorkflowConflicts {
+    jobID: number;
+    options: WorkflowOption[];
+    spawnsConcurrency: boolean;
+    stepId: number;
+  }
+
+  export interface WorkflowPathDisplayDetails {
+    destStepId: number;
+    sourceStepID: number;
+    label: string;
+    labelColor: any;
+    labelX: number;
+    labelY: number;
+    lineColor: any;
+    pathObject: any;
+  }
+
+  export interface WorkflowStepDisplayDetails {
+    labelColor: any;
+    centerX: number;
+    fillColor: any;
+    height: number;
+    label: string;
+    centerY: number;
+    OutlineColor: any;
+    shape: string;
+    stepId: number;
+    stepType: string;
+    width: number;
+  }
+
   export interface ExternalRenderer {
     setup(): void;
     render(): void;
@@ -139,26 +647,6 @@ declare namespace __esri {
     suggestionTemplate: string;
   }
 
-  export interface SearchViewModelLocatorSource {
-    categories: string[];
-    countryCode: string;
-    localSearchOptions: any;
-    locationToAddressDistance: number;
-    searchTemplate: string;
-    locator: Locator;
-    singleLineFieldName: string;
-  }
-
-  export interface SearchViewModelFeatureLayerSource {
-    displayField: string;
-    exactMatch: boolean;
-    featureLayer: FeatureLayer;
-    searchFields: string[];
-    searchQueryParams: any;
-    suggestQueryParams: any;
-    suggestionTemplate: string;
-  }
-
   export type GetHeader = (headerName: string) => string;
 
   export type WatchCallback = (newValue: any, oldValue: any, propertyName: string, target: Accessor) => void;
@@ -282,11 +770,33 @@ declare namespace __esri {
     offset?: number;
   }
 
+  export interface FeatureLayerApplyEditsEdits {
+    addFeatures?: Graphic[];
+    updateFeatures?: Graphic[];
+    deleteFeatures?: Graphic[] | any[];
+  }
+
+  export interface FeatureLayerCapabilities {
+    operations: FeatureLayerCapabilitiesOperations;
+  }
+
+  export interface FeatureLayerCapabilitiesOperations {
+    supportsAdd: boolean;
+    supportsDelete: boolean;
+    supportsUpdate: boolean;
+    supportsEditing: boolean;
+    supportsQuery: boolean;
+  }
+
   export interface FeatureLayerElevationInfo {
     mode: string;
     offset?: number;
   }
 
+  export interface FeatureLayerGetFieldDomainOptions {
+    feature: Graphic;
+  }
+
   export interface GraphicsLayerElevationInfo {
     mode: string;
     offset?: number;
@@ -306,6 +816,21 @@ declare namespace __esri {
     offset?: number;
   }
 
+  export interface StreamLayerFilter {
+    geometry: Extent;
+    where: string;
+  }
+
+  export interface StreamLayerPurgeOptions {
+    displayCount: number;
+    age: number;
+  }
+
+  export interface StreamLayerUpdateFilterFilterChanges {
+    geometry: Extent;
+    where: string;
+  }
+
   export interface VectorTileLayerCurrentStyleInfo {
     serviceUrl: string;
     styleUrl: string;
@@ -382,6 +907,14 @@ declare namespace __esri {
     label: string;
   }
 
+  export interface PointCloudRendererPointSizeAlgorithm {
+    type: string;
+    useRealWorldSymbolSizes: boolean;
+    size: number;
+    scaleFactor: number;
+    minSize: number;
+  }
+
   export interface PointCloudClassBreaksRendererColorClassBreakInfos {
     minValue: number;
     maxValue: number;
@@ -422,8 +955,8 @@ declare namespace __esri {
   }
 
   export interface Symbol3DStyleOrigin {
-    styleName: string;
-    styleUrl: string;
+    styleName?: string;
+    styleUrl?: string;
     name: string;
   }
 
@@ -508,6 +1041,294 @@ declare namespace __esri {
     tolerance: number;
   }
 
+  export interface ConfigurationTaskGetDataWorkspaceDetailsParams {
+    dataWorkspaceId: string;
+    user: string;
+  }
+
+  export interface ConfigurationTaskGetUserJobQueryDetailsParams {
+    queryId: number;
+    user: string;
+  }
+
+  export interface JobTaskAddEmbeddedAttachmentParams {
+    jobId: number;
+    form: any;
+    user: string;
+  }
+
+  export interface JobTaskAddLinkedAttachmentParams {
+    jobId: number;
+    attachmentType: number;
+    path: string;
+    user: string;
+  }
+
+  export interface JobTaskAddLinkedRecordParams {
+    jobId: number;
+    tableName: string;
+    user: string;
+  }
+
+  export interface JobTaskAssignJobsParams {
+    jobIds: number[];
+    assignedType: string;
+    assignedTo: string;
+    user: string;
+  }
+
+  export interface JobTaskCloseJobsParams {
+    jobIds: number[];
+    user: string;
+  }
+
+  export interface JobTaskCreateDependencyParams {
+    jobId: number;
+    heldOnType: string;
+    heldOnValue: number;
+    depJobId: number;
+    depOnType: string;
+    depOnValue: number;
+    user: string;
+  }
+
+  export interface JobTaskCreateHoldParams {
+    jobId: number;
+    holdTypeId: number;
+    comments: string;
+    user: string;
+  }
+
+  export interface JobTaskCreateJobVersionParams {
+    jobId: number;
+    name: string;
+    parent: string;
+    user: string;
+  }
+
+  export interface JobTaskDeleteAttachmentParams {
+    jobId: number;
+    attachmentId: number;
+    user: string;
+  }
+
+  export interface JobTaskDeleteDependencyParams {
+    jobId: number;
+    dependencyId: number;
+    user: string;
+  }
+
+  export interface JobTaskDeleteJobsParams {
+    jobIds: number[];
+    deleteHistory?: boolean;
+    user: string;
+  }
+
+  export interface JobTaskDeleteLinkedRecordParams {
+    jobId: number;
+    tableName: string;
+    recordId: number;
+    user: string;
+  }
+
+  export interface JobTaskGetAttachmentContentUrlParams {
+    jobId: number;
+    attachmentId: number;
+  }
+
+  export interface JobTaskListFieldValuesParams {
+    jobId: number;
+    tableName: string;
+    field: string;
+    user: string;
+  }
+
+  export interface JobTaskListMultiLevelFieldValuesParams {
+    field: string;
+    previousSelectedValues: string[];
+    user: string;
+  }
+
+  export interface JobTaskLogActionParams {
+    jobId: number;
+    activityTypeId: number;
+    comments: string;
+    user: string;
+  }
+
+  export interface JobTaskQueryJobsParams {
+    queryId: number;
+    user: string;
+  }
+
+  export interface JobTaskQueryMultiLevelSelectedValuesParams {
+    field: string;
+    user: string;
+  }
+
+  export interface JobTaskReleaseHoldParams {
+    jobId: number;
+    holdId: number;
+  }
+
+  export interface JobTaskReopenClosedJobsParams {
+    jobIds: number[];
+    user: string;
+  }
+
+  export interface JobTaskSearchJobsParams {
+    text: string;
+    user: string;
+  }
+
+  export interface JobTaskUnassignJobsParams {
+    jobIds: number[];
+    user: string;
+  }
+
+  export interface JobTaskUpdateNotesParams {
+    jobId: number;
+    notes: string;
+    user: string;
+  }
+
+  export interface JobTaskUpdateRecordParams {
+    jobId: number;
+    record: AuxRecordDescription;
+    user: string;
+  }
+
+  export interface NotificationTaskAddChangeRuleParams {
+    rule: ChangeRule;
+    user: string;
+  }
+
+  export interface NotificationTaskDeleteChangeRuleParams {
+    ruleId: string;
+    user: string;
+  }
+
+  export interface NotificationTaskNotifySessionParams {
+    sessionid: string;
+    deleteAfter: boolean;
+    user: string;
+  }
+
+  export interface NotificationTaskQueryChangeRulesParams {
+    name: string;
+    description: string;
+    searchType: string;
+    user: string;
+  }
+
+  export interface NotificationTaskRunSpatialNotificationOnHistoryParams {
+    dataWorkspaceId: string;
+    from: Date;
+    to: Date;
+    logMatches: boolean;
+    send: boolean;
+    user: string;
+  }
+
+  export interface NotificationTaskSendNotificationParams {
+    jobId: number;
+    notificationType: string;
+    user: string;
+  }
+
+  export interface NotificationTaskSubscribeToNotificationParams {
+    notificationTypeId: number;
+    email: string;
+    user: string;
+  }
+
+  export interface NotificationTaskUnsubscribeFromNotificationParams {
+    notificationTypeId: number;
+    email: string;
+    user: string;
+  }
+
+  export interface ReportTaskGenerateReportParams {
+    reportId: number;
+    user: string;
+  }
+
+  export interface ReportTaskGetReportContentUrlParams {
+    reportId: number;
+    user: number;
+  }
+
+  export interface ReportTaskGetReportDataParams {
+    reportId: number;
+    user: string;
+  }
+
+  export interface TokenTaskParseTokensParams {
+    jobId: any;
+    stringToParse: string;
+    user: string;
+  }
+
+  export interface WorkflowTaskCanRunStepParams {
+    jobId: number;
+    stepId: number;
+    user: string;
+  }
+
+  export interface WorkflowTaskExecuteStepsParams {
+    jobId: number;
+    stepIds: number[];
+    auto: boolean;
+    user: string;
+  }
+
+  export interface WorkflowTaskGetStepDescriptionParams {
+    jobId: number;
+    stepId: number;
+  }
+
+  export interface WorkflowTaskGetStepFileUrlParams {
+    jobId: number;
+    stepId: number;
+  }
+
+  export interface WorkflowTaskGetStepParams {
+    jobId: number;
+    stepId: number;
+  }
+
+  export interface WorkflowTaskMarkStepsAsDoneParams {
+    jobId: number;
+    stepIds: number[];
+    user: string;
+  }
+
+  export interface WorkflowTaskMoveToNextStepParams {
+    jobId: number;
+    stepId: number;
+    returnCode: number;
+    user: string;
+  }
+
+  export interface WorkflowTaskRecreateWorkflowParams {
+    jobId: number;
+    user: string;
+  }
+
+  export interface WorkflowTaskResolveConflictParams {
+    jobId: number;
+    stepId: number;
+    optionReturnCode: number;
+    optionStepIds: number[];
+    user: string;
+  }
+
+  export interface WorkflowTaskSetCurrentStepParams {
+    jobId: number;
+    stepId: number;
+    user: string;
+  }
+
   export interface MapViewConstraints {
     lods?: LOD[];
     minScale?: number;
@@ -804,6 +1625,17 @@ declare namespace __esri {
     urlPrefix: string;
   }
 
+  export interface configWorkers {
+    loaderConfig: configWorkersLoaderConfig;
+  }
+
+  export interface configWorkersLoaderConfig {
+    has: any;
+    paths: any;
+    map: any;
+    packages: any[];
+  }
+
   export interface requestEsriRequestOptions {
     callbackParamName?: string;
     query?: any;
@@ -827,6 +1659,7 @@ declare namespace __esri {
     cast?: Function;
     readOnly?: boolean;
     aliasOf?: string;
+    value?: any;
   }
 
   export interface colorCreateContinuousRendererParams {
@@ -895,21 +1728,22 @@ declare namespace __esri {
     title: string;
   }
 
-  export interface sizeCreateVisualVariableParams {
+  export interface sizeCreateVisualVariablesParams {
     layer: FeatureLayer | SceneLayer;
     field: string;
     normalizationField?: string;
     basemap?: string | Basemap;
     sizeScheme?: any | any | any;
-    legendOptions?: sizeCreateVisualVariableParamsLegendOptions;
+    legendOptions?: sizeCreateVisualVariablesParamsLegendOptions;
     statistics?: any;
     minValue?: number;
     maxValue?: number;
     view?: SceneView;
     worldScale?: boolean;
+    axis?: boolean;
   }
 
-  export interface sizeCreateVisualVariableParamsLegendOptions {
+  export interface sizeCreateVisualVariablesParamsLegendOptions {
     title: string;
   }
 
@@ -972,6 +1806,7 @@ declare namespace __esri {
   }
 
   export interface univariateColorSizeCreateVisualVariablesParamsSizeOptions {
+    axis?: boolean;
     sizeScheme?: any | any | any;
     legendOptions?: univariateColorSizeCreateVisualVariablesParamsSizeOptionsLegendOptions;
   }
@@ -1433,6 +2268,7 @@ declare namespace __esri {
     expand(factor: number): Extent;
     intersection(extent: Extent): Extent;
     intersects(geometry: Geometry): boolean;
+    normalize(): Extent[];
     offset(dx: number, dy: number, dz: number): Extent;
     union(extent: Extent): Extent;
   }
@@ -1519,6 +2355,7 @@ declare namespace __esri {
     copy(other: Point): void;
     distance(other: Point): number;
     equals(point: Point): boolean;
+    normalize(): Point;
   }
 
   interface PointConstructor {
@@ -1556,6 +2393,9 @@ declare namespace __esri {
   interface PolygonConstructor {
     new(properties?: PolygonProperties): Polygon;
 
+
+    fromExtent(extent: Extent): Polygon;
+
     fromJSON(json: any): Polygon;
   }
 
@@ -1873,6 +2713,7 @@ declare namespace __esri {
   }
 
   interface FeatureLayer extends Layer, PortalLayer, ScaleRangeLayer {
+    capabilities: FeatureLayerCapabilities;
     copyright: string;
     definitionExpression: string;
     elevationInfo: FeatureLayerElevationInfo;
@@ -1898,7 +2739,9 @@ declare namespace __esri {
     url: string;
     version: number;
 
+    applyEdits(edits: FeatureLayerApplyEditsEdits): IPromise<any>;
     createQuery(): Query;
+    getFieldDomain(fieldName: string, options?: FeatureLayerGetFieldDomainOptions): Domain;
     queryExtent(params?: Query): IPromise<any>;
     queryFeatureCount(params?: Query): IPromise<any>;
     queryFeatures(params?: Query): IPromise<any>;
@@ -1914,6 +2757,7 @@ declare namespace __esri {
   export const FeatureLayer: FeatureLayerConstructor;
 
   interface FeatureLayerProperties extends LayerProperties, PortalLayerProperties, ScaleRangeLayerProperties {
+    capabilities?: FeatureLayerCapabilities;
     copyright?: string;
     definitionExpression?: string;
     elevationInfo?: FeatureLayerElevationInfo;
@@ -1940,6 +2784,26 @@ declare namespace __esri {
     version?: number;
   }
 
+  interface GeoRSSLayer extends Layer {
+    lineSymbol: SimpleLineSymbol;
+    pointSymbol: PictureMarkerSymbol;
+    polygonSymbol: SimpleFillSymbol;
+    url: string;
+  }
+
+  interface GeoRSSLayerConstructor {
+    new(properties?: GeoRSSLayerProperties): GeoRSSLayer;
+  }
+
+  export const GeoRSSLayer: GeoRSSLayerConstructor;
+
+  interface GeoRSSLayerProperties extends LayerProperties {
+    lineSymbol?: SimpleLineSymbolProperties;
+    pointSymbol?: PictureMarkerSymbolProperties;
+    polygonSymbol?: SimpleFillSymbolProperties;
+    url?: string;
+  }
+
   interface GraphicsLayer extends Layer, ScaleRangeLayer {
     elevationInfo: GraphicsLayerElevationInfo;
     graphics: Collection;
@@ -2061,6 +2925,7 @@ declare namespace __esri {
   }
 
   interface SceneLayer extends Layer, SceneService, PortalLayer {
+    definitionExpression: string;
     elevationInfo: SceneLayerElevationInfo;
     fields: Field[];
     geometryType: string;
@@ -2072,6 +2937,7 @@ declare namespace __esri {
     popupTemplate: PopupTemplate;
     renderer: Renderer;
 
+    createQuery(): Query;
     getFieldUsageInfo(fieldName: string): any;
     queryExtent(params?: Query): IPromise<any>;
     queryFeatureCount(params?: Query): IPromise<any>;
@@ -2088,6 +2954,7 @@ declare namespace __esri {
   export const SceneLayer: SceneLayerConstructor;
 
   interface SceneLayerProperties extends LayerProperties, SceneServiceProperties, PortalLayerProperties {
+    definitionExpression?: string;
     elevationInfo?: SceneLayerElevationInfo;
     fields?: FieldProperties[];
     geometryType?: string;
@@ -2101,9 +2968,12 @@ declare namespace __esri {
   }
 
   interface StreamLayer extends FeatureLayer {
+    filter: StreamLayerFilter;
     geometryDefinition: Extent;
     maximumTrackPoints: number;
-    purgeOptions: any;
+    purgeOptions: StreamLayerPurgeOptions;
+
+    updateFilter(filterChanges: StreamLayerUpdateFilterFilterChanges): IPromise<any>;
   }
 
   interface StreamLayerConstructor {
@@ -2115,9 +2985,10 @@ declare namespace __esri {
   export const StreamLayer: StreamLayerConstructor;
 
   interface StreamLayerProperties extends FeatureLayerProperties {
+    filter?: StreamLayerFilter;
     geometryDefinition?: ExtentProperties;
     maximumTrackPoints?: number;
-    purgeOptions?: any;
+    purgeOptions?: StreamLayerPurgeOptions;
   }
 
   interface UnknownLayer extends Layer {
@@ -2199,13 +3070,20 @@ declare namespace __esri {
   }
 
   interface CodedValueDomainConstructor {
-    new(properties?: any): CodedValueDomain;
+    new(properties?: CodedValueDomainProperties): CodedValueDomain;
+
 
     getName(code: string | number): string;
+
+    fromJSON(json: any): CodedValueDomain;
   }
 
   export const CodedValueDomain: CodedValueDomainConstructor;
 
+  interface CodedValueDomainProperties extends DomainProperties {
+    codedValues?: CodedValueDomainCodedValues[];
+  }
+
   interface DimensionalDefinition {
     dimensionName: string;
     isSlice: boolean;
@@ -2221,20 +3099,25 @@ declare namespace __esri {
 
   export const DimensionalDefinition: DimensionalDefinitionConstructor;
 
-  interface Domain {
+  interface Domain extends Accessor, JSONSupport {
     name: string;
     type: string;
-
-    toJSON(): any;
   }
 
   interface DomainConstructor {
-    new(): Domain;
+    new(properties?: DomainProperties): Domain;
+
+    fromJSON(json: any): Domain;
   }
 
   export const Domain: DomainConstructor;
 
-  interface Field extends JSONSupport {
+  interface DomainProperties {
+    name?: string;
+    type?: string;
+  }
+
+  interface Field extends Accessor, JSONSupport {
     alias: string;
     domain: Domain;
     editable: boolean;
@@ -2254,7 +3137,7 @@ declare namespace __esri {
 
   interface FieldProperties {
     alias?: string;
-    domain?: Domain;
+    domain?: DomainProperties;
     editable?: boolean;
     length?: number;
     name?: string;
@@ -2262,7 +3145,7 @@ declare namespace __esri {
     type?: string;
   }
 
-  interface ImageParameters {
+  interface ImageParameters extends Accessor {
     dpi: number;
     extent: Extent;
     format: string;
@@ -2278,20 +3161,39 @@ declare namespace __esri {
   }
 
   interface ImageParametersConstructor {
-    new(properties?: any): ImageParameters;
+    new(properties?: ImageParametersProperties): ImageParameters;
   }
 
   export const ImageParameters: ImageParametersConstructor;
 
+  interface ImageParametersProperties {
+    dpi?: number;
+    extent?: ExtentProperties;
+    format?: string;
+    height?: number;
+    imageSpatialReference?: SpatialReferenceProperties;
+    layerDefinitions?: string[];
+    layerIds?: number[];
+    layerOption?: string;
+    transparent?: boolean;
+    width?: number;
+  }
+
   interface InheritedDomain extends Domain {
   }
 
   interface InheritedDomainConstructor {
-    new(): InheritedDomain;
+    new(properties?: InheritedDomainProperties): InheritedDomain;
+
+    fromJSON(json: any): InheritedDomain;
   }
 
   export const InheritedDomain: InheritedDomainConstructor;
 
+  interface InheritedDomainProperties extends DomainProperties {
+
+  }
+
   interface LabelClass extends Accessor, JSONSupport {
     labelExpression: string;
     labelExpressionInfo: LabelClassLabelExpressionInfo;
@@ -2301,6 +3203,8 @@ declare namespace __esri {
     symbol: TextSymbol | LabelSymbol3D;
     useCodedValues: boolean;
     where: string;
+
+    clone(): LabelClass;
   }
 
   interface LabelClassConstructor {
@@ -2372,7 +3276,7 @@ declare namespace __esri {
     width?: number;
   }
 
-  interface MosaicRule extends JSONSupport {
+  interface MosaicRule extends Accessor, JSONSupport {
     ascending: boolean;
     lockRasterIds: number[];
     method: string;
@@ -2406,7 +3310,7 @@ declare namespace __esri {
     where?: string;
   }
 
-  interface PixelBlock {
+  interface PixelBlock extends Accessor {
     height: number;
     mask: number[];
     pixels: number[][];
@@ -2421,23 +3325,39 @@ declare namespace __esri {
   }
 
   interface PixelBlockConstructor {
-    new(properties?: any): PixelBlock;
+    new(properties?: PixelBlockProperties): PixelBlock;
   }
 
   export const PixelBlock: PixelBlockConstructor;
 
+  interface PixelBlockProperties {
+    height?: number;
+    mask?: number[];
+    pixels?: number[][];
+    pixelType?: string;
+    statistics?: PixelBlockStatistics[];
+    width?: number;
+  }
+
   interface RangeDomain extends Domain {
     maxValue: number;
     minValue: number;
   }
 
   interface RangeDomainConstructor {
-    new(): RangeDomain;
+    new(properties?: RangeDomainProperties): RangeDomain;
+
+    fromJSON(json: any): RangeDomain;
   }
 
   export const RangeDomain: RangeDomainConstructor;
 
-  interface RasterFunction extends JSONSupport {
+  interface RangeDomainProperties extends DomainProperties {
+    maxValue?: number;
+    minValue?: number;
+  }
+
+  interface RasterFunction extends Accessor, JSONSupport {
     functionArguments: any;
     functionName: string;
     outputPixelType: string;
@@ -2875,6 +3795,7 @@ declare namespace __esri {
     role: string;
     roleId: string;
     thumbnailUrl: string;
+    units: string;
     userContentUrl: string;
     username: string;
 
@@ -2907,6 +3828,7 @@ declare namespace __esri {
     role?: string;
     roleId?: string;
     thumbnailUrl?: string;
+    units?: string;
     userContentUrl?: string;
     username?: string;
   }
@@ -3005,7 +3927,7 @@ declare namespace __esri {
     valueExpression: string;
     valueExpressionTitle: string;
 
-    addUniqueValueInfo(valueOrInfo: string | any, symbol: Symbol): void;
+    addUniqueValueInfo(valueOrInfo: string | any, symbol?: Symbol): void;
     clone(): UniqueValueRenderer;
     getUniqueValueInfo(graphic: Graphic): any;
     removeUniqueValueInfo(value: string): void;
@@ -3034,6 +3956,7 @@ declare namespace __esri {
   }
 
   interface PointCloudRenderer extends Accessor, JSONSupport {
+    pointSizeAlgorithm: PointCloudRendererPointSizeAlgorithm;
     pointsPerInch: number;
   }
 
@@ -3046,6 +3969,7 @@ declare namespace __esri {
   export const PointCloudRenderer: PointCloudRendererConstructor;
 
   interface PointCloudRendererProperties {
+    pointSizeAlgorithm?: PointCloudRendererPointSizeAlgorithm;
     pointsPerInch?: number;
   }
 
@@ -3133,6 +4057,30 @@ declare namespace __esri {
     type?: string;
   }
 
+  interface Action extends Accessor {
+    className: string;
+    id: string;
+    image: string;
+    title: string;
+    visible: boolean;
+
+    clone(): Action;
+  }
+
+  interface ActionConstructor {
+    new(properties?: ActionProperties): Action;
+  }
+
+  export const Action: ActionConstructor;
+
+  interface ActionProperties {
+    className?: string;
+    id?: string;
+    image?: string;
+    title?: string;
+    visible?: boolean;
+  }
+
   interface ExtrudeSymbol3DLayer extends Symbol3DLayer {
     size: number;
 
@@ -3817,8 +4765,6 @@ declare namespace __esri {
   }
 
   interface QueryTask extends Task {
-    gdbVersion: string;
-
     execute(params: Query, requestOptions?: any): IPromise<any>;
     executeForCount(params: Query, requestOptions?: any): IPromise<any>;
     executeForExtent(params: Query, requestOptions?: any): IPromise<any>;
@@ -3833,7 +4779,7 @@ declare namespace __esri {
   export const QueryTask: QueryTaskConstructor;
 
   interface QueryTaskProperties extends TaskProperties {
-    gdbVersion?: string;
+
   }
 
   interface PrintTask extends Task {
@@ -4276,6 +5222,7 @@ declare namespace __esri {
     foundFieldName: string;
     layerId: number;
     layerName: string;
+    value: void;
   }
 
   interface FindResultConstructor {
@@ -4292,6 +5239,7 @@ declare namespace __esri {
     foundFieldName?: string;
     layerId?: number;
     layerName?: string;
+    value?: void;
   }
 
   interface GeneralizeParameters extends Accessor {
@@ -5042,6 +5990,173 @@ declare namespace __esri {
     trimExtendTo?: PolylineProperties;
   }
 
+  interface ConfigurationTask extends Task {
+    url: string;
+
+    getAllGroups(requestOptions?: any): IPromise<any>;
+    getAllUsers(requestOptions?: any): IPromise<any>;
+    getDataWorkspaceDetails(params: ConfigurationTaskGetDataWorkspaceDetailsParams, requestOptions?: any): IPromise<any>;
+    getGroup(groupId: number, requestOptions?: any): IPromise<any>;
+    getJobTypeDetails(jobTypeId: number, requestOptions?: any): IPromise<any>;
+    getPublicJobQueryDetails(queryId: number, requestOptions?: any): IPromise<any>;
+    getServiceInfo(requestOptions?: any): IPromise<any>;
+    getTableRelationshipsDetails(requestOptions?: any): IPromise<any>;
+    getUser(user: string, requestOptions?: any): IPromise<any>;
+    getUserJobQueryDetails(params: ConfigurationTaskGetUserJobQueryDetailsParams, requestOptions?: any): IPromise<any>;
+    getVisibleJobTypes(user: string, requestOptions?: any): IPromise<any>;
+  }
+
+  interface ConfigurationTaskConstructor {
+    new(properties?: ConfigurationTaskProperties): ConfigurationTask;
+  }
+
+  export const ConfigurationTask: ConfigurationTaskConstructor;
+
+  interface ConfigurationTaskProperties extends TaskProperties {
+    url?: string;
+  }
+
+  interface JobTask extends Task {
+    url: string;
+
+    addEmbeddedAttachment(params: JobTaskAddEmbeddedAttachmentParams, requestOptions?: any): IPromise<any>;
+    addLinkedAttachment(params: JobTaskAddLinkedAttachmentParams, requestOptions?: any): IPromise<any>;
+    addLinkedRecord(params: JobTaskAddLinkedRecordParams, requestOptions?: any): IPromise<any>;
+    assignJobs(params: JobTaskAssignJobsParams, requestOptions?: any): IPromise<any>;
+    closeJobs(params: JobTaskCloseJobsParams, requestOptions?: any): IPromise<any>;
+    createDependency(params: JobTaskCreateDependencyParams, requestOptions?: any): IPromise<any>;
+    createHold(params: JobTaskCreateHoldParams, requestOptions?: any): IPromise<any>;
+    createJobs(params: JobCreationParameters, requestOptions?: any): IPromise<any>;
+    createJobVersion(params: JobTaskCreateJobVersionParams, requestOptions?: any): IPromise<any>;
+    deleteAttachment(params: JobTaskDeleteAttachmentParams, requestOptions?: any): IPromise<any>;
+    deleteDependency(params: JobTaskDeleteDependencyParams, requestOptions?: any): IPromise<any>;
+    deleteJobs(params: JobTaskDeleteJobsParams, requestOptions?: any): IPromise<any>;
+    deleteLinkedRecord(params: JobTaskDeleteLinkedRecordParams, requestOptions?: any): IPromise<any>;
+    getActivityLog(jobId: number, requestOptions?: any): IPromise<any>;
+    getAttachmentContentUrl(params: JobTaskGetAttachmentContentUrlParams): string;
+    getAttachments(jobId: number, requestOptions?: any): IPromise<any>;
+    getDependencies(jobId: number, requestOptions?: any): IPromise<any>;
+    getExtendedProperties(jobId: number, requestOptions?: any): IPromise<any>;
+    getHolds(jobId: number, requestOptions?: any): IPromise<any>;
+    getJob(jobId: number, requestOptions?: any): IPromise<any>;
+    getJobIds(requestOptions?: any): IPromise<any>;
+    getNotes(jobId: number, requestOptions?: any): IPromise<any>;
+    listFieldValues(params: JobTaskListFieldValuesParams, requestOptions?: any): IPromise<any>;
+    listMultiLevelFieldValues(params: JobTaskListMultiLevelFieldValuesParams, requestOptions?: any): IPromise<any>;
+    logAction(params: JobTaskLogActionParams, requestOptions?: any): IPromise<any>;
+    queryJobs(params: JobTaskQueryJobsParams, requestOptions?: any): IPromise<any>;
+    queryJobsAdHoc(params: JobQueryParameters, requestOptions?: any): IPromise<any>;
+    queryMultiLevelSelectedValues(params: JobTaskQueryMultiLevelSelectedValuesParams, requestOptions?: any): IPromise<any>;
+    releaseHold(params: JobTaskReleaseHoldParams, requestOptions?: any): IPromise<any>;
+    reopenClosedJobs(params: JobTaskReopenClosedJobsParams, requestOptions?: any): IPromise<any>;
+    searchJobs(params: JobTaskSearchJobsParams, requestOptions?: any): IPromise<any>;
+    unassignJobs(params: JobTaskUnassignJobsParams, requestOptions?: any): IPromise<any>;
+    updateJob(params: JobUpdateParameters, requestOptions?: any): IPromise<any>;
+    updateNotes(params: JobTaskUpdateNotesParams, requestOptions?: any): IPromise<any>;
+    updateRecord(params: JobTaskUpdateRecordParams, requestOptions?: any): IPromise<any>;
+  }
+
+  interface JobTaskConstructor {
+    new(properties?: JobTaskProperties): JobTask;
+  }
+
+  export const JobTask: JobTaskConstructor;
+
+  interface JobTaskProperties extends TaskProperties {
+    url?: string;
+  }
+
+  interface NotificationTask extends Task {
+    url: string;
+
+    addChangeRule(params: NotificationTaskAddChangeRuleParams, requestOptions?: any): IPromise<any>;
+    deleteChangeRule(params: NotificationTaskDeleteChangeRuleParams, requestOptions?: any): IPromise<any>;
+    getAllChangeRules(requestOptions?: any): IPromise<any>;
+    getChangeRule(ruleId: string, requestOptions?: any): IPromise<any>;
+    getChangeRuleMatch(matchId: string, requestOptions?: any): IPromise<any>;
+    getDatabaseTime(dataWorkspaceId: string, requestOptions?: any): IPromise<any>;
+    getSessionMatches(sessionId: string, requestOptions?: any): IPromise<any>;
+    notifySession(params: NotificationTaskNotifySessionParams, requestOptions?: any): IPromise<any>;
+    queryChangeRules(params: NotificationTaskQueryChangeRulesParams, requestOptions?: any): IPromise<any>;
+    runSpatialNotificationOnHistory(params: NotificationTaskRunSpatialNotificationOnHistoryParams, requestOptions?: any): IPromise<any>;
+    sendNotification(params: NotificationTaskSendNotificationParams, requestOptions?: any): IPromise<any>;
+    subscribeToNotification(params: NotificationTaskSubscribeToNotificationParams, requestOptions?: any): IPromise<any>;
+    unsubscribeFromNotification(params: NotificationTaskUnsubscribeFromNotificationParams, requestOptions?: any): IPromise<any>;
+  }
+
+  interface NotificationTaskConstructor {
+    new(properties?: NotificationTaskProperties): NotificationTask;
+  }
+
+  export const NotificationTask: NotificationTaskConstructor;
+
+  interface NotificationTaskProperties extends TaskProperties {
+    url?: string;
+  }
+
+  interface ReportTask extends Task {
+    url: string;
+
+    generateReport(params: ReportTaskGenerateReportParams, requestOptions?: any): IPromise<any>;
+    getAllReports(requestOptions?: any): IPromise<any>;
+    getReportContentUrl(params: ReportTaskGetReportContentUrlParams): string;
+    getReportData(params: ReportTaskGetReportDataParams, requestOptions?: any): IPromise<any>;
+    getReportStylesheet(reportId: number, requestOptions?: any): IPromise<any>;
+  }
+
+  interface ReportTaskConstructor {
+    new(properties?: ReportTaskProperties): ReportTask;
+  }
+
+  export const ReportTask: ReportTaskConstructor;
+
+  interface ReportTaskProperties extends TaskProperties {
+    url?: string;
+  }
+
+  interface TokenTask extends Task {
+    parseTokens(params: TokenTaskParseTokensParams, requestOptions?: any): IPromise<any>;
+  }
+
+  interface TokenTaskConstructor {
+    new(properties?: TokenTaskProperties): TokenTask;
+  }
+
+  export const TokenTask: TokenTaskConstructor;
+
+  interface TokenTaskProperties extends TaskProperties {
+
+  }
+
+  interface WorkflowTask extends Task {
+    url: string;
+
+    canRunStep(params: WorkflowTaskCanRunStepParams, requestOptions?: any): IPromise<any>;
+    executeSteps(params: WorkflowTaskExecuteStepsParams, requestOptions?: any): IPromise<any>;
+    getAllSteps(jobId: number, requestOptions?: any): IPromise<any>;
+    getCurrentSteps(jobId: number, requestOptions?: any): IPromise<any>;
+    getStep(params: WorkflowTaskGetStepParams, requestOptions?: any): IPromise<any>;
+    getStepDescription(params: WorkflowTaskGetStepDescriptionParams, requestOptions?: any): IPromise<any>;
+    getStepFileUrl(params: WorkflowTaskGetStepFileUrlParams): string;
+    getWorkflowDisplayDetails(jobId: number, requestOptions?: any): IPromise<any>;
+    getWorkflowImageUrl(jobId: number): string;
+    markStepsAsDone(params: WorkflowTaskMarkStepsAsDoneParams, requestOptions?: any): IPromise<any>;
+    moveToNextStep(params: WorkflowTaskMoveToNextStepParams, requestOptions?: any): IPromise<any>;
+    recreateWorkflow(params: WorkflowTaskRecreateWorkflowParams, requestOptions?: any): IPromise<any>;
+    resolveConflict(params: WorkflowTaskResolveConflictParams, requestOptions?: any): IPromise<any>;
+    setCurrentStep(params: WorkflowTaskSetCurrentStepParams, requestOptions?: any): IPromise<any>;
+  }
+
+  interface WorkflowTaskConstructor {
+    new(properties?: WorkflowTaskProperties): WorkflowTask;
+  }
+
+  export const WorkflowTask: WorkflowTaskConstructor;
+
+  interface WorkflowTaskProperties extends TaskProperties {
+    url?: string;
+  }
+
   interface MapView extends View {
     center: Point;
     constraints: MapViewConstraints;
@@ -5053,6 +6168,7 @@ declare namespace __esri {
     zoom: number;
 
     goTo(target: number[] | Geometry | Geometry[] | Graphic | Graphic[] | Viewpoint | any, options?: MapViewGoToOptions): IPromise<any>;
+    hasEventListener(type: string): boolean;
     hitTest(screenPoint: MapViewHitTestScreenPoint): IPromise<any>;
     on(type: string | string[], modifiersOrHandler: string[] | Function, handler?: Function): any;
     toMap(screenPoint: ScreenPoint, mapPoint?: Point): Point;
@@ -5090,6 +6206,7 @@ declare namespace __esri {
     zoom: number;
 
     goTo(target: number[] | Geometry | Geometry[] | Graphic | Graphic[] | Viewpoint | Camera | any, options?: SceneViewGoToOptions): IPromise<any>;
+    hasEventListener(type: string): boolean;
     hitTest(screenPoint: SceneViewHitTestScreenPoint): IPromise<any>;
     on(type: string | string[], modifiersOrHandler: string[] | Function, handler?: Function): any;
     toMap(screenPoint: ScreenPoint, mapPoint?: Point): Point;
@@ -5116,7 +6233,7 @@ declare namespace __esri {
     zoom?: number;
   }
 
-  interface View extends Accessor, corePromise, Evented, BreakpointsOwner, DOMContainer {
+  interface View extends Accessor, corePromise, BreakpointsOwner, DOMContainer {
     allLayerViews: Collection;
     animation: ViewAnimation;
     graphics: Collection;
@@ -5238,16 +6355,33 @@ declare namespace __esri {
     pixelData?: ImageryLayerViewPixelData;
   }
 
+  interface SceneLayerView extends LayerView {
+    queryExtent(params?: Query): IPromise<any>;
+    queryFeatureCount(params?: Query): IPromise<any>;
+    queryFeatures(params?: Query): IPromise<any>;
+    queryObjectIds(params?: Query): IPromise<any>;
+  }
+
+  interface SceneLayerViewConstructor {
+    new(properties?: SceneLayerViewProperties): SceneLayerView;
+  }
+
+  export const SceneLayerView: SceneLayerViewConstructor;
+
+  interface SceneLayerViewProperties extends LayerViewProperties {
+
+  }
+
   interface UI extends Accessor {
     container: any;
     height: number;
     padding: any;
-    view: SceneView | MapView;
+    view: MapView | SceneView;
     width: number;
 
-    add(component: any | any[], position?: string | any): void;
+    add(component: Widget | any | string | any | any, position?: string | any): void;
     empty(position?: string): void;
-    move(component: any | any[], position?: string): void;
+    move(component: Widget | any | string | any | any, position?: string): void;
     remove(component: any | any[]): void;
   }
 
@@ -5261,7 +6395,7 @@ declare namespace __esri {
     container?: any;
     height?: number;
     padding?: any | number;
-    view?: SceneView | MapView;
+    view?: MapView | SceneView;
     width?: number;
   }
 
@@ -5406,9 +6540,11 @@ declare namespace __esri {
     visibleLayers?: SlideVisibleLayers;
   }
 
-  interface Attribution extends Accessor {
-    view: SceneView | MapView;
+  interface Attribution extends Widget {
+    view: MapView | SceneView;
     viewModel: AttributionViewModel;
+
+    render(): any;
   }
 
   interface AttributionConstructor {
@@ -5417,18 +6553,41 @@ declare namespace __esri {
 
   export const Attribution: AttributionConstructor;
 
-  interface AttributionProperties {
-    view?: SceneView | MapView;
+  interface AttributionProperties extends WidgetProperties {
+    view?: MapView | SceneView;
     viewModel?: AttributionViewModel;
   }
 
-  interface BasemapToggle extends Accessor, Evented {
+  interface BasemapGallery extends Widget {
+    activeBasemap: Basemap;
+    source: LocalBasemapsSource | PortalBasemapsSource;
+    view: MapView | SceneView;
+    viewModel: BasemapGalleryViewModel;
+
+    render(): any;
+  }
+
+  interface BasemapGalleryConstructor {
+    new(properties?: BasemapGalleryProperties): BasemapGallery;
+  }
+
+  export const BasemapGallery: BasemapGalleryConstructor;
+
+  interface BasemapGalleryProperties extends WidgetProperties {
+    activeBasemap?: BasemapProperties;
+    source?: LocalBasemapsSource | PortalBasemapsSource;
+    view?: MapView | SceneView;
+    viewModel?: BasemapGalleryViewModelProperties;
+  }
+
+  interface BasemapToggle extends Widget {
     activeBasemap: Basemap;
     nextBasemap: Basemap;
     titleVisible: boolean;
-    view: SceneView | MapView;
+    view: MapView | SceneView;
     viewModel: BasemapToggleViewModel;
 
+    render(): any;
     toggle(): void;
   }
 
@@ -5438,15 +6597,15 @@ declare namespace __esri {
 
   export const BasemapToggle: BasemapToggleConstructor;
 
-  interface BasemapToggleProperties {
+  interface BasemapToggleProperties extends WidgetProperties {
     activeBasemap?: BasemapProperties;
     nextBasemap?: Basemap | string;
     titleVisible?: boolean;
-    view?: SceneView | MapView;
+    view?: MapView | SceneView;
     viewModel?: BasemapToggleViewModelProperties;
   }
 
-  interface ColorSlider extends Accessor {
+  interface ColorSlider extends Accessor, Widgette {
     handlesVisible: boolean;
     histogram: any;
     histogramVisible: boolean;
@@ -5469,7 +6628,7 @@ declare namespace __esri {
 
   export const ColorSlider: ColorSliderConstructor;
 
-  interface ColorSliderProperties {
+  interface ColorSliderProperties extends WidgetteProperties {
     handlesVisible?: boolean;
     histogram?: any;
     histogramVisible?: boolean;
@@ -5486,10 +6645,11 @@ declare namespace __esri {
     visualVariable?: any;
   }
 
-  interface Compass extends Accessor {
-    view: SceneView | MapView;
+  interface Compass extends Widget {
+    view: MapView | SceneView;
     viewModel: CompassViewModel;
 
+    render(): any;
     reset(): void;
   }
 
@@ -5499,17 +6659,51 @@ declare namespace __esri {
 
   export const Compass: CompassConstructor;
 
-  interface CompassProperties {
-    view?: SceneView | MapView;
+  interface CompassProperties extends WidgetProperties {
+    view?: MapView | SceneView;
     viewModel?: CompassViewModelProperties;
   }
 
-  interface Home extends Accessor, Evented {
+  interface Expand extends Widget {
+    collapseTooltip: string;
+    content: any;
+    expanded: boolean;
+    expandIconClass: string;
+    expandTooltip: string;
+    iconNumber: string;
+    view: MapView | SceneView;
+    viewModel: ExpandViewModel;
+
+    collapse(): void;
+    expand(): void;
+    render(): any;
+    toggle(): void;
+  }
+
+  interface ExpandConstructor {
+    new(properties?: ExpandProperties): Expand;
+  }
+
+  export const Expand: ExpandConstructor;
+
+  interface ExpandProperties extends WidgetProperties {
+    collapseTooltip?: string;
+    content?: any | any | string | Widget;
+    expanded?: boolean;
+    expandIconClass?: string;
+    expandTooltip?: string;
+    iconNumber?: string;
+    view?: MapView | SceneView;
+    viewModel?: ExpandViewModelProperties;
+  }
+
+  interface Home extends Widget {
     view: MapView | SceneView;
     viewModel: HomeViewModel;
     viewpoint: Viewpoint;
 
     go(): void;
+    render(): any;
   }
 
   interface HomeConstructor {
@@ -5518,7 +6712,7 @@ declare namespace __esri {
 
   export const Home: HomeConstructor;
 
-  interface HomeProperties {
+  interface HomeProperties extends WidgetProperties {
     view?: MapView | SceneView;
     viewModel?: HomeViewModelProperties;
     viewpoint?: ViewpointProperties;
@@ -5526,10 +6720,12 @@ declare namespace __esri {
 
   interface LayerList extends Widget {
     createActionsFunction: Function;
-    view: SceneView | MapView;
+    operationalItems: Collection;
+    view: MapView | SceneView;
     viewModel: LayerListViewModel;
 
     render(): any;
+    triggerAction(action: Action, item: ListItem): void;
   }
 
   interface LayerListConstructor {
@@ -5540,13 +6736,14 @@ declare namespace __esri {
 
   interface LayerListProperties extends WidgetProperties {
     createActionsFunction?: Function;
-    view?: SceneView | MapView;
+    operationalItems?: Collection;
+    view?: MapView | SceneView;
     viewModel?: LayerListViewModelProperties;
   }
 
-  interface Legend extends Accessor {
+  interface Legend extends Accessor, Widgette {
     layerInfos: LegendLayerInfos[];
-    view: SceneView | MapView;
+    view: MapView | SceneView;
   }
 
   interface LegendConstructor {
@@ -5555,12 +6752,12 @@ declare namespace __esri {
 
   export const Legend: LegendConstructor;
 
-  interface LegendProperties {
+  interface LegendProperties extends WidgetteProperties {
     layerInfos?: LegendLayerInfos[];
-    view?: SceneView | MapView;
+    view?: MapView | SceneView;
   }
 
-  interface Locate extends Accessor, Evented {
+  interface Locate extends Widget {
     geolocationOptions: any;
     goToLocationEnabled: boolean;
     graphic: Graphic;
@@ -5568,6 +6765,7 @@ declare namespace __esri {
     viewModel: LocateViewModel;
 
     locate(): IPromise<any>;
+    render(): any;
   }
 
   interface LocateConstructor {
@@ -5576,7 +6774,7 @@ declare namespace __esri {
 
   export const Locate: LocateConstructor;
 
-  interface LocateProperties {
+  interface LocateProperties extends WidgetProperties {
     geolocationOptions?: any;
     goToLocationEnabled?: boolean;
     graphic?: GraphicProperties;
@@ -5584,11 +6782,12 @@ declare namespace __esri {
     viewModel?: LocateViewModelProperties;
   }
 
-  interface NavigationToggle extends Accessor {
+  interface NavigationToggle extends Widget {
     layout: string;
     view: SceneView;
     viewModel: NavigationToggleViewModel;
 
+    render(): any;
     toggle(): void;
   }
 
@@ -5598,13 +6797,13 @@ declare namespace __esri {
 
   export const NavigationToggle: NavigationToggleConstructor;
 
-  interface NavigationToggleProperties {
+  interface NavigationToggleProperties extends WidgetProperties {
     layout?: string;
     view?: SceneViewProperties;
     viewModel?: NavigationToggleViewModelProperties;
   }
 
-  interface Popup extends Accessor, Evented {
+  interface Popup extends Accessor, Widgette, Evented {
     actions: Collection;
     content: string;
     currentDockPosition: string;
@@ -5636,7 +6835,7 @@ declare namespace __esri {
 
   export const Popup: PopupConstructor;
 
-  interface PopupProperties {
+  interface PopupProperties extends WidgetteProperties {
     actions?: Collection;
     content?: string | any;
     currentDockPosition?: string;
@@ -5674,12 +6873,34 @@ declare namespace __esri {
     viewModel?: PrintViewModelProperties;
   }
 
-  interface Search extends Accessor, Evented {
+  interface ScaleBar extends Widget {
+    style: string;
+    unit: string;
+    view: MapView;
+    viewModel: ScaleBarViewModel;
+
+    render(): any;
+  }
+
+  interface ScaleBarConstructor {
+    new(properties?: ScaleBarProperties): ScaleBar;
+  }
+
+  export const ScaleBar: ScaleBarConstructor;
+
+  interface ScaleBarProperties extends WidgetProperties {
+    style?: string;
+    unit?: string;
+    view?: MapViewProperties;
+    viewModel?: ScaleBarViewModelProperties;
+  }
+
+  interface Search extends Widget {
     activeSource: FeatureLayer | Locator;
     activeSourceIndex: number;
     allPlaceholder: string;
     autoSelect: boolean;
-    defaultSource: any;
+    defaultSource: any | any;
     maxResults: number;
     maxSuggestions: number;
     minSuggestCharacters: number;
@@ -5690,6 +6911,7 @@ declare namespace __esri {
     resultGraphicEnabled: boolean;
     results: any[];
     searchAllEnabled: boolean;
+    searching: boolean;
     searchTerm: string;
     selectedResult: any;
     sources: SearchSources;
@@ -5699,6 +6921,7 @@ declare namespace __esri {
     viewModel: SearchViewModel;
 
     clear(): void;
+    render(): any;
     search(searchTerm?: string | Geometry | any | number[][]): IPromise<any>;
     suggest(value?: string): IPromise<any>;
   }
@@ -5709,12 +6932,12 @@ declare namespace __esri {
 
   export const Search: SearchConstructor;
 
-  interface SearchProperties {
+  interface SearchProperties extends WidgetProperties {
     activeSource?: FeatureLayer | Locator;
     activeSourceIndex?: number;
     allPlaceholder?: string;
     autoSelect?: boolean;
-    defaultSource?: any;
+    defaultSource?: any | any;
     maxResults?: number;
     maxSuggestions?: number;
     minSuggestCharacters?: number;
@@ -5725,6 +6948,7 @@ declare namespace __esri {
     resultGraphicEnabled?: boolean;
     results?: any[];
     searchAllEnabled?: boolean;
+    searching?: boolean;
     searchTerm?: string;
     selectedResult?: any;
     sources?: SearchSources;
@@ -5734,7 +6958,7 @@ declare namespace __esri {
     viewModel?: SearchViewModelProperties;
   }
 
-  interface SizeSlider extends Accessor {
+  interface SizeSlider extends Accessor, Widgette {
     handlesVisible: boolean;
     histogram: any;
     histogramVisible: boolean;
@@ -5757,7 +6981,7 @@ declare namespace __esri {
 
   export const SizeSlider: SizeSliderConstructor;
 
-  interface SizeSliderProperties {
+  interface SizeSliderProperties extends WidgetteProperties {
     handlesVisible?: boolean;
     histogram?: any;
     histogramVisible?: boolean;
@@ -5774,7 +6998,7 @@ declare namespace __esri {
     visualVariable?: any;
   }
 
-  interface Track extends Accessor {
+  interface Track extends Widget {
     geolocationOptions: any;
     goToLocationEnabled: boolean;
     graphic: Graphic;
@@ -5782,6 +7006,7 @@ declare namespace __esri {
     view: MapView | SceneView;
     viewModel: TrackViewModel;
 
+    render(): any;
     start(): void;
     stop(): void;
   }
@@ -5792,7 +7017,7 @@ declare namespace __esri {
 
   export const Track: TrackConstructor;
 
-  interface TrackProperties {
+  interface TrackProperties extends WidgetProperties {
     geolocationOptions?: any;
     goToLocationEnabled?: boolean;
     graphic?: GraphicProperties;
@@ -5801,7 +7026,7 @@ declare namespace __esri {
     viewModel?: TrackViewModelProperties;
   }
 
-  interface UnivariateColorSizeSlider extends Accessor {
+  interface UnivariateColorSizeSlider extends Accessor, Widgette {
     handlesVisible: boolean;
     histogram: any;
     histogramVisible: boolean;
@@ -5824,7 +7049,7 @@ declare namespace __esri {
 
   export const UnivariateColorSizeSlider: UnivariateColorSizeSliderConstructor;
 
-  interface UnivariateColorSizeSliderProperties {
+  interface UnivariateColorSizeSliderProperties extends WidgetteProperties {
     handlesVisible?: boolean;
     histogram?: any;
     histogramVisible?: boolean;
@@ -5847,7 +7072,9 @@ declare namespace __esri {
     id: string;
 
     destroy(): void;
+    own(handles: any[]): void;
     postInitialize(): void;
+    renderNow(): void;
     scheduleRender(): void;
     startup(): void;
   }
@@ -5859,15 +7086,16 @@ declare namespace __esri {
   export const Widget: WidgetConstructor;
 
   interface WidgetProperties {
-    container?: string;
+    container?: string | any;
     destroyed?: boolean;
     id?: string;
   }
 
-  interface Zoom extends Accessor {
-    view: SceneView | MapView;
+  interface Zoom extends Widget {
+    view: MapView | SceneView;
     viewModel: ZoomViewModel;
 
+    render(): any;
     zoomIn(): void;
     zoomOut(): void;
   }
@@ -5878,8 +7106,8 @@ declare namespace __esri {
 
   export const Zoom: ZoomConstructor;
 
-  interface ZoomProperties {
-    view?: SceneView | MapView;
+  interface ZoomProperties extends WidgetProperties {
+    view?: MapView | SceneView;
     viewModel?: ZoomViewModelProperties;
   }
 
@@ -5887,7 +7115,7 @@ declare namespace __esri {
     attributionText: string;
     itemDelimiter: string;
     state: string;
-    view: SceneView | MapView;
+    view: MapView | SceneView;
   }
 
   interface AttributionViewModelConstructor {
@@ -5896,11 +7124,35 @@ declare namespace __esri {
 
   export const AttributionViewModel: AttributionViewModelConstructor;
 
+  interface BasemapGalleryViewModel extends Accessor {
+    activeBasemap: Basemap;
+    items: Collection;
+    source: LocalBasemapsSource | PortalBasemapsSource;
+    state: string;
+    view: MapView | SceneView;
+
+    basemapEquals(basemap1: Basemap, basemap2: Basemap): boolean;
+  }
+
+  interface BasemapGalleryViewModelConstructor {
+    new(properties?: BasemapGalleryViewModelProperties): BasemapGalleryViewModel;
+  }
+
+  export const BasemapGalleryViewModel: BasemapGalleryViewModelConstructor;
+
+  interface BasemapGalleryViewModelProperties {
+    activeBasemap?: BasemapProperties;
+    items?: Collection;
+    source?: LocalBasemapsSource | PortalBasemapsSource;
+    state?: string;
+    view?: MapView | SceneView;
+  }
+
   interface BasemapToggleViewModel extends Accessor, Evented {
     activeBasemap: Basemap;
     nextBasemap: Basemap;
     state: string;
-    view: SceneView | MapView;
+    view: MapView | SceneView;
 
     toggle(): void;
   }
@@ -5915,12 +7167,13 @@ declare namespace __esri {
     activeBasemap?: BasemapProperties;
     nextBasemap?: Basemap | string;
     state?: string;
-    view?: SceneView | MapView;
+    view?: MapView | SceneView;
   }
 
   interface CompassViewModel extends Accessor {
+    orientation: any;
     state: string;
-    view: SceneView | MapView;
+    view: MapView | SceneView;
 
     reset(): void;
   }
@@ -5932,8 +7185,27 @@ declare namespace __esri {
   export const CompassViewModel: CompassViewModelConstructor;
 
   interface CompassViewModelProperties {
+    orientation?: any;
     state?: string;
-    view?: SceneView | MapView;
+    view?: MapView | SceneView;
+  }
+
+  interface ExpandViewModel extends Accessor {
+    expanded: boolean;
+    state: string;
+    view: MapView | SceneView;
+  }
+
+  interface ExpandViewModelConstructor {
+    new(properties?: ExpandViewModelProperties): ExpandViewModel;
+  }
+
+  export const ExpandViewModel: ExpandViewModelConstructor;
+
+  interface ExpandViewModelProperties {
+    expanded?: boolean;
+    state?: string;
+    view?: MapView | SceneView;
   }
 
   interface HomeViewModel extends Accessor, Evented {
@@ -5960,9 +7232,9 @@ declare namespace __esri {
     createActionsFunction: Function;
     operationalItems: Collection;
     state: string;
-    view: SceneView | MapView;
+    view: MapView | SceneView;
 
-    triggerAction(actionIndex: number): void;
+    triggerAction(action: Action, item: ListItem): void;
   }
 
   interface LayerListViewModelConstructor {
@@ -5975,9 +7247,32 @@ declare namespace __esri {
     createActionsFunction?: Function;
     operationalItems?: Collection;
     state?: string;
-    view?: SceneView | MapView;
+    view?: MapView | SceneView;
   }
 
+  interface ListItem {
+    actionsOpen: boolean;
+    actionsSections: Collection;
+    children: Collection;
+    error: Error;
+    layer: Layer;
+    open: boolean;
+    title: string;
+    updating: boolean;
+    view: MapView | SceneView;
+    visibilityMode: string;
+    visible: boolean;
+    visibleAtCurrentScale: boolean;
+
+    clone(): ListItem;
+  }
+
+  interface ListItemConstructor {
+    new(): ListItem;
+  }
+
+  export const ListItem: ListItemConstructor;
+
   interface LocateViewModel extends Accessor, Evented, GeolocationPositioning {
     state: string;
 
@@ -6075,6 +7370,20 @@ declare namespace __esri {
     view?: MapView | SceneView;
   }
 
+  interface ScaleBarViewModel extends Accessor {
+    view: MapView;
+  }
+
+  interface ScaleBarViewModelConstructor {
+    new(properties?: ScaleBarViewModelProperties): ScaleBarViewModel;
+  }
+
+  export const ScaleBarViewModel: ScaleBarViewModelConstructor;
+
+  interface ScaleBarViewModelProperties {
+    view?: MapViewProperties;
+  }
+
   interface SearchViewModel extends Accessor, Evented {
     activeSource: FeatureLayer | Locator;
     activeSourceIndex: number;
@@ -6163,7 +7472,7 @@ declare namespace __esri {
     canZoomIn: boolean;
     canZoomOut: boolean;
     state: string;
-    view: SceneView | MapView;
+    view: MapView | SceneView;
 
     zoomIn(): void;
     zoomOut(): void;
@@ -6179,7 +7488,7 @@ declare namespace __esri {
     canZoomIn?: boolean;
     canZoomOut?: boolean;
     state?: string;
-    view?: SceneView | MapView;
+    view?: MapView | SceneView;
   }
 
   interface JSONSupport {
@@ -6301,6 +7610,8 @@ declare namespace __esri {
     dpi: number;
     gdbVersion: string;
     imageFormat: string;
+    imageMaxHeight: number;
+    imageMaxWidth: number;
     imageTransparency: boolean;
     sublayers: Collection;
 
@@ -6320,6 +7631,8 @@ declare namespace __esri {
     dpi?: number;
     gdbVersion?: string;
     imageFormat?: string;
+    imageMaxHeight?: number;
+    imageMaxWidth?: number;
     imageTransparency?: boolean;
     sublayers?: Collection;
   }
@@ -6547,6 +7860,24 @@ declare namespace __esri {
     width?: number;
   }
 
+  interface Widgette {
+    container: string | any;
+    visible: boolean;
+
+    destroy(): void;
+  }
+
+  interface WidgetteConstructor {
+    new(): Widgette;
+  }
+
+  export const Widgette: WidgetteConstructor;
+
+  interface WidgetteProperties {
+    container?: string | any;
+    visible?: boolean;
+  }
+
   interface GeolocationPositioning {
     geolocationOptions: any;
     goToLocationEnabled: boolean;
@@ -6569,8 +7900,10 @@ declare namespace __esri {
 
   interface config {
     geometryServiceUrl: string;
+    geoRSSServiceUrl: string;
     portalUrl: string;
     request: configRequest;
+    workers: configWorkers;
   }
 
   export const config: config;
@@ -6596,13 +7929,19 @@ declare namespace __esri {
   export const lang: lang;
 
   interface promiseUtils {
-    eachAlways(promises: IPromise<any>[]): IPromise<any>[];
-    reject(error?: any): IPromise<any>;
-    resolve(value?: any): IPromise<any>;
+    eachAlways(promises: IPromise<any>[] | any): IPromise<EachAlwaysResult[]> | any;
+    reject<T>(error?: any): IPromise<T>;
+    resolve<T>(value?: T): IPromise<T>;
   }
 
   export const promiseUtils: promiseUtils;
 
+  interface requireUtils {
+    when(moduleRequire: any, moduleNames: string[] | string): IPromise<any>;
+  }
+
+  export const requireUtils: requireUtils;
+
   interface urlUtils {
     addProxyRule(rule: urlUtilsAddProxyRuleRule): number;
     getProxyRule(url: string): any;
@@ -6636,7 +7975,7 @@ declare namespace __esri {
   interface decorators {
     aliasOf(propertyName: string): Function;
     cast(propertyName: string): Function;
-    cast(classFunction: Function): void;
+    cast(classFunction: Function): Function;
     declared<T>(baseClass: T, ...mixinClasses: any[]): T;
     property(propertyMetadata?: decoratorsPropertyPropertyMetadata): Function;
     subclass(declaredClass?: string): Function;
@@ -6739,6 +8078,12 @@ declare namespace __esri {
 
   export const jsonUtils: jsonUtils;
 
+  interface normalizeUtils {
+    normalizeCentralMeridian(geometries: Geometry[], geometryService?: GeometryService): IPromise<any>;
+  }
+
+  export const normalizeUtils: normalizeUtils;
+
   interface webMercatorUtils {
     canProject(source: SpatialReference | any, target: SpatialReference | any): boolean;
     geographicToWebMercator(geometry: Geometry): Geometry;
@@ -6765,7 +8110,7 @@ declare namespace __esri {
 
   interface size {
     createContinuousRenderer(params: sizeCreateContinuousRendererParams): IPromise<any>;
-    createVisualVariable(params: sizeCreateVisualVariableParams): IPromise<any>;
+    createVisualVariables(params: sizeCreateVisualVariablesParams): IPromise<any>;
   }
 
   export const size: size;
@@ -6787,13 +8132,17 @@ declare namespace __esri {
     histogram(params: histogramHistogramParams): IPromise<any>;
   }
 
-  export const histogram: histogram;
+  const __histogramMapped: histogram;
+  export const histogram: typeof __histogramMapped.histogram;
+
 
   interface summaryStatistics {
     summaryStatistics(params: summaryStatisticsSummaryStatisticsParams): IPromise<any>;
   }
 
-  export const summaryStatistics: summaryStatistics;
+  const __summaryStatisticsMapped: summaryStatistics;
+  export const summaryStatistics: typeof __summaryStatisticsMapped.summaryStatistics;
+
 
   interface symbologyColor {
     cloneScheme(scheme: any): any;
@@ -6824,16 +8173,6 @@ declare namespace __esri {
 
   export const supportJsonUtils: supportJsonUtils;
 
-  interface Action {
-    className: string;
-    id: string;
-    image: string;
-    title: string;
-    visible: boolean;
-  }
-
-  export const Action: Action;
-
   interface symbolsSupportJsonUtils {
     fromJSON(json: any): Symbol;
   }
@@ -6861,20 +8200,30 @@ declare namespace __esri {
 
   export const widget: widget;
 
-  interface ListItem {
-    actionsOpen: boolean;
-    actionsSections: Collection;
-    children: Collection;
+  interface BasemapGalleryItem {
+    basemap: Basemap;
     error: Error;
-    open: boolean;
-    title: string;
-    updating: boolean;
-    visibilityMode: string;
-    visible: boolean;
-    visibleAtCurrentScale: boolean;
+    state: string;
+    view: MapView | SceneView;
   }
 
-  export const ListItem: ListItem;
+  export const BasemapGalleryItem: BasemapGalleryItem;
+
+  interface LocalBasemapsSource {
+    basemaps: Collection;
+    state: string;
+  }
+
+  export const LocalBasemapsSource: LocalBasemapsSource;
+
+  interface PortalBasemapsSource {
+    basemaps: Collection;
+    filterFunction: Function;
+    portal: Portal;
+    state: string;
+  }
+
+  export const PortalBasemapsSource: PortalBasemapsSource;
 }
 
 declare module "esri" {
@@ -6888,10 +8237,116 @@ declare module "esri" {
 
   export import WatchHandle = __esri.WatchHandle;
 
+  export import EachAlwaysResult = __esri.EachAlwaysResult;
+
   export import PausableWatchHandle = __esri.PausableWatchHandle;
 
+  export import FeatureEditResult = __esri.FeatureEditResult;
+
   export import AttributeParamValue = __esri.AttributeParamValue;
 
+  export import DataWorkspace = __esri.DataWorkspace;
+
+  export import GroupMembership = __esri.GroupMembership;
+
+  export import HoldType = __esri.HoldType;
+
+  export import JobPriority = __esri.JobPriority;
+
+  export import JobQuery = __esri.JobQuery;
+
+  export import JobStatus = __esri.JobStatus;
+
+  export import JobQueryContainer = __esri.JobQueryContainer;
+
+  export import JobQueryDetails = __esri.JobQueryDetails;
+
+  export import Privilege = __esri.Privilege;
+
+  export import UserDetails = __esri.UserDetails;
+
+  export import VersionInfo = __esri.VersionInfo;
+
+  export import WorkflowManagerServiceInfo = __esri.WorkflowManagerServiceInfo;
+
+  export import JobType = __esri.JobType;
+
+  export import JobTypeDetails = __esri.JobTypeDetails;
+
+  export import TableRelationship = __esri.TableRelationship;
+
+  export import JobCreationParameters = __esri.JobCreationParameters;
+
+  export import JobQueryParameters = __esri.JobQueryParameters;
+
+  export import JobUpdateParameters = __esri.JobUpdateParameters;
+
+  export import AuxRecordDescription = __esri.AuxRecordDescription;
+
+  export import ActivityType = __esri.ActivityType;
+
+  export import AuxRecordContainer = __esri.AuxRecordContainer;
+
+  export import JobTaskJobInfo = __esri.JobTaskJobInfo;
+
+  export import QueryResult = __esri.QueryResult;
+
+  export import AuxRecord = __esri.AuxRecord;
+
+  export import AuxRecordValue = __esri.AuxRecordValue;
+
+  export import FieldValue = __esri.FieldValue;
+
+  export import JobVersionInfo = __esri.JobVersionInfo;
+
+  export import QueryFieldInfo = __esri.QueryFieldInfo;
+
+  export import JobAttachment = __esri.JobAttachment;
+
+  export import JobDependency = __esri.JobDependency;
+
+  export import ChangeRule = __esri.ChangeRule;
+
+  export import DataSetEvaluator = __esri.DataSetEvaluator;
+
+  export import AOIEvaluator = __esri.AOIEvaluator;
+
+  export import DatasetConfiguration = __esri.DatasetConfiguration;
+
+  export import EmailNotifier = __esri.EmailNotifier;
+
+  export import WhereCondition = __esri.WhereCondition;
+
+  export import NotificationType = __esri.NotificationType;
+
+  export import ChangeRuleMatch = __esri.ChangeRuleMatch;
+
+  export import ReportDataGroup = __esri.ReportDataGroup;
+
+  export import ReportData = __esri.ReportData;
+
+  export import Report = __esri.Report;
+
+  export import ExecuteInfo = __esri.ExecuteInfo;
+
+  export import Step = __esri.Step;
+
+  export import StepType = __esri.StepType;
+
+  export import WorkflowDisplayDetails = __esri.WorkflowDisplayDetails;
+
+  export import WorkflowOption = __esri.WorkflowOption;
+
+  export import WorkflowStepInfo = __esri.WorkflowStepInfo;
+
+  export import WorkflowAnnotationDisplayDetails = __esri.WorkflowAnnotationDisplayDetails;
+
+  export import WorkflowConflicts = __esri.WorkflowConflicts;
+
+  export import WorkflowPathDisplayDetails = __esri.WorkflowPathDisplayDetails;
+
+  export import WorkflowStepDisplayDetails = __esri.WorkflowStepDisplayDetails;
+
   export import ExternalRenderer = __esri.ExternalRenderer;
 
   export import RenderContext = __esri.RenderContext;
@@ -6906,10 +8361,6 @@ declare module "esri" {
 
   export import FeatureLayerSource = __esri.FeatureLayerSource;
 
-  export import SearchViewModelLocatorSource = __esri.SearchViewModelLocatorSource;
-
-  export import SearchViewModelFeatureLayerSource = __esri.SearchViewModelFeatureLayerSource;
-
   export import GetHeader = __esri.GetHeader;
 
   export import WatchCallback = __esri.WatchCallback;
@@ -6966,8 +8417,16 @@ declare module "esri" {
 
   export import CSVLayerElevationInfo = __esri.CSVLayerElevationInfo;
 
+  export import FeatureLayerApplyEditsEdits = __esri.FeatureLayerApplyEditsEdits;
+
+  export import FeatureLayerCapabilities = __esri.FeatureLayerCapabilities;
+
+  export import FeatureLayerCapabilitiesOperations = __esri.FeatureLayerCapabilitiesOperations;
+
   export import FeatureLayerElevationInfo = __esri.FeatureLayerElevationInfo;
 
+  export import FeatureLayerGetFieldDomainOptions = __esri.FeatureLayerGetFieldDomainOptions;
+
   export import GraphicsLayerElevationInfo = __esri.GraphicsLayerElevationInfo;
 
   export import LayerFromArcGISServerUrlParams = __esri.LayerFromArcGISServerUrlParams;
@@ -6976,6 +8435,12 @@ declare module "esri" {
 
   export import SceneLayerElevationInfo = __esri.SceneLayerElevationInfo;
 
+  export import StreamLayerFilter = __esri.StreamLayerFilter;
+
+  export import StreamLayerPurgeOptions = __esri.StreamLayerPurgeOptions;
+
+  export import StreamLayerUpdateFilterFilterChanges = __esri.StreamLayerUpdateFilterFilterChanges;
+
   export import VectorTileLayerCurrentStyleInfo = __esri.VectorTileLayerCurrentStyleInfo;
 
   export import CodedValueDomainCodedValues = __esri.CodedValueDomainCodedValues;
@@ -7004,6 +8469,8 @@ declare module "esri" {
 
   export import UniqueValueRendererUniqueValueInfos = __esri.UniqueValueRendererUniqueValueInfos;
 
+  export import PointCloudRendererPointSizeAlgorithm = __esri.PointCloudRendererPointSizeAlgorithm;
+
   export import PointCloudClassBreaksRendererColorClassBreakInfos = __esri.PointCloudClassBreaksRendererColorClassBreakInfos;
 
   export import PointCloudStretchRendererStops = __esri.PointCloudStretchRendererStops;
@@ -7042,6 +8509,102 @@ declare module "esri" {
 
   export import QueryQuantizationParameters = __esri.QueryQuantizationParameters;
 
+  export import ConfigurationTaskGetDataWorkspaceDetailsParams = __esri.ConfigurationTaskGetDataWorkspaceDetailsParams;
+
+  export import ConfigurationTaskGetUserJobQueryDetailsParams = __esri.ConfigurationTaskGetUserJobQueryDetailsParams;
+
+  export import JobTaskAddEmbeddedAttachmentParams = __esri.JobTaskAddEmbeddedAttachmentParams;
+
+  export import JobTaskAddLinkedAttachmentParams = __esri.JobTaskAddLinkedAttachmentParams;
+
+  export import JobTaskAddLinkedRecordParams = __esri.JobTaskAddLinkedRecordParams;
+
+  export import JobTaskAssignJobsParams = __esri.JobTaskAssignJobsParams;
+
+  export import JobTaskCloseJobsParams = __esri.JobTaskCloseJobsParams;
+
+  export import JobTaskCreateDependencyParams = __esri.JobTaskCreateDependencyParams;
+
+  export import JobTaskCreateHoldParams = __esri.JobTaskCreateHoldParams;
+
+  export import JobTaskCreateJobVersionParams = __esri.JobTaskCreateJobVersionParams;
+
+  export import JobTaskDeleteAttachmentParams = __esri.JobTaskDeleteAttachmentParams;
+
+  export import JobTaskDeleteDependencyParams = __esri.JobTaskDeleteDependencyParams;
+
+  export import JobTaskDeleteJobsParams = __esri.JobTaskDeleteJobsParams;
+
+  export import JobTaskDeleteLinkedRecordParams = __esri.JobTaskDeleteLinkedRecordParams;
+
+  export import JobTaskGetAttachmentContentUrlParams = __esri.JobTaskGetAttachmentContentUrlParams;
+
+  export import JobTaskListFieldValuesParams = __esri.JobTaskListFieldValuesParams;
+
+  export import JobTaskListMultiLevelFieldValuesParams = __esri.JobTaskListMultiLevelFieldValuesParams;
+
+  export import JobTaskLogActionParams = __esri.JobTaskLogActionParams;
+
+  export import JobTaskQueryJobsParams = __esri.JobTaskQueryJobsParams;
+
+  export import JobTaskQueryMultiLevelSelectedValuesParams = __esri.JobTaskQueryMultiLevelSelectedValuesParams;
+
+  export import JobTaskReleaseHoldParams = __esri.JobTaskReleaseHoldParams;
+
+  export import JobTaskReopenClosedJobsParams = __esri.JobTaskReopenClosedJobsParams;
+
+  export import JobTaskSearchJobsParams = __esri.JobTaskSearchJobsParams;
+
+  export import JobTaskUnassignJobsParams = __esri.JobTaskUnassignJobsParams;
+
+  export import JobTaskUpdateNotesParams = __esri.JobTaskUpdateNotesParams;
+
+  export import JobTaskUpdateRecordParams = __esri.JobTaskUpdateRecordParams;
+
+  export import NotificationTaskAddChangeRuleParams = __esri.NotificationTaskAddChangeRuleParams;
+
+  export import NotificationTaskDeleteChangeRuleParams = __esri.NotificationTaskDeleteChangeRuleParams;
+
+  export import NotificationTaskNotifySessionParams = __esri.NotificationTaskNotifySessionParams;
+
+  export import NotificationTaskQueryChangeRulesParams = __esri.NotificationTaskQueryChangeRulesParams;
+
+  export import NotificationTaskRunSpatialNotificationOnHistoryParams = __esri.NotificationTaskRunSpatialNotificationOnHistoryParams;
+
+  export import NotificationTaskSendNotificationParams = __esri.NotificationTaskSendNotificationParams;
+
+  export import NotificationTaskSubscribeToNotificationParams = __esri.NotificationTaskSubscribeToNotificationParams;
+
+  export import NotificationTaskUnsubscribeFromNotificationParams = __esri.NotificationTaskUnsubscribeFromNotificationParams;
+
+  export import ReportTaskGenerateReportParams = __esri.ReportTaskGenerateReportParams;
+
+  export import ReportTaskGetReportContentUrlParams = __esri.ReportTaskGetReportContentUrlParams;
+
+  export import ReportTaskGetReportDataParams = __esri.ReportTaskGetReportDataParams;
+
+  export import TokenTaskParseTokensParams = __esri.TokenTaskParseTokensParams;
+
+  export import WorkflowTaskCanRunStepParams = __esri.WorkflowTaskCanRunStepParams;
+
+  export import WorkflowTaskExecuteStepsParams = __esri.WorkflowTaskExecuteStepsParams;
+
+  export import WorkflowTaskGetStepDescriptionParams = __esri.WorkflowTaskGetStepDescriptionParams;
+
+  export import WorkflowTaskGetStepFileUrlParams = __esri.WorkflowTaskGetStepFileUrlParams;
+
+  export import WorkflowTaskGetStepParams = __esri.WorkflowTaskGetStepParams;
+
+  export import WorkflowTaskMarkStepsAsDoneParams = __esri.WorkflowTaskMarkStepsAsDoneParams;
+
+  export import WorkflowTaskMoveToNextStepParams = __esri.WorkflowTaskMoveToNextStepParams;
+
+  export import WorkflowTaskRecreateWorkflowParams = __esri.WorkflowTaskRecreateWorkflowParams;
+
+  export import WorkflowTaskResolveConflictParams = __esri.WorkflowTaskResolveConflictParams;
+
+  export import WorkflowTaskSetCurrentStepParams = __esri.WorkflowTaskSetCurrentStepParams;
+
   export import MapViewConstraints = __esri.MapViewConstraints;
 
   export import MapViewGoToOptions = __esri.MapViewGoToOptions;
@@ -7124,6 +8687,10 @@ declare module "esri" {
 
   export import configRequestProxyRules = __esri.configRequestProxyRules;
 
+  export import configWorkers = __esri.configWorkers;
+
+  export import configWorkersLoaderConfig = __esri.configWorkersLoaderConfig;
+
   export import requestEsriRequestOptions = __esri.requestEsriRequestOptions;
 
   export import urlUtilsAddProxyRuleRule = __esri.urlUtilsAddProxyRuleRule;
@@ -7144,9 +8711,9 @@ declare module "esri" {
 
   export import sizeCreateContinuousRendererParamsLegendOptions = __esri.sizeCreateContinuousRendererParamsLegendOptions;
 
-  export import sizeCreateVisualVariableParams = __esri.sizeCreateVisualVariableParams;
+  export import sizeCreateVisualVariablesParams = __esri.sizeCreateVisualVariablesParams;
 
-  export import sizeCreateVisualVariableParamsLegendOptions = __esri.sizeCreateVisualVariableParamsLegendOptions;
+  export import sizeCreateVisualVariablesParamsLegendOptions = __esri.sizeCreateVisualVariablesParamsLegendOptions;
 
   export import univariateColorSizeCreateContinuousRendererParams = __esri.univariateColorSizeCreateContinuousRendererParams;
 
@@ -7351,6 +8918,11 @@ declare module "esri/layers/FeatureLayer" {
   export = FeatureLayer;
 }
 
+declare module "esri/layers/GeoRSSLayer" {
+  import GeoRSSLayer = __esri.GeoRSSLayer;
+  export = GeoRSSLayer;
+}
+
 declare module "esri/layers/GraphicsLayer" {
   import GraphicsLayer = __esri.GraphicsLayer;
   export = GraphicsLayer;
@@ -7571,6 +9143,11 @@ declare module "esri/renderers/PointCloudUniqueValueRenderer" {
   export = PointCloudUniqueValueRenderer;
 }
 
+declare module "esri/support/Action" {
+  import Action = __esri.Action;
+  export = Action;
+}
+
 declare module "esri/symbols/ExtrudeSymbol3DLayer" {
   import ExtrudeSymbol3DLayer = __esri.ExtrudeSymbol3DLayer;
   export = ExtrudeSymbol3DLayer;
@@ -7961,6 +9538,36 @@ declare module "esri/tasks/support/TrimExtendParameters" {
   export = TrimExtendParameters;
 }
 
+declare module "esri/tasks/workflow/ConfigurationTask" {
+  import ConfigurationTask = __esri.ConfigurationTask;
+  export = ConfigurationTask;
+}
+
+declare module "esri/tasks/workflow/JobTask" {
+  import JobTask = __esri.JobTask;
+  export = JobTask;
+}
+
+declare module "esri/tasks/workflow/NotificationTask" {
+  import NotificationTask = __esri.NotificationTask;
+  export = NotificationTask;
+}
+
+declare module "esri/tasks/workflow/ReportTask" {
+  import ReportTask = __esri.ReportTask;
+  export = ReportTask;
+}
+
+declare module "esri/tasks/workflow/TokenTask" {
+  import TokenTask = __esri.TokenTask;
+  export = TokenTask;
+}
+
+declare module "esri/tasks/workflow/WorkflowTask" {
+  import WorkflowTask = __esri.WorkflowTask;
+  export = WorkflowTask;
+}
+
 declare module "esri/views/MapView" {
   import MapView = __esri.MapView;
   export = MapView;
@@ -8001,6 +9608,11 @@ declare module "esri/views/layers/ImageryLayerView" {
   export = ImageryLayerView;
 }
 
+declare module "esri/views/layers/SceneLayerView" {
+  import SceneLayerView = __esri.SceneLayerView;
+  export = SceneLayerView;
+}
+
 declare module "esri/views/ui/UI" {
   import UI = __esri.UI;
   export = UI;
@@ -8046,6 +9658,11 @@ declare module "esri/widgets/Attribution" {
   export = Attribution;
 }
 
+declare module "esri/widgets/BasemapGallery" {
+  import BasemapGallery = __esri.BasemapGallery;
+  export = BasemapGallery;
+}
+
 declare module "esri/widgets/BasemapToggle" {
   import BasemapToggle = __esri.BasemapToggle;
   export = BasemapToggle;
@@ -8061,6 +9678,11 @@ declare module "esri/widgets/Compass" {
   export = Compass;
 }
 
+declare module "esri/widgets/Expand" {
+  import Expand = __esri.Expand;
+  export = Expand;
+}
+
 declare module "esri/widgets/Home" {
   import Home = __esri.Home;
   export = Home;
@@ -8096,6 +9718,11 @@ declare module "esri/widgets/Print" {
   export = Print;
 }
 
+declare module "esri/widgets/ScaleBar" {
+  import ScaleBar = __esri.ScaleBar;
+  export = ScaleBar;
+}
+
 declare module "esri/widgets/Search" {
   import Search = __esri.Search;
   export = Search;
@@ -8131,6 +9758,11 @@ declare module "esri/widgets/Attribution/AttributionViewModel" {
   export = AttributionViewModel;
 }
 
+declare module "esri/widgets/BasemapGallery/BasemapGalleryViewModel" {
+  import BasemapGalleryViewModel = __esri.BasemapGalleryViewModel;
+  export = BasemapGalleryViewModel;
+}
+
 declare module "esri/widgets/BasemapToggle/BasemapToggleViewModel" {
   import BasemapToggleViewModel = __esri.BasemapToggleViewModel;
   export = BasemapToggleViewModel;
@@ -8141,6 +9773,11 @@ declare module "esri/widgets/Compass/CompassViewModel" {
   export = CompassViewModel;
 }
 
+declare module "esri/widgets/Expand/ExpandViewModel" {
+  import ExpandViewModel = __esri.ExpandViewModel;
+  export = ExpandViewModel;
+}
+
 declare module "esri/widgets/Home/HomeViewModel" {
   import HomeViewModel = __esri.HomeViewModel;
   export = HomeViewModel;
@@ -8151,6 +9788,11 @@ declare module "esri/widgets/LayerList/LayerListViewModel" {
   export = LayerListViewModel;
 }
 
+declare module "esri/widgets/LayerList/ListItem" {
+  import ListItem = __esri.ListItem;
+  export = ListItem;
+}
+
 declare module "esri/widgets/Locate/LocateViewModel" {
   import LocateViewModel = __esri.LocateViewModel;
   export = LocateViewModel;
@@ -8171,6 +9813,11 @@ declare module "esri/widgets/Popup/PopupViewModel" {
   export = PopupViewModel;
 }
 
+declare module "esri/widgets/ScaleBar/ScaleBarViewModel" {
+  import ScaleBarViewModel = __esri.ScaleBarViewModel;
+  export = ScaleBarViewModel;
+}
+
 declare module "esri/widgets/Search/SearchViewModel" {
   import SearchViewModel = __esri.SearchViewModel;
   export = SearchViewModel;
@@ -8266,6 +9913,11 @@ declare module "esri/views/DOMContainer" {
   export = DOMContainer;
 }
 
+declare module "esri/widgets/Widgette" {
+  import Widgette = __esri.Widgette;
+  export = Widgette;
+}
+
 declare module "esri/widgets/support/GeolocationPositioning" {
   import GeolocationPositioning = __esri.GeolocationPositioning;
   export = GeolocationPositioning;
@@ -8296,6 +9948,11 @@ declare module "esri/core/promiseUtils" {
   export = promiseUtils;
 }
 
+declare module "esri/core/requireUtils" {
+  import requireUtils = __esri.requireUtils;
+  export = requireUtils;
+}
+
 declare module "esri/core/urlUtils" {
   import urlUtils = __esri.urlUtils;
   export = urlUtils;
@@ -8331,6 +9988,11 @@ declare module "esri/geometry/support/jsonUtils" {
   export = jsonUtils;
 }
 
+declare module "esri/geometry/support/normalizeUtils" {
+  import normalizeUtils = __esri.normalizeUtils;
+  export = normalizeUtils;
+}
+
 declare module "esri/geometry/support/webMercatorUtils" {
   import webMercatorUtils = __esri.webMercatorUtils;
   export = webMercatorUtils;
@@ -8391,11 +10053,6 @@ declare module "esri/renderers/support/jsonUtils" {
   export = supportJsonUtils;
 }
 
-declare module "esri/support/Action" {
-  import Action = __esri.Action;
-  export = Action;
-}
-
 declare module "esri/symbols/support/jsonUtils" {
   import symbolsSupportJsonUtils = __esri.symbolsSupportJsonUtils;
   export = symbolsSupportJsonUtils;
@@ -8411,7 +10068,17 @@ declare module "esri/widgets/support/widget" {
   export = widget;
 }
 
-declare module "esri/widgets/LayerList/ListItem" {
-  import ListItem = __esri.ListItem;
-  export = ListItem;
+declare module "esri/widgets/BasemapGallery/BasemapGalleryItem" {
+  import BasemapGalleryItem = __esri.BasemapGalleryItem;
+  export = BasemapGalleryItem;
 }
+
+declare module "esri/widgets/BasemapGallery/support/LocalBasemapsSource" {
+  import LocalBasemapsSource = __esri.LocalBasemapsSource;
+  export = LocalBasemapsSource;
+}
+
+declare module "esri/widgets/BasemapGallery/support/PortalBasemapsSource" {
+  import PortalBasemapsSource = __esri.PortalBasemapsSource;
+  export = PortalBasemapsSource;
+}
\ No newline at end of file
diff --git a/archiver/archiver-tests.ts b/archiver/archiver-tests.ts
index d79b29f079..f186fb9bcb 100644
--- a/archiver/archiver-tests.ts
+++ b/archiver/archiver-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import Archiver = require('archiver');
 import FS = require('fs');
 
diff --git a/async/index.d.ts b/async/index.d.ts
index e3fbe7e512..62e047b209 100644
--- a/async/index.d.ts
+++ b/async/index.d.ts
@@ -6,17 +6,16 @@
 interface Dictionary<T> { [key: string]: T; }
 
 interface ErrorCallback<T> { (err?: T): void; }
-interface AsyncWaterfallCallback<E> { (err: E, ...args: any[]): void; }
-interface AsyncBooleanResultCallback<E> { (err: E, truthValue: boolean): void; }
-interface AsyncResultCallback<T, E> { (err: E, result: T): void; }
-interface AsyncResultArrayCallback<T, E> { (err: E, results: T[]): void; }
-interface AsyncResultObjectCallback<T, E> { (err: E, results: Dictionary<T>): void; }
+interface AsyncBooleanResultCallback<E> { (err?: E, truthValue?: boolean): void; }
+interface AsyncResultCallback<T, E> { (err?: E, result?: T): void; }
+interface AsyncResultArrayCallback<T, E> { (err?: E, results?: (T | undefined)[]): void; }
+interface AsyncResultObjectCallback<T, E> { (err: E | undefined, results: Dictionary<T | undefined>): void; }
 
 interface AsyncFunction<T, E> { (callback: (err?: E, result?: T) => void): void; }
 interface AsyncIterator<T, E> { (item: T, callback: ErrorCallback<E>): void; }
 interface AsyncForEachOfIterator<T, E> { (item: T, key: number|string, callback: ErrorCallback<E>): void; }
 interface AsyncResultIterator<T, R, E> { (item: T, callback: AsyncResultCallback<R, E>): void; }
-interface AsyncMemoIterator<T, R, E> { (memo: R, item: T, callback: AsyncResultCallback<R, E>): void; }
+interface AsyncMemoIterator<T, R, E> { (memo: R | undefined, item: T, callback: AsyncResultCallback<R, E>): void; }
 interface AsyncBooleanIterator<T, E> { (item: T, callback: AsyncBooleanResultCallback<E>): void; }
 
 interface AsyncWorker<T, E> { (task: T, callback: ErrorCallback<E>): void; }
@@ -76,7 +75,7 @@ interface AsyncPriorityQueue<T> {
 
 interface AsyncCargo {
     length(): number;
-    payload: number;
+    payload?: number;
     push(task: any, callback? : Function): void;
     push(task: any[], callback? : Function): void;
     saturated(): void;
@@ -175,7 +174,7 @@ interface Async {
     during<E>(test: (testCallback : AsyncBooleanResultCallback<E>) => void, fn: AsyncVoidFunction<E>, callback: ErrorCallback<E>): void;
     doDuring<E>(fn: AsyncVoidFunction<E>, test: (testCallback: AsyncBooleanResultCallback<E>) => void, callback: ErrorCallback<E>): void;
     forever<E>(next: (next : ErrorCallback<E>) => void, errBack: ErrorCallback<E>) : void;
-    waterfall<T, E>(tasks: Function[], callback?: AsyncResultCallback<T,E>): void;
+    waterfall<T, E>(tasks: Function[], callback?: AsyncResultCallback<T, E | Error>): void;
     compose(...fns: Function[]): Function;
     seq(...fns: Function[]): Function;
     applyEach(fns: Function[], argsAndCallback: any[]): void;           // applyEach(fns, args..., callback). TS does not support ... for a middle argument. Callback is optional.
@@ -186,29 +185,30 @@ interface Async {
     cargo<E>(worker : (tasks: any[], callback : ErrorCallback<E>) => void, payload? : number) : AsyncCargo;
     auto<E>(tasks: any, concurrency?: number, callback?: AsyncResultCallback<any, E>): void;
     autoInject<E>(tasks: any, callback?: AsyncResultCallback<any, E>): void;
-    retry<T, E>(opts: number, task: (callback : AsyncResultCallback<T, E>, results: any) => void, callback:  AsyncResultCallback<any, E>): void;
-    retry<T, E>(opts: { times: number, interval: number|((retryCount: number) => number) }, task: (callback: AsyncResultCallback<T, E>, results : any) => void, callback:  AsyncResultCallback<any, E>): void;
-    retryable<T, E>(opts: number | {times: number, interval: number}, task: AsyncFunction<T, E>): AsyncFunction<T, E>;
-    apply<E>(fn: Function, ...arguments: any[]): AsyncFunction<any,E>;
+    retry<T, E>(opts: number, task: (callback : AsyncResultCallback<T, E>, results: any) => void, callback:  AsyncResultCallback<any, E | Error>): void;
+    retry<T, E>(opts: { times: number, interval: number|((retryCount: number) => number) }, task: (callback: AsyncResultCallback<T, E>, results : any) => void, callback:  AsyncResultCallback<any, E | Error>): void;
+    retryable<T, E>(opts: number | {times: number, interval: number}, task: AsyncFunction<T, E>): AsyncFunction<T, E | Error>;
+    apply<E>(fn: Function, ...arguments: any[]): AsyncFunction<any,E | Error>;
     nextTick(callback: Function, ...args: any[]): void;
     setImmediate: typeof async.nextTick;
 
-    reflect<T, E>(fn: AsyncFunction<T, E>) : (callback: (err: void, result: {error?: Error, value?: T}) => void) => void;
-    reflectAll<T, E>(tasks: AsyncFunction<T, E>[]): ((callback: (err: void, result: {error?: Error, value?: T}) => void) => void)[];
+    reflect<T, E>(fn: AsyncFunction<T, E>) : (callback: (err: null, result: {error?: E, value?: T}) => void) => void;
+    reflectAll<T, E>(tasks: AsyncFunction<T, E>[]): ((callback: (err: null, result: {error?: E, value?: T}) => void) => void)[];
 
-    timeout<T, E>(fn: AsyncFunction<T, E>, milliseconds: number, info?: any): AsyncFunction<T, E>;
-    timeout<T, R, E>(fn: AsyncResultIterator<T, R, E>, milliseconds: number, info?: any): AsyncResultIterator<T, R, E>;
+    timeout<T, E>(fn: AsyncFunction<T, E>, milliseconds: number, info?: any): AsyncFunction<T, E | Error>;
+    timeout<T, R, E>(fn: AsyncResultIterator<T, R, E>, milliseconds: number, info?: any): AsyncResultIterator<T, R, E | Error>;
 
     times<T, E> (n: number, iterator: AsyncResultIterator<number, T, E>, callback: AsyncResultArrayCallback<T, E>): void;
     timesSeries<T, E>(n: number, iterator: AsyncResultIterator<number, T, E>, callback: AsyncResultArrayCallback<T, E>): void;
     timesLimit<T, E>(n: number, limit: number, iterator: AsyncResultIterator<number, T, E>, callback: AsyncResultArrayCallback<T, E>): void;
 
-    transform<T, R, E>(arr: T[], iteratee: (acc: R[], item: T, key: string, callback: (error?: E) => void) => void): void;
-    transform<T, R, E>(arr: T[], acc: R[], iteratee: (acc: R[], item: T, key: string, callback: (error?: E) => void) => void): void;
-    transform<T, R, E>(arr: {[key: string] : T}, iteratee: (acc: {[key: string] : R}, item: T, key: string, callback: (error?: E) => void) => void): void;
-    transform<T, R, E>(arr: {[key: string] : T}, acc: {[key: string] : R}, iteratee: (acc: {[key: string] : R}, item: T, key: string, callback: (error?: E) => void) => void): void;
+    transform<T, R, E>(arr: T[], iteratee: (acc: R[], item: T, key: number, callback: (error?: E) => void) => void, callback?: AsyncResultArrayCallback<T, E>): void;
+    transform<T, R, E>(arr: T[], acc: R[], iteratee: (acc: R[], item: T, key: number, callback: (error?: E) => void) => void, callback?: AsyncResultArrayCallback<T, E>): void;
 
-    race<T, E>(tasks: (AsyncFunction<T, E>)[], callback: AsyncResultCallback<T, E>) : void;
+    transform<T, R, E>(arr: {[key: string] : T}, iteratee: (acc: {[key: string] : R}, item: T, key: string, callback: (error?: E) => void) => void, callback?: AsyncResultObjectCallback<T, E>): void;
+    transform<T, R, E>(arr: {[key: string] : T}, acc: {[key: string] : R}, iteratee: (acc: {[key: string] : R}, item: T, key: string, callback: (error?: E) => void) => void, callback?: AsyncResultObjectCallback<T, E>): void;
+
+    race<T, E>(tasks: (AsyncFunction<T, E>)[], callback: AsyncResultCallback<T, E | Error>) : void;
 
     // Utils
     memoize(fn: Function, hasher?: Function): Function;
@@ -226,4 +226,3 @@ declare var async: Async;
 declare module "async" {
     export = async;
 }
-
diff --git a/async/test/explicit.ts b/async/test/explicit.ts
index 80343cf6b1..b9ea9c84ed 100644
--- a/async/test/explicit.ts
+++ b/async/test/explicit.ts
@@ -1,44 +1,74 @@
 
 
-interface StringCallback { (err: Error, result: string): void; }
+interface StringCallback { (err?: Error, result?: string): void; }
 interface AsyncStringGetter { (callback: StringCallback): void; }
 
 var taskArray: AsyncStringGetter[] = [
     function (callback) {
         setTimeout(function () {
-            callback(null, 'one');
+            callback(undefined, 'one');
         }, 200);
     },
     function (callback) {
         setTimeout(function () {
-            callback(null, 'two');
+            callback(undefined, 'two');
         }, 100);
     },
 ];
 
-async.series(taskArray, function (err, results) { console.log(results[0].match(/o/)) });
-async.parallel(taskArray, function (err, results) { console.log(results[0].match(/o/)) });
-async.parallelLimit(taskArray, 3, function (err, results) { console.log(results[0].match(/o/)) });
+async.series(taskArray, function (err, results) {
+    if (results) {
+        let first = results[0];
+        if (first) {
+            console.log(first.match(/o/))
+        }
+    }
+});
+async.parallel(taskArray, function (err, results) {
+    if (results) {
+        let first = results[0];
+        if (first) {
+            console.log(first.match(/o/))
+        }
+    }
+});
+async.parallelLimit(taskArray, 3, function (err, results) {
+    if (results) {
+        let first = results[0];
+        if (first) {
+            console.log(first.match(/o/))
+        }
+    }
+});
 
 
 interface Lookup<T> { [key: string]: T; }
-interface NumberCallback { (err: Error, result: number): void; }
+interface NumberCallback { (err?: Error, result?: number): void; }
 interface AsyncNumberGetter { (callback: NumberCallback): void; }
 
 var taskDict: Lookup<AsyncNumberGetter> = {
     one: function(callback){
         setTimeout(function(){
-            callback(null, 1);
+            callback(undefined, 1);
         }, 200);
     },
     two: function(callback){
         setTimeout(function(){
-            callback(null, 2);
+            callback(undefined, 2);
         }, 100);
     }
 }
 
-async.series(taskDict, function(err, results) { console.log(results['one'].toFixed(1)) });
-async.parallel(taskDict, function(err, results) { console.log(results['one'].toFixed(1)) });
-async.parallelLimit(taskDict, 3, function(err, results) { console.log(results['one'].toFixed(1)) });
+async.series(taskDict, function(err, results) {
+    let one = results['one'];
+    console.log(one && one.toFixed(1))
+});
+async.parallel(taskDict, function(err, results) {
+    let one = results['one'];
+    console.log(one && one.toFixed(1))
+});
+async.parallelLimit(taskDict, 3, function(err, results) {
+    let one = results['one'];
+    console.log(one && one.toFixed(1))
+});
 
diff --git a/async/test/index.ts b/async/test/index.ts
index 8c6be303e4..b30ca4c7ba 100644
--- a/async/test/index.ts
+++ b/async/test/index.ts
@@ -350,9 +350,9 @@ q2.unshift(['task3', 'task4', 'task5'], function (error) {
 });
 
 
-var aq = async.queue<number, number, Error>(function (level: number, callback: (error : Error, newLevel: number) => void) {
+var aq = async.queue<number, number, Error>(function (level: number, callback: (error?: Error, newLevel?: number) => void) {
     console.log('hello ' + level);
-    callback(null, level+1);
+    callback(undefined, level+1);
 });
 
 aq.push(1, function (err : Error, newLevel : number) {
@@ -807,9 +807,9 @@ async.some<number, Error>({
 
 // timeout
 
-function myFunction1(foo : any, callback: (err : Error, result : any) => void ) : void {
+function myFunction1(foo : any, callback: (err?: Error, result?: any) => void ) : void {
 	console.log(`async.timeout 1 ${foo}`);
-	return callback(null, foo);
+	return callback(undefined, foo);
 }
 var wrapped1 = async.timeout(myFunction1, 1000);
 wrapped1({ bar: 'bar' }, function(err : Error, data : any) {
@@ -817,9 +817,9 @@ wrapped1({ bar: 'bar' }, function(err : Error, data : any) {
 });
 
 
-function myFunction2(callback: (err : Error, result : any) => void ) : void {
+function myFunction2(callback: (err?: Error, result?: any) => void ) : void {
 	console.log(`async.timeout 2`);
-	return callback(null, { bar: 'bar' });
+	return callback(undefined, { bar: 'bar' });
 }
 
 var wrapped2 = async.timeout(myFunction2, 1000);
@@ -827,9 +827,9 @@ wrapped2( function(err : Error, data : any) {
     console.log(`async.timeout 2 end ${data}`);
 });
 
-function myFunction3(callback: (err : Error, result : any) => void ) : void {
+function myFunction3(callback: (err?: Error, result?: any) => void ) : void {
 	console.log(`async.timeout 3`);
-	return callback(null, { bar: 'bar' });
+	return callback(undefined, { bar: 'bar' });
 }
 
 var wrapped3 = async.timeout(myFunction3, 1000, { bar: 'bar' });
diff --git a/async/tsconfig.json b/async/tsconfig.json
index 851293fccf..5b8f42c6d2 100644
--- a/async/tsconfig.json
+++ b/async/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,4 +20,4 @@
         "test/index.ts",
         "test/explicit.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/atom/atom-tests.ts b/atom/atom-tests.ts
index 37b2fb314c..1b141fb492 100644
--- a/atom/atom-tests.ts
+++ b/atom/atom-tests.ts
@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="pathwatcher" />
 
 import path = require("path");
 import _atom = require("atom");
diff --git a/atom/index.d.ts b/atom/index.d.ts
index 7c984bd812..05c9794eec 100644
--- a/atom/index.d.ts
+++ b/atom/index.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: vvakame <https://github.com/vvakame/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="q" />
 /// <reference types="jquery" />
 /// <reference types="space-pen" />
 /// <reference types="emissary" />
@@ -1519,6 +1518,7 @@ declare var atom:AtomCore.IAtom;
 
 declare module "atom" {
 	import spacePen = require("space-pen");
+	import Q = require("q");
 
 	var $:typeof spacePen.$;
 	var $$:typeof spacePen.$$;
diff --git a/atom/tsconfig.json b/atom/tsconfig.json
index 3bb8fe9761..6c1bb13aef 100644
--- a/atom/tsconfig.json
+++ b/atom/tsconfig.json
@@ -12,6 +12,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/aurelia-knockout/aurelia-knockout-tests.ts b/aurelia-knockout/aurelia-knockout-tests.ts
new file mode 100644
index 0000000000..6944ab5889
--- /dev/null
+++ b/aurelia-knockout/aurelia-knockout-tests.ts
@@ -0,0 +1,11 @@
+
+export class ViewModel {
+
+    constructor(private knockoutBindable: KnockoutBindable) {
+    }
+
+    activate(settings: any): void {
+        this.knockoutBindable.applyBindableValues(settings, this);
+        this.knockoutBindable.applyBindableValues(settings, this, true);
+    }
+}
diff --git a/aurelia-knockout/index.d.ts b/aurelia-knockout/index.d.ts
new file mode 100644
index 0000000000..2ccec60b46
--- /dev/null
+++ b/aurelia-knockout/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for aurelia-knockout 2.0
+// Project: https://github.com/code-chris/aurelia-knockout
+// Definitions by: Christian Kotzbauer <https://github.com/code-chris>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare interface KnockoutBindable {
+
+    /**
+     * Applys all values from a data object (usually the activation data) to the corresponding instance fields
+     * in the current view model if they are marked as @bindable. By default all matching values from the data object
+     * are applied. To only apply observable values set the last parameter to `true`. Subscriptions are created
+     * for all Knockout observables in the data object to update the view-model values respectively.
+     *
+     * @param data - the data object
+     * @param target - the target view model
+     * @param applyOnlyObservables - `true` if only observable values should be applied, false by default.
+     */
+  applyBindableValues(data: any, target: any, applyOnlyObservables?: boolean): void;
+}
diff --git a/localforage/tsconfig.json b/aurelia-knockout/tsconfig.json
similarity index 92%
rename from localforage/tsconfig.json
rename to aurelia-knockout/tsconfig.json
index 1e3cbf9e63..aa45dc1157 100644
--- a/localforage/tsconfig.json
+++ b/aurelia-knockout/tsconfig.json
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "localforage-tests.ts"
+        "aurelia-knockout-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/fine-uploader/tslint.json b/aurelia-knockout/tslint.json
similarity index 100%
rename from fine-uploader/tslint.json
rename to aurelia-knockout/tslint.json
diff --git a/auth0/auth0-tests.ts b/auth0/auth0-tests.ts
index 502a72eec1..24a4aad87d 100644
--- a/auth0/auth0-tests.ts
+++ b/auth0/auth0-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="auth0" />
-
 import * as auth0 from 'auth0';
 
 const management = new auth0.ManagementClient({
diff --git a/autobahn/autobahn-tests.ts b/autobahn/autobahn-tests.ts
index 141a43547e..d753e960fe 100644
--- a/autobahn/autobahn-tests.ts
+++ b/autobahn/autobahn-tests.ts
@@ -34,7 +34,7 @@ function test_client() {
         session.publish('com.myapp.hello', ['Hello, world!']);
 
         // 3) register a procedure for remoting
-        session.register('com.myapp.add2', myInstance.add2);
+        session.register('com.myapp.add2', myInstance.add2, { invoke: 'roundrobin' });
 
         // 4) call a remote procedure
         session.call<number>('com.myapp.add2', [2, 3]).then(
diff --git a/autobahn/index.d.ts b/autobahn/index.d.ts
index e93d3c065f..8a37bdf21b 100644
--- a/autobahn/index.d.ts
+++ b/autobahn/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for AutobahnJS v0.9.6
+// Type definitions for AutobahnJS v0.9.7
 // Project: http://autobahn.ws/js/
 // Definitions by: Elad Zelingher <https://github.com/darkl/>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -177,6 +177,7 @@ declare namespace autobahn {
 
     interface IRegisterOptions {
         disclose_caller?: boolean;
+        invoke?: 'single' | 'roundrobin' | 'random' | 'first' | 'last';
     }
 
     export class Connection {
diff --git a/autosize/autosize-tests.ts b/autosize/autosize-tests.ts
index a7eea57a62..fa0988be24 100644
--- a/autosize/autosize-tests.ts
+++ b/autosize/autosize-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="autosize" />
-
 // from a NodeList
 autosize(document.querySelectorAll('textarea'));
 
diff --git a/awesomplete/awesomplete-tests.ts b/awesomplete/awesomplete-tests.ts
index 11abfdcba0..7998dc49e3 100644
--- a/awesomplete/awesomplete-tests.ts
+++ b/awesomplete/awesomplete-tests.ts
@@ -1,3 +1,5 @@
+import * as Awesomplete from 'awesomplete';
+
 var input = document.getElementById("myinput");
 new Awesomplete(input, {list: "#mylist"});
 
@@ -11,45 +13,48 @@ var awesomplete = new Awesomplete(input);
 awesomplete.list = ["Ada", "Java", "JavaScript", "LOLCODE", "Node.js", "Ruby on Rails"];
 
 new Awesomplete(input, {
-	list: [
-		{ label: "Belarus", value: "BY" },
-		{ label: "China", value: "CN" },
-		{ label: "United States", value: "US" }
-	]
+    list: [
+        { label: "Belarus", value: "BY" },
+        { label: "China", value: "CN" },
+        { label: "United States", value: "US" }
+    ]
 });
 
 // Same with arrays:
 new Awesomplete(input, {
-	list: [
-		[ "Belarus", "BY" ],
-		[ "China", "CN" ],
-		[ "United States", "US" ]
-	]
+    list: [
+        [ "Belarus", "BY" ],
+        [ "China", "CN" ],
+        [ "United States", "US" ]
+    ]
 });
 
 new Awesomplete('input[type="email"]', {
-	list: ["aol.com", "att.net", "comcast.net", "facebook.com", "gmail.com", "gmx.com", "googlemail.com", "google.com", "hotmail.com", "hotmail.co.uk", "mac.com", "me.com", "mail.com", "msn.com", "live.com", "sbcglobal.net", "verizon.net", "yahoo.com", "yahoo.co.uk"],
-	data: function (text: string, input: any) {
-		return input.slice(0, input.indexOf("@")) + "@" + text;
-	},
-	filter: Awesomplete.FILTER_STARTSWITH
+    list: ["aol.com", "att.net", "comcast.net", "facebook.com", "gmail.com",
+           "gmx.com", "googlemail.com", "google.com", "hotmail.com",
+           "hotmail.co.uk", "mac.com", "me.com", "mail.com", "msn.com",
+           "live.com", "sbcglobal.net", "verizon.net", "yahoo.com", "yahoo.co.uk"],
+    data: (text: string, input: string) => {
+        return input.slice(0, input.indexOf("@")) + "@" + text;
+    },
+    filter: Awesomplete.FILTER_STARTSWITH
 });
 
 new Awesomplete('input[data-multiple]', {
-	filter: function(text: string, input: any) {
-		return Awesomplete.FILTER_CONTAINS(text, input.match(/[^,]*$/)[0]);
-	},
+    filter: (text: string, input: any) => {
+        return Awesomplete.FILTER_CONTAINS(text, input.match(/[^,]*$/)[0]);
+    },
 
-	replace: function(text: string) {
-		var before = this.input.value.match(/^.+,\s*|/)[0];
-		this.input.value = before + text + ", ";
-	}
+    replace: (text: string) => {
+        var before = this.input.value.match(/^.+,\s*|/)[0];
+        this.input.value = before + text + ", ";
+    }
 });
 
 var ajax = new XMLHttpRequest();
 ajax.open("GET", "https://restcountries.eu/rest/v1/lang/fr", true);
-ajax.onload = function() {
-	var list = JSON.parse(ajax.responseText).map(function(i: any) { return i.name; });
-	new Awesomplete(document.querySelector("#ajax-example input"),{ list: list });
+ajax.onload = () => {
+    var list = JSON.parse(ajax.responseText).map((i: any) => { return i.name; });
+    new Awesomplete(document.querySelector("#ajax-example input"), { list: list });
 };
-ajax.send();
\ No newline at end of file
+ajax.send();
diff --git a/awesomplete/index.d.ts b/awesomplete/index.d.ts
index d39389f008..9b8976cfd1 100644
--- a/awesomplete/index.d.ts
+++ b/awesomplete/index.d.ts
@@ -1,49 +1,57 @@
-// Type definitions for Awesomplete v1.1.0
+// Type definitions for Awesomplete 1.1
 // Project: https://leaverou.github.io/awesomplete/
-// Definitions by: webbiesdk <https://github.com/webbiesdk/>, Ben Dixon <https://github.com/bmdixon/>
+// Definitions by: webbiesdk <https://github.com/webbiesdk/>, Ben Dixon <https://github.com/bmdixon/>, Trevor Bekolay <https://github.com/tbekolay/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare class Awesomplete {
-	constructor(input: Element | HTMLElement | string, o?: AwesompleteOptions);
-	static all: Array<any>;
-	static $$: (expr: string | NodeSelector, con?: any) => NodeList;
-	static ITEM: (text: string, input: string) => HTMLElement;
-	static $: {
-		(expr: string|Element, con?: NodeSelector): string | Element;
-		regExpEscape: (s: { replace: (arg0: RegExp, arg1: string) => void }) => any;
-		create: (tag: string, o: any) => HTMLElement;
-		fire: (target: EventTarget, type: string, properties: any) => any;
-		siblingIndex: (el: Element) => number;
-	};
-	static FILTER_STARTSWITH: (text: string, input: string) => boolean;
-	static FILTER_CONTAINS: (text: string, input: string) => boolean;
-	static SORT_BYLENGTH: (a: number | any[], b: number | any[]) => number;
-	static REPLACE: (text: any) => void;
-	next: () => void;
-	container: HTMLElement;
-	select: (selected?: HTMLElement, originalTarget?: HTMLElement) => void;
-	previous: () => void;
-	index: number;
-	opened: number;
-	list: string | string[] | Element | { label: string, value: any }[] | [string, string][];
-	input: HTMLElement | string;
-	goto: (i: number) => void;
-	ul: HTMLElement;
-	close: () => void;
-	evaluate: () => void;
-	selected: boolean;
-	open: () => void;
-	status: HTMLElement;
+    constructor(input: Element | HTMLElement | string, o?: Awesomplete.Options);
+    static all: any[];
+    static $$: (expr: string | NodeSelector, con?: any) => NodeList;
+    static ITEM: (text: string, input: string) => HTMLElement;
+    static $: {
+        (expr: string|Element, con?: NodeSelector): string | Element;
+        regExpEscape: (s: { replace: (arg0: RegExp, arg1: string) => void }) => any;
+        create: (tag: string, o: any) => HTMLElement;
+        fire: (target: EventTarget, type: string, properties: any) => any;
+        siblingIndex: (el: Element) => number;
+    };
+    static FILTER_STARTSWITH: (text: string, input: string) => boolean;
+    static FILTER_CONTAINS: (text: string, input: string) => boolean;
+    static SORT_BYLENGTH: (left: number | any[], right: number | any[]) => number;
+    static REPLACE: (text: string) => void;
+    static DATA: (item: Awesomplete.Suggestion) => Awesomplete.Suggestion;
+    next: () => void;
+    container: HTMLElement;
+    select: (selected?: HTMLElement, originalTarget?: HTMLElement) => void;
+    previous: () => void;
+    index: number;
+    opened: number;
+    list: string | Element | Awesomplete.Suggestion[];
+    input: HTMLElement | string;
+    goto: (i: number) => void;
+    ul: HTMLElement;
+    close: () => void;
+    evaluate: () => void;
+    selected: boolean;
+    open: () => void;
+    status: HTMLElement;
 }
 
-interface AwesompleteOptions {
-	list?: string | string[] | Element | { label: string, value: any }[] | [string, string][];
-	minChars?: Number;
-	maxItems?: Number;
-	autoFirst?: boolean;
-    data?: Function;
-	filter?: Function;
-	sort?: Function;
-	item?: Function;
-	replace?: Function;
+declare namespace Awesomplete {
+    type Suggestion = string | {label: string | any, value: string | any} | [string, string];
+
+    interface Options {
+        list?: string | string[] | Element | { label: string, value: any }[] | [string, string][];
+        minChars?: number;
+        maxItems?: number;
+        autoFirst?: boolean;
+        data?: (item: Suggestion, input: string) => string;
+        filter?: (text: string, input: string) => boolean;
+        sort?: (left: number | any[], right: number | any[]) => number;
+        item?: (text: string, input: string) => HTMLElement;
+        replace?: (text: string) => void;
+    }
 }
+
+export = Awesomplete;
+export as namespace Awesomplete;
diff --git a/service_worker_api/tslint.json b/awesomplete/tslint.json
similarity index 100%
rename from service_worker_api/tslint.json
rename to awesomplete/tslint.json
diff --git a/aws-lambda/aws-lambda-tests.ts b/aws-lambda/aws-lambda-tests.ts
index fb09beda8a..1ffdb2980b 100644
--- a/aws-lambda/aws-lambda-tests.ts
+++ b/aws-lambda/aws-lambda-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="aws-lambda" />
-
 var str: string = "any string";
 var date: Date = new Date();
 var anyObj: any = { abc: 123 };
@@ -13,6 +11,12 @@ var clientContextClient: AWSLambda.ClientContextClient;
 var context: AWSLambda.Context;
 var identity: AWSLambda.CognitoIdentity;
 var proxyResult: AWSLambda.ProxyResult;
+var snsEvt: AWSLambda.SNSEvent;
+var snsEvtRecs: Array<AWSLambda.SNSEventRecord>;
+var snsEvtRec: AWSLambda.SNSEventRecord;
+var snsMsg: AWSLambda.SNSMessage;
+var snsMsgAttr: AWSLambda.SNSMessageAttribute;
+var snsMsgAttrs: AWSLambda.SNSMessageAttributes;
 
 /* API Gateway Event */
 str = apiGwEvt.body;
@@ -44,9 +48,36 @@ str = apiGwEvt.requestContext.resourceId;
 str = apiGwEvt.requestContext.resourcePath;
 str = apiGwEvt.resource;
 
+/* SNS Event */
+snsEvtRecs = snsEvt.Records;
+
+str = snsEvtRec.EventSource;
+str = snsEvtRec.EventSubscriptionArn;
+str = snsEvtRec.EventVersion;
+snsMsg = snsEvtRec.Sns;
+
+str = snsMsg.SignatureVersion;
+str = snsMsg.Timestamp;
+str = snsMsg.Signature;
+str = snsMsg.SigningCertUrl;
+str = snsMsg.MessageId;
+str = snsMsg.Message;
+snsMsgAttrs = snsMsg.MessageAttributes;
+str = snsMsg.Type;
+str = snsMsg.UnsubscribeUrl;
+str = snsMsg.TopicArn;
+str = snsMsg.Subject;
+
+snsMsgAttrs["example"] = snsMsgAttr;
+
+str = snsMsgAttr.Type;
+str = snsMsgAttr.Value;
+
 /* Lambda Proxy Result */
 num = proxyResult.statusCode;
-str = proxyResult.headers["example"];
+proxyResult.headers["example"] = str;
+proxyResult.headers["example"] = b;
+proxyResult.headers["example"] = num;
 str = proxyResult.body
 
 /* Context */
diff --git a/aws-lambda/index.d.ts b/aws-lambda/index.d.ts
index e8b70db7bd..83579b4d0d 100644
--- a/aws-lambda/index.d.ts
+++ b/aws-lambda/index.d.ts
@@ -39,6 +39,41 @@ interface APIGatewayEvent {
     resource: string;
 }
 
+// SNS "event"
+interface SNSMessageAttribute {
+    Type: string;
+    Value: string;
+}
+
+interface SNSMessageAttributes {
+    [name: string]: SNSMessageAttribute;
+}
+
+interface SNSMessage {
+    SignatureVersion: string;
+    Timestamp: string;
+    Signature: string;
+    SigningCertUrl: string;
+    MessageId: string;
+    Message: string;
+    MessageAttributes: SNSMessageAttributes;
+    Type: string;
+    UnsubscribeUrl: string;
+    TopicArn: string;
+    Subject: string;
+}
+
+interface SNSEventRecord {
+    EventVersion: string;
+    EventSubscriptionArn: string;
+    EventSource: string;
+    Sns: SNSMessage;
+}
+
+interface SNSEvent {
+    Records: Array<SNSEventRecord>;
+}
+
 // Context
 // http://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-context.html
 interface Context {
@@ -97,7 +132,7 @@ interface ClientContextEnv {
 interface ProxyResult {
     statusCode: number;
     headers?: {
-      [header: string]: string;
+        [header: string]: boolean | number | string;
     },
     body: string;
 }
@@ -110,8 +145,8 @@ interface ProxyResult {
  * @param context – runtime information of the Lambda function that is executing.
  * @param callback – optional callback to return information to the caller, otherwise return value is null.
  */
-export type Handler = (event: any, context: Context, callback?: Callback)  => void;
-export type ProxyHandler = (event: APIGatewayEvent, context: Context, callback?: ProxyCallback)  => void;
+export type Handler = (event: any, context: Context, callback?: Callback) => void;
+export type ProxyHandler = (event: APIGatewayEvent, context: Context, callback?: ProxyCallback) => void;
 
 /**
  * Optional callback parameter.
diff --git a/aws-serverless-express/aws-serverless-express-tests.ts b/aws-serverless-express/aws-serverless-express-tests.ts
index c46056ed25..97d236e043 100644
--- a/aws-serverless-express/aws-serverless-express-tests.ts
+++ b/aws-serverless-express/aws-serverless-express-tests.ts
@@ -1,9 +1,10 @@
-/// <reference types="express"/>
-
 import * as awsServerlessExpress from 'aws-serverless-express';
 import * as express from 'express';
+import { eventContext } from 'aws-serverless-express/middleware';
 
 const app = express();
+app.use(eventContext());
+
 const server = awsServerlessExpress.createServer(app, () => {});
 
 const mockEvent = {
diff --git a/aws-serverless-express/index.d.ts b/aws-serverless-express/index.d.ts
index e4601e6ccd..db49e6ca6b 100644
--- a/aws-serverless-express/index.d.ts
+++ b/aws-serverless-express/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for aws-serverless-express
+// Type definitions for aws-serverless-express 2.1
 // Project: https://github.com/awslabs/aws-serverless-express
-// Definitions by: Ben Speakman <https://github.com/threesquared>
+// Definitions by: Ben Speakman <https://github.com/threesquared>, Josh Caffey <https://github.com/jcaffey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
@@ -16,4 +16,4 @@ export function proxy(
     server: http.Server,
     event: any,
     context: lambda.Context
-): void;
\ No newline at end of file
+): void;
diff --git a/aws-serverless-express/middleware.d.ts b/aws-serverless-express/middleware.d.ts
new file mode 100644
index 0000000000..ff33b4c6ea
--- /dev/null
+++ b/aws-serverless-express/middleware.d.ts
@@ -0,0 +1,8 @@
+import { RequestHandler } from 'express';
+
+export interface Options {
+    reqPropKey?: string;
+    deleteHeaders?: boolean;
+}
+
+export function eventContext(options?: Options): RequestHandler;
diff --git a/aws-serverless-express/tsconfig.json b/aws-serverless-express/tsconfig.json
index a62cead1a1..62885fcda3 100644
--- a/aws-serverless-express/tsconfig.json
+++ b/aws-serverless-express/tsconfig.json
@@ -17,6 +17,7 @@
     },
     "files": [
         "index.d.ts",
+        "middleware.d.ts",
         "aws-serverless-express-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/xmpp-jid/tslint.json b/aws-serverless-express/tslint.json
similarity index 100%
rename from xmpp-jid/tslint.json
rename to aws-serverless-express/tslint.json
diff --git a/axel/axel-tests.ts b/axel/axel-tests.ts
new file mode 100644
index 0000000000..553973b210
--- /dev/null
+++ b/axel/axel-tests.ts
@@ -0,0 +1,7 @@
+
+import * as axel from 'axel';
+
+axel.clear();
+axel.bg(0,255,0);
+axel.line(1,1,10,10);
+axel.cursor.restore();
diff --git a/axel/index.d.ts b/axel/index.d.ts
new file mode 100644
index 0000000000..751e2c33fa
--- /dev/null
+++ b/axel/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for Axel module
+// Project: https://github.com/F1LT3R/axel
+// Definitions by: Ruslan Molodyko <https://github.com/ruslan-molodyko>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class Axel {
+    brush: string;
+    rows: number;
+    cols: number;
+    cursor: cursorInterface;
+
+    lerp(p1: number, p2: number, m: number): number;
+    circ(x: number, y: number, m: number): number;
+    goto(x: number, y: number): void;
+    scrub(x1: number, y1: number, w: number, h: number): void;
+    box(x1: number, y1: number, w: number, h: number): void;
+    point(x: number, y: number, char: string): void;
+    dist(x1: number, y1: number, x2: number, y2: number): number;
+    line(x1: number, y1: number, x2: number, y2: number): void;
+    text(x: number, y: number, text: string): void;
+    fg(r: number, g: number, b: number): void;
+    bg(r: number, g: number, b: number): void;
+    draw(cb: Function): void;
+    clear(): void;
+}
+
+declare interface cursorInterface {
+    on(): void;
+    off(): void;
+    reset(): void;
+    restore(): void;
+}
+
+declare module 'axel' {
+    const instance: Axel;
+    export = instance;
+}
diff --git a/axel/tsconfig.json b/axel/tsconfig.json
new file mode 100644
index 0000000000..0ac3689676
--- /dev/null
+++ b/axel/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": false,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "axel-tests.ts",
+    "index.d.ts"
+  ]
+}
\ No newline at end of file
diff --git a/babel-template/babel-template-tests.ts b/babel-template/babel-template-tests.ts
index b5d4547188..31e3bd44d9 100644
--- a/babel-template/babel-template-tests.ts
+++ b/babel-template/babel-template-tests.ts
@@ -1,7 +1,4 @@
-
 /// <reference types="babel-generator" />
-/// <reference types="babel-types" />
-
 
 // Example from https://github.com/babel/babel/tree/master/packages/babel-template
 import template = require('babel-template');
diff --git a/babel-traverse/babel-traverse-tests.ts b/babel-traverse/babel-traverse-tests.ts
index 3779852c5f..98afbbc0a7 100644
--- a/babel-traverse/babel-traverse-tests.ts
+++ b/babel-traverse/babel-traverse-tests.ts
@@ -1,5 +1,3 @@
-
-/// <reference types="babel-types" />
 /// <reference types="babylon" />
 
 
diff --git a/babylon/babylon-tests.ts b/babylon/babylon-tests.ts
index bb95625935..769d635e89 100644
--- a/babylon/babylon-tests.ts
+++ b/babylon/babylon-tests.ts
@@ -1,8 +1,3 @@
-
-/// <reference types="babel-types" />
-/// <reference types="babel-types" />
-
-
 // Example from https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md#babylon
 import * as babylon from "babylon";
 declare function assert(expr: boolean): void;
diff --git a/backbone.layoutmanager/backbone.layoutmanager-tests.ts b/backbone.layoutmanager/backbone.layoutmanager-tests.ts
index fe11ce9b18..edddb8352b 100644
--- a/backbone.layoutmanager/backbone.layoutmanager-tests.ts
+++ b/backbone.layoutmanager/backbone.layoutmanager-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 import * as Backbone from 'backbone';
 
 // Example code.
@@ -26,7 +24,7 @@ class View extends Backbone.Layout<Backbone.Model> {
             "mouseleave": "removeElement"
         }
     }
-    
+
     wrapElement(): void {
         this.$el.wrap("<b>");
     }
diff --git a/backbone/backbone-tests.ts b/backbone/backbone-tests.ts
index accdb93979..c074ac57e5 100644
--- a/backbone/backbone-tests.ts
+++ b/backbone/backbone-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery" />
-
 function test_events() {
 
     var object = new Backbone.Events();
diff --git a/bardjs/bardjs-tests.ts b/bardjs/bardjs-tests.ts
index 2d312634ca..91172b7255 100644
--- a/bardjs/bardjs-tests.ts
+++ b/bardjs/bardjs-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="mocha" />
-/// <reference types="chai" />
-
 import * as angular from 'angular';
 import 'angular-mocks';
 
diff --git a/batch-stream/batch-stream-tests.ts b/batch-stream/batch-stream-tests.ts
index d3195466e8..4554530072 100644
--- a/batch-stream/batch-stream-tests.ts
+++ b/batch-stream/batch-stream-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import fs = require('fs');
 import BatchStream = require('batch-stream');
 
diff --git a/bazinga-translator/bazinga-translator-tests.ts b/bazinga-translator/bazinga-translator-tests.ts
index 8c5d1dafa8..3856ff22a1 100644
--- a/bazinga-translator/bazinga-translator-tests.ts
+++ b/bazinga-translator/bazinga-translator-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="bazinga-translator" />
-
 Translator.fallback = 'en';
 Translator.defaultDomain = 'messages';
 
diff --git a/bezier-js/bezier-js-tests.ts b/bezier-js/bezier-js-tests.ts
index f5fba4d947..003b6e1c45 100644
--- a/bezier-js/bezier-js-tests.ts
+++ b/bezier-js/bezier-js-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="bezier-js" />
-
 function test() {
 
     var bezierjs: typeof BezierJs;
diff --git a/big-integer/big-integer-tests.ts b/big-integer/big-integer-tests.ts
index 2ab3c1fad5..62f234b371 100644
--- a/big-integer/big-integer-tests.ts
+++ b/big-integer/big-integer-tests.ts
@@ -113,5 +113,6 @@ isBigInteger = x.times( "100" );
 isNumber = x.toJSNumber();
 
 isString = x.toString();
+isString = x.toString(36);
 
 isNumber = x.valueOf();
diff --git a/big-integer/index.d.ts b/big-integer/index.d.ts
index 452593e950..f8ca2b488c 100644
--- a/big-integer/index.d.ts
+++ b/big-integer/index.d.ts
@@ -195,7 +195,7 @@ interface BigInteger {
     toJSNumber(): number;
 
     /** Converts a bigInt to a string. */
-    toString(): string;
+    toString( radix?: number ): string;
 
     /** Converts a bigInt to a native Javascript number. This override allows you to use native arithmetic operators without explicit conversion. */
     valueOf(): number;
diff --git a/bingmaps/bingmaps-tests.ts b/bingmaps/bingmaps-tests.ts
index 239e33094a..e83ff89aba 100644
--- a/bingmaps/bingmaps-tests.ts
+++ b/bingmaps/bingmaps-tests.ts
@@ -1,10 +1,3 @@
-/// <reference path="Microsoft.Maps.AdvancedShapes.d.ts"/>
-/// <reference path="Microsoft.Maps.Directions.d.ts"/>
-/// <reference path="Microsoft.Maps.Search.d.ts"/>
-/// <reference path="Microsoft.Maps.Themes.BingTheme.d.ts"/>
-/// <reference path="Microsoft.Maps.Traffic.d.ts"/>
-/// <reference path="Microsoft.Maps.VenueMaps.d.ts"/>
-
 namespace BingMapsTests {
 
     // An interactive set of Bing Maps AJAX control usages can be found at http://www.bingmapsportal.com/isdk/ajaxv7
diff --git a/bit-array/bit-array-tests.ts b/bit-array/bit-array-tests.ts
index 7c1ff57b1b..7d50de143c 100644
--- a/bit-array/bit-array-tests.ts
+++ b/bit-array/bit-array-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="bit-array" />
-
 import BitArray = require("bit-array");
 
 const a = new BitArray(32);
diff --git a/blob-stream/blob-stream-tests.ts b/blob-stream/blob-stream-tests.ts
index b9174859f9..40f9888788 100644
--- a/blob-stream/blob-stream-tests.ts
+++ b/blob-stream/blob-stream-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 var bl = require('blob-stream');
 
 var blob = bl.toBlob();
diff --git a/blue-tape/blue-tape-tests.ts b/blue-tape/blue-tape-tests.ts
index 92b2641115..c34bc6e32c 100644
--- a/blue-tape/blue-tape-tests.ts
+++ b/blue-tape/blue-tape-tests.ts
@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /// <reference types="bluebird" />
 
 import tape = require('blue-tape');
diff --git a/bluebird-global/index.d.ts b/bluebird-global/index.d.ts
index e4c4920501..a705222e9d 100644
--- a/bluebird-global/index.d.ts
+++ b/bluebird-global/index.d.ts
@@ -80,6 +80,8 @@ declare global {
         // then: typeof Bluebird.prototype.then;
         thenReturn: typeof Bluebird.prototype.thenReturn;
         thenThrow: typeof Bluebird.prototype.thenThrow;
+        catchReturn: typeof Bluebird.prototype.catchReturn;
+        catchThrow: typeof Bluebird.prototype.catchThrow;
         throw: typeof Bluebird.prototype.throw;
         timeout: typeof Bluebird.prototype.timeout;
         toJSON: typeof Bluebird.prototype.toJSON;
diff --git a/bluebird-retry/bluebird-retry-tests.ts b/bluebird-retry/bluebird-retry-tests.ts
index b63b360160..eb3260a007 100644
--- a/bluebird-retry/bluebird-retry-tests.ts
+++ b/bluebird-retry/bluebird-retry-tests.ts
@@ -1,5 +1,3 @@
-
-/// <reference types="bluebird" />
 import Promise = require('bluebird');
 import retry = require('bluebird-retry');
 
diff --git a/bluebird-retry/index.d.ts b/bluebird-retry/index.d.ts
index 22c7b1c95e..63adc1476d 100644
--- a/bluebird-retry/index.d.ts
+++ b/bluebird-retry/index.d.ts
@@ -17,6 +17,9 @@ declare namespace retry {
         timeout?: number;
         max_tries?: number;
         predicate?: any;
+        throw_original?: boolean;
+        context?: any;
+        args?: any;
     }
 
 }
diff --git a/bluebird/bluebird-tests.ts b/bluebird/bluebird-tests.ts
index c08a7bdc6b..b9fc8d0cef 100644
--- a/bluebird/bluebird-tests.ts
+++ b/bluebird/bluebird-tests.ts
@@ -506,6 +506,15 @@ fooProm = fooProm.thenThrow(err);
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+barProm = fooProm.catchReturn(bar);
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+// fooProm
+fooProm = fooProm.catchThrow(err);
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
 str = fooProm.toString();
 
 obj = fooProm.toJSON();
diff --git a/bluebird/index.d.ts b/bluebird/index.d.ts
index ecacedfd0d..3508a4e742 100644
--- a/bluebird/index.d.ts
+++ b/bluebird/index.d.ts
@@ -248,6 +248,37 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
   throw(reason: Error): Bluebird<R>;
   thenThrow(reason: Error): Bluebird<R>;
 
+  /**
+   * Convenience method for:
+   *
+   * <code>
+   * .catch(function() {
+   *    return value;
+   * });
+   * </code>
+   *
+   * in the case where `value` doesn't change its value. That means `value` is bound at the time of calling `.catchReturn()`
+   */
+  catchReturn<U>(value: U): Bluebird<U>;
+  catchReturn<U>(predicate: (error: any) => boolean, value: U): Bluebird<U | R>;
+  catchReturn<E extends Error, U>(ErrorClass: new (...args: any[]) => E, value: U): Bluebird<U | R>;
+  catchReturn<U>(predicate: Object, value: U): Bluebird<U | R>;
+
+  /**
+   * Convenience method for:
+   *
+   * <code>
+   * .catch(function() {
+   *    throw reason;
+   * });
+   * </code>
+   * Same limitations apply as with `.catchReturn()`.
+   */
+  catchThrow(reason: Error): Bluebird<R>;
+  catchThrow(predicate: (error: any) => boolean, reason: Error): Bluebird<R>;
+  catchThrow<E extends Error, U>(ErrorClass: new (...args: any[]) => E, reason: Error): Bluebird<R>;
+  catchThrow(predicate: Object, reason: Error): Bluebird<R>;
+
   /**
    * Convert to String.
    */
diff --git a/bookshelf/index.d.ts b/bookshelf/index.d.ts
index 4aa6fd38b5..c7947579c8 100644
--- a/bookshelf/index.d.ts
+++ b/bookshelf/index.d.ts
@@ -17,7 +17,7 @@ interface Bookshelf extends Bookshelf.Events<any> {
 	Collection: typeof Bookshelf.Collection;
 
 	plugin(name: string | string[] | Function, options?: any): Bookshelf;
-	transaction<T>(callback: (transaction: knex.Transaction) => T): BlueBird<T>;
+	transaction<T>(callback: (transaction: knex.Transaction) => BlueBird<T>): BlueBird<T>;
 }
 
 declare function Bookshelf(knex: knex): Bookshelf;
diff --git a/bootbox/bootbox-tests.ts b/bootbox/bootbox-tests.ts
index 92a079f456..f5604d5312 100644
--- a/bootbox/bootbox-tests.ts
+++ b/bootbox/bootbox-tests.ts
@@ -6,7 +6,7 @@ bootbox.alert("Are we ok with callback?", function () {
 	console.log("Callback called!");
 });
 bootbox.alert({
-	size: "medium",
+	size: "small",
 	message: "Are we ok with callback and custom button?",
 	callback: function () {
 		console.log("Callback called!");
@@ -38,7 +38,29 @@ bootbox.prompt({
 		console.log(result);
 	}
 });
-
+bootbox.prompt({
+    title: "This is a prompt with a set of checkbox inputs!",
+    inputType: 'checkbox',
+    inputOptions: [
+        {
+            text: 'Choice One',
+            value: '1',
+            group: 'Group 1'
+        },
+        {
+            text: 'Choice Two',
+            value: '2',
+            group: 'Group 1'
+        },
+        {
+            text: 'Choice Three',
+            value: '3'
+        }
+    ],
+    callback: function (result) {
+        console.log(result);
+    }
+});
 
 bootbox.dialog({
 	title: "Wassup?",
diff --git a/bootbox/index.d.ts b/bootbox/index.d.ts
index 40494d5ca5..28d30e2ba0 100644
--- a/bootbox/index.d.ts
+++ b/bootbox/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Bootbox 4.4.0
 // Project: https://github.com/makeusabrew/bootbox
-// Definitions by: Vincent Bortone <https://github.com/vbortone/>, Kon Pik <https://github.com/konpikwastaken/>, Anup Kattel <https://github.com/kanup/>, Dominik Schroeter <https://github.com/icereed/>, Troy McKinnon <https://github.com/trodi/>
+// Definitions by: Vincent Bortone <https://github.com/vbortone/>, Kon Pik <https://github.com/konpikwastaken/>, Anup Kattel <https://github.com/kanup/>, Dominik Schroeter <https://github.com/icereed/>, Troy McKinnon <https://github.com/trodi/>, Stanny Nuytkens <https://github.com/stannynuytkens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="jquery" />
@@ -15,7 +15,8 @@ interface BootboxBaseOptions {
 	closeButton?: boolean;
 	animate?: boolean;
 	className?: string;
-	size?: string;
+	/** All other values result in medium */
+	size?: "small" | "large";
 	buttons?: BootboxButtonMap; // complex object where each key is of type BootboxButton
 }
 
@@ -40,9 +41,10 @@ interface BootboxConfirmOptions extends BootboxDialogOptions {
 interface BootboxPromptOptions extends BootboxBaseOptions {
 	title: string;
 	value?: string;
-	inputType?: string;
+	inputType?: "text" | "textarea" | "email" | "select" | "checkbox" | "date" | "time" | "number" | "password";
 	callback: (result: string) => any;
 	buttons?: BootboxConfirmPromptButtonMap;
+	inputOptions?: { text: string, value: string, group?: string }[];
 }
 
 /** Bootbox options available when setting defaults for modals */
diff --git a/bootpag/bootpag-tests.ts b/bootpag/bootpag-tests.ts
index 6a5503f9f8..a0a2a78cc3 100644
--- a/bootpag/bootpag-tests.ts
+++ b/bootpag/bootpag-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 var pagerSelector = ".bootpager";
 var $pager = $(pagerSelector);
 
diff --git a/bootstrap-datepicker/bootstrap-datepicker-tests.ts b/bootstrap-datepicker/bootstrap-datepicker-tests.ts
index cedc28c93c..372967ec21 100644
--- a/bootstrap-datepicker/bootstrap-datepicker-tests.ts
+++ b/bootstrap-datepicker/bootstrap-datepicker-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="index.d.ts"/>
 function tests_simple() {
     $('#datepicker').datepicker();
     $('#datepicker').datepicker({
diff --git a/bootstrap-maxlength/bootstrap-maxlength-tests.ts b/bootstrap-maxlength/bootstrap-maxlength-tests.ts
index 32255bc66b..92c3f1b57e 100644
--- a/bootstrap-maxlength/bootstrap-maxlength-tests.ts
+++ b/bootstrap-maxlength/bootstrap-maxlength-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 // Examples from the projects github page
 $('input[maxlength]').maxlength();
 
diff --git a/bootstrap-notify/bootstrap-notify-tests.ts b/bootstrap-notify/bootstrap-notify-tests.ts
index 5ae4f2ffc1..2977d39abf 100644
--- a/bootstrap-notify/bootstrap-notify-tests.ts
+++ b/bootstrap-notify/bootstrap-notify-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="jquery" />
-
 //Test for bootstrap-notify v3.1.3
 //Copied example directly from Bootstrap-notify site
 
diff --git a/bootstrap-select/bootstrap-select-tests.ts b/bootstrap-select/bootstrap-select-tests.ts
index e2e8c88560..55900b3ab7 100644
--- a/bootstrap-select/bootstrap-select-tests.ts
+++ b/bootstrap-select/bootstrap-select-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 $(".selectpicker").selectpicker({
     actionsBox: true,
     container: "body",
diff --git a/bootstrap-slider/bootstrap-slider-tests.ts b/bootstrap-slider/bootstrap-slider-tests.ts
index 98701cedc3..df143d4c72 100644
--- a/bootstrap-slider/bootstrap-slider-tests.ts
+++ b/bootstrap-slider/bootstrap-slider-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 $(function() {
     // examples from http://seiyria.github.io/bootstrap-slider/
 
diff --git a/bootstrap-switch/bootstrap-switch-tests.ts b/bootstrap-switch/bootstrap-switch-tests.ts
index 539399a78e..65fafff2e9 100644
--- a/bootstrap-switch/bootstrap-switch-tests.ts
+++ b/bootstrap-switch/bootstrap-switch-tests.ts
@@ -1,9 +1,6 @@
-/// <reference types="jquery"/>
-
-
 function test_cases() {
 	$('#switch').bootstrapSwitch();
-	
+
 	$('#switch').bootstrapSwitch({
 		state: false
 	});
@@ -15,7 +12,7 @@ function test_cases() {
 
 	//var mySwitch = $('#switch').get(0);
 	//mySwitch.toggleAnimate();
-	
+
 	$('#switch').bootstrapSwitch('state', true, true);
 
 	$('#switch').bootstrapSwitch('state') === true;
diff --git a/bootstrap-touchspin/bootstrap-touchspin-tests.ts b/bootstrap-touchspin/bootstrap-touchspin-tests.ts
index c8a6a713f9..7d1ea73437 100644
--- a/bootstrap-touchspin/bootstrap-touchspin-tests.ts
+++ b/bootstrap-touchspin/bootstrap-touchspin-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 $(function () {
     // Example 1 from http://www.virtuosoft.eu/code/bootstrap-touchspin/
     $("input[name='demo1']").TouchSpin({
@@ -26,7 +23,7 @@ $(function () {
     $("input[name='demo_vertical']").TouchSpin({
         verticalbuttons: true
     });
-    
+
     // Example 4 from http://www.virtuosoft.eu/code/bootstrap-touchspin/
     $("input[name='demo_vertical2']").TouchSpin({
         verticalbuttons: true,
diff --git a/bootstrap-validator/bootstrap-validator-tests.ts b/bootstrap-validator/bootstrap-validator-tests.ts
index 07d4753ed1..e43a094184 100644
--- a/bootstrap-validator/bootstrap-validator-tests.ts
+++ b/bootstrap-validator/bootstrap-validator-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery" />
-
 $('#myForm').validator();
 $('#myForm').validator('update');
 $('#myForm').validator('validate');
diff --git a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts
index 3373bdb9e8..575f72b7cb 100644
--- a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts
+++ b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 import * as moment from "moment";
 
 const dp = $("#picker").datetimepicker().data("DateTimePicker");
diff --git a/bootstrap/bootstrap-tests.ts b/bootstrap/bootstrap-tests.ts
index cef85d5d42..cd786b41a7 100644
--- a/bootstrap/bootstrap-tests.ts
+++ b/bootstrap/bootstrap-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 $('body').off('.data-api');
 $('body').off('.alert.data-api');
 
diff --git a/browser-resolve/browser-resolve-tests.ts b/browser-resolve/browser-resolve-tests.ts
index 2225f7754c..7d08de726f 100644
--- a/browser-resolve/browser-resolve-tests.ts
+++ b/browser-resolve/browser-resolve-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="browser-resolve" />
-
 import * as browserResolve from 'browser-resolve';
 
 function basic_test_async(callback: (err?: Error, resolved?: string) => void) {
diff --git a/bunyan-blackhole/bunyan-blackhole-tests.ts b/bunyan-blackhole/bunyan-blackhole-tests.ts
new file mode 100644
index 0000000000..ef2096a4c8
--- /dev/null
+++ b/bunyan-blackhole/bunyan-blackhole-tests.ts
@@ -0,0 +1,26 @@
+import blackhole = require("bunyan-blackhole");
+
+
+
+var logsLaboursLost = blackhole("lost");
+
+const rotten = new Error("Something is rotten in the state of Denmark");
+
+logsLaboursLost.info(rotten, "Play %s", "Hamlet");
+logsLaboursLost.debug(rotten, "Play %s", "King Lear");
+logsLaboursLost.trace(rotten, "Play %s", "Much Ado About Nothing");
+logsLaboursLost.warn(rotten, "Play %s", "All's Well That Ends Well");
+logsLaboursLost.error(rotten, "Play %s", "Romeo and Juliet");
+
+logsLaboursLost.error("Something is rotten in the state of Denmark");
+
+logsLaboursLost.debug({character: "Marcellus", play: "King Lear"}, "Friends of my soul, you twain");
+logsLaboursLost.trace({play: "All's Well That Ends Well"}, "Love all, trust a few, do wrong to none");
+logsLaboursLost.info({play: "Much Ado About Nothing"}, "Let me be that I am and seek not to alter me.");
+logsLaboursLost.warn({play: "All's Well That Ends Well"}, "Love all, trust a few, do wrong to none");
+logsLaboursLost.error({play: "All's Well That Ends Well"}, "Love all, trust a few, do wrong to none");
+
+var hamlet = logsLaboursLost.child({play: "Hamlet"});
+hamlet.info({character: "Polonius"}, "Though this be madness, yet there is method in't");
+
+
diff --git a/bunyan-blackhole/index.d.ts b/bunyan-blackhole/index.d.ts
new file mode 100644
index 0000000000..f8be6fc730
--- /dev/null
+++ b/bunyan-blackhole/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for bunyan-blackhole 0.2
+// Project: https://github.com/Floby/node-bunyan-blackhole
+// Definitions by: Olivier Chevet <https://github.com/olivr70>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as Logger from "bunyan";
+
+/**
+ * Constructor.
+ * @param {string} [name] name of the blackhole Logger
+ * @return {Logger} A bunyan logger .
+ */
+declare function bunyanBlackHole(name: string): Logger;
+export = bunyanBlackHole;
diff --git a/node-form/tsconfig.json b/bunyan-blackhole/tsconfig.json
similarity index 92%
rename from node-form/tsconfig.json
rename to bunyan-blackhole/tsconfig.json
index 1bb627df73..cddd529d29 100644
--- a/node-form/tsconfig.json
+++ b/bunyan-blackhole/tsconfig.json
@@ -17,6 +17,6 @@
     },
     "files": [
         "index.d.ts",
-        "node-form-tests.ts"
+        "bunyan-blackhole-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/bunyan-blackhole/tslint.json b/bunyan-blackhole/tslint.json
new file mode 100644
index 0000000000..2221e40e4a
--- /dev/null
+++ b/bunyan-blackhole/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
\ No newline at end of file
diff --git a/bunyan/bunyan-tests.ts b/bunyan/bunyan-tests.ts
index 91b45765d1..acf382c7c2 100644
--- a/bunyan/bunyan-tests.ts
+++ b/bunyan/bunyan-tests.ts
@@ -86,26 +86,32 @@ var object = {
     test: 123
 };
 
+log.trace();
 log.trace(buffer);
 log.trace(error);
 log.trace(object);
 log.trace('Hello, %s', 'world!');
+log.debug();
 log.debug(buffer);
 log.debug(error);
 log.debug(object);
 log.debug('Hello, %s', 'world!');
+log.info();
 log.info(buffer);
 log.info(error);
 log.info(object);
 log.info('Hello, %s', 'world!');
+log.warn();
 log.warn(buffer);
 log.warn(error);
 log.warn(object);
 log.warn('Hello, %s', 'world!');
+log.error();
 log.error(buffer);
 log.error(error);
 log.error(object);
 log.error('Hello, %s', 'world!');
+log.fatal();
 log.fatal(buffer);
 log.fatal(error);
 log.fatal(object);
diff --git a/bunyan/index.d.ts b/bunyan/index.d.ts
index 787a0225f1..060fa8eaa3 100644
--- a/bunyan/index.d.ts
+++ b/bunyan/index.d.ts
@@ -22,30 +22,191 @@ declare class Logger extends EventEmitter {
     fields: any;
     src: boolean;
 
+    /**
+     * Returns a boolean: is the `trace` level enabled?
+     * 
+     * This is equivalent to `log.isTraceEnabled()` or `log.isEnabledFor(TRACE)` in log4j.
+     */
+    trace(): boolean;
+
+    /**
+     * Special case to log an `Error` instance to the record.
+     * This adds an `err` field with exception details
+     * (including the stack) and sets `msg` to the exception
+     * message or you can specify the `msg`.
+     */
     trace(error: Error, format?: any, ...params: any[]): void;
+
     trace(buffer: Buffer, format?: any, ...params: any[]): void;
+
+    /**
+     * Uses `util.format` for msg formatting.
+     */
+    trace(format: string | number, ...params: any[]): void;
+
+    /**
+     * The first field can optionally be a "fields" object, which
+     * is merged into the log record.
+     * 
+     * To pass in an Error *and* other fields, use the `err`
+     * field name for the Error instance.
+     */
     trace(obj: Object, format?: any, ...params: any[]): void;
-    trace(format: string, ...params: any[]): void;
+
+    /**
+     * Returns a boolean: is the `debug` level enabled?
+     * 
+     * This is equivalent to `log.isDebugEnabled()` or `log.isEnabledFor(DEBUG)` in log4j.
+     */
+    debug(): boolean;
+
+    /**
+     * Special case to log an `Error` instance to the record.
+     * This adds an `err` field with exception details
+     * (including the stack) and sets `msg` to the exception
+     * message or you can specify the `msg`.
+     */
     debug(error: Error, format?: any, ...params: any[]): void;
+
     debug(buffer: Buffer, format?: any, ...params: any[]): void;
+
+    /**
+     * Uses `util.format` for msg formatting.
+     */
+    debug(format: string | number, ...params: any[]): void;
+
+    /**
+     * The first field can optionally be a "fields" object, which
+     * is merged into the log record.
+     * 
+     * To pass in an Error *and* other fields, use the `err`
+     * field name for the Error instance.
+     */
     debug(obj: Object, format?: any, ...params: any[]): void;
-    debug(format: string, ...params: any[]): void;
+
+    /**
+     * Returns a boolean: is the `info` level enabled?
+     * 
+     * This is equivalent to `log.isInfoEnabled()` or `log.isEnabledFor(INFO)` in log4j.
+     */
+    info(): boolean;
+
+    /**
+     * Special case to log an `Error` instance to the record.
+     * This adds an `err` field with exception details
+     * (including the stack) and sets `msg` to the exception
+     * message or you can specify the `msg`.
+     */
     info(error: Error, format?: any, ...params: any[]): void;
+
     info(buffer: Buffer, format?: any, ...params: any[]): void;
+
+    /**
+     * Uses `util.format` for msg formatting.
+     */
+    info(format: string | number, ...params: any[]): void;
+
+    /**
+     * The first field can optionally be a "fields" object, which
+     * is merged into the log record.
+     * 
+     * To pass in an Error *and* other fields, use the `err`
+     * field name for the Error instance.
+     */
     info(obj: Object, format?: any, ...params: any[]): void;
-    info(format: string, ...params: any[]): void;
+
+    /**
+     * Returns a boolean: is the `warn` level enabled?
+     * 
+     * This is equivalent to `log.isWarnEnabled()` or `log.isEnabledFor(WARN)` in log4j.
+     */
+    warn(): boolean;
+
+    /**
+     * Special case to log an `Error` instance to the record.
+     * This adds an `err` field with exception details
+     * (including the stack) and sets `msg` to the exception
+     * message or you can specify the `msg`.
+     */
     warn(error: Error, format?: any, ...params: any[]): void;
+
     warn(buffer: Buffer, format?: any, ...params: any[]): void;
+
+    /**
+     * Uses `util.format` for msg formatting.
+     */
+    warn(format: string | number, ...params: any[]): void;
+
+    /**
+     * The first field can optionally be a "fields" object, which
+     * is merged into the log record.
+     * 
+     * To pass in an Error *and* other fields, use the `err`
+     * field name for the Error instance.
+     */
     warn(obj: Object, format?: any, ...params: any[]): void;
-    warn(format: string, ...params: any[]): void;
+
+    /**
+     * Returns a boolean: is the `error` level enabled?
+     * 
+     * This is equivalent to `log.isErrorEnabled()` or `log.isEnabledFor(ERROR)` in log4j.
+     */
+    error(): boolean;
+
+    /**
+     * Special case to log an `Error` instance to the record.
+     * This adds an `err` field with exception details
+     * (including the stack) and sets `msg` to the exception
+     * message or you can specify the `msg`.
+     */
     error(error: Error, format?: any, ...params: any[]): void;
+
     error(buffer: Buffer, format?: any, ...params: any[]): void;
+
+    /**
+     * Uses `util.format` for msg formatting.
+     */
+    error(format: string | number, ...params: any[]): void;
+
+    /**
+     * The first field can optionally be a "fields" object, which
+     * is merged into the log record.
+     * 
+     * To pass in an Error *and* other fields, use the `err`
+     * field name for the Error instance.
+     */
     error(obj: Object, format?: any, ...params: any[]): void;
-    error(format: string, ...params: any[]): void;
+
+    /**
+     * Returns a boolean: is the `fatal` level enabled?
+     * 
+     * This is equivalent to `log.isFatalEnabled()` or `log.isEnabledFor(FATAL)` in log4j.
+     */
+    fatal(): boolean;
+
+    /**
+     * Special case to log an `Error` instance to the record.
+     * This adds an `err` field with exception details
+     * (including the stack) and sets `msg` to the exception
+     * message or you can specify the `msg`.
+     */
     fatal(error: Error, format?: any, ...params: any[]): void;
+
     fatal(buffer: Buffer, format?: any, ...params: any[]): void;
+
+    /**
+     * Uses `util.format` for msg formatting.
+     */
+    fatal(format: string | number, ...params: any[]): void;
+
+    /**
+     * The first field can optionally be a "fields" object, which
+     * is merged into the log record.
+     * 
+     * To pass in an Error *and* other fields, use the `err`
+     * field name for the Error instance.
+     */
     fatal(obj: Object, format?: any, ...params: any[]): void;
-    fatal(format: string, ...params: any[]): void;
 }
 
 declare namespace Logger {
diff --git a/business-rules-engine/Validation.d.ts b/business-rules-engine/Validation.d.ts
index 0dd8283dc2..7f61f517be 100644
--- a/business-rules-engine/Validation.d.ts
+++ b/business-rules-engine/Validation.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Roman Samec <https://github.com/rsamec>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="q" />
-
 declare namespace Validation {
     interface IErrorCustomMessage {
         (config: any, args: any): string;
diff --git a/business-rules-engine/business-rules-engine-tests.ts b/business-rules-engine/business-rules-engine-tests.ts
index 3ffbe2948c..4ae31155f2 100644
--- a/business-rules-engine/business-rules-engine-tests.ts
+++ b/business-rules-engine/business-rules-engine-tests.ts
@@ -1,4 +1,3 @@
-/// <reference types="q" />
 import * as Validators from 'business-rules-engine/node-validators';
 import Validation = require("business-rules-engine");
 
diff --git a/business-rules-engine/index.d.ts b/business-rules-engine/index.d.ts
index 4f71b43dfb..a74bcf180d 100644
--- a/business-rules-engine/index.d.ts
+++ b/business-rules-engine/index.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Source: typings/business-rules-engine/Validation.d.ts
-/// <reference types="q" />
 
 import * as Q from "q";
 
diff --git a/business-rules-engine/node-validators.d.ts b/business-rules-engine/node-validators.d.ts
index 73746eef92..fa2b9cb39e 100644
--- a/business-rules-engine/node-validators.d.ts
+++ b/business-rules-engine/node-validators.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Roman Samec <https://github.com/rsamec>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="q" />
 /// <reference types="node" />
 
 import Validation = require("business-rules-engine");
diff --git a/business-rules-engine/tsconfig.json b/business-rules-engine/tsconfig.json
index 008e622d1f..a80b05099b 100644
--- a/business-rules-engine/tsconfig.json
+++ b/business-rules-engine/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/c3/c3-tests.ts b/c3/c3-tests.ts
index 4a0695af1f..d9057eabb6 100644
--- a/c3/c3-tests.ts
+++ b/c3/c3-tests.ts
@@ -368,7 +368,9 @@ function line_examples() {
         data: {},
         line: {
             connectNull: true,
-            step_type: "step-after"
+            step: {
+                type: "step-after"
+            }
         }
     });
 }
diff --git a/c3/index.d.ts b/c3/index.d.ts
index 5edb096395..748b19bfc5 100644
--- a/c3/index.d.ts
+++ b/c3/index.d.ts
@@ -145,7 +145,9 @@ declare namespace c3 {
             /**
              * Change step type for step chart. 'step', 'step-before' and 'step-after' can be used.
              */
-            step_type?: string;
+            step?: {
+                 type: string;
+             };
         };
 
         area?: {
diff --git a/cachefactory/cachefactory-tests.ts b/cachefactory/cachefactory-tests.ts
index 73397dd8bf..32eeb63257 100644
--- a/cachefactory/cachefactory-tests.ts
+++ b/cachefactory/cachefactory-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="cachefactory" />
-
 CacheFactory.get('test');
 
 CacheFactory.createCache('test', {
diff --git a/cal-heatmap/cal-heatmap-tests.ts b/cal-heatmap/cal-heatmap-tests.ts
index 47020b811c..ff0e3c0d06 100644
--- a/cal-heatmap/cal-heatmap-tests.ts
+++ b/cal-heatmap/cal-heatmap-tests.ts
@@ -1,6 +1,4 @@
-
 /// <reference types="jquery" />
-/// <reference types="d3" />
 
 var cal = new CalHeatMap();
 cal.init();
diff --git a/cassandra-driver/cassandra-driver-tests.ts b/cassandra-driver/cassandra-driver-tests.ts
index 9feee249ac..e5d8f2ab60 100644
--- a/cassandra-driver/cassandra-driver-tests.ts
+++ b/cassandra-driver/cassandra-driver-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="cassandra-driver" />
-
 import * as cassandra from 'cassandra-driver';
 import * as util from 'util';
 
diff --git a/cbor/cbor-tests.ts b/cbor/cbor-tests.ts
index e1a7abb9cf..eb84201b97 100644
--- a/cbor/cbor-tests.ts
+++ b/cbor/cbor-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import cbor = require('cbor');
 import assert = require('assert');
 import fs = require('fs');
diff --git a/chai-as-promised/chai-as-promised-tests.ts b/chai-as-promised/chai-as-promised-tests.ts
index 0fde03dfa3..d9f681769b 100644
--- a/chai-as-promised/chai-as-promised-tests.ts
+++ b/chai-as-promised/chai-as-promised-tests.ts
@@ -1,7 +1,3 @@
-
-/// <reference types="promises-a-plus" />
-/// <reference types="q" />
-
 import chai = require('chai');
 import chaiAsPromised = require('chai-as-promised');
 import Q = require('q');
@@ -12,7 +8,7 @@ class TestClass {}
 
 // ReSharper disable WrongExpressionStatement
 // BDD API (expect)
-var thenableNum: PromisesAPlus.Thenable<number>;
+var thenableNum: PromiseLike<number>;
 thenableNum = chai.expect(thenableNum).to.eventually.equal(3);
 thenableNum = chai.expect(thenableNum).to.eventually.have.property('foo');
 thenableNum = chai.expect(thenableNum).to.become(3);
@@ -56,7 +52,7 @@ Q.all([
 ]).should.notify(() => console.log('done'));
 
 // Assert API
-var thenableVoid: PromisesAPlus.Thenable<void>;
+var thenableVoid: PromiseLike<void>;
 thenableVoid = chai.assert.eventually.equal(thenableNum, 4, 'Message');
 thenableVoid = chai.assert.isFulfilled(thenableNum, "optional message");
 thenableVoid = chai.assert.becomes(thenableNum, "foo", "optional message");
diff --git a/chai-as-promised/index.d.ts b/chai-as-promised/index.d.ts
index b4f3ca405d..4c36eccb61 100644
--- a/chai-as-promised/index.d.ts
+++ b/chai-as-promised/index.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="chai" />
-/// <reference types="promises-a-plus" />
 
 declare module 'chai-as-promised' {
     function chaiAsPromised(chai: any, utils: any): void;
@@ -27,7 +26,7 @@ declare namespace Chai {
     // Eventually does not have .then(), but PromisedAssertion have.
     interface Eventually extends PromisedLanguageChains, PromisedNumericComparison, PromisedTypeComparison {
         // From chai-as-promised
-        become(expected: PromisesAPlus.Thenable<any>): PromisedAssertion;
+        become(expected: PromiseLike<any>): PromisedAssertion;
         fulfilled: PromisedAssertion;
         rejected: PromisedAssertion;
         rejectedWith(expected: any, message?: string | RegExp): PromisedAssertion;
@@ -74,7 +73,7 @@ declare namespace Chai {
         members: PromisedMembers;
     }
 
-    interface PromisedAssertion extends Eventually, PromisesAPlus.Thenable<any> {
+    interface PromisedAssertion extends Eventually, PromiseLike<any> {
     }
 
     interface PromisedLanguageChains {
@@ -181,111 +180,111 @@ declare namespace Chai {
     // For Assert API
     interface Assert {
         eventually: PromisedAssert;
-        isFulfilled(promise: PromisesAPlus.Thenable<any>, message?: string): PromisesAPlus.Thenable<void>;
-        becomes(promise: PromisesAPlus.Thenable<any>, expected: any, message?: string): PromisesAPlus.Thenable<void>;
-        doesNotBecome(promise: PromisesAPlus.Thenable<any>, expected: any, message?: string): PromisesAPlus.Thenable<void>;
-        isRejected(promise: PromisesAPlus.Thenable<any>, message?: string): PromisesAPlus.Thenable<void>;
-        isRejected(promise: PromisesAPlus.Thenable<any>, expected: any, message?: string): PromisesAPlus.Thenable<void>;
-        isRejected(promise: PromisesAPlus.Thenable<any>, match: RegExp, message?: string): PromisesAPlus.Thenable<void>;
-        notify(fn: Function): PromisesAPlus.Thenable<void>;
+        isFulfilled(promise: PromiseLike<any>, message?: string): PromiseLike<void>;
+        becomes(promise: PromiseLike<any>, expected: any, message?: string): PromiseLike<void>;
+        doesNotBecome(promise: PromiseLike<any>, expected: any, message?: string): PromiseLike<void>;
+        isRejected(promise: PromiseLike<any>, message?: string): PromiseLike<void>;
+        isRejected(promise: PromiseLike<any>, expected: any, message?: string): PromiseLike<void>;
+        isRejected(promise: PromiseLike<any>, match: RegExp, message?: string): PromiseLike<void>;
+        notify(fn: Function): PromiseLike<void>;
     }
 
     export interface PromisedAssert {
-        fail(actual?: any, expected?: any, msg?: string, operator?: string): PromisesAPlus.Thenable<void>;
+        fail(actual?: any, expected?: any, msg?: string, operator?: string): PromiseLike<void>;
 
-        ok(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        notOk(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        ok(val: any, msg?: string): PromiseLike<void>;
+        notOk(val: any, msg?: string): PromiseLike<void>;
 
-        equal(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
-        notEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+        equal(act: any, exp: any, msg?: string): PromiseLike<void>;
+        notEqual(act: any, exp: any, msg?: string): PromiseLike<void>;
 
-        strictEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
-        notStrictEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+        strictEqual(act: any, exp: any, msg?: string): PromiseLike<void>;
+        notStrictEqual(act: any, exp: any, msg?: string): PromiseLike<void>;
 
-        deepEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
-        notDeepEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+        deepEqual(act: any, exp: any, msg?: string): PromiseLike<void>;
+        notDeepEqual(act: any, exp: any, msg?: string): PromiseLike<void>;
 
-        isTrue(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isFalse(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isTrue(val: any, msg?: string): PromiseLike<void>;
+        isFalse(val: any, msg?: string): PromiseLike<void>;
 
-        isNull(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isNotNull(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNull(val: any, msg?: string): PromiseLike<void>;
+        isNotNull(val: any, msg?: string): PromiseLike<void>;
 
-        isUndefined(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isDefined(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isUndefined(val: any, msg?: string): PromiseLike<void>;
+        isDefined(val: any, msg?: string): PromiseLike<void>;
 
-        isFunction(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isNotFunction(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isFunction(val: any, msg?: string): PromiseLike<void>;
+        isNotFunction(val: any, msg?: string): PromiseLike<void>;
 
-        isObject(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isNotObject(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isObject(val: any, msg?: string): PromiseLike<void>;
+        isNotObject(val: any, msg?: string): PromiseLike<void>;
 
-        isArray(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isNotArray(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isArray(val: any, msg?: string): PromiseLike<void>;
+        isNotArray(val: any, msg?: string): PromiseLike<void>;
 
-        isString(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isNotString(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isString(val: any, msg?: string): PromiseLike<void>;
+        isNotString(val: any, msg?: string): PromiseLike<void>;
 
-        isNumber(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isNotNumber(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNumber(val: any, msg?: string): PromiseLike<void>;
+        isNotNumber(val: any, msg?: string): PromiseLike<void>;
 
-        isBoolean(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isNotBoolean(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isBoolean(val: any, msg?: string): PromiseLike<void>;
+        isNotBoolean(val: any, msg?: string): PromiseLike<void>;
 
-        typeOf(val: any, type: string, msg?: string): PromisesAPlus.Thenable<void>;
-        notTypeOf(val: any, type: string, msg?: string): PromisesAPlus.Thenable<void>;
+        typeOf(val: any, type: string, msg?: string): PromiseLike<void>;
+        notTypeOf(val: any, type: string, msg?: string): PromiseLike<void>;
 
-        instanceOf(val: any, type: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        notInstanceOf(val: any, type: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        instanceOf(val: any, type: Function, msg?: string): PromiseLike<void>;
+        notInstanceOf(val: any, type: Function, msg?: string): PromiseLike<void>;
 
-        include(exp: string, inc: any, msg?: string): PromisesAPlus.Thenable<void>;
-        include(exp: any[], inc: any, msg?: string): PromisesAPlus.Thenable<void>;
+        include(exp: string, inc: any, msg?: string): PromiseLike<void>;
+        include(exp: any[], inc: any, msg?: string): PromiseLike<void>;
 
-        notInclude(exp: string, inc: any, msg?: string): PromisesAPlus.Thenable<void>;
-        notInclude(exp: any[], inc: any, msg?: string): PromisesAPlus.Thenable<void>;
+        notInclude(exp: string, inc: any, msg?: string): PromiseLike<void>;
+        notInclude(exp: any[], inc: any, msg?: string): PromiseLike<void>;
 
-        match(exp: any, re: RegExp, msg?: string): PromisesAPlus.Thenable<void>;
-        notMatch(exp: any, re: RegExp, msg?: string): PromisesAPlus.Thenable<void>;
+        match(exp: any, re: RegExp, msg?: string): PromiseLike<void>;
+        notMatch(exp: any, re: RegExp, msg?: string): PromiseLike<void>;
 
-        property(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
-        notProperty(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
-        deepProperty(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
-        notDeepProperty(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
+        property(obj: Object, prop: string, msg?: string): PromiseLike<void>;
+        notProperty(obj: Object, prop: string, msg?: string): PromiseLike<void>;
+        deepProperty(obj: Object, prop: string, msg?: string): PromiseLike<void>;
+        notDeepProperty(obj: Object, prop: string, msg?: string): PromiseLike<void>;
 
-        propertyVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        propertyNotVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        propertyVal(obj: Object, prop: string, val: any, msg?: string): PromiseLike<void>;
+        propertyNotVal(obj: Object, prop: string, val: any, msg?: string): PromiseLike<void>;
 
-        deepPropertyVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        deepPropertyNotVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        deepPropertyVal(obj: Object, prop: string, val: any, msg?: string): PromiseLike<void>;
+        deepPropertyNotVal(obj: Object, prop: string, val: any, msg?: string): PromiseLike<void>;
 
-        lengthOf(exp: any, len: number, msg?: string): PromisesAPlus.Thenable<void>;
+        lengthOf(exp: any, len: number, msg?: string): PromiseLike<void>;
         //alias frenzy
-        throw(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        throw(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
-        throw(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        throw(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+        throw(fn: Function, msg?: string): PromiseLike<void>;
+        throw(fn: Function, regExp: RegExp): PromiseLike<void>;
+        throw(fn: Function, errType: Function, msg?: string): PromiseLike<void>;
+        throw(fn: Function, errType: Function, regExp: RegExp): PromiseLike<void>;
 
-        throws(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        throws(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
-        throws(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        throws(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+        throws(fn: Function, msg?: string): PromiseLike<void>;
+        throws(fn: Function, regExp: RegExp): PromiseLike<void>;
+        throws(fn: Function, errType: Function, msg?: string): PromiseLike<void>;
+        throws(fn: Function, errType: Function, regExp: RegExp): PromiseLike<void>;
 
-        Throw(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        Throw(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
-        Throw(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        Throw(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+        Throw(fn: Function, msg?: string): PromiseLike<void>;
+        Throw(fn: Function, regExp: RegExp): PromiseLike<void>;
+        Throw(fn: Function, errType: Function, msg?: string): PromiseLike<void>;
+        Throw(fn: Function, errType: Function, regExp: RegExp): PromiseLike<void>;
 
-        doesNotThrow(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        doesNotThrow(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
-        doesNotThrow(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        doesNotThrow(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+        doesNotThrow(fn: Function, msg?: string): PromiseLike<void>;
+        doesNotThrow(fn: Function, regExp: RegExp): PromiseLike<void>;
+        doesNotThrow(fn: Function, errType: Function, msg?: string): PromiseLike<void>;
+        doesNotThrow(fn: Function, errType: Function, regExp: RegExp): PromiseLike<void>;
 
-        operator(val: any, operator: string, val2: any, msg?: string): PromisesAPlus.Thenable<void>;
-        closeTo(act: number, exp: number, delta: number, msg?: string): PromisesAPlus.Thenable<void>;
+        operator(val: any, operator: string, val2: any, msg?: string): PromiseLike<void>;
+        closeTo(act: number, exp: number, delta: number, msg?: string): PromiseLike<void>;
 
-        sameMembers(set1: any[], set2: any[], msg?: string): PromisesAPlus.Thenable<void>;
-        includeMembers(set1: any[], set2: any[], msg?: string): PromisesAPlus.Thenable<void>;
+        sameMembers(set1: any[], set2: any[], msg?: string): PromiseLike<void>;
+        includeMembers(set1: any[], set2: any[], msg?: string): PromiseLike<void>;
 
-        ifError(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        ifError(val: any, msg?: string): PromiseLike<void>;
     }
 }
diff --git a/chai-enzyme/chai-enzyme-tests.tsx b/chai-enzyme/chai-enzyme-tests.tsx
index 7e7ef027ed..8fc64e2711 100644
--- a/chai-enzyme/chai-enzyme-tests.tsx
+++ b/chai-enzyme/chai-enzyme-tests.tsx
@@ -1,7 +1,3 @@
-/// <reference types="react" />
-/// <reference types="enzyme" />
-/// <reference types="chai" />
-
 import * as React from "react";
 import * as chaiEnzyme from "chai-enzyme";
 import { expect } from "chai";
@@ -34,7 +30,7 @@ expect(wrapper).to.have.ref("test");
 expect(wrapper).to.be.selected();
 expect(wrapper).to.have.tagName("div");
 expect(wrapper).to.have.text("");
-expect(wrapper).to.have.Type(Test);
+expect(wrapper).to.have.type(Test);
 expect(wrapper).to.have.value("test");
 expect(wrapper).to.have.attr("test", "test");
 expect(wrapper).to.have.data("test", "Test");
diff --git a/chai-spies/chai-spies-tests.ts b/chai-spies/chai-spies-tests.ts
index 7ac0610e4d..326b1e0137 100644
--- a/chai-spies/chai-spies-tests.ts
+++ b/chai-spies/chai-spies-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="chai" />
-/// <reference types="mocha" />
-
 import * as chai from 'chai';
 import * as spies from 'chai-spies';
 import * as Mocha from 'mocha';
diff --git a/chart.js/index.d.ts b/chart.js/index.d.ts
index 08781f4463..43192689c1 100644
--- a/chart.js/index.d.ts
+++ b/chart.js/index.d.ts
@@ -1,11 +1,16 @@
-// Type definitions for Chart.js
+// Type definitions for Chart.js 2.4.0
 // Project: https://github.com/nnnick/Chart.js
 // Definitions by: Alberto Nuti <https://github.com/anuti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="jquery" />
+
 declare class Chart {
     static readonly Chart: typeof Chart;
-    constructor(context: CanvasRenderingContext2D | HTMLCanvasElement, options: Chart.ChartConfiguration);
+    constructor(
+        context: string | JQuery | CanvasRenderingContext2D | HTMLCanvasElement | string[] | CanvasRenderingContext2D[] | HTMLCanvasElement[],
+        options: Chart.ChartConfiguration
+    );
     config: Chart.ChartConfiguration;
     data: Chart.ChartData;
     destroy: () => {};
@@ -20,7 +25,7 @@ declare class Chart {
     getElementsAtEvent: (e: any) => {}[];
     getDatasetAtEvent: (e: any) => {}[];
 
-    defaults: {
+    static defaults: {
         global: Chart.ChartOptions;
     }
 }
@@ -32,6 +37,8 @@ declare namespace Chart {
 
     export type ScaleType = 'category' | 'linear' | 'logarithmic' | 'time' | 'radialLinear';
 
+    export type PositionType = 'left' | 'right' | 'top' | 'bottom';
+
     export interface ChartLegendItem {
         text?: string;
         fillStyle?: string;
@@ -342,7 +349,7 @@ declare namespace Chart {
     export interface ChartScales {
         type?: ScaleType | string;
         display?: boolean;
-        position?: string;
+        position?: PositionType | string;
         beforeUpdate?: (scale?: any) => void;
         beforeSetDimension?: (scale?: any) => void;
         beforeDataLimits?: (scale?: any) => void;
@@ -364,29 +371,25 @@ declare namespace Chart {
         yAxes?: ChartYAxe[];
     }
 
-    export interface ChartXAxe {
+    export interface CommonAxe {
         type?: ScaleType | string;
         display?: boolean;
         id?: string;
         stacked?: boolean;
-        categoryPercentage?: number;
-        barPercentage?: number;
-        barThickness?: number;
-        gridLines?: GridLineOptions;
         position?: string;
         ticks?: TickOptions;
-        time?: TimeScale;
+        gridLines?: GridLineOptions;
+        barThickness?: number;
         scaleLabel?: ScaleTitleOptions;
     }
 
-    export interface ChartYAxe {
-        type?: ScaleType | string;
-        display?: boolean;
-        id?: string;
-        stacked?: boolean;
-        position?: string;
-        ticks?: TickOptions;
-        scaleLabel?: ScaleTitleOptions;
+    export interface ChartXAxe extends CommonAxe {
+        categoryPercentage?: number;
+        barPercentage?: number;
+        time?: TimeScale;
+    }
+
+    export interface ChartYAxe extends CommonAxe {
     }
 
     export interface LinearScale extends ChartScales {
diff --git a/cheerio/cheerio-tests.ts b/cheerio/cheerio-tests.ts
index 5b1f6511ec..1c0848eef7 100644
--- a/cheerio/cheerio-tests.ts
+++ b/cheerio/cheerio-tests.ts
@@ -55,6 +55,10 @@ var $multiEl = $('selector', 'selector', 'selector');
 $el.attr('id');
 $el.attr('id', 'favorite').html();
 
+// props
+$el.prop('style')
+$el.prop('style', 'none').html()
+
 // data
 $el.data();
 $el.data('apple-color');
@@ -86,6 +90,7 @@ $el.is(() => {
  */
 // serializeArray
 $('<form><input name="foo" value="bar" /></form>').serializeArray();
+$('<form><input name="foo" value="bar" /></form>').serialize();
 
 /**
  * Traversing
@@ -217,6 +222,9 @@ $el.eq(0).addBack('.class').length
  * Manipulation
  */
 
+$('<li class="plum">Plum</li>').appendTo($el)
+$el.prependTo($('<li class="plum">Plum</li>'))
+
 // .append( content, [content, ...] )
 $el.append('<li class="plum">Plum</li>').html();
 $el.append('<li class="plum">Plum</li>', '<li class="plum">Plum</li>').html();
diff --git a/cheerio/index.d.ts b/cheerio/index.d.ts
index e94eb1a68c..f3615674f5 100644
--- a/cheerio/index.d.ts
+++ b/cheerio/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Cheerio v0.17.0
+// Type definitions for Cheerio v0.22.0
 // Project: https://github.com/cheeriojs/cheerio
-// Definitions by: Bret Little <https://github.com/blittle>, VILIC VANE <http://vilic.info>, Wayne Maurer <https://github.com/wmaurer>
+// Definitions by: Bret Little <https://github.com/blittle>, VILIC VANE <http://vilic.info>, Wayne Maurer <https://github.com/wmaurer>, Umar Nizamani <https://github.com/umarniz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface Cheerio {
@@ -47,10 +47,11 @@ interface Cheerio {
     is(func: (index: number, element: CheerioElement) => boolean): boolean;
 
     // Form
+    serialize(): string;
     serializeArray(): {name: string, value: string}[];
 
     // Traversing
-
+    
     find(selector: string): Cheerio;
     find(element: Cheerio): Cheerio;
 
@@ -60,6 +61,9 @@ interface Cheerio {
     parentsUntil(element: CheerioElement, filter?: string): Cheerio;
     parentsUntil(element: Cheerio, filter?: string): Cheerio;
 
+    prop(name: string): any;
+    prop(name: string, value: any): Cheerio;
+
     closest(): Cheerio;
     closest(selector: string): Cheerio;
 
@@ -126,6 +130,8 @@ interface Cheerio {
     addBack(filter: string):Cheerio;
 
     // Manipulation
+    appendTo(target: Cheerio) : Cheerio
+    prependTo(target: Cheerio) : Cheerio
 
     append(content: string, ...contents: any[]): Cheerio;
     append(content: Document, ...contents: any[]): Cheerio;
@@ -266,4 +272,4 @@ declare var cheerio:CheerioAPI;
 
 declare module "cheerio" {
     export = cheerio;
-}
+}
\ No newline at end of file
diff --git a/chocolatechipjs/chocolatechipjs-tests.ts b/chocolatechipjs/chocolatechipjs-tests.ts
index 465ea2b0a9..7036358aed 100644
--- a/chocolatechipjs/chocolatechipjs-tests.ts
+++ b/chocolatechipjs/chocolatechipjs-tests.ts
@@ -1,4 +1,3 @@
-/// <reference types="chocolatechipjs" />
 // ChocolateChipStatic -- DOM creation, etc.
 $(function() {
     alert('Ready to do stuff!');
@@ -282,7 +281,7 @@ fetch('../controllers/php-post.php', {
   },
   body: formData
 })
-.then($.json) 
+.then($.json)
 .then(function<postData>(data: any): any {
   if(data.email_check == "valid"){
     $("#message_ajax").html("<div class='successMessage'>" + data.email + " is a valid e-mail address. Thank you, " + data.name + ".</div>");
@@ -300,12 +299,12 @@ interface putData {
 var putData = $('#fileText').val();
 fetch('../controllers/php-put.php', {
   method: 'put',
-  headers: {  
-    "Content-type": "application/x-www-form-urlencoded; charset=UTF-8"  
+  headers: {
+    "Content-type": "application/x-www-form-urlencoded; charset=UTF-8"
   },
   body: putData
 })
-.then($.json) 
+.then($.json)
 .then(function<putData>(data:any): any {
    console.dir(data.base);
    $("#message_ajax").append('<p>' + data.result + '</p>');
@@ -324,12 +323,12 @@ interface deleteData {
 var file = $('#fileName').val();
 fetch('../controllers/php-delete.php', {
   method: 'delete',
-  headers: {  
-    "Content-type": "application/x-www-form-urlencoded; charset=UTF-8"  
+  headers: {
+    "Content-type": "application/x-www-form-urlencoded; charset=UTF-8"
   },
   body: file
 })
-.then($.json) 
+.then($.json)
 .then(function<deleteData>(data: any): any {
    $("#message_ajax").html("<div>DELETE was sent to the server successfully.</div>");
    $("#message_ajax").append('<p>' + data.result + '</p>');
diff --git a/chrome/index.d.ts b/chrome/index.d.ts
index b88ae5faf0..b7b6de0076 100644
--- a/chrome/index.d.ts
+++ b/chrome/index.d.ts
@@ -4854,7 +4854,7 @@ declare namespace chrome.proxy {
  */
 declare namespace chrome.runtime {
     /** This will be defined during an API method callback if there was an error */
-    var lastError: LastError;
+    var lastError: LastError | undefined;
     /** The ID of the extension/app. */
     var id: string;
 
diff --git a/cliff/cliff-tests.ts b/cliff/cliff-tests.ts
index 9217d9a38a..e69de29bb2 100644
--- a/cliff/cliff-tests.ts
+++ b/cliff/cliff-tests.ts
@@ -1 +0,0 @@
-/// <reference types="cliff" />
\ No newline at end of file
diff --git a/co-body/co-body-tests.ts b/co-body/co-body-tests.ts
index 6011632399..944cadd394 100644
--- a/co-body/co-body-tests.ts
+++ b/co-body/co-body-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="node"/>
-/// <reference types="koa"/>
-
 import * as koa from 'koa';
 import * as parse from 'co-body';
 
diff --git a/coinstring/coinstring-tests.ts b/coinstring/coinstring-tests.ts
index ab11a44fb7..1cc3fb9a42 100644
--- a/coinstring/coinstring-tests.ts
+++ b/coinstring/coinstring-tests.ts
@@ -1,8 +1,5 @@
-/// <reference types= "node" />
-
 import cs = require('coinstring');
 
-
 var privateKeyHex = "1184cd2cdd640ca42cfc3a091c51d549b2f016d454b2774019c2b2d2e08529fd";
 var privateKeyHexBuf = new Buffer(privateKeyHex, 'hex');
 var version = 0x80; // Bitcoin private key
diff --git a/compression-webpack-plugin/compression-webpack-plugin-tests.ts b/compression-webpack-plugin/compression-webpack-plugin-tests.ts
new file mode 100644
index 0000000000..3939bf5847
--- /dev/null
+++ b/compression-webpack-plugin/compression-webpack-plugin-tests.ts
@@ -0,0 +1,14 @@
+import { Configuration } from 'webpack';
+import CompressionPlugin = require('compression-webpack-plugin');
+
+const c: Configuration = {
+    plugins: [
+        new CompressionPlugin({
+            asset: "[path].gz[query]",
+            algorithm: "gzip",
+            test: /\.js$|\.html$/,
+            threshold: 10240,
+            minRatio: 0.8
+        })
+    ]
+};
diff --git a/compression-webpack-plugin/index.d.ts b/compression-webpack-plugin/index.d.ts
new file mode 100644
index 0000000000..536a77b8e9
--- /dev/null
+++ b/compression-webpack-plugin/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for compression-webpack-plugin 0.3
+// Project: https://github.com/webpack-contrib/compression-webpack-plugin
+// Definitions by: Anton Kandybo <https://github.com/dublicator>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Plugin } from 'webpack';
+
+export = CompressionPlugin;
+
+declare class CompressionPlugin extends Plugin {
+    constructor(options?: CompressionPlugin.Options);
+}
+
+declare namespace CompressionPlugin {
+    export interface Options {
+        asset?: string;
+        algorithm?: string;
+        test?: RegExp | RegExp[];
+        regExp?: RegExp | RegExp[];
+        threshold?: number;
+        minRatio?: number;
+
+        // zopfli options
+        verbose?: boolean;
+        verbose_more?: boolean;
+        numiterations?: number;
+        blocksplitting?: boolean;
+        blocksplittinglast?: boolean;
+        blocksplittingmax?: number;
+
+        // zlib options
+        level?: number;
+        flush?: number;
+        chunkSize?: number;
+        windowBits?: number;
+        memLevel?: number;
+        strategy?: number;
+        dictionary?: any;
+    }
+}
diff --git a/paymentrequest/tsconfig.json b/compression-webpack-plugin/tsconfig.json
similarity index 78%
rename from paymentrequest/tsconfig.json
rename to compression-webpack-plugin/tsconfig.json
index e5754a139a..70383d3658 100644
--- a/paymentrequest/tsconfig.json
+++ b/compression-webpack-plugin/tsconfig.json
@@ -1,14 +1,13 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
         "target": "es6",
+        "lib": [
+            "es6"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -19,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "paymentrequest-tests.ts"
+        "compression-webpack-plugin-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/compression-webpack-plugin/tslint.json b/compression-webpack-plugin/tslint.json
new file mode 100644
index 0000000000..70cee1ba88
--- /dev/null
+++ b/compression-webpack-plugin/tslint.json
@@ -0,0 +1,4 @@
+{ 
+    "extends": "../tslint.json"
+}
+ 
\ No newline at end of file
diff --git a/connect-redis/connect-redis-tests.ts b/connect-redis/connect-redis-tests.ts
index ed21f3b4be..3c50074117 100644
--- a/connect-redis/connect-redis-tests.ts
+++ b/connect-redis/connect-redis-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="express-session" />
-
 import * as connectRedis from "connect-redis";
 import * as session from "express-session";
 
diff --git a/cookie/cookie-tests.ts b/cookie/cookie-tests.ts
index 2581a5c372..dd5be0f850 100644
--- a/cookie/cookie-tests.ts
+++ b/cookie/cookie-tests.ts
@@ -17,7 +17,7 @@ function test_parse(): void {
 }
 
 function test_options(): void {
-    var serializeOptions: CookieSerializeOptions = {
+    var serializeOptions: cookie.CookieSerializeOptions = {
         encode: (x: string) => x,
         path: '/',
         expires: new Date(),
@@ -27,7 +27,7 @@ function test_options(): void {
         httpOnly: false
     };
 
-    var parseOptios: CookieParseOptions = {
+    var parseOptios: cookie.CookieParseOptions = {
         decode: (x: string) => x
     };
 }
diff --git a/cookie/index.d.ts b/cookie/index.d.ts
index 950796fa22..507eaee01d 100644
--- a/cookie/index.d.ts
+++ b/cookie/index.d.ts
@@ -1,28 +1,118 @@
-// Type definitions for cookie v0.1.2
+// Type definitions for cookie v0.3.0
 // Project: https://github.com/jshttp/cookie
 // Definitions by: Pine Mizune <https://github.com/pine613>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface CookieSerializeOptions {
-    encode?: (val: string) => string;
-    path?: string;
-    expires?: Date;
-    maxAge?: number;
+    /**
+     * Specifies the value for the Domain Set-Cookie attribute. By default, no
+     * domain is set, and most clients will consider the cookie to apply to only
+     * the current domain.
+     */
     domain?: string;
-    secure?: boolean;
+    /**
+     * Specifies a function that will be used to encode a cookie's value. Since
+     * value of a cookie has a limited character set (and must be a simple
+     * string), this function can be used to encode a value into a string suited
+     * for a cookie's value.
+     *
+     * The default function is the global `encodeURIComponent`, which will
+     * encode a JavaScript string into UTF-8 byte sequences and then URL-encode
+     * any that fall outside of the cookie range.
+     */
+    encode?: (val: string) => string;
+    /**
+     * Specifies the `Date` object to be the value for the `Expires`
+     * `Set-Cookie` attribute. By default, no expiration is set, and most
+     * clients will consider this a "non-persistent cookie" and will delete it
+     * on a condition like exiting a web browser application.
+     *
+     * *Note* the cookie storage model specification states that if both
+     * `expires` and `maxAge` are set, then `maxAge` takes precedence, but it is
+     * possible not all clients by obey this, so if both are set, they should
+     * point to the same date and time.
+     */
+    expires?: Date;
+    /**
+     * Specifies the boolean value for the `HttpOnly` `Set-Cookie` attribute.
+     * When truthy, the `HttpOnly` attribute is set, otherwise it is not. By
+     * default, the `HttpOnly` attribute is not set.
+     *
+     * *Note* be careful when setting this to true, as compliant clients will
+     * not allow client-side JavaScript to see the cookie in `document.cookie`.
+     */
     httpOnly?: boolean;
+    /**
+     * Specifies the number (in seconds) to be the value for the `Max-Age`
+     * `Set-Cookie` attribute. The given number will be converted to an integer
+     * by rounding down. By default, no maximum age is set.
+     *
+     * *Note* the cookie storage model specification states that if both
+     * `expires` and `maxAge` are set, then `maxAge` takes precedence, but it is
+     * possible not all clients by obey this, so if both are set, they should
+     * point to the same date and time.
+     */
+    maxAge?: number;
+    /**
+     * Specifies the value for the `Path` `Set-Cookie` attribute. By default,
+     * the path is considered the "default path".
+     */
+    path?: string;
+    /**
+     * Specifies the boolean or string to be the value for the `SameSite`
+     * `Set-Cookie` attribute.
+     *
+     * - `true` will set the `SameSite` attribute to `Strict` for strict same
+     * site enforcement.
+     * - `false` will not set the `SameSite` attribute.
+     * - `'lax'` will set the `SameSite` attribute to Lax for lax same site
+     * enforcement.
+     * - `'strict'` will set the `SameSite` attribute to Strict for strict same
+     * site enforcement.
+     */
+    sameSite?: boolean | 'lax' | 'strict';
+    /**
+     * Specifies the boolean value for the `Secure` `Set-Cookie` attribute. When
+     * truthy, the `Secure` attribute is set, otherwise it is not. By default,
+     * the `Secure` attribute is not set.
+     *
+     * *Note* be careful when setting this to `true`, as compliant clients will
+     * not send the cookie back to the server in the future if the browser does
+     * not have an HTTPS connection.
+     */
+    secure?: boolean;
 }
 
 interface CookieParseOptions {
+    /**
+     * Specifies a function that will be used to decode a cookie's value. Since
+     * the value of a cookie has a limited character set (and must be a simple
+     * string), this function can be used to decode a previously-encoded cookie
+     * value into a JavaScript string or other object.
+     *
+     * The default function is the global `decodeURIComponent`, which will decode
+     * any URL-encoded sequences into their byte representations.
+     *
+     * *Note* if an error is thrown from this function, the original, non-decoded
+     * cookie value will be returned as the cookie's value.
+     */
     decode?: (val: string) => string;
 }
 
-interface CookieStatic {
-    serialize(name: string, val: string, options?: CookieSerializeOptions): string;
-    parse(str: string, options?: CookieParseOptions): { [key: string]: string };
-}
+/**
+ * Parse an HTTP Cookie header string and returning an object of all cookie
+ * name-value pairs.
+ *
+ * @param str the string representing a `Cookie` header value
+ * @param options object containing parsing options
+ */
+export function parse(str: string, options?: CookieParseOptions): { [key: string]: string };
 
-declare module "cookie" {
-    var cookie: CookieStatic;
-    export = cookie;
-}
+/**
+ * Serialize a cookie name-value pair into a `Set-Cookie` header string.
+ *
+ * @param name the name for the cookie
+ * @param val value to set the cookie to
+ * @param options object containing serialization options
+ */
+export function serialize(name: string, val: string, options?: CookieSerializeOptions): string;
diff --git a/cookies/cookies-tests.ts b/cookies/cookies-tests.ts
index 30e07d3000..5a2ad1e4a7 100644
--- a/cookies/cookies-tests.ts
+++ b/cookies/cookies-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import * as Cookies from 'cookies';
 import * as http from 'http';
 
diff --git a/cordova-plugin-app-version/index.d.ts b/cordova-plugin-app-version/index.d.ts
index e295724474..b30beef9c6 100644
--- a/cordova-plugin-app-version/index.d.ts
+++ b/cordova-plugin-app-version/index.d.ts
@@ -3,14 +3,11 @@
 // Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="jquery" />
-/// <reference types="q" />
-
 interface Cordova {
 	getAppVersion: {
-		getAppName: () => Q.IPromise<string> & JQueryPromise<string>;
-		getPackageName: () => Q.IPromise<string> & JQueryPromise<string>;
-		getVersionCode: () => Q.IPromise<string> & JQueryPromise<string>;
-		getVersionNumber: () => Q.IPromise<string> & JQueryPromise<string>;
+		getAppName: () => Promise<string>;
+		getPackageName: () => Promise<string>;
+		getVersionCode: () => Promise<string>;
+		getVersionNumber: () => Promise<string>;
 	};
 }
diff --git a/cordova-plugin-battery-status/cordova-plugin-battery-status-tests.ts b/cordova-plugin-battery-status/cordova-plugin-battery-status-tests.ts
index 4dafa2e966..1c62521293 100644
--- a/cordova-plugin-battery-status/cordova-plugin-battery-status-tests.ts
+++ b/cordova-plugin-battery-status/cordova-plugin-battery-status-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts"/>
-
 window.addEventListener('batterystatus',
     (ev: BatteryStatusEvent) => { console.log('Battery level is ' + ev.level); });
 
diff --git a/cordova-plugin-camera/cordova-plugin-camera-tests.ts b/cordova-plugin-camera/cordova-plugin-camera-tests.ts
index 00edf02b0a..2f1b661775 100644
--- a/cordova-plugin-camera/cordova-plugin-camera-tests.ts
+++ b/cordova-plugin-camera/cordova-plugin-camera-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts"/>
-
 navigator.camera.getPicture(
     (data: string) => { alert('Got photo!'); },
     (message: string)=> { alert('Failed!: ' + message); },
diff --git a/cordova-plugin-contacts/cordova-plugin-contacts-tests.ts b/cordova-plugin-contacts/cordova-plugin-contacts-tests.ts
index c50912c3ba..26243ab43a 100644
--- a/cordova-plugin-contacts/cordova-plugin-contacts-tests.ts
+++ b/cordova-plugin-contacts/cordova-plugin-contacts-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts"/>
-
 var contact: Contact = navigator.contacts.create({
     nickname: 'John Smith',
     displayName: 'John Smith',
diff --git a/cordova-plugin-device-motion/cordova-plugin-device-motion-tests.ts b/cordova-plugin-device-motion/cordova-plugin-device-motion-tests.ts
index 17b1e49930..1b335beaf7 100644
--- a/cordova-plugin-device-motion/cordova-plugin-device-motion-tests.ts
+++ b/cordova-plugin-device-motion/cordova-plugin-device-motion-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts"/>
-
 navigator.accelerometer.getCurrentAcceleration(
     (acc: Acceleration) => { console.log('X: ' + acc.x + 'Y: ' + acc.y + 'Z: ' + acc.z); },
     () => { alert('Error!'); });
diff --git a/cordova-plugin-device-orientation/cordova-plugin-device-orientation-tests.ts b/cordova-plugin-device-orientation/cordova-plugin-device-orientation-tests.ts
index 097a66e99e..ab025d5fbf 100644
--- a/cordova-plugin-device-orientation/cordova-plugin-device-orientation-tests.ts
+++ b/cordova-plugin-device-orientation/cordova-plugin-device-orientation-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts"/>
-
 navigator.compass.getCurrentHeading(
     (heading: CompassHeading)=> { console.log('Got heading to ' + heading.magneticHeading); },
     (error: CompassError)=> { alert('Error! ' + error.code); },
diff --git a/cordova-plugin-device/cordova-plugin-device-tests.ts b/cordova-plugin-device/cordova-plugin-device-tests.ts
index 450eadb1f0..cb894785c2 100644
--- a/cordova-plugin-device/cordova-plugin-device-tests.ts
+++ b/cordova-plugin-device/cordova-plugin-device-tests.ts
@@ -1,3 +1 @@
-/// <reference path="index.d.ts"/>
-
 console.log(JSON.stringify(device));
\ No newline at end of file
diff --git a/cordova-plugin-dialogs/cordova-plugin-dialogs-tests.ts b/cordova-plugin-dialogs/cordova-plugin-dialogs-tests.ts
index dd9396f36f..498d7d1000 100644
--- a/cordova-plugin-dialogs/cordova-plugin-dialogs-tests.ts
+++ b/cordova-plugin-dialogs/cordova-plugin-dialogs-tests.ts
@@ -1,4 +1,2 @@
-/// <reference path="index.d.ts"/>
-
 navigator.notification.alert('Alert!', () => { alert('You\'re alerted'); }, 'Alert', 'Ok');
 navigator.notification.confirm('Are you ok?', (choice: number) => { alert('Your choice is ' + choice); });
diff --git a/cordova-plugin-file-transfer/cordova-plugin-file-transfer-tests.ts b/cordova-plugin-file-transfer/cordova-plugin-file-transfer-tests.ts
index 4050b2c4aa..eec24db2e0 100644
--- a/cordova-plugin-file-transfer/cordova-plugin-file-transfer-tests.ts
+++ b/cordova-plugin-file-transfer/cordova-plugin-file-transfer-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts"/>
-
 var file = new FileTransfer();
 
 file.onprogress = (ev: ProgressEvent) => {
diff --git a/cordova-plugin-file/cordova-plugin-file-tests.ts b/cordova-plugin-file/cordova-plugin-file-tests.ts
index bd9d7de672..37538434e3 100644
--- a/cordova-plugin-file/cordova-plugin-file-tests.ts
+++ b/cordova-plugin-file/cordova-plugin-file-tests.ts
@@ -1,5 +1,4 @@
 /// <reference types="cordova"/>
-/// <reference path="index.d.ts"/>
 
 function fsaccessor(fs: FileSystem) {
     console.log('FS root is: ' + fs.root.name);
diff --git a/cordova-plugin-globalization/cordova-plugin-globalization-tests.ts b/cordova-plugin-globalization/cordova-plugin-globalization-tests.ts
index 0a58703a32..4b80f2ff72 100644
--- a/cordova-plugin-globalization/cordova-plugin-globalization-tests.ts
+++ b/cordova-plugin-globalization/cordova-plugin-globalization-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts"/>
-
 navigator.globalization.dateToString(new Date(),
     (date) => { console.log(JSON.stringify(date)); },
     (error) => { alert(error.message); },
diff --git a/cordova-plugin-ibeacon/index.d.ts b/cordova-plugin-ibeacon/index.d.ts
index bfbfe607d4..3530ccb70d 100644
--- a/cordova-plugin-ibeacon/index.d.ts
+++ b/cordova-plugin-ibeacon/index.d.ts
@@ -3,95 +3,97 @@
 // Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="q" />
+import * as Q from "q";
 
-interface CordovaPlugins {
-    locationManager: BeaconPlugin.LocationManager;
-}
-
-declare namespace BeaconPlugin {
-	/**
-	 * Beacon Plugin.
-	 */
-	export interface LocationManager {
-		delegate: Delegate;
-		BeaconRegion: BeaconRegion;
-		Region: Region;
-		onDomDelegateReady(): Q.Promise<void>;
-		startMonitoringForRegion(region: Region): Q.Promise<void>;
-		stopMonitoringForRegion(region: Region): Q.Promise<void>;
-		requestStateForRegion(region: Region): Q.Promise<void>;
-		startRangingBeaconsInRegion(region: Region): Q.Promise<void>;
-		stopRangingBeaconsInRegion(region: Region): Q.Promise<void>;
-		getAuthorizationStatus(): Q.Promise<PluginResult>;
-		requestWhenInUseAuthorization(): Q.Promise<void>;
-		requestAlwaysAuthorization(): Q.Promise<void>;
-		getMonitoredRegions(): Q.Promise<Region[]>;
-		getRangedRegions(): Q.Promise<Region[]>;
-		isRangingAvailable(): Q.Promise<boolean>;
-		isMonitoringAvailableForClass(region: Region): Q.Promise<boolean>;
-		startAdvertising(region: Region, measuredPower: boolean): Q.Promise<void>;
-		stopAdvertising(): Q.Promise<void>;
-		isAdvertisingAvailable(): Q.Promise<boolean>;
-		isAdvertising(): Q.Promise<boolean>;
-		disableDebugLogs(): Q.Promise<void>;
-		enableDebugNotifications(): Q.Promise<void>;
-		disableDebugNotifications(): Q.Promise<void>;
-		enableDebugLogs(): Q.Promise<void>;
-		isBluetoothEnabled(): Q.Promise<boolean>;
-		enableBluetooth(): Q.Promise<void>;
-		disableBluetooth(): Q.Promise<void>;
-		appendToDeviceLog(message: string): Q.Promise<string>;
+declare global {
+	interface CordovaPlugins {
+		locationManager: BeaconPlugin.LocationManager;
 	}
 
-	export interface PluginResult {
-		eventType: string;
-		region: Region;
-		beacons: Beacon[];
-		authorizationStatus: string;
-		state: string;
-		error: string;
-	}
+	namespace BeaconPlugin {
+		/**
+		 * Beacon Plugin.
+		 */
+		export interface LocationManager {
+			delegate: Delegate;
+			BeaconRegion: BeaconRegion;
+			Region: Region;
+			onDomDelegateReady(): Q.Promise<void>;
+			startMonitoringForRegion(region: Region): Q.Promise<void>;
+			stopMonitoringForRegion(region: Region): Q.Promise<void>;
+			requestStateForRegion(region: Region): Q.Promise<void>;
+			startRangingBeaconsInRegion(region: Region): Q.Promise<void>;
+			stopRangingBeaconsInRegion(region: Region): Q.Promise<void>;
+			getAuthorizationStatus(): Q.Promise<PluginResult>;
+			requestWhenInUseAuthorization(): Q.Promise<void>;
+			requestAlwaysAuthorization(): Q.Promise<void>;
+			getMonitoredRegions(): Q.Promise<Region[]>;
+			getRangedRegions(): Q.Promise<Region[]>;
+			isRangingAvailable(): Q.Promise<boolean>;
+			isMonitoringAvailableForClass(region: Region): Q.Promise<boolean>;
+			startAdvertising(region: Region, measuredPower: boolean): Q.Promise<void>;
+			stopAdvertising(): Q.Promise<void>;
+			isAdvertisingAvailable(): Q.Promise<boolean>;
+			isAdvertising(): Q.Promise<boolean>;
+			disableDebugLogs(): Q.Promise<void>;
+			enableDebugNotifications(): Q.Promise<void>;
+			disableDebugNotifications(): Q.Promise<void>;
+			enableDebugLogs(): Q.Promise<void>;
+			isBluetoothEnabled(): Q.Promise<boolean>;
+			enableBluetooth(): Q.Promise<void>;
+			disableBluetooth(): Q.Promise<void>;
+			appendToDeviceLog(message: string): Q.Promise<string>;
+		}
 
-	export interface Delegate {
-		didDetermineStateForRegion(pluginResult: PluginResult): void;
-		didStartMonitoringForRegion(pluginResult: PluginResult): void;
-		didExitRegion(pluginResult: PluginResult): void;
-		didEnterRegion(pluginResult: PluginResult): void;
-		didRangeBeaconsInRegion(pluginResult: PluginResult): void;
-		peripheralManagerDidStartAdvertising(pluginResult: PluginResult): void;
-		peripheralManagerDidUpdateState(pluginResult: PluginResult): void;
-		didChangeAuthorizationStatus(authorizationStatus: string): void;
-		monitoringDidFailForRegionWithError(pluginResult: PluginResult): void;
-	}
+		export interface PluginResult {
+			eventType: string;
+			region: Region;
+			beacons: Beacon[];
+			authorizationStatus: string;
+			state: string;
+			error: string;
+		}
 
-	export interface Region {
-		identifier: string;
-		new (identifier: string): Region;
-	}
+		export interface Delegate {
+			didDetermineStateForRegion(pluginResult: PluginResult): void;
+			didStartMonitoringForRegion(pluginResult: PluginResult): void;
+			didExitRegion(pluginResult: PluginResult): void;
+			didEnterRegion(pluginResult: PluginResult): void;
+			didRangeBeaconsInRegion(pluginResult: PluginResult): void;
+			peripheralManagerDidStartAdvertising(pluginResult: PluginResult): void;
+			peripheralManagerDidUpdateState(pluginResult: PluginResult): void;
+			didChangeAuthorizationStatus(authorizationStatus: string): void;
+			monitoringDidFailForRegionWithError(pluginResult: PluginResult): void;
+		}
 
-	export interface BeaconRegion extends Region {
-		uuid: string;
-		major: string;
-		minor: string;
-		notifyEntryStateOnDisplay: boolean;
-		new (identifier: string, uuid: string, major?: number, minor?: number, notifyEntryStateOnDisplay?: boolean): BeaconRegion;
-	}
+		export interface Region {
+			identifier: string;
+			new (identifier: string): Region;
+		}
 
-	export interface CircularRegion extends Region {
-		latitude: number;
-		longitude: number;
-		radius: number;
-		new (identifier: string, latitude: number, longitude: number, radius: number): CircularRegion;
-	}
+		export interface BeaconRegion extends Region {
+			uuid: string;
+			major: string;
+			minor: string;
+			notifyEntryStateOnDisplay: boolean;
+			new (identifier: string, uuid: string, major?: number, minor?: number, notifyEntryStateOnDisplay?: boolean): BeaconRegion;
+		}
 
-	export interface Beacon {
-		uuid: string;
-		major: string;
-		minor: string;
-		proximity: string;
-		tx: number;
-		rssi: number;
-		accuracy: number;
+		export interface CircularRegion extends Region {
+			latitude: number;
+			longitude: number;
+			radius: number;
+			new (identifier: string, latitude: number, longitude: number, radius: number): CircularRegion;
+		}
+
+		export interface Beacon {
+			uuid: string;
+			major: string;
+			minor: string;
+			proximity: string;
+			tx: number;
+			rssi: number;
+			accuracy: number;
+		}
 	}
-}
+}
\ No newline at end of file
diff --git a/cordova-plugin-ibeacon/tsconfig.json b/cordova-plugin-ibeacon/tsconfig.json
index 603b991c64..af70edc7f5 100644
--- a/cordova-plugin-ibeacon/tsconfig.json
+++ b/cordova-plugin-ibeacon/tsconfig.json
@@ -12,6 +12,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/cordova-plugin-inappbrowser/cordova-plugin-inappbrowser-tests.ts b/cordova-plugin-inappbrowser/cordova-plugin-inappbrowser-tests.ts
index 43b0d28153..cef288c921 100644
--- a/cordova-plugin-inappbrowser/cordova-plugin-inappbrowser-tests.ts
+++ b/cordova-plugin-inappbrowser/cordova-plugin-inappbrowser-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts"/>
-
 // InAppBrowser plugin
 //----------------------------------------------------------------------
 
diff --git a/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts b/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts
index 3dce2776bf..767eaa6ed2 100644
--- a/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts
+++ b/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts"/>
-
 Keyboard.shrinkView(true);
 Keyboard.shrinkView(false);
 Keyboard.hideFormAccessoryBar(true);
diff --git a/cordova-plugin-media-capture/cordova-plugin-media-capture-tests.ts b/cordova-plugin-media-capture/cordova-plugin-media-capture-tests.ts
index 8bd56c714f..91fdefa74f 100644
--- a/cordova-plugin-media-capture/cordova-plugin-media-capture-tests.ts
+++ b/cordova-plugin-media-capture/cordova-plugin-media-capture-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts" />
-
 console.log('Supported audio modes are: ' + JSON.stringify(navigator.device.capture.supportedAudioModes));
 
 navigator.device.capture.captureAudio(
diff --git a/cordova-plugin-media/cordova-plugin-media-tests.ts b/cordova-plugin-media/cordova-plugin-media-tests.ts
index 76e39c8d7b..1c00c850e5 100644
--- a/cordova-plugin-media/cordova-plugin-media-tests.ts
+++ b/cordova-plugin-media/cordova-plugin-media-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts"/>
-
 // Media and Media Capture
 //----------------------------------------------------------------------
 
diff --git a/cordova-plugin-network-information/cordova-plugin-network-information-tests.ts b/cordova-plugin-network-information/cordova-plugin-network-information-tests.ts
index 702aeb5714..0c4bfd7a2d 100644
--- a/cordova-plugin-network-information/cordova-plugin-network-information-tests.ts
+++ b/cordova-plugin-network-information/cordova-plugin-network-information-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts" />
-
 var connType = navigator.connection.type;
 if (connType == Connection.WIFI) {
     console.log('Congratulations, you\'re with fast Internet!');
diff --git a/cordova-plugin-splashscreen/cordova-plugin-splashscreen-tests.ts b/cordova-plugin-splashscreen/cordova-plugin-splashscreen-tests.ts
index d24720eb1d..5938396ad4 100644
--- a/cordova-plugin-splashscreen/cordova-plugin-splashscreen-tests.ts
+++ b/cordova-plugin-splashscreen/cordova-plugin-splashscreen-tests.ts
@@ -1,4 +1,2 @@
-/// <reference path="index.d.ts"/>
-
 navigator.splashscreen.show();
 navigator.splashscreen.hide();
\ No newline at end of file
diff --git a/cordova-plugin-statusbar/cordova-plugin-statusbar-tests.ts b/cordova-plugin-statusbar/cordova-plugin-statusbar-tests.ts
index 9d22ca912c..623211d6c6 100644
--- a/cordova-plugin-statusbar/cordova-plugin-statusbar-tests.ts
+++ b/cordova-plugin-statusbar/cordova-plugin-statusbar-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="index.d.ts"/>
-
-
 var statusBar: StatusBar = window.StatusBar;
 statusBar.overlaysWebView(true);
 statusBar.overlaysWebView(false);
diff --git a/cordova-plugin-vibration/cordova-plugin-vibration-tests.ts b/cordova-plugin-vibration/cordova-plugin-vibration-tests.ts
index b34cd23675..33cdb43436 100644
--- a/cordova-plugin-vibration/cordova-plugin-vibration-tests.ts
+++ b/cordova-plugin-vibration/cordova-plugin-vibration-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts" />
-
 var notification: Notification;
 
 notification.vibrate(100);
diff --git a/cordova-plugin-websql/cordova-plugin-websql-tests.ts b/cordova-plugin-websql/cordova-plugin-websql-tests.ts
index 8679b3d5c3..c6299a489c 100644
--- a/cordova-plugin-websql/cordova-plugin-websql-tests.ts
+++ b/cordova-plugin-websql/cordova-plugin-websql-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="index.d.ts" />
-
-
 var db = window.openDatabase('Test', '0.1', 'test', 1024 * 1024 * 5);
 db.transaction(
     (tx: SqlTransaction) => {
diff --git a/core-js/core-js-tests.ts b/core-js/core-js-tests.ts
index 42cd770b86..0614b117b9 100644
--- a/core-js/core-js-tests.ts
+++ b/core-js/core-js-tests.ts
@@ -8,7 +8,7 @@ let s: string;
 let i: number;
 let b: boolean;
 let f: () => void;
-let o: Object;
+let o: {};
 let r: RegExp;
 let sym: symbol;
 let e: Error;
@@ -21,7 +21,7 @@ let arrayOfPoint3D: Point3D[];
 let arrayOfSymbol: symbol[];
 let arrayOfPropertyKey: PropertyKey[];
 let arrayOfAny: any[];
-let arrayOfStringAny: [string, any][];
+let arrayOfStringAny: Array<[string, any]>;
 let arrayLikeOfAny: ArrayLike<any>;
 let iterableOfPoint: Iterable<Point>;
 let iterableOfStringPoint: Iterable<[string, Point]>;
@@ -57,7 +57,7 @@ let dictOfAny: Dict<any>;
 
 // #############################################################################################
 // ECMAScript 6: Object & Function
-// Modules: es6.object.assign, es6.object.is, es6.object.set-prototype-of, 
+// Modules: es6.object.assign, es6.object.is, es6.object.set-prototype-of,
 //          es6.object.to-string, es6.function.name and es6.function.has-instance.
 // #############################################################################################
 
@@ -88,8 +88,8 @@ arrayOfPoint = Array.of(point, point);
 
 // #############################################################################################
 // ECMAScript 6: String & RegExp
-// Modules: es6.string.from-code-point, es6.string.raw, es6.string.code-point-at, 
-//          es6.string.ends-with, es6.string.includes, es6.string.repeat, 
+// Modules: es6.string.from-code-point, es6.string.raw, es6.string.code-point-at,
+//          es6.string.ends-with, es6.string.includes, es6.string.repeat,
 //          es6.string.starts-with, and es6.regexp
 // #############################################################################################
 
diff --git a/core-js/index.d.ts b/core-js/index.d.ts
index a0a10708d9..4191cd11aa 100644
--- a/core-js/index.d.ts
+++ b/core-js/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for core-js v0.9.7
+// Type definitions for core-js 0.9
 // Project: https://github.com/zloirock/core-js/
 // Definitions by: Ron Buckton <http://github.com/rbuckton>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /* *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -18,539 +19,12 @@ See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
 
-declare type PropertyKey = string | number | symbol;
-
-// #############################################################################################
-// ECMAScript 6: Object & Function
-// Modules: es6.object.assign, es6.object.is, es6.object.set-prototype-of,
-//          es6.object.to-string, es6.function.name and es6.function.has-instance.
-// #############################################################################################
-
-interface ObjectConstructor {
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source The source object from which to copy properties.
-      */
-    assign<T, U>(target: T, source: U): T & U;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source1 The first source object from which to copy properties.
-      * @param source2 The second source object from which to copy properties.
-      */
-    assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source1 The first source object from which to copy properties.
-      * @param source2 The second source object from which to copy properties.
-      * @param source3 The third source object from which to copy properties.
-      */
-    assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param sources One or more source objects from which to copy properties
-      */
-    assign(target: any, ...sources: any[]): any;
-
-    /**
-      * Returns true if the values are the same value, false otherwise.
-      * @param value1 The first value.
-      * @param value2 The second value.
-      */
-    is(value1: any, value2: any): boolean;
-
-    /**
-      * Sets the prototype of a specified object o to  object proto or null. Returns the object o.
-      * @param o The object to change its prototype.
-      * @param proto The value of the new prototype or null.
-      * @remarks Requires `__proto__` support.
-      */
-    setPrototypeOf(o: any, proto: any): any;
-}
-
-interface Function {
-    /**
-      * Returns the name of the function. Function names are read-only and can not be changed.
-      */
-    name: string;
-
-    /**
-      * Determines if a constructor object recognizes an object as one of the
-      * constructor’s instances.
-      * @param value The object to test.
-      */
-    [Symbol.hasInstance](value: any): boolean;
-}
-
-// #############################################################################################
-// ECMAScript 6: Array
-// Modules: es6.array.from, es6.array.of, es6.array.copy-within, es6.array.fill, es6.array.find,
-//          and es6.array.find-index
-// #############################################################################################
-
-interface Array<T> {
-    /**
-      * Returns the value of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
-
-    /**
-      * Returns the index of the first element in the array where predicate is true, and -1
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns -1.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: T) => boolean, thisArg?: any): number;
-
-    /**
-      * Returns the this object after filling the section identified by start and end with value
-      * @param value value to fill array section with
-      * @param start index to start filling the array at. If start is negative, it is treated as
-      * length+start where length is the length of the array.
-      * @param end index to stop filling the array at. If end is negative, it is treated as
-      * length+end.
-      */
-    fill(value: T, start?: number, end?: number): T[];
-
-    /**
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the
-      * length of the array.
-      * @param start If start is negative, it is treated as length+start. If end is negative, it
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value.
-      */
-    copyWithin(target: number, start: number, end?: number): T[];
-
-    [Symbol.unscopables]: any;
-}
-
-interface ArrayConstructor {
-    /**
-      * Creates an array from an array-like object.
-      * @param arrayLike An array-like object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
-
-    /**
-      * Creates an array from an iterable object.
-      * @param iterable An iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from<T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
-
-    /**
-      * Creates an array from an array-like object.
-      * @param arrayLike An array-like object to convert to an array.
-      */
-    from<T>(arrayLike: ArrayLike<T>): Array<T>;
-
-    /**
-      * Creates an array from an iterable object.
-      * @param iterable An iterable object to convert to an array.
-      */
-    from<T>(iterable: Iterable<T>): Array<T>;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of<T>(...items: T[]): Array<T>;
-}
-
-// #############################################################################################
-// ECMAScript 6: String & RegExp
-// Modules: es6.string.from-code-point, es6.string.raw, es6.string.code-point-at,
-//          es6.string.ends-with, es6.string.includes, es6.string.repeat,
-//          es6.string.starts-with, and es6.regexp
-// #############################################################################################
-
-interface String {
-    /**
-      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point
-      * value of the UTF-16 encoded code point starting at the string element at position pos in
-      * the String resulting from converting this object to a String.
-      * If there is no element at that position, the result is undefined.
-      * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos.
-      */
-    codePointAt(pos: number): number;
-
-    /**
-      * Returns true if searchString appears as a substring of the result of converting this
-      * object to a String, at one or more positions that are
-      * greater than or equal to position; otherwise, returns false.
-      * @param searchString search string
-      * @param position If position is undefined, 0 is assumed, so as to search all of the String.
-      */
-    includes(searchString: string, position?: number): boolean;
-
-    /**
-      * Returns true if the sequence of elements of searchString converted to a String is the
-      * same as the corresponding elements of this object (converted to a String) starting at
-      * endPosition – length(this). Otherwise returns false.
-      */
-    endsWith(searchString: string, endPosition?: number): boolean;
-
-    /**
-      * Returns a String value that is made from count copies appended together. If count is 0,
-      * T is the empty String is returned.
-      * @param count number of copies to append
-      */
-    repeat(count: number): string;
-
-    /**
-      * Returns true if the sequence of elements of searchString converted to a String is the
-      * same as the corresponding elements of this object (converted to a String) starting at
-      * position. Otherwise returns false.
-      */
-    startsWith(searchString: string, position?: number): boolean;
-}
-
-interface StringConstructor {
-    /**
-      * Return the String value whose elements are, in order, the elements in the List elements.
-      * If length is 0, the empty string is returned.
-      */
-    fromCodePoint(...codePoints: number[]): string;
-
-    /**
-      * String.raw is intended for use as a tag function of a Tagged Template String. When called
-      * as such the first argument will be a well formed template call site object and the rest
-      * parameter will contain the substitution values.
-      * @param template A well-formed template string call site representation.
-      * @param substitutions A set of substitution values.
-      */
-    raw(template: TemplateStringsArray, ...substitutions: any[]): string;
-}
-
-interface RegExp {
-    /**
-      * Returns a string indicating the flags of the regular expression in question. This field is read-only.
-      * The characters in this string are sequenced and concatenated in the following order:
-      *
-      *    - "g" for global
-      *    - "i" for ignoreCase
-      *    - "m" for multiline
-      *    - "u" for unicode
-      *    - "y" for sticky
-      *
-      * If no flags are set, the value is the empty string.
-      */
-    flags: string;
-}
-
-// #############################################################################################
-// ECMAScript 6: Number & Math
-// Modules: es6.number.constructor, es6.number.statics, and es6.math
-// #############################################################################################
-
-interface NumberConstructor {
-    /**
-      * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1
-      * that is representable as a Number value, which is approximately:
-      * 2.2204460492503130808472633361816 x 10‍−‍16.
-      */
-    EPSILON: number;
-
-    /**
-      * Returns true if passed value is finite.
-      * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a
-      * number. Only finite values of the type number, result in true.
-      * @param number A numeric value.
-      */
-    isFinite(number: number): boolean;
-
-    /**
-      * Returns true if the value passed is an integer, false otherwise.
-      * @param number A numeric value.
-      */
-    isInteger(number: number): boolean;
-
-    /**
-      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a
-      * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter
-      * to a number. Only values of the type number, that are also NaN, result in true.
-      * @param number A numeric value.
-      */
-    isNaN(number: number): boolean;
-
-    /**
-      * Returns true if the value passed is a safe integer.
-      * @param number A numeric value.
-      */
-    isSafeInteger(number: number): boolean;
-
-    /**
-      * The value of the largest integer n such that n and n + 1 are both exactly representable as
-      * a Number value.
-      * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1.
-      */
-    MAX_SAFE_INTEGER: number;
-
-    /**
-      * The value of the smallest integer n such that n and n − 1 are both exactly representable as
-      * a Number value.
-      * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)).
-      */
-    MIN_SAFE_INTEGER: number;
-
-    /**
-      * Converts a string to a floating-point number.
-      * @param string A string that contains a floating-point number.
-      */
-    parseFloat(string: string): number;
-
-    /**
-      * Converts A string to an integer.
-      * @param s A string to convert into a number.
-      * @param radix A value between 2 and 36 that specifies the base of the number in numString.
-      * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
-      * All other strings are considered decimal.
-      */
-    parseInt(string: string, radix?: number): number;
-}
-
-interface Math {
-    /**
-      * Returns the number of leading zero bits in the 32-bit binary representation of a number.
-      * @param x A numeric expression.
-      */
-    clz32(x: number): number;
-
-    /**
-      * Returns the result of 32-bit multiplication of two numbers.
-      * @param x First number
-      * @param y Second number
-      */
-    imul(x: number, y: number): number;
-
-    /**
-      * Returns the sign of the x, indicating whether x is positive, negative or zero.
-      * @param x The numeric expression to test
-      */
-    sign(x: number): number;
-
-    /**
-      * Returns the base 10 logarithm of a number.
-      * @param x A numeric expression.
-      */
-    log10(x: number): number;
-
-    /**
-      * Returns the base 2 logarithm of a number.
-      * @param x A numeric expression.
-      */
-    log2(x: number): number;
-
-    /**
-      * Returns the natural logarithm of 1 + x.
-      * @param x A numeric expression.
-      */
-    log1p(x: number): number;
-
-    /**
-      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of
-      * the natural logarithms).
-      * @param x A numeric expression.
-      */
-    expm1(x: number): number;
-
-    /**
-      * Returns the hyperbolic cosine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    cosh(x: number): number;
-
-    /**
-      * Returns the hyperbolic sine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    sinh(x: number): number;
-
-    /**
-      * Returns the hyperbolic tangent of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    tanh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic cosine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    acosh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic sine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    asinh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic tangent of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    atanh(x: number): number;
-
-    /**
-      * Returns the square root of the sum of squares of its arguments.
-      * @param values Values to compute the square root for.
-      *     If no arguments are passed, the result is +0.
-      *     If there is only one argument, the result is the absolute value.
-      *     If any argument is +Infinity or -Infinity, the result is +Infinity.
-      *     If any argument is NaN, the result is NaN.
-      *     If all arguments are either +0 or −0, the result is +0.
-      */
-    hypot(...values: number[]): number;
-
-    /**
-      * Returns the integral part of the a numeric expression, x, removing any fractional digits.
-      * If x is already an integer, the result is x.
-      * @param x A numeric expression.
-      */
-    trunc(x: number): number;
-
-    /**
-      * Returns the nearest single precision float representation of a number.
-      * @param x A numeric expression.
-      */
-    fround(x: number): number;
-
-    /**
-      * Returns an implementation-dependent approximation to the cube root of number.
-      * @param x A numeric expression.
-      */
-    cbrt(x: number): number;
-}
-
 // #############################################################################################
 // ECMAScript 6: Symbols
 // Modules: es6.symbol
 // #############################################################################################
 
-interface Symbol {
-    /** Returns a string representation of an object. */
-    toString(): string;
-
-    [Symbol.toStringTag]: string;
-}
-
 interface SymbolConstructor {
-    /**
-      * A reference to the prototype.
-      */
-    prototype: Symbol;
-
-    /**
-      * Returns a new unique Symbol value.
-      * @param  description Description of the new Symbol object.
-      */
-    (description?: string|number): symbol;
-
-    /**
-      * Returns a Symbol object from the global symbol registry matching the given key if found.
-      * Otherwise, returns a new symbol with this key.
-      * @param key key to search for.
-      */
-    for(key: string): symbol;
-
-    /**
-      * Returns a key from the global symbol registry matching the given Symbol if found.
-      * Otherwise, returns a undefined.
-      * @param sym Symbol to find the key for.
-      */
-    keyFor(sym: symbol): string;
-
-    // Well-known Symbols
-
-    /**
-      * A method that determines if a constructor object recognizes an object as one of the
-      * constructor’s instances. Called by the semantics of the instanceof operator.
-      */
-    hasInstance: symbol;
-
-    /**
-      * A Boolean value that if true indicates that an object should flatten to its array elements
-      * by Array.prototype.concat.
-      */
-    isConcatSpreadable: symbol;
-
-    /**
-      * A method that returns the default iterator for an object. Called by the semantics of the
-      * for-of statement.
-      */
-    iterator: symbol;
-
-    /**
-      * A regular expression method that matches the regular expression against a string. Called
-      * by the String.prototype.match method.
-      */
-    match: symbol;
-
-    /**
-      * A regular expression method that replaces matched substrings of a string. Called by the
-      * String.prototype.replace method.
-      */
-    replace: symbol;
-
-    /**
-      * A regular expression method that returns the index within a string that matches the
-      * regular expression. Called by the String.prototype.search method.
-      */
-    search: symbol;
-
-    /**
-      * A function valued property that is the constructor function that is used to create
-      * derived objects.
-      */
-    species: symbol;
-
-    /**
-      * A regular expression method that splits a string at the indices that match the regular
-      * expression. Called by the String.prototype.split method.
-      */
-    split: symbol;
-
-    /**
-      * A method that converts an object to a corresponding primitive value.Called by the ToPrimitive
-      * abstract operation.
-      */
-    toPrimitive: symbol;
-
-    /**
-      * A String value that is used in the creation of the default string description of an object.
-      * Called by the built-in method Object.prototype.toString.
-      */
-    toStringTag: symbol;
-
-    /**
-      * An Object whose own property names are property names that are excluded from the with
-      * environment bindings of the associated objects.
-      */
-    unscopables: symbol;
-
     /**
       * Non-standard. Use simple mode for core-js symbols. See https://github.com/zloirock/core-js/#caveats-when-using-symbol-polyfill
       */
@@ -562,193 +36,6 @@ interface SymbolConstructor {
     userSetter(): void;
 }
 
-declare var Symbol: SymbolConstructor;
-
-interface Object {
-    /**
-      * Determines whether an object has a property with the specified name.
-      * @param v A property name.
-      */
-    hasOwnProperty(v: PropertyKey): boolean;
-
-    /**
-      * Determines whether a specified property is enumerable.
-      * @param v A property name.
-      */
-    propertyIsEnumerable(v: PropertyKey): boolean;
-}
-
-interface ObjectConstructor {
-    /**
-      * Returns an array of all symbol properties found directly on object o.
-      * @param o Object to retrieve the symbols from.
-      */
-    getOwnPropertySymbols(o: any): symbol[];
-
-    /**
-      * Gets the own property descriptor of the specified object.
-      * An own property descriptor is one that is defined directly on the object and is not
-      * inherited from the object's prototype.
-      * @param o Object that contains the property.
-      * @param p Name of the property.
-    */
-    getOwnPropertyDescriptor(o: any, propertyKey: PropertyKey): PropertyDescriptor;
-
-    /**
-      * Adds a property to an object, or modifies attributes of an existing property.
-      * @param o Object on which to add or modify the property. This can be a native JavaScript
-      * object (that is, a user-defined object or a built in object) or a DOM object.
-      * @param p The property name.
-      * @param attributes Descriptor for the property. It can be for a data property or an accessor
-      *  property.
-      */
-    defineProperty(o: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): any;
-}
-
-interface Math {
-    [Symbol.toStringTag]: string;
-}
-
-interface JSON {
-    [Symbol.toStringTag]: string;
-}
-
-// #############################################################################################
-// ECMAScript 6: Collections
-// Modules: es6.map, es6.set, es6.weak-map, and es6.weak-set
-// #############################################################################################
-
-interface Map<K, V> {
-    clear(): void;
-    delete(key: K): boolean;
-    forEach(callbackfn: (value: V, index: K, map: Map<K, V>) => void, thisArg?: any): void;
-    get(key: K): V;
-    has(key: K): boolean;
-    set(key: K, value?: V): Map<K, V>;
-    size: number;
-}
-
-interface MapConstructor {
-    new <K, V>(): Map<K, V>;
-    new <K, V>(iterable: Iterable<[K, V]>): Map<K, V>;
-    prototype: Map<any, any>;
-}
-
-declare var Map: MapConstructor;
-
-interface Set<T> {
-    add(value: T): Set<T>;
-    clear(): void;
-    delete(value: T): boolean;
-    forEach(callbackfn: (value: T, index: T, set: Set<T>) => void, thisArg?: any): void;
-    has(value: T): boolean;
-    size: number;
-}
-
-interface SetConstructor {
-    new <T>(): Set<T>;
-    new <T>(iterable: Iterable<T>): Set<T>;
-    prototype: Set<any>;
-}
-
-declare var Set: SetConstructor;
-
-interface WeakMap<K, V> {
-    delete(key: K): boolean;
-    get(key: K): V;
-    has(key: K): boolean;
-    set(key: K, value?: V): WeakMap<K, V>;
-}
-
-interface WeakMapConstructor {
-    new <K, V>(): WeakMap<K, V>;
-    new <K, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
-    prototype: WeakMap<any, any>;
-}
-
-declare var WeakMap: WeakMapConstructor;
-
-interface WeakSet<T> {
-    add(value: T): WeakSet<T>;
-    delete(value: T): boolean;
-    has(value: T): boolean;
-}
-
-interface WeakSetConstructor {
-    new <T>(): WeakSet<T>;
-    new <T>(iterable: Iterable<T>): WeakSet<T>;
-    prototype: WeakSet<any>;
-}
-
-declare var WeakSet: WeakSetConstructor;
-
-// #############################################################################################
-// ECMAScript 6: Iterators
-// Modules: es6.string.iterator, es6.array.iterator, es6.map, es6.set, web.dom.iterable
-// #############################################################################################
-
-interface IteratorResult<T> {
-    done: boolean;
-    value?: T;
-}
-
-interface Iterator<T> {
-    next(value?: any): IteratorResult<T>;
-    return?(value?: any): IteratorResult<T>;
-    throw?(e?: any): IteratorResult<T>;
-}
-
-interface Iterable<T> {
-    [Symbol.iterator](): Iterator<T>;
-}
-
-interface IterableIterator<T> extends Iterator<T> {
-    [Symbol.iterator](): IterableIterator<T>;
-}
-
-interface String {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<string>;
-}
-
-interface Array<T> {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<T>;
-
-    /**
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, T]>;
-
-    /**
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-
-    /**
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<T>;
-}
-
-interface Map<K, V> {
-    entries(): IterableIterator<[K, V]>;
-    keys(): IterableIterator<K>;
-    values(): IterableIterator<V>;
-    [Symbol.iterator](): IterableIterator<[K, V]>;
-}
-
-interface Set<T> {
-    entries(): IterableIterator<[T, T]>;
-    keys(): IterableIterator<T>;
-    values(): IterableIterator<T>;
-    [Symbol.iterator](): IterableIterator<T>;
-}
-
-interface NodeList {
-    [Symbol.iterator](): IterableIterator<Node>;
-}
-
 interface $for<T> extends IterableIterator<T> {
     of(callbackfn: (value: T, key: any) => void, thisArg?: any): void;
     array(): T[];
@@ -759,135 +46,6 @@ interface $for<T> extends IterableIterator<T> {
 
 declare function $for<T>(iterable: Iterable<T>): $for<T>;
 
-// #############################################################################################
-// ECMAScript 6: Promises
-// Modules: es6.promise
-// #############################################################################################
-
-interface PromiseLike<T> {
-    /**
-    * Attaches callbacks for the resolution and/or rejection of the Promise.
-    * @param onfulfilled The callback to execute when the Promise is resolved.
-    * @param onrejected The callback to execute when the Promise is rejected.
-    * @returns A Promise for the completion of which ever callback is executed.
-    */
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<TResult>;
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): PromiseLike<TResult>;
-}
-
-/**
- * Represents the completion of an asynchronous operation
- */
-interface Promise<T> {
-    /**
-    * Attaches callbacks for the resolution and/or rejection of the Promise.
-    * @param onfulfilled The callback to execute when the Promise is resolved.
-    * @param onrejected The callback to execute when the Promise is rejected.
-    * @returns A Promise for the completion of which ever callback is executed.
-    */
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
-
-    /**
-     * Attaches a callback for only the rejection of the Promise.
-     * @param onrejected The callback to execute when the Promise is rejected.
-     * @returns A Promise for the completion of the callback.
-     */
-    catch(onrejected?: (reason: any) => T | PromiseLike<T>): Promise<T>;
-    catch(onrejected?: (reason: any) => void): Promise<T>;
-}
-
-interface PromiseConstructor {
-    /**
-      * A reference to the prototype.
-      */
-    prototype: Promise<any>;
-
-    /**
-     * Creates a new Promise.
-     * @param executor A callback used to initialize the promise. This callback is passed two arguments:
-     * a resolve callback used resolve the promise with a value or the result of another promise,
-     * and a reject callback used to reject the promise with a provided reason or error.
-     */
-    new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
-
-    /**
-     * Creates a Promise that is resolved with an array of results when all of the provided Promises
-     * resolve, or rejected when any Promise is rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
-    all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
-    all<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
-    all<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>;
-    all<T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>;
-    all<T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>]): Promise<[T1, T2, T3, T4, T5]>;
-    all<T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>]): Promise<[T1, T2, T3, T4]>;
-    all<T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<[T1, T2, T3]>;
-    all<T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
-    all<TAll>(values: Iterable<TAll | PromiseLike<TAll>>): Promise<TAll[]>;
-
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
-     * or rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    race<T>(values: Iterable<T | PromiseLike<T>>): Promise<T>;
-
-    /**
-     * Creates a new rejected promise for the provided reason.
-     * @param reason The reason the promise was rejected.
-     * @returns A new rejected Promise.
-     */
-    reject(reason: any): Promise<void>;
-
-    /**
-     * Creates a new rejected promise for the provided reason.
-     * @param reason The reason the promise was rejected.
-     * @returns A new rejected Promise.
-     */
-    reject<T>(reason: any): Promise<T>;
-
-    /**
-      * Creates a new resolved promise for the provided value.
-      * @param value A promise.
-      * @returns A promise whose internal state matches the provided promise.
-      */
-    resolve<T>(value: T | PromiseLike<T>): Promise<T>;
-
-    /**
-     * Creates a new resolved promise .
-     * @returns A resolved promise.
-     */
-    resolve(): Promise<void>;
-}
-
-declare var Promise: PromiseConstructor;
-
-// #############################################################################################
-// ECMAScript 6: Reflect
-// Modules: es6.reflect
-// #############################################################################################
-
-declare namespace Reflect {
-    function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
-    function construct(target: Function, argumentsList: ArrayLike<any>, newTarget?: any): any;
-    function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
-    function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
-    function enumerate(target: any): IterableIterator<any>;
-    function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
-    function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
-    function getPrototypeOf(target: any): any;
-    function has(target: any, propertyKey: PropertyKey): boolean;
-    function isExtensible(target: any): boolean;
-    function ownKeys(target: any): Array<PropertyKey>;
-    function preventExtensions(target: any): boolean;
-    function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
-    function setPrototypeOf(target: any, proto: any): boolean;
-}
-
 // #############################################################################################
 // ECMAScript 7
 // Modules: es7.array.includes, es7.string.at, es7.string.pad-start, es7.string.pad-end,
@@ -895,19 +53,11 @@ declare namespace Reflect {
 //          es7.map.to-json, and es7.set.to-json
 // #############################################################################################
 
-interface Array<T> {
-    includes(value: T, fromIndex?: number): boolean;
-}
-
 interface String {
     at(index: number): string;
-    padStart(length: number, fillStr?: string): string;
-    padEnd(length: number, fillStr?: string): string;
 }
 
-interface ObjectConstructor {
-    values(object: any): any[];
-    entries(object: any): [string, any][];
+interface Object {
     getOwnPropertyDescriptors(object: any): PropertyDescriptorMap;
 }
 
@@ -942,7 +92,7 @@ interface ArrayConstructor {
       * Combines two or more arrays.
       * @param items Additional items to add to the end of array1.
       */
-    concat<T>(array: ArrayLike<T>, ...items: (T[]| T)[]): T[];
+    concat<T>(array: ArrayLike<T>, ...items: Array<T[]| T>): T[];
     /**
       * Adds all the elements of an array separated by the specified separator string.
       * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
@@ -969,19 +119,13 @@ interface ArrayConstructor {
       */
     sort<T>(array: ArrayLike<T>, compareFn?: (a: T, b: T) => number): T[];
 
-    /**
-      * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
-      * @param start The zero-based location in the array from which to start removing elements.
-      */
-    splice<T>(array: ArrayLike<T>, start: number): T[];
-
     /**
       * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
       * @param start The zero-based location in the array from which to start removing elements.
       * @param deleteCount The number of elements to remove.
       * @param items Elements to insert into the array in place of the deleted elements.
       */
-    splice<T>(array: ArrayLike<T>, start: number, deleteCount: number, ...items: T[]): T[];
+    splice<T>(array: ArrayLike<T>, start: number, deleteCount?: number, ...items: T[]): T[];
 
     /**
       * Inserts new elements at the start of an array.
@@ -1005,14 +149,16 @@ interface ArrayConstructor {
 
     /**
       * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of the array.
+      * @param callbackfn  A function that accepts up to three arguments.
+      *        The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of the array.
       * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
       */
     every<T>(array: ArrayLike<T>, callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
 
     /**
       * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of the array.
+      * @param callbackfn A function that accepts up to three arguments.
+      *        The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of the array.
       * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
       */
     some<T>(array: ArrayLike<T>, callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
@@ -1039,30 +185,38 @@ interface ArrayConstructor {
     filter<T>(array: ArrayLike<T>, callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
 
     /**
-      * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * Calls the specified callback function for all the elements in an array.
+      * The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation.
+      *        The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduce<T, U>(array: ArrayLike<T>, callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
 
     /**
-      * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * Calls the specified callback function for all the elements in an array.
+      * The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation.
+      *        The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduce<T>(array: ArrayLike<T>, callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
 
     /**
-      * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * Calls the specified callback function for all the elements in an array, in descending order.
+      * The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation.
+      *        The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduceRight<T, U>(array: ArrayLike<T>, callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
 
     /**
-      * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * Calls the specified callback function for all the elements in an array, in descending order.
+      * The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation.
+      *        The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduceRight<T>(array: ArrayLike<T>, callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
 
@@ -1090,7 +244,7 @@ interface ArrayConstructor {
       * @param thisArg If provided, it will be used as the this value for each invocation of
       * predicate. If it is not provided, undefined is used instead.
       */
-    find<T>(array: ArrayLike<T>, predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
+    find<T>(array: ArrayLike<T>, predicate: (value: T, index: number, obj: T[]) => boolean, thisArg?: any): T;
 
     /**
       * Returns the index of the first element in the array where predicate is true, and undefined
@@ -1125,8 +279,8 @@ interface ArrayConstructor {
     copyWithin<T>(array: ArrayLike<T>, target: number, start: number, end?: number): T[];
 
     includes<T>(array: ArrayLike<T>, value: T, fromIndex?: number): boolean;
-    turn<T, U>(array: ArrayLike<T>, callbackfn: (memo: U, value: T, index: number, array: Array<T>) => void, memo?: U): U;
-    turn<T>(array: ArrayLike<T>, callbackfn: (memo: Array<T>, value: T, index: number, array: Array<T>) => void, memo?: Array<T>): Array<T>;
+    turn<T, U>(array: ArrayLike<T>, callbackfn: (memo: U, value: T, index: number, array: T[]) => void, memo?: U): U;
+    turn<T>(array: ArrayLike<T>, callbackfn: (memo: T[], value: T, index: number, array: T[]) => void, memo?: T[]): T[];
 }
 
 // #############################################################################################
@@ -1180,7 +334,7 @@ declare var log: Log;
 interface Dict<T> {
     [key: string]: T;
     [key: number]: T;
-    //[key: symbol]: T;
+    // [key: symbol]: T;
 }
 
 interface DictConstructor {
@@ -1257,12 +411,12 @@ interface Array<T> {
     /**
       * Non-standard.
       */
-    turn<U>(callbackfn: (memo: U, value: T, index: number, array: Array<T>) => void, memo?: U): U;
+    turn<U>(callbackfn: (memo: U, value: T, index: number, array: T[]) => void, memo?: U): U;
 
     /**
       * Non-standard.
       */
-    turn(callbackfn: (memo: Array<T>, value: T, index: number, array: Array<T>) => void, memo?: Array<T>): Array<T>;
+    turn(callbackfn: (memo: T[], value: T, index: number, array: T[]) => void, memo?: T[]): T[];
 }
 
 // #############################################################################################
@@ -1313,10 +467,9 @@ declare namespace core {
         function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
         function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
         function getPrototypeOf(target: any): any;
-        function has(target: any, propertyKey: string): boolean;
-        function has(target: any, propertyKey: symbol): boolean;
+        function has(target: any, propertyKey: string | symbol): boolean;
         function isExtensible(target: any): boolean;
-        function ownKeys(target: any): Array<PropertyKey>;
+        function ownKeys(target: any): PropertyKey[];
         function preventExtensions(target: any): boolean;
         function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
         function setPrototypeOf(target: any, proto: any): boolean;
@@ -1324,10 +477,8 @@ declare namespace core {
 
     var Object: {
         getPrototypeOf(o: any): any;
-        getOwnPropertyDescriptor(o: any, p: string): PropertyDescriptor;
         getOwnPropertyNames(o: any): string[];
         create(o: any, properties?: PropertyDescriptorMap): any;
-        defineProperty(o: any, p: string, attributes: PropertyDescriptor): any;
         defineProperties(o: any, properties: PropertyDescriptorMap): any;
         seal<T>(o: T): T;
         freeze<T>(o: T): T;
@@ -1357,21 +508,18 @@ declare namespace core {
     };
 
     var Array: {
-        from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
-        from<T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
-        from<T>(arrayLike: ArrayLike<T>): Array<T>;
-        from<T>(iterable: Iterable<T>): Array<T>;
-        of<T>(...items: T[]): Array<T>;
+        from<T, U>(arrayLike: ArrayLike<T> | Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
+        from<T>(arrayLike: ArrayLike<T> | Iterable<T>): T[];
+        of<T>(...items: T[]): T[];
         push<T>(array: ArrayLike<T>, ...items: T[]): number;
         pop<T>(array: ArrayLike<T>): T;
-        concat<T>(array: ArrayLike<T>, ...items: (T[]| T)[]): T[];
+        concat<T>(array: ArrayLike<T>, ...items: Array<T[] | T>): T[];
         join<T>(array: ArrayLike<T>, separator?: string): string;
         reverse<T>(array: ArrayLike<T>): T[];
         shift<T>(array: ArrayLike<T>): T;
         slice<T>(array: ArrayLike<T>, start?: number, end?: number): T[];
         sort<T>(array: ArrayLike<T>, compareFn?: (a: T, b: T) => number): T[];
-        splice<T>(array: ArrayLike<T>, start: number): T[];
-        splice<T>(array: ArrayLike<T>, start: number, deleteCount: number, ...items: T[]): T[];
+        splice<T>(array: ArrayLike<T>, start: number, deleteCount?: number, ...items: T[]): T[];
         unshift<T>(array: ArrayLike<T>, ...items: T[]): number;
         indexOf<T>(array: ArrayLike<T>, searchElement: T, fromIndex?: number): number;
         lastIndexOf<T>(array: ArrayLike<T>, earchElement: T, fromIndex?: number): number;
@@ -1387,13 +535,13 @@ declare namespace core {
         entries<T>(array: ArrayLike<T>): IterableIterator<[number, T]>;
         keys<T>(array: ArrayLike<T>): IterableIterator<number>;
         values<T>(array: ArrayLike<T>): IterableIterator<T>;
-        find<T>(array: ArrayLike<T>, predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
+        find<T>(array: ArrayLike<T>, predicate: (value: T, index: number, obj: T[]) => boolean, thisArg?: any): T;
         findIndex<T>(array: ArrayLike<T>, predicate: (value: T) => boolean, thisArg?: any): number;
         fill<T>(array: ArrayLike<T>, value: T, start?: number, end?: number): T[];
         copyWithin<T>(array: ArrayLike<T>, target: number, start: number, end?: number): T[];
         includes<T>(array: ArrayLike<T>, value: T, fromIndex?: number): boolean;
-        turn<T>(array: ArrayLike<T>, callbackfn: (memo: Array<T>, value: T, index: number, array: Array<T>) => void, memo?: Array<T>): Array<T>;
-        turn<T, U>(array: ArrayLike<T>, callbackfn: (memo: U, value: T, index: number, array: Array<T>) => void, memo?: U): U;
+        turn<T>(array: ArrayLike<T>, callbackfn: (memo: T[], value: T, index: number, array: T[]) => void, memo?: T[]): T[];
+        turn<T, U>(array: ArrayLike<T>, callbackfn: (memo: U, value: T, index: number, array: T[]) => void, memo?: U): U;
     };
 
     var String: {
@@ -1782,8 +930,7 @@ declare module "core-js/fn/function/has-instance" {
     var hasInstance: (value: any) => boolean;
     export = hasInstance;
 }
-declare module "core-js/fn/function/name"
-{
+declare module "core-js/fn/function/name" {
 }
 declare module "core-js/fn/function/part" {
     var part: typeof core.Function.part;
diff --git a/core-js/tsconfig.json b/core-js/tsconfig.json
index b37502a626..8c7007b563 100644
--- a/core-js/tsconfig.json
+++ b/core-js/tsconfig.json
@@ -2,8 +2,9 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "dom"
+            "es2017",
+            "dom",
+            "dom.iterable"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/mobservable/tslint.json b/core-js/tslint.json
similarity index 97%
rename from mobservable/tslint.json
rename to core-js/tslint.json
index f05741c59b..0f47deabb4 100644
--- a/mobservable/tslint.json
+++ b/core-js/tslint.json
@@ -3,4 +3,4 @@
     "rules": {
         "forbidden-types": false
     }
-}
+}
\ No newline at end of file
diff --git a/cors/index.d.ts b/cors/index.d.ts
index ecad80d187..6c1fc3e4c3 100644
--- a/cors/index.d.ts
+++ b/cors/index.d.ts
@@ -10,7 +10,7 @@ import express = require('express');
 
 type CustomOrigin = (
     requestOrigin: string,
-    callback: (err: Error, allow?: boolean) => void
+    callback: (err: Error | null, allow?: boolean) => void
 ) => void;
 
 declare namespace e {
diff --git a/cryptojs/test/md5-tests.ts b/cryptojs/test/md5-tests.ts
index d44496aae5..4063750d7d 100644
--- a/cryptojs/test/md5-tests.ts
+++ b/cryptojs/test/md5-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="yui" />
-
-
 YUI.add('algo-md5-test', function (Y) {
     var C = CryptoJS;
 
diff --git a/csprng/csprng-tests.ts b/csprng/csprng-tests.ts
new file mode 100644
index 0000000000..aafddc4021
--- /dev/null
+++ b/csprng/csprng-tests.ts
@@ -0,0 +1,5 @@
+import csprng = require("csprng");
+
+let rngStr: string;
+
+rngStr = csprng(32, 16);
diff --git a/csprng/index.d.ts b/csprng/index.d.ts
new file mode 100644
index 0000000000..90aa83b017
--- /dev/null
+++ b/csprng/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for csprng 0.1
+// Project: https://github.com/jcoglan/node-csprng
+// Definitions by: Wink Saville <https://github.com/winksaville>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+export = csprng;
+
+declare function csprng(bits: number, radix: number): string;
diff --git a/csprng/tsconfig.json b/csprng/tsconfig.json
new file mode 100644
index 0000000000..0877c1ab25
--- /dev/null
+++ b/csprng/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "csprng-tests.ts"
+    ]
+}
diff --git a/csprng/tslint.json b/csprng/tslint.json
new file mode 100644
index 0000000000..ec365f164b
--- /dev/null
+++ b/csprng/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../tslint.json"
+}
diff --git a/css-modules-require-hook/css-modules-require-hook-tests.ts b/css-modules-require-hook/css-modules-require-hook-tests.ts
index 0e2e366f96..93da1326bd 100644
--- a/css-modules-require-hook/css-modules-require-hook-tests.ts
+++ b/css-modules-require-hook/css-modules-require-hook-tests.ts
@@ -1,4 +1,3 @@
-/// <reference types="css-modules-require-hook" />
 /// <reference types="node" />
 
 import * as hook from 'css-modules-require-hook';
@@ -63,7 +62,7 @@ hook({ extensions: ['.scss', '.sass'] });
 
 hook({ ignore: (file: string) => false });
 hook({ ignore: 'unused' });
-hook({ ignore: /\.test\.(css|scss|sass)/$ });
+hook({ ignore: /\.test\.(css|scss|sass)$/ });
 
 //
 // https://github.com/css-modules/css-modules-require-hook/blob/master/README.md#preprocesscss-function
diff --git a/csv-parse/csv-parse-tests.ts b/csv-parse/csv-parse-tests.ts
index 21df979d82..b0f13121fe 100644
--- a/csv-parse/csv-parse-tests.ts
+++ b/csv-parse/csv-parse-tests.ts
@@ -2,27 +2,27 @@ import parse = require('csv-parse');
 
 function callbackAPITest() {
     var input = '#Welcome\n"1","2","3","4"\n"a","b","c","d"';
-    parse(input, {comment: '#'}, function(err, output){
-    output.should.eql([ [ '1', '2', '3', '4' ], [ 'a', 'b', 'c', 'd' ] ]);
+    parse(input, {comment: '#'}, (err, output) => {
+        output.should.eql([ [ '1', '2', '3', '4' ], [ 'a', 'b', 'c', 'd' ] ]);
     });
 }
 
 function streamAPITest() {
-    let output:string[][] = [];
+    let output: string[][] = [];
     // Create the parser
     var parser = parse({delimiter: ':'});
     let record: string[];
     // Use the writable stream api
-    parser.on('readable', function(){
-        while(record = parser.read()){
+    parser.on('readable', () => {
+        while (record = parser.read()) {
             output.push(record);
         }
     });
     // Catch any error
-    parser.on('error', function(err: any){
+    parser.on('error', (err: any) => {
         console.log(err.message);
     });
-    parser.on('finish', function(){
+    parser.on('finish', () => {
         console.log(output);
     });
     // Now that setup is done, write data to the stream
@@ -37,12 +37,12 @@ import fs = require('fs');
 function pipeFunctionTest() {
     var transform = require('stream-transform');
 
-    var output:any = [];
+    var output: any = [];
     var parser = parse({delimiter: ':'})
     var input = fs.createReadStream('/etc/passwd');
-    var transformer = transform(function(record: any[], callback: any){
-    setTimeout(function(){
-        callback(null, record.join(' ')+'\n');
+    var transformer = transform((record: any[], callback: any) => {
+    setTimeout(() => {
+        callback(null, record.join(' ') + '\n');
     }, 500);
     }, {parallel: 10});
     input.pipe(parser).pipe(transformer).pipe(process.stdout);
diff --git a/csv-parse/index.d.ts b/csv-parse/index.d.ts
index 5cdfe164ef..e780bac27d 100644
--- a/csv-parse/index.d.ts
+++ b/csv-parse/index.d.ts
@@ -1,136 +1,120 @@
-// Type definitions for csv-parse 1.1.0
+// Type definitions for csv-parse 1.1
 // Project: https://github.com/wdavidw/node-csv-parse
 // Definitions by: David Muller <https://github.com/davidm77>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
-declare module "csv-parse/types" {
-    interface callbackFn {
-        (err: any, output: any): void
-    }
+import * as stream from "stream";
 
-    interface nameCallback {
-        (line1: any[]): boolean | string[]
-    }
+export = parse;
 
-    interface options {
-        /***
-         *  Set the field delimiter. One character only, defaults to comma.
-         */
-        delimiter?: string;
+declare function parse(input: string, options?: parse.Options, callback?: parse.Callback): any;
+declare function parse(options?: parse.Options, callback?: parse.Callback): any;
+declare function parse(callback?: parse.Callback): any;
+declare namespace parse {
+    type Callback = (err: any, output: any) => void;
 
-        /***
-         *  String used to delimit record rows or a special value; special constants are 'auto', 'unix', 'mac', 'windows', 'unicode'; defaults to 'auto' (discovered in source or 'unix' if no source is specified).
-         */
-        rowDelimiter?:  string;
-        /***
-         *  Optional character surrounding a field, one character only, defaults to double quotes.
-         */
-        quote?: string
-
-        /***
-         *  Set the escape character, one character only, defaults to double quotes.
-         */
-        escape?: string
-
-        /***
-         *  List of fields as an array, a user defined callback accepting the first line and returning the column names or true if autodiscovered in the first CSV line, default to null, affect the result data set in the sense that records will be objects instead of arrays.
-         */
-        columns?: any[]|boolean|nameCallback;
-
-        /***
-         *  Treat all the characters after this one as a comment, default to '' (disabled).
-         */
-        comment?: string
-
-        /***
-         *  Name of header-record title to name objects by.
-         */
-        objname?: string
-
-        /***
-         *  Preserve quotes inside unquoted field.
-         */
-        relax?: boolean
-
-        /***
-         *  Discard inconsistent columns count, default to false.
-         */
-        relax_column_count?: boolean
-
-        /***
-         *  Dont generate empty values for empty lines.
-         */
-        skip_empty_lines?: boolean
-
-        /***
-         *  Maximum numer of characters to be contained in the field and line buffers before an exception is raised, used to guard against a wrong delimiter or rowDelimiter, default to 128000 characters.
-         */
-        max_limit_on_data_read?: number
-
-        /***
-         *  If true, ignore whitespace immediately around the delimiter, defaults to false. Does not remove whitespace in a quoted field.
-         */
-        trim?: boolean
-
-        /***
-         *  If true, ignore whitespace immediately following the delimiter (i.e. left-trim all fields), defaults to false. Does not remove whitespace in a quoted field.
-         */
-        ltrim?: boolean
-
-        /***
-         *  If true, ignore whitespace immediately preceding the delimiter (i.e. right-trim all fields), defaults to false. Does not remove whitespace in a quoted field.
-         */
-        rtrim?: boolean
-
-        /***
-         *  If true, the parser will attempt to convert read data types to native types.
-         */
-        auto_parse?: boolean
-
-        /***
-         *  If true, the parser will attempt to convert read data types to dates. It requires the "auto_parse" option.
-         */
-        auto_parse_date?: boolean
-    }
-
-    import * as stream from "stream";
-
-    interface Parser extends stream.Transform {
+    interface Parser extends stream.Transform {}
+    class Parser {
+        constructor(options: Options);
         __push(line: any): any ;
         __write(chars: any, end: any, callback: any): any;
     }
 
-    interface ParserConstructor {
-       new (options: options): Parser;
+    interface Options {
+        /**
+         * Set the field delimiter. One character only, defaults to comma.
+         */
+        delimiter?: string;
+
+        /**
+         * String used to delimit record rows or a special value;
+         * special constants are 'auto', 'unix', 'mac', 'windows', 'unicode';
+         * defaults to 'auto' (discovered in source or 'unix' if no source is specified).
+         */
+        rowDelimiter?:  string;
+        /**
+         * Optional character surrounding a field, one character only, defaults to double quotes.
+         */
+        quote?: string
+
+        /**
+         * Set the escape character, one character only, defaults to double quotes.
+         */
+        escape?: string
+
+        /**
+         * List of fields as an array,
+         * a user defined callback accepting the first line and returning the column names or true if autodiscovered in the first CSV line,
+         * default to null,
+         * affect the result data set in the sense that records will be objects instead of arrays.
+         */
+        columns?: any[] | boolean | ((line1: any[]) => boolean | string[]);
+
+        /**
+         * Treat all the characters after this one as a comment, default to '' (disabled).
+         */
+        comment?: string
+
+        /**
+         * Name of header-record title to name objects by.
+         */
+        objname?: string
+
+        /**
+         * Preserve quotes inside unquoted field.
+         */
+        relax?: boolean
+
+        /**
+         * Discard inconsistent columns count, default to false.
+         */
+        relax_column_count?: boolean
+
+        /**
+         * Dont generate empty values for empty lines.
+         */
+        skip_empty_lines?: boolean
+
+        /**
+         * Maximum numer of characters to be contained in the field and line buffers before an exception is raised,
+         * used to guard against a wrong delimiter or rowDelimiter,
+         * default to 128000 characters.
+         */
+        max_limit_on_data_read?: number
+
+        /**
+         * If true, ignore whitespace immediately around the delimiter, defaults to false.
+         * Does not remove whitespace in a quoted field.
+         */
+        trim?: boolean
+
+        /**
+         * If true, ignore whitespace immediately following the delimiter (i.e. left-trim all fields), defaults to false.
+         * Does not remove whitespace in a quoted field.
+         */
+        ltrim?: boolean
+
+        /**
+         * If true, ignore whitespace immediately preceding the delimiter (i.e. right-trim all fields), defaults to false.
+         * Does not remove whitespace in a quoted field.
+         */
+        rtrim?: boolean
+
+        /**
+         * If true, the parser will attempt to convert read data types to native types.
+         */
+        auto_parse?: boolean
+
+        /**
+         * If true, the parser will attempt to convert read data types to dates. It requires the "auto_parse" option.
+         */
+        auto_parse_date?: boolean
     }
 
+    // TODO: what is this for?
     interface ParserStream extends NodeJS.ReadWriteStream {
         read(size?: number): any & string[];
     }
-
-    interface parse {
-        (input: string, options?: options, callback?: callbackFn): any;
-        (options: options, callback: callbackFn): any;
-        (callback: callbackFn): any;
-        (options?: options): ParserStream;
-        Parser: ParserConstructor;
-    }
 }
-
-declare module "csv-parse" {
-    import { parse as parseIntf } from "csv-parse/types";
-
-    let parse: parseIntf;
-
-    export = parse;
-}
-
-declare module "csv-parse/lib/sync" {
-   import { options } from "csv-parse/types";
-
-   function parse (input: string, options?: options): any;
-
-   export = parse;
-}
\ No newline at end of file
diff --git a/csv-parse/lib/sync.d.ts b/csv-parse/lib/sync.d.ts
new file mode 100644
index 0000000000..5a025f6dab
--- /dev/null
+++ b/csv-parse/lib/sync.d.ts
@@ -0,0 +1,4 @@
+import { Options } from "csv-parse";
+
+declare function parse(input: string, options?: Options): any;
+export = parse;
diff --git a/csv-parse/tsconfig.json b/csv-parse/tsconfig.json
index 36611c4d1d..b721ff4fe6 100644
--- a/csv-parse/tsconfig.json
+++ b/csv-parse/tsconfig.json
@@ -17,6 +17,7 @@
     },
     "files": [
         "index.d.ts",
+        "lib/sync.d.ts",
         "csv-parse-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/csv-parse/tslint.json b/csv-parse/tslint.json
new file mode 100644
index 0000000000..2221e40e4a
--- /dev/null
+++ b/csv-parse/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
\ No newline at end of file
diff --git a/csv-stringify/csv-stringify-tests.ts b/csv-stringify/csv-stringify-tests.ts
index bd6873affb..a05f35d368 100644
--- a/csv-stringify/csv-stringify-tests.ts
+++ b/csv-stringify/csv-stringify-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import stringify = require("csv-stringify");
 
 let stream: stringify.Stringifier;
diff --git a/csvtojson/csvtojson-tests.ts b/csvtojson/csvtojson-tests.ts
new file mode 100644
index 0000000000..4368d00494
--- /dev/null
+++ b/csvtojson/csvtojson-tests.ts
@@ -0,0 +1,114 @@
+import csv = require('csvtojson');
+import fs = require('fs');
+
+// From documentation on project home page -> https://github.com/Keyang/node-csvtojson
+
+/////////////////////////////
+// From CSV String
+const csvStr: string = `1,2,3
+4,5,6
+7,8,9`;
+
+// event emitter version using factory function
+csv({ noheader: true })
+    .fromString(csvStr)
+    .on('csv', (csvRow: string[]) => {  // this func will be called 3 times
+        console.log(csvRow);                        // => [1,2,3] , [4,5,6]  , [7,8,9]
+    })
+    .on('done', () => {
+        //parsing finished
+    });
+
+// event emitter version using Converter class
+new csv.Converter({ noheader: true })
+    .fromString(csvStr)
+    .on('csv', (csvRow: string[]) => {  // this func will be called 3 times
+        console.log(csvRow);                        // => [1,2,3] , [4,5,6]  , [7,8,9]
+    })
+    .on('done', () => {
+        //parsing finished
+    });
+
+// callback version using Converter class
+new csv.Converter({ noheader: true })
+    .fromString(csvStr, (err, result) => {
+        console.log(JSON.stringify(result));
+    });
+
+// callback version using factory function
+csv({ noheader: true })
+    .fromString(csvStr, (err, result) => {
+        console.log(JSON.stringify(result));
+    });
+
+/////////////////////////////
+// From CSV File
+const filePath = './test.csv';
+
+// event emitter version using factory function
+csv()
+    .fromFile(filePath)
+    .on('json', (jsonObj: any) => {
+        console.log(JSON.stringify(jsonObj));
+    })
+    .on('done', (error: any) => {
+        console.log('end');
+    });
+
+// event emitter version using Converter class
+new csv.Converter()
+    .fromFile(filePath)
+    .on('json', (jsonObj: any) => {
+        console.log(JSON.stringify(jsonObj));
+    })
+    .on('done', (error: any) => {
+        console.log('end');
+    });
+
+// callback version using factory function
+csv()
+    .fromFile(filePath, (err, result) => {
+        console.log(JSON.stringify(result));
+    });
+
+// callback version using Converter class
+new csv.Converter()
+    .fromFile(filePath, (err, result) => {
+        console.log(JSON.stringify(result));
+    });
+
+/////////////////////////////
+// From CSV Stream
+
+const stream = fs.createReadStream(filePath);
+
+// event emitter version using factory function
+csv().fromStream(stream)
+    .on('json', (jsonObj: any) => {
+        console.log(JSON.stringify(jsonObj));
+    })
+    .on('done', (error: any) => {
+        console.log('end');
+    });
+
+// event emitter version using Converter class
+new csv.Converter()
+    .fromStream(stream)
+    .on('json', (jsonObj: any) => {
+        console.log(JSON.stringify(jsonObj));
+    })
+    .on('done', (error: any) => {
+        console.log('end');
+    });
+
+// callback version using factory function
+csv()
+    .fromStream(stream, (err, result) => {
+        console.log(JSON.stringify(result));
+    });
+
+// callback version using Converter class
+new csv.Converter()
+    .fromStream(stream, (err, result) => {
+        console.log(JSON.stringify(result));
+    });
diff --git a/csvtojson/index.d.ts b/csvtojson/index.d.ts
new file mode 100644
index 0000000000..9ba01212c7
--- /dev/null
+++ b/csvtojson/index.d.ts
@@ -0,0 +1,276 @@
+// Type definitions for csvtojson 1.1
+// Project: https://github.com/Keyang/node-csvtojson
+// Definitions by: Eric Byers <https://github.com/EricByers>, Wayne Carson <https://github.com/wcarson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as stream from 'stream';
+
+declare namespace csvtojson {
+
+    /**
+     * Stream options
+     */
+    type StreamOptions = stream.TransformOptions;
+
+    /**
+     * Converter options
+     */
+    interface ConverterOptions {
+
+        /**
+         * Delimiter used for seperating columns. Use "auto" if delimiter is unknown in advance,
+         * in this case, delimiter will be auto-detected (by best attempt). Use an array to give
+         * a list of potential delimiters e.g. [",","|","$"]. (default: ",")
+         */
+        delimiter?: string | string[];
+
+        /**
+         * If a column contains delimiter, it is able to use quote character to surround the column
+         * content. e.g. "hello, world" wont be split into two columns while parsing. Set to "off"
+         * will ignore all quotes. (default: " (double quote))
+         */
+        quote?: string;
+
+        /**
+         * Indicate if parser trim off spaces surrounding column content. e.g. " content " will be
+         * trimmed to "content". (default: true)
+         */
+        trim?: boolean;
+
+        /**
+         * This parameter turns on and off whether check field type. (default: true)
+         */
+        checkType?: boolean;
+
+        /**
+         * Stringify the stream output to JSON array. This is useful when pipe output to a file
+         * which expects stringified JSON array. (default: false and only stringified JSON (without [])
+         * will be pushed to downstream)
+         */
+        toArrayString?: boolean;
+
+        /**
+         * Ignore the empty value in CSV columns. If a column value is not giving, set this to true to
+         * skip them. (default: false)
+         */
+        ignoreEmpty?: boolean;
+
+        /**
+         * Number of worker processes. The worker process will use multi-cores to help process CSV data.
+         * Set to number of cores to improve the performance of processing large CSV file. Keep 1 for
+         * small csv files. (default: 1)
+         */
+        workerNum?: number;
+
+        /**
+         * Indicating CSV data has no header row and first row is data row. (default: false)
+         */
+        noheader?: boolean;
+
+        /**
+         * An array to specify the headers of CSV data. If noheader is false, this value will override
+         * CSV header row. Example: ["my field","name"] (default: null)
+         */
+        headers?: string[];
+
+        /**
+         * Don't interpret dots (.) and square brackets in header fields as nested object or array identifiers
+         * at all (treat them like regular characters for JSON field identifiers). (default: false)
+         */
+        flatKeys?: boolean;
+
+        /**
+         * The max character a CSV row could have. 0 means infinite. If max number exceeded, parser will emit
+         * "error" of "row_exceed". if a possibly corrupted CSV data provided, give it a number like 65535
+         * so the parser wont consume memory. (default: 0)
+         */
+        maxRowLength?: number;
+
+        /**
+         * Whether or not to check if the column number of a row is the same as headers. If column number
+         * mismatched headers number, an error of "mismatched_column" will be emitted. (default: false)
+         */
+        checkColumn?: boolean;
+
+        /**
+         * End of line character. If omitted, parser will attempt retrieve it from first chunk of CSV data.
+         * If no valid eol found, then operation system eol will be used.
+         */
+        eol?: string;
+
+        /**
+         * Escape character used in quoted column. Default is double quote (") according to RFC4108. Change
+         * to back slash (\) or other chars for your own case. (default: " (double quote))
+         */
+        escape?: string;
+
+        /**
+         * This parameter instructs the parser to include only those columns as specified by an array of
+         * column indexes. Example: [0,2,3] will parse and include only columns 0, 2, and 3 in the JSON output.
+         */
+        includeColumns?: number[];
+
+        /**
+         * This parameter instructs the parser to ignore columns as specified by an array of column indexes.
+         * Example: [1,3,5] will ignore columns 1, 3, and 5 and will not return them in the JSON output.
+         */
+        ignoreColumns?: number[];
+
+        /**
+         * Deprecated. Use workerNum instead.
+         */
+        fork?: number;
+    }
+
+    /**
+     * Callback function for handling result of parse.
+     */
+    type ParseResultHandler = (err: any, result: any) => void;
+
+    /**
+     * Event handler for "json" events.
+     */
+    type JsonEventHandler = (jsonObj: any, rowNumber: number) => void;
+
+    /**
+     * Event handler for "csv" events.
+     */
+    type CsvEventHandler = (csvRow: string[], rowNumber: number) => void;
+
+    /**
+     * Event handler for "data" events.
+     */
+    type DataEventHandler = (data: any) => void;
+
+    /**
+     * Event handler for "error" events.
+     */
+    type ErrorEventHandler = (err: any) => void;
+
+    /**
+     * Event handler for "record_parsed" events.
+     */
+    type RecordParsedEventHandler = (jsonObj: any, csvRoe: string[], rowNumber: number) => void;
+
+    /**
+     * Event handler for "end" events.
+     */
+    type EndEventHandler = () => void;
+
+    /**
+     * Event handler for "end_parsed" events.
+     */
+    type EndParsedEventHandler = (jsonObjArray: any[]) => void;
+
+    /**
+     * Event handler for "done" events.
+     */
+    type DoneEventHandler = (err: any) => void;
+
+    /**
+     * Converts provided CSV input to  a JSON object.
+     */
+    class Converter extends stream.Transform {
+
+        /**
+         * Initializes a new instance of a Converter
+         * @param {ConverterOptions} options       converter options
+         * @param {StreamOptions}    streamOptions stream options
+         */
+        constructor(options?: ConverterOptions, streamOptions?: StreamOptions);
+
+        /**
+         * Reads in a CSV from a string.
+         * @param {string} str the string to convert
+         * @return {Converter} returns this object for chaining
+         */
+        fromString(str: string): this
+
+        /**
+         * Reads in a CSV from a string.
+         * @param {string}             str      the string to convert
+         * @param {ParseResultHandler} callback callback function to handle result or error
+         */
+        fromString(str: string, callback: ParseResultHandler): void;
+
+        /**
+         * Reads in a CSV from a file.
+         * @param {string} filePath the path to the CSV file
+         * @return {Converter} returns this object for chaining
+         */
+        fromFile(filePath: string): this
+
+        /**
+         * Reads in a CSV from a file.
+         * @param {string}             filePath the path to the CSV file
+         * @param {ParseResultHandler} callback callback function to handle result or error
+         */
+        fromFile(filePath: string, callback: ParseResultHandler): void;
+
+        /**
+         * Reads in a CSV from a stream.
+         * @param {Stream} stream the stream
+         * @return {Converter} returns this object for chaining
+         */
+        fromStream(stream: NodeJS.ReadableStream): this
+
+        /**
+         * Reads in a CSV from a stream.
+         * @param {Stream}             stream   the stream
+         * @param {ParseResultHandler} callback callback function to handle result or error
+         */
+        fromStream(stream: stream.Stream, callback: ParseResultHandler): void;
+
+        /**
+         * Adds a listener function to the end of the listeners array for an event.
+         * Available events:
+         * - json
+         * - csv
+         * - data
+         * - error
+         * - record_parsed
+         * - end
+         * - end_parsed
+         * - done
+         * @param  {Event}   event    name of event
+         * @param  {Function} listener listener function
+         * @return {this} returns this object for chaining
+         */
+        // tslint:disable-next-line:forbidden-types
+        on(event: string, listener: Function | JsonEventHandler | CsvEventHandler | DataEventHandler | ErrorEventHandler
+            | RecordParsedEventHandler | EndEventHandler | EndParsedEventHandler | DoneEventHandler): this;
+
+        /**
+         * Transform objects after CSV parsing but before result being emitted or pushed downstream.
+         * @param  {Function} callback transform function
+         * @return {this} returns this object for chaining
+         */
+        transf(callback: (jsonObj: any, csvRow: string[], rowNumber: number) => void): this;
+
+        /**
+         * The function in preRawData will be called directly with the string from upper stream.
+         * @param  {Function} callback callback function
+         * @return {this} returns this object for chaining
+         */
+        preRawData(callback: (csvRawData: string, cb: (newData: any) => void) => void): this;
+
+        /**
+         * The function is called each time a file line being found in csv stream.
+         * @param  {Function} callback callback function
+         * @return {this} returns this object for chaining
+         */
+        preFileLine(callback: (line: string, rowNumber: number) => string): this;
+    }
+}
+
+/**
+ * Factory function which creates an instance of a Converter object.
+ * @param {ConverterOptions} options       converter options
+ * @param {StreamOptions}    streamOptions stream options
+ * @return {csvtojson.Converter} Converter object
+ */
+declare function csvtojson(options?: csvtojson.ConverterOptions, streamOptions?: csvtojson.StreamOptions): csvtojson.Converter;
+
+export = csvtojson;
diff --git a/csvtojson/tsconfig.json b/csvtojson/tsconfig.json
new file mode 100644
index 0000000000..81ec6a66a2
--- /dev/null
+++ b/csvtojson/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "csvtojson-tests.ts"
+    ]
+}
diff --git a/csvtojson/tslint.json b/csvtojson/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/csvtojson/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/cybozulabs-md5/cybozulabs-md5-tests.ts b/cybozulabs-md5/cybozulabs-md5-tests.ts
index 7572ed9124..2163b6e8c9 100644
--- a/cybozulabs-md5/cybozulabs-md5-tests.ts
+++ b/cybozulabs-md5/cybozulabs-md5-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="cybozulabs-md5" />
-
 var hash: string;
 hash = CybozuLabs.MD5.calc("abc");
 hash = CybozuLabs.MD5.calc("abc", CybozuLabs.MD5.BY_ASCII);
diff --git a/d3.cloud.layout/d3.cloud.layout-tests.ts b/d3.cloud.layout/d3.cloud.layout-tests.ts
index b2e0349cd4..862b7f0d82 100644
--- a/d3.cloud.layout/d3.cloud.layout-tests.ts
+++ b/d3.cloud.layout/d3.cloud.layout-tests.ts
@@ -1,42 +1,40 @@
-/// <reference types="d3" />
+interface ICompTextSize{
+  text:string;
+  size:number;
+  x?:number;
+  y?:number;
+  rotate?:number;
+}
 
-  interface ICompTextSize{
-    text:string;
-    size:number;
-    x?:number;
-    y?:number;
-    rotate?:number;
-  }
+var fill = d3.scale.category20<number>();
+d3.layout.cloud().size([300, 300])
+    .words([
+      "Hello", "world", "normally", "you", "want", "more", "words",
+      "than", "this"].map(function(d:string) {
+      return {text: d, size: 10 + Math.random() * 90};
+    }))
+    .padding(5)
+    .rotate(function() { return ~~(Math.random() * 2) * 90; })
+    .font("Impact")
+    .fontSize(function(d:ICompTextSize) { return d.size; })
+    .on("end", draw)
+    .start();
 
-
-  var fill = d3.scale.category20<number>();
-  d3.layout.cloud().size([300, 300])
-      .words([
-        "Hello", "world", "normally", "you", "want", "more", "words",
-        "than", "this"].map(function(d:string) {
-        return {text: d, size: 10 + Math.random() * 90};
-      }))
-      .padding(5)
-      .rotate(function() { return ~~(Math.random() * 2) * 90; })
-      .font("Impact")
-      .fontSize(function(d:ICompTextSize) { return d.size; })
-      .on("end", draw)
-      .start();
-  function draw(words:ICompTextSize[]) {
-    d3.select("body").append("svg")
-        .attr("width", 300)
-        .attr("height", 300)
-      .append("g")
-        .attr("transform", "translate(150,150)")
-      .selectAll("text")
-        .data(words)
-      .enter().append("text")
-        .style("font-size", function(d:ICompTextSize) { return d.size + "px"; })
-        .style("font-family", "Impact")
-        .style("fill", function(d:ICompTextSize, i:number) { return fill(i); })
-        .attr("text-anchor", "middle")
-        .attr("transform", function(d:ICompTextSize) {
-          return "translate(" + [d.x, d.y] + ")rotate(" + d.rotate + ")";
-        })
-        .text(function(d:ICompTextSize) { return d.text; });
-  }
+function draw(words:ICompTextSize[]) {
+  d3.select("body").append("svg")
+      .attr("width", 300)
+      .attr("height", 300)
+    .append("g")
+      .attr("transform", "translate(150,150)")
+    .selectAll("text")
+      .data(words)
+    .enter().append("text")
+      .style("font-size", function(d:ICompTextSize) { return d.size + "px"; })
+      .style("font-family", "Impact")
+      .style("fill", function(d:ICompTextSize, i:number) { return fill(i); })
+      .attr("text-anchor", "middle")
+      .attr("transform", function(d:ICompTextSize) {
+        return "translate(" + [d.x, d.y] + ")rotate(" + d.rotate + ")";
+      })
+      .text(function(d:ICompTextSize) { return d.text; });
+}
diff --git a/d3kit/d3kit-tests.ts b/d3kit/d3kit-tests.ts
index c8a447ecda..e1a92d41b9 100644
--- a/d3kit/d3kit-tests.ts
+++ b/d3kit/d3kit-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="d3" />
-
 function test_abstract_chart() {
     let el: Element,
         chart: d3kit.AbstractChart,
@@ -86,8 +84,8 @@ function test_svgchart() {
         options: d3kit.ChartOptions,
         margins: d3kit.ChartMargin,
         offsets: [number, number],
-        svg: d3.Selection<d3.BaseType, any, d3.BaseType, any>, 
-        rootg: d3.Selection<d3.BaseType, any, d3.BaseType, any>, 
+        svg: d3.Selection<d3.BaseType, any, d3.BaseType, any>,
+        rootg: d3.Selection<d3.BaseType, any, d3.BaseType, any>,
         layers: d3kit.LayerOrganizer;
 
     // create a div, append to body, return Node as type Element
diff --git a/d3kit/v1/d3kit-tests.ts b/d3kit/v1/d3kit-tests.ts
index d49891822b..9ffb7ca2ba 100644
--- a/d3kit/v1/d3kit-tests.ts
+++ b/d3kit/v1/d3kit-tests.ts
@@ -1,9 +1,6 @@
-/// <reference types="d3" />
 /// <reference types="mocha" />
 /// <reference types="chai" />
 
-/* jshint expr: true */
-
 var expect = chai.expect;
 describe('Skeleton', function(){
     var element: Element, $element: d3.Selection<any>, $svg: d3.Selection<any>, skeleton: d3kit.Skeleton;
diff --git a/datatables.net-buttons/datatables.net-buttons-tests.ts b/datatables.net-buttons/datatables.net-buttons-tests.ts
index 2dcdd26ff4..6acbbeaf8a 100644
--- a/datatables.net-buttons/datatables.net-buttons-tests.ts
+++ b/datatables.net-buttons/datatables.net-buttons-tests.ts
@@ -1,7 +1,3 @@
-/// <reference types="jquery" />
-/// <reference types="datatables.net" />
-
-
 $(document).ready(function () {
 
     var config: DataTables.Settings =
diff --git a/datatables.net-fixedheader/datatables.net-fixedheader-tests.ts b/datatables.net-fixedheader/datatables.net-fixedheader-tests.ts
index 949bca825c..561b968ba9 100644
--- a/datatables.net-fixedheader/datatables.net-fixedheader-tests.ts
+++ b/datatables.net-fixedheader/datatables.net-fixedheader-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-/// <reference types="datatables.net"/>
-
 $(document).ready(() => {
     var config: DataTables.Settings = {
         // FixedHeader extension options
diff --git a/datatables.net-select/datatables.net-select-tests.ts b/datatables.net-select/datatables.net-select-tests.ts
index aa1851931c..5d8fdd8dc6 100644
--- a/datatables.net-select/datatables.net-select-tests.ts
+++ b/datatables.net-select/datatables.net-select-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-/// <reference types="datatables.net"/>
-
 $(document).ready(() => {
     var config: DataTables.Settings = {
         // Select extension options
diff --git a/datatables.net/datatables.net-tests.ts b/datatables.net/datatables.net-tests.ts
index 0134581ee1..c4a8fcaf3e 100644
--- a/datatables.net/datatables.net-tests.ts
+++ b/datatables.net/datatables.net-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery"/>
-
-
 $(document).ready(function () {
     //#region "Language"
 
diff --git a/daterangepicker/index.d.ts b/daterangepicker/index.d.ts
index 7929474994..d78e06dd97 100644
--- a/daterangepicker/index.d.ts
+++ b/daterangepicker/index.d.ts
@@ -140,6 +140,14 @@ declare namespace daterangepicker {
          * Text for apply label.
          */
         applyLabel?: string;
+        /**
+         * Text for fromLabel label.
+         */
+        fromLabel?: string;
+        /**
+         * Text for toLabel label.
+         */
+        toLabel?: string;
         /**
          * Format of the date string. example: 'YYYY-MM-DD'
          */
diff --git a/dir-resolve/dir-resolve-tests.ts b/dir-resolve/dir-resolve-tests.ts
new file mode 100644
index 0000000000..d84f9d0efc
--- /dev/null
+++ b/dir-resolve/dir-resolve-tests.ts
@@ -0,0 +1,3 @@
+import resolve = require("dir-resolve");
+
+resolve("module/package");
diff --git a/dir-resolve/index.d.ts b/dir-resolve/index.d.ts
new file mode 100644
index 0000000000..0b8f425b0b
--- /dev/null
+++ b/dir-resolve/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for dir-resolve 1.0
+// Project: https://github.com/mwinche/dir-resolve
+// Definitions by: Andy Hanson <https://github.com/andy-ms>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function resolve(path: string): string;
+export = resolve;
diff --git a/dir-resolve/tsconfig.json b/dir-resolve/tsconfig.json
new file mode 100644
index 0000000000..1748792b1d
--- /dev/null
+++ b/dir-resolve/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "dir-resolve-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dir-resolve/tslint.json b/dir-resolve/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/dir-resolve/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/draft-js/index.d.ts b/draft-js/index.d.ts
index 1805a17ab0..a79de31e70 100644
--- a/draft-js/index.d.ts
+++ b/draft-js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Draft.js v0.9.0
+// Type definitions for Draft.js v0.10.0
 // Project: https://facebook.github.io/draft-js/
 // Definitions by: Dmitry Rogozhny <https://github.com/dmitryrogozhny>, Eelco Lempsink <https://github.com/eelco>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -357,7 +357,7 @@ declare namespace Draft {
              *   - "props": Props to be passed into the React component that will be used.
              */
             interface DraftDecorator {
-                strategy: (block: ContentBlock, callback: (start: number, end: number) => void) => void;
+                strategy: (block: ContentBlock, callback: (start: number, end: number) => void, contentState: ContentState) => void;
                 component: Function;
                 props?: Object;
             }
@@ -564,6 +564,9 @@ declare namespace Draft {
             import DraftBlockType = Draft.Model.Constants.DraftBlockType;
             import DraftDecoratorType = Draft.Model.Decorators.DraftDecoratorType;
 
+            import DraftEntityType = Draft.Model.Entity.DraftEntityType;
+            import DraftEntityMutability = Draft.Model.Entity.DraftEntityMutability;
+
             type DraftInlineStyle = Immutable.OrderedSet<string>;
             type BlockMap = Immutable.OrderedMap<string, Draft.Model.ImmutableData.ContentBlock>;
 
@@ -701,6 +704,10 @@ declare namespace Draft {
                 static createFromBlockArray(blocks: Array<ContentBlock>): ContentState;
                 static createFromText(text: string, delimiter?: string): ContentState;
 
+                createEntity(type: DraftEntityType, mutability: DraftEntityMutability, data?: Object): ContentState;
+                getEntity(key: string): EntityInstance;
+                getLastCreatedEntityKey(): string;
+
                 getBlockMap(): BlockMap;
                 getSelectionBefore(): SelectionState;
                 getSelectionAfter(): SelectionState;
diff --git a/dw-bxslider-4/dw-bxslider-4-tests.ts b/dw-bxslider-4/dw-bxslider-4-tests.ts
index e20f748a5d..57092d642f 100644
--- a/dw-bxslider-4/dw-bxslider-4-tests.ts
+++ b/dw-bxslider-4/dw-bxslider-4-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 // examples from http://bxslider.com/examples
 
 $(document).ready(function() {
diff --git a/dynatable/dynatable-tests.ts b/dynatable/dynatable-tests.ts
index acba41092a..e727c209c1 100644
--- a/dynatable/dynatable-tests.ts
+++ b/dynatable/dynatable-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 // Using the global setup option
 // =============================
 $.dynatableSetup({ features: { pushState: false }, dataset: { perPageDefault: 5, perPageOptions: [2, 5, 10] } });
diff --git a/easy-api-request/index.d.ts b/easy-api-request/index.d.ts
index 8f4ca0d553..f04b68be3a 100644
--- a/easy-api-request/index.d.ts
+++ b/easy-api-request/index.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Karl Düüna <https://github.com/DeadAlready/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="q" />
 /// <reference types="node" />
 
 import stream = require('stream');
diff --git a/easy-api-request/tsconfig.json b/easy-api-request/tsconfig.json
index 663d9a15d0..0f8b3873e0 100644
--- a/easy-api-request/tsconfig.json
+++ b/easy-api-request/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/ecurve/ecurve-tests.ts b/ecurve/ecurve-tests.ts
index c2214c6905..ced84ef8aa 100644
--- a/ecurve/ecurve-tests.ts
+++ b/ecurve/ecurve-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import ecurve = require('ecurve');
 import crypto = require('crypto');
 
diff --git a/ej.web.all/ej.web.all-tests.ts b/ej.web.all/ej.web.all-tests.ts
index 63928f47cc..50b4c117e4 100644
--- a/ej.web.all/ej.web.all-tests.ts
+++ b/ej.web.all/ej.web.all-tests.ts
@@ -1,7 +1,3 @@
-/// <reference types="jquery" />
-/// <reference types="ej.web.all" />
-
-
 /* tslint:disable */
 
 module AccordionComponent {
@@ -24,7 +20,7 @@ module AccordionComponent {
     });
 }
 
- 
+
 
 module AutocompleteComponent{
     var carList = [
@@ -48,15 +44,15 @@ module AutocompleteComponent{
                 "Triumph Spitfire", "Toyota 2000GT",
                 "Volvo P1800", "Volkswagen Shirako"
             ];
-    $(function () {        
-        var autocompleteInstance =new ej.Autocomplete($("#selectCar"), {        
+    $(function () {
+        var autocompleteInstance =new ej.Autocomplete($("#selectCar"), {
             width: "100%",
             watermarkText: "Select a car",
             dataSource: carList,
             enableAutoFill: true,
             showPopupButton: true,
             multiSelectMode: "delimiter"
-        });  
+        });
     });
 }
 
@@ -154,7 +150,7 @@ module ButtonComponent {
         });
     });
 }
-    
+
 
 
 
@@ -170,7 +166,7 @@ module ChartComponent {
                 range: { min: 25, max: 50, interval: 5 },
                 labelFormat: "{value}%",
                 title: { text: "Efficiency" },
-                
+
             },
             commonSeriesOptions:
 			{
@@ -185,28 +181,28 @@ module ChartComponent {
                     },
                     visible: true
                 },
-                 border : {width: 2}                             
-            },	
-            series: 
+                 border : {width: 2}
+            },
+            series:
 			[
 			    {
-                points: [{ x: 2005, y: 28 }, { x: 2006, y: 25 },{ x: 2007, y: 26 }, { x: 2008, y: 27 }, 
-						 { x: 2009, y: 32 }, { x: 2010, y: 35 }, { x: 2011, y: 30 }],						 
+                points: [{ x: 2005, y: 28 }, { x: 2006, y: 25 },{ x: 2007, y: 26 }, { x: 2008, y: 27 },
+						 { x: 2009, y: 32 }, { x: 2010, y: 35 }, { x: 2011, y: 30 }],
                 name: 'India'
-                },						
+                },
                 {
-                points: [{ x: 2005, y: 31 }, { x: 2006, y: 28 },{ x: 2007, y: 30 }, { x: 2008, y: 36 }, 
-						 { x: 2009, y: 36 }, { x: 2010, y: 39 }, { x: 2011, y: 37 }],						 
+                points: [{ x: 2005, y: 31 }, { x: 2006, y: 28 },{ x: 2007, y: 30 }, { x: 2008, y: 36 },
+						 { x: 2009, y: 36 }, { x: 2010, y: 39 }, { x: 2011, y: 37 }],
                 name: 'Germany'
                 },
 				{
-                points: [{ x: 2005, y: 36 }, { x: 2006, y: 32 },{ x: 2007, y: 34 }, { x: 2008, y: 41 }, 
-						 { x: 2009, y: 42 }, { x: 2010, y: 42 }, { x: 2011, y: 43 }],						 
+                points: [{ x: 2005, y: 36 }, { x: 2006, y: 32 },{ x: 2007, y: 34 }, { x: 2008, y: 41 },
+						 { x: 2009, y: 42 }, { x: 2010, y: 42 }, { x: 2011, y: 43 }],
                 name: 'England'
-                },					
+                },
                 {
-                points: [{ x: 2005, y: 39 }, { x: 2006, y: 36 },{ x: 2007, y: 40 }, { x: 2008, y: 44 }, 
-						 { x: 2009, y: 45 }, { x: 2010, y: 48 }, { x: 2011, y: 46 }],						 
+                points: [{ x: 2005, y: 39 }, { x: 2006, y: 36 },{ x: 2007, y: 40 }, { x: 2008, y: 44 },
+						 { x: 2009, y: 45 }, { x: 2010, y: 48 }, { x: 2011, y: 46 }],
                 name: 'France'
 				}
             ],
@@ -294,7 +290,7 @@ module circulargaugecomponent {
                         backgroundColor: "#f5b43f",
                         border: { color: "#f5b43f" }
                     }]
-            }]	
+            }]
         });
     });
 }
@@ -381,7 +377,7 @@ $(function () {
             createConnector({ name: "connector6", sourceNode: "Project", targetNode: "Resources", labels: [createLabel({ "text": "No" })] })
         ]
     });
-    
+
 });
 
 function createNode(option: ej.datavisualization.Diagram.Node) {
@@ -406,7 +402,7 @@ function createLabel(options : any) {
     return options;
 }
 
- 
+
 
 module DialogComponent {
     $(function () {
@@ -456,7 +452,7 @@ module digitalgaugecomponent {
 }
 
 
-		
+
 
 
 
@@ -476,12 +472,12 @@ module DropDownListComponent {
             enableFilterSearch: true,
             caseSensitiveSearch: true,
             enableIncrementalSearch: true,
-            enablePopupResize: true, 
+            enablePopupResize: true,
             delimiterChar: ";",
             multiSelectMode: ej.MultiSelectMode.Delimiter,
             maxPopupHeight: "300px",
-            minPopupHeight: "150px", 
-            maxPopupWidth: "500px", 
+            minPopupHeight: "150px",
+            maxPopupWidth: "500px",
             minPopupWidth: "350px",
             showCheckbox: true,
             showRoundedCorner: true
@@ -517,7 +513,7 @@ module GanttComponent {
         dataSource: (<any>window).projectData,
         allowColumnResize: true,
         allowSorting: true,
-        allowSelection: true,       
+        allowSelection: true,
         enableContextMenu: true,
         taskIdMapping: "taskID",
         allowDragAndDrop: true,
@@ -558,7 +554,7 @@ module GanttComponent {
         treeColumnIndex: 1,
         isResponsive: true,
     });
-}); 
+});
 }
 
 
@@ -674,7 +670,7 @@ module KanbanComponent {
     });
 }
 
- 
+
 
 
 module lineargaugecomponent {
@@ -700,14 +696,14 @@ module lineargaugecomponent {
                         backgroundColor: "#E94649",
                         border: { color: "#E94649" }, startWidth: 4, endWidth: 4
                     }]
-            }]		
+            }]
         });
     });
 }
 
-	
 
- 
+
+
 
 module ListBoxComponent {
     $(function () {
@@ -717,12 +713,12 @@ module ListBoxComponent {
     });
 }
 
- 
+
 
 module ListviewComponent {
     $(function () {
         var listviewInstance = new ej.ListView($("#defaultlistview"), {
-            enableCheckMark: true, 
+            enableCheckMark: true,
 		    width: 400
         });
     });
@@ -987,7 +983,7 @@ module MenuComponent {
 
 
 
- 
+
 
 module NavigationDrawerComponent {
     $(function () {
@@ -1027,7 +1023,7 @@ module PivotChartOlap {
     $(function () {
         var sample = new ej.PivotChart($("#PivotChart"),{
             dataSource: {
-			data: "http://bi.syncfusion.com/olap/msmdpump.dll", 
+			data: "http://bi.syncfusion.com/olap/msmdpump.dll",
 			catalog: "Adventure Works DW 2008 SE",
 			cube: "Adventure Works",
 			rows: [
@@ -1195,7 +1191,7 @@ module PivotGaugeOlap {
 					length: 120,
 					width: 7
                 },
-				{		
+				{
 					type: "marker",
 					markerType: "diamond",
 					distanceFromScale: 5,
@@ -1224,7 +1220,7 @@ module PivotGaugeOlap {
 					distanceFromScale: -5,
                     backgroundColor: "#fc0606",
 					border: { color: "#fc0606" }
-                }, 
+                },
 				{
 					distanceFromScale: -5
                 }],
@@ -1242,7 +1238,7 @@ module PivotGaugeOlap {
                 }]
             }]
         });
-    });	
+    });
 }
 
 
@@ -1316,7 +1312,7 @@ module PivotGaugeRelational {
 					length: 120,
 					width: 7
                 },
-				{		
+				{
 					type: "marker",
 					markerType: "diamond",
 					distanceFromScale: 5,
@@ -1345,7 +1341,7 @@ module PivotGaugeRelational {
 					distanceFromScale: -5,
                     backgroundColor: "#fc0606",
 					border: { color: "#fc0606" }
-                }, 
+                },
 				{
 					distanceFromScale: -5
                 }],
@@ -1363,7 +1359,7 @@ module PivotGaugeRelational {
                 }]
             }]
         });
-    });	
+    });
 }
 
 
@@ -1398,7 +1394,7 @@ module PivotGridOlap {
 			],
 			filters:[]
 		},
-        enableGroupingBar: true, 
+        enableGroupingBar: true,
         pivotTableFieldListID:"PivotSchemaDesigner"
         });
         $("#PivotSchemaDesigner").ejPivotSchemaDesigner();
@@ -1449,7 +1445,7 @@ module PivotGridRelational {
 					fieldCaption: "State"
 				}
 			],
-			columns:                     
+			columns:
 				[{
 					fieldName: "Product",
 					fieldCaption: "Product"
@@ -1467,10 +1463,10 @@ module PivotGridRelational {
             ],
 			filters:[]
 		},
-        enableGroupingBar: true, 
+        enableGroupingBar: true,
         pivotTableFieldListID:"PivotSchemaDesigner"
         });
-       $("#PivotSchemaDesigner").ejPivotSchemaDesigner(); 
+       $("#PivotSchemaDesigner").ejPivotSchemaDesigner();
 
     });
 }
@@ -1611,7 +1607,7 @@ function redo(e: any) {
 }
 
 
- 
+
 
 module RadialSliderComponent {
     $(function () {
@@ -1644,7 +1640,7 @@ module rangecomponent {
                         fill: '#69D2E7'
                     }
                 ];
-            } 
+            }
 
         });
     });
@@ -1696,7 +1692,7 @@ module RatingComponent {
             shapeWidth: 25,
             showTooltip: true
         });
-		
+
         var sample2 = new ej.Rating($("#halfRating"),{
             precision: ej.Rating.Precision.Half,
             value: 3.5,
@@ -1727,7 +1723,7 @@ module RatingComponent {
             shapeHeight: 25,
             shapeWidth: 25,
             showTooltip: true
-        }); 
+        });
     });
 
 }
@@ -1760,7 +1756,7 @@ module RibbonComponent {
                 toolTip: "Pin the Ribbon"
             },
             applicationTab: {
-                 type: ej.Ribbon.ApplicationTabType.Menu, menuItemID: "ribbonmenu", menuSettings: { openOnClick: false } 
+                 type: ej.Ribbon.ApplicationTabType.Menu, menuItemID: "ribbonmenu", menuSettings: { openOnClick: false }
             },
             tabs: [{
                 id: "home", text: "HOME", groups: [{
@@ -1837,7 +1833,7 @@ module RibbonComponent {
                                     width: 60,
                                     isBig: false
                                 }
-                            }] 
+                            }]
                 },
                 {
                         text: "Font", alignType: "rows", content: [{
@@ -2116,7 +2112,7 @@ module RibbonComponent {
                             groups: [{
                                 id: "zoomin",
                                 text: "Zoom In",
-                                toolTip: "Zoom In",                                
+                                toolTip: "Zoom In",
                                 buttonSettings: {
                                     width: 58,
                                     contentType: ej.ContentType.TextAndImage,
@@ -2127,7 +2123,7 @@ module RibbonComponent {
                                 {
                                     id: "zoomout",
                                     text: "Zoom Out",
-                                    toolTip: "Zoom Out",                                    
+                                    toolTip: "Zoom Out",
                                     buttonSettings: {
                                         width: 70,
                                         contentType: ej.ContentType.TextAndImage,
@@ -2138,7 +2134,7 @@ module RibbonComponent {
                                 {
                                     id: "fullscreen",
                                     text: "Full Screen",
-                                    toolTip: "Full Screen",                                    
+                                    toolTip: "Full Screen",
                                     buttonSettings: {
                                         width: 73,
                                         contentType: ej.ContentType.TextAndImage,
@@ -2367,7 +2363,7 @@ module RibbonComponent {
                         }
                     ]
                 }
-            ],   
+            ],
             create: function createControl(args) {
                 var ribbon = $("#defaultRibbon").data("ejRibbon");
                 $("#fontcolor").ejColorPicker({ value: "#FFFF00", modelType: "palette", cssClass: "e-ribbon", toolIcon: "e-fontcoloricon", select: colorHandler });
@@ -2383,7 +2379,7 @@ function colorHandler(args:any) {
 
 
 
- 
+
 
 module RotatorComponent {
     $(function () {
@@ -2546,7 +2542,7 @@ module ScheduleComponent {
             }
         });
     });
-}   
+}
 
 
 
@@ -2729,9 +2725,9 @@ module piesparkline4 {
     });
 }
 
-	
 
- 
+
+
 
 
 module SplitterComponent {
@@ -2766,7 +2762,7 @@ $(function () {
                 pdfUrl: (<any>window).baseurl + "api/Spreadsheet/PdfExport"
             },
             sheets: [{ rangeSettings: [{ dataSource: (<any>window).defaultData, startCell: "A1" }] }],
-			loadComplete: () => {  
+			loadComplete: () => {
 			var spreadsheet = $("#basicSpreadsheet").data("ejSpreadsheet"), xlFormat = spreadsheet.XLFormat;
 			if (!(<any>spreadsheet).isImport) {
         spreadsheet.setWidthToColumns([140, 128, 105, 100, 100, 110, 120, 120, 100]);
@@ -2790,13 +2786,13 @@ var default_data: Array<Object> = [
 	{ Category : "Employees", Country : "USA", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 70 },
 	{ Category : "Employees", Country : "USA", JobDescription : "Management",                                                  EmployeesCount : 40 },
 	{ Category : "Employees", Country : "USA", JobDescription : "Accounts",                                                    EmployeesCount : 60 },
-	
+
 	{ Category : "Employees", Country : "India",   JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 43 },
 	{ Category : "Employees", Country : "India",   JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 125},
 	{ Category : "Employees", Country : "India",   JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 60 },
 	{ Category : "Employees", Country : "India",   JobDescription : "HR Executives",                                               EmployeesCount : 70 },
 	{ Category : "Employees", Country : "India",   JobDescription : "Accounts",                                                    EmployeesCount : 45 },
-	
+
 	{ Category : "Employees", Country : "Germany", JobDescription : "Sales",         JobGroup : "Executive",                       EmployeesCount : 30 },
 	{ Category : "Employees", Country : "Germany", JobDescription : "Sales",         JobGroup : "Analyst",                         EmployeesCount : 40 },
 	{ Category : "Employees", Country : "Germany", JobDescription : "Marketing",                                                   EmployeesCount : 50 },
@@ -2805,13 +2801,13 @@ var default_data: Array<Object> = [
 	{ Category : "Employees", Country : "Germany", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 27 },
 	{ Category : "Employees", Country : "Germany", JobDescription : "Management",                                                  EmployeesCount : 33 },
 	{ Category : "Employees", Country : "Germany", JobDescription : "Accounts",                                                    EmployeesCount : 55 },
-	
+
 	{ Category : "Employees", Country : "UK",      JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 45 },
 	{ Category : "Employees", Country : "UK",      JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 96 },
 	{ Category : "Employees", Country : "UK",      JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 55 },
 	{ Category : "Employees", Country : "UK",      JobDescription : "HR Executives",                                               EmployeesCount : 60 },
 	{ Category : "Employees", Country : "UK",      JobDescription: "Accounts",                                                     EmployeesCount: 30  },
-	
+
 	{ Category : "Employees", Country : "France", JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 40 },
 	{ Category : "Employees", Country : "France", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 65 },
 	{ Category : "Employees", Country : "France", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 27 },
@@ -2821,7 +2817,7 @@ var default_data: Array<Object> = [
 module sunburstcomponent {
     $(function () {
         var sunburstsample = new ej.SunburstChart($("#Sunburst"), {
-            valueMemberPath: "EmployeesCount",           
+            valueMemberPath: "EmployeesCount",
             levels: [
                 {groupMemberPath: "Country"},
 				{groupMemberPath: "JobDescription"},
@@ -2860,8 +2856,8 @@ module TabComponent {
 
 
 module TagCloudComponent {
-    
-    
+
+
     var websiteCollection = [
         { text: "Google", url: "http://www.google.com", frequency: 12 },
         { text: "All Things Digital", url: "http://allthingsd.com/", frequency: 3 },
@@ -2892,7 +2888,7 @@ module TagCloudComponent {
                 text: "text", url: "url", frequency: "frequency"
             }
         });
-            
+
     });
 }
 
@@ -2932,7 +2928,7 @@ module EditorComponent {
 
 
 
- 
+
 
 module TileViewComponent {
     $(function () {
@@ -2943,38 +2939,38 @@ module TileViewComponent {
 			imageUrl:'content/images/tile/windows/people_1.png'
         });
 		var tile2 = new ej.Tile($("#tile2"), {
-            imagePosition:"center",		
+            imagePosition:"center",
 			tileSize:"small",
-			imageUrl:'content/images/tile/windows/alerts.png',		 
-	
+			imageUrl:'content/images/tile/windows/alerts.png',
+
         });
 		var tile3 = new ej.Tile($("#tile3"), {
-            imagePosition:"center",		 
+            imagePosition:"center",
 			tileSize:"small",
-			imageUrl:'content/images/tile/windows/bing.png',		 
+			imageUrl:'content/images/tile/windows/bing.png',
         });
 		var tile4 = new ej.Tile($("#tile4"), {
             tileSize:"small",
-		 	imageUrl:'content/images/tile/windows/camera.png',		 
+		 	imageUrl:'content/images/tile/windows/camera.png',
         });
 		var tile5 = new ej.Tile($("#tile5"), {
-            imagePosition:"center",		 
+            imagePosition:"center",
 			tileSize:"small",
-			imageUrl:'content/images/tile/windows/messages.png',		 
+			imageUrl:'content/images/tile/windows/messages.png',
         });
 		var tile6 = new ej.Tile($("#tile6"), {
-            imagePosition:"center",		 
+            imagePosition:"center",
 			tileSize:"medium",
-			imageUrl:'content/images/tile/windows/games.png',	
+			imageUrl:'content/images/tile/windows/games.png',
 			caption:{text:"Play"}
         });
-		var tile7 = new ej.Tile($("#tile7"), {	 
+		var tile7 = new ej.Tile($("#tile7"), {
 			tileSize:"medium",
 			imageUrl:'content/images/tile/windows/map.png',
 			caption:{text:"Maps"}
         });
 		var tile8 = new ej.Tile($("#tile8"), {
-            imagePosition:"fill",		 
+            imagePosition:"fill",
 			tileSize:"wide",
 			imageUrl:'content/images/tile/windows/sports.png',
 			caption:{text:"Sports"}
@@ -3026,7 +3022,7 @@ module TimePickerComponent {
 
 
 module ToolbarComponent {
-    
+
     $(function () {
         var sample = new ej.Toolbar($("#editingToolbar"),{
             width: "100%",
@@ -3045,7 +3041,7 @@ module ToolbarComponent {
 
 
 module TooltipComponent {
-    
+
     $(function () {
 
         var sample1 = new ej.Tooltip($("#link1"),{
@@ -3140,7 +3136,7 @@ module TreeGridComponent {
         isResponsive: true,
     });
 });
-} 
+}
 
 
 
@@ -3185,7 +3181,7 @@ module treemapcomponent {
 
 
 
- 
+
 
 module TreeViewComponent {
     $(function () {
@@ -3202,7 +3198,7 @@ module TreeViewComponent {
 
 
 module UploadboxComponent {
-    
+
     $(function () {
         var sample = new ej.Uploadbox($("#UploadDefault"),{
             saveUrl: "uploadbox/saveFiles.ashx",
@@ -3236,4 +3232,4 @@ module WaitingPopupComponent {
         });
     });
 
-}
+}
\ No newline at end of file
diff --git a/ej.web.all/index.d.ts b/ej.web.all/index.d.ts
index 356eb6af40..b1c4261705 100644
--- a/ej.web.all/index.d.ts
+++ b/ej.web.all/index.d.ts
@@ -3,11 +3,11 @@
 // Definitions by: Syncfusion <https://github.com/syncfusion/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="../jquery" />
+/// <reference types="jquery" />
 
 /*!
 *  filename: ej.web.all.d.ts
-*  version : 15.1.0.33
+*  version : 15.1.0.37
 *  Copyright Syncfusion Inc. 2001 - 2017. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing
@@ -1358,7 +1358,7 @@ export interface Model {
 	*/
 	cssClass?: string;
 
-	/** Allows you to set the custom header Icon. It accepts two key values “header”, ”selectedHeader”.
+	/** Allows you to set the custom header Icon. It accepts two key values “header”, ”selectedHeader”.
 	*   @Default {{ header: e-collapse, selectedHeader: e-expand }}
 	*/
 	customIcon?: CustomIcon;
@@ -1827,7 +1827,7 @@ export interface Model {
 	addNewText?: boolean;
 
 	/** Allows new values to be added to the autocomplete input other than the values in the suggestion list.
-	*   Normally, when there are no suggestions it will display “No suggestions” label in the popup.
+	*   Normally, when there are no suggestions it will display “No suggestions” label in the popup.
 	*   @Default {false}
 	*/
 	allowAddNew?: boolean;
@@ -1853,7 +1853,7 @@ export interface Model {
 	caseSensitiveSearch?: boolean;
 
 	/** The root class for the Autocomplete textbox widget which helps in customizing its theme.
-	*   @Default {””}
+	*   @Default {””}
 	*/
 	cssClass?: string;
 
@@ -1868,12 +1868,12 @@ export interface Model {
 	delaySuggestionTimeout?: number;
 
 	/** The special character which acts as a separator for the given words for multi-mode search i.e. the text after the delimiter are considered as a separate word or query for search operation.
-	*   @Default {’,’}
+	*   @Default {’,’}
 	*/
 	delimiterChar?: string;
 
 	/** The text to be displayed in the popup when there are no suggestions available for the entered text.
-	*   @Default {“No suggestions”}
+	*   @Default {“No suggestions”}
 	*/
 	emptyResultText?: string;
 
@@ -1899,7 +1899,7 @@ export interface Model {
 	*/
 	enablePersistence?: boolean;
 
-	/** Displays the Autocomplete widget’s content from right to left when enabled.
+	/** Displays the Autocomplete widget’s content from right to left when enabled.
 	*   @Default {false}
 	*/
 	enableRTL?: boolean;
@@ -1910,9 +1910,9 @@ export interface Model {
 	fields?: Fields;
 
 	/** Specifies the search filter type.
-	*   There are several types of search filter available such as ‘startswith’,
-	*   ‘contains’, ‘endswith’, ‘lessthan’, ‘lessthanorequal’, ‘greaterthan’,
-	*   ‘greaterthanorequal’, ‘equal’, ‘notequal’.
+	*   There are several types of search filter available such as ‘startswith’,
+	*   ‘contains’, ‘endswith’, ‘lessthan’, ‘lessthanorequal’, ‘greaterthan’,
+	*   ‘greaterthanorequal’, ‘equal’, ‘notequal’.
 	*   @Default {ej.filterType.StartsWith}
 	*/
 	filterType?: string;
@@ -1951,12 +1951,12 @@ export interface Model {
 	multiSelectMode?: ej.Autocomplete.MultiSelectMode|string;
 
 	/** The height of the suggestion list.
-	*   @Default {“152px”}
+	*   @Default {“152px”}
 	*/
 	popupHeight?: string;
 
 	/** The width of the suggestion list.
-	*   @Default {“auto”}
+	*   @Default {“auto”}
 	*/
 	popupWidth?: string;
 
@@ -2281,14 +2281,14 @@ export interface MultiColumnSettingsColumn {
 	*/
 	cssClass?: string;
 
-	/** Specifies the search data type. There are four types of data types available such as string, ‘number’, ‘boolean’ and ‘date’.
+	/** Specifies the search data type. There are four types of data types available such as string, ‘number’, ‘boolean’ and ‘date’.
 	*   @Default {ej.Type.String}
 	*/
 	type?: ej.Type|string;
 
-	/** Specifies the search filter type. There are several types of search filter available such as ‘startswith’,
-	*  ‘contains’, ‘endswith’, ‘lessthan’, ‘lessthanorequal’, ‘greaterthan’,
-	*  ‘greaterthanorequal’, ‘equal’, ‘notequal’.
+	/** Specifies the search filter type. There are several types of search filter available such as ‘startswith’,
+	*  ‘contains’, ‘endswith’, ‘lessthan’, ‘lessthanorequal’, ‘greaterthan’,
+	*  ‘greaterthanorequal’, ‘equal’, ‘notequal’.
 	*   @Default {ej.filterType.StartsWith}
 	*/
 	filterType?: ej.filterType|string;
@@ -2892,29 +2892,29 @@ class ListBox extends ej.Widget {
 	*/
 	getSelectedItems(): any;
 
-	/** Returns an item’s index based on the given text.
+	/** Returns an item’s index based on the given text.
 	*   @param {string} The list item text (label)
 	*   @returns {number}
 	*/
 	getIndexByText(text: string): number;
 
-	/** Returns an item’s index based on the value given.
-	*   @param {string} The list item’s value
+	/** Returns an item’s index based on the value given.
+	*   @param {string} The list item’s value
 	*   @returns {number}
 	*/
 	getIndexByValue(indices: string): number;
 
-	/** Returns an item’s text (label) based on the index given.
+	/** Returns an item’s text (label) based on the index given.
 	*   @returns {string}
 	*/
 	getTextByIndex(): string;
 
-	/** Returns a list item’s object using its index.
+	/** Returns a list item’s object using its index.
 	*   @returns {any}
 	*/
 	getItemByIndex(): any;
 
-	/** Returns a list item’s object based on the text given.
+	/** Returns a list item’s object based on the text given.
 	*   @param {string} The list item text.
 	*   @returns {any}
 	*/
@@ -3131,7 +3131,7 @@ export interface Model {
 	*/
 	allowMultiSelection?: boolean;
 
-	/** Loads the list data on demand via scrolling behavior to improve the application’s performance. There are two ways to load data which can be defined using “virtualScrollMode” property.
+	/** Loads the list data on demand via scrolling behavior to improve the application’s performance. There are two ways to load data which can be defined using “virtualScrollMode” property.
 	*   @Default {false}
 	*/
 	allowVirtualScrolling?: boolean;
@@ -3154,7 +3154,7 @@ export interface Model {
 	checkedIndices?: any[];
 
 	/** The root class for the ListBox widget to customize the existing theme.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	cssClass?: string;
 
@@ -3178,7 +3178,7 @@ export interface Model {
 	*/
 	enablePersistence?: boolean;
 
-	/** Displays the ListBox widget’s content from right to left when enabled.
+	/** Displays the ListBox widget’s content from right to left when enabled.
 	*   @Default {false}
 	*/
 	enableRTL?: boolean;
@@ -3253,7 +3253,7 @@ export interface Model {
 	template?: string;
 
 	/** Holds the selected items values and used to bind value to the list item using AngularJS and KnockoutJS.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	value?: number;
 
@@ -3395,7 +3395,7 @@ export interface ChangeEventArgs {
 	*/
 	data?: any;
 
-	/** List item’s index.
+	/** List item’s index.
 	*/
 	index?: number;
 
@@ -3415,11 +3415,11 @@ export interface ChangeEventArgs {
 	*/
 	isEnabled?: boolean;
 
-	/** List item’s text (label).
+	/** List item’s text (label).
 	*/
 	text?: string;
 
-	/** List item’s value.
+	/** List item’s value.
 	*/
 	value?: string;
 }
@@ -3442,7 +3442,7 @@ export interface CheckChangeEventArgs {
 	*/
 	data?: any;
 
-	/** List item’s index.
+	/** List item’s index.
 	*/
 	index?: number;
 
@@ -3462,11 +3462,11 @@ export interface CheckChangeEventArgs {
 	*/
 	isEnabled?: boolean;
 
-	/** List item’s text (label).
+	/** List item’s text (label).
 	*/
 	text?: string;
 
-	/** List item’s value.
+	/** List item’s value.
 	*/
 	value?: string;
 }
@@ -3549,7 +3549,7 @@ export interface ItemDragEventArgs {
 	*/
 	data?: any;
 
-	/** List item’s index.
+	/** List item’s index.
 	*/
 	index?: number;
 
@@ -3565,11 +3565,11 @@ export interface ItemDragEventArgs {
 	*/
 	isEnabled?: boolean;
 
-	/** List item’s text (label).
+	/** List item’s text (label).
 	*/
 	text?: string;
 
-	/** List item’s value.
+	/** List item’s value.
 	*/
 	value?: string;
 }
@@ -3592,7 +3592,7 @@ export interface ItemDragStartEventArgs {
 	*/
 	data?: any;
 
-	/** List item’s index.
+	/** List item’s index.
 	*/
 	index?: number;
 
@@ -3608,11 +3608,11 @@ export interface ItemDragStartEventArgs {
 	*/
 	isEnabled?: boolean;
 
-	/** List item’s text (label).
+	/** List item’s text (label).
 	*/
 	text?: string;
 
-	/** List item’s value.
+	/** List item’s value.
 	*/
 	value?: string;
 }
@@ -3635,7 +3635,7 @@ export interface ItemDragStopEventArgs {
 	*/
 	data?: any;
 
-	/** List item’s index.
+	/** List item’s index.
 	*/
 	index?: number;
 
@@ -3651,11 +3651,11 @@ export interface ItemDragStopEventArgs {
 	*/
 	isEnabled?: boolean;
 
-	/** List item’s text (label).
+	/** List item’s text (label).
 	*/
 	text?: string;
 
-	/** List item’s value.
+	/** List item’s value.
 	*/
 	value?: string;
 }
@@ -3678,7 +3678,7 @@ export interface ItemDropEventArgs {
 	*/
 	data?: any;
 
-	/** List item’s index.
+	/** List item’s index.
 	*/
 	index?: number;
 
@@ -3694,11 +3694,11 @@ export interface ItemDropEventArgs {
 	*/
 	isEnabled?: boolean;
 
-	/** List item’s text (label).
+	/** List item’s text (label).
 	*/
 	text?: string;
 
-	/** List item’s value.
+	/** List item’s value.
 	*/
 	value?: string;
 }
@@ -3721,7 +3721,7 @@ export interface SelectEventArgs {
 	*/
 	data?: any;
 
-	/** List item’s index.
+	/** List item’s index.
 	*/
 	index?: number;
 
@@ -3741,11 +3741,11 @@ export interface SelectEventArgs {
 	*/
 	isEnabled?: boolean;
 
-	/** List item’s text (label).
+	/** List item’s text (label).
 	*/
 	text?: string;
 
-	/** List item’s value.
+	/** List item’s value.
 	*/
 	value?: string;
 }
@@ -3768,7 +3768,7 @@ export interface UnselectEventArgs {
 	*/
 	data?: any;
 
-	/** List item’s index.
+	/** List item’s index.
 	*/
 	index?: number;
 
@@ -3788,11 +3788,11 @@ export interface UnselectEventArgs {
 	*/
 	isEnabled?: boolean;
 
-	/** List item’s text (label).
+	/** List item’s text (label).
 	*/
 	text?: string;
 
-	/** List item’s value.
+	/** List item’s value.
 	*/
 	value?: string;
 }
@@ -5673,6 +5673,10 @@ export interface UnselectEventArgs {
 	*/
 	name?: string;
 
+	/** Returns the name of unselected items.
+	*/
+	names?: string[];
+
 	/** Returns the type of unselected item.
 	*/
 	nodeType?: string;
@@ -5688,6 +5692,10 @@ export interface UnselectEventArgs {
 	/** Returns the unselected item details.
 	*/
 	unselectedItem?: any;
+
+	/** Returns the unselected items details.
+	*/
+	unselectedItems?: any[];
 }
 
 export interface ContextMenuSettings {
@@ -6430,6 +6438,11 @@ export namespace DateTimePicker {
 
 export interface Model {
 
+	/** Used to allow or restrict the editing in DateTimePicker input field directly. By setting false to this API, You can only pick the date and time values from DateTimePicker popup.
+	*   @Default {true}
+	*/
+	allowEdit?: boolean;
+
 	/** Displays the custom text for the buttons inside the DateTimePicker popup. when the culture value changed, we can change the buttons text based on the culture.
 	*   @Default {{ today: Today, timeNow: Time Now, done: Done, timeTitle: Time }}
 	*/
@@ -6519,7 +6532,7 @@ export interface Model {
 	*/
 	popupPosition?: string | ej.popupPosition;
 
-	/** Indicates that the DateTimePicker value can only be read and can’t change.
+	/** Indicates that the DateTimePicker value can only be read and can’t change.
 	*   @Default {false}
 	*/
 	readOnly?: boolean;
@@ -7303,7 +7316,7 @@ export interface Model {
 	allowKeyboardNavigation?: boolean;
 
 	/** Customizes the Dialog widget animations. The Dialog widget can be animated while opening and closing the dialog.
-	*   In order to customize animation effects, you need to set “enableAnimation” as true. It contains the following sub properties.
+	*   In order to customize animation effects, you need to set “enableAnimation” as true. It contains the following sub properties.
 	*/
 	animation?: any;
 
@@ -7320,7 +7333,7 @@ export interface Model {
 	*/
 	contentType?: string;
 
-	/** The URL to load the dialog content (such as AJAX, image, and iframe). In order to load content from URL, you need to set contentType as ‘ajax’ or ‘iframe’ or ‘image’.
+	/** The URL to load the dialog content (such as AJAX, image, and iframe). In order to load content from URL, you need to set contentType as ‘ajax’ or ‘iframe’ or ‘image’.
 	*/
 	contentUrl?: string;
 
@@ -7352,12 +7365,12 @@ export interface Model {
 	*/
 	enableRTL?: boolean;
 
-	/** The CSS class name to display the favicon in the dialog header. In order to display favicon, you need to set showHeader as true since the favicon will be displayed in the dialog header.
+	/** The CSS class name to display the favicon in the dialog header. In order to display favicon, you need to set� showHeader� as true since the favicon will be displayed in the dialog header.
 	*/
 	faviconCSS?: string;
 
-	/** Sets the height for the dialog widget. It accepts both string and integer values. For example, it can accepts values like “auto”, “100%”, “100px” as string type
-	*   and “100”, “500” as integer type.
+	/** Sets the height for the dialog widget. It accepts both string and integer values. For example, it can accepts values like “auto”, “100%”, “100px” as string type
+	*   and “100”, “500” as integer type.
 	*/
 	height?: string|number;
 
@@ -7370,7 +7383,7 @@ export interface Model {
 	*/
 	isResponsive?: boolean;
 
-	/** Default Value:{:.param}“en-US”
+	/** Default Value:{:.param}“en-US”
 	*/
 	locale?: number;
 
@@ -7418,8 +7431,8 @@ export interface Model {
 	*/
 	tooltip?: any;
 
-	/** Sets the height for the dialog widget. It accepts both string and integer values. For example, it can accepts values like “auto”, “100%”,
-	*   “100px” as string type and “100”, “500” as integer type.
+	/** Sets the height for the dialog widget. It accepts both string and integer values. For example, it can accepts values like “auto”, “100%”,
+	*   “100px” as string type and “100”, “500” as integer type.
 	*/
 	width?: string|number;
 
@@ -7860,149 +7873,6 @@ export interface AjaxSettings {
 }
 }
 
-class DocumentEditor extends ej.Widget {
-	static fn: DocumentEditor;
-	constructor(element: JQuery | Element, options?: DocumentEditor.Model);
-	static Locale: any;
-	model: DocumentEditor.Model;
-	defaults: DocumentEditor.Model;
-
-	/** Loads the document from specified path using web API provided by importUrl.
-	*   @param {string} Specifies the file path.
-	*   @returns {void}
-	*/
-	load(path: string): void;
-
-	/** Gets the page number of current selection in the document.
-	*   @returns {number}
-	*/
-	getCurrentPageNumber(): number;
-
-	/** Gets the total number of pages in the document.
-	*   @returns {number}
-	*/
-	getPageCount(): number;
-
-	/** Gets the text of current selection in the document.
-	*   @returns {string}
-	*/
-	getSelectedText(): string;
-
-	/** Gets the current zoom factor value of the document editor.
-	*   @returns {number}
-	*/
-	getZoomFactor(): number;
-
-	/** Scales the document editor with the specified zoom factor. The range of zoom factor should be 0.10 to 5.00 (10 - 500 %).
-	*   @param {number} Specifies the factor for zooming.
-	*   @returns {void}
-	*/
-	setZoomFactor(factor: number): void;
-
-	/** Prints the document content as page by page.
-	*   @returns {void}
-	*/
-	print(): void;
-
-	/** Finds the first occurrence of specified text from current selection and  highlights the result. If the document end is reached, find operation will occur from the document start position.
-	*   @param {string} Specifies the text to search in a document.
-	*   @returns {void}
-	*/
-	find(text: string): void;
-}
-export namespace DocumentEditor {
-
-export interface Model {
-
-	/** Gets or sets an object that indicates initialization of importing and exporting documents in document editor.
-	*/
-	importExportSettings?: ImportExportSettings;
-
-	/** Triggers when the document changes. */
-	onDocumentChange?(e: OnDocumentChangeEventArgs): void;
-
-	/** Triggers when the selection changes. */
-	onSelectionChange?(e: OnSelectionChangeEventArgs): void;
-
-	/** Triggers when the zoom factor changes. */
-	onZoomFactorChange?(e: OnZoomFactorChangeEventArgs): void;
-
-	/** Triggers when the hyperlink is clicked. */
-	onRequestNavigate?(e: OnRequestNavigateEventArgs): void;
-}
-
-export interface OnDocumentChangeEventArgs {
-
-	/** True, if the event should be canceled; otherwise, false.
-	*/
-	cancel?: boolean;
-
-	/** Returns the document editor model.
-	*/
-	model?: any;
-
-	/** Returns the name of the event.
-	*/
-	type?: string;
-}
-
-export interface OnSelectionChangeEventArgs {
-
-	/** True, if the event should be canceled; otherwise, false.
-	*/
-	cancel?: boolean;
-
-	/** Returns the document editor model.
-	*/
-	model?: any;
-
-	/** Returns the name of the event.
-	*/
-	type?: string;
-}
-
-export interface OnZoomFactorChangeEventArgs {
-
-	/** True, if the event should be canceled; otherwise, false.
-	*/
-	cancel?: boolean;
-
-	/** Returns the document editor model.
-	*/
-	model?: any;
-
-	/** Returns the name of the event.
-	*/
-	type?: string;
-}
-
-export interface OnRequestNavigateEventArgs {
-
-	/** true, if the event should be canceled; otherwise, false.
-	*/
-	cancel?: boolean;
-
-	/** Returns the document editor model.
-	*/
-	model?: any;
-
-	/** Returns the link type and navigation link.
-	*/
-	hyperlink?: any;
-
-	/** Returns the name of the event.
-	*/
-	type?: string;
-}
-
-export interface ImportExportSettings {
-
-	/** Gets or sets URL of Web API that should be used to parse the document while loading.
-	*/
-	importUrl?: string;
-}
-}
-
 class DropDownList extends ej.Widget {
 	static fn: DropDownList;
 	constructor(element: JQuery | Element, options?: DropDownList.Model);
@@ -8135,7 +8005,7 @@ export interface Model {
 	*/
 	allowVirtualScrolling?: boolean;
 
-	/** The cascading DropDownLists is a series of two or more DropDownLists in which each DropDownList is filtered according to the previous DropDownList’s value.
+	/** The cascading DropDownLists is a series of two or more DropDownLists in which each DropDownList is filtered according to the previous DropDownList’s value.
 	*   @Default {null}
 	*/
 	cascadeTo?: string;
@@ -8316,7 +8186,7 @@ export interface Model {
 	*/
 	sortOrder?: ej.SortOrder|string;
 
-	/** Specifies the targetID for the DropDownList’s items.
+	/** Specifies the targetID for the DropDownList’s items.
 	*   @Default {null}
 	*/
 	targetID?: string;
@@ -8384,7 +8254,7 @@ export interface Model {
 	/** Fires when the cascading happens between two DropDownList exactly after the value changes in the first dropdown and before filtering in the second Dropdown. */
 	cascade?(e: CascadeEventArgs): void;
 
-	/** Fires the action when the DropDownList control’s value is changed. */
+	/** Fires the action when the DropDownList control’s value is changed. */
 	change?(e: ChangeEventArgs): void;
 
 	/** Fires the action when the list item checkbox value is changed. */
@@ -9481,6 +9351,11 @@ export namespace Editor {
 
 export interface Model {
 
+	/** Specifies the currency symbol of currency textbox, used when the user wants to overwrite the currency symbol commonly instead of the current culture symbol.
+	*   @Default {Based on the culture}
+	*/
+	currencySymbol?: string;
+
 	/** Sets the root CSS class for Editors which allow us to customize the appearance.
 	*/
 	cssClass?: string;
@@ -11130,7 +11005,7 @@ export interface Fields {
 	*/
 	dataSource?: any;
 
-	/** Specifies the HTML attributes to “LI” item list.
+	/** Specifies the HTML attributes to “LI” item list.
 	*/
 	htmlAttribute?: string;
 
@@ -11138,11 +11013,11 @@ export interface Fields {
 	*/
 	id?: string;
 
-	/** Specifies the image attribute to “img” tag inside items list.
+	/** Specifies the image attribute to “img” tag inside items list.
 	*/
 	imageAttribute?: string;
 
-	/** Specifies the image URL to “img” tag inside item list.
+	/** Specifies the image URL to “img” tag inside item list.
 	*/
 	imageUrl?: string;
 
@@ -11158,7 +11033,7 @@ export interface Fields {
 	*/
 	query?: any;
 
-	/** Specifies the sprite CSS class to “LI” item list.
+	/** Specifies the sprite CSS class to “LI” item list.
 	*/
 	spriteCssClass?: string;
 
@@ -13061,10 +12936,10 @@ export interface Tab {
 
 enum ItemType {
 
-	///To render the button for ribbon backstage page’s contents
+	///To render the button for ribbon backstage page’s contents
 	Button,
 
-	///To render the tab for ribbon backstage page’s contents
+	///To render the tab for ribbon backstage page’s contents
 	Tab
 }
 
@@ -14384,6 +14259,14 @@ export interface ContextMenuSettings {
 	customMenuItems?: ContextMenuSettingsCustomMenuItem[];
 }
 
+export interface ColumnsTotalCount {
+
+	/** To customize the totalCount text properties.
+	*   @Default {null}
+	*/
+	text?: string;
+}
+
 export interface ColumnsConstraints {
 
 	/** It is used to specify the type of constraints as column or swimlane.
@@ -14410,9 +14293,9 @@ export interface Column {
 	headerText?: string;
 
 	/** To customize the totalCount properties.
-	*   @Default {false}
+	*   @Default {Object}
 	*/
-	totalCount?: string;
+	totalCount?: ColumnsTotalCount;
 
 	/** Gets or sets an object that indicates to render the Kanban with specified columns key.
 	*   @Default {null}
@@ -15276,14 +15159,14 @@ class RTE extends ej.Widget {
 	insertMenuOption(): void;
 
 	/** Add a table column at the right or left of the specified cell
-	*   @param {boolean} If it’s true, add a column at the left of the cell, otherwise add a column at the right of the cell
+	*   @param {boolean} If it’s true, add a column at the left of the cell, otherwise add a column at the right of the cell
 	*   @param {JQuery} Column will be added based on the given cell element
 	*   @returns {HTMLElement}
 	*/
 	insertColumn(before?: boolean, cell?: JQuery): HTMLElement;
 
 	/** To add a table row below or above the specified cell.
-	*   @param {boolean} If it’s true, add a row before the cell, otherwise add a row after the cell
+	*   @param {boolean} If it’s true, add a row before the cell, otherwise add a row after the cell
 	*   @param {JQuery} Row will be added based on the given cell element
 	*   @returns {HTMLElement}
 	*/
@@ -15397,7 +15280,7 @@ export interface Model {
 	*/
 	cssClass?: string;
 
-	/** Enables/disables the RTE control’s accessibility or interaction.
+	/** Enables/disables the RTE control’s accessibility or interaction.
 	*   @Default {True}
 	*/
 	enabled?: boolean;
@@ -15615,7 +15498,7 @@ export interface Model {
 	/** Sets the tools in the RTE and gets the inner display order of the corresponding group element. Tools are dependent on the toolsList property.
 	*   @Default {formatStyle: [format],style: [bold, italic, underline, strikethrough],alignment: [justifyLeft, justifyCenter, justifyRight, justifyFull],lists: [unorderedList, orderedList],
 	*	indenting: [outdent, indent],doAction: [undo, redo],links: [createLink,removeLink],images: [image],media: [video],tables: [createTable, addRowAbove, addRowBelow,
-	*   addColumnLeft, addColumnRight, deleteRow, deleteColumn, deleteTable]],view:[“fullScreen”,zoomIn,zoomOut],print:[print]}
+	*   addColumnLeft, addColumnRight, deleteRow, deleteColumn, deleteTable]],view:[“fullScreen”,zoomIn,zoomOut],print:[print]}
 	*/
 	tools?: Tools;
 
@@ -16425,7 +16308,7 @@ export interface Model {
 	enableRTL?: boolean;
 
 	/** Specifies the height of the Split Button.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	height?: string|number;
 
@@ -16466,7 +16349,7 @@ export interface Model {
 	text?: string;
 
 	/** Specifies the width of the Split Button.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	width?: string|number;
 
@@ -16745,7 +16628,7 @@ export interface Model {
 	animationSpeed?: number;
 
 	/** Specify the CSS class to splitter control to achieve custom theme.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	cssClass?: string;
 
@@ -16775,7 +16658,7 @@ export interface Model {
 	isResponsive?: boolean;
 
 	/** Specify the orientation for splitter control. See orientation
-	*   @Default {ej.orientation.Horizontal or “horizontal”}
+	*   @Default {ej.orientation.Horizontal or “horizontal”}
 	*/
 	orientation?: ej.Orientation|string;
 
@@ -16924,7 +16807,7 @@ class Tab extends ej.Widget {
 	model: Tab.Model;
 	defaults: Tab.Model;
 
-	/** Add new tab items with given name, URL and given index position, if index null it’s add last item.
+	/** Add new tab items with given name, URL and given index position, if index null it’s add last item.
 	*   @param {string} URL name / tab id.
 	*   @param {string} Tab Display name.
 	*   @param {number} Index position to placed , this is optional.
@@ -17069,7 +16952,7 @@ export interface Model {
 	*/
 	htmlAttributes?: any;
 
-	/** The idPrefix property appends the given string on the added tab item id’s in runtime.
+	/** The idPrefix property appends the given string on the added tab item id’s in runtime.
 	*   @Default {ej-tab-}
 	*/
 	idPrefix?: string;
@@ -17094,7 +16977,7 @@ export interface Model {
 	*/
 	showRoundedCorner?: boolean;
 
-	/** Set the width for outer panel element, if not it’s take parent width.
+	/** Set the width for outer panel element, if not it’s take parent width.
 	*   @Default {null}
 	*/
 	width?: string|number;
@@ -20443,7 +20326,7 @@ export interface Fields {
 	*/
 	id?: string;
 
-	/** Specifies the image attribute to “img” tag inside items list
+	/** Specifies the image attribute to “img” tag inside items list
 	*/
 	imageAttribute?: any;
 
@@ -20455,7 +20338,7 @@ export interface Fields {
 	*/
 	isChecked?: string;
 
-	/** Specifies the link attribute to “a” tag in item list.
+	/** Specifies the link attribute to “a” tag in item list.
 	*/
 	linkAttribute?: any;
 
@@ -20981,14 +20864,14 @@ export interface DialogAction {
 	*/
 	drag?: boolean;
 
-	/** Enables or disables the Uploadbox dialog’s modal property to the dialog popup.
+	/** Enables or disables the Uploadbox dialog’s modal property to the dialog popup.
 	*/
 	modal?: boolean;
 }
 
 export interface DialogText {
 
-	/** Sets the uploaded file’s Name (header text) to the Dialog popup.
+	/** Sets the uploaded file’s Name (header text) to the Dialog popup.
 	*/
 	name?: string;
 
@@ -21226,6 +21109,12 @@ class Grid extends ej.Widget {
 	*/
 	deleteRecord(fieldName: string, data: any[]): void;
 
+	/** Delete the row based on the given tr element in grid.
+	*   @param {JQuery} Pass the tr element in grid content to get its row index
+	*   @returns {HTMLElement}
+	*/
+	deleteRow($tr: JQuery): HTMLElement;
+
 	/** Destroy the grid widget all events bound using this._on will be unbind automatically and bring the control to pre-init state.
 	*   @returns {void}
 	*/
@@ -21238,6 +21127,11 @@ class Grid extends ej.Widget {
 	*/
 	editCell(index: number, fieldName: string): void;
 
+	/** It returns a value and if the input field values of edit form is not based on the validation rules then it will show the validation message.
+	*   @returns {Boolean}
+	*/
+	editFormValidate(): boolean;
+
 	/** Send a save request in grid.
 	*   @returns {void}
 	*/
@@ -21324,6 +21218,13 @@ class Grid extends ej.Widget {
 	*/
 	getColumnIndexByField(fieldName: string): number;
 
+	/** Get the column index of the given headerText of column in grid.
+	*   @param {string} Pass the headerText of the column to get that column index
+	*   @param {string} optionalOptional Pass the field name of the column.
+	*   @returns {number}
+	*/
+	getColumnIndexByHeaderText(headerText: string, field?: string): number;
+
 	/** Get the content div element of grid.
 	*   @returns {HTMLElement}
 	*/
@@ -21349,6 +21250,11 @@ class Grid extends ej.Widget {
 	*/
 	getCurrentViewData(): any[];
 
+	/** Get the data of given row index in grid.
+	*   @returns {any}
+	*/
+	getDataByIndex(): any;
+
 	/** Get the column field name from the given header text in grid.
 	*   @param {string} Pass header text of the column to get its corresponding field name
 	*   @returns {String}
@@ -21439,6 +21345,17 @@ class Grid extends ej.Widget {
 	*/
 	getSelectedRecords(): any[];
 
+	/** Get the selected row element details in grid.
+	*   @returns {Array<any>}
+	*/
+	getSelectedRows(): any[];
+
+	/** It accepts the string value and returns the field and sorted direction of the column in grid.
+	*   @param {string} Pass the field of the column to get the sorted direction of the corresponding column in Grid.
+	*   @returns {number}
+	*/
+	getsortColumnByField(field: string): number;
+
 	/** Get the calculated summary values of JSON data passed to it
 	*   @param {any} Pass Summary Column details
 	*   @param {any} Pass JSON Array for which its field values to be calculated
@@ -21518,6 +21435,13 @@ class Grid extends ej.Widget {
 	*/
 	reorderColumns(fromFieldName: string, toFieldName: string): void;
 
+	/** Re-order the row in grid
+	*   @param {Array<any>} Pass the indexes of the rows needs to reorder.
+	*   @param {number} Pass the index of a row where to be reorderd.
+	*   @returns {void}
+	*/
+	reorderRows(indexes: any[], toindex: number): void;
+
 	/** Reset the model collections like pageSettings, groupSettings, filterSettings, sortSettings and summaryRows.
 	*   @returns {void}
 	*/
@@ -21617,6 +21541,11 @@ class Grid extends ej.Widget {
 	*/
 	setCellValue(Index: number, fieldName: string, value: any): void;
 
+	/** It sets the default data to the column in grid during adding record in batch edit mode.
+	*   @returns {void}
+	*/
+	setDefaultData(): void;
+
 	/** The grid rows has to be rendered as detail view in mobile mode based on given value.
 	*   @param {number} It is used to render grid rows as details view in mobile mode.
 	*   @returns {void}
@@ -21676,20 +21605,20 @@ export interface Model {
 	*/
 	allowCellMerging?: boolean;
 
-	/** Gets or sets a value that indicates whether to enable dynamic grouping behavior. Grouping can be done by drag on drop desired columns to grid’s GroupDropArea.
-	*   This can be further customized through “groupSettings” property.
+	/** Gets or sets a value that indicates whether to enable dynamic grouping behavior. Grouping can be done by drag on drop desired columns to grid’s GroupDropArea.
+	*   This can be further customized through “groupSettings” property.
 	*   @Default {false}
 	*/
 	allowGrouping?: boolean;
 
-	/** Gets or sets a value that indicates whether to enable keyboard support for performing grid actions. selectionType – Gets or sets a value that indicates whether to enable single
+	/** Gets or sets a value that indicates whether to enable keyboard support for performing grid actions. selectionType – Gets or sets a value that indicates whether to enable single
 	*   row or multiple rows selection behavior in grid. Multiple selection can be done through by holding CTRL and clicking the grid rows
 	*   @Default {true}
 	*/
 	allowKeyboardNavigation?: boolean;
 
 	/** Gets or sets a value that indicates whether to enable dynamic filtering behavior on grid. Filtering can be used to limit the records displayed using required criteria and
-	*   this can be further customized through “filterSettings” property
+	*   this can be further customized through “filterSettings” property
 	*   @Default {false}
 	*/
 	allowFiltering?: boolean;
@@ -21705,7 +21634,7 @@ export interface Model {
 	allowMultiSorting?: boolean;
 
 	/** This specifies the grid to show the paginated data. Also enables pager control at the bottom of grid for dynamic navigation through data source.
-	*   Paging can be further customized through “pageSettings” property.
+	*   Paging can be further customized through “pageSettings” property.
 	*   @Default {false}
 	*/
 	allowPaging?: boolean;
@@ -21736,7 +21665,7 @@ export interface Model {
 	*/
 	allowScrolling?: boolean;
 
-	/** Gets or sets a value that indicates whether to enable dynamic searching behavior in grid. Currently search box can be enabled through “toolbarSettings”
+	/** Gets or sets a value that indicates whether to enable dynamic searching behavior in grid. Currently search box can be enabled through “toolbarSettings”
 	*   @Default {false}
 	*/
 	allowSearching?: boolean;
@@ -21842,6 +21771,11 @@ export interface Model {
 	*/
 	enableTouch?: boolean;
 
+	/** It sets a value that indicates whether to enable toolbar items, when allowEditing, allowAdding and allowDeleting property set as false in the grid.
+	*   @Default {false}
+	*/
+	enableToolbarItems?: boolean;
+
 	/** Act as mapper for the excel exporting URL.
 	*   @Default {ExportToExcel}
 	*/
@@ -21914,7 +21848,7 @@ export interface Model {
 	searchSettings?: SearchSettings;
 
 	/** Gets a value that indicates whether the grid model to hold multiple selected records . selectedRecords can be used to displayed hold the single
-	*   or multiple selected records using “selectedRecords” property
+	*   or multiple selected records using “selectedRecords” property
 	*   @Default {null}
 	*/
 	selectedRecords?: any[];
@@ -21947,12 +21881,12 @@ export interface Model {
 	*/
 	showColumnChooser?: boolean;
 
-	/** Gets or sets a value that indicates stacked header should be shown on grid layout when the property “stackedHeaderRows” is set.
+	/** Gets or sets a value that indicates stacked header should be shown on grid layout when the property “stackedHeaderRows” is set.
 	*   @Default {false}
 	*/
 	showStackedHeader?: boolean;
 
-	/** Gets or sets a value that indicates summary rows should be shown on grid layout when the property “summaryRows” is set
+	/** Gets or sets a value that indicates summary rows should be shown on grid layout when the property “summaryRows” is set
 	*   @Default {false}
 	*/
 	showSummary?: boolean;
@@ -22003,6 +21937,12 @@ export interface Model {
 	/** Triggered before the batch save. */
 	beforeBatchSave?(e: BeforeBatchSaveEventArgs): void;
 
+	/** Triggered before the print. */
+	beforePrint?(e: BeforePrintEventArgs): void;
+
+	/** Triggered before row drop in the grid */
+	beforeRowDrop?(e: BeforeRowDropEventArgs): void;
+
 	/** Triggered before the record is going to be edited. */
 	beginEdit?(e: BeginEditEventArgs): void;
 
@@ -22600,6 +22540,48 @@ export interface BeforeBatchSaveEventArgs {
 	batchChanges?: any;
 }
 
+export interface BeforePrintEventArgs {
+
+	/** Returns the grid model.
+	*/
+	model?: any;
+
+	/** Returns the name of the event.
+	*/
+	type?: string;
+
+	/** Returns the Grid element.
+	*/
+	element?: any;
+
+	/** Returns the selected records.
+	*/
+	selectedRows?: any;
+}
+
+export interface BeforeRowDropEventArgs {
+
+	/** Returns the cancel option value.
+	*/
+	cancel?: boolean;
+
+	/** Returns the targeted row.
+	*/
+	target?: any;
+
+	/** Returns the targeted row index.
+	*/
+	targetIndex?: any;
+
+	/** Returns the dragged record details
+	*/
+	draggedRecords?: any;
+
+	/** Returns the drop details
+	*/
+	dropDetails?: any;
+}
+
 export interface BeginEditEventArgs {
 
 	/** Returns the cancel option value.
@@ -24060,6 +24042,11 @@ export interface Column {
 	*/
 	filterBarTemplate?: any;
 
+	/** Gets or sets a value that indicates to render the excel or menu filter dialog to the grid columns. See filterType
+	*   @Default {null}
+	*/
+	filterType?: ej.Grid.FilterType|string;
+
 	/** Gets or sets a value that indicates to define foreign key field name of the grid datasource.
 	*   @Default {null}
 	*/
@@ -24088,6 +24075,11 @@ export interface Column {
 	*/
 	headerTextAlign?: ej.TextAlign|string;
 
+	/** It accepts the string value and shows the tooltip for the Grid column header.
+	*   @Default {null}
+	*/
+	headerTooltip?: string;
+
 	/** You can use this property to freeze selected columns in grid at the time of scrolling.
 	*   @Default {false}
 	*/
@@ -24104,7 +24096,7 @@ export interface Column {
 	isPrimaryKey?: boolean;
 
 	/** Gets or sets a value that indicates the order of Column that are to be hidden or visible when Grid element is in responsive mode and could not occupy all columns.
-	*   @Default {null}
+	*   @Default {-1}
 	*/
 	priority?: number;
 
@@ -24265,7 +24257,11 @@ export interface FilterSettingsFilteredColumn {
 	*/
 	field?: string;
 
-	/** Gets or sets a value that indicates whether to define the filter condition to filtered column.
+	/** Gets or sets a value that indicates whether to define the matchCase of given value to be filter.
+	*/
+	matchCase?: boolean;
+
+	/** Gets or sets a value that indicates whether to define the filter condition to filtered column. See operator
 	*/
 	operator?: ej.FilterOperators|string;
 
@@ -24285,7 +24281,12 @@ export interface FilterSettings {
 	*/
 	enableCaseSensitivity?: boolean;
 
-	/** This specifies the grid to starts the filter action while typing in the filterBar or after pressing the enter key. based on the filterBarMode. See filterBarMode
+	/** Gets or sets a value that indicates to define the interDeterminateState of checkbox in excel filter dialog.
+	*   @Default {true}
+	*/
+	enableInterDeterminateState?: boolean;
+
+	/** This specifies the grid to starts the filter action while typing in the filterBar or after pressing the enter key. based on the filterBarMode. See filterBarMode.
 	*   @Default {ej.Grid.FilterBarMode.Immediate}
 	*/
 	filterBarMode?: ej.Grid.FilterBarMode|string;
@@ -24300,6 +24301,11 @@ export interface FilterSettings {
 	*/
 	filterType?: ej.Grid.FilterType|string;
 
+	/** This specifies the grid to delay the filter action while typing in the filterBar.
+	*   @Default {1500}
+	*/
+	immediateModeDelay?: number;
+
 	/** Gets or sets a value that indicates the maximum number of filter choices that can be showed in the excel styled filter menu.
 	*   @Default {1000}
 	*/
@@ -24458,6 +24464,11 @@ export interface SearchSettings {
 
 export interface SelectionSettings {
 
+	/** Gets or sets a value that indicates the cell selection actions based on the cell selection mode.
+	*   @Default {flow}
+	*/
+	cellSelectionMode?: string;
+
 	/** Gets or sets a value that indicates whether to enable the toggle selection behavior for row, cell and column.
 	*   @Default {false}
 	*/
@@ -24476,6 +24487,16 @@ export interface ScrollSettings {
 	*/
 	allowVirtualScrolling?: boolean;
 
+	/** It accepts the boolean value and shows or hides the scrollbar while focus in or focus out of the Grid.
+	*   @Default {false}
+	*/
+	autoHide?: boolean;
+
+	/** Specifies the height and width of button in the scrollbar.
+	*   @Default {18}
+	*/
+	buttonSize?: number;
+
 	/** This specify the grid to enable/disable touch control for scrolling.
 	*   @Default {true}
 	*/
@@ -24496,6 +24517,11 @@ export interface ScrollSettings {
 	*/
 	height?: string|number;
 
+	/** It accepts the integer value and sets the width of scrollbar.
+	*   @Default {18}
+	*/
+	scrollerSize?: number;
+
 	/** This is used to define the mode of virtual scrolling in grid. See virtualScrollMode
 	*   @Default {ej.Grid.VirtualScrollMode.Normal}
 	*/
@@ -24556,6 +24582,11 @@ export interface StackedHeaderRowsStackedHeaderColumn {
 	*   @Default {ej.TextAlign.Left}
 	*/
 	textAlign?: string;
+
+	/** Sets the template for tooltip for the Grid stackedHeaderColumns.
+	*   @Default {null}
+	*/
+	tooltip?: string;
 }
 
 export interface StackedHeaderRow {
@@ -24744,6 +24775,16 @@ enum EditingType {
 }
 
 
+enum FilterType {
+
+	///Specifies the filter type as menu.
+	Menu,
+
+	///Specifies the filter type as excel.
+	Excel
+}
+
+
 enum EditMode {
 
 	///Edit mode is normal.
@@ -24802,19 +24843,6 @@ enum FilterBarMode {
 }
 
 
-enum FilterType {
-
-	///Specifies the filter type as menu.
-	Menu,
-
-	///Specifies the filter type as excel.
-	Excel,
-
-	///Specifies the filter type as filterbar.
-	FilterBar
-}
-
-
 enum PrintMode {
 
 	///Prints all pages.
@@ -25583,7 +25611,7 @@ export interface Model {
 	*/
 	yName?: string;
 
-	/** Controls wheather sunburst has to be responsive or not.
+	/** Controls whether sunburst has to be responsive or not.
 	*   @Default {true}
 	*/
 	isResponsive?: boolean;
@@ -25703,7 +25731,7 @@ export interface Model {
 	pointRegionClick?(e: PointRegionClickEventArgs): void;
 
 	/** Fires while moving the mouse over sunburst points */
-	pointRegionMousemove?(e: PointRegionMousemoveEventArgs): void;
+	pointRegionMouseMove?(e: PointRegionMouseMoveEventArgs): void;
 
 	/** Fires when clicking the point to perform drilldown. */
 	drillDownClick?(e: DrillDownClickEventArgs): void;
@@ -25867,7 +25895,7 @@ export interface PointRegionClickEventArgs {
 	type?: string;
 }
 
-export interface PointRegionMousemoveEventArgs {
+export interface PointRegionMouseMoveEventArgs {
 
 	/** Includes data of mouse moved region
 	*/
@@ -26117,7 +26145,7 @@ export interface DataLabelSettings {
 	*/
 	visible?: boolean;
 
-	/** Alginment of sunburst datalabel
+	/** Alignment of sunburst datalabel
 	*   @Default {Angle. See DatalabelAlignment}
 	*/
 	labelRotationMode?: ej.datavisualization.Sunburst.SunburstLabelRotationMode|string;
@@ -26126,12 +26154,12 @@ export interface DataLabelSettings {
 	*/
 	font?: DataLabelSettingsFont;
 
-	/** Custome template for datalabel
+	/** Custom template for datalabel
 	*   @Default {null}
 	*/
 	template?: string;
 
-	/** Fill color for the datalable
+	/** Fill color for the datalabel
 	*   @Default {null}
 	*/
 	fill?: string;
@@ -26778,12 +26806,12 @@ export interface Model {
 	analysisMode?: ej.Pivot.AnalysisMode|string;
 
 	/** Specifies the CSS class to PivotGrid to achieve custom theme.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	cssClass?: string;
 
 	/** Connects the PivotSchemaDesigner with the specified ID to the PivotGrid Control.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	pivotTableFieldListID?: string;
 
@@ -26852,6 +26880,11 @@ export interface Model {
 	*/
 	enableConditionalFormatting?: boolean;
 
+	/** Enables the advanced filtering options Value Filtering, Label Filtering and Sorting for each fields in server mode.
+	*   @Default {false}
+	*/
+	enableAdvancedFilter?: boolean;
+
 	/** Allows the user to refresh the control on-demand and not during every UI operation.
 	*   @Default {false}
 	*/
@@ -26917,7 +26950,7 @@ export interface Model {
 	*/
 	hyperlinkSettings?: HyperlinkSettings;
 
-	/** Allows the user to enable PivotGrid’s responsiveness in the browser layout.
+	/** Allows the user to enable PivotGrid’s responsiveness in the browser layout.
 	*   @Default {false}
 	*/
 	isResponsive?: boolean;
@@ -26947,7 +26980,7 @@ export interface Model {
 	serviceMethodSettings?: ServiceMethodSettings;
 
 	/** Connects the service using the specified URL for any server updates.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	url?: string;
 
@@ -27579,7 +27612,7 @@ export interface DataSource {
 	filters?: DataSourceFilter[];
 
 	/** Contains the respective cube name from OLAP database as string type.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	cube?: string;
 
@@ -27589,7 +27622,7 @@ export interface DataSource {
 	data?: any;
 
 	/** In connection with an OLAP database, this property contains the database name as string to fetch the data from the given connection string.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	catalog?: string;
 
@@ -27845,7 +27878,7 @@ export namespace PivotSchemaDesigner {
 export interface Model {
 
 	/** Specifies the CSS class to PivotSchemaDesigner to achieve custom theme.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	cssClass?: string;
 
@@ -27855,7 +27888,7 @@ export interface Model {
 	customObject?: any;
 
 	/** For ASP.NET and MVC Wrapper, PivotSchemaDesigner will be initialized and rendered empty initially. Once the connected pivot control widget is rendered completely,
-	*   PivotSchemaDesigner will just be populated with data source by setting this property to “true”.
+	*   PivotSchemaDesigner will just be populated with data source by setting this property to “true”.
 	*   @Default {false}
 	*/
 	enableWrapper?: boolean;
@@ -27876,7 +27909,7 @@ export interface Model {
 	enableDragDrop?: boolean;
 
 	/** Sets the height for PivotSchemaDesigner.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	height?: string;
 
@@ -27896,12 +27929,12 @@ export interface Model {
 	serviceMethod?: ServiceMethod;
 
 	/** Connects the service using the specified URL for any server updates.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	url?: string;
 
 	/** Sets the width for PivotSchemaDesigner.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	width?: string;
 
@@ -28076,7 +28109,7 @@ export interface Model {
 	seriesPageCount?: number;
 
 	/** Contains the ID of the target element for which paging needs to be done.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	targetControlID?: string;
 }
@@ -28182,7 +28215,7 @@ export interface Model {
 	analysisMode?: ej.Pivot.AnalysisMode|string;
 
 	/** Specifies the CSS class to PivotChart to achieve custom theme.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	cssClass?: string;
 
@@ -28216,7 +28249,7 @@ export interface Model {
 	*/
 	enableRTL?: boolean;
 
-	/** Allows the user to enable PivotChart’s responsiveness in the browser layout.
+	/** Allows the user to enable PivotChart’s responsiveness in the browser layout.
 	*   @Default {false}
 	*/
 	isResponsive?: boolean;
@@ -28238,14 +28271,14 @@ export interface Model {
 
 	/** This is a horizontal axis that contains options to configure axis and it is the primary x axis for all the series in series array.
 	*   To override x axis for particular series, create an axis object by providing unique name by using name property and add it to axes array.
-	*   Then, assign the name to the series’s xAxisName property to link both axis and series.
+	*   Then, assign the name to the series’s xAxisName property to link both axis and series.
 	*   @Default {{}}
 	*/
 	primaryXAxis?: any;
 
 	/** This is a vertical axis that contains options to configure axis. This is the primary y axis for all the series in series array.
 	*   To override y axis for particular series, create an axis object by providing unique name by using name property and add it to axes array.
-	*   Then, assign the name to the series’s yAxisName property to link both axis and series.
+	*   Then, assign the name to the series’s yAxisName property to link both axis and series.
 	*   @Default {{}}
 	*/
 	primaryYAxis?: any;
@@ -28266,7 +28299,7 @@ export interface Model {
 	size?: any;
 
 	/** Connects the service using the specified URL for any server updates on operating the control in server mode.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	url?: string;
 
@@ -28570,7 +28603,7 @@ export interface DataSourceFilter {
 export interface DataSource {
 
 	/** Contains the respective cube name from OLAP database as string type.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	cube?: string;
 
@@ -28580,7 +28613,7 @@ export interface DataSource {
 	data?: any;
 
 	/** In connection with an OLAP database, this property contains the database name as string to fetch the data from the given connection string.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	catalog?: string;
 
@@ -28761,7 +28794,7 @@ export interface Model {
 	clientExportMode?: ej.PivotClient.ClientExportMode|string;
 
 	/** Specifies the CSS class to PivotClient to achieve custom theme.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	cssClass?: string;
 
@@ -29339,7 +29372,7 @@ export interface DataSource {
 	filters?: DataSourceFilter[];
 
 	/** Contains the respective cube name from OLAP database as string type.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	cube?: string;
 
@@ -29349,11 +29382,11 @@ export interface DataSource {
 	data?: any;
 
 	/** In connection with an OLAP database, this property contains the database name as string to fetch the data from the given connection string.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	catalog?: string;
 
-	/** Allows user to filter the members (by its name and values) through advanced filtering (excel-like) option for OLAP data source in client-mode.
+	/** Allows user to filter the members (by its name and values) through advanced filtering (excel-like) option in client-mode.
 	*   @Default {false}
 	*/
 	enableAdvancedFilter?: boolean;
@@ -29390,7 +29423,7 @@ export interface DisplaySettings {
 	*/
 	enableTogglePanel?: boolean;
 
-	/** Allows the user to enable PivotClient’s responsiveness in the browser layout.
+	/** Allows the user to enable PivotClient’s responsiveness in the browser layout.
 	*   @Default {false}
 	*/
 	isResponsive?: boolean;
@@ -29598,7 +29631,7 @@ export interface Model {
 	columnsCount?: number;
 
 	/** Specifies the CSS class to PivotGauge to achieve custom theme.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	cssClass?: string;
 
@@ -29627,7 +29660,7 @@ export interface Model {
 	*/
 	enableRTL?: boolean;
 
-	/** Allows the user to enable PivotGauge’s responsiveness in the browser layout.
+	/** Allows the user to enable PivotGauge’s responsiveness in the browser layout.
 	*   @Default {false}
 	*/
 	isResponsive?: boolean;
@@ -29663,7 +29696,7 @@ export interface Model {
 	showHeaderLabel?: boolean;
 
 	/** Connects the service using the specified URL for any server updates on server mode operation.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	url?: string;
 
@@ -29899,7 +29932,7 @@ export interface DataSourceFilter {
 export interface DataSource {
 
 	/** Contains the respective cube name from OLAP database as string type.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	cube?: string;
 
@@ -29909,7 +29942,7 @@ export interface DataSource {
 	data?: any;
 
 	/** In connection with an OLAP database, this property contains the database name as string to fetch the data from the given connection string.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	catalog?: string;
 
@@ -30041,7 +30074,7 @@ export namespace PivotTreeMap {
 export interface Model {
 
 	/** Specifies the CSS class to PivotTreeMap to achieve custom theme.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	cssClass?: string;
 
@@ -30055,7 +30088,7 @@ export interface Model {
 	*/
 	customObject?: any;
 
-	/** Allows the user to enable PivotTreeMap’s responsiveness in the browser layout.
+	/** Allows the user to enable PivotTreeMap’s responsiveness in the browser layout.
 	*   @Default {false}
 	*/
 	isResponsive?: boolean;
@@ -30076,7 +30109,7 @@ export interface Model {
 	serviceMethodSettings?: ServiceMethodSettings;
 
 	/** Connects the service using the specified URL for any server updates.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	url?: string;
 
@@ -30311,12 +30344,12 @@ export interface DataSource {
 	data?: any;
 
 	/** Contains the respective cube name from OLAP database as string type.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	cube?: string;
 
 	/** In connection with an OLAP database, this property contains the database name as string to fetch the data from the given connection string.
-	*   @Default {“”}
+	*   @Default {“”}
 	*/
 	catalog?: string;
 
@@ -33630,6 +33663,11 @@ export interface EditSettings {
 	*   @Default {normal}
 	*/
 	editMode?: string;
+
+	/** Specifies the position where the new row has to be added.
+	*   @Default {ej.Gantt.RowPosition.BelowSelectedRow}
+	*/
+	rowPosition?: ej.Gantt.RowPosition|string;
 }
 
 export interface ScheduleHeaderSettings {
@@ -33679,10 +33717,10 @@ export interface ScheduleHeaderSettings {
 	*/
 	yearHeaderFormat?: string;
 
-	/** Specifies the size of the lowest time unit along the timescale, with minimum value as &quot;50%&quot; and maximum value as &quot;500%&quot;. It is also possble to set the value in pixels.
+	/** Specifies the size of the lowest time unit along the timescale, with minimum value as &quot;50%&quot; and maximum value as &quot;500%&quot;. It is also possible to set the value in pixels.
 	*   @Default {100%}
 	*/
-	timscaleUnitSize?: string;
+	timescaleUnitSize?: string;
 
 	/** Specifies the start day of the week in week timescale mode
 	*   @Default {0}
@@ -33759,6 +33797,25 @@ enum BeginEditAction {
 }
 
 
+enum RowPosition {
+
+	///you can add a new row at top.
+	Top,
+
+	///you can add a new row at bottom.
+	Bottom,
+
+	///you can add a new row to above selected row.
+	AboveSelectedRow,
+
+	///you can add a new row to below selected row.
+	BelowSelectedRow,
+
+	///you can add a new row as a child for selected row.
+	Child
+}
+
+
 enum TaskType {
 
 	///Resource unit remains constant while editing the work and duration values.
@@ -34759,7 +34816,7 @@ export interface Model {
 	*/
 	locale?: string;
 
-	/** Enables or disables internal parsing of a row. When disbaled this property, row will be displayed using the defined template without any internal event bindings.
+	/** Enables or disables internal parsing of a row. When disabled this property, row will be displayed using the defined template without any internal event bindings.
 	*   @Default {true}
 	*/
 	parseRowTemplate?: boolean;
@@ -36276,7 +36333,7 @@ export interface Model {
 	*/
 	query?: any;
 
-	/** Sets the list of button elements to be selected. To enable this option groupButtonMode should be in “checkbox” mode.
+	/** Sets the list of button elements to be selected. To enable this option groupButtonMode should be in “checkbox” mode.
 	*   @Default {[]}
 	*/
 	selectedItemIndex?: number[]|string[];
@@ -37141,7 +37198,7 @@ export interface Badge {
 	value?: number;
 
 	/** Sets position for tile badge.
-	*   @Default {“bottomright”}
+	*   @Default {“bottomright”}
 	*/
 	position?: ej.Tile.BadgePosition|string;
 }
@@ -42367,8 +42424,152 @@ export interface IgnoreSettings {
 }
 }
 
+class DocumentEditor extends ej.Widget {
+	static fn: DocumentEditor;
+	constructor(element: JQuery | Element, options?: DocumentEditor.Model);
+	static Locale: any;
+	model: DocumentEditor.Model;
+	defaults: DocumentEditor.Model;
+
+	/** Loads the document from specified path using web API provided by importUrl.
+	*   @param {string} Specifies the file path.
+	*   @returns {void}
+	*/
+	load(path: string): void;
+
+	/** Gets the page number of current selection in the document.
+	*   @returns {number}
+	*/
+	getCurrentPageNumber(): number;
+
+	/** Gets the total number of pages in the document.
+	*   @returns {number}
+	*/
+	getPageCount(): number;
+
+	/** Gets the text of current selection in the document.
+	*   @returns {string}
+	*/
+	getSelectedText(): string;
+
+	/** Gets the current zoom factor value of the document editor.
+	*   @returns {number}
+	*/
+	getZoomFactor(): number;
+
+	/** Scales the document editor with the specified zoom factor. The range of zoom factor should be 0.10 to 5.00 (10 - 500 %).
+	*   @param {number} Specifies the factor for zooming.
+	*   @returns {void}
+	*/
+	setZoomFactor(factor: number): void;
+
+	/** Prints the document content as page by page.
+	*   @returns {void}
+	*/
+	print(): void;
+
+	/** Finds the first occurrence of specified text from current selection and  highlights the result. If the document end is reached, find operation will occur from the document start position.
+	*   @param {string} Specifies the text to search in a document.
+	*   @returns {void}
+	*/
+	find(text: string): void;
+}
+export namespace DocumentEditor {
+
+export interface Model {
+
+	/** Gets or sets an object that indicates initialization of importing and exporting documents in document editor.
+	*/
+	importExportSettings?: ImportExportSettings;
+
+	/** Triggers when the document changes. */
+	onDocumentChange?(e: OnDocumentChangeEventArgs): void;
+
+	/** Triggers when the selection changes. */
+	onSelectionChange?(e: OnSelectionChangeEventArgs): void;
+
+	/** Triggers when the zoom factor changes. */
+	onZoomFactorChange?(e: OnZoomFactorChangeEventArgs): void;
+
+	/** Triggers when the hyperlink is clicked. */
+	onRequestNavigate?(e: OnRequestNavigateEventArgs): void;
+}
+
+export interface OnDocumentChangeEventArgs {
+
+	/** True, if the event should be canceled; otherwise, false.
+	*/
+	cancel?: boolean;
+
+	/** Returns the document editor model.
+	*/
+	model?: any;
+
+	/** Returns the name of the event.
+	*/
+	type?: string;
+}
+
+export interface OnSelectionChangeEventArgs {
+
+	/** True, if the event should be canceled; otherwise, false.
+	*/
+	cancel?: boolean;
+
+	/** Returns the document editor model.
+	*/
+	model?: any;
+
+	/** Returns the name of the event.
+	*/
+	type?: string;
+}
+
+export interface OnZoomFactorChangeEventArgs {
+
+	/** True, if the event should be canceled; otherwise, false.
+	*/
+	cancel?: boolean;
+
+	/** Returns the document editor model.
+	*/
+	model?: any;
+
+	/** Returns the name of the event.
+	*/
+	type?: string;
+}
+
+export interface OnRequestNavigateEventArgs {
+
+	/** true, if the event should be canceled; otherwise, false.
+	*/
+	cancel?: boolean;
+
+	/** Returns the document editor model.
+	*/
+	model?: any;
+
+	/** Returns the link type and navigation link.
+	*/
+	hyperlink?: any;
+
+	/** Returns the name of the event.
+	*/
+	type?: string;
+}
+
+export interface ImportExportSettings {
+
+	/** Gets or sets URL of Web API that should be used to parse the document while loading.
+	*/
+	importUrl?: string;
+}
+}
+
 }
 declare namespace ej.datavisualization {
+
 class SymbolPalette extends ej.Widget {
 	static fn: SymbolPalette;
 	constructor(element: JQuery | Element, options?: SymbolPalette.Model);
@@ -47062,18 +47263,18 @@ export interface Model {
 
 	/** This is a horizontal axis that contains options to configure axis and it is the primary x axis for all the series in series array.
 	*   To override x axis for particular series, create an axis object by providing unique name by using name property and add it to axes array.
-	*   Then, assign the name to the series’s xAxisName property to link both axis and series.
+	*   Then, assign the name to the series’s xAxisName property to link both axis and series.
 	*/
 	primaryXAxis?: PrimaryXAxis;
 
 	/** To override x axis for particular series, create an axis object by providing unique name by using name property and add it to axes array.
-	*   Then, assign the name to the series’s xAxisName property to link both axis and series.
+	*   Then, assign the name to the series’s xAxisName property to link both axis and series.
 	*/
 	axes?: Axis[];
 
 	/** This is a vertical axis that contains options to configure axis. This is the primary y axis for all the series in series array.
 	*   To override y axis for particular series, create an axis object by providing unique name by using name property and add it to axes array.
-	*   Then, assign the name to the series’s yAxisName property to link both axis and series.
+	*   Then, assign the name to the series’s yAxisName property to link both axis and series.
 	*/
 	primaryYAxis?: PrimaryYAxis;
 
@@ -47511,7 +47712,7 @@ export interface LegendItemClickEventArgs {
 	*/
 	LegendItem?: any;
 
-	/** Options to customize the legend item styles such as border, color, size, etc…,
+	/** Options to customize the legend item styles such as border, color, size, etc…,
 	*/
 	style?: any;
 
@@ -47554,11 +47755,11 @@ export interface LegendItemMouseMoveEventArgs {
 	*/
 	LegendItem?: any;
 
-	/** Options to customize the legend item styles such as border, color, size, etc…,
+	/** Options to customize the legend item styles such as border, color, size, etc…,
 	*/
 	style?: any;
 
-	/** Options to customize the legend item styles such as border, color, size, etc…,
+	/** Options to customize the legend item styles such as border, color, size, etc…,
 	*/
 	Bounds?: any;
 
@@ -48676,7 +48877,7 @@ export interface CommonSeriesOptionsMarkerDataLabel {
 	*/
 	shape?: ej.datavisualization.Chart.Shape|string;
 
-	/** Custom template to format the data label content. Use “point.x” and “point.y” as a placeholder text to display the corresponding data point’s x and y value.
+	/** Custom template to format the data label content. Use “point.x” and “point.y” as a placeholder text to display the corresponding data point’s x and y value.
 	*/
 	template?: string;
 
@@ -48728,7 +48929,7 @@ export interface CommonSeriesOptionsMarker {
 	*/
 	fill?: string;
 
-	/** The URL for the Image to be displayed as marker. In order to display image as marker, set series.marker.shape as ‘image’.
+	/** The URL for the Image to be displayed as marker. In order to display image as marker, set series.marker.shape as ‘image’.
 	*/
 	imageUrl?: string;
 
@@ -48854,7 +49055,7 @@ export interface CommonSeriesOptionsTooltip {
 	*/
 	opacity?: number;
 
-	/** Custom template to format the tooltip content. Use “point.x” and “point.y” as a placeholder text to display the corresponding data point’s x and y value.
+	/** Custom template to format the tooltip content. Use “point.x” and “point.y” as a placeholder text to display the corresponding data point’s x and y value.
 	*   @Default {null}
 	*/
 	template?: string;
@@ -48959,7 +49160,7 @@ export interface CommonSeriesOptionsErrorBarCap {
 	length?: number;
 
 	/** Color of the error bar cap.
-	*   @Default {“#000000”}
+	*   @Default {“#000000”}
 	*/
 	fill?: string;
 }
@@ -49319,7 +49520,7 @@ export interface CommonSeriesOptions {
 	*/
 	isTransposed?: boolean;
 
-	/** Render the x mark in the center of the boxplot series type.x represents the average value of the boxplot series.
+	/** Render the x mark in the center of the box and whisker series type.x represents the average value of the box and whisker series.
 	*   @Default {true}
 	*/
 	showMedian?: boolean;
@@ -49329,7 +49530,7 @@ export interface CommonSeriesOptions {
 	*/
 	labelPosition?: ej.datavisualization.Chart.LabelPosition|string;
 
-	/** Quartile calculation has been performed in three different formulas to render the boxplot series.
+	/** Quartile calculation has been performed in three different formulas to render the box and whisker series.
 	*   @Default {exclusive}
 	*/
 	boxPlotMode?: ej.datavisualization.Chart.boxPlotMode|string;
@@ -49701,7 +49902,7 @@ export interface IndicatorsTooltip {
 	*/
 	enableAnimation?: boolean;
 
-	/** Format of indicator tooltip. Use “point.x” and “point.y” as a placeholder text to display the corresponding data point’s x and y value.
+	/** Format of indicator tooltip. Use “point.x” and “point.y” as a placeholder text to display the corresponding data point’s x and y value.
 	*   @Default {#point.x# : #point.y#}
 	*/
 	format?: string;
@@ -50446,8 +50647,8 @@ export interface PrimaryXAxisStripLine {
 	*/
 	width?: number;
 
-	/** Specifies the order where the strip line and the series have to be rendered. When Z-order is “behind”, strip line is rendered
-	*   under the series and when it is “over”, it is rendered above the series.
+	/** Specifies the order where the strip line and the series have to be rendered. When Z-order is “behind”, strip line is rendered
+	*   under the series and when it is “over”, it is rendered above the series.
 	*   @Default {over. See ZIndex}
 	*/
 	zIndex?: ej.datavisualization.Chart.ZIndex|string;
@@ -50553,7 +50754,7 @@ export interface PrimaryXAxis {
 	*/
 	crossesInAxis?: string;
 
-	/** Category axis can also plot points based on index value of data points. Index based plotting can be enabled by setting ‘isIndexed’ property to true.
+	/** Category axis can also plot points based on index value of data points. Index based plotting can be enabled by setting ‘isIndexed’ property to true.
 	*   @Default {false}
 	*/
 	isIndexed?: boolean;
@@ -51129,7 +51330,7 @@ export interface AxesStripLine {
 	*/
 	width?: number;
 
-	/** Specifies the order where the strip line and the series have to be rendered. When Z-order is “behind”, strip line is rendered under the series and when it is “over”,
+	/** Specifies the order where the strip line and the series have to be rendered. When Z-order is “behind”, strip line is rendered under the series and when it is “over”,
 	*   it is rendered above the series.
 	*   @Default {over. See ZIndex}
 	*/
@@ -51230,7 +51431,7 @@ export interface Axis {
 	*/
 	crossesAt?: number;
 
-	/** Category axis can also plot points based on index value of data points. Index based plotting can be enabled by setting ‘isIndexed’ property to true.
+	/** Category axis can also plot points based on index value of data points. Index based plotting can be enabled by setting ‘isIndexed’ property to true.
 	*   @Default {false}
 	*/
 	isIndexed?: boolean;
@@ -51781,7 +51982,7 @@ export interface PrimaryYAxisStripLine {
 	*/
 	start?: number;
 
-	/** Indicates whether to render the strip line from the minimum/start value of the axis. This property won’t work when start property is set.
+	/** Indicates whether to render the strip line from the minimum/start value of the axis. This property won’t work when start property is set.
 	*   @Default {false}
 	*/
 	startFromAxis?: boolean;
@@ -51806,8 +52007,8 @@ export interface PrimaryYAxisStripLine {
 	*/
 	width?: number;
 
-	/** Specifies the order in which strip line and the series have to be rendered. When Z-order is “behind”, strip line is rendered below the series and
-	*   when it is “over”, it is rendered above the series.
+	/** Specifies the order in which strip line and the series have to be rendered. When Z-order is “behind”, strip line is rendered below the series and
+	*   when it is “over”, it is rendered above the series.
 	*   @Default {over. See ZIndex}
 	*/
 	zIndex?: ej.datavisualization.Chart.ZIndex|string;
@@ -52322,7 +52523,7 @@ export interface SeriesMarkerDataLabel {
 	opacity?: number;
 
 	/** Background shape of the data label.
-	*   @Default {No shape is rendered by default, so its value is ‘none’. See Shape}
+	*   @Default {No shape is rendered by default, so its value is ‘none’. See Shape}
 	*/
 	shape?: ej.datavisualization.Chart.Shape|string;
 
@@ -52345,7 +52546,7 @@ export interface SeriesMarkerDataLabel {
 	*/
 	visible?: boolean;
 
-	/** Custom template to format the data label content. Use “point.x” and “point.y” as a placeholder text to display the corresponding data point’s x and y value.
+	/** Custom template to format the data label content. Use “point.x” and “point.y” as a placeholder text to display the corresponding data point’s x and y value.
 	*/
 	template?: string;
 
@@ -52383,7 +52584,7 @@ export interface SeriesMarker {
 	*/
 	fill?: string;
 
-	/** The URL for the Image that is to be displayed as marker. In order to display image as marker, set series.marker.shape as ‘image’.
+	/** The URL for the Image that is to be displayed as marker. In order to display image as marker, set series.marker.shape as ‘image’.
 	*/
 	imageUrl?: string;
 
@@ -52740,7 +52941,7 @@ export interface SeriesPointsMarkerDataLabel {
 	opacity?: number;
 
 	/** Background shape of the data label.
-	*   @Default {No shape is rendered by default, so its value is ‘none’. See Shape}
+	*   @Default {No shape is rendered by default, so its value is ‘none’. See Shape}
 	*/
 	shape?: ej.datavisualization.Chart.Shape|string;
 
@@ -52759,7 +52960,7 @@ export interface SeriesPointsMarkerDataLabel {
 	*/
 	visible?: boolean;
 
-	/** Custom template to format the data label content. Use “point.x” and “point.y” as a placeholder text to display the corresponding data point’s x and y value.
+	/** Custom template to format the data label content. Use “point.x” and “point.y” as a placeholder text to display the corresponding data point’s x and y value.
 	*/
 	template?: string;
 
@@ -52797,7 +52998,7 @@ export interface SeriesPointsMarker {
 	*/
 	fill?: string;
 
-	/** The URL for the Image that is to be displayed as marker. In order to display image as marker, set series.marker.shape as ‘image’.
+	/** The URL for the Image that is to be displayed as marker. In order to display image as marker, set series.marker.shape as ‘image’.
 	*/
 	imageUrl?: string;
 
@@ -52969,7 +53170,7 @@ export interface SeriesTooltip {
 	*/
 	opacity?: number;
 
-	/** Custom template to format the tooltip content. Use “point.x” and “point.y” as a placeholder text to display the corresponding data point’s x and y value.
+	/** Custom template to format the tooltip content. Use “point.x” and “point.y” as a placeholder text to display the corresponding data point’s x and y value.
 	*   @Default {null}
 	*/
 	template?: string;
@@ -53273,7 +53474,7 @@ export interface Series {
 	*/
 	isTransposed?: boolean;
 
-	/** Render the x mark in the center of the boxplot series type.x represents the average value of the boxplot series.
+	/** Render the x mark in the center of the box and whisker series type.x represents the average value of the box and whisker series.
 	*   @Default {true}
 	*/
 	showMedian?: boolean;
@@ -57128,6 +57329,11 @@ export interface Layer {
 	*/
 	labelSettings?: LayersLabelSettings;
 
+	/** Specifies the map view type.
+	*   @Default {'geographic'}
+	*/
+	geometryType?: ej.datavisualization.Map.GeometryType|string;
+
 	/** Specifies the map type.
 	*   @Default {'geometry'}
 	*/
@@ -57240,6 +57446,14 @@ Default,
 }
 }
 namespace Map {
+enum GeometryType {
+//specifies the geographic view of map
+Geographic,
+//specifies the normal land view of map
+Normal,
+}
+}
+namespace Map {
 enum LayerType {
 //specifies the geometry type
 Geometry,
@@ -59684,6 +59898,16 @@ export interface Connector {
 
 export interface ContextMenuItem {
 
+	/** Defines the text for the collection of context menu item
+	*   @Default {null}
+	*/
+	text?: string;
+
+	/** Defines the name for the collection of context menu items
+	*   @Default {null}
+	*/
+	name?: string;
+
 	/** Defines the image url for the collection of context menu items
 	*   @Default {null}
 	*/
@@ -59693,6 +59917,11 @@ export interface ContextMenuItem {
 	*   @Default {null}
 	*/
 	cssClass?: string;
+
+	/** Defines the collection of sub items for the context menu items
+	*   @Default {[]}
+	*/
+	subItems?: any[];
 }
 
 export interface ContextMenu {
@@ -63490,7 +63719,7 @@ export interface Model {
 	*/
 	yName?: string;
 
-	/** Controls wheather sunburst has to be responsive or not.
+	/** Controls whether sunburst has to be responsive or not.
 	*   @Default {true}
 	*/
 	isResponsive?: boolean;
@@ -63610,7 +63839,7 @@ export interface Model {
 	pointRegionClick?(e: PointRegionClickEventArgs): void;
 
 	/** Fires while moving the mouse over sunburst points */
-	pointRegionMousemove?(e: PointRegionMousemoveEventArgs): void;
+	pointRegionMouseMove?(e: PointRegionMouseMoveEventArgs): void;
 
 	/** Fires when clicking the point to perform drilldown. */
 	drillDownClick?(e: DrillDownClickEventArgs): void;
@@ -63774,7 +64003,7 @@ export interface PointRegionClickEventArgs {
 	type?: string;
 }
 
-export interface PointRegionMousemoveEventArgs {
+export interface PointRegionMouseMoveEventArgs {
 
 	/** Includes data of mouse moved region
 	*/
@@ -64024,7 +64253,7 @@ export interface DataLabelSettings {
 	*/
 	visible?: boolean;
 
-	/** Alginment of sunburst datalabel
+	/** Alignment of sunburst datalabel
 	*   @Default {Angle. See DatalabelAlignment}
 	*/
 	labelRotationMode?: ej.datavisualization.Sunburst.SunburstLabelRotationMode|string;
@@ -64033,12 +64262,12 @@ export interface DataLabelSettings {
 	*/
 	font?: DataLabelSettingsFont;
 
-	/** Custome template for datalabel
+	/** Custom template for datalabel
 	*   @Default {null}
 	*/
 	template?: string;
 
-	/** Fill color for the datalable
+	/** Fill color for the datalabel
 	*   @Default {null}
 	*/
 	fill?: string;
diff --git a/electron-devtools-installer/electron-devtools-installer-tests.ts b/electron-devtools-installer/electron-devtools-installer-tests.ts
index a923e2b20e..a453221698 100644
--- a/electron-devtools-installer/electron-devtools-installer-tests.ts
+++ b/electron-devtools-installer/electron-devtools-installer-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="electron-devtools-installer" />
-
 import installExtension, {
     EMBER_INSPECTOR, REACT_DEVELOPER_TOOLS,
     BACKBONE_DEBUGGER, JQUERY_DEBUGGER,
diff --git a/electron/index.d.ts b/electron/index.d.ts
index 0b98ae1944..11103b3a18 100644
--- a/electron/index.d.ts
+++ b/electron/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Electron v1.4.8
 // Project: http://electron.atom.io/
-// Definitions by: jedmao <https://github.com/jedmao/>, rhysd <https://rhysd.github.io>, Milan Burda <https://github.com/miniak/>, aliib <https://github.com/aliib>, Daniel Perez Alvarez <https://github.com/unindented>
+// Definitions by: jedmao <https://github.com/jedmao/>, rhysd <https://rhysd.github.io>, Milan Burda <https://github.com/miniak/>, aliib <https://github.com/aliib>, Daniel Perez Alvarez <https://github.com/unindented>, Markus Olsson <https://github.com/niik>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -2455,7 +2455,11 @@ declare namespace Electron {
 		 */
 		constructor(options: MenuItemOptions);
 
-		click: (menuItem: MenuItem, browserWindow: BrowserWindow, event: Event) => void;
+		/**
+		 * A function that is fired when the MenuItem receives a click event
+		 */
+		click: (event: Event, browserWindow: BrowserWindow, webContents: WebContents) => void;
+
 		/**
 		 * Read-only property.
 		 */
@@ -2492,7 +2496,7 @@ declare namespace Electron {
 		/**
 		 * Callback when the menu item is clicked.
 		 */
-		click?: (menuItem: MenuItem, browserWindow: BrowserWindow) => void;
+		click?: (menuItem: MenuItem, browserWindow: BrowserWindow, event: Event) => void;
 		/**
 		 * Can be normal, separator, submenu, checkbox or radio.
 		 */
diff --git a/electron/test/main.ts b/electron/test/main.ts
index 276a15d851..35a85a81dc 100644
--- a/electron/test/main.ts
+++ b/electron/test/main.ts
@@ -531,12 +531,19 @@ var winWindows = new BrowserWindow({
 // menu-item
 // https://github.com/atom/electron/blob/master/docs/api/menu-item.md
 
-var menuItem = new MenuItem({});
+var menuItem = new MenuItem({
+	click: (menuItem: Electron.MenuItem, browserWindow: Electron.BrowserWindow, event: Electron.Event) => {
+		console.log('click', menuItem, browserWindow, event);
+	}
+});
+
+const fakeEvent: Electron.Event = {
+	preventDefault: () => { },
+	sender: winWindows.webContents,
+}
 
 menuItem.label = 'Hello World!';
-menuItem.click = (menuItem, browserWindow) => {
-	console.log('click', menuItem, browserWindow);
-};
+menuItem.click(fakeEvent, winWindows, winWindows.webContents)
 
 // menu
 // https://github.com/atom/electron/blob/master/docs/api/menu.md
diff --git a/ember/v1/ember-tests.ts b/ember/v1/ember-tests.ts
index 25ca3e3cc5..103fb0146e 100644
--- a/ember/v1/ember-tests.ts
+++ b/ember/v1/ember-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="handlebars" />
-
-
 var App : any;
 
 App = Em.Application.create<Em.Application>();
diff --git a/enzyme/enzyme-tests.tsx b/enzyme/enzyme-tests.tsx
index 82a8dc9822..c7323766f7 100644
--- a/enzyme/enzyme-tests.tsx
+++ b/enzyme/enzyme-tests.tsx
@@ -37,6 +37,13 @@ namespace ShallowWrapperTest {
         elementWrapper: ShallowWrapper<HTMLAttributes<{}>, {}>,
         statelessWrapper: ShallowWrapper<StatelessProps, never>;
 
+    function test_props_state_inferring() {
+        let wrapper: ShallowWrapper<MyComponentProps, MyComponentState>;
+        wrapper = shallow(<MyComponent stringProp="value" />);
+        wrapper.state().stateProperty;
+        wrapper.props().stringProp.toUpperCase();
+    }
+
     function test_shallow_options() {
         shallow(<MyComponent stringProp="1"/>, {
             context: {
@@ -337,6 +344,13 @@ namespace ReactWrapperTest {
         elementWrapper: ReactWrapper<HTMLAttributes<{}>, {}>,
         statelessWrapper: ReactWrapper<StatelessProps, never>;
 
+    function test_prop_state_inferring() {
+        let wrapper: ReactWrapper<MyComponentProps, MyComponentState>;
+        wrapper = mount(<MyComponent stringProp="value" />);
+        wrapper.state().stateProperty;
+        wrapper.props().stringProp.toUpperCase();
+    }
+
     function test_unmount() {
         reactWrapper = reactWrapper.unmount();
     }
diff --git a/enzyme/index.d.ts b/enzyme/index.d.ts
index fc498ca78a..abb57e36ef 100644
--- a/enzyme/index.d.ts
+++ b/enzyme/index.d.ts
@@ -546,6 +546,7 @@ export interface MountRendererProps {
  * @param node
  * @param [options]
  */
+export function shallow<P>(node: ReactElement<P>, options?: ShallowRendererProps): ShallowWrapper<P, any>;
 export function shallow<P, S>(node: ReactElement<P>, options?: ShallowRendererProps): ShallowWrapper<P, S>;
 
 /**
@@ -553,6 +554,7 @@ export function shallow<P, S>(node: ReactElement<P>, options?: ShallowRendererPr
  * @param node
  * @param [options]
  */
+export function mount<P>(node: ReactElement<P>, options?: MountRendererProps): ReactWrapper<P, any>;
 export function mount<P, S>(node: ReactElement<P>, options?: MountRendererProps): ReactWrapper<P, S>;
 
 /**
diff --git a/esprima/esprima-tests.ts b/esprima/esprima-tests.ts
index d7c748d3b8..60b54e0679 100644
--- a/esprima/esprima-tests.ts
+++ b/esprima/esprima-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="estree" />
-
-
 import esprima = require('esprima');
 import * as ESTree from 'estree';
 
diff --git a/event-stream/tsconfig.json b/event-stream/tsconfig.json
index 208ff51fe0..768497bcd8 100644
--- a/event-stream/tsconfig.json
+++ b/event-stream/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/extended-listbox/extended-listbox-tests.ts b/extended-listbox/extended-listbox-tests.ts
index 0ca2f862b1..dfa51ffebf 100644
--- a/extended-listbox/extended-listbox-tests.ts
+++ b/extended-listbox/extended-listbox-tests.ts
@@ -1,5 +1,4 @@
-
-
+/// <reference types="jquery" />
 
 var $test = $("#test");
 
@@ -126,54 +125,3 @@ instance.onItemEnterPressed((event: ListboxEvent) => {
 instance.onItemDoubleClicked((event: ListboxEvent) => {
     console.log(event.args);
 });
-
-
-
-/////// LEGACY API ///////
-
-// Add string item
-instance.target.listbox("addItem", "Test2");
-
-
-// Add item
-var item: ListboxItem = <ListboxItem>{};
-item.selected = true;
-item.disabled = false;
-item.childItems = ["Test4"];
-item.groupHeader = false;
-item.id = "ouetioreit";
-item.index = 0;
-item.text = "Test3";
-var id: string = instance.target.listbox("addItem", item);
-
-
-// Remove item
-instance.target.listbox("removeItem", id);
-
-
-// Get item
-var i: ListboxItem = instance.target.listbox("getItem", id);
-
-
-// Get items
-var allItems: ListboxItem[] = instance.target.listbox("getItems");
-
-
-// Move item up
-var newIndex: number = instance.target.listbox("moveItemUp", i.id);
-
-
-// Move item down
-newIndex = instance.target.listbox("moveItemDown", i.id);
-
-
-// Clear selection
-instance.target.listbox("clearSelection");
-
-
-// Enable
-instance.target.listbox("enable", false);
-
-
-// Destroy
-instance.target.listbox("destroy");
diff --git a/extended-listbox/index.d.ts b/extended-listbox/index.d.ts
index eb5f0eec04..3f3527b903 100644
--- a/extended-listbox/index.d.ts
+++ b/extended-listbox/index.d.ts
@@ -1,10 +1,8 @@
-// Type definitions for extended-listbox 1.1.x
+// Type definitions for extended-listbox 2.0.x
 // Project: https://github.com/code-chris/extended-listbox
 // Definitions by: Christian Kotzbauer <https://github.com/code-chris>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="jquery" />
-
 interface ListboxItem {
     /** display text */
     text?: string;
@@ -147,37 +145,4 @@ interface JQuery {
 
     /** constructs a new instance of Listbox on the given DOM item */
     listbox(options: ListBoxOptions): ExtendedListboxInstance|ExtendedListboxInstance[];
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'addItem'): string;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'removeItem'): void;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'destroy'): void;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'getItem'): ListboxItem;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'getItems'): ListboxItem[];
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'moveItemUp'): number;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'moveItemDown'): number;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'clearSelection'): void;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'enable'): void;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: string): any;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: string, methodParameter: any): any;
 }
diff --git a/facebook-js-sdk/index.d.ts b/facebook-js-sdk/index.d.ts
index a7b78e73b0..cb1981580a 100644
--- a/facebook-js-sdk/index.d.ts
+++ b/facebook-js-sdk/index.d.ts
@@ -172,6 +172,7 @@ declare namespace facebook {
         authResponse: {
             accessToken: string;
             expiresIn: number;
+	    grantedScopes: string;
             signedRequest: string;
             userID: string;
         };
diff --git a/faker/faker-tests.ts b/faker/faker-tests.ts
index 4dc2a3735f..5fb6a53746 100644
--- a/faker/faker-tests.ts
+++ b/faker/faker-tests.ts
@@ -52,6 +52,11 @@ resultStr = faker.company.bsAdjective();
 resultStr = faker.company.bsBuzz();
 resultStr = faker.company.bsNoun();
 
+resultStr = faker.database.column();
+resultStr = faker.database.type();
+resultStr = faker.database.collation();
+resultStr = faker.database.engine();
+
 resultDate = faker.date.past();
 resultDate = faker.date.future();
 resultDate = faker.date.between('foo', 'bar');
@@ -80,6 +85,8 @@ resultStr = faker.finance.transactionType();
 resultStr = faker.finance.currencyCode();
 resultStr = faker.finance.currencyName();
 resultStr = faker.finance.currencySymbol();
+resultStr = faker.finance.bitcoinAddress();
+resultStr = faker.finance.bic();
 
 resultStr = faker.hacker.abbreviation();
 resultStr = faker.hacker.adjective();
@@ -110,6 +117,8 @@ resultStr = userCard.address.suite;
 resultStr = faker.internet.avatar();
 resultStr = faker.internet.email();
 resultStr = faker.internet.email('foo', 'bar', 'quux');
+resultStr = faker.internet.exampleEmail();
+resultStr = faker.internet.exampleEmail('foo', 'bar');
 resultStr = faker.internet.protocol();
 resultStr = faker.internet.url();
 resultStr = faker.internet.domainName();
@@ -128,12 +137,18 @@ resultStr = faker.lorem.words();
 resultStr = faker.lorem.words(0);
 resultStr = faker.lorem.sentence();
 resultStr = faker.lorem.sentence(0, 0);
+resultStr = faker.lorem.slug();
+resultStr = faker.lorem.slug(0);
 resultStr = faker.lorem.sentences();
 resultStr = faker.lorem.sentences(0);
 resultStr = faker.lorem.paragraph();
 resultStr = faker.lorem.paragraph(0);
 resultStr = faker.lorem.paragraphs();
 resultStr = faker.lorem.paragraphs(0, '');
+resultStr = faker.lorem.text();
+resultStr = faker.lorem.text(0);
+resultStr = faker.lorem.lines();
+resultStr = faker.lorem.lines(0);
 
 resultStr = faker.name.firstName();
 resultStr = faker.name.firstName(0);
@@ -169,6 +184,13 @@ resultStr = faker.random.objectElement();
 resultStr = faker.random.objectElement({foo: 'bar', field: 'foo'});
 resultStr = faker.random.uuid();
 resultBool = faker.random.boolean();
+resultStr = faker.random.word();
+resultStr = faker.random.words();
+resultStr = faker.random.words(0);
+resultStr = faker.random.image();
+resultStr = faker.random.locale();
+resultStr = faker.random.alphaNumeric();
+resultStr = faker.random.alphaNumeric(0);
 
 resultStr = faker.system.fileName( "foo", "bar" );
 resultStr = faker.system.commonFileName( "foo", "bar" );
diff --git a/faker/index.d.ts b/faker/index.d.ts
index 01e01b8b8b..ccca40e51a 100644
--- a/faker/index.d.ts
+++ b/faker/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for faker v3.1
+// Type definitions for faker v4.1.0
 // Project: http://marak.com/faker.js/
-// Definitions by: Bas Pennings <https://github.com/basp/>, Yuki Kokubun <https://github.com/Kuniwak>
+// Definitions by: Ben Swartz <https://github.com/bensw/>, Bas Pennings <https://github.com/basp/>, Yuki Kokubun <https://github.com/Kuniwak>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare var fakerStatic: Faker.FakerStatic;
@@ -52,6 +52,13 @@ declare namespace Faker {
 			bsNoun(): string;
 		};
 
+		database: {
+			column(): string;
+			type(): string;
+			collation(): string;
+			engine(): string;
+		};
+
 		date: {
 			past(years?: number, refDate?: string|Date): Date;
 			future(years?: number, refDate?: string|Date): Date;
@@ -72,6 +79,8 @@ declare namespace Faker {
 			currencyCode(): string;
 			currencyName(): string;
 			currencySymbol(): string;
+			bitcoinAddress(): string;
+			bic(): string
 		};
 
 		hacker: {
@@ -116,11 +125,13 @@ declare namespace Faker {
 			sports(width?: number, height?: number): string;
 			technics(width?: number, height?: number): string;
 			transport(width?: number, height?: number): string;
+			dataUri(width?: number, height?: number): string;
 		};
 
 		internet: {
 			avatar(): string;
 			email(firstName?: string, lastName?: string, provider?: string): string;
+			exampleEmail(firstName?: string, lastName?: string): string;
 			userName(firstName?: string, lastName?: string): string;
 			protocol(): string;
 			url(): string;
@@ -128,6 +139,7 @@ declare namespace Faker {
 			domainSuffix(): string;
 			domainWord(): string;
 			ip(): string;
+			ipv6(): string;
 			userAgent(): string;
 			color(baseRed255?: number, baseGreen255?: number, baseBlue255?: number): string;
 			mac(): string;
@@ -138,9 +150,12 @@ declare namespace Faker {
 			word(): string;
 			words(num?: number): string;
 			sentence(wordCount?: number, range?: number): string;
+			slug(wordCount?: number): string;
 			sentences(sentenceCount?: number): string;
 			paragraph(sentenceCount?: number): string;
 			paragraphs(paragraphCount?: number, separator?: string): string;
+			text(times?: number): string;
+			lines(lineCount?: number): string;
 		};
 
 		name: {
@@ -171,6 +186,11 @@ declare namespace Faker {
 			objectElement<T>(object?: { [key: string]: T }, field?: any): T;
 			uuid(): string;
 			boolean(): boolean;
+			word(): string; // TODO: have ability to return specific type of word? As in: noun, adjective, verb, etc
+			words(count?: number): string;
+			image(): string;
+			locale(): string;
+			alphaNumeric(count?: number): string;
 		};
 
 		system: {
@@ -275,6 +295,14 @@ declare module "faker" {
 	export = fakerStatic;
 }
 
+declare module "faker/locale/az" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/cz" {
+	export = fakerStatic;
+}
+
 declare module "faker/locale/de" {
 	export = fakerStatic;
 }
@@ -351,6 +379,10 @@ declare module "faker/locale/ge" {
 	export = fakerStatic;
 }
 
+declare module "faker/locale/id_ID" {
+	export = fakerStatic;
+}
+
 declare module "faker/locale/it" {
 	export = fakerStatic;
 }
diff --git a/faker/tsconfig.json b/faker/tsconfig.json
index c2ce14c941..0589e5dc54 100644
--- a/faker/tsconfig.json
+++ b/faker/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -19,4 +19,4 @@
         "index.d.ts",
         "faker-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/faker/v3/faker-tests.ts b/faker/v3/faker-tests.ts
new file mode 100644
index 0000000000..4dc2a3735f
--- /dev/null
+++ b/faker/v3/faker-tests.ts
@@ -0,0 +1,183 @@
+
+
+let resultStr: string;
+let resultBool: boolean;
+let resultNum: number;
+let resultStrArr: string[];
+let resultDate: Date;
+
+import faker = require('faker');
+faker.locale = 'en';
+
+resultStr = faker.address.zipCode();
+resultStr = faker.address.zipCode('###');
+resultStr = faker.address.city();
+resultStr = faker.address.city(0);
+resultStr = faker.address.cityPrefix();
+resultStr = faker.address.citySuffix();
+resultStr = faker.address.streetName();
+resultStr = faker.address.streetAddress();
+resultStr = faker.address.streetAddress(false);;
+resultStr = faker.address.streetSuffix();
+resultStr = faker.address.streetPrefix();
+resultStr = faker.address.secondaryAddress();
+resultStr = faker.address.county();
+resultStr = faker.address.country();
+resultStr = faker.address.countryCode();
+resultStr = faker.address.state();
+resultStr = faker.address.state(false);
+resultStr = faker.address.stateAbbr();
+resultStr = faker.address.latitude();
+resultStr = faker.address.longitude();
+
+resultStr = faker.commerce.color();
+resultStr = faker.commerce.department();
+resultStr = faker.commerce.productName();
+resultStr = faker.commerce.price();
+resultStr = faker.commerce.price(0, 0, 0, '#');
+resultStr = faker.commerce.productAdjective();
+resultStr = faker.commerce.productMaterial();
+resultStr = faker.commerce.product();
+
+resultStrArr = faker.company.suffixes();
+resultStr = faker.company.companyName();
+resultStr = faker.company.companyName(0);
+resultStr = faker.company.companySuffix();
+resultStr = faker.company.catchPhrase();
+resultStr = faker.company.bs();
+resultStr = faker.company.catchPhraseAdjective();
+resultStr = faker.company.catchPhraseDescriptor();
+resultStr = faker.company.catchPhraseNoun();
+resultStr = faker.company.bsAdjective();
+resultStr = faker.company.bsBuzz();
+resultStr = faker.company.bsNoun();
+
+resultDate = faker.date.past();
+resultDate = faker.date.future();
+resultDate = faker.date.between('foo', 'bar');
+resultDate = faker.date.between(new Date(), new Date());
+resultDate = faker.date.recent();
+resultDate = faker.date.recent(100);
+resultStr = faker.date.month();
+resultStr = faker.date.month({
+	abbr: true,
+	context: true
+});
+resultStr = faker.date.weekday();
+resultStr = faker.date.weekday({
+	abbr: true,
+	context: true
+});
+
+resultStr = faker.finance.account();
+resultStr = faker.finance.account(0);
+resultStr = faker.finance.accountName();
+resultStr = faker.finance.mask();
+resultStr = faker.finance.mask(0, false, false);
+resultStr = faker.finance.amount();
+resultStr = faker.finance.amount(0, 0, 0, '#');
+resultStr = faker.finance.transactionType();
+resultStr = faker.finance.currencyCode();
+resultStr = faker.finance.currencyName();
+resultStr = faker.finance.currencySymbol();
+
+resultStr = faker.hacker.abbreviation();
+resultStr = faker.hacker.adjective();
+resultStr = faker.hacker.noun();
+resultStr = faker.hacker.verb();
+resultStr = faker.hacker.ingverb();
+resultStr = faker.hacker.phrase();
+
+resultStr = faker.helpers.randomize();
+resultNum = faker.helpers.randomize([1,2,3,4]);
+resultStr = faker.helpers.randomize(['foo', 'bar', 'quux']);
+resultStr = faker.helpers.slugify('foo bar quux');
+resultStr = faker.helpers.replaceSymbolWithNumber('foo# bar#');
+resultStr = faker.helpers.replaceSymbols('foo# bar? quux#');
+resultStrArr = faker.helpers.shuffle(['foo', 'bar', 'quux']);
+resultStr = faker.helpers.mustache('{{foo}}{{bar}}', {foo: 'x', bar: 'y'});
+
+const card = faker.helpers.createCard();
+resultStr = card.name;
+resultStr = card.address.streetA;
+const contextualCard = faker.helpers.contextualCard();
+resultStr = contextualCard.name;
+resultStr = contextualCard.address.suite;
+const userCard = faker.helpers.userCard();
+resultStr = userCard.name;
+resultStr = userCard.address.suite;
+
+resultStr = faker.internet.avatar();
+resultStr = faker.internet.email();
+resultStr = faker.internet.email('foo', 'bar', 'quux');
+resultStr = faker.internet.protocol();
+resultStr = faker.internet.url();
+resultStr = faker.internet.domainName();
+resultStr = faker.internet.domainSuffix();
+resultStr = faker.internet.domainWord();
+resultStr = faker.internet.ip();
+resultStr = faker.internet.userAgent();
+resultStr = faker.internet.color();
+resultStr = faker.internet.color(0, 0, 0);
+resultStr = faker.internet.mac();
+resultStr = faker.internet.password();
+resultStr = faker.internet.password(0, false, '#', 'foo');
+
+resultStr = faker.lorem.word();
+resultStr = faker.lorem.words();
+resultStr = faker.lorem.words(0);
+resultStr = faker.lorem.sentence();
+resultStr = faker.lorem.sentence(0, 0);
+resultStr = faker.lorem.sentences();
+resultStr = faker.lorem.sentences(0);
+resultStr = faker.lorem.paragraph();
+resultStr = faker.lorem.paragraph(0);
+resultStr = faker.lorem.paragraphs();
+resultStr = faker.lorem.paragraphs(0, '');
+
+resultStr = faker.name.firstName();
+resultStr = faker.name.firstName(0);
+resultStr = faker.name.lastName();
+resultStr = faker.name.lastName(0);
+resultStr = faker.name.findName();
+resultStr = faker.name.findName('', '', 0);
+resultStr = faker.name.jobTitle();
+resultStr = faker.name.prefix();
+resultStr = faker.name.suffix();
+resultStr = faker.name.title();
+resultStr = faker.name.jobDescriptor();
+resultStr = faker.name.jobArea();
+resultStr = faker.name.jobType();
+
+resultStr = faker.phone.phoneNumber();
+resultStr = faker.phone.phoneNumber('#');
+resultStr = faker.phone.phoneNumberFormat();
+// https://github.com/Marak/faker.js/blob/master/lib/phone_number.js#L9-L13
+resultStr = faker.phone.phoneNumberFormat(0);
+resultStr = faker.phone.phoneFormats();
+
+resultNum = faker.random.number();
+resultNum = faker.random.number(0);
+resultNum = faker.random.number({
+	min: 0,
+	max: 0,
+	precision: 0
+});
+resultStr = faker.random.arrayElement();
+resultStr = faker.random.arrayElement(['foo', 'bar', 'quux'])
+resultStr = faker.random.objectElement();
+resultStr = faker.random.objectElement({foo: 'bar', field: 'foo'});
+resultStr = faker.random.uuid();
+resultBool = faker.random.boolean();
+
+resultStr = faker.system.fileName( "foo", "bar" );
+resultStr = faker.system.commonFileName( "foo", "bar" );
+resultStr = faker.system.mimeType();
+resultStr = faker.system.commonFileType();
+resultStr = faker.system.commonFileExt();
+resultStr = faker.system.fileType();
+resultStr = faker.system.fileExt( "foo" );
+resultStr = faker.system.semver();
+
+import fakerEn = require('faker/locale/en');
+resultStr = faker.name.firstName();
diff --git a/faker/v3/index.d.ts b/faker/v3/index.d.ts
new file mode 100644
index 0000000000..01e01b8b8b
--- /dev/null
+++ b/faker/v3/index.d.ts
@@ -0,0 +1,416 @@
+// Type definitions for faker v3.1
+// Project: http://marak.com/faker.js/
+// Definitions by: Bas Pennings <https://github.com/basp/>, Yuki Kokubun <https://github.com/Kuniwak>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var fakerStatic: Faker.FakerStatic;
+
+declare namespace Faker {
+	interface FakerStatic {
+		locale: string;
+
+		address: {
+			zipCode(format?: string): string;
+			city(format?: number): string;
+			cityPrefix(): string;
+			citySuffix(): string;
+			streetName(): string;
+			streetAddress(useFullAddress?: boolean): string;
+			streetSuffix(): string;
+			streetPrefix(): string;
+			secondaryAddress(): string;
+			county(): string;
+			country(): string;
+			countryCode(): string;
+			state(useAbbr?: boolean): string;
+			stateAbbr(): string;
+			latitude(): string;
+			longitude(): string;
+		};
+
+		commerce: {
+			color(): string;
+			department(): string;
+			productName(): string;
+			price(min?: number, max?: number, dec?: number, symbol?: string): string;
+			productAdjective(): string;
+			productMaterial(): string;
+			product(): string;
+		};
+
+		company: {
+			suffixes(): string[];
+			companyName(format?: number): string;
+			companySuffix(): string;
+			catchPhrase(): string;
+			bs(): string;
+			catchPhraseAdjective(): string;
+			catchPhraseDescriptor(): string;
+			catchPhraseNoun(): string;
+			bsAdjective(): string;
+			bsBuzz(): string;
+			bsNoun(): string;
+		};
+
+		date: {
+			past(years?: number, refDate?: string|Date): Date;
+			future(years?: number, refDate?: string|Date): Date;
+			between(from: string|number|Date, to: string|Date): Date;
+			recent(days?: number): Date;
+			month(options?: { abbr?: boolean, context?: boolean }): string;
+			weekday(options?: { abbr?: boolean, context?: boolean }): string;
+		};
+
+		fake(str: string): string;
+
+		finance: {
+			account(length?: number): string;
+			accountName(): string;
+			mask(length?: number, parens?: boolean, elipsis?: boolean): string;
+			amount(min?:number, max?: number, dec?: number, symbol?: string): string;
+			transactionType(): string;
+			currencyCode(): string;
+			currencyName(): string;
+			currencySymbol(): string;
+		};
+
+		hacker: {
+			abbreviation(): string;
+			adjective(): string;
+			noun(): string;
+			verb(): string;
+			ingverb(): string;
+			phrase(): string;
+		};
+
+		helpers: {
+			randomize<T>(array: T[]): T;
+			randomize(): string;
+			slugify(string?: string): string;
+			replaceSymbolWithNumber(string?: string, symbol?: string): string;
+			replaceSymbols(string?: string): string;
+			shuffle<T>(o: T[]): T[];
+			shuffle(): string[];
+			mustache(str: string, data: { [key: string]: string|((substring: string, ...args: any[]) => string) }): string;
+			createCard(): Faker.Card;
+			contextualCard(): Faker.ContextualCard;
+			userCard(): Faker.UserCard;
+			createTransaction(): Faker.Transaction;
+		};
+
+
+		image: {
+			image(): string;
+			avatar(): string;
+			imageUrl(width?: number, height?: number, category?: string): string;
+			abstract(width?: number, height?: number): string;
+			animals(width?: number, height?: number): string;
+			business(width?: number, height?: number): string;
+			cats(width?: number, height?: number): string;
+			city(width?: number, height?: number): string;
+			food(width?: number, height?: number): string;
+			nightlife(width?: number, height?: number): string;
+			fashion(width?: number, height?: number): string;
+			people(width?: number, height?: number): string;
+			nature(width?: number, height?: number): string;
+			sports(width?: number, height?: number): string;
+			technics(width?: number, height?: number): string;
+			transport(width?: number, height?: number): string;
+		};
+
+		internet: {
+			avatar(): string;
+			email(firstName?: string, lastName?: string, provider?: string): string;
+			userName(firstName?: string, lastName?: string): string;
+			protocol(): string;
+			url(): string;
+			domainName(): string;
+			domainSuffix(): string;
+			domainWord(): string;
+			ip(): string;
+			userAgent(): string;
+			color(baseRed255?: number, baseGreen255?: number, baseBlue255?: number): string;
+			mac(): string;
+			password(len?: number, memorable?: boolean, pattern?: string|RegExp, prefix?: string): string;
+		};
+
+		lorem: {
+			word(): string;
+			words(num?: number): string;
+			sentence(wordCount?: number, range?: number): string;
+			sentences(sentenceCount?: number): string;
+			paragraph(sentenceCount?: number): string;
+			paragraphs(paragraphCount?: number, separator?: string): string;
+		};
+
+		name: {
+			firstName(gender?: number): string;
+			lastName(gender?: number): string;
+			findName(firstName?: string, lastName?: string, gender?: number): string;
+			jobTitle(): string;
+			prefix(): string;
+			suffix(): string;
+			title(): string;
+			jobDescriptor(): string;
+			jobArea(): string;
+			jobType(): string;
+		};
+
+		phone: {
+			phoneNumber(format?: string): string;
+			phoneNumberFormat(phoneFormatsArrayIndex?: number): string;
+			phoneFormats(): string;
+		};
+
+		random: {
+			number(max: number): number;
+			number(options?: { min?: number, max?: number, precision?: number }): number;
+			arrayElement(): string;
+			arrayElement<T>(array: T[]): T;
+			objectElement(object?: { [key: string]: any }, field?: "key"): string;
+			objectElement<T>(object?: { [key: string]: T }, field?: any): T;
+			uuid(): string;
+			boolean(): boolean;
+		};
+
+		system: {
+			fileName(ext: string, type: string): string;
+			commonFileName(ext: string, type: string): string;
+			mimeType(): string;
+			commonFileType(): string;
+			commonFileExt(): string;
+			fileType(): string;
+			fileExt(mimeType: string): string;
+			//directoryPath(): string;
+			//filePath(): string;
+			semver(): string;
+		};
+
+		seed(value: number): void;
+	}
+
+	interface Card {
+		name: string;
+		username: string;
+		email: string;
+		address: FullAddress;
+		phone: string;
+		website: string;
+		company: Company;
+		posts: Post[];
+		accountHistory: string[];
+	}
+
+	interface FullAddress {
+		streetA: string;
+		streetB: string;
+		streetC: string;
+		streetD: string;
+		city: string;
+		state: string;
+		county: string;
+		zipcode: string;
+		geo: Geo;
+	}
+
+	interface Geo {
+		lat: string;
+		lng: string;
+	}
+
+	interface Company {
+		name: string;
+		catchPhrase: string;
+		bs: string;
+	}
+
+	interface Post {
+		words: string;
+		sentence: string;
+		sentences: string;
+		paragraph: string;
+	}
+
+	interface ContextualCard {
+		name: string;
+		username: string;
+		email: string;
+		dob: Date;
+		phone: string;
+		address: Address;
+		website: string;
+		company: Company;
+	}
+
+	interface Address {
+		street: string;
+		suite: string;
+		city: string;
+		state: string;
+		zipcode: string;
+		geo: Geo;
+	}
+
+	interface UserCard {
+		name: string;
+		username: string;
+		email: string;
+		address: Address;
+		phone: string;
+		website: string;
+		company: Company;
+	}
+
+	interface Transaction {
+		amount: string;
+		date: Date;
+		business: string;
+		name: string;
+		type: string;
+		account: string;
+	}
+}
+
+declare module "faker" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/de" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/de_AT" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/de_CH" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/el_GR" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_AU" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_BORK" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_CA" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_GB" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_IE" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_IND" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_US" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_au_ocker" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/es" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/es_MX" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/fa" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/fr" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/fr_CA" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/ge" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/it" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/ja" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/ko" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/nb_NO" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/nep" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/nl" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/pl" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/pt_BR" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/ru" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/sk" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/sv" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/tr" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/uk" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/vi" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/zh_CN" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/zh_TW" {
+	export = fakerStatic;
+}
diff --git a/faker/v3/tsconfig.json b/faker/v3/tsconfig.json
new file mode 100644
index 0000000000..052493a9c7
--- /dev/null
+++ b/faker/v3/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+            "faker": [ "faker/v3" ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "faker-tests.ts"
+    ]
+}
diff --git a/falcor-express/falcor-express-tests.ts b/falcor-express/falcor-express-tests.ts
index f4a4ed8b52..c76a61f901 100644
--- a/falcor-express/falcor-express-tests.ts
+++ b/falcor-express/falcor-express-tests.ts
@@ -1,7 +1,3 @@
-
-/// <reference types="falcor" />
-/// <reference types="falcor-router" />
-
 import express = require('express');
 import Router = require('falcor-router');
 import falcorExpress = require('falcor-express')
diff --git a/fancybox/fancybox-tests.ts b/fancybox/fancybox-tests.ts
index 2d5743c950..eac3f31771 100644
--- a/fancybox/fancybox-tests.ts
+++ b/fancybox/fancybox-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 $('.fancybox').fancybox();
 $('.fancybox').fancybox({
     padding: 0,
diff --git a/featherlight/featherlight-tests.ts b/featherlight/featherlight-tests.ts
index 4d609d3475..e241a30990 100644
--- a/featherlight/featherlight-tests.ts
+++ b/featherlight/featherlight-tests.ts
@@ -1,7 +1,5 @@
 // Tests by: Kaur Kuut <https://github.com/xStrom>
 
-///<reference types="jquery" />
-
 // Every option as default
 var defaultOptions = {
 	namespace: 'featherlight',
diff --git a/file-type/index.d.ts b/file-type/index.d.ts
index a1bc0d8466..3a88fe0a94 100644
--- a/file-type/index.d.ts
+++ b/file-type/index.d.ts
@@ -5,11 +5,13 @@
 
 /// <reference types="node" />
 
-interface FileTypeResult {
-    ext: string
-    mime: string
+export = FileType;
+
+declare function FileType(buf: Buffer): FileType.FileTypeResult;
+
+declare namespace FileType {
+    export interface FileTypeResult {
+        ext: string;
+        mime: string;
+    }
 }
-
-declare function FileType(buf: Buffer): FileTypeResult
-
-export = FileType
diff --git a/fine-uploader/index.d.ts b/fine-uploader/index.d.ts
deleted file mode 100644
index dab4e720ea..0000000000
--- a/fine-uploader/index.d.ts
+++ /dev/null
@@ -1,346 +0,0 @@
-// Type definitions for FineUploader for 5.11
-// Project: http://fineuploader.com/
-// Definitions by: Bradford Wagner <https://github.com/bradfordwagner/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace qq {
-    interface BlobsOptions {
-        defaultName?: string;
-    }
-
-    interface CameraOptions {
-        button?: HTMLElement;
-        ios?: boolean;
-    }
-
-    interface ChunkingOptions {
-        concurrent?: ChunkingConcurrentOptions;
-        enabled?: boolean;          // default false
-        mandatory?: boolean;        // default false
-        partSize?: number;          // default 2,000,000
-        paramNames?: ChunkingParamNames;
-        success?: ChunkingSuccess;
-    }
-
-    interface ChunkingConcurrentOptions {
-        enabled?: boolean;          // default false
-    }
-
-    interface ChunkingParamNames {
-        chunkSize?: string;         // default: qqchunksize
-        partByteOffset?: string;    // default: qqpartbyteoffset
-        partIndex?: string;         // default: qqpartindex
-        totalParts?: string;        // default: qqtotalparts
-    }
-
-    interface ChunkingSuccess {
-        endpoint?: string | null;   // default: null
-    }
-
-    interface CorsOptions {
-        allowXdr?: boolean;         // default: false
-        expected?: boolean;         // default: false
-        sendCredentials: boolean;   // default: false
-    }
-
-    interface DeleteFileOptions<H, P> {
-        customHeader?: H;           // default: {}
-        enabled?: boolean;          // default false
-        endpoint?: string;          // default: /server/upload
-        method?: string;            // default: DELETE
-        params?: P;                 // default: {}
-    }
-
-    interface ExtraButtonsOptions<V> {
-        element: HTMLElement | undefined;   // default: undefined
-        fileInputTitle?: string;            // default: file input
-        folders?: boolean;                  // default: false
-        multiple?: boolean;                 // default: true
-        validation?: V;                     // default: 'validation'
-    }
-
-    interface FormOptions {
-        element?: string | HTMLElement; // default: qq-form
-        autoUpload?: boolean;           // default: false
-        interceptSubmit?: boolean;      // default: true
-    }
-
-    interface MessagesOptions {
-        emptyError?: string;                    // default: {file} is empty, please select files again without it.
-        maxHeightImageError?: string;           // default: Image is too tall.
-        maxWidthImageError?: string;            // default: Image is too wide.
-        minHeightImageError?: string;           // default: Image is not tall enough.
-        minWidthImageError?: string;            // default: Image is not wide enough.
-        minSizeError?: string;                  // default: {file} is too small, minimum file size is {minSizeLimit}.
-        noFilesError?: string;                  // default: No files to upload.
-        onLeave?: string;                       // default: The files are being uploaded, if you leave now the upload will be canceled.
-        retryFailTooManyItemsError?: string;    // default: Too many items ({netItems}) would be uploaded. Item limit is {itemLimit}.
-        typeError?: string;                     // default: {file} has an invalid extension. Valid extension(s): {extensions}.
-        // tslint:disable-next-line:max-line-length
-        unsupportedBrowserIos8Safari?: string;  // default: Unrecoverable error - this browser does not permit file uploading of any kind due to serious bugs in iOS8 Safari. Please use iOS8 Chrome until Apple fixes these issues.
-    }
-
-    interface PasteOptions {
-        defaultName?: string;                   // default: pasted_image
-        targetElement?: HTMLElement | null;     // default: null
-    }
-
-    interface ResumeOptions {
-        recordsExpireIn?: number;   // default: 7
-        enabled?: boolean;          // default: false
-        paramNames?: ResumeParamNameOptions;
-    }
-
-    interface ResumeParamNameOptions {
-        resuming: string;   // default: qqresume
-    }
-
-    interface RetryOptions {
-        autoAttemptDelay?: number;              // default: 5
-        enableAuto?: boolean;                   // default: false
-        maxAutoAttempts?: number;               // default: 3
-        preventRetryResponseProperty?: string;  // default: preventRetry
-    }
-
-    interface RequestOptions <H, P> {
-        customHeaders?: H;          // default: {}
-        endpoint?: string;          // default: /server/upload
-        filenameParam?: string;     // default: qqfilename
-        forceMultipart?: boolean;   // default: true
-        inputName?: string;         // default: qqfile
-        method?: string;            // default: POST
-        params?: P;                 // default: {}
-        paramsInBody?: boolean;     // default: true
-        uuid?: string;              // default: qquuid
-        totalFileSizeName?: string; // default: qqtotalfilesize
-    }
-
-    interface ScalingOptions {
-        customResizer?: (
-            blob: File | Blob,
-            height: number,
-            image: HTMLImageElement,
-            sourceCanvas: HTMLCanvasElement,
-            targetCanvas: HTMLCanvasElement,
-            width: number) => Promise<File | Blob> | undefined; // default: undefined
-        defaultQuality?: number;        // default: 80
-        defaultType?: string | null;    // default: null
-        failureText?: string;           // default: Failed to scale
-        includeExif?: boolean;          // default: false
-        orient?: boolean;               // default: true
-        sendOriginal?: boolean;         // default: false
-        sizes?: Size[];                 // default: []
-    }
-
-    /**
-     * From Documentation:
-     * An array containing size objects that describe scaled versions of each submitted image that should be generated and uploaded.
-     * A size object should usually contain a name String property (which will be appended to the file name of the scaled file), and must always contain a maxSize integer property.
-     * A type MIME string property is optional.
-     */
-    interface Size {
-        name: string;
-        maxSize: number;
-        type?: string;
-    }
-
-    interface SessionOptions<H, P> {
-        customHeaders?: H;          // default: {}
-        endpoint?: string | null;   // default: null
-        params?: P;                 // default: {}
-        refreshOnReset?: boolean;   // default: true
-    }
-
-    interface TextOptions {
-        defaultResponseError?: string;  // default: Upload failure reason unknown
-        fileInputTitle?: string;        // default: file input
-        sizeSymbols?: string[];         // default: ['kB', 'MB', 'GB', 'TB', 'PB', 'EB']
-    }
-
-    interface ValidationOptions {
-        acceptFiles?: MimeType[] | null;    // default: null
-        allowedExtensions?: string[];       // default: []
-        itemLimit?: number;                 // default: 0
-        minSizeLimit?: number;              // default: 0
-        sizeLimit?: number;                 // default: 0
-        stopOnFirstInvalidFile?: boolean;   // default: true
-        image?: ValidationImageOptions;
-    }
-
-    interface ValidationImageOptions {
-        maxHeight?: number;     // default: 0
-        maxWidth?: number;      // default: 0
-        minWidth?: number;      // default: 0
-        minHeight?: number;     // default: 0
-    }
-
-    interface WorkaroundOptions {
-        iosEmptyVideos?: boolean;       // default: true
-        ios8BrowserCrash?: boolean;     // default: false
-        ios8SafariUploads?: boolean;    // default: true
-    }
-
-    interface ChunkData {
-        partIndex: number;
-        startByte: number;
-        endByte: number;
-        totalParts: number;
-    }
-
-    interface ValidateMetadata {
-        name: string;
-        size?: number;
-    }
-
-    interface CallbackOptions {
-        onAutoRetry?: (id: number, name: string, attemptNumber: number) => void;
-        onCancel?: (id: number, name: string) => void;
-        onComplete?: <T>(id: number, name: string, responseJSON: T, xhr: XMLHttpRequest) => void; // ignore xhr: XDomainRequest as it is not compatible for all versions of TypeScript
-        onAllComplete?: (succeeded: number[], failed: number[]) => void;
-        onDelete?: (id: number) => void;
-        onDeleteComplete?: (id: number, xhr: XMLHttpRequest, isError: boolean) => void; // ignore xhr: XDomainRequest as it is not compatible for all versions of TypeScript
-        onError?: (id: number, name: string, errorReason: string, xhr: XMLHttpRequest) => void; // ignore xhr: XDomainRequest as it is not compatible for all versions of TypeScript
-        onManualRetry?: (id: number, name: string) => boolean; // return false to prevent this and all future retries
-        onPasteReceived?: (blob: Blob) => void;
-        onProgress?: (id: number, name: string, uploadedBytes: number, totalBytes: number) => void;
-        onResume?: <T>(id: number, name: string, chunkData: T) => void;
-        onSessionRequestComplete?: <T>(response: T[], success: boolean, xhrOrXdr: XMLHttpRequest) => void;  // ignore xhr: XDomainRequest as it is not compatible for all versions of TypeScript
-        onStatusChange?: (id: number, oldStatus: string, newStatus: string) => void;
-        onSubmit?: (id: number, name: string) => void;
-        onSubmitDelete?: (id: number) => void;
-        onSubmitted?: (id: number, name: string) => void;
-        onTotalProgress?: (totalUploadedBytes: number, totalBytes: number) => void;
-        onUpload?: (id: number, name: string) => void;
-        onUploadChunk?: (id: number, name: string, chunkData: ChunkData) => void;
-        // ignore xhr: XDomainRequest as it is not compatible for all versions of TypeScript
-        onUploadChunkSuccess?: <T>(id: number, chunkData: ChunkData, responseJSON: T, xhr: XMLHttpRequest) => void;
-        onValidate?: (data: ValidateMetadata, buttonContainer: HTMLElement) => void;
-        onValidateBatch?: (fileOrBlobDataArray: ValidateMetadata[], buttomContainer: HTMLElement) => void;
-    }
-
-    interface BasicOptions {
-        // core options
-        autoUpload?: boolean;       // default true
-        button?: HTMLElement;
-        debug?: boolean;
-        disableCancelForFormUploads?: boolean;
-        formatFileName?: (rawFileName: string) => string; // rawFilename to display filename
-        maxConnections?: number;
-        multiple?: boolean;
-
-        blobs?: BlobsOptions;
-        camera?: CameraOptions;
-        chunking?: ChunkingOptions;
-        cors?: CorsOptions;
-        deleteFile?: DeleteFileOptions<any, any>;
-        extraButtons?: ExtraButtonsOptions<any>;
-        form?: FormOptions;
-        messages?: MessagesOptions;
-        paste?: PasteOptions;
-        resume?: ResumeOptions;
-        retry?: RetryOptions;
-        request?: RequestOptions<any, any>;
-        scaling?: ScalingOptions;
-        session?: SessionOptions<any, any>;
-        text?: TextOptions;
-        validation?: ValidationOptions;
-        workarounds?: WorkaroundOptions;
-
-        callbacks?: CallbackOptions;
-    }
-
-    interface BlobWrapper {
-        blob: Blob;
-        name: string;
-    }
-
-    interface CanvasWrapper {
-        canvas: HTMLCanvasElement;
-        name: string;
-        quality: number; // 1-100
-        type: MimeType;
-    }
-
-    interface ResizeInfo {
-        blob: File | Blob;
-        height: number;
-        image: HTMLImageElement;
-        sourceCanvas: HTMLCanvasElement;
-        targetCanvas: HTMLCanvasElement;
-        width: number;
-    }
-
-    interface ResumableItem {
-        name: string;
-        uuid: string;
-        partIdx: number;
-    }
-
-    interface FilterOption {
-        id?: number;
-        uuid?: string;
-        originalName?: string;
-        name?: string;
-        status?: string;
-        size?: number;
-    }
-
-    interface ScaleImageOptions {
-        maxSize: number;
-        orient?: boolean;       // default: true
-        type?: string;           // default: type or reference image
-        quality?: number;       // 0-100 - default: 80
-        includeExif?: boolean;  // default: false
-        customResizer?: (resizeInfo: ResizeInfo) => Promise<File | Blob>;
-    }
-
-    class FineUploaderBasic {
-        constructor(options: BasicOptions)
-
-        addFiles<T>(files: File[] | HTMLInputElement[] | Blob[] | BlobWrapper[] | HTMLCanvasElement[] | CanvasWrapper[] | FileList, params: T, endpoint: string): void;
-        addInitialFiles<T>(initialFiles: T[]): void;
-        cancel(id: number): void;
-        cancelAll(): void;
-        clearStoredFiles(): void;
-        continueUpload(id: number): boolean; // true if successful
-        deleteFile(id: number): void;
-
-        /**
-         * TODO: need someone who has used this to update the returned promise related fields
-         */
-        drawThumbnail(id: number, targetContainer: HTMLElement, maxSize: number, fromServer: boolean, customResizer: (resizeInfo: ResizeInfo) => Promise<File | Blob>): Promise<any>
-        getButton(id: number): HTMLElement;
-        getFile(id: number): File | Blob;
-        getInProgress(): number;
-        getName(id: number): string;
-        getParentId(scaledFileId: number): number;
-        getRemainingAllowedItems(): number;
-        getResumableFilesData(): ResumableItem[];
-        getSize(id: number): number;
-        getUploads<T>(filter: FilterOption): T | T[];
-        getUuid(id: number): string;
-        log(message: string, level: string): void;
-        pauseUpload(id: number): boolean; // true if successful
-        reset(): void;
-        retry(id: number): void;
-        scaleImage(id: number, options: ScaleImageOptions): Promise<Blob>;
-        setCustomHeaders<H>(customHeaders: H, id: number): void;
-        setEndpoint(path: string, identifier: number | HTMLElement): void;
-        setDeleteFileCustomHeaders<H>(customHeaders: H, id: number): void;
-        setDeleteFileEndpoint(path: string, identifier: number | HTMLElement): void;
-        setDeleteFileParams<P>(params: P, id: number): void;
-        setItemLimit(newItemLimit: number): void;
-        setForm(formElementOrId: HTMLFormElement | string): void;
-        setName(id: number, name: string): void;
-        setParams<P>(params: P, id: number): void;
-        setUuid(id: number, uuid: string): void;
-        uploadStoredFiles(): void; // throws NoFilesError
-
-        // ui
-        addExtraDropzone(element: HTMLElement): void;
-        getDropTarget(id: number): HTMLElement;
-        getId(element: HTMLElement): number;
-        getItemByFileId(id: number): HTMLElement;
-        removeExtraDropzone(element: HTMLElement): void;
-    }
-}
diff --git a/fine-uploader/test/blobs.ts b/fine-uploader/test/blobs.ts
deleted file mode 100644
index 99e5355460..0000000000
--- a/fine-uploader/test/blobs.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-function testBlob() {
-    const config: qq.BasicOptions = {
-        blobs: {
-            defaultName: "hi.png"
-        }
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/callbacks.ts b/fine-uploader/test/callbacks.ts
deleted file mode 100644
index eba85ad2a0..0000000000
--- a/fine-uploader/test/callbacks.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-class CallbacksTest {
-    constructor(private opts: qq.CallbackOptions) {
-
-    }
-
-    testCallbacks() {
-        const opts = this.opts;
-
-        interface CustomType {
-            myTypeOfClass: string;
-        }
-
-        opts.onAutoRetry = (id, name, attemptNumber) => {};
-
-        opts.onCancel = (id, name) => {};
-
-        opts.onComplete = (id: number, name: string, responseJSON: CustomType, xhr: XMLHttpRequest) => {};
-
-        opts.onAllComplete = (succeeded, failed) => {};
-
-        opts.onDelete = (id) => {};
-
-        opts.onDeleteComplete = (id, xhr, isError) => {};
-
-        opts.onError = (id, name, errorReason, xhr) => {};
-
-        opts.onManualRetry = (id, name) => {
-            return true;
-        };
-
-        opts.onPasteReceived = (blob) => {};
-
-        opts.onProgress = (id, name, uploadedBytes, totalBytes) => {};
-
-        opts.onResume = (id: number, name: string, chunkData: CustomType) => {};
-
-        opts.onSessionRequestComplete = (response: CustomType[], success: boolean, xhrOrXdr: XMLHttpRequest) => {};
-
-        opts.onStatusChange = (id, oldStatus, newStatus) => {};
-
-        opts.onSubmit = (id, name) => {};
-
-        opts.onSubmitDelete = (id) => {};
-
-        opts.onSubmitted = (id, name) => {};
-
-        opts.onTotalProgress = (totalUploadedBytes, totalBytes) => {};
-
-        opts.onUpload = (id, name) => {};
-
-        opts.onUploadChunk = (id, name, chunkData) => {};
-
-        opts.onUploadChunkSuccess = (id: number, chunkData: qq.ChunkData, responseJSON: CustomType, xhr: XMLHttpRequest) => {};
-
-        opts.onValidate = (data, buttonContainer) => {};
-
-        opts.onValidateBatch = (fileOrBlobDataArray, buttonContaine) => {};
-    }
-}
diff --git a/fine-uploader/test/camera.ts b/fine-uploader/test/camera.ts
deleted file mode 100644
index b42a080778..0000000000
--- a/fine-uploader/test/camera.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-function cameraTest() {
-    const cameraButton = new HTMLButtonElement();
-
-    const cameraOptions: qq.CameraOptions = {
-        button: cameraButton,
-        ios: false
-    };
-
-    const config: qq.BasicOptions = {
-        camera: cameraOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/chunking.ts b/fine-uploader/test/chunking.ts
deleted file mode 100644
index 386dd67738..0000000000
--- a/fine-uploader/test/chunking.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-function chunkingTest() {
-
-    const chunkingOptions: qq.ChunkingOptions = {
-        concurrent: {
-            enabled: false
-        },
-        enabled: true,
-        mandatory: true,
-        partSize: 1000000,
-        paramNames: {
-            chunkSize: "chunkSize",
-            partByteOffset: "partByteOffset",
-            partIndex: "partIndex",
-            totalParts: "totalParts"
-        },
-        success: {
-            endpoint: "/some/web/endpoint/yaySuccesss"
-        }
-    };
-
-    const config: qq.BasicOptions = {
-        chunking: chunkingOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/core.ts b/fine-uploader/test/core.ts
deleted file mode 100644
index dbc06e95d6..0000000000
--- a/fine-uploader/test/core.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-function testCore() {
-    const button: HTMLElement = new HTMLButtonElement();
-
-    const config: qq.BasicOptions = {
-        autoUpload: true,
-        button,
-        debug: true,
-        disableCancelForFormUploads: true,
-        formatFileName: (rawFileName: string) => {
-            return "hi";
-        },
-        maxConnections: 10,
-        multiple: true
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/cors.ts b/fine-uploader/test/cors.ts
deleted file mode 100644
index 771b210208..0000000000
--- a/fine-uploader/test/cors.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-function corsTest() {
-    const corsOptions: qq.CorsOptions = {
-        allowXdr: true,
-        expected: true,
-        sendCredentials: true
-    };
-
-    const config: qq.BasicOptions = {
-        cors: corsOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/deleteFile.ts b/fine-uploader/test/deleteFile.ts
deleted file mode 100644
index 49c3e68890..0000000000
--- a/fine-uploader/test/deleteFile.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-function deleteFileTest() {
-    interface CustomHeader {
-        myOption: string;
-    }
-
-    interface CustomParams {
-        myParam: string;
-    }
-
-    const deleteFileOptions: qq.DeleteFileOptions<CustomHeader, CustomParams> = {
-        customHeader: {
-            myOption: "ewwww"
-        },
-        enabled: true,
-        endpoint: "/my/server/location/delete",
-        method: "POST",
-        params: {
-            myParam: "u"
-        }
-    };
-
-
-    const config: qq.BasicOptions = {
-        deleteFile: deleteFileOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/extraButtons.ts b/fine-uploader/test/extraButtons.ts
deleted file mode 100644
index eef709bea8..0000000000
--- a/fine-uploader/test/extraButtons.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-function extraButtons() {
-    interface Validation {
-        myValue: string;
-    }
-
-    const element: HTMLElement = new HTMLElement();
-
-    const extraButtonOptions: qq.ExtraButtonsOptions<Validation> = {
-        element,
-        fileInputTitle: "inputTitle",
-        folders: true,
-        multiple: false,
-        validation: {
-            myValue: "ew"
-        }
-    };
-
-    const config: qq.BasicOptions = {
-        extraButtons: extraButtonOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/form.ts b/fine-uploader/test/form.ts
deleted file mode 100644
index ccc08b69a1..0000000000
--- a/fine-uploader/test/form.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-function formTest() {
-    const formOptions: qq.FormOptions = {
-        element: "qq-form",
-        autoUpload: true,
-        interceptSubmit: true
-    };
-
-    const config: qq.BasicOptions = {
-        form: formOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/message.ts b/fine-uploader/test/message.ts
deleted file mode 100644
index 726584bf7b..0000000000
--- a/fine-uploader/test/message.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-function messageTest() {
-    const messageOptions: qq.MessagesOptions = {
-        emptyError: "emptyError",
-        maxHeightImageError: "maxHeightImageError",
-        maxWidthImageError: "error occurred",
-        minHeightImageError: "error occurred",
-        minWidthImageError: "error occurred",
-        minSizeError: "error occurred",
-        noFilesError: "error occurred",
-        onLeave: "error occurred",
-        retryFailTooManyItemsError: "error occurred",
-        typeError: "error occurred",
-        unsupportedBrowserIos8Safari: "error occurred"
-    };
-
-    const config: qq.BasicOptions = {
-        messages: messageOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/method.ts b/fine-uploader/test/method.ts
deleted file mode 100644
index 1adb13db81..0000000000
--- a/fine-uploader/test/method.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-class TestMethods {
-    constructor(private uploader: qq.FineUploaderBasic) {
-    }
-
-    testAddFiles() {
-        interface ParamType {
-            field: string;
-        }
-
-        const params: ParamType = {
-            field: 'hiiiii'
-        };
-
-        this.uploader.addFiles(
-            new FileList(),
-            params,
-            "/my/happy/endpoint"
-        );
-    }
-
-    testAddInitialFiles() {
-        interface InitialFiles {
-            myField: number;
-        }
-
-        const initialFiles: InitialFiles[] = [{
-            myField: 1324
-        }];
-
-        this.uploader.addInitialFiles(initialFiles);
-    }
-
-    testDrawThumbnail() {
-        const promise: Promise<any> = this.uploader.drawThumbnail(
-            1234,
-            new HTMLElement(),
-            1234565,
-            false,
-            (resizeInfo) => {
-                return new Promise<File | Blob>(() => {
-                    return new Blob();
-                });
-            }
-        );
-    }
-
-    testGetUploads() {
-        interface ResponseType {
-            hi: string;
-        }
-        const response: ResponseType | ResponseType[] = this.uploader.getUploads<ResponseType>({
-            status: "proggresssssssesees"
-        });
-    }
-
-    testSetCustomHeaders() {
-        interface CustomHeader {
-            customField: number;
-        }
-
-        this.uploader.setCustomHeaders<CustomHeader>({
-            customField: 1234
-        }, 1234);
-    }
-
-    testSetDeleteCustomHeaders() {
-        interface CustomHeader {
-            customField: number;
-        }
-
-        this.uploader.setDeleteFileCustomHeaders<CustomHeader>({
-            customField: 1234
-        }, 1234);
-    }
-
-    testSetDeleteFileParams() {
-        interface CustomParams {
-            paramField: boolean;
-        }
-        this.uploader.setDeleteFileParams<CustomParams>({
-            paramField: false
-        }, 1234);
-    }
-
-    testSetParams() {
-        interface CustomParams {
-            customParams: number;
-        }
-
-        this.uploader.setParams<CustomParams>({
-            customParams: 1234
-        }, 1234);
-    }
-
-    bulkTests() {
-        this.uploader.cancel(1);
-        this.uploader.cancelAll();
-        this.uploader.clearStoredFiles();
-        const shouldContinue: boolean = this.uploader.continueUpload(1234);
-        this.uploader.deleteFile(1234);
-        const elem: HTMLElement = this.uploader.getButton(1234);
-        const fileOrBlob: File | Blob = this.uploader.getFile(1234);
-        let num: number = this.uploader.getInProgress();
-        let s: string = this.uploader.getName(1234);
-        num = this.uploader.getParentId(1234);
-        num = this.uploader.getRemainingAllowedItems();
-        const resumables: qq.ResumableItem[] = this.uploader.getResumableFilesData();
-        num = this.uploader.getSize(1234);
-        s = this.uploader.getUuid(1234);
-        this.uploader.log("why am i doing this?", "info");
-        const b: boolean = this.uploader.pauseUpload(1234);
-        this.uploader.reset();
-        this.uploader.retry(1234);
-        const blobPromise: Promise<Blob> = this.uploader.scaleImage(1234, {
-            maxSize: 20,
-            orient: false,
-            type: "png",
-            quality: 10,
-            includeExif: false,
-        });
-        this.uploader.setEndpoint("/my/path/is/my/own", 1234);
-        this.uploader.setEndpoint("/my/path/is/my/own", new HTMLElement());
-        this.uploader.setDeleteFileEndpoint("/some/path", 1234);
-        this.uploader.setDeleteFileEndpoint("/some/path", new HTMLElement());
-        this.uploader.setItemLimit(1234);
-        this.uploader.setForm(new HTMLFormElement());
-        this.uploader.setForm("myFormElement");
-        this.uploader.setName(1234, "myCustomName");
-        this.uploader.setUuid(1234, "12341234");
-        this.uploader.uploadStoredFiles();
-    }
-
-    uiTests() {
-        this.uploader.addExtraDropzone(new HTMLElement());
-        let elem: HTMLElement = this.uploader.getDropTarget(1234);
-        const n: number = this.uploader.getId(elem);
-        elem = this.uploader.getItemByFileId(n);
-        this.uploader.removeExtraDropzone(elem);
-    }
-}
diff --git a/fine-uploader/test/paste.ts b/fine-uploader/test/paste.ts
deleted file mode 100644
index 9b3c7d9007..0000000000
--- a/fine-uploader/test/paste.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-function pasteTest() {
-    const targetElement: HTMLElement = new HTMLElement();
-
-    const pasteOptions: qq.PasteOptions = {
-        defaultName: "pasted_image",
-        targetElement
-    };
-
-    const config: qq.BasicOptions = {
-        paste: pasteOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/request.ts b/fine-uploader/test/request.ts
deleted file mode 100644
index 54b29c9be9..0000000000
--- a/fine-uploader/test/request.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-function requestTest() {
-    interface CustomHeader {
-        customHeader: string;
-    }
-
-    interface CustomParam {
-        customParam: boolean;
-    }
-
-    const requestOptions: qq.RequestOptions<CustomHeader, CustomParam> = {
-        customHeaders: {
-            customHeader: "my custom header hehehehee"
-        },
-        endpoint: "/my/custom/endpoint",
-        filenameParam: "newFilenameParam",
-        forceMultipart: true,
-        inputName: "filenameParamMapping",
-        method: "POST",
-        params: {
-            customParam: false
-        },
-        paramsInBody: false,
-        uuid: "asdf123456",
-        totalFileSizeName: "totalFileSize"
-    };
-
-    const config: qq.BasicOptions = {
-        request: requestOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
\ No newline at end of file
diff --git a/fine-uploader/test/resume.ts b/fine-uploader/test/resume.ts
deleted file mode 100644
index dc588d19f5..0000000000
--- a/fine-uploader/test/resume.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-function resumeTest() {
-    const resumeOptions: qq.ResumeOptions = {
-        recordsExpireIn: 10,
-        enabled: true,
-        paramNames: {
-            resuming: "ew you"
-        }
-    };
-
-    const config: qq.BasicOptions = {
-        resume: resumeOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/retry.ts b/fine-uploader/test/retry.ts
deleted file mode 100644
index 85c9f71af3..0000000000
--- a/fine-uploader/test/retry.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-function retryTest() {
-
-    const retryOptions: qq.RetryOptions = {
-        autoAttemptDelay: 1,
-        enableAuto: true,
-        maxAutoAttempts: 32,
-        preventRetryResponseProperty: "preventRetry"
-    };
-
-    const config: qq.BasicOptions = {
-        retry: retryOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
\ No newline at end of file
diff --git a/fine-uploader/test/scaling.ts b/fine-uploader/test/scaling.ts
deleted file mode 100644
index 5e8ff3dc51..0000000000
--- a/fine-uploader/test/scaling.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-function scalingTest() {
-    const scalingOptions: qq.ScalingOptions = {
-        customResizer: (blob, height, image, sourceCanvas, targetCanvas, width) => {
-            const promise = new Promise<File|Blob>(() => {
-                return blob;
-            });
-            return promise;
-        },
-        defaultQuality: 10,
-        defaultType: "JPEG",
-        failureText: "you have failed me for the last time",
-        includeExif: true,
-        orient: false,
-        sendOriginal: true,
-        sizes: [
-            {
-                maxSize: 10,
-                name: "i am added to name",
-                type: "mime type"
-            }
-        ]
-    };
-
-    const config: qq.BasicOptions = {
-        scaling: scalingOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/session.ts b/fine-uploader/test/session.ts
deleted file mode 100644
index 7d8d6069b9..0000000000
--- a/fine-uploader/test/session.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-function sessionTest() {
-    interface CustomHeader {
-        customHeader: string;
-    }
-
-    interface CustomParam {
-        customParam: boolean;
-    }
-
-    const sessionOptions: qq.SessionOptions<CustomHeader, CustomParam> = {
-        customHeaders: {
-            customHeader: "customHeader"
-        },
-        endpoint: "/mysession/endpoint",
-        params: {
-            customParam: false
-        },
-        refreshOnReset: false
-    };
-
-    const config: qq.BasicOptions = {
-        session: sessionOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/text.ts b/fine-uploader/test/text.ts
deleted file mode 100644
index e83ddb4bcf..0000000000
--- a/fine-uploader/test/text.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-function textTest() {
-    const textOptions: qq.TextOptions = {
-        defaultResponseError: "you have failed me for the last time",
-        fileInputTitle: "file input title",
-        sizeSymbols: ['kb']
-    };
-
-    const config: qq.BasicOptions = {
-        text: textOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/validation.ts b/fine-uploader/test/validation.ts
deleted file mode 100644
index 60324157f9..0000000000
--- a/fine-uploader/test/validation.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-function validationTest() {
-
-    const validationOptions: qq.ValidationOptions = {
-        acceptFiles: [new MimeType()],
-        allowedExtensions: ['csv, xls'],
-        itemLimit: 5,
-        sizeLimit: 10000000,
-        stopOnFirstInvalidFile: false,
-        image: {
-            maxHeight: 10,
-            maxWidth: 10,
-            minHeight: 1,
-            minWidth: 1
-        }
-    };
-
-    const config: qq.BasicOptions = {
-        validation: validationOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/test/workarounds.ts b/fine-uploader/test/workarounds.ts
deleted file mode 100644
index 42fa5ceee7..0000000000
--- a/fine-uploader/test/workarounds.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-function workaroundsTest() {
-    const workaroundOptions: qq.WorkaroundOptions = {
-        iosEmptyVideos: false,
-        ios8BrowserCrash: false,
-        ios8SafariUploads: false
-    };
-
-    const config: qq.BasicOptions = {
-        workarounds: workaroundOptions
-    };
-
-    const uploader = new qq.FineUploaderBasic(config);
-}
diff --git a/fine-uploader/tsconfig.json b/fine-uploader/tsconfig.json
deleted file mode 100644
index c02e485091..0000000000
--- a/fine-uploader/tsconfig.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "files": [
-        "index.d.ts",
-        "test/blobs.ts",
-        "test/camera.ts",
-        "test/chunking.ts",
-        "test/core.ts",
-        "test/cors.ts",
-        "test/deleteFile.ts",
-        "test/extraButtons.ts",
-        "test/form.ts",
-        "test/message.ts",
-        "test/paste.ts",
-        "test/resume.ts",
-        "test/retry.ts",
-        "test/request.ts",
-        "test/scaling.ts",
-        "test/session.ts",
-        "test/text.ts",
-        "test/validation.ts",
-        "test/workarounds.ts",
-        "test/method.ts",
-        "test/callbacks.ts"
-    ],
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    }
-}
\ No newline at end of file
diff --git a/firebase-client/firebase-client-tests.ts b/firebase-client/firebase-client-tests.ts
index 0b79ec75d6..987b4b638b 100644
--- a/firebase-client/firebase-client-tests.ts
+++ b/firebase-client/firebase-client-tests.ts
@@ -19,16 +19,16 @@ var client = new FirebaseClient({
 var newUser:User = new User();
 newUser.name = {
 	first: "Fred",
-	last: "Flinstone" 
+	last: "Flinstone"
 };
 
 client.push("users", newUser)
 	.then(function (result){
 		console.log(result.name);
 		var newUser2:User = new User();
-		newUser2.name = { 
-			first: "Fred", 
-			last: "Rockington" 
+		newUser2.name = {
+			first: "Fred",
+			last: "Rockington"
 		}
 		return client.update("users/" + result.name, newUser2);
 	}).then(function (result){
@@ -36,15 +36,15 @@ client.push("users", newUser)
 		var newUser3:User = new User();
 		newUser3.name = {
 			first: "Axe",
-			last: "Steel"	
+			last: "Steel"
 		};
 		return client.set("users/AXESTEEL", newUser3);
 	}).then(function (result){
 		console.log(result.name.first);
 		return client.get();
-	}).then(function (result){ 
+	}).then(function (result){
 		console.log(result);
 		return client.get<User>("users/AXESTEEL")
 	}).then(function (result){
-		console.log(result.name.first);	
+		console.log(result.name.first);
 	});
\ No newline at end of file
diff --git a/firebase-client/index.d.ts b/firebase-client/index.d.ts
index d2c58bb5ba..b766fc2478 100644
--- a/firebase-client/index.d.ts
+++ b/firebase-client/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Andrew Breen <https://github.com/fpsscarecrow/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="q" />
+import * as Q from "q";
 
 interface PushResponse {
 	/**
@@ -17,7 +17,7 @@ interface FirebaseConfig {
 	 * path for the Firebase instance
 	 */
 	url : string;
-	
+
 	/**
 	 * Token for authorisation
 	 */
@@ -29,38 +29,38 @@ interface FirebaseClient {
 	 * Creates a new FirebaseClient given the provided configuration
 	 */
 	new (config : FirebaseConfig) : FirebaseClient;
-	
+
 	/**
 	 * Retrieves all objects at the base path
 	 */
 	get<T>() : Q.Promise<T>;
-	
+
 	/**
 	 * Retrieves an object
 	 * @param path Relative path from the base for the resource
 	 */
 	get<T>(path : string) : Q.Promise<T>;
-	
+
 	/**
 	 * Returns a promise of the HTTP response from setting the value at the given path
 	 * @param path Relative path from the base for the resource
 	 * @param data Data to be set as the value for the given path
 	 */
 	set<T>(path : string, data : T) : Q.Promise<T>;
-	
+
 	/**
 	 * Update a node at a given path
 	 * @param path Relative path from the base for the resource
 	 * @param value Value of the response
 	 */
 	update<T>(path : string, value : T) : Q.Promise<T>;
-	
+
 	/**
 	 * Deletes the resource at a given path
 	 * @param path Relative path from the base for the resource
 	 */
 	delete(path : string) :  Q.Promise<void>;
-	
+
 	/**
 	 * @param path Relative path from the base for the resource
 	 * @param value Object to push to the path
@@ -70,7 +70,5 @@ interface FirebaseClient {
 
 declare var FirebaseClient: FirebaseClient;
 
-declare module 'firebase-client' {
-	export = FirebaseClient;
-}
-
+export = FirebaseClient;
+export as namespace FirebaseClient;
diff --git a/firebase-client/tsconfig.json b/firebase-client/tsconfig.json
index fdb35ab929..b439fb8310 100644
--- a/firebase-client/tsconfig.json
+++ b/firebase-client/tsconfig.json
@@ -12,6 +12,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/fixed-data-table/fixed-data-table-tests.tsx b/fixed-data-table/fixed-data-table-tests.tsx
index 7dfac22230..f57ff3d946 100644
--- a/fixed-data-table/fixed-data-table-tests.tsx
+++ b/fixed-data-table/fixed-data-table-tests.tsx
@@ -1,6 +1,3 @@
-
-/// <reference types="react"/>
-
 import * as React from "react";
 import {Table, Cell, Column, CellProps} from "fixed-data-table";
 
diff --git a/flickity/flickity-tests.ts b/flickity/flickity-tests.ts
index b98315285f..b4ecf51997 100644
--- a/flickity/flickity-tests.ts
+++ b/flickity/flickity-tests.ts
@@ -4,11 +4,9 @@
 // Definitions: https://github.com/clmcgrath/
 
 ///<reference types="jquery"/>
-///<reference path="FlickityEvents.ts"/>
 
 //jQuery tests
 
-
 var $flickity: JQuery = $("#flickity-selector").flickity(
     {
         initialIndex: 0,
@@ -105,15 +103,15 @@ flikty2.destroy();
 flikty2.reloadCells();
 
 //event handlers
-flikty2.on(FlickityEvents.cellSelect, (evt, ele) => {
+flikty2.on("cellSelect", (evt, ele) => {
     //do something
 });
 
-flikty2.off(FlickityEvents.cellSelect, (evt, ele, pntr, vctr) => {
+flikty2.off("cellSelect", (evt, ele, pntr, vctr) => {
     //do something
 });
 
-flikty2.once(FlickityEvents.cellSelect, (evt, ele, pntr) => {
+flikty2.once("cellSelect", (evt, ele, pntr) => {
     //do something
 });
 
diff --git a/flot/index.d.ts b/flot/index.d.ts
index 20fadd0a47..e4fed6a246 100644
--- a/flot/index.d.ts
+++ b/flot/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Flot
 // Project: http://www.flotcharts.org/
-// Definitions by: Matt Burland <https://github.com/burlandm>
+// Definitions by: Matt Burland <https://github.com/burlandm>, Timo Mühlbach <https://github.com/Anticom>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
@@ -21,16 +21,16 @@ declare namespace jquery.flot {
     }
 
     interface hooks {
-        processOptions: { (plot: plot, options: plotOptions): void; } [];
-        processRawData: { (plot: plot, series: dataSeries, data: any[], datapoints: datapoints): void; }[];
-        processDatapoints: { (plot: plot, series: dataSeries, datapoints: datapoints): void; }[];
-        processOffset: { (plot: plot, offset: canvasPoint): void; }[];
-        drawBackground: { (plot: plot, context: CanvasRenderingContext2D): void; }[];
-        drawSeries: { (plot: plot, context: CanvasRenderingContext2D, series: dataSeries): void; }[];
-        draw: { (plot: plot, context: CanvasRenderingContext2D): void; }[];
-        bindEvents: { (plot: plot, eventHolder: JQuery): void; }[];
-        drawOverlay: { (plot: plot, context: CanvasRenderingContext2D): void; }[];
-        shutdown: { (plot: plot, eventHolder: JQuery): void; }[];
+        processOptions?: { (plot: plot, options: plotOptions): void; } [];
+        processRawData?: { (plot: plot, series: dataSeries, data: any[], datapoints: datapoints): void; }[];
+        processDatapoints?: { (plot: plot, series: dataSeries, datapoints: datapoints): void; }[];
+        processOffset?: { (plot: plot, offset: canvasPoint): void; }[];
+        drawBackground?: { (plot: plot, context: CanvasRenderingContext2D): void; }[];
+        drawSeries?: { (plot: plot, context: CanvasRenderingContext2D, series: dataSeries): void; }[];
+        draw?: { (plot: plot, context: CanvasRenderingContext2D): void; }[];
+        bindEvents?: { (plot: plot, eventHolder: JQuery): void; }[];
+        drawOverlay?: { (plot: plot, context: CanvasRenderingContext2D): void; }[];
+        shutdown?: { (plot: plot, eventHolder: JQuery): void; }[];
     }
 
     interface interaction {
diff --git a/foundation-sites/foundation-sites-tests.ts b/foundation-sites/foundation-sites-tests.ts
index 4932f01624..2e90071c7d 100644
--- a/foundation-sites/foundation-sites-tests.ts
+++ b/foundation-sites/foundation-sites-tests.ts
@@ -1,11 +1,3 @@
-// Tests for type definitions for Foundation Sites v6.0.4
-// Project: http://foundation.zurb.com/
-// Definitions by: Sam Vloeberghs <https://github.com/samvloeberghs/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="jquery" />
-
-
 $(document).foundation();
 $(document).foundation('method5');
 $(document).foundation(['method', 'method2']);
diff --git a/foundation/foundation-tests.ts b/foundation/foundation-tests.ts
index 913bd0ee1b..33f8530589 100644
--- a/foundation/foundation-tests.ts
+++ b/foundation/foundation-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 function empty_callback() : void {}
 
 function plugin_list() {
diff --git a/from/from-tests.ts b/from/from-tests.ts
index b46bdf66f1..e73a4915a0 100644
--- a/from/from-tests.ts
+++ b/from/from-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import from = require('from');
 
 var rs: NodeJS.ReadableStream;
diff --git a/fs-ext/fs-ext-tests.ts b/fs-ext/fs-ext-tests.ts
index baba88f092..0c774589bc 100644
--- a/fs-ext/fs-ext-tests.ts
+++ b/fs-ext/fs-ext-tests.ts
@@ -1,19 +1,16 @@
-
-/// <reference types="node" />
-
 import fs = require('fs-ext');
 
 var num:number;
 var str:string;
 
-//from node.js 'fs' module 
+//from node.js 'fs' module
 fs.appendFileSync(str, "data");
 
-fs.flock(num, str, (err)=>{ 
+fs.flock(num, str, (err)=>{
 });
 fs.flockSync(num, str);
 
-fs.fcntl(num, str, num, (err, res)=>{	
+fs.fcntl(num, str, num, (err, res)=>{
 });
 fs.fcntl(num, str, (err, res)=>{
 });
diff --git a/fs-extra-promise-es6/fs-extra-promise-es6-tests.ts b/fs-extra-promise-es6/fs-extra-promise-es6-tests.ts
index 12623c54b1..46e623207a 100644
--- a/fs-extra-promise-es6/fs-extra-promise-es6-tests.ts
+++ b/fs-extra-promise-es6/fs-extra-promise-es6-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import fs = require('fs-extra-promise-es6');
 import stream = require('stream');
 
@@ -145,7 +143,7 @@ strArr = fs.readdirSync(path);
 fs.close(fd, errorCallback);
 fs.closeSync(fd);
 fs.open(path, flags, modeStr, (err: Error, fd: number) => {
-    
+
 });
 num = fs.openSync(path, flags, modeStr);
 fs.utimes(path, atime, mtime, errorCallback);
diff --git a/fs-extra-promise/fs-extra-promise-tests.ts b/fs-extra-promise/fs-extra-promise-tests.ts
index 112a27109c..28bdd26120 100644
--- a/fs-extra-promise/fs-extra-promise-tests.ts
+++ b/fs-extra-promise/fs-extra-promise-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import fs = require('fs-extra-promise');
 import stream = require('stream');
 
diff --git a/fs-extra/fs-extra-tests.ts b/fs-extra/fs-extra-tests.ts
index 896d6411f7..a6990cc75f 100644
--- a/fs-extra/fs-extra-tests.ts
+++ b/fs-extra/fs-extra-tests.ts
@@ -1,8 +1,5 @@
-
-/// <reference types="node" />
-
 import fs = require('fs-extra');
-import * as Path from 'path'
+import * as Path from 'path';
 
 var src: string;
 var dest: string;
@@ -22,7 +19,7 @@ fs.copy(src, dest,
 	{
 		clobber: true,
 		preserveTimestamps: true,
-		filter: (src: string) => {return false}
+		filter: (src: string) => { return false; }
 	},
 	errorCallback
 );
@@ -43,7 +40,7 @@ fs.copySync(src, dest,
 	{
 		clobber: true,
 		preserveTimestamps: true,
-		filter: (src: string) => {return false}
+		filter: (src: string) => { return false; }
 	}
 );
 fs.copySync(src, dest,
@@ -102,35 +99,3 @@ fs.ensureSymlink(path, errorCallback);
 fs.ensureSymlinkSync(path);
 fs.emptyDir(path, errorCallback);
 fs.emptyDirSync(path);
-
-var items: string[];
-fs.walk("my-path")
-  .on('data', function (item) {
-    items.push(item.path);
-  })
-  .on('end', function () {
-    console.dir(items);
-  });
-
-const ignoreHiddenFiles = (item: string): boolean => {
-  const basename = Path.basename(item)
-  return basename === '.' || basename[0] !== '.'
-}
-
-const sortPaths = (left: string, right: string) => left.localeCompare(right);
-
-const options = {
-  filter: ignoreHiddenFiles,
-  pathSorter: sortPaths
-}
-
-fs.walk(path, options)
-  .on('readable', function (this: fs.PathEntryStream) {
-    let item: fs.PathEntry | undefined
-    while ((item = this.read())) {
-      items.push(item.path)
-    }
-  })
-  .on('end', function () {
-
-  })
diff --git a/fs-extra/index.d.ts b/fs-extra/index.d.ts
index 2cc47724c8..57f4a6fb24 100644
--- a/fs-extra/index.d.ts
+++ b/fs-extra/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for fs-extra
+// Type definitions for fs-extra v2.0.0
 // Project: https://github.com/jprichardson/node-fs-extra
-// Definitions by: midknight41 <https://github.com/midknight41>
+// Definitions by: midknight41 <https://github.com/midknight41>, Brendan Forster <https://github.com/shiftkey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/fs-extra.d.ts
@@ -120,9 +120,6 @@ export type PathEntryStream = {
   read(): PathEntry | null
 }
 
-export function walk(path: string, options?: WalkOptions): WalkEventEmitter;
-export function walkSync(path: string): ReadonlyArray<string>;
-
 export interface CopyFilterFunction {
     (src: string): boolean
 }
diff --git a/ftp/ftp-tests.ts b/ftp/ftp-tests.ts
index 6e5e7d37a9..4d78104940 100644
--- a/ftp/ftp-tests.ts
+++ b/ftp/ftp-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import Client = require("ftp");
 import fs = require("fs");
 
@@ -8,8 +5,8 @@ var c = new Client();
 c.on('ready', (): void => {
 	c.get('foo.txt', function(err: Error, stream: NodeJS.ReadableStream): void {
 		if (err) throw err;
-		stream.once('close', function(): void { 
-			c.end(); 
+		stream.once('close', function(): void {
+			c.end();
 		});
 		stream.pipe(fs.createWriteStream('foo.local-copy.txt'));
 	});
@@ -25,4 +22,4 @@ c.connect({
 });
 
 
-  
+
diff --git a/fullcalendar/fullcalendar-tests.ts b/fullcalendar/fullcalendar-tests.ts
index 7640c85db6..63328a9cef 100644
--- a/fullcalendar/fullcalendar-tests.ts
+++ b/fullcalendar/fullcalendar-tests.ts
@@ -1,5 +1,4 @@
-/// <reference types="jquery"/>
-/// <reference types="jqueryui"/>
+/// <reference types="jqueryui" />
 
 import * as FullCalendar from 'fullcalendar';
 import * as moment from 'moment';
diff --git a/fullcalendar/v1/fullcalendar-tests.ts b/fullcalendar/v1/fullcalendar-tests.ts
index 56a9eb0024..ede55bc0b1 100644
--- a/fullcalendar/v1/fullcalendar-tests.ts
+++ b/fullcalendar/v1/fullcalendar-tests.ts
@@ -1,6 +1,4 @@
-/// <reference types="jquery"/>
-/// <reference types="jqueryui"/>
-/// <reference types="moment"/>
+/// <reference types="jqueryui" />
 
 // All examples from http://arshaw.com/fullcalendar/docs/
 
diff --git a/gapi.auth2/gapi.auth2-tests.ts b/gapi.auth2/gapi.auth2-tests.ts
index 621ca6f056..1d389d59e9 100644
--- a/gapi.auth2/gapi.auth2-tests.ts
+++ b/gapi.auth2/gapi.auth2-tests.ts
@@ -1,6 +1,6 @@
+/// <reference types="gapi.people" />
 
-
-function test_init(){
+function test_init() {
   var auth = gapi.auth2.init({
     client_id: 'my-id',
     cookie_policy: 'single_host_origin',
@@ -9,7 +9,7 @@ function test_init(){
   });
 }
 
-function test_getAuthInstance(){
+function test_getAuthInstance() {
   gapi.auth2.init({
     client_id: 'my-id',
     cookie_policy: 'single_host_origin',
@@ -19,14 +19,14 @@ function test_getAuthInstance(){
   var auth = gapi.auth2.getAuthInstance();
 }
 
-function test_signIn(){
+function test_signIn() {
   gapi.auth2.getAuthInstance().signIn({
     scope: 'email profile',
     prompt: 'content'
   });
 }
 
-function test_signInOptionsBuild(){
+function test_signInOptionsBuild() {
   var options = new gapi.auth2.SigninOptionsBuilder();
   options.setAppPackageName('com.example.app');
   options.setFetchBasicProfile(true);
@@ -35,13 +35,13 @@ function test_signInOptionsBuild(){
   gapi.auth2.getAuthInstance().signIn(options);
 }
 
-function test_getAuthResponse(){
+function test_getAuthResponse() {
   var user = gapi.auth2.getAuthInstance().currentUser.get();
   var authResponse = user.getAuthResponse();
   var authResponseWithAuth = user.getAuthResponse(true);
 }
 
-function test_render(){
+function test_render() {
   var success = (googleUser: gapi.auth2.GoogleUser): void => {
     console.log(googleUser);
   };
@@ -59,3 +59,87 @@ function test_render(){
     onfailure: failure
   });
 }
+
+/* Example taken from https://developers.google.com/identity/sign-in/web/ */
+function onSignIn(googleUser: gapi.auth2.GoogleUser) {
+  // Useful data for your client-side scripts:
+  var profile = googleUser.getBasicProfile();
+  console.log("ID: " + profile.getId()); // Don't send this directly to your server!
+  console.log('Full Name: ' + profile.getName());
+  console.log('Given Name: ' + profile.getGivenName());
+  console.log('Family Name: ' + profile.getFamilyName());
+  console.log("Image URL: " + profile.getImageUrl());
+  console.log("Email: " + profile.getEmail());
+
+  // The ID token you need to pass to your backend:
+  var id_token = googleUser.getAuthResponse().id_token;
+  console.log("ID Token: " + id_token);
+};
+
+
+/* Example taken from https://github.com/google/google-api-javascript-client/blob/master/samples/authSample.html */
+
+// Enter an API key from the Google API Console:
+//   https://console.developers.google.com/apis/credentials
+var apiKey = 'YOUR_API_KEY';
+// Enter the API Discovery Docs that describes the APIs you want to
+// access. In this example, we are accessing the People API, so we load
+// Discovery Doc found here: https://developers.google.com/people/api/rest/
+var discoveryDocs = ["https://people.googleapis.com/$discovery/rest?version=v1"];
+// Enter a client ID for a web application from the Google API Console:
+//   https://console.developers.google.com/apis/credentials?project=_
+// In your API Console project, add a JavaScript origin that corresponds
+//   to the domain where you will be running the script.
+var clientId = 'YOUR_WEB_CLIENT_ID.apps.googleusercontent.com';
+// Enter one or more authorization scopes. Refer to the documentation for
+// the API or https://developers.google.com/people/v1/how-tos/authorizing
+// for details.
+var scopes = 'profile';
+var authorizeButton = document.getElementById('authorize-button');
+var signoutButton = document.getElementById('signout-button');
+function handleClientLoad() {
+  // Load the API client and auth2 library
+  gapi.load('client:auth2', initClient);
+}
+function initClient() {
+  gapi.client.init({
+      apiKey: apiKey,
+      discoveryDocs: discoveryDocs,
+      clientId: clientId,
+      scope: scopes
+  }).then(function () {
+    // Listen for sign-in state changes.
+    gapi.auth2.getAuthInstance().isSignedIn.listen(updateSigninStatus);
+    // Handle the initial sign-in state.
+    updateSigninStatus(gapi.auth2.getAuthInstance().isSignedIn.get());
+    authorizeButton.onclick = handleAuthClick;
+    signoutButton.onclick = handleSignoutClick;
+  });
+}
+function updateSigninStatus(isSignedIn: boolean) {
+  if (isSignedIn) {
+    authorizeButton.style.display = 'none';
+    signoutButton.style.display = 'block';
+    makeApiCall();
+  } else {
+    authorizeButton.style.display = 'block';
+    signoutButton.style.display = 'none';
+  }
+}
+function handleAuthClick(event: MouseEvent) {
+  gapi.auth2.getAuthInstance().signIn();
+}
+function handleSignoutClick(event: MouseEvent) {
+  gapi.auth2.getAuthInstance().signOut();
+}
+// Load the API and make an API call.  Display the results on the screen.
+function makeApiCall() {
+  gapi.client.people.people.get({
+    resourceName: 'people/me'
+  }).then(function(resp) {
+    var p = document.createElement('p');
+    var name = resp.result.names[0].givenName;
+    p.appendChild(document.createTextNode('Hello, '+name+'!'));
+    document.getElementById('content').appendChild(p);
+  });
+}
diff --git a/gapi.auth2/index.d.ts b/gapi.auth2/index.d.ts
index 6146a87e28..402da68699 100644
--- a/gapi.auth2/index.d.ts
+++ b/gapi.auth2/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Sign-In API
+// Type definitions for Google Sign-In API 0.0
 // Project: https://developers.google.com/identity/sign-in/web/
 // Definitions by: Derek Lawless <https://github.com/flawless2011>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -21,7 +21,7 @@ declare namespace gapi.auth2 {
      * Calls the onInit function when the GoogleAuth object is fully initialized, or calls the onFailure function if
      * initialization fails.
      */
-    then(onInit: () => any, onFailure: (reason: string) => any): any;
+    then(onInit: () => any, onFailure?: (reason: string) => any): any;
 
     /**
      * Signs in the user with the options specified to gapi.auth2.init().
@@ -58,7 +58,7 @@ declare namespace gapi.auth2 {
                        onsuccess: (googleUser: GoogleUser) => any, onfailure: (reason: string) => any): any;
   }
 
-  export interface IsSignedIn{
+  export interface IsSignedIn {
     /**
      * Returns whether the current user is currently signed in.
      */
diff --git a/gapi.calendar/gapi.calendar-tests.ts b/gapi.calendar/gapi.calendar-tests.ts
new file mode 100644
index 0000000000..0438e5dc06
--- /dev/null
+++ b/gapi.calendar/gapi.calendar-tests.ts
@@ -0,0 +1,152 @@
+/* Example taken from Google Calendar API JavaScript Quickstart https://developers.google.com/google-apps/calendar/quickstart/js */
+
+{
+  // Your Client ID can be retrieved from your project in the Google
+  // Developer Console, https://console.developers.google.com
+  var CLIENT_ID = '<YOUR_CLIENT_ID>';
+
+  var SCOPES = ["https://www.googleapis.com/auth/calendar.readonly"];
+
+  /**
+   * Check if current user has authorized this application.
+   */
+  function checkAuth() {
+    gapi.auth.authorize(
+      {
+        'client_id': CLIENT_ID,
+        'scope': SCOPES.join(' '),
+        'immediate': true
+      }, handleAuthResult);
+  }
+
+  /**
+   * Handle response from authorization server.
+   *
+   * @param {Object} authResult Authorization result.
+   */
+  function handleAuthResult(authResult: GoogleApiOAuth2TokenObject) {
+    var authorizeDiv = document.getElementById('authorize-div')!;
+    if (authResult && !authResult.error) {
+      // Hide auth UI, then load client library.
+      authorizeDiv.style.display = 'none';
+      loadCalendarApi();
+    } else {
+      // Show auth UI, allowing the user to initiate authorization by
+      // clicking authorize button.
+      authorizeDiv.style.display = 'inline';
+    }
+  }
+
+  /**
+   * Initiate auth flow in response to user clicking authorize button.
+   *
+   * @param {Event} event Button click event.
+   */
+  function handleAuthClick(event: MouseEvent) {
+    gapi.auth.authorize(
+      {client_id: CLIENT_ID, scope: SCOPES, immediate: false},
+      handleAuthResult);
+    return false;
+  }
+
+  /**
+   * Load Google Calendar client library. List upcoming events
+   * once client library is loaded.
+   */
+  function loadCalendarApi() {
+    gapi.client.load('calendar', 'v3', listUpcomingEvents);
+  }
+
+  /**
+   * Print the summary and start datetime/date of the next ten events in
+   * the authorized user's calendar. If no events are found an
+   * appropriate message is printed.
+   */
+  function listUpcomingEvents() {
+    var request = gapi.client.calendar.events.list({
+      'calendarId': 'primary',
+      'timeMin': (new Date()).toISOString(),
+      'showDeleted': false,
+      'singleEvents': true,
+      'maxResults': 10,
+      'orderBy': 'startTime'
+    });
+
+    request.execute(function(resp) {
+      var events = resp.items;
+      appendPre('Upcoming events:');
+
+      if (events.length > 0) {
+        for (let i = 0; i < events.length; i++) {
+          var event = events[i];
+          var when = event.start.dateTime;
+          if (!when) {
+            when = event.start.date;
+          }
+          appendPre(event.summary + ' (' + when + ')')
+        }
+      } else {
+        appendPre('No upcoming events found.');
+      }
+
+    });
+  }
+
+  /**
+   * Append a pre element to the body containing the given message
+   * as its text node.
+   *
+   * @param {string} message Text to be placed in pre element.
+   */
+  function appendPre(message: string) {
+    var pre = document.getElementById('output')!;
+    var textContent = document.createTextNode(message + '\n');
+    pre.appendChild(textContent);
+  }
+}
+
+/* Example taken from https://developers.google.com/google-apps/calendar/v3/reference/events/insert#examples */
+
+{
+  // Refer to the JavaScript quickstart on how to setup the environment:
+  // https://developers.google.com/google-apps/calendar/quickstart/js
+  // Change the scope to 'https://www.googleapis.com/auth/calendar' and delete any
+  // stored credentials.
+
+  const event = {
+    'summary': 'Google I/O 2015',
+    'location': '800 Howard St., San Francisco, CA 94103',
+    'description': 'A chance to hear more about Google\'s developer products.',
+    'start': {
+      'dateTime': '2015-05-28T09:00:00-07:00',
+      'timeZone': 'America/Los_Angeles'
+    },
+    'end': {
+      'dateTime': '2015-05-28T17:00:00-07:00',
+      'timeZone': 'America/Los_Angeles'
+    },
+    'recurrence': [
+      'RRULE:FREQ=DAILY;COUNT=2'
+    ],
+    'attendees': [
+      {'email': 'lpage@example.com'},
+      {'email': 'sbrin@example.com'}
+    ],
+    'reminders': {
+      'useDefault': false,
+      'overrides': [
+        {'method': 'email', 'minutes': 24 * 60},
+        {'method': 'popup', 'minutes': 10}
+      ]
+    }
+  };
+
+  var request = gapi.client.calendar.events.insert({
+    'calendarId': 'primary',
+    'resource': event
+  });
+
+  request.execute(function(event) {
+    appendPre('Event created: ' + event.htmlLink);
+  });
+}
diff --git a/gapi.calendar/index.d.ts b/gapi.calendar/index.d.ts
new file mode 100644
index 0000000000..bd0e3b0d17
--- /dev/null
+++ b/gapi.calendar/index.d.ts
@@ -0,0 +1,675 @@
+// Type definitions for Google Calendar API 3.0
+// Project: https://developers.google.com/google-apps/calendar/
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="gapi" />
+
+declare namespace gapi.client.calendar {
+  export class freebusy {
+    static query(parameters: FreeBusyQueryParameters): HttpRequest<FreeBusy>;
+  }
+
+  interface FreeBusyQueryParameters {
+    timeMin: datetime;
+    timeMax: datetime;
+    timeZone?: string;
+    groupExpansionMax?: integer;
+    calendarExpansionMax?: integer;
+    items: {id: string}[];
+  }
+
+  interface FreeBusy {
+    kind: 'calendar#freeBusy';
+    timeMin: datetime;
+    timeMax: datetime;
+    groups: {
+      (key: string): {
+        errors?: {
+          domain: string;
+          reason: string;
+        }[];
+        calendars: string[];
+      }
+    };
+    calendars: {
+      (key: string): {
+        errors?: {
+          domain: string;
+          reason: string;
+        }[];
+        busy: {
+          start: datetime;
+          end: datetime;
+        }[];
+      }
+    };
+  }
+
+  export class acl {
+    static insert(parameters: AclInsertParameters): HttpRequest<Acl>;
+    static get(parameters: AclGetParameters): HttpRequest<Acl>;
+    static update(parameters: AclUpdateParameters): HttpRequest<Acl>;
+    static delete(parameters: AclDeleteParameters): HttpRequest<void>;
+  }
+
+  // The type of the scope. Possible values are:
+  type ScopeType =
+    // The public scope. This is the default value.
+    // Note: The permissions granted to the "default", or public, scope apply to any user, authenticated or not.
+    'default' |
+    // Limits the scope to a single user.
+    'user' |
+    // Limits the scope to a group.
+    'group' |
+    // Limits the scope to a domain.
+    'domain';
+
+  interface Acl {
+    kind: 'calendar#aclRule';
+    etag: etag;
+    id: string;
+    scope: {
+      type: ScopeType;
+      value: string;
+    };
+    role: AccessRole;
+  }
+
+  interface AclInsertParameters {
+    calendarId: string;
+
+    // Acl resource
+    role: AccessRole;
+    scope: {
+      type: ScopeType;
+      value?: string;
+    };
+  }
+
+  interface AclGetParameters {
+    calendarId: string;
+    ruleId: string;
+  }
+
+  interface AclUpdateParameters extends AclInsertParameters {
+    ruleId: string;
+  }
+
+  interface AclDeleteParameters extends AclGetParameters {
+  }
+
+  export class calendarList {
+    static list(parameters?: CalendarListListParameters): HttpRequest<CalendarList>;
+    static insert(parameters: CalendarListInsertParameters): HttpRequest<CalendarListEntry>;
+  }
+
+  type AccessRoleWithoutNone =
+    // The user has read access to free/busy information.
+    'freeBusyReader' |
+    // The user has read access to the calendar. Private events will appear to users with reader access, but event details will be hidden.
+    'reader' |
+    // The user has read and write access to the calendar. Private events will appear to users with writer access, and event details will be visible.
+    'writer' |
+    // The user has ownership of the calendar. This role has all of the permissions of the writer role with the additional ability to see and manipulate ACLs.
+    'owner';
+
+  // The user's access role for this calendar. Read-only. Possible values are:
+  type AccessRole =
+    // The user has no access.
+    'none' |
+    AccessRoleWithoutNone;
+
+  interface CalendarListListParameters {
+    maxResults?: integer;
+    // The minimum access role for the user in the returned entries. Optional. The default is no restriction. Acceptable values are:
+    minAccessRole?: AccessRoleWithoutNone;
+    pageToken?: string;
+    showDeleted?: boolean;
+    showHidden?: boolean;
+    syncToken?: string;
+  }
+
+  interface CalendarListInsertParameters {
+    // Parameters
+    // Optional query parameters
+    colorRgbFormat?: boolean;
+
+    // CalendarList resource
+    resource: CalendarListInput;
+  }
+
+  interface CalendarListInput {
+    // Required Properties
+    id: string;
+
+    // Optional Properties
+    backgroundColor?: string;
+    colorId?: string;
+    defaultReminders?: {
+      method: ReminderMethod;
+      minutes: integer;
+    }[];
+    foregroundColor?: string;
+    hidden?: boolean;
+    notificationSettings?: {
+      notifications: {
+        type: NotificationType;
+        method: string;
+      }[];
+    };
+    selected?: boolean;
+    summaryOverride?: string;
+  }
+
+  interface CalendarList {
+    kind: 'calendar#calendarList';
+    etag: etag;
+
+    /**
+     * Token used to access the next page of this result.
+     * Omitted if no further results are available, in which case nextSyncToken is provided.
+     */
+    nextPageToken?: string;
+
+    /**
+     * Token used at a later point in time to retrieve only the entries that have changed since this result was returned.
+     * Omitted if further results are available, in which case nextPageToken is provided.
+     */
+    nextSyncToken?: string;
+
+    items: CalendarListEntry[];
+  }
+
+  // The type of notification. Possible values are:
+  type NotificationType =
+    // Notification sent when a new event is put on the calendar.
+    'eventCreation' |
+    // Notification sent when an event is changed.
+    'eventChange' |
+    // Notification sent when an event is cancelled.
+    'eventCancellation' |
+    // Notification sent when an event is changed.
+    'eventResponse' |
+    // An agenda with the events of the day (sent out in the morning).
+    'agenda';
+
+  interface CalendarListEntry {
+    kind: 'calendar#calendarListEntry';
+    etag: etag;
+    id: string;
+    summary: string;
+    description?: string;
+    location?: string;
+    timeZone?: string;
+    summaryOverride?: string;
+    colorId?: string;
+    backgroundColor?: string;
+    foregroundColor?: string;
+    hidden?: boolean;
+    selected?: boolean;
+    // The effective access role that the authenticated user has on the calendar. Read-only.
+    accessRole: AccessRoleWithoutNone;
+    defaultReminders: {
+      method: ReminderMethod;
+      minutes: integer;
+    }[];
+    notificationSettings?: {
+      notifications: {
+        type: NotificationType;
+        method: string;
+      }[];
+    };
+    primary?: boolean;
+    deleted?: boolean;
+  }
+
+  export class calendars {
+    static insert(parameters: CalendarsInsertParameters): HttpRequest<Calendar>;
+    static update(parameters: CalendarsUpdateParameters): HttpRequest<Calendar>;
+    static delete(parameters: CalendarsDeleteParameters): HttpRequest<void>;
+  }
+
+  interface CalendarsUpdateParameters {
+    calendarId: string;
+
+    // Calendars resource
+    // Optional Properties
+    description?: string;
+    location?: string;
+    summary?: string;
+    timeZone?: string;
+  }
+
+  interface CalendarsInsertParameters {
+    // Calendars resource
+    // Required Properties
+    summary: string;
+
+    description?: string;
+    location?: string;
+    timeZone?: string;
+  }
+
+  interface CalendarsDeleteParameters {
+    calendarId: string;
+  }
+
+  interface Calendar {
+    kind: 'calendar#calendar';
+    etag: etag;
+    id: string;
+    summary: string;
+    description?: string;
+    location?: string;
+    timeZone?: string;
+  }
+
+  export class events {
+    static list(parameters: EventsListParameters): HttpRequest<Events>;
+    static insert(parameters: EventsInsertParameters): HttpRequest<Event>;
+    static update(parameters: EventsUpdateParameters): HttpRequest<Event>;
+    static get(parameters: EventsGetParameters): HttpRequest<Event>;
+  }
+
+  interface EventsGetParameters {
+    calendarId: string;
+    eventId: string;
+
+    alwaysIncludeEmail?: boolean;
+    maxAttendees?: integer;
+    timeZone?: string;
+  }
+
+  interface EventsInsertParameters {
+    calendarId: string;
+
+    maxAttendees?: integer;
+    sendNotifications?: boolean;
+    supportsAttachments?: boolean;
+
+    // Event resource
+    resource: EventInput;
+  }
+
+  interface EventsUpdateParameters {
+    calendarId: string;
+    eventId: string;
+
+    alwaysIncludeEmail?: boolean;
+    maxAttendees?: integer;
+    sendNotifications?: boolean;
+    supportsAttachments?: boolean;
+
+    // Event resource
+    resource: EventInput;
+  }
+
+  interface EventInput {
+    // Required Properties
+    attachments?: {
+      fileUrl: string;
+    }[];
+    attendees?: {
+      email: string;
+      displayName?: string;
+      optional?: boolean;
+      responseStatus?: AttendeeResponseStatus;
+      comment?: string;
+      additionalGuests?: integer;
+    }[];
+    end: {
+      date?: date;
+      dateTime?: datetime;
+      timeZone?: string
+    };
+    reminders?: {
+      overrides: {
+        method: string;
+        minutes: integer;
+      }[];
+      useDefault: boolean;
+    };
+    start: {
+      date?: date;
+      dateTime?: datetime;
+      timeZone: string;
+    };
+
+    // Optional Properties
+    anyoneCanAddSelf?: boolean;
+    colorId?: string;
+    description?: string;
+    extendedProperties?: {
+      private: {
+        (key: string): string
+      };
+      shared: {
+        (key: string): string
+      }
+    };
+    gadget?: {
+      display?: GadgetDisplayMode;
+      height: integer;
+      iconLink: string;
+      link: string;
+      preferences: {
+        (key: string): string
+      }
+      title: string;
+      type: string;
+      width: integer;
+    };
+    guestsCanInviteOthers?: boolean;
+    guestsCanSeeOtherGuests?: boolean;
+    id?: string;
+    location?: string;
+    originalStartTime?: {
+      date: date;
+      dateTime: datetime;
+      timeZone: string
+    };
+    recurrence?: string[];
+    sequence?: integer;
+    source?: {
+      url: string;
+      title: string
+    };
+    status?: EventStatus;
+    summary?: string;
+    transparency?: EventTransparency;
+    visibility?: EventVisibility;
+  }
+
+  // The order of the events returned in the result. Optional. The default is an unspecified, stable order.
+  // Acceptable values are:
+  type EventsOrder =
+    // Order by the start date/time (ascending). This is only available when querying single events (i.e. the parameter singleEvents is True)
+    'startTime' |
+    // Order by last modification time (ascending).
+    'updated';
+
+  // Token obtained from the nextSyncToken field returned on the last page of results from the previous list request.
+  // It makes the result of this list request contain only entries that have changed since then.
+  // All events deleted since the previous list request will always be in the result set and it is not allowed to set showDeleted to False.
+  // There are several query parameters that cannot be specified together with nextSyncToken to ensure consistency of the client state.
+  // These are:
+  type SyncToken =
+    'iCalUID' |
+    'orderBy' |
+    'privateExtendedProperty' |
+    'q' |
+    'sharedExtendedProperty' |
+    'timeMin' |
+    'timeMax' |
+    'updatedMin';
+
+  interface EventsListParameters {
+    calendarId: string;
+    alwaysIncludeEmail?: boolean;
+    iCalUID?: string;
+    maxAttendees?: integer;
+    maxResults?: integer;
+    orderBy?: EventsOrder;
+    pageToken?: string;
+    privateExtendedProperty?: string;
+    q?: string;
+    sharedExtendedProperty?: string;
+    showDeleted?: boolean;
+    showHiddenInvitations?: boolean;
+    singleEvents?: boolean;
+    syncToken?: SyncToken;
+    timeMax?: datetime;
+    timeMin?: datetime;
+    timeZone?: string;
+    updatedMin?: datetime;
+  }
+
+  interface Events {
+    kind: 'calendar#events';
+    etag: etag;
+    summary: string;
+    description: string;
+    updated: datetime;
+    timeZone: string;
+    // The user's access role for this calendar. Read-only. Possible values are:
+    accessRole: AccessRole;
+    defaultReminders: {
+      method: ReminderMethod;
+      minutes: integer;
+    }[];
+    nextPageToken?: string;
+    nextSyncToken?: string;
+    items: Event[];
+  }
+
+  type etag = string;
+  type datetime = string;
+  type date = string;
+  type integer = number;
+
+  // The attendee's response status. Possible values are:
+  type AttendeeResponseStatus =
+    // The attendee has not responded to the invitation.
+    'needsAction' |
+    // The attendee has declined the invitation.
+    'declined' |
+    // The attendee has tentatively accepted the invitation.
+    'tentative' |
+    // The attendee has accepted the invitation.
+    'accepted';
+
+  // The gadget's display mode. Optional. Possible values are:
+  type GadgetDisplayMode =
+    // The gadget displays next to the event's title in the calendar view.
+    'icon' |
+    // The gadget displays when the event is clicked.
+    'chip';
+
+  // The method used by this reminder. Possible values are:
+  type ReminderMethod =
+    // Reminders are sent via email.
+    'email' |
+    // Reminders are sent via SMS. These are only available for Google Apps for Work, Education, and Government customers. Requests to set SMS reminders for other account types are ignored.
+    'sms' |
+    // Reminders are sent via a UI popup.
+    'popup';
+
+  // Status of the event. Optional. Possible values are:
+  type EventStatus =
+    // The event is confirmed. This is the default status.
+    'confirmed' |
+    // The event is tentatively confirmed.
+    'tentative' |
+    // The event is cancelled.
+    'cancelled';
+
+  // Whether the event blocks time on the calendar. Optional. Possible values are:
+  type EventTransparency =
+    // The event blocks time on the calendar. This is the default value.
+    'opaque' |
+    // The event does not block time on the calendar.
+    'transparent';
+
+  // Visibility of the event. Optional. Possible values are:
+  type EventVisibility =
+    // Uses the default visibility for events on the calendar. This is the default value.
+    'default' |
+    // The event is public and event details are visible to all readers of the calendar.
+    'public' |
+    // The event is private and only event attendees may view event details.
+    'private' |
+    // The event is private. This value is provided for compatibility reasons.
+    'confidential';
+
+  class Event {
+    kind: 'calendar#event';
+    etag: etag;
+    id: string;
+    status?: EventStatus;
+    htmlLink: string;
+    created: datetime;
+    updated: datetime;
+    summary: string;
+    description: string;
+    location?: string;
+    colorId?: string;
+
+    // The creator of the event. Read-only.
+    creator: {
+      // The creator's Profile ID, if available.
+      id?: string;
+
+      // The creator's email address, if available.
+      email?: string;
+
+      // The creator's name, if available.
+      displayName?: string;
+
+      // Whether the creator corresponds to the calendar on which this copy of the event appears. Read-only. The default is False.
+      self?: boolean;
+    };
+
+    // The organizer of the event.
+    organizer: {
+      // The organizer's Profile ID, if available.
+      id?: string;
+
+      // The organizer's email address, if available.
+      email?: string;
+
+      // The organizer's name, if available.
+      displayName?: string;
+
+      // Whether the organizer corresponds to the calendar on which this copy of the event appears. Read-only. The default is False.
+      self?: boolean;
+    };
+
+    // The (inclusive) start time of the event. For a recurring event, this is the start time of the first instance.
+    start: {
+      // The date, in the format "yyyy-mm-dd", if this is an all-day event.
+      date?: date;
+
+      // The time, as a combined date-time value (formatted according to RFC3339).
+      // A time zone offset is required unless a time zone is explicitly specified in timeZone.
+      dateTime?: datetime;
+
+      // The time zone in which the time is specified. (Formatted as an IANA Time Zone Database name, e.g. "Europe/Zurich".)
+      // For recurring events this field is required and specifies the time zone in which the recurrence is expanded.
+      // For single events this field is optional and indicates a custom time zone for the event start/end.
+      timeZone?: string;
+    };
+
+    // The (exclusive) end time of the event. For a recurring event, this is the end time of the first instance.
+    end: {
+      // The date, in the format "yyyy-mm-dd", if this is an all-day event.
+      date?: date;
+
+      // The time, as a combined date-time value (formatted according to RFC3339).
+      // A time zone offset is required unless a time zone is explicitly specified in timeZone.
+      dateTime?: datetime;
+
+      // The time zone in which the time is specified. (Formatted as an IANA Time Zone Database name, e.g. "Europe/Zurich".)
+      // For recurring events this field is required and specifies the time zone in which the recurrence is expanded.
+      // For single events this field is optional and indicates a custom time zone for the event start/end.
+      timeZone?: string;
+    };
+
+    // 	Whether the end time is actually unspecified. An end time is still provided for compatibility reasons, even if this attribute is set to True.
+    // The default is False.
+    endTimeUnspecified?: boolean;
+
+    recurrence: string[];
+
+    // For an instance of a recurring event, this is the id of the recurring event to which this instance belongs. Immutable.
+    recurringEventId?: string;
+
+    // Whether the organizer corresponds to the calendar on which this copy of the event appears. Read-only. The default is False.
+    originalStartTime?: {
+      date: date;
+      dateTime: datetime;
+      timeZone?: string;
+    };
+
+    transparency?: EventTransparency;
+    visibility?: EventVisibility;
+    iCalUID: string;
+    sequence: integer;
+
+    // The attendees of the event.
+    attendees?: {
+      id: string;
+      email: string;
+      displayName?: string;
+      organizer: boolean;
+      self: boolean;
+      resource: boolean;
+      optional?: boolean;
+      responseStatus: AttendeeResponseStatus;
+      comment?: string;
+      additionalGuests?: integer;
+    }[];
+
+    attendeesOmitted?: boolean;
+
+    // Extended properties of the event.
+    extendedProperties?: {
+      private: {
+        (key: string): string;
+      };
+      shared: {
+        (key: string): string;
+      }
+    };
+
+    // An absolute link to the Google+ hangout associated with this event. Read-only.
+    hangoutLink?: string;
+
+    // A gadget that extends this event.
+    gadget?: {
+      type: string;
+      title: string;
+      link: string;
+      iconLink: string;
+      width?: integer;
+      height?: integer;
+      display?: GadgetDisplayMode;
+      preferences: {
+        (key: string): string;
+      }
+    };
+
+    anyoneCanAddSelf?: boolean;
+    guestsCanInviteOthers?: boolean;
+    guestsCanModify?: boolean;
+    guestsCanSeeOtherGuests?: boolean;
+    privateCopy?: boolean;
+
+    // Whether this is a locked event copy where no changes can be made to the main event fields "summary", "description", "location", "start", "end" or "recurrence". The default is False. Read-Only.
+    locked?: boolean;
+
+    reminders: {
+      useDefault: boolean;
+      overrides?: {
+        method: ReminderMethod;
+        minutes: integer;
+      }[];
+    };
+
+    // Source from which the event was created. For example, a web page, an email message or any document identifiable by an URL with HTTP or HTTPS scheme.
+    // Can only be seen or modified by the creator of the event.
+    source?: {
+      url: string;
+      title: string;
+    };
+
+    // File attachments for the event. Currently only Google Drive attachments are supported.
+    attachments?: {
+      fileUrl: string;
+      title: string;
+      mimeType: string;
+      iconLink: string;
+      fileId: string;
+    }[];
+  }
+}
diff --git a/gapi.calendar/tsconfig.json b/gapi.calendar/tsconfig.json
new file mode 100644
index 0000000000..7613ee5b3d
--- /dev/null
+++ b/gapi.calendar/tsconfig.json
@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "module": "commonjs",
+    "lib": ["es6", "dom"],
+    "strictNullChecks": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true
+  },
+  "files": [
+    "index.d.ts",
+    "gapi.calendar-tests.ts"
+  ]
+}
diff --git a/gapi.people/gapi.people-tests.ts b/gapi.people/gapi.people-tests.ts
new file mode 100644
index 0000000000..65b6339765
--- /dev/null
+++ b/gapi.people/gapi.people-tests.ts
@@ -0,0 +1,99 @@
+/* Example taken from Google People API JavaScript Quickstart https://developers.google.com/people/quickstart/js */
+
+{
+  // Your Client ID can be retrieved from your project in the Google
+  // Developer Console, https://console.developers.google.com
+  var CLIENT_ID = '<YOUR_CLIENT_ID>';
+
+  var SCOPES = ["https://www.googleapis.com/auth/contacts.readonly"];
+
+  /**
+   * Check if current user has authorized this application.
+   */
+  function checkAuth() {
+    gapi.auth.authorize(
+      {
+        'client_id': CLIENT_ID,
+        'scope': SCOPES.join(' '),
+        'immediate': true
+      }, handleAuthResult);
+  }
+
+  /**
+   * Handle response from authorization server.
+   *
+   * @param {Object} authResult Authorization result.
+   */
+  function handleAuthResult(authResult: GoogleApiOAuth2TokenObject) {
+    var authorizeDiv = document.getElementById('authorize-div')!;
+    if (authResult && !authResult.error) {
+      // Hide auth UI, then load client library.
+      authorizeDiv.style.display = 'none';
+      loadPeopleApi();
+    } else {
+      // Show auth UI, allowing the user to initiate authorization by
+      // clicking authorize button.
+      authorizeDiv.style.display = 'inline';
+    }
+  }
+
+  /**
+   * Initiate auth flow in response to user clicking authorize button.
+   *
+   * @param {Event} event Button click event.
+   */
+  function handleAuthClick(event: MouseEvent) {
+    gapi.auth.authorize(
+      {client_id: CLIENT_ID, scope: SCOPES, immediate: false},
+      handleAuthResult);
+    return false;
+  }
+
+  /**
+   * Load Google People client library. List names if available
+   * of 10 connections.
+   */
+  function loadPeopleApi() {
+    gapi.client.load('https://people.googleapis.com/$discovery/rest', 'v1', listConnectionNames);
+  }
+
+  /**
+   * Print the display name if available for 10 connections.
+   */
+  function listConnectionNames() {
+    var request = gapi.client.people.people.connections.list({
+        'resourceName': 'people/me',
+        'pageSize': 10,
+      });
+
+      request.execute(function(resp) {
+        var connections = resp.connections;
+        appendPre('Connections:');
+
+        if (connections.length > 0) {
+          for (var i = 0; i < connections.length; i++) {
+            var person = connections[i];
+            if (person.names && person.names.length > 0) {
+              appendPre(person.names[0].displayName)
+            } else {
+              appendPre("No display name found for connection.");
+            }
+          }
+        } else {
+          appendPre('No upcoming events found.');
+        }
+      });
+  }
+
+  /**
+   * Append a pre element to the body containing the given message
+   * as its text node.
+   *
+   * @param {string} message Text to be placed in pre element.
+   */
+  function appendPre(message: string) {
+    var pre = document.getElementById('output')!;
+    var textContent = document.createTextNode(message + '\n');
+    pre.appendChild(textContent);
+  }
+}
diff --git a/gapi.people/index.d.ts b/gapi.people/index.d.ts
new file mode 100644
index 0000000000..86bf930beb
--- /dev/null
+++ b/gapi.people/index.d.ts
@@ -0,0 +1,246 @@
+// Type definitions for Google People API 1.0
+// Project: https://developers.google.com/people/
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="gapi" />
+
+declare namespace gapi.client.people {
+  export namespace people {
+
+    interface GetParameters {
+      resourceName: string;
+
+      // Query parameters
+      requestMask?: RequestMask;
+    }
+
+    function get(parameters: GetParameters): HttpRequest<Person>;
+
+    interface GetBatchGetParameters {
+      // Query parameters
+      resourcesName?: string;
+      requestMask?: RequestMask;
+    }
+
+    function getBatchGet(parameters: GetBatchGetParameters): HttpRequest<BatchGetResponse>;
+
+    interface BatchGetResponse {
+      responses: PersonResponse[];
+    }
+
+    interface PersonResponse {
+      httpStatusCode: number;
+      person: Person;
+      requestedResourceName: string;
+    }
+
+    namespace connections {
+      function list(parameters: ListParameters): HttpRequest<Response>;
+
+      type SortOrder = 'LAST_MODIFIED_ASCENDING' | 'FIRST_NAME_ASCENDING' | 'LAST_NAME_ASCENDING';
+
+      interface ListParameters {
+        resourceName: string;
+
+        // Query parameters
+        pageToken?: string;
+        pageSize?: number;
+        sortOrder?: SortOrder;
+        syncToken?: string;
+        requestMask?: RequestMask;
+      }
+
+      interface Response {
+        connections: Person[];
+        nextPageToken: string;
+        nextSyncToken: string;
+      }
+    }
+  }
+
+  interface RequestMask {
+    includeField: string;
+  }
+
+  type SourceType = 'SOURCE_TYPE_UNSPECIFIED' | 'ACCOUNT' | 'PROFILE' | 'DOMAIN_PROFILE' | 'CONTACT';
+
+  interface Source {
+    type: SourceType;
+    id: string;
+    etag: string;
+    resourceName: string;
+  }
+
+  type ObjectType = 'OBJECT_TYPE_UNSPECIFIED' | 'PERSON' | 'PAGE';
+
+  interface PersonMetadata {
+    sources: Source[];
+    previousResourceNames: string[];
+    linkedPeopleResourceNames: string[];
+    deleted: boolean;
+    objectType: ObjectType;
+  }
+
+  interface FieldMetadata {
+    primary: boolean;
+    verified: boolean;
+    source: Source;
+  }
+
+  interface Locale {
+    metadata: FieldMetadata;
+    value: string;
+  }
+
+  interface Name {
+    metadata: FieldMetadata;
+    displayName: string;
+    displayNameLastFirst: string;
+    familyName: string;
+    givenName: string;
+    middleName: string;
+    honorificPrefix: string;
+    honorificSuffix: string;
+    phoneticFullName: string;
+    phoneticFamilyName: string;
+    phoneticGivenName: string;
+    phoneticMiddleName: string;
+    phoneticHonorificPrefix: string;
+    phoneticHonorificSuffix: string;
+  }
+
+  type NicknameType = 'DEFAULT' | 'MAIDEN_NAME' | 'INITIALS' | 'GPLUS' | 'OTHER_NAME';
+
+  interface Nickname {
+    metadata: FieldMetadata;
+    value: string;
+    type: NicknameType;
+  }
+
+  interface CoverPhoto {
+  }
+
+  interface Photo {
+  }
+
+  interface Gender {
+  }
+
+  interface AgeRange {
+  }
+
+  interface Birthday {
+  }
+
+  interface Event {
+  }
+
+  interface Address {
+    metadata: FieldMetadata;
+    formattedValue: string;
+    type: string;
+    formattedType: string;
+    poBox: string;
+    streetAddress: string;
+    extendedAddress: string;
+    city: string;
+    region: string;
+    postalCode: string;
+    country: string;
+    countryCode: string;
+  }
+
+  interface Residence {
+    metadata: FieldMetadata;
+    value: string;
+    current: boolean;
+  }
+
+  interface EmailAddress {
+    metadata: FieldMetadata;
+    value: string;
+    type: string;
+    formattedType: string;
+    displayName: string;
+  }
+
+  interface PhoneNumber {
+    metadata: FieldMetadata;
+    value: string;
+    canonicalForm: string;
+    type: string;
+    formattedType: string;
+  }
+
+  interface ImClient {
+  }
+
+  interface Tagline {
+  }
+
+  interface Biography {
+  }
+
+  interface Url {
+  }
+
+  interface Organization {
+  }
+
+  interface Occupation {
+  }
+
+  interface Interest {
+  }
+
+  interface Skill {
+  }
+
+  interface BraggingRights {
+  }
+
+  interface Relation {
+  }
+
+  interface RelationshipInterest {
+  }
+
+  interface RelationshipStatus {
+  }
+
+  interface Membership {
+  }
+
+  interface Person {
+    resourceName: string;
+    etag: string;
+    metadata: PersonMetadata;
+    locales: Locale[];
+    names: Name[];
+    nicknames?: Nickname[];
+    coverPhotos: CoverPhoto[];
+    photos?: Photo[];
+    genders?: Gender[];
+    ageRange?: AgeRange;
+    birthdays?: Birthday[];
+    events?: Event[];
+    addresses?: Address[];
+    residences?: Residence[];
+    emailAddresses?: EmailAddress[];
+    phoneNumbers?: PhoneNumber[];
+    imClients?: ImClient[];
+    taglines?: Tagline[];
+    biographies?: Biography[];
+    urls?: Url[];
+    organizations?: Organization[];
+    occupations?: Occupation[];
+    interests?: Interest[];
+    skills?: Skill[];
+    BraggingRights?: BraggingRights[];
+    relations?: Relation[];
+    relationshipInterests?: RelationshipInterest[];
+    relationshipStatuses?: RelationshipStatus[];
+    memberships?: Membership[];
+  }
+}
diff --git a/gapi.people/tsconfig.json b/gapi.people/tsconfig.json
new file mode 100644
index 0000000000..93fcfc59b6
--- /dev/null
+++ b/gapi.people/tsconfig.json
@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "module": "commonjs",
+    "lib": ["es6", "dom"],
+    "strictNullChecks": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true
+  },
+  "files": [
+    "index.d.ts",
+    "gapi.people-tests.ts"
+  ]
+}
diff --git a/gapi.plus/gapi.plus-tests.ts b/gapi.plus/gapi.plus-tests.ts
new file mode 100644
index 0000000000..12368dd63c
--- /dev/null
+++ b/gapi.plus/gapi.plus-tests.ts
@@ -0,0 +1,10 @@
+/* Example taken from https://developers.google.com/+/web/people/ */
+
+gapi.client.load('plus','v1', function(){
+ var request = gapi.client.plus.people.get({
+   'userId': 'me'
+ });
+ request.execute(function(resp) {
+   console.log('Retrieved profile for:' + resp.displayName);
+ });
+});
diff --git a/gapi.plus/index.d.ts b/gapi.plus/index.d.ts
new file mode 100644
index 0000000000..3e24b79ce1
--- /dev/null
+++ b/gapi.plus/index.d.ts
@@ -0,0 +1,111 @@
+// Type definitions for Google+ Platform API 1.0
+// Project: https://developers.google.com/+/web/people/
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="gapi" />
+
+// See Google+ REST API Reference https://developers.google.com/+/web/api/rest/latest/
+declare namespace gapi.client.plus {
+  export namespace people {
+
+    interface GetParameters {
+      userId: string;
+    }
+    function get(parameters: GetParameters): HttpRequest<Person>;
+
+    interface SearchParameters {
+      query: string;
+      language?: string;
+      maxResults?: number;
+      pageToken?: string;
+    }
+    function search(parameters: SearchParameters): HttpRequest<PeopleFeed>;
+
+    // Search response
+    interface PeopleFeed {
+      kind: 'plus#peopleFeed';
+      etag: string;
+      selfLink: string;
+      title: string;
+      nextPageToken: string;
+      totalItems: number;
+      items: Person[];
+    }
+
+    interface Person {
+      kind: 'plus#person';
+      etag: string;
+      nickname: string;
+      occupation: string;
+      skills: string;
+      birthday: string;
+      gender: string;
+      emails: {
+        value: string;
+        type: string;
+      }[];
+      urls: {
+        value: string;
+        type: string;
+        label: string;
+      }[];
+      objectType: string;
+      id: string;
+      displayName: string;
+      name: {
+        formatted: string;
+        familyName: string;
+        givenName: string;
+        middleName: string;
+        honorificPrefix: string;
+        honorificSuffix: string;
+      };
+      tagline: string;
+      braggingRights: string;
+      aboutMe: string;
+      relationshipStatus: string;
+      url: string;
+      image: {
+        url: string;
+      };
+      organizations: {
+        name: string;
+        department: string;
+        title: string;
+        type: string;
+        startDate: string;
+        endDate: string;
+        location: string;
+        description: string;
+        primary: boolean;
+      }[];
+      placesLived: {
+        value: string;
+        primary: boolean;
+      }[];
+      isPlusUser: boolean;
+      language: string;
+      ageRange: {
+        min: number;
+        max: number;
+      };
+      plusOneCount: number;
+      circledByCount: number;
+      verified: boolean;
+      cover: {
+        layout: string;
+        coverPhoto: {
+          url: string;
+          height: number;
+          width: number;
+        };
+        coverInfo: {
+          topImageOffset: number;
+          leftImageOffset: number;
+        }
+      };
+      domain: string;
+    }
+  }
+}
diff --git a/gapi.plus/tsconfig.json b/gapi.plus/tsconfig.json
new file mode 100644
index 0000000000..1fc2401de1
--- /dev/null
+++ b/gapi.plus/tsconfig.json
@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "module": "commonjs",
+    "lib": ["es6", "dom"],
+    "strictNullChecks": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true
+  },
+  "files": [
+    "index.d.ts",
+    "gapi.plus-tests.ts"
+  ]
+}
diff --git a/gapi/gapi-tests.ts b/gapi/gapi-tests.ts
new file mode 100644
index 0000000000..3c70b9850d
--- /dev/null
+++ b/gapi/gapi-tests.ts
@@ -0,0 +1,97 @@
+/// <reference types="gapi.people" />
+/// <reference types="gapi.plus" />
+
+/* Examples taken from https://developers.google.com/api-client-library/javascript/start/start-js */
+
+{
+  function start1() {
+    // 2. Initialize the JavaScript client library.
+    gapi.client.init({
+      'apiKey': 'YOUR_API_KEY',
+      'discoveryDocs': ['https://people.googleapis.com/$discovery/rest'],
+      // clientId and scope are optional if auth is not required.
+      'clientId': 'YOUR_WEB_CLIENT_ID.apps.googleusercontent.com',
+      'scope': 'profile',
+    }).then(function() {
+      // 3. Initialize and make the API request.
+      return gapi.client.people.people.get({
+        resourceName: 'people/me'
+      });
+    }).then(function(response) {
+      console.log(response.result);
+    }, function(reason) {
+      console.log('Error: ' + reason.result.error.message);
+    });
+  };
+  // 1. Load the JavaScript client library.
+  gapi.load('client', start1);
+}
+
+{
+  function start2() {
+    // 2. Initialize the JavaScript client library.
+    gapi.client.init({
+      'apiKey': 'YOUR_API_KEY',
+      // clientId and scope are optional if auth is not required.
+      'clientId': 'YOUR_WEB_CLIENT_ID.apps.googleusercontent.com',
+      'scope': 'profile',
+    }).then(function() {
+      // 3. Initialize and make the API request.
+      return gapi.client.request({
+        'path': 'https://people.googleapis.com/v1/people/me',
+      })
+    }).then(function(response) {
+      console.log(response.result);
+    }, function(reason) {
+      console.log('Error: ' + reason.result.error.message);
+    });
+  };
+  // 1. Load the JavaScript client library.
+  gapi.load('client', start2);
+}
+
+
+/* Examples taken from https://developers.google.com/api-client-library/javascript/features/promises */
+
+gapi.client.request({'path': '/plus/v1/people', 'params': {'query': 'John'}}).then(function(response) {
+  // Handle response
+}, function(reason) {
+  // Handle error
+});
+
+gapi.client.load('plus', 'v1').then(function() {
+  gapi.client.plus.people.search({'query': ''}).then(response => { });
+});
+
+var personFetcher = {
+  results: [],
+
+  // Why this: any? Check https://github.com/Microsoft/TypeScript/issues/10835
+
+  fetch: function(this: any, name: string) {
+    gapi.client.request({path: '/plus/v1/people', params:{query: name}}).then(function(this: any, response) {
+      this.results.push(response.result);
+    }, function(reason) {
+      console.error(name, 'was not fetched:', reason.result.error.message);
+    }, this);
+  }
+};
+personFetcher.fetch('John');
+
+gapi.client.request({
+  'path': 'plus/v1/people',
+  'params': {'query': name}
+}).execute(function(resp, rawResp) {
+  processResponse(resp);
+});
+
+gapi.client.request({
+  'path': 'plus/v1/people',
+  'params': {'query': name}
+}).then(function(resp) {
+  processResponse(resp.result);
+});
+
+function processResponse(response: any) {
+  // Stub
+}
diff --git a/gapi/index.d.ts b/gapi/index.d.ts
index 28d5c990bc..8f8e621fa3 100644
--- a/gapi/index.d.ts
+++ b/gapi/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for Google API Client
+// Type definitions for Google API Client 0.0
 // Project: https://code.google.com/p/google-api-javascript-client/
 // Definitions by: Frank M <https://github.com/sgtfrankieboy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// TypeScript Version: 2.1
 
 /**
  * The OAuth 2.0 token object represents the OAuth 2.0 token and any associated data.
@@ -38,7 +38,7 @@ declare namespace gapi {
     /**
      * Pragmatically initialize gapi class member.
      */
-    export function load(object: string, fn: any) : any;
+    export function load(apiName: string, callback: () => void): void;
 
 }
 
@@ -102,7 +102,7 @@ declare namespace gapi.auth {
         /**
          * A function in the global namespace, which is called when the sign-in button is rendered and also called after a sign-in flow completes.
          */
-        callback?: Function;
+        callback?: () => void;
         /**
          * If true, all previously granted scopes remain granted in each incremental request, for incremental authorization. The default value true is correct for most use cases; use false only if employing delegated auth, where you pass the bearer token to a less-trusted component with lower programmatic authority.
          */
@@ -127,6 +127,30 @@ declare namespace gapi.auth {
 }
 
 declare namespace gapi.client {
+    /**
+     * Initializes the JavaScript client with API key, OAuth client ID, scope, and API discovery document(s).
+     * If OAuth client ID and scope are provided, this function will load the gapi.auth2 module to perform OAuth.
+     * The gapi.client.init function can be run multiple times, such as to set up more APIs, to change API key, or initialize OAuth lazily.
+     */
+    export function init(args: {
+        /**
+         * The API Key to use.
+         */
+        apiKey?: string;
+        /**
+         * An array of discovery doc URLs or discovery doc JSON objects.
+         */
+        discoveryDocs?: string[];
+        /**
+         * The app's client ID, found and created in the Google Developers Console.
+         */
+        clientId?: string;
+        /**
+         * The scopes to request, as a space-delimited string.
+         */
+        scope?: string
+    }): Promise<void>;
+
     interface RequestOptions {
         /**
          * The URL to handle the request
@@ -155,43 +179,79 @@ declare namespace gapi.client {
     }
 
     /**
-    * Loads the client library interface to a particular API. If a callback is not provided, a promise is returned.
-    * @param name The name of the API to load.
-    * @param version The version of the API to load.
-    * @return promise The promise that get's resolved after the request is finished.
-    */
-    export function load(name: string, version: string): Promise<void>
+     * Loads the client library interface to a particular API. If a callback is not provided, a promise is returned.
+     * @param name The name of the API to load.
+     * @param version The version of the API to load.
+     * @return promise The promise that get's resolved after the request is finished.
+     */
+    export function load(name: string, version: string): Promise<void>;
 
     /**
-    * Loads the client library interface to a particular API. The new API interface will be in the form gapi.client.api.collection.method.
-    * @param name The name of the API to load.
-    * @param version The version of the API to load
-    * @param callback the function that is called once the API interface is loaded
-    * @param url optional, the url of your app - if using Google's APIs, don't set it
-    */
+     * Loads the client library interface to a particular API. The new API interface will be in the form gapi.client.api.collection.method.
+     * @param name The name of the API to load.
+     * @param version The version of the API to load
+     * @param callback the function that is called once the API interface is loaded
+     * @param url optional, the url of your app - if using Google's APIs, don't set it
+     */
     export function load(name: string, version: string, callback: () => any, url?: string): void;
     /**
-    * Creates a HTTP request for making RESTful requests.
-    * An object encapsulating the various arguments for this method.
-    */
+     * Creates a HTTP request for making RESTful requests.
+     * An object encapsulating the various arguments for this method.
+     */
     export function request(args: RequestOptions): HttpRequest<any>;
     /**
-    * Creates an RPC Request directly. The method name and version identify the method to be executed and the RPC params are provided upon RPC creation.
-    * @param method The method to be executed.
-    * @param version The version of the API which defines the method to be executed. Defaults to v1
-    * @param rpcParams A key-value pair of the params to supply to this RPC
-    */
+     * Creates an RPC Request directly. The method name and version identify the method to be executed and the RPC params are provided upon RPC creation.
+     * @param method The method to be executed.
+     * @param version The version of the API which defines the method to be executed. Defaults to v1
+     * @param rpcParams A key-value pair of the params to supply to this RPC
+     */
     export function rpcRequest(method: string, version?: string, rpcParams?: any): RpcRequest;
     /**
-    * Sets the API key for the application.
-    * @param apiKey The API key to set
-    */
+     * Sets the API key for the application.
+     * @param apiKey The API key to set
+     */
     export function setApiKey(apiKey: string): void;
 
+    interface HttpRequestFulfilled<T> {
+        result: T;
+        body: string;
+        headers?: any[];
+        status?: number;
+        statusText?: string;
+    }
+
+    interface HttpRequestRejected {
+        result: {
+            error: {
+                message: string;
+            }
+        };
+        body: string;
+        headers?: any[];
+        status?: number;
+        statusText?: string;
+    }
+
+    /**
+     * HttpRequest supports promises.
+     * See Google API Client JavaScript Using Promises https://developers.google.com/api-client-library/javascript/features/promises
+     *
+     * TODO This should be updated when TypeScript 2.3 is released
+     * See https://github.com/Microsoft/TypeScript/issues/12409
+     * See https://github.com/Microsoft/TypeScript/blob/65da012527937a3074c62655d60ee08fee809f7f/lib/lib.es5.d.ts#L1339
+     */
+     class HttpRequestPromise<T> {
+        then<TResult>(
+             opt_onFulfilled?: ((response: HttpRequestFulfilled<T>) => void) | null,
+             opt_onRejected?: ((reason: HttpRequestRejected) => void) | null,
+             opt_context?: any
+        ): Promise<TResult>;
+    }
+
     /**
      * An object encapsulating an HTTP request. This object is not instantiated directly, rather it is returned by gapi.client.request.
      */
-    export class HttpRequest<T> {
+    export class HttpRequest<T> extends HttpRequestPromise<T> {
         /**
          * Executes the request and runs the supplied callback on response.
          * @param callback The callback function which executes when the request succeeds or fails.
@@ -210,25 +270,9 @@ declare namespace gapi.client {
                 status: number;
                 statusText: string;
             }
-            ) => any):void;
-            /**
-         * HttpRequest supports promises.
-         */
-        then(success:(response:{
-                result:T;
-                body:string;
-                headers?: any[];
-                status?: number;
-                statusText?: string
-            })=>void,
-            failure:(response:{
-                result:T;
-                body:string;
-                headers?: any[];
-                status?: number;
-                statusText?: string
-            })=>void): void;
+            ) => any): void;
     }
+
     /**
      * Represents an HTTP Batch operation. Individual HTTP requests are added with the add method and the batch is executed using execute.
      */
@@ -244,16 +288,16 @@ declare namespace gapi.client {
              */
             id: string;
             callback: (
-            /**
-             * is the response for this request only. Its format is defined by the API method being called.
-             */
-            individualResponse: any,
-            /**
-             * is the raw batch ID-response map as a string. It contains all responses to all requests in the batch.
-             */
-            rawBatchResponse: any
-            ) => any
-        }):void;
+                /**
+                 * is the response for this request only. Its format is defined by the API method being called.
+                 */
+                individualResponse: any,
+                /**
+                 * is the raw batch ID-response map as a string. It contains all responses to all requests in the batch.
+                 */
+                rawBatchResponse: any
+                ) => any
+        }): void;
         /**
          * Executes all requests in the batch. The supplied callback is executed on success or failure.
          * @param callback The callback to execute when the batch returns.
@@ -267,7 +311,7 @@ declare namespace gapi.client {
              * is the same response, but as an unparsed JSON-string.
              */
             rawBatchResponse: string
-            ) => any):void;
+            ) => any): void;
     }
 
     /**
@@ -288,7 +332,7 @@ declare namespace gapi.client {
              * is the same as jsonResp, except it is a raw string that has not been parsed. It is typically used when the response is not JSON.
              */
             rawResp: string
-            ) => void ):void;
+            ) => void): void;
     }
 
 }
diff --git a/gapi/tsconfig.json b/gapi/tsconfig.json
index 27e01ecd7b..22f5738c1a 100644
--- a/gapi/tsconfig.json
+++ b/gapi/tsconfig.json
@@ -2,11 +2,12 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -16,6 +17,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "index.d.ts"
+        "index.d.ts",
+        "gapi-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/gijgo/gijgo-tests.ts b/gijgo/gijgo-tests.ts
index 5731732295..6e624ad4f6 100644
--- a/gijgo/gijgo-tests.ts
+++ b/gijgo/gijgo-tests.ts
@@ -1,5 +1,4 @@
 /// <reference types="jquery" />
-/// <reference types="gijgo" />
 
 // Grid
 $(() => {
diff --git a/gldatepicker/gldatepicker-tests.ts b/gldatepicker/gldatepicker-tests.ts
index d133a5f823..974c1da8a7 100644
--- a/gldatepicker/gldatepicker-tests.ts
+++ b/gldatepicker/gldatepicker-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 $('input').glDatePicker();
 $('#example2').glDatePicker(
 {
diff --git a/gm/gm-tests.ts b/gm/gm-tests.ts
index 2189d9064d..e8bf5787cd 100644
--- a/gm/gm-tests.ts
+++ b/gm/gm-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import gm = require('gm');
 import stream = require('stream');
 
diff --git a/google.fonts/google.fonts-tests.ts b/google.fonts/google.fonts-tests.ts
new file mode 100644
index 0000000000..7d63cd77fd
--- /dev/null
+++ b/google.fonts/google.fonts-tests.ts
@@ -0,0 +1,16 @@
+function test(list: google.fonts.WebfontList) {
+
+    var f = list.items[0];
+
+    var info = [
+        f.category,
+        f.family,
+        f.kind,
+        f.subsets.length,
+        f.version
+    ];
+
+    var urls = f.variants.map(
+        v => f.files[v]
+    );
+}
diff --git a/google.fonts/index.d.ts b/google.fonts/index.d.ts
new file mode 100644
index 0000000000..959447b198
--- /dev/null
+++ b/google.fonts/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for Google Fonts API 1.0
+// Project: https://developers.google.com/fonts/
+// Definitions by: Dan Marshall <https://github.com/danmarshall>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace google.fonts {
+
+    export interface WebfontList {
+        kind: string;
+        items: WebfontFamily[];
+    }
+
+    export interface WebfontFamily {
+        category?: string;
+        kind: string;
+        family: string;
+        subsets: string[];
+        variants: string[];
+        version: string;
+        lastModified: string;
+        files: { [variant: string]: string };
+    }
+}
diff --git a/pixi-spine/tsconfig.json b/google.fonts/tsconfig.json
similarity index 93%
rename from pixi-spine/tsconfig.json
rename to google.fonts/tsconfig.json
index 8351a9fd60..2df5048a3b 100644
--- a/pixi-spine/tsconfig.json
+++ b/google.fonts/tsconfig.json
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "pixi-spine-tests.ts"
+        "google.fonts-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/google.fonts/tslint.json b/google.fonts/tslint.json
new file mode 100644
index 0000000000..fdc7cdc370
--- /dev/null
+++ b/google.fonts/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../tslint.json"
+}
\ No newline at end of file
diff --git a/googlemaps/index.d.ts b/googlemaps/index.d.ts
index 60e0a92dfc..fee406b348 100644
--- a/googlemaps/index.d.ts
+++ b/googlemaps/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Google Maps JavaScript API 3.26
 // Project: https://developers.google.com/maps/
-// Definitions by: Folia A/S <http://www.folia.dk>, Chris Wrench <https://github.com/cgwrench>, Kiarash Ghiaseddin <https://github.com/Silver-Connection/DefinitelyTyped>,  Grant Hutchins <https://github.com/nertzy>, Denis Atyasov <https://github.com/xaolas>
+// Definitions by: Folia A/S <http://www.folia.dk>, Chris Wrench <https://github.com/cgwrench>, Kiarash Ghiaseddin <https://github.com/Silver-Connection/DefinitelyTyped>,  Grant Hutchins <https://github.com/nertzy>, Denis Atyasov <https://github.com/xaolas>, Michael McMullin <https://github.com/mrmcnerd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /*
@@ -371,7 +371,7 @@ declare namespace google.maps {
         setControlPosition(controlPosition: ControlPosition): void;
         setControls(controls: string[]): void;
         setDrawingMode(drawingMode: string): void;
-        setMap(map: Map): void;
+        setMap(map: Map | null): void;
         setStyle(style: Data.StylingFunction|Data.StyleOptions): void;
         toGeoJson(callback: (feature: Object) => void): void;
     }
@@ -835,7 +835,7 @@ declare namespace google.maps {
         getVisible(): boolean;
         setDraggable(draggable: boolean): void;
         setEditable(editable: boolean): void;
-        setMap(map: Map): void;
+		setMap(map: Map | null): void;
         setOptions(options: PolylineOptions): void;
         setPath(path: MVCArray|LatLng[]|LatLngLiteral[]): void; // MVCArray<LatLng>|Array<LatLng|LatLngLiteral>
         setVisible(visible: boolean): void;
@@ -873,7 +873,7 @@ declare namespace google.maps {
         getVisible(): boolean;
         setDraggable(draggable: boolean): void;
         setEditable(editable: boolean): void;
-        setMap(map: Map): void;
+		setMap(map: Map | null): void;
         setOptions(options: PolygonOptions): void;
         setPath(path: MVCArray|LatLng[]|LatLngLiteral[]): void;
         setPaths(paths: MVCArray): void;
@@ -959,7 +959,7 @@ declare namespace google.maps {
         setBounds(bounds: LatLngBounds|LatLngBoundsLiteral): void;
         setDraggable(draggable: boolean): void;
         setEditable(editable: boolean): void;
-        setMap(map: Map): void;
+		setMap(map: Map | null): void;
         setOptions(options: RectangleOptions): void;
         setVisible(visible: boolean): void;
     }
@@ -992,7 +992,7 @@ declare namespace google.maps {
         setCenter(center: LatLng|LatLngLiteral): void;
         setDraggable(draggable: boolean): void;
         setEditable(editable: boolean): void;
-        setMap(map: Map): void;
+		setMap(map: Map | null): void;
         setOptions(options: CircleOptions): void;
         setRadius(radius: number): void;
         setVisible(visible: boolean): void;
@@ -1036,7 +1036,7 @@ declare namespace google.maps {
         getMap(): Map;
         getOpacity(): number;
         getUrl(): string;
-        setMap(map: Map): void;
+		setMap(map: Map | null): void;
         setOpacity(opacity: number): void;
     }
 
@@ -1053,7 +1053,7 @@ declare namespace google.maps {
         getProjection(): MapCanvasProjection;
         onAdd(): void;
         onRemove(): void;
-        setMap(map: Map|StreetViewPanorama): void;
+		setMap(map: Map | StreetViewPanorama | null): void;
     }
 
     export interface MapPanes {
@@ -1144,7 +1144,7 @@ declare namespace google.maps {
         getPanel(): Element;
         getRouteIndex(): number;
         setDirections(directions: DirectionsResult): void;
-        setMap(map: Map): void;
+		setMap(map: Map | null): void;
         setOptions(options: DirectionsRendererOptions): void;
         setPanel(panel: Element): void;
         setRouteIndex(routeIndex: number): void;
@@ -1624,13 +1624,13 @@ declare namespace google.maps {
     export class BicyclingLayer extends MVCObject {
         constructor();
         getMap(): Map;
-        setMap(map: Map): void;
+		setMap(map: Map | null): void;
     }
 
     export class FusionTablesLayer extends MVCObject {
         constructor(options: FusionTablesLayerOptions);
         getMap(): Map;
-        setMap(map: Map): void;
+		setMap(map: Map | null): void;
         setOptions(options: FusionTablesLayerOptions): void;
     }
 
@@ -1701,7 +1701,7 @@ declare namespace google.maps {
         getStatus(): KmlLayerStatus;
         getUrl(): string;
         getZIndex(): number;
-        setMap(map: Map): void;
+		setMap(map: Map | null): void;
         setUrl(url: string): void;
         setZIndez(zIndex: number): void;
     }
@@ -1760,7 +1760,7 @@ declare namespace google.maps {
     export class TrafficLayer extends MVCObject {
         constructor(opts?: TrafficLayerOptions);
         getMap(): Map;
-        setMap(map: Map): void;
+        setMap(map: Map | null): void;
         setOptions(options: TrafficLayerOptions): void;
     }
 
@@ -1772,7 +1772,7 @@ declare namespace google.maps {
     export class TransitLayer extends MVCObject {
         constructor();
         getMap(): void;
-        setMap(map: Map): void;
+		setMap(map: Map | null): void;
     }
 
     /***** Street View *****/
@@ -1904,7 +1904,7 @@ declare namespace google.maps {
 
     export class StreetViewCoverageLayer extends MVCObject  {
         getMap(): Map;
-        setMap(map: Map): void;
+		setMap(map: Map | null): void;
     }
 
     /***** Events *****/
@@ -2155,7 +2155,7 @@ declare namespace google.maps {
             setBorderColor(borderColor: string): void;
             setChannelNumber(channelNumber: string): void;
             setFormat(format: AdFormat): void;
-            setMap(map: Map): void;
+			setMap(map: Map | null): void;
             setPosition(position: ControlPosition): void;
             setTextColor(textColor: string): void;
             setTitleColor(titleColor: string): void;
@@ -2224,6 +2224,22 @@ declare namespace google.maps {
             types: string[];
         }
 
+        export interface OpeningHours {
+            open_now: boolean,
+            periods: OpeningPeriod[],
+            weekday_text: string[]
+        }
+
+        export interface OpeningPeriod {
+            open: OpeningHoursTime,
+            close?: OpeningHoursTime
+        }
+
+        export interface OpeningHoursTime {
+            day: number,
+            time: string
+        }
+
         export interface PredictionTerm {
             offset: number;
             value: string;
@@ -2260,7 +2276,7 @@ declare namespace google.maps {
         }
 
         export interface PlaceDetailsRequest  {
-            placeId: string;
+            placeid: string;
         }
 
         export interface PlaceGeometry {
@@ -2290,6 +2306,7 @@ declare namespace google.maps {
             icon: string;
             international_phone_number: string;
             name: string;
+            opening_hours: OpeningHours;
             permanently_closed: boolean;
             photos: PlacePhoto[];
             place_id: string;
@@ -2404,7 +2421,7 @@ declare namespace google.maps {
             getDrawingMode(): OverlayType;
             getMap(): Map;
             setDrawingMode(drawingMode: OverlayType): void;
-            setMap(map: Map): void;
+			setMap(map: Map | null): void;
             setOptions(options: DrawingManagerOptions): void;
         }
 
@@ -2453,7 +2470,7 @@ declare namespace google.maps {
             getZIndex(): number;
             setLayerId(layerId: string): void;
             setLayerKey(layerKey: string): void;
-            setMap(map: Map): void;
+			setMap(map: Map | null): void;
             setMapId(mapId: string): void;
             setOpacity(opacity: number): void;
             setOptions(options: MapsEngineLayerOptions): void;
@@ -2497,7 +2514,7 @@ declare namespace google.maps {
             setData(data: MVCArray): void;
             setData(data: LatLng[]): void;
             setData(data: WeightedLocation[]): void;
-            setMap(map: Map): void;
+			setMap(map: Map | null): void;
         }
 
         export interface HeatmapLayerOptions {
diff --git a/gregorian-calendar/gregorian-calendar-tests.ts b/gregorian-calendar/gregorian-calendar-tests.ts
index a7b11cf21d..096933ed2b 100644
--- a/gregorian-calendar/gregorian-calendar-tests.ts
+++ b/gregorian-calendar/gregorian-calendar-tests.ts
@@ -1,9 +1,6 @@
-/// <reference types="gregorian-calendar" />
-
 import GregorianCalendar = require('gregorian-calendar');
 import GregorianCalendarFormat = require('gregorian-calendar-format');
 
-
 let cal = new GregorianCalendar();
 cal.set(2016, 7, 27, 0, 0, 0, 0);
 
diff --git a/gridfs-stream/gridfs-stream-tests.ts b/gridfs-stream/gridfs-stream-tests.ts
index 1ed4e97006..8086245722 100644
--- a/gridfs-stream/gridfs-stream-tests.ts
+++ b/gridfs-stream/gridfs-stream-tests.ts
@@ -1,7 +1,3 @@
-
-
-/// <reference types="node" />
-
 // Samples from:
 // https://github.com/aheckmann/gridfs-stream
 
diff --git a/gulp-angular-templatecache/tsconfig.json b/gulp-angular-templatecache/tsconfig.json
index eda0469b48..869b08da9a 100644
--- a/gulp-angular-templatecache/tsconfig.json
+++ b/gulp-angular-templatecache/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-autoprefixer/tsconfig.json b/gulp-autoprefixer/tsconfig.json
index 955f890f2b..35ad131268 100644
--- a/gulp-autoprefixer/tsconfig.json
+++ b/gulp-autoprefixer/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-babel/gulp-babel-tests.ts b/gulp-babel/gulp-babel-tests.ts
index b705c68850..4cd6ff0467 100644
--- a/gulp-babel/gulp-babel-tests.ts
+++ b/gulp-babel/gulp-babel-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import babel = require('gulp-babel');
 
 var x: NodeJS.ReadWriteStream = babel();
diff --git a/gulp-batch/gulp-batch-tests.ts b/gulp-batch/gulp-batch-tests.ts
new file mode 100644
index 0000000000..c5936eb031
--- /dev/null
+++ b/gulp-batch/gulp-batch-tests.ts
@@ -0,0 +1,8 @@
+import * as gulp from "gulp";
+import * as batch from "gulp-batch";
+
+gulp.task('default', () => {
+    gulp.watch([ 'lib/**', 'test/**' ], batch((events: any, cb: any) => {
+        events.on('data', console.log).on('end', cb);
+     }));
+});
diff --git a/gulp-batch/index.d.ts b/gulp-batch/index.d.ts
new file mode 100644
index 0000000000..a3be8e252e
--- /dev/null
+++ b/gulp-batch/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for gulp-batch 1.0
+// Project: https://github.com/floatdrop/gulp-batch
+// Definitions by: Alvaro Menezes <https://github.com/alvarollmenezes>, Vinicius Salomao <https://github.com/vizeke>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function batch(opts?: any, cb?: any, errorHandler?: any): (event: any) => void;
+declare namespace batch { }
+export = batch;
diff --git a/gulp-batch/tsconfig.json b/gulp-batch/tsconfig.json
new file mode 100644
index 0000000000..1406137b98
--- /dev/null
+++ b/gulp-batch/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "files": [
+        "index.d.ts",
+        "gulp-batch-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+         "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/gulp-batch/tslint.json b/gulp-batch/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/gulp-batch/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/gulp-cache/tsconfig.json b/gulp-cache/tsconfig.json
index 3126e1ef38..368718e5d1 100644
--- a/gulp-cache/tsconfig.json
+++ b/gulp-cache/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-cached/tsconfig.json b/gulp-cached/tsconfig.json
index 32f3759409..77ef9c0aa1 100644
--- a/gulp-cached/tsconfig.json
+++ b/gulp-cached/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-changed/tsconfig.json b/gulp-changed/tsconfig.json
index 4185d001ef..ab8e90a21d 100644
--- a/gulp-changed/tsconfig.json
+++ b/gulp-changed/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-cheerio/gulp-cheerio-tests.ts b/gulp-cheerio/gulp-cheerio-tests.ts
index 464abccead..e2d3bfe267 100644
--- a/gulp-cheerio/gulp-cheerio-tests.ts
+++ b/gulp-cheerio/gulp-cheerio-tests.ts
@@ -1,7 +1,3 @@
-
-
-/// <reference types="cheerio" />
-
 import cheerio = require('gulp-cheerio');
 import gulp = require('gulp');
 import Vinyl = require('vinyl');
diff --git a/gulp-cheerio/tsconfig.json b/gulp-cheerio/tsconfig.json
index 254698a94e..d6cdfaac69 100644
--- a/gulp-cheerio/tsconfig.json
+++ b/gulp-cheerio/tsconfig.json
@@ -12,6 +12,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-coffeeify/tsconfig.json b/gulp-coffeeify/tsconfig.json
index 54406ca98a..67e213beda 100644
--- a/gulp-coffeeify/tsconfig.json
+++ b/gulp-coffeeify/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-coffeelint/tsconfig.json b/gulp-coffeelint/tsconfig.json
index 2cc883884b..f1d388ddb7 100644
--- a/gulp-coffeelint/tsconfig.json
+++ b/gulp-coffeelint/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-concat/tsconfig.json b/gulp-concat/tsconfig.json
index 1f4acfd285..0d4c2e1c52 100644
--- a/gulp-concat/tsconfig.json
+++ b/gulp-concat/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-copy/tsconfig.json b/gulp-copy/tsconfig.json
index cc4c620b9f..0111f96820 100644
--- a/gulp-copy/tsconfig.json
+++ b/gulp-copy/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-csso/tsconfig.json b/gulp-csso/tsconfig.json
index 706fd106af..9519eac9b6 100644
--- a/gulp-csso/tsconfig.json
+++ b/gulp-csso/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-debug/tsconfig.json b/gulp-debug/tsconfig.json
index accf822a92..dac4ba0725 100644
--- a/gulp-debug/tsconfig.json
+++ b/gulp-debug/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-dtsm/gulp-dtsm-tests.ts b/gulp-dtsm/gulp-dtsm-tests.ts
index 54e12eff6a..dafc6b3468 100644
--- a/gulp-dtsm/gulp-dtsm-tests.ts
+++ b/gulp-dtsm/gulp-dtsm-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import * as dtsm from 'gulp-dtsm';
 import * as gulp from 'gulp';
 
diff --git a/gulp-dtsm/tsconfig.json b/gulp-dtsm/tsconfig.json
index 6003ac335b..872e75dd19 100644
--- a/gulp-dtsm/tsconfig.json
+++ b/gulp-dtsm/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-espower/tsconfig.json b/gulp-espower/tsconfig.json
index 1140a956aa..92f4388198 100644
--- a/gulp-espower/tsconfig.json
+++ b/gulp-espower/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-file-include/tsconfig.json b/gulp-file-include/tsconfig.json
index d166690ec5..d08b25fa2e 100644
--- a/gulp-file-include/tsconfig.json
+++ b/gulp-file-include/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-filter/tsconfig.json b/gulp-filter/tsconfig.json
index f217497fa9..c48a36bb69 100644
--- a/gulp-filter/tsconfig.json
+++ b/gulp-filter/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-flatten/tsconfig.json b/gulp-flatten/tsconfig.json
index 484a4e3aef..72d3110eaa 100644
--- a/gulp-flatten/tsconfig.json
+++ b/gulp-flatten/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-gh-pages/tsconfig.json b/gulp-gh-pages/tsconfig.json
index a6f5d411b1..44cffa6d99 100644
--- a/gulp-gh-pages/tsconfig.json
+++ b/gulp-gh-pages/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-gzip/tsconfig.json b/gulp-gzip/tsconfig.json
index 07e07f0cf5..4eea3f8d72 100644
--- a/gulp-gzip/tsconfig.json
+++ b/gulp-gzip/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-help-doc/tsconfig.json b/gulp-help-doc/tsconfig.json
index 646e8ad141..283808fe7b 100644
--- a/gulp-help-doc/tsconfig.json
+++ b/gulp-help-doc/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-help/gulp-help-tests.ts b/gulp-help/gulp-help-tests.ts
index 5d11bc23b7..ae7d0846e7 100644
--- a/gulp-help/gulp-help-tests.ts
+++ b/gulp-help/gulp-help-tests.ts
@@ -1,7 +1,3 @@
-/// <reference types="node" />
-
-'use strict';
-
 import gulpHelp = require('gulp-help');
 
 var gulp = gulpHelp(require('gulp'));
diff --git a/gulp-help/tsconfig.json b/gulp-help/tsconfig.json
index d0647ad22a..f8e499e793 100644
--- a/gulp-help/tsconfig.json
+++ b/gulp-help/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-html-replace/gulp-html-replace-tests.ts b/gulp-html-replace/gulp-html-replace-tests.ts
index 568fb481fd..9a21a53b84 100644
--- a/gulp-html-replace/gulp-html-replace-tests.ts
+++ b/gulp-html-replace/gulp-html-replace-tests.ts
@@ -1,7 +1,3 @@
-
-
-/// <reference types="node" />
-
 import * as gulp from 'gulp';
 import * as htmlreplace from 'gulp-html-replace';
 
diff --git a/gulp-html-replace/tsconfig.json b/gulp-html-replace/tsconfig.json
index 25eff60770..e074dcc546 100644
--- a/gulp-html-replace/tsconfig.json
+++ b/gulp-html-replace/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-htmlmin/tsconfig.json b/gulp-htmlmin/tsconfig.json
index 5d12b48035..964d06a7a1 100644
--- a/gulp-htmlmin/tsconfig.json
+++ b/gulp-htmlmin/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-if/tsconfig.json b/gulp-if/tsconfig.json
index f9db5297cf..6ea4d6a30b 100644
--- a/gulp-if/tsconfig.json
+++ b/gulp-if/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-inject/tsconfig.json b/gulp-inject/tsconfig.json
index 0201da00d9..c243f76d43 100644
--- a/gulp-inject/tsconfig.json
+++ b/gulp-inject/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-insert/tsconfig.json b/gulp-insert/tsconfig.json
index e548f022fa..aa58483b8a 100644
--- a/gulp-insert/tsconfig.json
+++ b/gulp-insert/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-install/tsconfig.json b/gulp-install/tsconfig.json
index 0b4494f7cd..79ecdd6cf1 100644
--- a/gulp-install/tsconfig.json
+++ b/gulp-install/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-istanbul/tsconfig.json b/gulp-istanbul/tsconfig.json
index f7ca4e96c7..f860b33143 100644
--- a/gulp-istanbul/tsconfig.json
+++ b/gulp-istanbul/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-jade/tsconfig.json b/gulp-jade/tsconfig.json
index b746e232bf..6b9c5c22c4 100644
--- a/gulp-jade/tsconfig.json
+++ b/gulp-jade/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-jasmine-browser/tsconfig.json b/gulp-jasmine-browser/tsconfig.json
index e5b112e90f..c347d86d35 100644
--- a/gulp-jasmine-browser/tsconfig.json
+++ b/gulp-jasmine-browser/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-json-editor/tsconfig.json b/gulp-json-editor/tsconfig.json
index 85846b46fd..8d6021c6f8 100644
--- a/gulp-json-editor/tsconfig.json
+++ b/gulp-json-editor/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-jspm/tsconfig.json b/gulp-jspm/tsconfig.json
index fbf318afab..e52189d99a 100644
--- a/gulp-jspm/tsconfig.json
+++ b/gulp-jspm/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-less/tsconfig.json b/gulp-less/tsconfig.json
index be38992302..4c9110c114 100644
--- a/gulp-less/tsconfig.json
+++ b/gulp-less/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-load-plugins/tsconfig.json b/gulp-load-plugins/tsconfig.json
index 77238a0e61..4e3ea0ba8c 100644
--- a/gulp-load-plugins/tsconfig.json
+++ b/gulp-load-plugins/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-minify-css/tsconfig.json b/gulp-minify-css/tsconfig.json
index 2d59793675..0b04647f28 100644
--- a/gulp-minify-css/tsconfig.json
+++ b/gulp-minify-css/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-minify-html/tsconfig.json b/gulp-minify-html/tsconfig.json
index 3e37896bd2..2b5f377a6c 100644
--- a/gulp-minify-html/tsconfig.json
+++ b/gulp-minify-html/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-mocha/tsconfig.json b/gulp-mocha/tsconfig.json
index aef5d2d758..3405efd531 100644
--- a/gulp-mocha/tsconfig.json
+++ b/gulp-mocha/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-newer/tsconfig.json b/gulp-newer/tsconfig.json
index ac02863c9b..53fd3b5fd5 100644
--- a/gulp-newer/tsconfig.json
+++ b/gulp-newer/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-ng-annotate/tsconfig.json b/gulp-ng-annotate/tsconfig.json
index 16f68955bb..b8b4d4fc6d 100644
--- a/gulp-ng-annotate/tsconfig.json
+++ b/gulp-ng-annotate/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-nodemon/tsconfig.json b/gulp-nodemon/tsconfig.json
index dc91f8e066..9af358b797 100644
--- a/gulp-nodemon/tsconfig.json
+++ b/gulp-nodemon/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-plumber/tsconfig.json b/gulp-plumber/tsconfig.json
index 878facc1f7..9f00169b06 100644
--- a/gulp-plumber/tsconfig.json
+++ b/gulp-plumber/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-protractor/tsconfig.json b/gulp-protractor/tsconfig.json
index 1141cf2042..667da98b75 100644
--- a/gulp-protractor/tsconfig.json
+++ b/gulp-protractor/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-remember/tsconfig.json b/gulp-remember/tsconfig.json
index e8ecc18bdc..f8ae755cca 100644
--- a/gulp-remember/tsconfig.json
+++ b/gulp-remember/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-rename/tsconfig.json b/gulp-rename/tsconfig.json
index 8a3a2c34dd..7276696b70 100644
--- a/gulp-rename/tsconfig.json
+++ b/gulp-rename/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-replace/tsconfig.json b/gulp-replace/tsconfig.json
index 5624a977d3..8b78b80dcc 100644
--- a/gulp-replace/tsconfig.json
+++ b/gulp-replace/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-rev-replace/tsconfig.json b/gulp-rev-replace/tsconfig.json
index b3fb130952..dfbd0d502f 100644
--- a/gulp-rev-replace/tsconfig.json
+++ b/gulp-rev-replace/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-rev/tsconfig.json b/gulp-rev/tsconfig.json
index ea7647e39a..b1f1715d28 100644
--- a/gulp-rev/tsconfig.json
+++ b/gulp-rev/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-ruby-sass/tsconfig.json b/gulp-ruby-sass/tsconfig.json
index 9465184b37..b6c74a2dd8 100644
--- a/gulp-ruby-sass/tsconfig.json
+++ b/gulp-ruby-sass/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-sass/tsconfig.json b/gulp-sass/tsconfig.json
index 26e1b2af4c..bec0180414 100644
--- a/gulp-sass/tsconfig.json
+++ b/gulp-sass/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-shell/tsconfig.json b/gulp-shell/tsconfig.json
index 81356de73d..ac0bc0cf3a 100644
--- a/gulp-shell/tsconfig.json
+++ b/gulp-shell/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-size/tsconfig.json b/gulp-size/tsconfig.json
index b1be4ca1dc..fe93b09ba6 100644
--- a/gulp-size/tsconfig.json
+++ b/gulp-size/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-sort/tsconfig.json b/gulp-sort/tsconfig.json
index 87097c7ad2..1921a1884c 100644
--- a/gulp-sort/tsconfig.json
+++ b/gulp-sort/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-sourcemaps/tsconfig.json b/gulp-sourcemaps/tsconfig.json
index e9c6d80281..9ce9bf808f 100644
--- a/gulp-sourcemaps/tsconfig.json
+++ b/gulp-sourcemaps/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-strip-debug/tsconfig.json b/gulp-strip-debug/tsconfig.json
index db20e2db69..572113b3cf 100644
--- a/gulp-strip-debug/tsconfig.json
+++ b/gulp-strip-debug/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-svg-sprite/tsconfig.json b/gulp-svg-sprite/tsconfig.json
index 381d78b150..82b417934a 100644
--- a/gulp-svg-sprite/tsconfig.json
+++ b/gulp-svg-sprite/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-task-listing/tsconfig.json b/gulp-task-listing/tsconfig.json
index 1f3b796968..fb06f0a926 100644
--- a/gulp-task-listing/tsconfig.json
+++ b/gulp-task-listing/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-tsd/tsconfig.json b/gulp-tsd/tsconfig.json
index a5738eb561..813e29fd74 100644
--- a/gulp-tsd/tsconfig.json
+++ b/gulp-tsd/tsconfig.json
@@ -11,6 +11,12 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-tslint/tsconfig.json b/gulp-tslint/tsconfig.json
index 91d3edf8a3..46befdb599 100644
--- a/gulp-tslint/tsconfig.json
+++ b/gulp-tslint/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-typedoc/tsconfig.json b/gulp-typedoc/tsconfig.json
index 9d0f620269..f60478c1fa 100644
--- a/gulp-typedoc/tsconfig.json
+++ b/gulp-typedoc/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-typescript/tsconfig.json b/gulp-typescript/tsconfig.json
index fa6cbbc908..120791965a 100644
--- a/gulp-typescript/tsconfig.json
+++ b/gulp-typescript/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-uglify/tsconfig.json b/gulp-uglify/tsconfig.json
index 43db40e019..d0ae9de799 100644
--- a/gulp-uglify/tsconfig.json
+++ b/gulp-uglify/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-useref/gulp-useref-tests.ts b/gulp-useref/gulp-useref-tests.ts
index 1f1a152be0..9f2bd409d5 100644
--- a/gulp-useref/gulp-useref-tests.ts
+++ b/gulp-useref/gulp-useref-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import * as gulp from 'gulp';
 import * as useref from 'gulp-useref';
 
diff --git a/gulp-useref/tsconfig.json b/gulp-useref/tsconfig.json
index 132913f9d8..67e8c2aaed 100644
--- a/gulp-useref/tsconfig.json
+++ b/gulp-useref/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-util/tsconfig.json b/gulp-util/tsconfig.json
index 06b269e0ed..44b42dbad1 100644
--- a/gulp-util/tsconfig.json
+++ b/gulp-util/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp-watch/tsconfig.json b/gulp-watch/tsconfig.json
index 7062be6f7e..9822101d39 100644
--- a/gulp-watch/tsconfig.json
+++ b/gulp-watch/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/gulp/index.d.ts b/gulp/index.d.ts
index 9f3e7d96ba..fefd5b0fda 100644
--- a/gulp/index.d.ts
+++ b/gulp/index.d.ts
@@ -10,7 +10,6 @@
 
 import Orchestrator = require("orchestrator");
 import VinylFile = require("vinyl");
-
 declare type Strings = string|string[];
 
 declare namespace gulp {
diff --git a/gulp/tsconfig.json b/gulp/tsconfig.json
index f6670453d1..01afedbf29 100644
--- a/gulp/tsconfig.json
+++ b/gulp/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/hammerjs/v1/hammerjs-tests.ts b/hammerjs/v1/hammerjs-tests.ts
index bb006241fe..60d990c0bd 100644
--- a/hammerjs/v1/hammerjs-tests.ts
+++ b/hammerjs/v1/hammerjs-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery"/>
-
-
 // plugin check
 if (!Hammer.HAS_TOUCHEVENTS && !Hammer.HAS_POINTEREVENTS) {
     Hammer.plugins.fakeMultitouch();
diff --git a/handlebars/index.d.ts b/handlebars/index.d.ts
index 96b0491040..d3ab2c80e3 100644
--- a/handlebars/index.d.ts
+++ b/handlebars/index.d.ts
@@ -10,6 +10,9 @@ declare namespace Handlebars {
     export function registerPartial(name: string, str: any): void;
     export function unregisterHelper(name: string): void;
     export function unregisterPartial(name: string): void;
+    export function registerDecorator(name: string, fn: Function): void;
+    export function unregisterDecorator(name: string): void;
+
     export function K(): void;
     export function createFrame(object: any): any;
     export function Exception(message: string): void;
@@ -26,7 +29,9 @@ declare namespace Handlebars {
     export var Utils: typeof hbs.Utils;
     export var logger: Logger;
     export var templates: HandlebarsTemplates;
-    export var helpers: any;
+    export var helpers: { [name: string]: Function };
+    export var partials: { [name: string]: any };
+    export var decorators: { [name: string]: Function };
 
     export function registerDecorator(name: string, fn: Function): void;
     export function registerDecorator(obj: {[name: string] : Function}): void;
diff --git a/handsontable/handsontable-tests.ts b/handsontable/handsontable-tests.ts
index eb48441244..f744c10483 100644
--- a/handsontable/handsontable-tests.ts
+++ b/handsontable/handsontable-tests.ts
@@ -16,7 +16,7 @@ function test_HandsontableInit() {
     autoWrapRow: true,
     bindRowsWithHeaders: 'foo',
     cell: [],
-    cells: function() {},
+    cells: () => { return; },
     checkedTemplate: true,
     className: [],
     colHeaders: true,
@@ -99,7 +99,7 @@ function test_HandsontableInit() {
     selectOptions: [],
     skipColumnOnPaste: true,
     sortByRelevance: true,
-    sortFunction: function() {},
+    sortFunction: () => { return; },
     sortIndicator: true,
     source: [],
     startCols: 123,
@@ -114,7 +114,7 @@ function test_HandsontableInit() {
     type: 'foo',
     uncheckedTemplate: true,
     undo: true,
-    validator: function() {},
+    validator: () => {return; },
     viewportColumnRenderingOffset: 123,
     viewportRowRenderingOffset: 123,
     visibleRows: 123,
@@ -122,86 +122,86 @@ function test_HandsontableInit() {
     wordWrap: true,
 
     // Hooks
-    afterAutofillApplyValues: function() {},
-    afterCellMetaReset: function() {},
-    afterChange: function() {},
-    afterChangesObserved: function() {},
-    afterColumnMove: function() {},
-    afterColumnResize: function() {},
-    afterColumnSort: function() {},
-    afterContextMenuDefaultOptions: function() {},
-    afterContextMenuHide: function() {},
-    afterContextMenuShow: function() {},
-    afterCopyLimit: function() {},
-    afterCreateCol: function() {},
-    afterCreateRow: function() {},
-    afterDeselect: function() {},
-    afterDestroy: function() {},
-    afterDocumentKeyDown: function() {},
-    afterFilter: function() {},
-    afterGetCellMeta: function() {},
-    afterGetColHeader: function() {},
-    afterGetColumnHeaderRenderers: function() {},
-    afterGetRowHeader: function() {},
-    afterGetRowHeaderRenderers: function() {},
-    afterInit: function() {},
-    afterLoadData: function() {},
-    afterMomentumScroll: function() {},
-    afterOnCellCornerMouseDown: function() {},
-    afterOnCellMouseDown: function() {},
-    afterOnCellMouseOver: function() {},
-    afterRemoveCol: function() {},
-    afterRemoveRow: function() {},
-    afterRender: function() {},
-    afterRenderer: function() {},
-    afterRowMove: function() {},
-    afterRowResize: function() {},
-    afterScrollHorizontally: function() {},
-    afterScrollVertically: function() {},
-    afterSelection: function() {},
-    afterSelectionByProp: function() {},
-    afterSelectionEnd: function() {},
-    afterSelectionEndByProp: function() {},
-    afterSetCellMeta: function() {},
-    afterUpdateSettings: function() {},
-    afterValidate: function() {},
-    beforeAutofill: function() {},
-    beforeCellAlignment: function() {},
-    beforeChange: function() {},
-    beforeChangeRender: function() {},
-    beforeColumnMove: function() {},
-    beforeColumnResize: function() {},
-    beforeColumnSort: function() {},
-    beforeDrawBorders: function() {},
-    beforeFilter: function() {},
-    beforeGetCellMeta: function() {},
-    beforeInit: function() {},
-    beforeInitWalkontable: function() {},
-    beforeKeyDown: function() {},
-    beforeOnCellMouseDown: function() {},
-    beforeRemoveCol: function() {},
-    beforeRemoveRow: function() {},
-    beforeRender: function() {},
-    beforeRenderer: function() {},
-    beforeRowMove: function() {},
-    beforeRowResize: function() {},
-    beforeSetRangeEnd: function() {},
-    beforeStretchingColumnWidth: function() {},
-    beforeTouchScroll: function() {},
-    beforeValidate: function() {},
-    construct: function() {},
-    init: function() {},
-    modifyCol: function() {},
-    modifyColHeader: function() {},
-    modifyColWidth: function() {},
-    modifyCopyableRange: function() {},
-    modifyRow: function() {},
-    modifyRowHeader: function() {},
-    modifyRowHeight: function() {},
-    persistentStateLoad: function() {},
-    persistentStateReset: function() {},
-    persistentStateSave: function() {},
-    unmodifyCol: function() {}
+    afterAutofillApplyValues: () => {return; },
+    afterCellMetaReset: () => {return; },
+    afterChange: () => {return; },
+    afterChangesObserved: () => {return; },
+    afterColumnMove: () => {return; },
+    afterColumnResize: () => {return; },
+    afterColumnSort: () => {return; },
+    afterContextMenuDefaultOptions: () => {return; },
+    afterContextMenuHide: () => {return; },
+    afterContextMenuShow: () => {return; },
+    afterCopyLimit: () => {return; },
+    afterCreateCol: () => {return; },
+    afterCreateRow: () => {return; },
+    afterDeselect: () => {return; },
+    afterDestroy: () => {return; },
+    afterDocumentKeyDown: () => {return; },
+    afterFilter: () => {return; },
+    afterGetCellMeta: () => {return; },
+    afterGetColHeader: () => {return; },
+    afterGetColumnHeaderRenderers: () => {return; },
+    afterGetRowHeader: () => {return; },
+    afterGetRowHeaderRenderers: () => {return; },
+    afterInit: () => {return; },
+    afterLoadData: () => {return; },
+    afterMomentumScroll: () => {return; },
+    afterOnCellCornerMouseDown: () => {return; },
+    afterOnCellMouseDown: () => {return; },
+    afterOnCellMouseOver: () => {return; },
+    afterRemoveCol: () => {return; },
+    afterRemoveRow: () => {return; },
+    afterRender: () => {return; },
+    afterRenderer: () => {return; },
+    afterRowMove: () => {return; },
+    afterRowResize: () => {return; },
+    afterScrollHorizontally: () => {return; },
+    afterScrollVertically: () => {return; },
+    afterSelection: () => {return; },
+    afterSelectionByProp: () => {return; },
+    afterSelectionEnd: () => {return; },
+    afterSelectionEndByProp: () => {return; },
+    afterSetCellMeta: () => {return; },
+    afterUpdateSettings: () => {return; },
+    afterValidate: () => {return; },
+    beforeAutofill: () => {return; },
+    beforeCellAlignment: () => {return; },
+    beforeChange: () => {return; },
+    beforeChangeRender: () => {return; },
+    beforeColumnMove: () => {return; },
+    beforeColumnResize: () => {return; },
+    beforeColumnSort: () => {return; },
+    beforeDrawBorders: () => {return; },
+    beforeFilter: () => {return; },
+    beforeGetCellMeta: () => {return; },
+    beforeInit: () => {return; },
+    beforeInitWalkontable: () => {return; },
+    beforeKeyDown: () => {return; },
+    beforeOnCellMouseDown: () => {return; },
+    beforeRemoveCol: () => {return; },
+    beforeRemoveRow: () => {return; },
+    beforeRender: () => {return; },
+    beforeRenderer: () => {return; },
+    beforeRowMove: () => {return; },
+    beforeRowResize: () => {return; },
+    beforeSetRangeEnd: () => {return; },
+    beforeStretchingColumnWidth: () => {return; },
+    beforeTouchScroll: () => {return; },
+    beforeValidate: () => {return; },
+    construct: () => {return; },
+    init: () => {return; },
+    modifyCol: () => {return; },
+    modifyColHeader: () => {return; },
+    modifyColWidth: () => {return; },
+    modifyCopyableRange: () => {return; },
+    modifyRow: () => {return; },
+    modifyRowHeader: () => {return; },
+    modifyRowHeight: () => {return; },
+    persistentStateLoad: () => {return; },
+    persistentStateReset: () => {return; },
+    persistentStateSave: () => {return; },
+    unmodifyCol: () => {return; }
   });
 }
 
@@ -269,10 +269,10 @@ function test_HandsontableMethods() {
   hot.propToCol('foo');
   hot.propToCol(123);
   hot.removeCellMeta(123, 123, 'foo');
-  hot.removeHook('foo', function() {});
+  hot.removeHook('foo', () => {return; });
   hot.render();
   hot.rowOffset();
-  hot.runHooks('foo', 123, 'foo', true, {}, [], function() {});
+  hot.runHooks('foo', 123, 'foo', true, {}, [], () => {return; });
   hot.selectCell(123, 123, 123, 123, true, true);
   hot.selectCellByProp(123, 'foo', 123, 'foo', true);
   hot.setCellMeta(123, 123, 'foo', 'foo');
@@ -281,11 +281,21 @@ function test_HandsontableMethods() {
   hot.setDataAtRowProp(123, 'foo', 'foo', 'foo');
   hot.spliceCol(123, 123, 123, 'foo');
   hot.spliceRow(123, 123, 123, 'foo');
+  hot.toPhysicalRow(123);
+  hot.toPhysicalColumn(123);
+  hot.toVisualRow(123);
+  hot.toVisualColumn(123);
   hot.unlisten();
   hot.updateSettings({}, true);
-  hot.validateCells(function() {});
-  
+  hot.validateCells(() => {return; });
+
   Handsontable.renderers.NumericRenderer(hot, new HTMLTableDataCellElement(), 0, 0, "prop", 1.235, {});
   Handsontable.renderers.TextRenderer(hot, new HTMLTableDataCellElement(), 0, 0, "prop", 1.235, {});
-  Handsontable.Dom.addEvent(new HTMLElement(), "eventName", () => {});
+  Handsontable.Dom.addEvent(new HTMLElement(), "eventName", () => { return; });
 }
+
+class MyCustomHotPlugin extends Handsontable.plugins.BasePlugin {
+  isEnabled(): boolean {
+     return !!this.hot.getSettings().manualRowMove;
+  }
+}
\ No newline at end of file
diff --git a/handsontable/index.d.ts b/handsontable/index.d.ts
index eeef57394e..e569ee58f7 100644
--- a/handsontable/index.d.ts
+++ b/handsontable/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Handsontable 0.24.3
+// Type definitions for Handsontable 0.30
 // Project: https://handsontable.com/
 // Definitions by: Handsoncode sp. z o.o. <http://handsoncode.net/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped\
@@ -251,7 +251,7 @@ declare namespace ht {
     getSchema(): Object;
     getSelected(): any[];
     getSelectedRange(): Range;
-    getSettings(): Object;
+    getSettings(): Options;
     getSourceData(r?: number, c?: number, r2?: number, c2?: number): any[];
     getSourceDataAtCell(row: number, column: number): any;
     getSourceDataAtCol(column: number): any[];
@@ -280,8 +280,12 @@ declare namespace ht {
     setDataAtRowProp(row: number|any[], prop: string, value: string, source?: string): void;
     spliceCol(col: number, index: number, amount: number, elements?: any): void;
     spliceRow(row: number, index: number, amount: number, elements?: any): void;
+    toPhysicalRow(row: number): number;
+    toPhysicalColumn(column: number): number;
+    toVisualRow(row: number): number;
+    toVisualColumn(column: number): number;
     unlisten(): void;
-    updateSettings(settings: Object, init: boolean): void;
+    updateSettings(settings: Object, init?: boolean): void;
     validateCells(callback: Function): void;
   }
 
@@ -302,61 +306,215 @@ declare namespace ht {
     }
 
     interface ColumnProperties extends CellProperties {
-        data?: string;
-        editor?: string;
+        data?: string | number;
+        title?: string;
+        editor?: string | EditorConstructor;
         selectOptions?: any[];
+        width?: number;
+
     }
 
     interface CellProperties {
-        renderer?: (
-            instance: Methods,
-            td: HTMLTableDataCellElement,
-            row: number,
-            col: number,
-            prop: string,
-            value: any,
-            tdCellProperties: Object) => void;
+        renderer?: CellRenderer;
         type?: string;
         readOnly?: boolean;
         language?: string;
         format?: string;
-        validator?: (value: string, callback: (condition: boolean) => void) => void;
+        validator?: Validator;
+        allowInvalid?: boolean;
+        className?: string;
     }
 
     interface CellPosition {
         row: number;
         col: number;
     }
+
+    // so that you can write custom plugins in typescript
+    interface BasePlugin {
+        init(): void;
+        enablePlugin(): void;
+        disablePlugin(): void;
+        addHook(name: string, callback: Function): void;
+        removeHooks(name: string): void;
+        clearHooks(): void;
+        callOnPluginsReady(callback: Function): void;
+        updatePlugin(): void;
+        destroy(): void;
+        enabled: boolean;
+        hot: Methods;
+    }
+
+    interface PluginConstructor {
+        new (hotInstance: Methods): BasePlugin;
+    }
+
+    interface ContextMenuPluginConstructor extends PluginConstructor {
+        SEPARATOR: string;
+    }
+
+    interface Plugins {
+        AutoColumnSize: PluginConstructor;
+        AutoRowSizeAutoRowSize: PluginConstructor;
+        BasePlugin: PluginConstructor;
+        BindRowsWithHeaders: PluginConstructor;
+        CollapsibleColumns: PluginConstructor;
+        ColumnSorting: PluginConstructor;
+        ColumnSummary: PluginConstructor;
+        Comments: PluginConstructor;
+        ContextMenu: ContextMenuPluginConstructor;
+        ContextMenuCopyPaste: PluginConstructor;
+        DragToScroll: PluginConstructor;
+        DropdownMenu: PluginConstructor;
+        ExportFile: PluginConstructor;
+        Filters: PluginConstructor;
+        Formulas: PluginConstructor;
+        GanttChart: PluginConstructor;
+        HeaderTooltips: PluginConstructor;
+        HiddenColumns: PluginConstructor;
+        HiddenRows: PluginConstructor;
+        ManualColumnFreeze: PluginConstructor;
+        ManualColumnMove: PluginConstructor;
+        ManualColumnResize: PluginConstructor;
+        ManualRowMove: PluginConstructor;
+        ManualRowResize: PluginConstructor;
+        MultipleSelectionHandles: PluginConstructor;
+        NestedHeaders: PluginConstructor;
+        NestedRows: PluginConstructor;
+        ObserveChanges: PluginConstructor;
+        TouchScroll: PluginConstructor;
+        TrimRows: PluginConstructor;
+        registerPlugin(pluginName: string, PluginClass: PluginConstructor): void;
+    }
+
+    interface Hooks {
+        register(key: string): void;
+        run(instace: ht.Methods, hookName: string, key?: any, value?: any): any;
+    }
+
+    interface Dom {
+        addEvent(element: HTMLElement, eventName: string, callback: Function): void;
+        addClass(element: HTMLElement, className: string | string[]): void;
+        removeClass(element: HTMLElement, className: string | string[]): void;
+        offset(element: HTMLElement): any;
+        getWindowScrollLeft(): number;
+        getWindowScrollTop(): number;
+        outerHeight(element: HTMLElement): number;
+        hasClass(element: HTMLElement, className: string): boolean | undefined;
+    }
+
+    interface ArrayMapper {
+        clearMap(): void;
+        getIndexByValue(value: any): number;
+        getValueByIndex(index: number): any;
+        insertItems(index: number, amount?: number): number[];
+        removeItems(index: number | number[], amount?: number): number[];
+        unshiftItems(index: number | number[], amount?: number): void;
+        shiftItems(index: number, amount?: number): void;
+    }
+
+    interface Utils {
+        arrayMapper: ArrayMapper;
+    }
+
+    interface Helper {
+        arrayFilter(array: any[], predicate: Function): any[];
+        arrayEach(array: any[], predicate: Function): void;
+        arrayMap(array: any[], predicate: Function): any[];
+        arrayReduce(array: any[], predicate: Function, initialValue?: any): any;
+        objectEach(obj: any, predicate: Function): void;
+        rangeEach(rangeFrom: number, rangeTo: number | Function, iteratee?: Function): void;
+        mixin(Base: any, ...mixins: any[]): void;
+        isNumeric(number: any): boolean;
+        createSpreadsheetData(rows: number, columns: number): any;
+    }
+
+    type CellRenderer = (
+            instance: Methods,
+            td: HTMLTableCellElement,
+            row: number,
+            col: number,
+            prop: string,
+            value: any,
+            cellProperties: any) => void;
+
+    interface Editor {
+        open(): void;
+    }
+
+    interface EditorConstructor {
+        new (instance: Methods): Editor;
+    }
+
+    interface Editors {
+        TextEditor: EditorConstructor;
+    }
+
+    type Validator = (value: string, callback: (condition: boolean) => void) => void;
+
+    interface Renderers {
+        TextRenderer: CellRenderer;
+        NumericRenderer: CellRenderer;
+        AutocompleteRenderer: CellRenderer;
+    }
+
+    type AsyncAutocompleteSourceFunction = (query: string, process: (values: any[]) => void) => void;
+
+    interface AutocompleteColumn extends ColumnProperties {
+        source?: any[] | AsyncAutocompleteSourceFunction;
+        strict?: boolean;
+        trimDropdown?: boolean;
+    }
+
+    interface DateColumn extends ColumnProperties {
+        dateFormat?: string;
+        correctFormat?: boolean;
+    }
+
+    interface NumericColumn extends ColumnProperties {
+        format?: string;
+        language?: string;
+    }
+
+    interface CheckboxColumnLabel {
+        position?: 'before' | 'after';
+        property?: string;
+        value: string;
+    }
+
+    interface CheckboxColumn extends ColumnProperties {
+        checkedTemplate?: any;
+        uncheckedTemplate?: any;
+        label?: CheckboxColumnLabel;
+    }
+
+    type CellMetaFunction = (row: number, column: number, prop: string) => void;
+
+    type DropdownColumn = AutocompleteColumn;
 }
 
-
 declare var Handsontable: {
-  new (element: Element, options: ht.Options): ht.Methods;
-  renderers: {
-    TextRenderer(
-      instance: any,
-      td: HTMLTableCellElement,
-      row: number,
-      col: number,
-      prop: string,
-      value: any,
-      cellProperties: any): void;
-    NumericRenderer(
-      instance: any,
-      td: HTMLTableCellElement,
-      row: number,
-      col: number,
-      prop: string,
-      value: any,
-      cellProperties: any): void;
-  }
-  Dom: {
-    addEvent(element: HTMLElement, eventName: string, callback: Function): void;
-  }
+    new (element: Element, options: ht.Options): ht.Methods;
+    plugins: ht.Plugins;
+    hooks: ht.Hooks;
+    Dom: ht.Dom;
+    dom: ht.Dom;
+    helper: ht.Helper;
+    utils: ht.Utils;
+    renderers: ht.Renderers;
+    editors: ht.Editors;
 };
 
 declare module "handsontable" {
     export var Handsontable: {
       new (element: Element, options: ht.Options): ht.Methods;
+      plugins: ht.Plugins;
+      hooks: ht.Hooks;
+      Dom: ht.Dom;
+      dom: ht.Dom;
+      helper: ht.Helper;
+      utils: ht.Utils;
+      renderers: ht.Renderers;
+      editors: ht.Editors;
     };
 }
diff --git a/handsontable/tslint.json b/handsontable/tslint.json
new file mode 100644
index 0000000000..14c6526bd1
--- /dev/null
+++ b/handsontable/tslint.json
@@ -0,0 +1,7 @@
+{ 
+  "extends": "../tslint.json",
+  "rules": {
+    "forbidden-types": false,
+    "no-single-declare-module": false
+  }
+}
\ No newline at end of file
diff --git a/highcharts/index.d.ts b/highcharts/index.d.ts
index 58f2a97a5e..968b5975fb 100644
--- a/highcharts/index.d.ts
+++ b/highcharts/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Highcharts 4.2.7
+// Type definitions for Highcharts 4.2
 // Project: http://www.highcharts.com/
-// Definitions by: Damiano Gambarotto <http://github.com/damianog>, Dan Lewi Harkestad <http://github.com/baltie>
+// Definitions by: Damiano Gambarotto <http://github.com/damianog>, Dan Lewi Harkestad <http://github.com/baltie>, Albert Ozimek <https://github.com/AlbertOzimek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Highcharts {
@@ -799,7 +799,7 @@ declare namespace Highcharts {
              * @since 2.1.5
              */
             y?: number;
-        }
+        };
         /**
          * For datetime axes, this decides where to put the tick between weeks. 0 = Sunday, 1 = Monday.
          * @default 1
@@ -813,8 +813,8 @@ declare namespace Highcharts {
          */
         startOnTick?: boolean;
         /**
-         * Solid gauge series only. Color stops for the solid gauge. 
-         * Use this in cases where a linear gradient between a minColor and maxColor is not sufficient. 
+         * Solid gauge series only. Color stops for the solid gauge.
+         * Use this in cases where a linear gradient between a minColor and maxColor is not sufficient.
          * The stops is an array of tuples, where the first item is a float between 0 and 1 assigning the relative position in the gradient, and the second item is the color.
          */
         stops?: [number, string][];
@@ -2059,7 +2059,7 @@ declare namespace Highcharts {
              * @since 3.0.8
              */
             theme?: ButtonStatesTheme;
-        }
+        };
         /**
          * An array of series configurations for the drill down. Each series configuration uses the same syntax as the
          * series option set. These drilldown series are hidden by default. The drilldown series is linked to the parent
@@ -4585,7 +4585,7 @@ declare namespace Highcharts {
              * Options for the hovered series
              */
             hover?: BarStates;
-        }
+        };
     }
 
     interface LineChart extends SeriesChart {
@@ -4897,7 +4897,7 @@ declare namespace Highcharts {
              * Options for the hovered series
              */
             hover?: BarStates;
-        }
+        };
     }
 
     interface WaterFallChart extends BarChart {
diff --git a/highcharts/modules/map/index.d.ts b/highcharts/modules/map/index.d.ts
new file mode 100644
index 0000000000..9818729a62
--- /dev/null
+++ b/highcharts/modules/map/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for Highmaps 4.2.7
+// Project: http://www.highcharts.com/products/highmaps
+// Definitions by: Albert Ozimek <https://github.com/AlbertOzimek>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Static } from 'highcharts';
+
+declare module 'highcharts' {
+    export interface Static {
+        mapChart(renderTo: string | HTMLElement, options: Options, callback?: (chart: ChartObject) => void): ChartObject;
+    }
+}
+
diff --git a/highcharts/tsconfig.json b/highcharts/tsconfig.json
index 3526f42da7..93645d284b 100644
--- a/highcharts/tsconfig.json
+++ b/highcharts/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "files": [
         "index.d.ts",
+        "modules/map/index.d.ts",
         "modules/boost.d.ts",
         "modules/exporting.d.ts",
         "modules/no-data-to-display.d.ts",
@@ -32,4 +33,4 @@
         "test/no-data-to-display.ts",
         "test/offline-exporting.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/highcharts/tslint.json b/highcharts/tslint.json
new file mode 100644
index 0000000000..6fb4f705cf
--- /dev/null
+++ b/highcharts/tslint.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../tslint.json",
+  "rules": {
+    "forbidden-types": false,
+    "unified-signatures": false,
+    "array-type": false,
+    "no-empty-interface": false,
+    "dt-header": false
+  }
+}
diff --git a/history.js/index.d.ts b/history.js/index.d.ts
index 5a24bd5d73..13d66b8cf6 100644
--- a/history.js/index.d.ts
+++ b/history.js/index.d.ts
@@ -20,9 +20,11 @@ interface Historyjs {
 
     enabled: boolean;
 
-    pushState(data: any, title: string, url: string): void;
-    replaceState(data: any, title: string, url: string): void;
-    getState(): HistoryState;
+    pushState(data: any, title: string, url: string, queue?: boolean): boolean;
+    replaceState(data: any, title: string, url: string, queue?: boolean): boolean;
+    getState(friendly?: boolean, create?: boolean): HistoryState;
+    getStateId (passedState: HistoryState): string;
+    getStateById (id: string): HistoryState;
     getStateByIndex(index: number): HistoryState;
     getCurrentIndex(): number;
     getHash(): string;
@@ -37,12 +39,30 @@ interface Historyjs {
     debug(...messages: any[]): void;
 
     options: HistoryOptions;
+
+    /**
+     * History.setTitle(title)
+     * Applies the title to the document
+     * @param {HistoryState} newState
+     * @return {Boolean}
+     */
+    setTitle (newState: HistoryState): boolean
+    clearQueue(): Historyjs;
+    clearAllIntervals(): void;
+    getRootUrl(): string;
+
+    emulated: {
+        hashChange?: any;
+        pushState?: any;
+    }
 }
 
 interface HistoryState {
     data?: any;
     title?: string;
     url: string;
+    hashedUrl?: string;
+    cleanUrl?: string;
 }
 
 interface HistoryOptions {
@@ -56,6 +76,4 @@ interface HistoryOptions {
     initialTitle?: string;
     html4Mode?: boolean;
     delayInit?: number;
-
-
 }
diff --git a/htmlescape/htmlescape-tests.ts b/htmlescape/htmlescape-tests.ts
new file mode 100644
index 0000000000..c3e174787c
--- /dev/null
+++ b/htmlescape/htmlescape-tests.ts
@@ -0,0 +1,8 @@
+import * as htmlescape from "htmlescape";
+import { sanitize } from "htmlescape";
+
+// === '{"x":"a\\u0026\\u003c\\u003e\\u2028\\u2029"}'
+htmlescape({ x: "a&<>\u2028\u2029" });
+
+// === 'a&<>\\u2028\\u2029'
+sanitize("a&<>\u2028\u2029");
diff --git a/htmlescape/index.d.ts b/htmlescape/index.d.ts
new file mode 100644
index 0000000000..51d8eae58d
--- /dev/null
+++ b/htmlescape/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for htmlescape 1.1
+// Project: https://github.com/zertosh/htmlescape
+// Definitions by: bouzuya <http://bouzuya.net>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function htmlescape(o: any): string;
+declare namespace htmlescape {
+    export function sanitize(s: string): string;
+}
+
+export = htmlescape;
+export as namespace htmlescape;
diff --git a/htmlescape/tsconfig.json b/htmlescape/tsconfig.json
new file mode 100644
index 0000000000..6ba5d9819a
--- /dev/null
+++ b/htmlescape/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "htmlescape-tests.ts"
+    ]
+}
diff --git a/htmlescape/tslint.json b/htmlescape/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/htmlescape/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/http-errors/http-errors-tests.ts b/http-errors/http-errors-tests.ts
index e8c12126b4..51017828a1 100644
--- a/http-errors/http-errors-tests.ts
+++ b/http-errors/http-errors-tests.ts
@@ -83,3 +83,4 @@ var err = new createError.MisdirectedRequest();
 var err = new createError.MisdirectedRequest('Where should this go?');
 
 let error: createError.HttpError;
+console.log(error instanceof createError.HttpError);
diff --git a/http-errors/index.d.ts b/http-errors/index.d.ts
index 176703f23f..aff5b312dd 100644
--- a/http-errors/index.d.ts
+++ b/http-errors/index.d.ts
@@ -23,6 +23,8 @@ declare module 'http-errors' {
             [code: string]: new (msg?: string) => HttpError;
 
             (...args: Array<Error | string | number | Object>): HttpError;
+            
+            HttpError: HttpErrorConstructor;
 
             Continue: HttpErrorConstructor;
             SwitchingProtocols: HttpErrorConstructor;
diff --git a/hystrixjs/hystrixjs-tests.ts b/hystrixjs/hystrixjs-tests.ts
index b7f10a27d8..676015be06 100644
--- a/hystrixjs/hystrixjs-tests.ts
+++ b/hystrixjs/hystrixjs-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="q"/>
-
 import hystrixjs = require('hystrixjs');
 import q = require('q');
 
diff --git a/hystrixjs/index.d.ts b/hystrixjs/index.d.ts
index d4a738b999..39fef977e1 100644
--- a/hystrixjs/index.d.ts
+++ b/hystrixjs/index.d.ts
@@ -3,146 +3,141 @@
 // Definitions by: Igor Sechyn <https://github.com/igorsechyn/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="q"/>
-///<reference types="rx"/>
+import * as Q from "q";
+import * as RX from "rx";
 
-declare namespace HystrixJS {
+export as namespace hystrixjs;
+export as namespace HystrixJS;
 
-     interface HystrixProperties {
-        "hystrix.force.circuit.open"?: boolean,
-        "hystrix.force.circuit.closed"?: boolean,
-        "hystrix.circuit.sleepWindowInMilliseconds"?:number,
-        "hystrix.circuit.errorThresholdPercentage"?: number,
-        "hystrix.circuit.volumeThreshold"?:number,
-        "hystrix.circuit.volumeThreshold.forceOverride"?: boolean,
-        "hystrix.circuit.volumeThreshold.override"?: number,
-        "hystrix.execution.timeoutInMilliseconds"?: number,
-        "hystrix.metrics.statistical.window.timeInMilliseconds"?: number,
-        "hystrix.metrics.statistical.window.bucketsNumber"?: number,
-        "hystrix.metrics.percentile.window.timeInMilliseconds"?: number,
-        "hystrix.metrics.percentile.window.bucketsNumber"?: number,
-        "hystrix.request.volume.rejectionThreshold"?: number
-    }
-
-     interface HystrixConfig {
-        metricsPercentileWindowBuckets(): number;
-        circuitBreakerForceClosed(): boolean;
-        circuitBreakerForceOpened(): boolean;
-        circuitBreakerSleepWindowInMilliseconds(): number;
-        circuitBreakerErrorThresholdPercentage(): number;
-        circuitBreakerRequestVolumeThreshold(): number;
-        circuitBreakerRequestVolumeThresholdForceOverride(): boolean;
-        circuitBreakerRequestVolumeThresholdOverride(): number;
-        executionTimeoutInMilliseconds(): number;
-        metricsStatisticalWindowBuckets(): number;
-        metricsStatisticalWindowInMilliseconds(): number;
-        metricsPercentileWindowInMilliseconds(): number;
-        metricsPercentileWindowBuckets(): number;
-        requestVolumeRejectionThreshold(): number;
-        resetProperties(): void;
-        init(properties: HystrixProperties): void;
-    }
-
-     interface Command {
-        execute(...args: any[]): Q.Promise<any>;
-    }
-
-     interface CommandBuilder {
-        circuitBreakerSleepWindowInMilliseconds(value: number): CommandBuilder;
-        errorHandler(value: (error: any) => boolean): CommandBuilder;
-        timeout(value: number): CommandBuilder;
-        circuitBreakerRequestVolumeThreshold(value: number): CommandBuilder;
-        requestVolumeRejectionThreshold(value: number): CommandBuilder;
-        circuitBreakerForceOpened(value: boolean): CommandBuilder;
-        circuitBreakerForceClosed(value: boolean): CommandBuilder;
-        statisticalWindowNumberOfBuckets(value: number): CommandBuilder;
-        statisticalWindowLength(value: number): CommandBuilder;
-        percentileWindowNumberOfBuckets(value: number): CommandBuilder;
-        percentileWindowLength(value: number): CommandBuilder;
-        circuitBreakerErrorThresholdPercentage(value: number): CommandBuilder;
-        run(value: (args: any) => Q.Promise<any>): CommandBuilder;
-        fallbackTo(value: (...args: any[]) => Q.Promise<any>): CommandBuilder;
-        context(value: any): CommandBuilder;
-        build(): Command;
-    }
-
-     interface CommandFactory {
-        getOrCreate(commandKey: string, commandGroup?: string): CommandBuilder;
-        resetCache(): void;
-    }
-
-    interface HealthCounts {
-        totalCount: number;
-        errorCount: number;
-        errorPercentage: number;
-    }
-
-    interface CommandMetrics {
-        markSuccess(): void;
-        markRejected(): void;
-        markFailure(): void;
-        markTimeout(): void;
-        markShortCircuited(): void;
-        incrementExecutionCount(): void;
-        decrementExecutionCount(): void;
-        getCurrentExecutionCount(): number;
-        addExecutionTime(value: number): void;
-        getRollingCount(type: any): number;
-        getExecutionTime(percentile: any): number;
-        getHealthCounts(): HealthCounts;
-        reset(): void;
-    }
-
-    interface MetricsProperties {
-        commandKey: string,
-        commandGroup: string,
-        statisticalWindowTimeInMilliSeconds?: number,
-        statisticalWindowNumberOfBuckets?: number,
-        percentileWindowTimeInMilliSeconds?: number,
-        percentileWindowNumberOfBuckets?: number
-    }
-
-    interface MetricsFactory {
-        getOrCreate(config: MetricsProperties): CommandMetrics;
-        resetCache(): void;
-        getAllMetrics(): Array<CommandMetrics>;
-    }
-
-    interface CirctuiBreakerConfig {
-        circuitBreakerSleepWindowInMilliseconds: number,
-        commandKey: string,
-        circuitBreakerErrorThresholdPercentage: number,
-        circuitBreakerRequestVolumeThreshold: number,
-        commandGroup: string,
-        circuitBreakerForceClosed: boolean,
-        circuitBreakerForceOpened: boolean
-    }
-
-    interface CircuitBreaker {
-        allowRequest(): boolean;
-        allowSingleTest(): boolean;
-        isOpen(): boolean;
-        markSuccess(): void;
-    }
-
-    interface CircuitFactory {
-        getOrCreate(config: CirctuiBreakerConfig): CircuitBreaker;
-        getCache(): Array<CircuitBreaker>;
-        resetCache(): void;
-    }
-
-    interface HystrixSSEStream {
-        toObservable(): Rx.Observable<any>
-    }
+export interface HystrixProperties {
+    "hystrix.force.circuit.open"?: boolean,
+    "hystrix.force.circuit.closed"?: boolean,
+    "hystrix.circuit.sleepWindowInMilliseconds"?: number,
+    "hystrix.circuit.errorThresholdPercentage"?: number,
+    "hystrix.circuit.volumeThreshold"?: number,
+    "hystrix.circuit.volumeThreshold.forceOverride"?: boolean,
+    "hystrix.circuit.volumeThreshold.override"?: number,
+    "hystrix.execution.timeoutInMilliseconds"?: number,
+    "hystrix.metrics.statistical.window.timeInMilliseconds"?: number,
+    "hystrix.metrics.statistical.window.bucketsNumber"?: number,
+    "hystrix.metrics.percentile.window.timeInMilliseconds"?: number,
+    "hystrix.metrics.percentile.window.bucketsNumber"?: number,
+    "hystrix.request.volume.rejectionThreshold"?: number
 }
-declare var hystrixjs: {
-    commandFactory: HystrixJS.CommandFactory,
-    metricsFactory: HystrixJS.MetricsFactory,
-    circuitFactory: HystrixJS.CircuitFactory,
-    hystrixSSEStream: HystrixJS.HystrixSSEStream,
-    hystrixConfig: HystrixJS.HystrixConfig
-};
 
-declare module "hystrixjs" {
-    export = hystrixjs;
+export interface HystrixConfig {
+    metricsPercentileWindowBuckets(): number;
+    circuitBreakerForceClosed(): boolean;
+    circuitBreakerForceOpened(): boolean;
+    circuitBreakerSleepWindowInMilliseconds(): number;
+    circuitBreakerErrorThresholdPercentage(): number;
+    circuitBreakerRequestVolumeThreshold(): number;
+    circuitBreakerRequestVolumeThresholdForceOverride(): boolean;
+    circuitBreakerRequestVolumeThresholdOverride(): number;
+    executionTimeoutInMilliseconds(): number;
+    metricsStatisticalWindowBuckets(): number;
+    metricsStatisticalWindowInMilliseconds(): number;
+    metricsPercentileWindowInMilliseconds(): number;
+    metricsPercentileWindowBuckets(): number;
+    requestVolumeRejectionThreshold(): number;
+    resetProperties(): void;
+    init(properties: HystrixProperties): void;
 }
+
+export interface Command {
+    execute(...args: any[]): Q.Promise<any>;
+}
+
+export interface CommandBuilder {
+    circuitBreakerSleepWindowInMilliseconds(value: number): CommandBuilder;
+    errorHandler(value: (error: any) => boolean): CommandBuilder;
+    timeout(value: number): CommandBuilder;
+    circuitBreakerRequestVolumeThreshold(value: number): CommandBuilder;
+    requestVolumeRejectionThreshold(value: number): CommandBuilder;
+    circuitBreakerForceOpened(value: boolean): CommandBuilder;
+    circuitBreakerForceClosed(value: boolean): CommandBuilder;
+    statisticalWindowNumberOfBuckets(value: number): CommandBuilder;
+    statisticalWindowLength(value: number): CommandBuilder;
+    percentileWindowNumberOfBuckets(value: number): CommandBuilder;
+    percentileWindowLength(value: number): CommandBuilder;
+    circuitBreakerErrorThresholdPercentage(value: number): CommandBuilder;
+    run(value: (args: any) => Q.Promise<any>): CommandBuilder;
+    fallbackTo(value: (...args: any[]) => Q.Promise<any>): CommandBuilder;
+    context(value: any): CommandBuilder;
+    build(): Command;
+}
+
+export interface CommandFactory {
+    getOrCreate(commandKey: string, commandGroup?: string): CommandBuilder;
+    resetCache(): void;
+}
+
+export interface HealthCounts {
+    totalCount: number;
+    errorCount: number;
+    errorPercentage: number;
+}
+
+export interface CommandMetrics {
+    markSuccess(): void;
+    markRejected(): void;
+    markFailure(): void;
+    markTimeout(): void;
+    markShortCircuited(): void;
+    incrementExecutionCount(): void;
+    decrementExecutionCount(): void;
+    getCurrentExecutionCount(): number;
+    addExecutionTime(value: number): void;
+    getRollingCount(type: any): number;
+    getExecutionTime(percentile: any): number;
+    getHealthCounts(): HealthCounts;
+    reset(): void;
+}
+
+export interface MetricsProperties {
+    commandKey: string,
+    commandGroup: string,
+    statisticalWindowTimeInMilliSeconds?: number,
+    statisticalWindowNumberOfBuckets?: number,
+    percentileWindowTimeInMilliSeconds?: number,
+    percentileWindowNumberOfBuckets?: number
+}
+
+export interface MetricsFactory {
+    getOrCreate(config: MetricsProperties): CommandMetrics;
+    resetCache(): void;
+    getAllMetrics(): Array<CommandMetrics>;
+}
+
+export interface CirctuiBreakerConfig {
+    circuitBreakerSleepWindowInMilliseconds: number,
+    commandKey: string,
+    circuitBreakerErrorThresholdPercentage: number,
+    circuitBreakerRequestVolumeThreshold: number,
+    commandGroup: string,
+    circuitBreakerForceClosed: boolean,
+    circuitBreakerForceOpened: boolean
+}
+
+export interface CircuitBreaker {
+    allowRequest(): boolean;
+    allowSingleTest(): boolean;
+    isOpen(): boolean;
+    markSuccess(): void;
+}
+
+export interface CircuitFactory {
+    getOrCreate(config: CirctuiBreakerConfig): CircuitBreaker;
+    getCache(): Array<CircuitBreaker>;
+    resetCache(): void;
+}
+
+export interface HystrixSSEStream {
+    toObservable(): Rx.Observable<any>
+}
+
+export var commandFactory: CommandFactory;
+export var metricsFactory: MetricsFactory;
+export var circuitFactory: CircuitFactory;
+export var hystrixSSEStream: HystrixSSEStream;
+export var hystrixConfig: HystrixConfig;
\ No newline at end of file
diff --git a/hystrixjs/tsconfig.json b/hystrixjs/tsconfig.json
index c23c0c6875..e1cb1a7c4d 100644
--- a/hystrixjs/tsconfig.json
+++ b/hystrixjs/tsconfig.json
@@ -12,6 +12,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/i18next-browser-languagedetector/i18next-browser-languagedetector-tests.ts b/i18next-browser-languagedetector/i18next-browser-languagedetector-tests.ts
index bca7aee3b7..9f36a7d538 100644
--- a/i18next-browser-languagedetector/i18next-browser-languagedetector-tests.ts
+++ b/i18next-browser-languagedetector/i18next-browser-languagedetector-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="i18next" />
-
 import * as i18next from 'i18next';
 import LngDetector from 'i18next-browser-languagedetector';
 
diff --git a/i18next-xhr-backend/i18next-xhr-backend-tests.ts b/i18next-xhr-backend/i18next-xhr-backend-tests.ts
index b4e71467f1..9c12809271 100644
--- a/i18next-xhr-backend/i18next-xhr-backend-tests.ts
+++ b/i18next-xhr-backend/i18next-xhr-backend-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="i18next"/>
-/// <reference types="i18next-xhr-backend"/>
-
 import * as i18next from 'i18next';
 import XHR from 'i18next-xhr-backend';
 
diff --git a/ibm-mobilefirst/ibm-mobilefirst-tests.ts b/ibm-mobilefirst/ibm-mobilefirst-tests.ts
index 92dbee824d..498c9c3d7f 100644
--- a/ibm-mobilefirst/ibm-mobilefirst-tests.ts
+++ b/ibm-mobilefirst/ibm-mobilefirst-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery" />
-
 // Tests
 
 // Test WL.Client
@@ -126,7 +124,7 @@ WL.SimpleDialog.show(
             WL.Logger.debug("First button pressed");
         }
     }]);
-    
+
 // Test WL.TabBar
 // iOS
 var creditTab = WL.TabBar.addItem("CREDIT", function() {
diff --git a/imagemagick-native/imagemagick-native-tests.ts b/imagemagick-native/imagemagick-native-tests.ts
index c872634ab2..94d8fd05bb 100644
--- a/imagemagick-native/imagemagick-native-tests.ts
+++ b/imagemagick-native/imagemagick-native-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import imagemagick = require('imagemagick-native');
 import fs = require('fs');
 
diff --git a/imagemagick/imagemagick-tests.ts b/imagemagick/imagemagick-tests.ts
index 87ead6307a..5bc9d9cc93 100644
--- a/imagemagick/imagemagick-tests.ts
+++ b/imagemagick/imagemagick-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import imagemagick = require('imagemagick');
 import child_process = require('child_process');
 
diff --git a/intro.js/index.d.ts b/intro.js/index.d.ts
index d7893018c2..b0925cd41a 100644
--- a/intro.js/index.d.ts
+++ b/intro.js/index.d.ts
@@ -21,6 +21,8 @@ declare namespace IntroJs {
         prevLabel?: string;
         skipLabel?: string;
         doneLabel?: string;
+        hidePrev?: boolean;
+        hideNext?: boolean;
         tooltipPosition?: string;
         tooltipClass?: string;
         highlightClass?: string;
@@ -33,10 +35,12 @@ declare namespace IntroJs {
         showProgress?: boolean;
         scrollToElement?: boolean;
         overlayOpacity?: number;
+        scrollPadding?: number;
         positionPrecedence?: string[];
         disableInteraction?: boolean;
         hintPosition?: string;
         hintButtonLabel?: string;
+        hintAnimation?: boolean;
         steps?: Step[];
         hints?: Hint[];
     }
diff --git a/intro.js/intro.js-tests.ts b/intro.js/intro.js-tests.ts
index 0d79c1bd21..19267a94a3 100644
--- a/intro.js/intro.js-tests.ts
+++ b/intro.js/intro.js-tests.ts
@@ -8,6 +8,10 @@ intro.setOption('doneLabel', 'Next page');
 intro.setOption('overlayOpacity', 50);
 intro.setOption('showProgress', true);
 intro.setOptions({
+    hidePrev: true,
+    hideNext: false,
+    scrollPadding: 30,
+    hintAnimation: false,
     steps: [
         {
             intro: "Hello world!"
diff --git a/is-array/is-array-tests.ts b/is-array/is-array-tests.ts
index 9a8e252e05..327c2ea3d0 100644
--- a/is-array/is-array-tests.ts
+++ b/is-array/is-array-tests.ts
@@ -7,7 +7,7 @@ isArray(true);
 isArray([]);
 isArray({});
 
-var x = {}
+var x = {};
 if (isArray(x)) {
     x.push(0);
 }
diff --git a/jasmine-es6-promise-matchers/index.d.ts b/jasmine-es6-promise-matchers/index.d.ts
index 89e3146c2c..7d61d4d660 100644
--- a/jasmine-es6-promise-matchers/index.d.ts
+++ b/jasmine-es6-promise-matchers/index.d.ts
@@ -13,7 +13,7 @@ declare namespace JasminePromiseMatchers  {
 
 declare namespace jasmine {
 
-	interface Matchers {
+	interface Matchers<T> {
 		/**
 		 * Verifies that a Promise is (or has been) rejected.
 		 */
diff --git a/jasmine-expect/index.d.ts b/jasmine-expect/index.d.ts
index c2ee7e0ee5..ca5c2dbfc3 100644
--- a/jasmine-expect/index.d.ts
+++ b/jasmine-expect/index.d.ts
@@ -1,93 +1,154 @@
-// Type definitions for jasmine-expect 2.0
+// Type definitions for jasmine-expect 3.6.0
 // Project: https://github.com/JamieMason/Jasmine-Matchers
-// Definitions by: UserPixel <https://github.com/UserPixel>
+// Definitions by: GeneralCss <https://github.com/GeneralCss>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
 /// <reference types="jasmine" />
 
 declare namespace jasmine {
-  interface Matchers {
-    // These functions are written in the order defined in the src directory of jasmine-matchers
-    // The type system is used smartly whenever it can provide value (by looking at the code of every matcher)
-    toBeAfter(otherDate: Date): boolean; //
-    toBeArray(): boolean; //
-    toBeArrayOfBooleans(): boolean; //
-    toBeArrayOfNumbers(): boolean;
-    toBeArrayOfObjects(): boolean;
-    toBeArrayOfSize(size: number): boolean;
-    toBeArrayOfStrings(): boolean;
-    toBeBefore(otherDate: Date): boolean; //
-    toBeBoolean(): boolean;
-    toBeCalculable(): boolean;
-    toBeDate(): boolean;
-    toBeEmptyArray(): boolean;
-    toBeEmptyObject(): boolean;
-    toBeEmptyString(): boolean;
-    toBeEvenNumber(): boolean;
-    toBeFalse(): boolean;
-    toBeFunction(): boolean;
-    toBeHtmlString(): boolean;
-    toBeIso8601(): boolean;
-    toBeJsonString(): boolean;
-    toBeLongerThan(other: string): boolean;
-    toBeNonEmptyArray(): boolean;
-    toBeNonEmptyObject(): boolean;
-    toBeNonEmptyString(): boolean;
-    toBeNumber(): boolean;
-    toBeObject(): boolean;
-    toBeOddNumber(): boolean;
-    toBeSameLengthAs(other: string): boolean;
-    toBeShorterThan(other: string): boolean;
-    toBeString(): boolean;
-    toBeTrue(): boolean;
-    toBeWhitespace(): boolean;
-    toBeWholeNumber(): boolean;
-    toBeWithinRange(floor: number, ceiling: number): boolean;
+    interface Matchers<T> {
+        // toBe
+        toBeArray(): boolean;
+        toBeArrayOfBooleans(): boolean;
+        toBeArrayOfNumbers(): boolean;
+        toBeArrayOfObjects(): boolean;
+        toBeArrayOfSize(size: number): boolean;
+        toBeArrayOfStrings(): boolean;
+        toBeEmptyArray(): boolean;
+        toBeNonEmptyArray(): boolean;
 
-    toEndWith(subString: string): boolean;
+        // Booleans
+        toBeBoolean(): boolean;
+        toBeFalse(): boolean;
+        toBeTrue(): boolean;
 
-    toHaveArray(key: string): boolean;
-    toHaveArrayOfBooleans(key: string): boolean;
-    toHaveArrayOfNumbers(key: string): boolean;
-    toHaveArrayOfObjects(key: string): boolean;
-    toHaveArrayOfSize(key: string, size?: number): boolean;
-    toHaveArrayOfStrings(key: string): boolean;
-    toHaveBoolean(key: string): boolean;
-    toHaveCalculable(key: string): boolean;
-    toHaveDate(key: string): boolean;
-    toHaveDateAfter(key: string, otherDate: Date): boolean;
-    toHaveDateBefore(key: string, otherDate: Date): boolean;
-    toHaveEmptyArray(key: string): boolean;
-    toHaveEmptyObject(key: string): boolean;
-    toHaveEmptyString(key: string): boolean;
-    toHaveEvenNumber(key: string): boolean;
-    toHaveFalse(key: string): boolean;
-    toHaveHtmlString(key: string): boolean;
-    toHaveIso8601(key: string): boolean;
-    toHaveJsonString(key: string): boolean;
-    toHaveMember(key: string): boolean;
-    toHaveMethod(key: string): boolean;
-    toHaveNonEmptyArray(key: string): boolean;
-    toHaveNonEmptyObject(key: string): boolean;
-    toHaveNonEmptyString(key: string): boolean;
-    toHaveNumber(key: string): boolean;
-    toHaveNumberWithinRange(key: string, floor: number, ceiling: number): boolean;
-    toHaveObject(key: string): boolean;
-    toHaveOddNumber(key: string): boolean;
-    toHaveString(key: string): boolean;
-    toHaveStringLongerThan(key: string, other: string): boolean;
-    toHaveStringSameLengthAs(key: string, other: string): boolean;
-    toHaveStringShorterThan(key: string, other: string): boolean;
-    toHaveTrue(key: string): boolean;
-    toHaveWhitespaceString(key: string): boolean;
-    toHaveWholeNumber(key: string): boolean;
+        // Dates
+        toBeAfter(date: Date): boolean
+        toBeBefore(date: Date): boolean
+        toBeDate(): boolean;
+        toBeValidDate(): boolean;
 
-    toImplement(api: {}): boolean;
+        // Functions
+        toBeFunction(): boolean;
+        toThrowAnyError(): boolean;
+        toThrowErrorOfType(constructorName: string): boolean
 
-    toStartWith(subString: string): boolean;
+        // Numbers
+        toBeCalculable(): boolean;
+        toBeEvenNumber(): boolean;
+        toBeGreaterThanOrEqualTo(number: number): boolean;
+        toBeLessThanOrEqualTo(number: number): boolean;
+        toBeNear(number: number, epsilon: number): boolean;
+        toBeNumber(): boolean;
+        toBeOddNumber(): boolean
+        toBeWholeNumber(): boolean;
+        toBeWithinRange(floor: number, ceiling: number): boolean;
 
-    toThrowAnyError(): boolean;
-    toThrowErrorOfType(type: string): boolean;
-  }
+        // Strings
+        toBeEmptyString(): boolean;
+        toBeHtmlString(): boolean;
+        toBeIso8601(): boolean;
+        toBeJsonString(): boolean;
+        toBeLongerThan(string: string): boolean;
+        toBeNonEmptyString(): boolean;
+        toBeSameLengthAs(string: string): boolean;
+        toBeShorterThan(string: string): boolean;
+        toBeString(): boolean;
+        toBeWhitespace(): boolean;
+        toEndWith(string: string): boolean;
+        toStartWith(string: string): boolean;
+
+        // Objects
+        toBeEmptyObject(): boolean;
+        toBeNonEmptyObject(): boolean;
+        toBeObject(): boolean;
+
+        // Regular Expression
+        toBeRegExp(): boolean;
+
+        // Members, Properties, Methods
+        toHaveArray(memberName: string): boolean;
+        toHaveArrayOfBooleans(memberName: string): boolean;
+        toHaveArrayOfNumbers(memberName: string): boolean;
+        toHaveArrayOfObjects(memberName: string): boolean;
+        toHaveArrayOfSize(memberName: string, size: number): boolean;
+        toHaveArrayOfStrings(memberName: string): boolean;
+        toHaveBoolean(memberName: string): boolean;
+        toHaveCalculable(memberName: string): boolean;
+        toHaveDate(memberName: string): boolean;
+        toHaveDateAfter(memberName: string, date: Date): boolean;
+        toHaveDateBefore(memberName: string, date: Date): boolean;
+        toHaveEmptyArray(memberName: string): boolean;
+        toHaveEmptyObject(memberName: string): boolean;
+        toHaveEmptyString(memberName: string): boolean;
+        toHaveEvenNumber(memberName: string): boolean;
+        toHaveFalse(memberName: string): boolean;
+        toHaveHtmlString(memberName: string): boolean;
+        toHaveIso8601(memberName: string): boolean;
+        toHaveJsonString(memberName: string): boolean;
+        toHaveMember(memberName: string): boolean;
+        toHaveMethod(memberName: string): boolean;
+        toHaveNonEmptyArray(memberName: string): boolean;
+        toHaveNonEmptyObject(memberName: string): boolean;
+        toHaveNonEmptyString(memberName: string): boolean;
+        toHaveNumber(memberName: string): boolean;
+        toHaveNumberWithinRange(memberName: string, floor: number, ceiling: number): boolean;
+        toHaveObject(memberName: string): boolean;
+        toHaveOddNumber(memberName: string): boolean;
+        toHaveString(memberName: string): boolean;
+        toHaveStringLongerThan(memberName: string, string: string): boolean;
+        toHaveStringSameLengthAs(memberName: string, string: string): boolean;
+        toHaveStringShorterThan(memberName: string, string: string): boolean;
+        toHaveTrue(memberName: string): boolean;
+        toHaveUndefined(memberName: string): boolean;
+        toHaveWhitespaceString(memberName: string): boolean;
+        toHaveWholeNumber(memberName: string): boolean;
+    }
+
+    interface AssymetricMatchers {
+
+      // Arrays
+      arrayOfBooleans(): boolean;
+      arrayOfNumbers(): boolean;
+      arrayOfObjects(): boolean;
+      arrayOfSize(number: number): boolean;
+      arrayOfStrings(): boolean;
+      emptyArray(): boolean;
+      nonEmptyArray(): boolean;
+
+      // Dates
+      after(date: Date): boolean;
+      before(date: Date): boolean;
+
+      // Numbers
+      calculable(): boolean;
+      evenNumber(): boolean;
+      greaterThanOrEqualTo(number: number): boolean;
+      lessThanOrEqualTo(number: number): boolean;
+      oddNumber(): boolean;
+      wholeNumber(): boolean;
+      withinRange(floor: number, ceiling: number): boolean;
+
+      // Strings
+      endingWith(string: string): boolean;
+      iso8601(): boolean;
+      jsonString(): boolean;
+      longerThan(string: string): boolean;
+      nonEmptyString(string: string): boolean;
+      sameLengthAs(string: string): boolean;
+      shorterThan(string: string): boolean;
+      startingWith(string: string): boolean;
+      whitespace(): boolean;
+
+      //Objects
+      emptyObject(): boolean;
+      nonEmptyObject(): boolean;
+
+      // Regular expressions
+      regExp(): boolean;
+    }
 }
+
+declare var any: jasmine.AssymetricMatchers;
+
diff --git a/jasmine-expect/jasmine-expect-tests.ts b/jasmine-expect/jasmine-expect-tests.ts
index 7753cc7381..4a8cbb3855 100644
--- a/jasmine-expect/jasmine-expect-tests.ts
+++ b/jasmine-expect/jasmine-expect-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jasmine" />
-
-
 // Taken directly from the test directory of the original repo
 
 declare var describeWhenNotArray: (arr: string) => void;
@@ -873,9 +870,11 @@ describe('toHaveArrayOfSize', function() {
   describeToHaveArrayX('toHaveArrayOfSize', function() {
     describe('when number of expected items does not match', function() {
       it('should deny', function() {
-        expect({
+        var xpToFail = <any>expect;
+        xpToFail({
           memberName: ''
         }).not.toHaveArrayOfSize('memberName');
+
         expect({
           memberName: ['bar']
         }).not.toHaveArrayOfSize('memberName', 0);
@@ -1877,40 +1876,6 @@ describe('toHaveWholeNumber', function() {
   });
 });
 
-describe('toImplement', function() {
-  describe('when invoked', function() {
-    describe('when subject IS an Object containing all of the supplied members', function() {
-      it('should confirm', function() {
-        expect({
-          a: 1,
-          b: 2
-        }).toImplement({
-          a: 1,
-          b: 2
-        });
-        expect({
-          a: 1,
-          b: 2
-        }).toImplement({
-          a: 1
-        });
-      });
-    });
-    describe('when subject is NOT an Object containing all of the supplied members', function() {
-      it('should deny', function() {
-        expect({
-          a: 1
-        }).not.toImplement({
-          c: 3
-        });
-        expect(null).not.toImplement({
-          a: 1
-        });
-      });
-    });
-  });
-});
-
 describe('toStartWith', function() {
   describe('when invoked', function() {
     describe('when subject is NOT an undefined or empty string', function() {
diff --git a/jasmine-jquery/index.d.ts b/jasmine-jquery/index.d.ts
index fb91e0c37b..14eb26b380 100644
--- a/jasmine-jquery/index.d.ts
+++ b/jasmine-jquery/index.d.ts
@@ -81,7 +81,7 @@ declare namespace jasmine {
         proxyCallTo_(methodName: string, passedArguments: any): any;
     }
 
-    interface Matchers {
+    interface Matchers<T> {
         /**
          * Check if DOM element has class.
          *
@@ -232,7 +232,7 @@ declare namespace jasmine {
          *
          */
         toHaveData(key : string, expectedValue : string): boolean;
-        toBe(selector: JQuery): boolean;
+        toBe(selector: T): boolean;
 
         /**
          * Check if DOM element is matched by the given selector.
@@ -241,7 +241,7 @@ declare namespace jasmine {
          * // returns true
          * expect($('<div><span class="some-class"></span></div>')).toContain('some-class')
          */
-        toContain(selector: JQuery): boolean;
+        toContain(selector: any): boolean;
 
         /**
          * Check if DOM element exists inside the given parent element.
diff --git a/jasmine-jquery/jasmine-jquery-tests.ts b/jasmine-jquery/jasmine-jquery-tests.ts
index 67b349d45e..440dff1b6c 100644
--- a/jasmine-jquery/jasmine-jquery-tests.ts
+++ b/jasmine-jquery/jasmine-jquery-tests.ts
@@ -1,18 +1,15 @@
-/// <reference types="jasmine" />
-/// <reference types="jquery" />
-
-
 describe("Jasmine jQuery extension", () => {
     it("Adds jQuery matchers", () => {
-        expect($('<div id="some-id"></div>')).toBe('div');
-        expect($('<div id="some-id"></div>')).toBe('div#some-id');
+        expect($('<div id="some-id"></div>')).toBe($('div'));
+        expect($('<div id="some-id"></div>')).toBe($('div#some-id'));
         expect($('<input type="checkbox" checked="checked"/>')).toBeChecked();
         expect($('<div id="some-id"></div>')).toBeHidden();
         expect($('<div style="display: none; margin: 10px;"></div>')).toHaveCss({ display: "none", margin: "10px" });
         expect($('<div style="display: none; margin: 10px;"></div>')).toHaveCss({ margin: "10px" });
         expect($('<option selected="selected"></option>')).toBeSelected();
         expect($('<div id="some-id"></div>')).toBeVisible();
-        expect($('<div><span class="some-class"></span></div>')).toContain('span.some-class');
+        // NOTE: It is now necessary to explicitly add the generic parameter when using `toContain`
+        expect<JQuery>($('<div><span class="some-class"></span></div>')).toContain('span.some-class');
         expect($('<span></span>').addClass('js-something')).toBeMatchedBy('.js-something');
         expect($('<span></span>')).toExist();
         expect($('<div id="some-id"></div>')).toHaveAttr('id', 'some-id');
diff --git a/jasmine-matchers/index.d.ts b/jasmine-matchers/index.d.ts
index ac44d25c1c..d4cad3b77c 100644
--- a/jasmine-matchers/index.d.ts
+++ b/jasmine-matchers/index.d.ts
@@ -23,7 +23,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 /// <reference types="jasmine" />
 
 declare namespace jasmine {
-    interface Matchers {
+    interface Matchers<T> {
 
         //toBe
         toBeArray(): boolean;
diff --git a/jasmine-matchers/jasmine-matchers-tests.ts b/jasmine-matchers/jasmine-matchers-tests.ts
index dc92e809dc..4ef032062d 100644
--- a/jasmine-matchers/jasmine-matchers-tests.ts
+++ b/jasmine-matchers/jasmine-matchers-tests.ts
@@ -14,9 +14,6 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-/// <reference types="jasmine" />
-
-
 describe('toBeArray', function () {
     describe('matches', function () {
         it('should pass for []', function () {
diff --git a/jasmine-promise-matchers/index.d.ts b/jasmine-promise-matchers/index.d.ts
index c511019b62..ffe4f65142 100644
--- a/jasmine-promise-matchers/index.d.ts
+++ b/jasmine-promise-matchers/index.d.ts
@@ -10,7 +10,7 @@ declare function installPromiseMatchers(): void;
 
 declare namespace jasmine {
 
-	interface Matchers {
+	interface Matchers <T>{
 		/**
 		 * Verifies that a Promise is (or has been) rejected.
 		 */
diff --git a/jasmine/index.d.ts b/jasmine/index.d.ts
index c0db55d100..caa1d12635 100644
--- a/jasmine/index.d.ts
+++ b/jasmine/index.d.ts
@@ -24,8 +24,9 @@ declare function afterEach(action: (done: DoneFn) => void, timeout?: number): vo
 declare function beforeAll(action: (done: DoneFn) => void, timeout?: number): void;
 declare function afterAll(action: (done: DoneFn) => void, timeout?: number): void;
 
-declare function expect(spy: Function): jasmine.Matchers;
-declare function expect(actual: any): jasmine.Matchers;
+declare function expect(spy: Function): jasmine.Matchers<any>;
+declare function expect<T>(actual: ArrayLike<T>): jasmine.ArrayLikeMatchers<T>;
+declare function expect<T>(actual: T): jasmine.Matchers<T>;
 
 declare function fail(e?: any): void;
 /** Action method that should be called when the async work is complete */
@@ -45,23 +46,33 @@ declare function waitsFor(latchMethod: () => boolean, failureMessage?: string, t
 declare function waits(timeout?: number): void;
 
 declare namespace jasmine {
+    type Expected<T> = T | ObjectContaining<T> | Any | Spy;
 
     var clock: () => Clock;
 
     function any(aclass: any): Any;
+
     function anything(): Any;
+
     function arrayContaining(sample: any[]): ArrayContaining;
-    function objectContaining(sample: any): ObjectContaining;
+    function objectContaining<T>(sample: Partial<T>): ObjectContaining<T>;
     function createSpy(name: string, originalFn?: Function): Spy;
+
     function createSpyObj(baseName: string, methodNames: any[]): any;
     function createSpyObj<T>(baseName: string, methodNames: any[]): T;
+
     function pp(value: any): string;
+
     function getEnv(): Env;
+
     function addCustomEqualityTester(equalityTester: CustomEqualityTester): void;
+
     function addMatchers(matchers: CustomMatcherFactories): void;
+
     function stringMatching(str: string): Any;
     function stringMatching(str: RegExp): Any;
-    function formatErrorMsg(domain: string, usage: string) : (msg: string) => string
+
+    function formatErrorMsg(domain: string, usage: string): (msg: string) => string;
 
     interface Any {
 
@@ -84,8 +95,8 @@ declare namespace jasmine {
         jasmineToString(): string;
     }
 
-    interface ObjectContaining {
-        new (sample: any): any;
+    interface ObjectContaining<T> {
+        new (sample: Partial<T>): Partial<T>;
 
         jasmineMatches(other: any, mismatchKeys: any[], mismatchValues: any[]): boolean;
         jasmineToString(): string;
@@ -115,18 +126,14 @@ declare namespace jasmine {
         withMock(func: () => void): void;
     }
 
-    interface CustomEqualityTester {
-        (first: any, second: any): boolean;
-    }
+    type CustomEqualityTester = (first: any, second: any) => boolean;
 
     interface CustomMatcher {
         compare<T>(actual: T, expected: T): CustomMatcherResult;
         compare(actual: any, expected: any): CustomMatcherResult;
     }
 
-    interface CustomMatcherFactory {
-        (util: MatchersUtil, customEqualityTesters: Array<CustomEqualityTester>): CustomMatcher;
-    }
+    type CustomMatcherFactory = (util: MatchersUtil, customEqualityTesters: CustomEqualityTester[]) => CustomMatcher;
 
     interface CustomMatcherFactories {
         [index: string]: CustomMatcherFactory;
@@ -138,9 +145,9 @@ declare namespace jasmine {
     }
 
     interface MatchersUtil {
-        equals(a: any, b: any, customTesters?: Array<CustomEqualityTester>): boolean;
-        contains<T>(haystack: ArrayLike<T> | string, needle: any, customTesters?: Array<CustomEqualityTester>): boolean;
-        buildFailureMessage(matcherName: string, isNot: boolean, actual: any, ...expected: Array<any>): string;
+        equals(a: any, b: any, customTesters?: CustomEqualityTester[]): boolean;
+        contains<T>(haystack: ArrayLike<T> | string, needle: any, customTesters?: CustomEqualityTester[]): boolean;
+        buildFailureMessage(matcherName: string, isNot: boolean, actual: any, ...expected: any[]): string;
     }
 
     interface Env {
@@ -152,7 +159,7 @@ declare namespace jasmine {
 
         currentSpec: Spec;
 
-        matchersClass: Matchers;
+        matchersClass: Matchers<any>;
 
         version(): any;
         versionString(): string;
@@ -226,12 +233,12 @@ declare namespace jasmine {
         passed(): boolean;
     }
 
-    interface MessageResult extends Result  {
+    interface MessageResult extends Result {
         values: any;
         trace: Trace;
     }
 
-    interface ExpectationResult extends Result  {
+    interface ExpectationResult extends Result {
         matcherName: string;
         passed(): boolean;
         expected: any;
@@ -244,12 +251,13 @@ declare namespace jasmine {
         new (options: {random: boolean, seed: string}): any;
         random: boolean;
         seed: string;
-        sort<T>(items: T[]) : T[];
+        sort<T>(items: T[]): T[];
     }
 
     namespace errors {
         class ExpectationFailed extends Error {
             constructor();
+
             stack: any;
         }
     }
@@ -257,7 +265,7 @@ declare namespace jasmine {
     interface TreeProcessor {
         new (attrs: any): any;
         execute: (done: Function) => void;
-        processTree() : any;
+        processTree(): any;
     }
 
     interface Trace {
@@ -303,18 +311,18 @@ declare namespace jasmine {
         results(): NestedResults;
     }
 
-    interface Matchers {
+    interface Matchers<T> {
 
-        new (env: Env, actual: any, spec: Env, isNot?: boolean): any;
+        new (env: Env, actual: T, spec: Env, isNot?: boolean): any;
 
         env: Env;
-        actual: any;
+        actual: T;
         spec: Env;
         isNot?: boolean;
         message(): any;
 
-        toBe(expected: any, expectationFailOutput?: any): boolean;
-        toEqual(expected: any, expectationFailOutput?: any): boolean;
+        toBe(expected: Expected<T>, expectationFailOutput?: any): boolean;
+        toEqual(expected: Expected<T>, expectationFailOutput?: any): boolean;
         toMatch(expected: string | RegExp, expectationFailOutput?: any): boolean;
         toBeDefined(expectationFailOutput?: any): boolean;
         toBeUndefined(expectationFailOutput?: any): boolean;
@@ -334,11 +342,18 @@ declare namespace jasmine {
         toThrow(expected?: any): boolean;
         toThrowError(message?: string | RegExp): boolean;
         toThrowError(expected?: new (...args: any[]) => Error, message?: string | RegExp): boolean;
-        not: Matchers;
+        not: Matchers<T>;
 
         Any: Any;
     }
 
+    interface ArrayLikeMatchers<T> extends Matchers<ArrayLike<T>> {
+        toBe(expected: Expected<ArrayLike<T>>, expectationFailOutput?: any): boolean;
+        toEqual(expected: Expected<ArrayLike<T>>, expectationFailOutput?: any): boolean;
+        toContain(expected: T, expectationFailOutput?: any): boolean;
+        not: ArrayLikeMatchers<T>;
+    }
+
     interface Reporter {
         reportRunnerStarting(runner: Runner): void;
         reportRunnerResults(runner: Runner): void;
@@ -373,18 +388,18 @@ declare namespace jasmine {
     }
 
     interface CustomReporterResult {
-        description: string,
-        failedExpectations?: FailedExpectation[],
-        fullName: string,
+        description: string;
+        failedExpectations?: FailedExpectation[];
+        fullName: string;
         id: string;
-        passedExpectations?: PassedExpectation[],
+        passedExpectations?: PassedExpectation[];
         pendingReason?: string;
         status?: string;
     }
 
     interface RunDetails {
         failedExpectations: ExpectationResult[];
-        order: jasmine.Order
+        order: jasmine.Order;
     }
 
     interface CustomReporter {
@@ -414,9 +429,7 @@ declare namespace jasmine {
         results(): NestedResults;
     }
 
-    interface SpecFunction {
-        (spec?: Spec): void;
-    }
+    type SpecFunction = (spec?: Spec) => void;
 
     interface SuiteOrSpec {
         id: number;
@@ -435,7 +448,7 @@ declare namespace jasmine {
         spies_: Spy[];
 
         results_: NestedResults;
-        matchersClass: Matchers;
+        matchersClass: Matchers<any>;
 
         getFullName(): string;
         results(): NestedResults;
@@ -448,7 +461,7 @@ declare namespace jasmine {
         waits(timeout: number): Spec;
         waitsFor(latchFunction: SpecFunction, timeoutMessage?: string, timeout?: number): Spec;
         fail(e?: any): void;
-        getMatchersClass_(): Matchers;
+        getMatchersClass_(): Matchers<any>;
         addMatchers(matchersPrototype: CustomMatcherFactories): void;
         finishCallback(): void;
         finish(onComplete?: () => void): void;
@@ -497,7 +510,7 @@ declare namespace jasmine {
         identity: string;
         and: SpyAnd;
         calls: Calls;
-        mostRecentCall: { args: any[]; };
+        mostRecentCall: {args: any[]; };
         argsForCall: any[];
     }
 
@@ -558,7 +571,7 @@ declare namespace jasmine {
         finished: boolean;
         result: any;
         messages: any;
-        runDetails: RunDetails
+        runDetails: RunDetails;
 
         new (): any;
 
diff --git a/jasmine/jasmine-tests.ts b/jasmine/jasmine-tests.ts
index 4632eb8b4c..1c9d5366e1 100644
--- a/jasmine/jasmine-tests.ts
+++ b/jasmine/jasmine-tests.ts
@@ -1,34 +1,34 @@
 // tests based on http://jasmine.github.io/2.2/introduction.html
 
-describe("A suite", function () {
-    it("contains spec with an expectation", function () {
+describe("A suite", () => {
+    it("contains spec with an expectation", () => {
         expect(true).toBe(true);
     });
 });
 
-describe("A suite is just a function", function () {
+describe("A suite is just a function", () => {
     var a: boolean;
 
-    it("and so is a spec", function () {
+    it("and so is a spec", () => {
         a = true;
         expect(a).toBe(true);
     });
 });
 
-describe("The 'toBe' matcher compares with ===", function () {
+describe("The 'toBe' matcher compares with ===", () => {
 
-    it("and has a positive case", function () {
+    it("and has a positive case", () => {
         expect(true).toBe(true);
     });
 
-    it("and can have a negative case", function () {
+    it("and can have a negative case", () => {
         expect(false).not.toBe(true);
     });
 });
 
-describe("Included matchers:", function () {
+describe("Included matchers:", () => {
 
-    it("The 'toBe' matcher compares with ===", function () {
+    it("The 'toBe' matcher compares with ===", () => {
         var a = 12;
         var b = a;
 
@@ -36,14 +36,14 @@ describe("Included matchers:", function () {
         expect(a).not.toBe(null);
     });
 
-    describe("The 'toEqual' matcher", function () {
+    describe("The 'toEqual' matcher", () => {
 
-        it("works for simple literals and variables", function () {
+        it("works for simple literals and variables", () => {
             var a = 12;
             expect(a).toEqual(12);
         });
 
-        it("should work for objects", function () {
+        it("should work for objects", () => {
             var foo = {
                 a: 12,
                 b: 34
@@ -56,7 +56,7 @@ describe("Included matchers:", function () {
         });
     });
 
-    it("The 'toMatch' matcher is for regular expressions", function () {
+    it("The 'toMatch' matcher is for regular expressions", () => {
         var message = "foo bar baz";
 
         expect(message).toMatch(/bar/);
@@ -64,25 +64,25 @@ describe("Included matchers:", function () {
         expect(message).not.toMatch(/quux/);
     });
 
-    it("The 'toBeDefined' matcher compares against `undefined`", function () {
+    it("The 'toBeDefined' matcher compares against `undefined`", () => {
         var a = {
             foo: "foo"
         };
 
         expect(a.foo).toBeDefined();
-        expect((<any>a).bar).not.toBeDefined();
+        expect((a as any).bar).not.toBeDefined();
     });
 
-    it("The `toBeUndefined` matcher compares against `undefined`", function () {
+    it("The `toBeUndefined` matcher compares against `undefined`", () => {
         var a = {
             foo: "foo"
         };
 
         expect(a.foo).not.toBeUndefined();
-        expect((<any>a).bar).toBeUndefined();
+        expect((a as any).bar).toBeUndefined();
     });
 
-    it("The 'toBeNull' matcher compares against null", function () {
+    it("The 'toBeNull' matcher compares against null", () => {
         var a: string = null;
         var foo = "foo";
 
@@ -91,28 +91,28 @@ describe("Included matchers:", function () {
         expect(foo).not.toBeNull();
     });
 
-    it("The 'toBeTruthy' matcher is for boolean casting testing", function () {
+    it("The 'toBeTruthy' matcher is for boolean casting testing", () => {
         var a: string, foo = "foo";
 
         expect(foo).toBeTruthy();
         expect(a).not.toBeTruthy();
     });
 
-    it("The 'toBeFalsy' matcher is for boolean casting testing", function () {
+    it("The 'toBeFalsy' matcher is for boolean casting testing", () => {
         var a: string, foo = "foo";
 
         expect(a).toBeFalsy();
         expect(foo).not.toBeFalsy();
     });
 
-    it("The 'toContain' matcher is for finding an item in an Array", function () {
+    it("The 'toContain' matcher is for finding an item in an Array", () => {
         var a = ["foo", "bar", "baz"];
 
-        expect(a).toContain("bar");
+        expect(a).toContain('foo');
         expect(a).not.toContain("quux");
     });
 
-    it("The 'toBeLessThan' matcher is for mathematical comparisons", function () {
+    it("The 'toBeLessThan' matcher is for mathematical comparisons", () => {
         var pi = 3.1415926,
             e = 2.78;
 
@@ -120,7 +120,7 @@ describe("Included matchers:", function () {
         expect(pi).not.toBeLessThan(e);
     });
 
-    it("The 'toBeGreaterThan' is for mathematical comparisons", function () {
+    it("The 'toBeGreaterThan' is for mathematical comparisons", () => {
         var pi = 3.1415926,
             e = 2.78;
 
@@ -128,7 +128,7 @@ describe("Included matchers:", function () {
         expect(e).not.toBeGreaterThan(pi);
     });
 
-    it("The 'toBeCloseTo' matcher is for precision math comparison", function () {
+    it("The 'toBeCloseTo' matcher is for precision math comparison", () => {
         var pi = 3.1415926,
             e = 2.78;
 
@@ -136,12 +136,12 @@ describe("Included matchers:", function () {
         expect(pi).toBeCloseTo(e, 0);
     });
 
-    it("The 'toThrow' matcher is for testing if a function throws an exception", function () {
-        var foo = function () {
+    it("The 'toThrow' matcher is for testing if a function throws an exception", () => {
+        var foo = () => {
             return 1 + 2;
         };
-        var bar = function () {
-            var a: any = undefined;
+        var bar = () => {
+            var a: any;
             return a + 1;
         };
 
@@ -149,8 +149,8 @@ describe("Included matchers:", function () {
         expect(bar).toThrow();
     });
 
-    it("The 'toThrowError' matcher is for testing a specific thrown exception", function() {
-        var foo = function() {
+    it("The 'toThrowError' matcher is for testing a specific thrown exception", () => {
+        var foo = () => {
             throw new TypeError("foo bar baz");
         };
 
@@ -161,15 +161,15 @@ describe("Included matchers:", function () {
     });
 });
 
-describe("A spec", function () {
-    it("is just a function, so it can contain any code", function () {
+describe("A spec", () => {
+    it("is just a function, so it can contain any code", () => {
         var foo = 0;
         foo += 1;
 
         expect(foo).toEqual(1);
     });
 
-    it("can have more than one expectation", function () {
+    it("can have more than one expectation", () => {
         var foo = 0;
         foo += 1;
 
@@ -178,96 +178,96 @@ describe("A spec", function () {
     });
 });
 
-describe("A spec (with setup and tear-down)", function () {
+describe("A spec (with setup and tear-down)", () => {
     var foo: number;
 
-    beforeEach(function () {
+    beforeEach(() => {
         foo = 0;
         foo += 1;
     });
 
-    afterEach(function () {
+    afterEach(() => {
         foo = 0;
     });
 
-    it("is just a function, so it can contain any code", function () {
+    it("is just a function, so it can contain any code", () => {
         expect(foo).toEqual(1);
     });
 
-    it("can have more than one expectation", function () {
+    it("can have more than one expectation", () => {
         expect(foo).toEqual(1);
         expect(true).toEqual(true);
     });
 });
 
-describe("A spec", function () {
+describe("A spec", () => {
     var foo: number;
 
-    beforeEach(function () {
+    beforeEach(() => {
         foo = 0;
         foo += 1;
     });
 
-    afterEach(function () {
+    afterEach(() => {
         foo = 0;
     });
 
-    it("is just a function, so it can contain any code", function () {
+    it("is just a function, so it can contain any code", () => {
         expect(foo).toEqual(1);
     });
 
-    it("can have more than one expectation", function () {
+    it("can have more than one expectation", () => {
         expect(foo).toEqual(1);
         expect(true).toEqual(true);
     });
 
-    describe("nested inside a second describe", function () {
+    describe("nested inside a second describe", () => {
         var bar: number;
 
-        beforeEach(function () {
+        beforeEach(() => {
             bar = 1;
         });
 
-        it("can reference both scopes as needed", function () {
+        it("can reference both scopes as needed", () => {
             expect(foo).toEqual(bar);
         });
     });
 });
 
-xdescribe("A spec", function () {
+xdescribe("A spec", () => {
     var foo: number;
 
-    beforeEach(function () {
+    beforeEach(() => {
         foo = 0;
         foo += 1;
     });
 
-    it("is just a function, so it can contain any code", function () {
+    it("is just a function, so it can contain any code", () => {
         expect(foo).toEqual(1);
     });
 });
 
-describe("Pending specs", function () {
+describe("Pending specs", () => {
 
-    xit("can be declared 'xit'", function () {
+    xit("can be declared 'xit'", () => {
         expect(true).toBe(false);
     });
 
     it("can be declared with 'it' but without a function");
 
-    it("can be declared by calling 'pending' in the spec body", function () {
+    it("can be declared by calling 'pending' in the spec body", () => {
         expect(true).toBe(false);
         pending(); // without reason
         pending('this is why it is pending');
     });
 });
 
-describe("A spy", function () {
+describe("A spy", () => {
     var foo: any, bar: any = null;
 
-    beforeEach(function () {
+    beforeEach(() => {
         foo = {
-            setBar: function (value: any) {
+            setBar: (value: any) => {
                 bar = value;
             }
         };
@@ -278,29 +278,29 @@ describe("A spy", function () {
         foo.setBar(456, 'another param');
     });
 
-    it("tracks that the spy was called", function () {
+    it("tracks that the spy was called", () => {
         expect(foo.setBar).toHaveBeenCalled();
     });
 
-    it("tracks all the arguments of its calls", function () {
+    it("tracks all the arguments of its calls", () => {
         expect(foo.setBar).toHaveBeenCalledWith(123);
         expect(foo.setBar).toHaveBeenCalledWith(456, 'another param');
     });
 
-    it("stops all execution on a function", function () {
+    it("stops all execution on a function", () => {
         expect(bar).toBeNull();
     });
 });
 
-describe("A spy, when configured to call through", function () {
+describe("A spy, when configured to call through", () => {
     var foo: any, bar: any, fetchedBar: any;
 
-    beforeEach(function () {
+    beforeEach(() => {
         foo = {
-            setBar: function (value: any) {
+            setBar: (value: any) => {
                 bar = value;
             },
-            getBar: function () {
+            getBar: () => {
                 return bar;
             }
         };
@@ -311,28 +311,28 @@ describe("A spy, when configured to call through", function () {
         fetchedBar = foo.getBar();
     });
 
-    it("tracks that the spy was called", function () {
+    it("tracks that the spy was called", () => {
         expect(foo.getBar).toHaveBeenCalled();
     });
 
-    it("should not effect other functions", function () {
+    it("should not effect other functions", () => {
         expect(bar).toEqual(123);
     });
 
-    it("when called returns the requested value", function () {
+    it("when called returns the requested value", () => {
         expect(fetchedBar).toEqual(123);
     });
 });
 
-describe("A spy, when configured to fake a return value", function () {
+describe("A spy, when configured to fake a return value", () => {
     var foo: any, bar: any, fetchedBar: any;
 
-    beforeEach(function () {
+    beforeEach(() => {
         foo = {
-            setBar: function (value: any) {
+            setBar: (value: any) => {
                 bar = value;
             },
-            getBar: function () {
+            getBar: () => {
                 return bar;
             }
         };
@@ -343,28 +343,28 @@ describe("A spy, when configured to fake a return value", function () {
         fetchedBar = foo.getBar();
     });
 
-    it("tracks that the spy was called", function () {
+    it("tracks that the spy was called", () => {
         expect(foo.getBar).toHaveBeenCalled();
     });
 
-    it("should not effect other functions", function () {
+    it("should not effect other functions", () => {
         expect(bar).toEqual(123);
     });
 
-    it("when called returns the requested value", function () {
+    it("when called returns the requested value", () => {
         expect(fetchedBar).toEqual(745);
     });
 });
 
-describe("A spy, when configured to fake a series of return values", function() {
+describe("A spy, when configured to fake a series of return values", () => {
     var foo: any, bar: any;
 
-    beforeEach(function() {
+    beforeEach(() => {
         foo = {
-            setBar: function(value: any) {
+            setBar: (value: any) => {
                 bar = value;
             },
-            getBar: function() {
+            getBar: () => {
                 return bar;
             }
         };
@@ -374,36 +374,36 @@ describe("A spy, when configured to fake a series of return values", function()
         foo.setBar(123);
     });
 
-    it("tracks that the spy was called", function() {
+    it("tracks that the spy was called", () => {
         foo.getBar(123);
         expect(foo.getBar).toHaveBeenCalled();
     });
 
-    it("should not affect other functions", function() {
+    it("should not affect other functions", () => {
         expect(bar).toEqual(123);
     });
 
-    it("when called multiple times returns the requested values in order", function() {
+    it("when called multiple times returns the requested values in order", () => {
         expect(foo.getBar()).toEqual("fetched first");
         expect(foo.getBar()).toEqual("fetched second");
         expect(foo.getBar()).toBeUndefined();
     });
 });
 
-describe("A spy, when configured with an alternate implementation", function () {
+describe("A spy, when configured with an alternate implementation", () => {
     var foo: any, bar: any, fetchedBar: any;
 
-    beforeEach(function () {
+    beforeEach(() => {
         foo = {
-            setBar: function (value: any) {
+            setBar: (value: any) => {
                 bar = value;
             },
-            getBar: function () {
+            getBar: () => {
                 return bar;
             }
         };
 
-        spyOn(foo, "getBar").and.callFake(function () {
+        spyOn(foo, "getBar").and.callFake(() => {
             return 1001;
         });
 
@@ -411,25 +411,25 @@ describe("A spy, when configured with an alternate implementation", function ()
         fetchedBar = foo.getBar();
     });
 
-    it("tracks that the spy was called", function () {
+    it("tracks that the spy was called", () => {
         expect(foo.getBar).toHaveBeenCalled();
     });
 
-    it("should not effect other functions", function () {
+    it("should not effect other functions", () => {
         expect(bar).toEqual(123);
     });
 
-    it("when called returns the requested value", function () {
+    it("when called returns the requested value", () => {
         expect(fetchedBar).toEqual(1001);
     });
 });
 
-describe("A spy, when configured to throw a value", function () {
+describe("A spy, when configured to throw a value", () => {
     var foo: any, bar: any;
 
-    beforeEach(function () {
+    beforeEach(() => {
         foo = {
-            setBar: function (value: any) {
+            setBar: (value: any) => {
                 bar = value;
             }
         };
@@ -437,57 +437,57 @@ describe("A spy, when configured to throw a value", function () {
         spyOn(foo, "setBar").and.throwError("quux");
     });
 
-    it("throws the value", function () {
-        expect(function () {
-            foo.setBar(123)
-    }).toThrowError("quux");
+    it("throws the value", () => {
+        expect(() => {
+            foo.setBar(123);
+        }).toThrowError("quux");
     });
 });
 
-describe("A spy, when configured with multiple actions", function () {
+describe("A spy, when configured with multiple actions", () => {
     var foo: any, bar: any, fetchedBar: any;
 
-    beforeEach(function () {
+    beforeEach(() => {
         foo = {
-            setBar: function (value: any) {
+            setBar: (value: any) => {
                 bar = value;
             },
-            getBar: function () {
+            getBar: () => {
                 return bar;
             }
         };
 
         spyOn(foo, 'getBar').and.callThrough().and.callFake(() => {
-          this.fakeCalled = true;
+            this.fakeCalled = true;
         });
 
         foo.setBar(123);
         fetchedBar = foo.getBar();
     });
 
-    it("tracks that the spy was called", function () {
+    it("tracks that the spy was called", () => {
         expect(foo.getBar).toHaveBeenCalled();
     });
 
-    it("should not effect other functions", function () {
+    it("should not effect other functions", () => {
         expect(bar).toEqual(123);
     });
 
-    it("when called returns the requested value", function () {
+    it("when called returns the requested value", () => {
         expect(fetchedBar).toEqual(123);
     });
 
-    it("should have called the fake implementation", function () {
+    it("should have called the fake implementation", () => {
         expect(this.fakeCalled).toEqual(true);
     });
 });
 
-describe("A spy", function () {
+describe("A spy", () => {
     var foo: any, bar: any = null;
 
-    beforeEach(function () {
+    beforeEach(() => {
         foo = {
-            setBar: function (value: any) {
+            setBar: (value: any) => {
                 bar = value;
             }
         };
@@ -495,7 +495,7 @@ describe("A spy", function () {
         spyOn(foo, 'setBar').and.callThrough();
     });
 
-    it("can call through and then stub in the same spec", function () {
+    it("can call through and then stub in the same spec", () => {
         foo.setBar(123);
         expect(bar).toEqual(123);
 
@@ -507,12 +507,12 @@ describe("A spy", function () {
     });
 });
 
-describe("A spy", function () {
+describe("A spy", () => {
     var foo: any, bar: any = null;
 
-    beforeEach(function () {
+    beforeEach(() => {
         foo = {
-            setBar: function (value: any) {
+            setBar: (value: any) => {
                 bar = value;
             }
         };
@@ -520,7 +520,7 @@ describe("A spy", function () {
         spyOn(foo, 'setBar');
     });
 
-    it("tracks if it was called at all", function () {
+    it("tracks if it was called at all", () => {
         expect(foo.setBar.calls.any()).toEqual(false);
 
         foo.setBar();
@@ -528,7 +528,7 @@ describe("A spy", function () {
         expect(foo.setBar.calls.any()).toEqual(true);
     });
 
-    it("tracks the number of times it was called", function () {
+    it("tracks the number of times it was called", () => {
         expect(foo.setBar.calls.count()).toEqual(0);
 
         foo.setBar();
@@ -537,7 +537,7 @@ describe("A spy", function () {
         expect(foo.setBar.calls.count()).toEqual(2);
     });
 
-    it("tracks the arguments of each call", function () {
+    it("tracks the arguments of each call", () => {
         foo.setBar(123);
         foo.setBar(456, "baz");
 
@@ -545,34 +545,34 @@ describe("A spy", function () {
         expect(foo.setBar.calls.argsFor(1)).toEqual([456, "baz"]);
     });
 
-    it("tracks the arguments of all calls", function () {
+    it("tracks the arguments of all calls", () => {
         foo.setBar(123);
         foo.setBar(456, "baz");
 
         expect(foo.setBar.calls.allArgs()).toEqual([[123], [456, "baz"]]);
     });
 
-    it("can provide the context and arguments to all calls", function () {
+    it("can provide the context and arguments to all calls", () => {
         foo.setBar(123);
 
         expect(foo.setBar.calls.all()).toEqual([{ object: foo, args: [123], returnValue: undefined }]);
     });
 
-    it("has a shortcut to the most recent call", function () {
+    it("has a shortcut to the most recent call", () => {
         foo.setBar(123);
         foo.setBar(456, "baz");
 
         expect(foo.setBar.calls.mostRecent()).toEqual({ object: foo, args: [456, "baz"], returnValue: undefined });
     });
 
-    it("has a shortcut to the first call", function () {
+    it("has a shortcut to the first call", () => {
         foo.setBar(123);
         foo.setBar(456, "baz");
 
         expect(foo.setBar.calls.first()).toEqual({ object: foo, args: [123], returnValue: undefined });
     });
 
-    it("can be reset", function () {
+    it("can be reset", () => {
         foo.setBar(123);
         foo.setBar(456, "baz");
 
@@ -584,40 +584,40 @@ describe("A spy", function () {
     });
 });
 
-describe("A spy, when created manually", function () {
+describe("A spy, when created manually", () => {
     var whatAmI: any;
 
-    beforeEach(function () {
+    beforeEach(() => {
         whatAmI = jasmine.createSpy('whatAmI');
 
         whatAmI("I", "am", "a", "spy");
     });
 
-    it("is named, which helps in error reporting", function () {
+    it("is named, which helps in error reporting", () => {
         expect(whatAmI.and.identity()).toEqual('whatAmI');
     });
 
-    it("tracks that the spy was called", function () {
+    it("tracks that the spy was called", () => {
         expect(whatAmI).toHaveBeenCalled();
     });
 
-    it("tracks its number of calls", function () {
+    it("tracks its number of calls", () => {
         expect(whatAmI.calls.count()).toEqual(1);
     });
 
-    it("tracks all the arguments of its calls", function () {
+    it("tracks all the arguments of its calls", () => {
         expect(whatAmI).toHaveBeenCalledWith("I", "am", "a", "spy");
     });
 
-    it("allows access to the most recent call", function () {
+    it("allows access to the most recent call", () => {
         expect(whatAmI.calls.mostRecent().args[0]).toEqual("I");
     });
 });
 
-describe("Multiple spies, when created manually", function () {
+describe("Multiple spies, when created manually", () => {
     var tape: any;
 
-    beforeEach(function () {
+    beforeEach(() => {
         tape = jasmine.createSpyObj('tape', ['play', 'pause', 'stop', 'rewind']);
 
         tape.play();
@@ -625,35 +625,35 @@ describe("Multiple spies, when created manually", function () {
         tape.rewind(0);
     });
 
-    it("creates spies for each requested function", function () {
+    it("creates spies for each requested function", () => {
         expect(tape.play).toBeDefined();
         expect(tape.pause).toBeDefined();
         expect(tape.stop).toBeDefined();
         expect(tape.rewind).toBeDefined();
     });
 
-    it("tracks that the spies were called", function () {
+    it("tracks that the spies were called", () => {
         expect(tape.play).toHaveBeenCalled();
         expect(tape.pause).toHaveBeenCalled();
         expect(tape.rewind).toHaveBeenCalled();
         expect(tape.stop).not.toHaveBeenCalled();
     });
 
-    it("tracks all the arguments of its calls", function () {
+    it("tracks all the arguments of its calls", () => {
         expect(tape.rewind).toHaveBeenCalledWith(0);
     });
 });
 
-describe("jasmine.any", function () {
-    it("matches any value", function () {
+describe("jasmine.any", () => {
+    it("matches any value", () => {
         expect({}).toEqual(jasmine.any(Object));
         expect(12).toEqual(jasmine.any(Number));
     });
 
-    describe("when used with a spy", function () {
-        it("is useful for comparing arguments", function () {
+    describe("when used with a spy", () => {
+        it("is useful for comparing arguments", () => {
             var foo = jasmine.createSpy('foo');
-            foo(12, function () {
+            foo(12, () => {
                 return true;
             });
 
@@ -662,10 +662,15 @@ describe("jasmine.any", function () {
     });
 });
 
-describe("jasmine.objectContaining", function () {
-    var foo: any;
+describe("jasmine.objectContaining", () => {
+    interface fooType {
+        a: number;
+        b: number;
+        bar: string;
+    }
+    var foo: fooType;
 
-    beforeEach(function () {
+    beforeEach(() => {
         foo = {
             a: 1,
             b: 2,
@@ -673,17 +678,25 @@ describe("jasmine.objectContaining", function () {
         };
     });
 
-    it("matches objects with the expect key/value pairs", function () {
-        expect(foo).toEqual(jasmine.objectContaining({
-            bar: "baz"
-        }));
+    it("matches objects with the expect key/value pairs", () => {
+        // not explictly providing the type on objectContaining only guards against
+        // missmatching types on know properties
         expect(foo).not.toEqual(jasmine.objectContaining({
-            c: 37
+            a: 37,
+            foo: 2, // <-- this does not cause an error as the compiler cannot infer the type completely
+            // b: '123', <-- this would cause an error as `b` defined as number in fooType
+        }));
+
+        // explictly providing the type on objectContaining makes the guard more precise
+        // as misspelled properties are detected as well
+        expect(foo).not.toEqual(jasmine.objectContaining<fooType>({
+            bar: '',
+            // foo: 1, <-- this would cause an error as `foo` is not defined in fooType
         }));
     });
 
-    describe("when used with a spy", function () {
-        it("is useful for comparing arguments", function () {
+    describe("when used with a spy", () => {
+        it("is useful for comparing arguments", () => {
             var callback = jasmine.createSpy('callback');
 
             callback({
@@ -700,44 +713,44 @@ describe("jasmine.objectContaining", function () {
     });
 });
 
-describe("jasmine.arrayContaining", function() {
-  var foo: any;
+describe("jasmine.arrayContaining", () => {
+    var foo: any;
 
-  beforeEach(function() {
-    foo = [1, 2, 3, 4];
-  });
+    beforeEach(() => {
+        foo = [1, 2, 3, 4];
+    });
 
-  it("matches arrays with some of the values", function() {
-    expect(foo).toEqual(jasmine.arrayContaining([3, 1]));
-    expect(foo).not.toEqual(jasmine.arrayContaining([6]));
-  });
+    it("matches arrays with some of the values", () => {
+        expect(foo).toEqual(jasmine.arrayContaining([3, 1]));
+        expect(foo).not.toEqual(jasmine.arrayContaining([6]));
+    });
 
-  describe("when used with a spy", function() {
-    it("is useful when comparing arguments", function() {
-      var callback = jasmine.createSpy('callback');
+    describe("when used with a spy", () => {
+        it("is useful when comparing arguments", () => {
+            var callback = jasmine.createSpy('callback');
 
-      callback([1, 2, 3, 4]);
+            callback([1, 2, 3, 4]);
 
-      expect(callback).toHaveBeenCalledWith(jasmine.arrayContaining([4, 2, 3]));
-      expect(callback).not.toHaveBeenCalledWith(jasmine.arrayContaining([5, 2]));
+            expect(callback).toHaveBeenCalledWith(jasmine.arrayContaining([4, 2, 3]));
+            expect(callback).not.toHaveBeenCalledWith(jasmine.arrayContaining([5, 2]));
+        });
     });
-  });
 });
 
-describe("Manually ticking the Jasmine Clock", function () {
+describe("Manually ticking the Jasmine Clock", () => {
     var timerCallback: any;
 
-    beforeEach(function () {
+    beforeEach(() => {
         timerCallback = jasmine.createSpy("timerCallback");
         jasmine.clock().install();
     });
 
-    afterEach(function () {
+    afterEach(() => {
         jasmine.clock().uninstall();
     });
 
-    it("causes a timeout to be called synchronously", function () {
-        setTimeout(function () {
+    it("causes a timeout to be called synchronously", () => {
+        setTimeout(() => {
             timerCallback();
         }, 100);
 
@@ -748,8 +761,8 @@ describe("Manually ticking the Jasmine Clock", function () {
         expect(timerCallback).toHaveBeenCalled();
     });
 
-    it("causes an interval to be called synchronously", function () {
-        setInterval(function () {
+    it("causes an interval to be called synchronously", () => {
+        setInterval(() => {
             timerCallback();
         }, 100);
 
@@ -765,8 +778,8 @@ describe("Manually ticking the Jasmine Clock", function () {
         expect(timerCallback.calls.count()).toEqual(2);
     });
 
-    describe("Mocking the Date object", function(){
-        it("mocks the Date object and sets it to a given time", function() {
+    describe("Mocking the Date object", () => {
+        it("mocks the Date object and sets it to a given time", () => {
             var baseTime = new Date(2013, 9, 23);
 
             jasmine.clock().mockDate(baseTime);
@@ -777,82 +790,82 @@ describe("Manually ticking the Jasmine Clock", function () {
     });
 });
 
-describe("Asynchronous specs", function () {
+describe("Asynchronous specs", () => {
     var value: number;
-    beforeEach(function (done: DoneFn) {
-        setTimeout(function () {
+    beforeEach((done: DoneFn) => {
+        setTimeout(() => {
             value = 0;
             done();
         }, 1);
     });
 
-    it("should support async execution of test preparation and expectations", function (done: DoneFn) {
+    it("should support async execution of test preparation and expectations", (done: DoneFn) => {
         value++;
         expect(value).toBeGreaterThan(0);
         done();
     });
 
-    describe("long asynchronous specs", function() {
-        beforeEach(function(done: DoneFn) {
-          done();
+    describe("long asynchronous specs", () => {
+        beforeEach((done: DoneFn) => {
+            done();
         }, 1000);
 
-        it("takes a long time", function(done: DoneFn) {
-          setTimeout(function() {
-            done();
-          }, 9000);
+        it("takes a long time", (done: DoneFn) => {
+            setTimeout(() => {
+                done();
+            }, 9000);
         }, 10000);
 
-        afterEach(function(done: DoneFn) {
-          done();
+        afterEach((done: DoneFn) => {
+            done();
         }, 1000);
     });
 
 });
 
-describe("Fail", function () {
+describe("Fail", () => {
 
-  it("should fail test when called without arguments", function () {
-    fail();
-  });
+    it("should fail test when called without arguments", () => {
+        fail();
+    });
 
-  it("should fail test when called with a fail message", function () {
-    fail("The test failed");
-  });
+    it("should fail test when called with a fail message", () => {
+        fail("The test failed");
+    });
 
-  it("should fail test when called an error", function () {
-    fail(new Error("The test failed with this error"));
-  });
+    it("should fail test when called an error", () => {
+        fail(new Error("The test failed with this error"));
+    });
 
 });
 
 // test based on http://jasmine.github.io/2.2/custom_equality.html
-describe("custom equality", function() {
+describe("custom equality", () => {
     var myCustomEquality: jasmine.CustomEqualityTester = function(first: any, second: any): boolean {
-        if (typeof first == "string" && typeof second == "string") {
-            return first[0] == second[1];
+        if (typeof first === "string" && typeof second === "string") {
+            return first[0] === second[1];
         }
     };
 
-    beforeEach(function() {
+    beforeEach(() => {
         jasmine.addCustomEqualityTester(myCustomEquality);
     });
 
 
-    it("should be custom equal", function() {
+    it("should be custom equal", () => {
         expect("abc").toEqual("aaa");
     });
 
-    it("should be custom not equal", function() {
+    it("should be custom not equal", () => {
         expect("abc").not.toEqual("abc");
     });
 });
 
 // test based on http://jasmine.github.io/2.2/custom_matcher.html
 var customMatchers: jasmine.CustomMatcherFactories = {
-    toBeGoofy: function (util: jasmine.MatchersUtil, customEqualityTesters: Array<jasmine.CustomEqualityTester>) {
+    toBeGoofy: (util: jasmine.MatchersUtil, customEqualityTesters: jasmine.CustomEqualityTester[]) => {
         return {
-            compare: function (actual: any, expected: any): jasmine.CustomMatcherResult {
+            compare: (actual: any, expected: any): jasmine.CustomMatcherResult => {
                 if (expected === undefined) {
                     expected = '';
                 }
@@ -881,29 +894,29 @@ var customMatchers: jasmine.CustomMatcherFactories = {
 //     }
 // }
 declare namespace jasmine {
-    interface Matchers {
-        toBeGoofy(expected?: any): boolean;
+    interface Matchers<T> {
+        toBeGoofy(expected?: jasmine.Expected<T>): boolean;
     }
 }
 
-describe("Custom matcher: 'toBeGoofy'", function () {
-    beforeEach(function () {
+describe("Custom matcher: 'toBeGoofy'", () => {
+    beforeEach(() => {
         jasmine.addMatchers(customMatchers);
     });
 
-    it("is available on an expectation", function () {
+    it("is available on an expectation", () => {
         expect({
             hyuk: 'gawrsh'
         }).toBeGoofy();
     });
 
-    it("can take an 'expected' parameter", function () {
+    it("can take an 'expected' parameter", () => {
         expect({
             hyuk: 'gawrsh is fun'
-        }).toBeGoofy(' is fun');
+        }).toBeGoofy({ hyuk: ' is fun' });
     });
 
-    it("can be negated", function () {
+    it("can be negated", () => {
         expect({
             hyuk: 'this is fun'
         }).not.toBeGoofy();
@@ -912,20 +925,21 @@ describe("Custom matcher: 'toBeGoofy'", function () {
 
 // test based on http://jasmine.github.io/2.5/custom_reporter.html
 var myReporter: jasmine.CustomReporter = {
-    jasmineStarted: function (suiteInfo: jasmine.SuiteInfo ) {
+    jasmineStarted: (suiteInfo: jasmine.SuiteInfo) => {
         console.log("Running suite with " + suiteInfo.totalSpecsDefined);
     },
 
-    suiteStarted: function (result: jasmine.CustomReporterResult) {
+    suiteStarted: (result: jasmine.CustomReporterResult) => {
         console.log("Suite started: " + result.description + " whose full description is: " + result.fullName);
     },
 
-    specStarted: function (result: jasmine.CustomReporterResult) {
+    specStarted: (result: jasmine.CustomReporterResult) => {
         console.log("Spec started: " + result.description + " whose full description is: " + result.fullName);
     },
 
-    specDone: function (result: jasmine.CustomReporterResult) {
+    specDone: (result: jasmine.CustomReporterResult) => {
         console.log("Spec: " + result.description + " was " + result.status);
+        //tslint:disable-next-line:prefer-for-of
         for (var i = 0; i < result.failedExpectations.length; i++) {
             console.log("Failure: " + result.failedExpectations[i].message);
             console.log("Actual: " + result.failedExpectations[i].actual);
@@ -935,15 +949,16 @@ var myReporter: jasmine.CustomReporter = {
         console.log(result.passedExpectations.length);
     },
 
-    suiteDone: function (result: jasmine.CustomReporterResult) {
+    suiteDone: (result: jasmine.CustomReporterResult) => {
         console.log('Suite: ' + result.description + ' was ' + result.status);
+        //tslint:disable-next-line:prefer-for-of
         for (var i = 0; i < result.failedExpectations.length; i++) {
             console.log('AfterAll ' + result.failedExpectations[i].message);
             console.log(result.failedExpectations[i].stack);
         }
     },
 
-    jasmineDone: function(runDetails: jasmine.RunDetails) {
+    jasmineDone: (runDetails: jasmine.RunDetails) => {
         console.log('Finished suite');
         console.log('Random:', runDetails.order.random);
     }
@@ -951,21 +966,21 @@ var myReporter: jasmine.CustomReporter = {
 
 jasmine.getEnv().addReporter(myReporter);
 
-describe("Randomize Tests", function() {
-	it("should allow randomization of the order of tests", function() {
-		expect(function() {
-			var env = jasmine.getEnv();
-			return env.randomizeTests(true);
-		}).not.toThrow();
-	});
+describe("Randomize Tests", () => {
+    it("should allow randomization of the order of tests", () => {
+        expect(() => {
+            var env = jasmine.getEnv();
+            return env.randomizeTests(true);
+        }).not.toThrow();
+    });
 
-	it("should allow a seed to be passed in for randomization", function() {
-		expect(function() {
-			var env = jasmine.getEnv();
-			env.randomizeTests(true);
-			return env.seed(1234);
-		}).not.toThrow();
-	});
+    it("should allow a seed to be passed in for randomization", () => {
+        expect(() => {
+            var env = jasmine.getEnv();
+            env.randomizeTests(true);
+            return env.seed(1234);
+        }).not.toThrow();
+    });
 });
 
 (() => {
@@ -976,14 +991,14 @@ describe("Randomize Tests", function() {
     env.addReporter(htmlReporter);
 
     var specFilter = new jasmine.HtmlSpecFilter();
-    env.specFilter = function (spec) {
+    env.specFilter = (spec) => {
         return specFilter.matches(spec.getFullName());
     };
 
     var currentWindowOnload = window.onload;
-    window.onload = function () {
+    window.onload = () => {
         if (currentWindowOnload) {
-            (<any>currentWindowOnload)(null);
+            (currentWindowOnload as any)(null);
         }
         htmlReporter.initialize();
         env.execute();
diff --git a/jasmine/package.json b/jasmine/package.json
deleted file mode 100644
index 7e47d54c61..0000000000
--- a/jasmine/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "dependencies": {
-        "typescript": ">=2.1.4"
-    }
-}
\ No newline at end of file
diff --git a/jasmine/v1/index.d.ts b/jasmine/v1/index.d.ts
index 5cbb2a9f83..3f51240f63 100644
--- a/jasmine/v1/index.d.ts
+++ b/jasmine/v1/index.d.ts
@@ -16,9 +16,9 @@ declare function xit(expectation: string, assertion: () => void): void;
 declare function beforeEach(action: () => void): void;
 declare function afterEach(action: () => void): void;
 
-declare function expect(spy: Function): jasmine.Matchers;
-//declare function expect(spy: jasmine.Spy): jasmine.Matchers;
-declare function expect(actual: any): jasmine.Matchers;
+declare function expect<T>(spy: Function): jasmine.Matchers<T>;
+//declare function expect(spy: jasmine.Spy): jasmine.Matchers<T>;
+declare function expect<T>(actual: any): jasmine.Matchers<T>;
 
 declare function spyOn(object: any, method: string): jasmine.Spy;
 
@@ -91,7 +91,7 @@ declare namespace jasmine {
 
         currentSpec: Spec;
 
-        matchersClass: Matchers;
+        matchersClass: Matchers<any>;
 
         version(): any;
         versionString(): string;
@@ -204,7 +204,7 @@ declare namespace jasmine {
         results(): NestedResults;
     }
 
-    interface Matchers {
+    interface Matchers<T> {
 
         new (env: Env, actual: any, spec: Env, isNot?: boolean): any;
 
@@ -232,7 +232,7 @@ declare namespace jasmine {
         toContainHtml(expected: string): boolean;
         toContainText(expected: string): boolean;
         toThrow(expected?: any): boolean;
-        not: Matchers;
+        not: Matchers<T>;
 
         Any: Any;
     }
@@ -287,7 +287,7 @@ declare namespace jasmine {
         spies_: Spy[];
 
         results_: NestedResults;
-        matchersClass: Matchers;
+        matchersClass: Matchers<any>;
 
         getFullName(): string;
         results(): NestedResults;
@@ -299,7 +299,7 @@ declare namespace jasmine {
         waits(timeout: number): Spec;
         waitsFor(latchFunction: SpecFunction, timeoutMessage?: string, timeout?: number): Spec;
         fail(e?: any): void;
-        getMatchersClass_(): Matchers;
+        getMatchersClass_(): Matchers<any>;
         addMatchers(matchersPrototype: any): void;
         finishCallback(): void;
         finish(onComplete?: () => void): void;
diff --git a/jasmine/v1/jasmine-tests.ts b/jasmine/v1/jasmine-tests.ts
index 9177679f8a..c47fc84007 100644
--- a/jasmine/v1/jasmine-tests.ts
+++ b/jasmine/v1/jasmine-tests.ts
@@ -60,7 +60,7 @@ describe("Included matchers:", () => {
             foo: 'foo'
         };
         expect(a.foo).toBeDefined();
-        expect((<any>a).bar).not.toBeDefined();
+        expect((a as any).bar).not.toBeDefined();
     });
 
     it("The `toBeUndefined` matcher compares against `undefined`", () => {
@@ -68,7 +68,7 @@ describe("Included matchers:", () => {
             foo: 'foo'
         };
         expect(a.foo).not.toBeUndefined();
-        expect((<any>a).bar).toBeUndefined();
+        expect((a as any).bar).toBeUndefined();
     });
 
     it("The 'toBeNull' matcher compares against null", () => {
@@ -202,7 +202,7 @@ describe("A spy", () => {
   var foo: any, bar: any = null;
     beforeEach(() => {
         foo = {
-            setBar: function (value: any) {
+            setBar: (value: any) => {
                 bar = value;
             }
         };
@@ -235,7 +235,7 @@ describe("A spy, when configured to call through", () => {
   var foo: any, bar: any, fetchedBar: any;
     beforeEach(() => {
         foo = {
-            setBar: function (value: any) {
+            setBar: (value: any) => {
                 bar = value;
             },
             getBar: () => {
@@ -261,7 +261,7 @@ describe("A spy, when faking a return value", () => {
   var foo: any, bar: any, fetchedBar: any;
     beforeEach(() => {
         foo = {
-            setBar: function (value: any) {
+            setBar: (value: any) => {
                 bar = value;
             },
             getBar: () => {
@@ -287,7 +287,7 @@ describe("A spy, when faking a return value", () => {
   var foo: any, bar: any, fetchedBar: any;
     beforeEach(() => {
         foo = {
-            setBar: function (value: any) {
+            setBar: (value: any) => {
                 bar = value;
             },
             getBar: () => {
@@ -319,7 +319,7 @@ describe("A spy, when created manually", () => {
         whatAmI("I", "am", "a", "spy");
     });
     it("is named, which helps in error reporting", () => {
-        expect(whatAmI.identity).toEqual('whatAmI')
+        expect(whatAmI.identity).toEqual('whatAmI');
     });
     it("tracks that the spy was called", () => {
         expect(whatAmI).toHaveBeenCalled();
@@ -369,7 +369,7 @@ describe("jasmine.any", () => {
         it("is useful for comparing arguments", () => {
             var foo = jasmine.createSpy('foo');
             foo(12, () => {
-                return true
+                return true;
             });
             expect(foo).toHaveBeenCalledWith(jasmine.any(Number), jasmine.any(Function));
         });
@@ -430,7 +430,7 @@ describe("Asynchronous specs", () => {
     jasmineEnv.updateInterval = 250;
     var htmlReporter = new jasmine.HtmlReporter();
     jasmineEnv.addReporter(htmlReporter);
-    jasmineEnv.specFilter = function (spec) {
+    jasmineEnv.specFilter = (spec) => {
         return htmlReporter.specFilter(spec);
     };
     var currentWindowOnload = (arg: any) => window.onload(arg);
@@ -439,11 +439,11 @@ describe("Asynchronous specs", () => {
             currentWindowOnload(null);
         }
 
-        (<HTMLElement>document.querySelector('.version')).innerHTML = jasmineEnv.versionString();
+        (document.querySelector('.version') as HTMLElement).innerHTML = jasmineEnv.versionString();
         execJasmine();
     };
 
     function execJasmine() {
         jasmineEnv.execute();
     }
-})();
\ No newline at end of file
+})();
diff --git a/jasminewd2/index.d.ts b/jasminewd2/index.d.ts
index 9d8ecde76e..3b8760709c 100644
--- a/jasminewd2/index.d.ts
+++ b/jasminewd2/index.d.ts
@@ -17,10 +17,10 @@ declare function afterAll(action: () => Promise<void>, timeout?: number): void;
 declare namespace jasmine {
   // The global `Promise` type is too strict and kinda wrong
   interface Promise<T> {
-      then<U>(onFulfill?: (value: T) => U | Promise<U>, onReject?: (error: any) => U | Promise<U>): Promise<U>;
+    then<U>(onFulfill?: (value: T) => U | Promise<U>, onReject?: (error: any) => U | Promise<U>): Promise<U>;
   }
 
-  interface Matchers {
+  interface Matchers<T> {
     toBe(expected: any, expectationFailOutput?: any): Promise<void>;
     toEqual(expected: any, expectationFailOutput?: any): Promise<void>;
     toMatch(expected: string | RegExp | Promise<string | RegExp>, expectationFailOutput?: any): Promise<void>;
@@ -44,6 +44,13 @@ declare namespace jasmine {
     toThrowError(expected?: new (...args: any[]) => Error | Promise<new (...args: any[]) => Error>, message?: string | RegExp | Promise<string | RegExp>): Promise<void>;
   }
 
+  interface ArrayLikeMatchers<T> extends Matchers<ArrayLike<T>> {
+    toBe(expected: Expected<ArrayLike<T>>, expectationFailOutput?: any): Promise<void>;
+    toEqual(expected: Expected<ArrayLike<T>>, expectationFailOutput?: any): Promise<void>;
+    toContain(expected: T, expectationFailOutput?: any): Promise<void>;
+    not: ArrayLikeMatchers<T>;
+  }
+
   function addMatchers(matchers: AsyncCustomMatcherFactories): void;
 
   interface Env {
@@ -59,12 +66,12 @@ declare namespace jasmine {
   }
 
   interface AsyncCustomMatcherFactory {
-      (util: MatchersUtil, customEqualityTesters: CustomEqualityTester[]): AsyncCustomMatcher;
+    (util: MatchersUtil, customEqualityTesters: CustomEqualityTester[]): AsyncCustomMatcher;
   }
 
   interface AsyncCustomMatcher {
-      compare<T>(actual: T, expected: T): AsyncCustomMatcherResult;
-      compare(actual: any, expected: any): AsyncCustomMatcherResult;
+    compare<T>(actual: T, expected: T): AsyncCustomMatcherResult;
+    compare(actual: any, expected: any): AsyncCustomMatcherResult;
   }
 
   interface AsyncCustomMatcherResult {
diff --git a/jest/index.d.ts b/jest/index.d.ts
old mode 100644
new mode 100755
index 4129dcc846..595a42ea2b
--- a/jest/index.d.ts
+++ b/jest/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Jest 19.2.0
 // Project: http://facebook.github.io/jest/
-// Definitions by: Asana <https://asana.com>, Ivo Stratev <https://github.com/NoHomey>, jwbay <https://github.com/jwbay>, Alexey Svetliakov <https://github.com/asvetliakov>
+// Definitions by: Asana <https://asana.com>, Ivo Stratev <https://github.com/NoHomey>, jwbay <https://github.com/jwbay>, Alexey Svetliakov <https://github.com/asvetliakov>, Alex Jover Morales <https://github.com/alexjoverm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -77,6 +77,8 @@ declare namespace jest {
     function runTimersToTime(msToRun: number): typeof jest;
     /** Explicitly supplies the mock object that the module system should return for the specified module. */
     function setMock<T>(moduleName: string, moduleExports: T): typeof jest;
+    /** Creates a mock function similar to jest.fn but also tracks calls to object[methodName] */
+    function spyOn<T extends {}, M extends keyof T>(object: T, method: M): SpyInstance<T[M]>;
     /** Indicates that the module system should never return a mocked version of the specified module from require() (e.g. that it should always return the real module). */
     function unmock(moduleName: string): typeof jest;
     /** Instructs Jest to use fake versions of the standard timer functions. */
@@ -158,19 +160,19 @@ declare namespace jest {
          * @param {any} actual The value to apply matchers against.
         */
         (actual: any): Matchers;
-        anything(): void;
+        anything(): any;
         /** Matches anything that was created with the given constructor. You can use it inside `toEqual` or `toBeCalledWith` instead of a literal value. */
-        any(classType: any): void;
+        any(classType: any): any;
         /** Matches any array made up entirely of elements in the provided array. You can use it inside `toEqual` or `toBeCalledWith` instead of a literal value.  */
-        arrayContaining(arr: any[]): void;
+        arrayContaining(arr: any[]): any;
         /** Verifies that a certain number of assertions are called during a test. This is often useful when testing asynchronous code, in order to make sure that assertions in a callback actually got called. */
         assertions(num: number): void;
         /** You can use `expect.extend` to add your own matchers to Jest. */
         extend(obj: ExpectExtendMap): void;
         /** Matches any object that recursively matches the provided keys. This is often handy in conjunction with other asymmetric matchers. */
-        objectContaining(obj: {}): void;
+        objectContaining(obj: {}): any;
         /** Matches any string that contains the exact provided string */
-        stringMatching(str: string | RegExp): void;
+        stringMatching(str: string | RegExp): any;
     }
 
     interface Matchers {
@@ -245,6 +247,10 @@ declare namespace jest {
         (...args: any[]): any;
     }
 
+    interface SpyInstance<T> extends MockInstance<T> {
+        mockRestore(): void;
+    }
+
     /**
      * Wrap module with mock definitions
      * @example
diff --git a/jest/jest-tests.ts b/jest/jest-tests.ts
index 6cfff857eb..d951153842 100644
--- a/jest/jest-tests.ts
+++ b/jest/jest-tests.ts
@@ -203,6 +203,19 @@ describe('Assymetric matchers', function () {
         }));
 
         expect.assertions(4);
+
+        interface Test {
+            a: number;
+            b: string;
+        }
+
+        // It's useful to create expected objects before the test call for refactoring purposes
+        // Assymetric matchers must return any in this case to constrain the required type
+        const test: Test = {
+            a: expect.any(Number),
+            b: expect.anything()
+        }
+        expect(callback).toHaveBeenCalledWith(test);
     });
 });
 
diff --git a/jimp/jimp-tests.ts b/jimp/jimp-tests.ts
index fd1ed1d2b7..a312cd4586 100644
--- a/jimp/jimp-tests.ts
+++ b/jimp/jimp-tests.ts
@@ -1,4 +1,4 @@
-import Jimp = require('jimp')
+import Jimp = require('jimp');
 
 // All code below is from node-jimp document
 Jimp.read("lenna.png", (err, data) => {
@@ -36,20 +36,20 @@ Jimp.read("http://www.example.com/path/to/lenna.jpg", (err, image) => {
     // do stuff with the image (if no exception)
 });
 
-var image = new Jimp(1, 2)
-var w = 0
-var h = 0
-var x = 0
-var y = 0
-var f = 0
-var src = ''
-var horz = Jimp.HORIZONTAL_ALIGN_CENTER
-var vert = Jimp.VERTICAL_ALIGN_BOTTOM
-var deg = 90
-var val = 0.5
-var hex = 0xFFFFFFFF
-var r = 0
-var n = 1
+var image = new Jimp(1, 2);
+var w = 0;
+var h = 0;
+var x = 0;
+var y = 0;
+var f = 0;
+var src = '';
+var horz = Jimp.HORIZONTAL_ALIGN_CENTER;
+var vert = Jimp.VERTICAL_ALIGN_BOTTOM;
+var deg = 90;
+var val = 0.5;
+var hex = 0xFFFFFFFF;
+var r = 0;
+var n = 1;
 /* Resize */
 image.contain(w, h);    // scale the image to the given width and height, some parts of the image may be letter boxed
 image.cover(w, h);      // scale the image to the given width and height, some parts of the image may be clipped
@@ -72,6 +72,7 @@ image.mask(src, x, y);          // masks the image with another Jimp image at x,
 /* Flip and rotate */
 image.flip(horz, vert);         // flip the image horizontally or vertically
 image.mirror(horz, vert);       // an alias for flip
+
 // rotate the image clockwise by a number of degrees.
 // Optionally, a resize mode can be passed.
 // If `false` is passed as the second parameter,
@@ -92,7 +93,7 @@ image.normalize();                // normalize the channels in an image
 image.fade(f);                  // an alternative to opacity, fades the image by a factor 0 - 1. 0 will haven no effect. 1 will turn the image
 image.opacity(f);               // multiply the alpha channel by each pixel by the factor f, 0 - 1
 image.opaque();                   // set the alpha channel on every pixel to fully opaque
-image.background(hex);          // set the default new pixel colour (e.g. 0xFFFFFFFF or 0x00000000) for by some operations (e.g. image.contain and 
+image.background(hex);          // set the default new pixel colour (e.g. 0xFFFFFFFF or 0x00000000) for by some operations (e.g. image.contain and
 
 /* Blurs */
 image.gaussian(r);              // Gaussian blur the image by r pixels (VERY slow)
@@ -111,15 +112,15 @@ image.resize(250, 250, Jimp.RESIZE_BEZIER);
 
 image.contain(250, 250, Jimp.HORIZONTAL_ALIGN_LEFT | Jimp.VERTICAL_ALIGN_TOP);
 
-var path = ''
-var str = ''
-var width = 0
+var path = '';
+var str = '';
+var width = 0;
 Jimp.loadFont(path).then(font => { // load font from .fnt file
     image.print(font, x, y, str);        // print a message on an image
     image.print(font, x, y, str, width); // print a message on an image with text wrapped at width
 });
 
-var cb = (err: Error, data: any) => {}
+var cb = (err: Error, data: any) => {};
 Jimp.loadFont(path, cb); // using a callback pattern
 
 Jimp.loadFont(Jimp.FONT_SANS_32_BLACK).then(font => {
@@ -129,16 +130,16 @@ Jimp.loadFont(Jimp.FONT_SANS_32_BLACK).then(font => {
 image.write(path, cb); // Node-style callback will be fired when write is successful
 
 var file = "new_name." + image.getExtension();
-image.write(file)
+image.write(file);
 
 
-var mime = 'image/png'
+var mime = 'image/png';
 image.getBuffer(mime, cb); // Node-style callback will be fired with result
 image.getBase64(mime, cb); // Node-style callback will be fired with result
 image.quality(n); // set the quality of saved JPEG, 0 - 100
 
-var bool = true
-var number = 0
+var bool = true;
+var number = 0;
 image.rgba(bool);             // set whether PNGs are saved as RGBA (true, default) or RGB (false)
 image.filterType(number);     // set the filter type for the saved PNG
 image.deflateLevel(number);   // set the deflate level for the saved PNG
@@ -149,11 +150,11 @@ image.color([
     { apply: 'lighten', params: [ 50 ] },
     { apply: 'xor', params: [ '#06D' ] }
 ]);
-  image.convolution([
+image.convolution([
     [-2, -1, 0],
     [-1, 1, 1],
     [ 0, 1, 2]
-  ])
+]);
 image.scan(0, 0, image.bitmap.width, image.bitmap.height, function(x, y, idx) {
     // x, y is the position of this pixel on the image
     // idx is the position start position of this rgba tuple in the bitmap Buffer
@@ -170,9 +171,9 @@ image.scan(0, 0, image.bitmap.width, image.bitmap.height, function(x, y, idx) {
 image.getPixelColor(x, y);      // returns the colour of that pixel e.g. 0xFFFFFFFF
 image.setPixelColor(hex, x, y); // sets the colour of that pixel
 
-var g = 0
-var b = 0
-var a = 0
+var g = 0;
+var b = 0;
+var a = 0;
 Jimp.rgbaToInt(r, g, b, a); // e.g. converts 255, 255, 255, 255 to 0xFFFFFFFF
 Jimp.intToRGBA(hex);        // e.g. converts 0xFFFFFFFF to {r: 255, g: 255, b: 255, a:255}
 
@@ -187,11 +188,11 @@ var image = new Jimp(256, 256, 0xFF0000FF, (err, image) => {
 image.hash(); // aHgG4GgoFjA
 image.hash(2); // 1010101011010000101010000100101010010000011001001001010011100100
 
-var image1 = new Jimp(0, 1)
-var image2 = new Jimp(0, 1)
+var image1 = new Jimp(0, 1);
+var image2 = new Jimp(0, 1);
 Jimp.distance(image1, image2); // returns a number 0-1, where 0 means the two images are perceived to be identical
 
-var threshold = 0
+var threshold = 0;
 var diff = Jimp.diff(image1, image2, threshold); // threshold ranges 0-1 (default: 0.1)
 diff.image;   // a Jimp image showing differences
 diff.percent; // the proportion of different pixels (0-1), where 0 means the images are pixel identical
diff --git a/jmespath/index.d.ts b/jmespath/index.d.ts
new file mode 100644
index 0000000000..a460fd6a4d
--- /dev/null
+++ b/jmespath/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for jmespath 0.15
+// Project: https://github.com/jmespath/jmespath.js
+// Definitions by: Jeffery Grajkowski <https://github.com/pushplay>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Take a JSON document and transform it into another JSON document
+ * through a JMESPath expression.  See: http://jmespath.org/
+ * @param jsonDoc the document to transform
+ * @param query a JMESPath expression
+ * @return the transformed document
+ */
+export function search(jsonDoc: any, query: string): any;
diff --git a/jmespath/jmespath-tests.ts b/jmespath/jmespath-tests.ts
new file mode 100644
index 0000000000..04034acf67
--- /dev/null
+++ b/jmespath/jmespath-tests.ts
@@ -0,0 +1,6 @@
+import jmespath = require("jmespath");
+
+const a = jmespath.search({foo: {bar: {baz: [0, 1, 2, 3, 4]}}}, "foo.bar.baz[2]");
+const b = jmespath.search({foo: {bar: {baz: [0, 1, 2, 3, 4]}}}, "foo.bar")
+const c = jmespath.search({"foo": [{"first": "a", "last": "b"}, {"first": "c", "last": "d"}]}, "foo[*].first");
+const d = jmespath.search({"foo": [{"age": 20}, {"age": 25}, {"age": 30}, {"age": 35}, {"age": 40}]}, "foo[?age > `30`]");
diff --git a/jmespath/tsconfig.json b/jmespath/tsconfig.json
new file mode 100644
index 0000000000..7db8ecc248
--- /dev/null
+++ b/jmespath/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jmespath-tests.ts"
+    ]
+}
diff --git a/jmespath/tslint.json b/jmespath/tslint.json
new file mode 100644
index 0000000000..2221e40e4a
--- /dev/null
+++ b/jmespath/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
\ No newline at end of file
diff --git a/joi/v6/joi-tests.ts b/joi/v6/joi-tests.ts
index 265bbd045c..03ca5ffac0 100644
--- a/joi/v6/joi-tests.ts
+++ b/joi/v6/joi-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="index.d.ts" />
 /// <reference types="node" />
 
 import Joi = require('joi');
diff --git a/jointjs/index.d.ts b/jointjs/index.d.ts
index 95e2b2b7e3..5ce0f187f0 100644
--- a/jointjs/index.d.ts
+++ b/jointjs/index.d.ts
@@ -6,891 +6,892 @@
 
 /// <reference types="backbone" />
 
+import * as Backbone from "backbone";
 
-declare namespace joint {
-    export var g: any;
-    export var V: any;
+export as namespace joint;
 
-    namespace dia {
-        interface Size {
-            width: number;
-            height: number;
-        }
+export var g: any;
+export var V: any;
 
-        interface Point {
-            x: number;
-            y: number;
-        }
+export namespace dia {
+    interface Size {
+        width: number;
+        height: number;
+    }
 
-        interface BBox extends Point, Size { }
+    interface Point {
+        x: number;
+        y: number;
+    }
 
-        interface TranslateOptions {
-            restrictedArea?: BBox;
-            transition?: TransitionOptions;
-        }
+    interface BBox extends Point, Size { }
 
-        interface TransitionOptions {
-            delay?: number;
-            duration?: number;
-            timingFunction?: (t: number) => number;
-            valueFunction?: (a: any, b: any) => (t: number) => any;
-        }
+    interface TranslateOptions {
+        restrictedArea?: BBox;
+        transition?: TransitionOptions;
+    }
 
-        interface DfsBfsOptions {
-            inbound?: boolean;
-            outbound?: boolean;
-            deep?: boolean;
-        }
+    interface TransitionOptions {
+        delay?: number;
+        duration?: number;
+        timingFunction?: (t: number) => number;
+        valueFunction?: (a: any, b: any) => (t: number) => any;
+    }
 
-        interface ExploreOptions {
-            breadthFirst?: boolean;
-            deep?: boolean;
-        }
+    interface DfsBfsOptions {
+        inbound?: boolean;
+        outbound?: boolean;
+        deep?: boolean;
+    }
 
-        class Graph extends Backbone.Model {
-            constructor(attributes?: any, options?: { cellNamespace: any });
-            addCell(cell: Cell | Cell[]): this;
-            addCells(cells: Cell[]): this;
-            resetCells(cells: Cell[], options?: any): this;
-            getCell(id: string): Cell;
-            getElements(): Element[];
-            getLinks(): Link[];
-            getCells(): Cell[];
-            getFirstCell(): Cell;
-            getLastCell(): Cell;
-            getConnectedLinks(element: Cell, options?: { inbound?: boolean, outbound?: boolean, deep?: boolean }): Link[];
-            disconnectLinks(cell: Cell, options?: any): void;
-            removeLinks(cell: Cell, options?: any): void;
-            translate(tx: number, ty?: number, options?: TranslateOptions): void;
-            cloneCells(cells: Cell[]): { [id: string]: Cell };
-            getSubgraph(cells: Cell[], options?: { deep?: boolean }): Cell[];
-            cloneSubgraph(cells: Cell[], options?: { deep?: boolean }): { [id: string]: Cell };
-            dfs(element: Element, iteratee: (element: Element, distance: number) => boolean, options?: DfsBfsOptions, visited?: Object, distance?: number): void;
-            bfs(element: Element, iteratee: (element: Element, distance: number) => boolean, options?: DfsBfsOptions): void;
-            search(element: Element, iteratee: (element: Element, distance: number) => boolean, options?: { breadthFirst?: boolean }): void;
-            getSuccessors(element: Element, options?: ExploreOptions): Element[];
-            getPredecessors(element: Element, options?: ExploreOptions): Element[];
-            isSuccessor(elementA: Element, elementB: Element): boolean;
-            isPredecessor(elementA: Element, elementB: Element): boolean;
-            isSource(element: Element): boolean;
-            isSink(element: Element): boolean;
-            getSources(): Element[];
-            getSinks(): Element[];
-            getNeighbors(element: Element, options?: DfsBfsOptions): Element[];
-            isNeighbor(elementA: Element, elementB: Element, options?: { inbound?: boolean, outbound?: boolean; }): boolean;
-            getCommonAncestor(...cells: Cell[]): Element;
-            toJSON(): any;
-            fromJSON(json: any, options?: any): this;
-            clear(options?: any): this;
-            findModelsFromPoint(rect: BBox): Element[];
-            findModelsUnderElement(element: Element, options?: { searchBy?: 'bbox' | 'center' | 'origin' | 'corner' | 'topRight' | 'bottomLeft' }): Element[];
-            getBBox(elements: Element[], options?: any): BBox;
-            toGraphLib(): any; // graphlib graph object
-            findModelsInArea(rect: BBox, options?: any): BBox | boolean;
-            getCellsBBox(cells: Cell[], options?: any): BBox;
-            getInboundEdges(node: string): Object;
-            getOutboundEdges(node: string): Object;
-            hasActiveBatch(name?: string): number | boolean;
-            maxZIndex(): number;
-            removeCells(cells: Cell[], options?: any): this;
-            resize(width: number, height: number, options?: number): this;
-            resizeCells(width: number, height: number, cells: Cell[], options?: number): this;
-            set(key: Object | string, value: any, options?: any): this;
-            startBatch(name: string, data?: Object): any;
-            stopBatch(name: string, data?: Object): any;
-        }
+    interface ExploreOptions {
+        breadthFirst?: boolean;
+        deep?: boolean;
+    }
 
-        class Cell extends Backbone.Model {
-            id: string;
-            toJSON(): any;
-            remove(options?: { disconnectLinks?: boolean }): this;
-            toFront(options?: { deep?: boolean }): this;
-            toBack(options?: { deep?: boolean }): this;
-            getAncestors(): Cell[];
-            isEmbeddedIn(element: Element, options?: { deep: boolean }): boolean;
-            prop(key: string): any;
-            prop(object: any): this;
-            prop(key: string, value: any, options?: any): this;
-            removeProp(path: string, options?: any): this;
-            attr(key: string): any;
-            attr(object: SVGAttributes): this;
-            attr(key: string, value: any): this;
-            clone(): Cell;
-            clone(opt: { deep?: boolean }): Cell | Cell[];
-            removeAttr(path: string | string[], options?: any): this;
-            transition(path: string, value?: any, options?: TransitionOptions, delim?: string): number;
-            getTransitions(): string[];
-            stopTransitions(path?: string, delim?: string): this;
-            addTo(graph: Graph, options?: any): this;
-            isLink(): boolean;
-            embed(cell: Cell, options?: any): this;
-            findView(paper: Paper): CellView;
-            getEmbeddedCells(options?: any): Cell[];
-            initialize(options?: any): void;
-            isElement(): boolean;
-            isEmbedded(): boolean;
-            processPorts(): void;
-            startBatch(name: string, options?: any): this;
-            stopBatch(name: string, options?: any): this;
-            unembed(cell: Cell, options?: any): this;
-        }
+    class Graph extends Backbone.Model {
+        constructor(attributes?: any, options?: { cellNamespace: any });
+        addCell(cell: Cell | Cell[]): this;
+        addCells(cells: Cell[]): this;
+        resetCells(cells: Cell[], options?: any): this;
+        getCell(id: string): Cell;
+        getElements(): Element[];
+        getLinks(): Link[];
+        getCells(): Cell[];
+        getFirstCell(): Cell;
+        getLastCell(): Cell;
+        getConnectedLinks(element: Cell, options?: { inbound?: boolean, outbound?: boolean, deep?: boolean }): Link[];
+        disconnectLinks(cell: Cell, options?: any): void;
+        removeLinks(cell: Cell, options?: any): void;
+        translate(tx: number, ty?: number, options?: TranslateOptions): void;
+        cloneCells(cells: Cell[]): { [id: string]: Cell };
+        getSubgraph(cells: Cell[], options?: { deep?: boolean }): Cell[];
+        cloneSubgraph(cells: Cell[], options?: { deep?: boolean }): { [id: string]: Cell };
+        dfs(element: Element, iteratee: (element: Element, distance: number) => boolean, options?: DfsBfsOptions, visited?: Object, distance?: number): void;
+        bfs(element: Element, iteratee: (element: Element, distance: number) => boolean, options?: DfsBfsOptions): void;
+        search(element: Element, iteratee: (element: Element, distance: number) => boolean, options?: { breadthFirst?: boolean }): void;
+        getSuccessors(element: Element, options?: ExploreOptions): Element[];
+        getPredecessors(element: Element, options?: ExploreOptions): Element[];
+        isSuccessor(elementA: Element, elementB: Element): boolean;
+        isPredecessor(elementA: Element, elementB: Element): boolean;
+        isSource(element: Element): boolean;
+        isSink(element: Element): boolean;
+        getSources(): Element[];
+        getSinks(): Element[];
+        getNeighbors(element: Element, options?: DfsBfsOptions): Element[];
+        isNeighbor(elementA: Element, elementB: Element, options?: { inbound?: boolean, outbound?: boolean; }): boolean;
+        getCommonAncestor(...cells: Cell[]): Element;
+        toJSON(): any;
+        fromJSON(json: any, options?: any): this;
+        clear(options?: any): this;
+        findModelsFromPoint(rect: BBox): Element[];
+        findModelsUnderElement(element: Element, options?: { searchBy?: 'bbox' | 'center' | 'origin' | 'corner' | 'topRight' | 'bottomLeft' }): Element[];
+        getBBox(elements: Element[], options?: any): BBox;
+        toGraphLib(): any; // graphlib graph object
+        findModelsInArea(rect: BBox, options?: any): BBox | boolean;
+        getCellsBBox(cells: Cell[], options?: any): BBox;
+        getInboundEdges(node: string): Object;
+        getOutboundEdges(node: string): Object;
+        hasActiveBatch(name?: string): number | boolean;
+        maxZIndex(): number;
+        removeCells(cells: Cell[], options?: any): this;
+        resize(width: number, height: number, options?: number): this;
+        resizeCells(width: number, height: number, cells: Cell[], options?: number): this;
+        set(key: Object | string, value: any, options?: any): this;
+        startBatch(name: string, data?: Object): any;
+        stopBatch(name: string, data?: Object): any;
+    }
 
-        type Padding = number | {
-            top?: number;
-            right?: number;
-            bottom?: number;
-            left?: number
-        };
+    class Cell extends Backbone.Model {
+        id: string;
+        toJSON(): any;
+        remove(options?: { disconnectLinks?: boolean }): this;
+        toFront(options?: { deep?: boolean }): this;
+        toBack(options?: { deep?: boolean }): this;
+        getAncestors(): Cell[];
+        isEmbeddedIn(element: Element, options?: { deep: boolean }): boolean;
+        prop(key: string): any;
+        prop(object: any): this;
+        prop(key: string, value: any, options?: any): this;
+        removeProp(path: string, options?: any): this;
+        attr(key: string): any;
+        attr(object: SVGAttributes): this;
+        attr(key: string, value: any): this;
+        clone(): Cell;
+        clone(opt: { deep?: boolean }): Cell | Cell[];
+        removeAttr(path: string | string[], options?: any): this;
+        transition(path: string, value?: any, options?: TransitionOptions, delim?: string): number;
+        getTransitions(): string[];
+        stopTransitions(path?: string, delim?: string): this;
+        addTo(graph: Graph, options?: any): this;
+        isLink(): boolean;
+        embed(cell: Cell, options?: any): this;
+        findView(paper: Paper): CellView;
+        getEmbeddedCells(options?: any): Cell[];
+        initialize(options?: any): void;
+        isElement(): boolean;
+        isEmbedded(): boolean;
+        processPorts(): void;
+        startBatch(name: string, options?: any): this;
+        stopBatch(name: string, options?: any): this;
+        unembed(cell: Cell, options?: any): this;
+    }
 
-        class Element extends Cell {
-            translate(tx: number, ty?: number, options?: TranslateOptions): this;
-            position(options?: { parentRelative: boolean }): Point;
-            position(x: number, y: number, options?: { parentRelative?: boolean }): this;
-            resize(width: number, height: number, options?: { direction?: 'left' | 'right' | 'top' | 'bottom' | 'top-right' | 'top-left' | 'bottom-left' | 'bottom-right' }): this;
-            rotate(deg: number, absolute?: boolean, origin?: Point): this;
-            embed(cell: Cell): this;
-            unembed(cell: Cell): this;
-            getEmbeddedCells(options?: ExploreOptions): Cell[];
-            fitEmbeds(options?: { deep?: boolean, padding?: Padding }): this;
-            getBBox(options?: any): BBox;
-            findView(paper: Paper): ElementView;
-            isElement(): boolean;
-            scale(scaleX: number, scaleY: number, origin?: Point, options?: any): this;
-            addPort(port: any, opt?: any): this;
-            addPorts(ports: any[], opt?: any): this;
-            removePort(port: any, opt?: any): this;
-            hasPorts(): boolean;
-            hasPort(id: string): boolean;
-            getPorts(): any[];
-            getPort(id: string): any;
-            getPortIndex(port: any): number;
-            portProp(portId: string, path: any, value?: any, opt?: any): joint.dia.Element;
-        }
+    type Padding = number | {
+        top?: number;
+        right?: number;
+        bottom?: number;
+        left?: number
+    };
 
-        interface CSSSelector {
-            [key: string]: string | number | Object; // Object added to support special attributes like filter http://jointjs.com/api#SpecialAttributes:filter
-        }
+    class Element extends Cell {
+        translate(tx: number, ty?: number, options?: TranslateOptions): this;
+        position(options?: { parentRelative: boolean }): Point;
+        position(x: number, y: number, options?: { parentRelative?: boolean }): this;
+        resize(width: number, height: number, options?: { direction?: 'left' | 'right' | 'top' | 'bottom' | 'top-right' | 'top-left' | 'bottom-left' | 'bottom-right' }): this;
+        rotate(deg: number, absolute?: boolean, origin?: Point): this;
+        embed(cell: Cell): this;
+        unembed(cell: Cell): this;
+        getEmbeddedCells(options?: ExploreOptions): Cell[];
+        fitEmbeds(options?: { deep?: boolean, padding?: Padding }): this;
+        getBBox(options?: any): BBox;
+        findView(paper: Paper): ElementView;
+        isElement(): boolean;
+        scale(scaleX: number, scaleY: number, origin?: Point, options?: any): this;
+        addPort(port: any, opt?: any): this;
+        addPorts(ports: any[], opt?: any): this;
+        removePort(port: any, opt?: any): this;
+        hasPorts(): boolean;
+        hasPort(id: string): boolean;
+        getPorts(): any[];
+        getPort(id: string): any;
+        getPortIndex(port: any): number;
+        portProp(portId: string, path: any, value?: any, opt?: any): joint.dia.Element;
+    }
 
-        interface SVGAttributes {
-            [selector: string]: CSSSelector;
-        }
+    interface CSSSelector {
+        [key: string]: string | number | Object; // Object added to support special attributes like filter http://jointjs.com/api#SpecialAttributes:filter
+    }
 
-        interface CellAttributes {
-            [key: string]: any;
-        }
+    interface SVGAttributes {
+        [selector: string]: CSSSelector;
+    }
 
-        interface TextAttrs extends SVGAttributes {
-            text?: {
-                [key: string]: string | number;
-                text?: string;
-            };
-        }
+    interface CellAttributes {
+        [key: string]: any;
+    }
 
-        interface Label {
-            position: number;
-            attrs?: TextAttrs;
-        }
-        interface LinkAttributes extends CellAttributes {
-            source?: Point | { id: string, selector?: string, port?: string };
-            target?: Point | { id: string, selector?: string, port?: string };
-            labels?: Label[];
-            vertices?: Point[];
-            smooth?: boolean;
-            attrs?: TextAttrs;
-            z?: number;
-        }
-
-        class Link extends Cell {
-            markup: string;
-            labelMarkup: string;
-            toolMakup: string;
-            vertexMarkup: string;
-            arrowHeadMarkup: string;
-
-            constructor(attributes?: LinkAttributes, options?: Object);
-            disconnect(): this;
-            label(index?: number): any;
-            label(index: number, value: Label): this;
-            reparent(options?: any): Element;
-            findView(paper: Paper): LinkView;
-            getSourceElement(): Element;
-            getTargetElement(): Element;
-            hasLoop(options?: { deep?: boolean }): boolean;
-            applyToPoints(fn: Function, options?: any): this;
-            getRelationshipAncestor(): Element;
-            isLink(): boolean;
-            isRelationshipEmbeddedIn(element: Element): boolean;
-            scale(sx: number, sy: number, origin: Point, optionts?: any): this;
-            translate(tx: number, ty: number, options?: any): this;
-        }
-
-        interface ManhattanRouterArgs {
-            excludeTypes?: string[];
-            excludeEnds?: 'source' | 'target';
-            startDirections?: ['left' | 'right' | 'top' | 'bottom'];
-            endDirections?: ['left' | 'right' | 'top' | 'bottom'];
-        }
-
-        interface PaperOptions extends Backbone.ViewOptions<Graph> {
-            el?: string | JQuery | HTMLElement;
-            width?: number;
-            height?: number;
-            origin?: Point;
-            gridSize?: number;
-            perpendicularLinks?: boolean;
-            elementView?: (element: Element) => ElementView | ElementView;
-            linkView?: (link: Link) => LinkView | LinkView;
-            defaultLink?: ((cellView: CellView, magnet: SVGElement) => Link) | Link;
-            defaultRouter?: ((vertices: Point[], args: Object, linkView: LinkView) => Point[]) | { name: string, args?: ManhattanRouterArgs };
-            defaultConnector?: ((sourcePoint: Point, targetPoint: Point, vertices: Point[], args: Object, linkView: LinkView) => string) | { name: string, args?: { radius?: number } };
-            interactive?: ((cellView: CellView, event: string) => boolean) | boolean | { vertexAdd?: boolean, vertexMove?: boolean, vertexRemove?: boolean, arrowheadMove?: boolean };
-            validateMagnet?: (cellView: CellView, magnet: SVGElement) => boolean;
-            validateConnection?: (cellViewS: CellView, magnetS: SVGElement, cellViewT: CellView, magnetT: SVGElement, end: 'source' | 'target', linkView: LinkView) => boolean;
-            linkConnectionPoint?: (linkView: LinkView, view: ElementView, magnet: SVGElement, reference: Point) => Point;
-            snapLinks?: boolean | { radius: number };
-            linkPinning?: boolean;
-            markAvailable?: boolean;
-            async?: boolean | { batchZise: number };
-            embeddingMode?: boolean;
-            validateEmbedding?: (childView: ElementView, parentView: ElementView) => boolean;
-            restrictTranslate?: ((elementView: ElementView) => BBox) | boolean;
-            guard?: (evt: Event, view: CellView) => boolean;
-            multiLinks?: boolean;
-            cellViewNamespace?: Object;
-            /** useful undocumented option */
-            clickThreshold?: number;
-            highlighting?: any;
-        }
-
-        interface ScaleContentOptions {
-            padding?: number;
-            preserveAspectRatio?: boolean;
-            minScale?: number;
-            minScaleX?: number;
-            minScaleY?: number;
-            maxScale?: number;
-            maxScaleX?: number;
-            maxScaleY?: number;
-            scaleGrid?: number;
-            fittingBBox?: BBox;
-        }
-
-        interface FitToContentOptions {
-            gridWidth?: number;
-            gridHeight?: number;
-            padding?: Padding;
-            allowNewOrigin?: 'negative' | 'positive' | 'any';
-            minWidth?: number;
-            minHeight?: number;
-            maxWidth?: number;
-            maxHeight?: number;
-        }
-
-        class Paper extends Backbone.View<Graph> {
-            constructor(options?: PaperOptions);
-            options: PaperOptions;
-            svg: SVGElement;
-            viewport: SVGGElement;
-            defs: SVGDefsElement;
-            setDimensions(width: number, height: number): void;
-            setOrigin(x: number, y: number): void;
-            scale(sx: number, sy?: number, ox?: number, oy?: number): this;
-            findView(element: any): CellView;
-            findViewByModel(model: Cell | string): CellView;
-            findViewsFromPoint(point: Point): ElementView[];
-            findViewsInArea(rect: BBox, options?: { strict?: boolean }): CellView[];
-            fitToContent(options?: FitToContentOptions): void;
-            scaleContentToFit(options?: ScaleContentOptions): void;
-            getContentBBox(): BBox;
-            clientToLocalPoint(p: Point): Point;
-
-            rotate(deg: number, ox?: number, oy?: number): Paper;      // @todo not released yet though it's in the source code already
-
-            afterRenderViews(): void;
-            asyncRenderViews(cells: Cell[], options?: any): void;
-            beforeRenderViews(cells: Cell[]): Cell[];
-            cellMouseout(evt: Event): void;
-            cellMouseover(evt: Event): void;
-            clearGrid(): this;
-            contextmenu(evt: Event): void;
-            createViewForModel(cell: Cell): CellView;
-            drawGrid(options?: any): this;
-            fitToContent(gridWidth?: number, gridHeight?: number, padding?: number, options?: any): void;
-            getArea(): BBox;
-            getDefaultLink(cellView: CellView, magnet: HTMLElement): Link;
-            getModelById(id: string): Cell;
-            getRestrictedArea(): BBox;
-            guard(evt: Event, view: CellView): boolean;
-            linkAllowed(linkViewOrModel: LinkView | Link): boolean;
-            mouseclick(evt: Event): void;
-            mousedblclick(evt: Event): void;
-            mousewheel(evt: Event): void;
-            onCellAdded(cell: Cell, graph: Graph, options: Object): void;
-            onCellHighlight(cellView: CellView, magnetEl: HTMLElement, options?: any): void;
-            onCellUnhighlight(cellView: CellView, magnetEl: HTMLElement, options?: any): void;
-            onRemove(): void;
-            pointerdown(evt: Event): void;
-            pointermove(evt: Event): void;
-            pointerup(evt: Event): void;
-            remove(): this;
-            removeView(cell: Cell): CellView;
-            removeViews(): void;
-            renderView(cell: Cell): CellView;
-            resetViews(cellsCollection: Cell[], options: any): void;
-            resolveHighlighter(options?: any): boolean | Object;
-            setGridSize(gridSize: number): this;
-            setInteractivity(value: any): void;
-            snapToGrid(p: Point): Point;
-            sortViews(): void;
-        }
-
-
-        interface GradientOptions {
-            type: 'linearGradient' | 'radialGradient';
-            stops: Array<{
-                offset: string;
-                color: string;
-                opacity?: number;
-            }>;
-        }
-        class CellViewGeneric<T extends Backbone.Model> extends Backbone.View<T> {
-            getBBox(options?: { useModelGeometry?: boolean }): BBox;
-            highlight(el?: any, options?: any): this;
-            unhighlight(el?: any, options?: any): this;
-            applyFilter(selector: string | HTMLElement, filter: Object): void;
-            applyGradient(selector: string | HTMLElement, attr: 'fill' | 'stroke', gradient: GradientOptions): void;
-            can(feature: string): boolean;
-            findBySelector(selector: string): JQuery;
-            findMagnet(el: any): HTMLElement;
-            getSelector(el: HTMLElement, prevSelector: string): string;
-            getStrokeBBox(el: any): BBox; // string|HTMLElement|Vectorizer
-            mouseout(evt: Event): void;
-            mouseover(evt: Event): void;
-            mousewheel(evt: Event, x: number, y: number, delta: number): void
-            notify(eventName: string): void;
-            onChangeAttrs(cell: Cell, attrs: Backbone.ViewOptions<T>, options?: any): this;
-            onSetTheme(oldTheme: string, newTheme: string): void;
-            pointerclick(evt: Event, x: number, y: number): void;
-            pointerdblclick(evt: Event, x: number, y: number): void;
-            pointerdown(evt: Event, x: number, y: number): void;
-            pointermove(evt: Event, x: number, y: number): void;
-            pointerup(evt: Event, x: number, y: number): void;
-            remove(): this;
-            setInteractivity(value: any): void;
-            setTheme(theme: string, options?: any): this;
-        }
-
-        class CellView extends CellViewGeneric<Cell> { }
-
-        interface ElementViewAttributes {
-            style?: string;
+    interface TextAttrs extends SVGAttributes {
+        text?: {
+            [key: string]: string | number;
             text?: string;
-            html?: string;
-            "ref-x"?: string | number;
-            "ref-y"?: string | number;
-            "ref-dx"?: number;
-            "ref-dy"?: number;
-            "ref-width"?: string | number;
-            "ref-height"?: string | number;
+        };
+    }
+
+    interface Label {
+        position: number;
+        attrs?: TextAttrs;
+    }
+    interface LinkAttributes extends CellAttributes {
+        source?: Point | { id: string, selector?: string, port?: string };
+        target?: Point | { id: string, selector?: string, port?: string };
+        labels?: Label[];
+        vertices?: Point[];
+        smooth?: boolean;
+        attrs?: TextAttrs;
+        z?: number;
+    }
+
+    class Link extends Cell {
+        markup: string;
+        labelMarkup: string;
+        toolMakup: string;
+        vertexMarkup: string;
+        arrowHeadMarkup: string;
+
+        constructor(attributes?: LinkAttributes, options?: Object);
+        disconnect(): this;
+        label(index?: number): any;
+        label(index: number, value: Label): this;
+        reparent(options?: any): Element;
+        findView(paper: Paper): LinkView;
+        getSourceElement(): Element;
+        getTargetElement(): Element;
+        hasLoop(options?: { deep?: boolean }): boolean;
+        applyToPoints(fn: Function, options?: any): this;
+        getRelationshipAncestor(): Element;
+        isLink(): boolean;
+        isRelationshipEmbeddedIn(element: Element): boolean;
+        scale(sx: number, sy: number, origin: Point, optionts?: any): this;
+        translate(tx: number, ty: number, options?: any): this;
+    }
+
+    interface ManhattanRouterArgs {
+        excludeTypes?: string[];
+        excludeEnds?: 'source' | 'target';
+        startDirections?: ['left' | 'right' | 'top' | 'bottom'];
+        endDirections?: ['left' | 'right' | 'top' | 'bottom'];
+    }
+
+    interface PaperOptions extends Backbone.ViewOptions<Graph> {
+        el?: string | JQuery | HTMLElement;
+        width?: number;
+        height?: number;
+        origin?: Point;
+        gridSize?: number;
+        perpendicularLinks?: boolean;
+        elementView?: (element: Element) => ElementView | ElementView;
+        linkView?: (link: Link) => LinkView | LinkView;
+        defaultLink?: ((cellView: CellView, magnet: SVGElement) => Link) | Link;
+        defaultRouter?: ((vertices: Point[], args: Object, linkView: LinkView) => Point[]) | { name: string, args?: ManhattanRouterArgs };
+        defaultConnector?: ((sourcePoint: Point, targetPoint: Point, vertices: Point[], args: Object, linkView: LinkView) => string) | { name: string, args?: { radius?: number } };
+        interactive?: ((cellView: CellView, event: string) => boolean) | boolean | { vertexAdd?: boolean, vertexMove?: boolean, vertexRemove?: boolean, arrowheadMove?: boolean };
+        validateMagnet?: (cellView: CellView, magnet: SVGElement) => boolean;
+        validateConnection?: (cellViewS: CellView, magnetS: SVGElement, cellViewT: CellView, magnetT: SVGElement, end: 'source' | 'target', linkView: LinkView) => boolean;
+        linkConnectionPoint?: (linkView: LinkView, view: ElementView, magnet: SVGElement, reference: Point) => Point;
+        snapLinks?: boolean | { radius: number };
+        linkPinning?: boolean;
+        markAvailable?: boolean;
+        async?: boolean | { batchZise: number };
+        embeddingMode?: boolean;
+        validateEmbedding?: (childView: ElementView, parentView: ElementView) => boolean;
+        restrictTranslate?: ((elementView: ElementView) => BBox) | boolean;
+        guard?: (evt: Event, view: CellView) => boolean;
+        multiLinks?: boolean;
+        cellViewNamespace?: Object;
+        /** useful undocumented option */
+        clickThreshold?: number;
+        highlighting?: any;
+    }
+
+    interface ScaleContentOptions {
+        padding?: number;
+        preserveAspectRatio?: boolean;
+        minScale?: number;
+        minScaleX?: number;
+        minScaleY?: number;
+        maxScale?: number;
+        maxScaleX?: number;
+        maxScaleY?: number;
+        scaleGrid?: number;
+        fittingBBox?: BBox;
+    }
+
+    interface FitToContentOptions {
+        gridWidth?: number;
+        gridHeight?: number;
+        padding?: Padding;
+        allowNewOrigin?: 'negative' | 'positive' | 'any';
+        minWidth?: number;
+        minHeight?: number;
+        maxWidth?: number;
+        maxHeight?: number;
+    }
+
+    class Paper extends Backbone.View<Graph> {
+        constructor(options?: PaperOptions);
+        options: PaperOptions;
+        svg: SVGElement;
+        viewport: SVGGElement;
+        defs: SVGDefsElement;
+        setDimensions(width: number, height: number): void;
+        setOrigin(x: number, y: number): void;
+        scale(sx: number, sy?: number, ox?: number, oy?: number): this;
+        findView(element: any): CellView;
+        findViewByModel(model: Cell | string): CellView;
+        findViewsFromPoint(point: Point): ElementView[];
+        findViewsInArea(rect: BBox, options?: { strict?: boolean }): CellView[];
+        fitToContent(options?: FitToContentOptions): void;
+        scaleContentToFit(options?: ScaleContentOptions): void;
+        getContentBBox(): BBox;
+        clientToLocalPoint(p: Point): Point;
+
+        rotate(deg: number, ox?: number, oy?: number): Paper;      // @todo not released yet though it's in the source code already
+
+        afterRenderViews(): void;
+        asyncRenderViews(cells: Cell[], options?: any): void;
+        beforeRenderViews(cells: Cell[]): Cell[];
+        cellMouseout(evt: Event): void;
+        cellMouseover(evt: Event): void;
+        clearGrid(): this;
+        contextmenu(evt: Event): void;
+        createViewForModel(cell: Cell): CellView;
+        drawGrid(options?: any): this;
+        fitToContent(gridWidth?: number, gridHeight?: number, padding?: number, options?: any): void;
+        getArea(): BBox;
+        getDefaultLink(cellView: CellView, magnet: HTMLElement): Link;
+        getModelById(id: string): Cell;
+        getRestrictedArea(): BBox;
+        guard(evt: Event, view: CellView): boolean;
+        linkAllowed(linkViewOrModel: LinkView | Link): boolean;
+        mouseclick(evt: Event): void;
+        mousedblclick(evt: Event): void;
+        mousewheel(evt: Event): void;
+        onCellAdded(cell: Cell, graph: Graph, options: Object): void;
+        onCellHighlight(cellView: CellView, magnetEl: HTMLElement, options?: any): void;
+        onCellUnhighlight(cellView: CellView, magnetEl: HTMLElement, options?: any): void;
+        onRemove(): void;
+        pointerdown(evt: Event): void;
+        pointermove(evt: Event): void;
+        pointerup(evt: Event): void;
+        remove(): this;
+        removeView(cell: Cell): CellView;
+        removeViews(): void;
+        renderView(cell: Cell): CellView;
+        resetViews(cellsCollection: Cell[], options: any): void;
+        resolveHighlighter(options?: any): boolean | Object;
+        setGridSize(gridSize: number): this;
+        setInteractivity(value: any): void;
+        snapToGrid(p: Point): Point;
+        sortViews(): void;
+    }
+
+
+    interface GradientOptions {
+        type: 'linearGradient' | 'radialGradient';
+        stops: Array<{
+            offset: string;
+            color: string;
+            opacity?: number;
+        }>;
+    }
+    class CellViewGeneric<T extends Backbone.Model> extends Backbone.View<T> {
+        getBBox(options?: { useModelGeometry?: boolean }): BBox;
+        highlight(el?: any, options?: any): this;
+        unhighlight(el?: any, options?: any): this;
+        applyFilter(selector: string | HTMLElement, filter: Object): void;
+        applyGradient(selector: string | HTMLElement, attr: 'fill' | 'stroke', gradient: GradientOptions): void;
+        can(feature: string): boolean;
+        findBySelector(selector: string): JQuery;
+        findMagnet(el: any): HTMLElement;
+        getSelector(el: HTMLElement, prevSelector: string): string;
+        getStrokeBBox(el: any): BBox; // string|HTMLElement|Vectorizer
+        mouseout(evt: Event): void;
+        mouseover(evt: Event): void;
+        mousewheel(evt: Event, x: number, y: number, delta: number): void
+        notify(eventName: string): void;
+        onChangeAttrs(cell: Cell, attrs: Backbone.ViewOptions<T>, options?: any): this;
+        onSetTheme(oldTheme: string, newTheme: string): void;
+        pointerclick(evt: Event, x: number, y: number): void;
+        pointerdblclick(evt: Event, x: number, y: number): void;
+        pointerdown(evt: Event, x: number, y: number): void;
+        pointermove(evt: Event, x: number, y: number): void;
+        pointerup(evt: Event, x: number, y: number): void;
+        remove(): this;
+        setInteractivity(value: any): void;
+        setTheme(theme: string, options?: any): this;
+    }
+
+    class CellView extends CellViewGeneric<Cell> { }
+
+    interface ElementViewAttributes {
+        style?: string;
+        text?: string;
+        html?: string;
+        "ref-x"?: string | number;
+        "ref-y"?: string | number;
+        "ref-dx"?: number;
+        "ref-dy"?: number;
+        "ref-width"?: string | number;
+        "ref-height"?: string | number;
+        ref?: string;
+        "x-alignment"?: 'middle' | 'right' | number;
+        "y-alignment"?: 'middle' | 'bottom' | number;
+        port?: string;
+    }
+    class ElementView extends CellViewGeneric<Element> {
+        scale(sx: number, sy: number): void; // @todo Documented in source but not released
+        finalizeEmbedding(options?: any): void;
+        getBBox(options?: any): BBox;
+        pointerdown(evt: Event, x: number, y: number): void;
+        pointermove(evt: Event, x: number, y: number): void;
+        pointerup(evt: Event, x: number, y: number): void;
+        positionRelative(vel: any, bbox: BBox, attributes: ElementViewAttributes, nodesBySelector?: Object): void; // Vectorizer
+        prepareEmbedding(options?: any): void;
+        processEmbedding(options?: any): void;
+        render(): this;
+        renderMarkup(): void;
+        resize(): void;
+        rotate(): void;
+        translate(model: Backbone.Model, changes?: any, options?: any): void;
+        update(cell: Cell, renderingOnlyAttrs?: Object): void;
+    }
+
+    class LinkView extends CellViewGeneric<Link> {
+        options: {
+            shortLinkLength?: number,
+            doubleLinkTools?: boolean,
+            longLinkLength?: number,
+            linkToolsOffset?: number,
+            doubleLinkToolsOffset?: number,
+            sampleInterval: number
+        };
+        getConnectionLength(): number;
+        sendToken(token: SVGElement, duration?: number, callback?: () => void): void;
+        addVertex(vertex: Point): number;
+        getPointAtLength(length: number): Point; // Marked as public api in source but not in the documents
+        createWatcher(endType: { id: string }): Function;
+        findRoute(oldVertices: Point[]): Point[];
+        getConnectionPoint(end: 'source' | 'target', selectorOrPoint: Element | Point, referenceSelectorOrPoint: Element | Point): Point;
+        getPathData(vertices: Point[]): any;
+        onEndModelChange(endType: 'source' | 'target', endModel?: Element, opt?: any): void;
+        onLabelsChange(): void;
+        onSourceChange(cell: Cell, sourceEnd: { id: string }, options: any): void;
+        onTargetChange(cell: Cell, targetEnd: { id: string }, options: any): void;
+        onToolsChange(): void;
+        onVerticesChange(cell: Cell, changed: any, options: any): void;
+        pointerdown(evt: Event, x: number, y: number): void;
+        pointermove(evt: Event, x: number, y: number): void;
+        pointerup(evt: Event, x: number, y: number): void;
+        removeVertex(idx: number): this;
+        render(): this;
+        renderArrowheadMarkers(): this;
+        renderLabels(): this;
+        renderTools(): this;
+        renderVertexMarkers(): this;
+        startArrowheadMove(end: 'source' | 'target', options?: any): void;
+        startListening(): void;
+        update(model: any, attributes: any, options?: any): this;
+        updateArrowheadMarkers(): this;
+        updateAttributes(): void;
+        updateConnection(options?: any): void;
+        updateLabelPositions(): this;
+        updateToolsPosition(): this;
+    }
+}
+
+export namespace ui { }
+
+export namespace shapes {
+    interface GenericAttributes<T> extends dia.CellAttributes {
+        position?: dia.Point;
+        size?: dia.Size;
+        angle?: number;
+        attrs?: T;
+    }
+    interface ShapeAttrs extends dia.CSSSelector {
+        fill?: string;
+        stroke?: string;
+        r?: string | number;
+        rx?: string | number;
+        ry?: string | number;
+        cx?: string | number;
+        cy?: string | number;
+        height?: string | number;
+        width?: string | number;
+        transform?: string;
+        points?: string;
+        'stroke-width'?: string | number;
+        'ref-x'?: string | number;
+        'ref-y'?: string | number;
+        ref?: string
+    }
+
+    namespace basic {
+        class Generic extends dia.Element {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        interface RectAttrs extends dia.TextAttrs {
+            rect?: ShapeAttrs;
+        }
+        class Rect extends Generic {
+            constructor(attributes?: GenericAttributes<RectAttrs>, options?: Object);
+        }
+        class Text extends Generic {
+            constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
+        }
+        interface CircleAttrs extends dia.TextAttrs {
+            circle?: ShapeAttrs;
+        }
+        class Circle extends Generic {
+            constructor(attributes?: GenericAttributes<CircleAttrs>, options?: Object);
+        }
+        interface EllipseAttrs extends dia.TextAttrs {
+            ellipse?: ShapeAttrs;
+        }
+        class Ellipse extends Generic {
+            constructor(attributes?: GenericAttributes<EllipseAttrs>, options?: Object);
+        }
+        interface PolygonAttrs extends dia.TextAttrs {
+            polygon?: ShapeAttrs;
+        }
+        class Polygon extends Generic {
+            constructor(attributes?: GenericAttributes<PolygonAttrs>, options?: Object);
+        }
+        interface PolylineAttrs extends dia.TextAttrs {
+            polyline?: ShapeAttrs;
+        }
+        class Polyline extends Generic {
+            constructor(attributes?: GenericAttributes<PolylineAttrs>, options?: Object);
+        }
+        class Image extends Generic {
+            constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
+        }
+        interface PathAttrs extends dia.TextAttrs {
+            path?: ShapeAttrs;
+        }
+        class Path extends Generic {
+            constructor(attributes?: GenericAttributes<PathAttrs>, options?: Object);
+        }
+        interface RhombusAttrs extends dia.TextAttrs {
+            path?: ShapeAttrs;
+        }
+        class Rhombus extends Generic {
+            constructor(attributes?: GenericAttributes<RhombusAttrs>, options?: Object);
+        }
+        interface TextBlockAttrs extends dia.TextAttrs {
+            rect?: ShapeAttrs;
+        }
+        class TextBlock extends Generic {
+            constructor(attributes?: GenericAttributes<TextBlockAttrs>, options?: Object);
+            updateSize(cell: dia.Cell, size: dia.Size): void;
+            updateContent(cell: dia.Cell, content: string): void;
+        }
+    }
+
+    namespace chess {
+        class KingWhite extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        class KingBlack extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        class QueenWhite extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        class QueenBlack extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        class RookWhite extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        class RookBlack extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        class BishopWhite extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        class BishopBlack extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        class KnightWhite extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        class KnightBlack extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        class PawnWhite extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        class PawnBlack extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+    }
+
+    namespace devs {
+        interface ModelAttributes extends GenericAttributes<dia.SVGAttributes> {
+            inPorts?: string[];
+            outPorts?: string[];
+            ports?: Object;
+        }
+        class Model extends basic.Generic {
+            constructor(attributes?: ModelAttributes, options?: Object);
+            changeInGroup(properties: any, opt?: any): boolean;
+            changeOutGroup(properties: any, opt?: any): boolean;
+            createPortItem(group: string, port: string): any;
+            createPortItems(group: string, ports: string[]): any[];
+            addOutPort(port: string, opt?: any): this;
+            addInPort(port: string, opt?: any): this;
+            removeOutPort(port: string, opt?: any): this;
+            removeInPort(port: string, opt?: any): this;
+        }
+        class Coupled extends Model {
+            constructor(attributes?: ModelAttributes, options?: Object);
+        }
+        class Atomic extends Model {
+            constructor(attributes?: ModelAttributes, options?: Object);
+        }
+        class Link extends dia.Link {
+            constructor(attributes?: dia.LinkAttributes, options?: Object);
+        }
+    }
+
+    namespace erd {
+        class Entity extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
+        }
+        class WeakEntity extends Entity {
+            constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
+        }
+        class Relationship extends dia.Element {
+            constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
+        }
+        class IdentifyingRelationship extends Relationship {
+            constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
+        }
+        interface AttributeAttrs extends dia.TextAttrs {
+            ellipse?: ShapeAttrs;
+        }
+        class Attribute extends dia.Element {
+            constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
+        }
+        class Multivalued extends Attribute {
+            constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
+        }
+        class Derived extends Attribute {
+            constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
+        }
+        class Key extends Attribute {
+            constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
+        }
+        class Normal extends Attribute {
+            constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
+        }
+        interface ISAAttrs extends dia.Element {
+            polygon?: ShapeAttrs;
+        }
+        class ISA extends dia.Element {
+            constructor(attributes?: GenericAttributes<ISAAttrs>, options?: Object);
+        }
+        class Line extends dia.Link {
+            constructor(attributes?: dia.LinkAttributes, options?: Object);
+            cardinality(value: string | number): void;
+        }
+    }
+
+    namespace fsa {
+        class State extends basic.Circle {
+            constructor(attributes?: GenericAttributes<basic.CircleAttrs>, options?: Object);
+        }
+        class StartState extends dia.Element {
+            constructor(attributes?: GenericAttributes<basic.CircleAttrs>, options?: Object);
+        }
+        class EndState extends dia.Element {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        class Arrow extends dia.Link {
+            constructor(attributes?: dia.LinkAttributes, options?: Object);
+        }
+    }
+
+    namespace logic {
+        interface LogicAttrs extends ShapeAttrs {
             ref?: string;
-            "x-alignment"?: 'middle' | 'right' | number;
-            "y-alignment"?: 'middle' | 'bottom' | number;
+            'ref-x'?: number | string;
+            'ref-dx'?: number | string;
+            'ref-y'?: number | string;
+            'ref-dy'?: number | string;
+            magnet?: boolean;
+            'class'?: string;
             port?: string;
         }
-        class ElementView extends CellViewGeneric<Element> {
-            scale(sx: number, sy: number): void; // @todo Documented in source but not released
-            finalizeEmbedding(options?: any): void;
-            getBBox(options?: any): BBox;
-            pointerdown(evt: Event, x: number, y: number): void;
-            pointermove(evt: Event, x: number, y: number): void;
-            pointerup(evt: Event, x: number, y: number): void;
-            positionRelative(vel: any, bbox: BBox, attributes: ElementViewAttributes, nodesBySelector?: Object): void; // Vectorizer
-            prepareEmbedding(options?: any): void;
-            processEmbedding(options?: any): void;
-            render(): this;
-            renderMarkup(): void;
-            resize(): void;
-            rotate(): void;
-            translate(model: Backbone.Model, changes?: any, options?: any): void;
-            update(cell: Cell, renderingOnlyAttrs?: Object): void;
+        interface IOAttrs extends dia.TextAttrs {
+            circle?: LogicAttrs;
         }
-
-        class LinkView extends CellViewGeneric<Link> {
-            options: {
-                shortLinkLength?: number,
-                doubleLinkTools?: boolean,
-                longLinkLength?: number,
-                linkToolsOffset?: number,
-                doubleLinkToolsOffset?: number,
-                sampleInterval: number
-            };
-            getConnectionLength(): number;
-            sendToken(token: SVGElement, duration?: number, callback?: () => void): void;
-            addVertex(vertex: Point): number;
-            getPointAtLength(length: number): Point; // Marked as public api in source but not in the documents
-            createWatcher(endType: { id: string }): Function;
-            findRoute(oldVertices: Point[]): Point[];
-            getConnectionPoint(end: 'source' | 'target', selectorOrPoint: Element | Point, referenceSelectorOrPoint: Element | Point): Point;
-            getPathData(vertices: Point[]): any;
-            onEndModelChange(endType: 'source' | 'target', endModel?: Element, opt?: any): void;
-            onLabelsChange(): void;
-            onSourceChange(cell: Cell, sourceEnd: { id: string }, options: any): void;
-            onTargetChange(cell: Cell, targetEnd: { id: string }, options: any): void;
-            onToolsChange(): void;
-            onVerticesChange(cell: Cell, changed: any, options: any): void;
-            pointerdown(evt: Event, x: number, y: number): void;
-            pointermove(evt: Event, x: number, y: number): void;
-            pointerup(evt: Event, x: number, y: number): void;
-            removeVertex(idx: number): this;
-            render(): this;
-            renderArrowheadMarkers(): this;
-            renderLabels(): this;
-            renderTools(): this;
-            renderVertexMarkers(): this;
-            startArrowheadMove(end: 'source' | 'target', options?: any): void;
-            startListening(): void;
-            update(model: any, attributes: any, options?: any): this;
-            updateArrowheadMarkers(): this;
-            updateAttributes(): void;
-            updateConnection(options?: any): void;
-            updateLabelPositions(): this;
-            updateToolsPosition(): this;
+        class Gate extends basic.Generic {
+            constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
+        }
+        class IO extends Gate {
+            constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
+        }
+        class Input extends IO {
+            constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
+        }
+        class Output extends IO {
+            constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
+        }
+        class Gate11 extends Gate {
+            constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
+        }
+        class Gate21 extends Gate {
+            constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
+        }
+        interface Image {
+            'xlink:href'?: string;
+        }
+        interface ImageAttrs extends LogicAttrs {
+            image?: Image;
+        }
+        class Repeater extends Gate11 {
+            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
+            operation(input: any): any;
+        }
+        class Note extends Gate11 {
+            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
+            operation(input: any): boolean;
+        }
+        class Or extends Gate21 {
+            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
+            operation(input1: any, input2: any): boolean;
+        }
+        class And extends Gate21 {
+            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
+            operation(input1: any, input2: any): boolean;
+        }
+        class Nor extends Gate21 {
+            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
+            operation(input1: any, input2: any): boolean;
+        }
+        class Nand extends Gate21 {
+            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
+            operation(input1: any, input2: any): boolean;
+        }
+        class Xor extends Gate21 {
+            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
+            operation(input1: any, input2: any): boolean;
+        }
+        class Xnor extends Gate21 {
+            constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
+            operation(input1: any, input2: any): boolean;
+        }
+        interface WireArgs extends dia.LinkAttributes {
+            router?: Object;
+            connector?: Object;
+        }
+        class Wire extends dia.Link {
+            constructor(attributes?: WireArgs, options?: Object);
         }
     }
 
-    namespace ui { }
-
-    namespace shapes {
-        interface GenericAttributes<T> extends dia.CellAttributes {
-            position?: dia.Point;
-            size?: dia.Size;
-            angle?: number;
-            attrs?: T;
+    namespace org {
+        interface MemberAttrs {
+            rect?: ShapeAttrs;
+            image?: ShapeAttrs;
         }
-        interface ShapeAttrs extends dia.CSSSelector {
-            fill?: string;
-            stroke?: string;
-            r?: string | number;
-            rx?: string | number;
-            ry?: string | number;
-            cx?: string | number;
-            cy?: string | number;
-            height?: string | number;
-            width?: string | number;
-            transform?: string;
-            points?: string;
-            'stroke-width'?: string | number;
-            'ref-x'?: string | number;
-            'ref-y'?: string | number;
-            ref?: string
+        class Member extends dia.Element {
+            constructor(attributes?: GenericAttributes<MemberAttrs>, options?: Object);
         }
-
-        namespace basic {
-            class Generic extends dia.Element {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            interface RectAttrs extends dia.TextAttrs {
-                rect?: ShapeAttrs;
-            }
-            class Rect extends Generic {
-                constructor(attributes?: GenericAttributes<RectAttrs>, options?: Object);
-            }
-            class Text extends Generic {
-                constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
-            }
-            interface CircleAttrs extends dia.TextAttrs {
-                circle?: ShapeAttrs;
-            }
-            class Circle extends Generic {
-                constructor(attributes?: GenericAttributes<CircleAttrs>, options?: Object);
-            }
-            interface EllipseAttrs extends dia.TextAttrs {
-                ellipse?: ShapeAttrs;
-            }
-            class Ellipse extends Generic {
-                constructor(attributes?: GenericAttributes<EllipseAttrs>, options?: Object);
-            }
-            interface PolygonAttrs extends dia.TextAttrs {
-                polygon?: ShapeAttrs;
-            }
-            class Polygon extends Generic {
-                constructor(attributes?: GenericAttributes<PolygonAttrs>, options?: Object);
-            }
-            interface PolylineAttrs extends dia.TextAttrs {
-                polyline?: ShapeAttrs;
-            }
-            class Polyline extends Generic {
-                constructor(attributes?: GenericAttributes<PolylineAttrs>, options?: Object);
-            }
-            class Image extends Generic {
-                constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
-            }
-            interface PathAttrs extends dia.TextAttrs {
-                path?: ShapeAttrs;
-            }
-            class Path extends Generic {
-                constructor(attributes?: GenericAttributes<PathAttrs>, options?: Object);
-            }
-            interface RhombusAttrs extends dia.TextAttrs {
-                path?: ShapeAttrs;
-            }
-            class Rhombus extends Generic {
-                constructor(attributes?: GenericAttributes<RhombusAttrs>, options?: Object);
-            }
-            interface TextBlockAttrs extends dia.TextAttrs {
-                rect?: ShapeAttrs;
-            }
-            class TextBlock extends Generic {
-                constructor(attributes?: GenericAttributes<TextBlockAttrs>, options?: Object);
-                updateSize(cell: dia.Cell, size: dia.Size): void;
-                updateContent(cell: dia.Cell, content: string): void;
-            }
-        }
-
-        namespace chess {
-            class KingWhite extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            class KingBlack extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            class QueenWhite extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            class QueenBlack extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            class RookWhite extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            class RookBlack extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            class BishopWhite extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            class BishopBlack extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            class KnightWhite extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            class KnightBlack extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            class PawnWhite extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            class PawnBlack extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-        }
-
-        namespace devs {
-            interface ModelAttributes extends GenericAttributes<dia.SVGAttributes> {
-                inPorts?: string[];
-                outPorts?: string[];
-                ports?: Object;
-            }
-            class Model extends basic.Generic {
-                constructor(attributes?: ModelAttributes, options?: Object);
-                changeInGroup(properties: any, opt?: any): boolean;
-                changeOutGroup(properties: any, opt?: any): boolean;
-                createPortItem(group: string, port: string): any;
-                createPortItems(group: string, ports: string[]): any[];
-                addOutPort(port: string, opt?: any): this;
-                addInPort(port: string, opt?: any): this;
-                removeOutPort(port: string, opt?: any): this;
-                removeInPort(port: string, opt?: any): this;
-            }
-            class Coupled extends Model {
-                constructor(attributes?: ModelAttributes, options?: Object);
-            }
-            class Atomic extends Model {
-                constructor(attributes?: ModelAttributes, options?: Object);
-            }
-            class Link extends dia.Link {
-                constructor(attributes?: dia.LinkAttributes, options?: Object);
-            }
-        }
-
-        namespace erd {
-            class Entity extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
-            }
-            class WeakEntity extends Entity {
-                constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
-            }
-            class Relationship extends dia.Element {
-                constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
-            }
-            class IdentifyingRelationship extends Relationship {
-                constructor(attributes?: GenericAttributes<dia.TextAttrs>, options?: Object);
-            }
-            interface AttributeAttrs extends dia.TextAttrs {
-                ellipse?: ShapeAttrs;
-            }
-            class Attribute extends dia.Element {
-                constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
-            }
-            class Multivalued extends Attribute {
-                constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
-            }
-            class Derived extends Attribute {
-                constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
-            }
-            class Key extends Attribute {
-                constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
-            }
-            class Normal extends Attribute {
-                constructor(attributes?: GenericAttributes<AttributeAttrs>, options?: Object);
-            }
-            interface ISAAttrs extends dia.Element {
-                polygon?: ShapeAttrs;
-            }
-            class ISA extends dia.Element {
-                constructor(attributes?: GenericAttributes<ISAAttrs>, options?: Object);
-            }
-            class Line extends dia.Link {
-                constructor(attributes?: dia.LinkAttributes, options?: Object);
-                cardinality(value: string | number): void;
-            }
-        }
-
-        namespace fsa {
-            class State extends basic.Circle {
-                constructor(attributes?: GenericAttributes<basic.CircleAttrs>, options?: Object);
-            }
-            class StartState extends dia.Element {
-                constructor(attributes?: GenericAttributes<basic.CircleAttrs>, options?: Object);
-            }
-            class EndState extends dia.Element {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            class Arrow extends dia.Link {
-                constructor(attributes?: dia.LinkAttributes, options?: Object);
-            }
-        }
-
-        namespace logic {
-            interface LogicAttrs extends ShapeAttrs {
-                ref?: string;
-                'ref-x'?: number | string;
-                'ref-dx'?: number | string;
-                'ref-y'?: number | string;
-                'ref-dy'?: number | string;
-                magnet?: boolean;
-                'class'?: string;
-                port?: string;
-            }
-            interface IOAttrs extends dia.TextAttrs {
-                circle?: LogicAttrs;
-            }
-            class Gate extends basic.Generic {
-                constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
-            }
-            class IO extends Gate {
-                constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
-            }
-            class Input extends IO {
-                constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
-            }
-            class Output extends IO {
-                constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
-            }
-            class Gate11 extends Gate {
-                constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
-            }
-            class Gate21 extends Gate {
-                constructor(attributes?: GenericAttributes<IOAttrs>, options?: Object);
-            }
-            interface Image {
-                'xlink:href'?: string;
-            }
-            interface ImageAttrs extends LogicAttrs {
-                image?: Image;
-            }
-            class Repeater extends Gate11 {
-                constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-                operation(input: any): any;
-            }
-            class Note extends Gate11 {
-                constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-                operation(input: any): boolean;
-            }
-            class Or extends Gate21 {
-                constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-                operation(input1: any, input2: any): boolean;
-            }
-            class And extends Gate21 {
-                constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-                operation(input1: any, input2: any): boolean;
-            }
-            class Nor extends Gate21 {
-                constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-                operation(input1: any, input2: any): boolean;
-            }
-            class Nand extends Gate21 {
-                constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-                operation(input1: any, input2: any): boolean;
-            }
-            class Xor extends Gate21 {
-                constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-                operation(input1: any, input2: any): boolean;
-            }
-            class Xnor extends Gate21 {
-                constructor(attributes?: GenericAttributes<ImageAttrs>, options?: Object);
-                operation(input1: any, input2: any): boolean;
-            }
-            interface WireArgs extends dia.LinkAttributes {
-                router?: Object;
-                connector?: Object;
-            }
-            class Wire extends dia.Link {
-                constructor(attributes?: WireArgs, options?: Object);
-            }
-        }
-
-        namespace org {
-            interface MemberAttrs {
-                rect?: ShapeAttrs;
-                image?: ShapeAttrs;
-            }
-            class Member extends dia.Element {
-                constructor(attributes?: GenericAttributes<MemberAttrs>, options?: Object);
-            }
-            class Arrow extends dia.Link {
-                constructor(attributes?: dia.LinkAttributes, options?: Object);
-            }
-        }
-
-        namespace pn {
-            class Place extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            class PlaceView extends dia.ElementView {
-                renderTokens(): void;
-            }
-            class Transition extends basic.Generic {
-                constructor(attributes?: GenericAttributes<basic.RectAttrs>, options?: Object);
-            }
-            class Link extends dia.Link {
-                constructor(attributes?: dia.LinkAttributes, options?: Object);
-            }
-        }
-
-        namespace uml {
-            interface ClassAttributes extends GenericAttributes<basic.RectAttrs> {
-                name: string[];
-                attributes: string[];
-                methods: string[];
-            }
-            class Class extends basic.Generic {
-                constructor(attributes?: ClassAttributes, options?: Object);
-                getClassName(): string[];
-                updateRectangles(): void;
-            }
-            class ClassView extends dia.ElementView {
-            }
-            class Abstract extends Class {
-                constructor(attributes?: ClassAttributes, options?: Object);
-            }
-            class AbstractView extends ClassView {
-                constructor(attributes?: ClassAttributes, options?: Object);
-            }
-            class Interface extends Class {
-                constructor(attributes?: ClassAttributes, options?: Object);
-            }
-            class InterfaceView extends ClassView {
-                constructor(attributes?: ClassAttributes, options?: Object);
-            }
-            class Generalization extends dia.Link {
-                constructor(attributes?: dia.LinkAttributes, options?: Object);
-            }
-            class Implementation extends dia.Link {
-                constructor(attributes?: dia.LinkAttributes, options?: Object);
-            }
-            class Aggregation extends dia.Link {
-                constructor(attributes?: dia.LinkAttributes, options?: Object);
-            }
-            class Composition extends dia.Link {
-                constructor(attributes?: dia.LinkAttributes, options?: Object);
-            }
-            class Association extends dia.Link {
-                constructor(attributes?: dia.LinkAttributes, options?: Object);
-            }
-            interface StateAttributes extends GenericAttributes<ShapeAttrs> {
-                events?: string[];
-            }
-            class State extends basic.Generic {
-                constructor(attributes?: GenericAttributes<basic.CircleAttrs>, options?: Object);
-                updateName(): void;
-                updateEvents(): void;
-                updatePath(): void;
-            }
-            class StartState extends basic.Circle {
-                constructor(attributes?: GenericAttributes<basic.CircleAttrs>, options?: Object);
-            }
-            class EndState extends basic.Generic {
-                constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
-            }
-            class Transition extends dia.Link {
-                constructor(attributes?: dia.LinkAttributes, options?: Object);
-            }
+        class Arrow extends dia.Link {
+            constructor(attributes?: dia.LinkAttributes, options?: Object);
         }
     }
 
-    namespace util {
-
-        namespace format {
-            export function number(specifier: string, value: number): string;
+    namespace pn {
+        class Place extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        class PlaceView extends dia.ElementView {
+            renderTokens(): void;
+        }
+        class Transition extends basic.Generic {
+            constructor(attributes?: GenericAttributes<basic.RectAttrs>, options?: Object);
+        }
+        class Link extends dia.Link {
+            constructor(attributes?: dia.LinkAttributes, options?: Object);
         }
-
-        export function uuid(): string;
-        export function guid(obj?: Object): string;
-        export function nextFrame(callback: () => void, context?: Object): number;
-        export function cancelFrame(requestId: number): void;
-        export function flattenObject(object: Object, delim: string, stop: (node: any) => boolean): any;
-        export function getByPath(object: Object, path: string, delim: string): any;
-        export function setByPath(object: Object, path: string, value: Object, delim: string): any;
-        export function unsetByPath(object: Object, path: string, delim: string): any;
-        export function breakText(text: string, size: dia.Size, attrs?: dia.SVGAttributes, options?: { svgDocument?: SVGElement }): string;
-        export function normalizeSides(box: number | { x?: number, y?: number, height?: number, width?: number }): dia.BBox;
-        export function getElementBBox(el: Element): dia.BBox;
-        export function setAttributesBySelector(el: Element, attrs: dia.SVGAttributes): void;
-        export function sortElements(elements: Element[] | string | JQuery, comparator: (a: Element, b: Element) => number): Element[];
-        export function shapePerimeterConnectionPoint(linkView: dia.LinkView, view: dia.ElementView, magnet: SVGElement, ref: dia.Point): dia.Point;
-        export function imageToDataUri(url: string, callback: (err: Error, dataUri: string) => void): void;
-
-        // Not documented but used in examples
-        /** @deprecated use lodash _.defaultsDeep */
-        export function deepSupplement(objects: any, defaultIndicator?: any): any;
-
-        // Private functions
-        /** @deprecated use lodash _.assign */
-        export function mixin(objects: any[]): any;
-        /** @deprecated use lodash _.defaults */
-        export function supplement(objects: any[]): any;
-        /** @deprecated use lodash _.mixin  */
-        export function deepMixin(objects: any[]): any;
     }
 
-    namespace layout {
-
-        interface LayoutOptions {
-            nodeSep?: number;
-            edgeSep?: number;
-            rankSep?: number;
-            rankDir?: 'TB' | 'BT' | 'LR' | 'RL';
-            marginX?: number;
-            marginY?: number;
-            resizeCluster?: boolean;
-            setPosition?: (element: dia.Element, position: dia.BBox) => void;
-            setLinkVertices?: (link: dia.Link, vertices: Position[]) => void;
+    namespace uml {
+        interface ClassAttributes extends GenericAttributes<basic.RectAttrs> {
+            name: string[];
+            attributes: string[];
+            methods: string[];
         }
-
-        export class DirectedGraph {
-            static layout(graph: dia.Graph | dia.Cell[], options?: LayoutOptions): dia.BBox;
+        class Class extends basic.Generic {
+            constructor(attributes?: ClassAttributes, options?: Object);
+            getClassName(): string[];
+            updateRectangles(): void;
+        }
+        class ClassView extends dia.ElementView {
+        }
+        class Abstract extends Class {
+            constructor(attributes?: ClassAttributes, options?: Object);
+        }
+        class AbstractView extends ClassView {
+            constructor(attributes?: ClassAttributes, options?: Object);
+        }
+        class Interface extends Class {
+            constructor(attributes?: ClassAttributes, options?: Object);
+        }
+        class InterfaceView extends ClassView {
+            constructor(attributes?: ClassAttributes, options?: Object);
+        }
+        class Generalization extends dia.Link {
+            constructor(attributes?: dia.LinkAttributes, options?: Object);
+        }
+        class Implementation extends dia.Link {
+            constructor(attributes?: dia.LinkAttributes, options?: Object);
+        }
+        class Aggregation extends dia.Link {
+            constructor(attributes?: dia.LinkAttributes, options?: Object);
+        }
+        class Composition extends dia.Link {
+            constructor(attributes?: dia.LinkAttributes, options?: Object);
+        }
+        class Association extends dia.Link {
+            constructor(attributes?: dia.LinkAttributes, options?: Object);
+        }
+        interface StateAttributes extends GenericAttributes<ShapeAttrs> {
+            events?: string[];
+        }
+        class State extends basic.Generic {
+            constructor(attributes?: GenericAttributes<basic.CircleAttrs>, options?: Object);
+            updateName(): void;
+            updateEvents(): void;
+            updatePath(): void;
+        }
+        class StartState extends basic.Circle {
+            constructor(attributes?: GenericAttributes<basic.CircleAttrs>, options?: Object);
+        }
+        class EndState extends basic.Generic {
+            constructor(attributes?: GenericAttributes<dia.SVGAttributes>, options?: Object);
+        }
+        class Transition extends dia.Link {
+            constructor(attributes?: dia.LinkAttributes, options?: Object);
         }
     }
 }
+
+export namespace util {
+
+    namespace format {
+        export function number(specifier: string, value: number): string;
+    }
+
+    export function uuid(): string;
+    export function guid(obj?: Object): string;
+    export function nextFrame(callback: () => void, context?: Object): number;
+    export function cancelFrame(requestId: number): void;
+    export function flattenObject(object: Object, delim: string, stop: (node: any) => boolean): any;
+    export function getByPath(object: Object, path: string, delim: string): any;
+    export function setByPath(object: Object, path: string, value: Object, delim: string): any;
+    export function unsetByPath(object: Object, path: string, delim: string): any;
+    export function breakText(text: string, size: dia.Size, attrs?: dia.SVGAttributes, options?: { svgDocument?: SVGElement }): string;
+    export function normalizeSides(box: number | { x?: number, y?: number, height?: number, width?: number }): dia.BBox;
+    export function getElementBBox(el: Element): dia.BBox;
+    export function setAttributesBySelector(el: Element, attrs: dia.SVGAttributes): void;
+    export function sortElements(elements: Element[] | string | JQuery, comparator: (a: Element, b: Element) => number): Element[];
+    export function shapePerimeterConnectionPoint(linkView: dia.LinkView, view: dia.ElementView, magnet: SVGElement, ref: dia.Point): dia.Point;
+    export function imageToDataUri(url: string, callback: (err: Error, dataUri: string) => void): void;
+
+    // Not documented but used in examples
+    /** @deprecated use lodash _.defaultsDeep */
+    export function deepSupplement(objects: any, defaultIndicator?: any): any;
+
+    // Private functions
+    /** @deprecated use lodash _.assign */
+    export function mixin(objects: any[]): any;
+    /** @deprecated use lodash _.defaults */
+    export function supplement(objects: any[]): any;
+    /** @deprecated use lodash _.mixin  */
+    export function deepMixin(objects: any[]): any;
+}
+
+export namespace layout {
+
+    interface LayoutOptions {
+        nodeSep?: number;
+        edgeSep?: number;
+        rankSep?: number;
+        rankDir?: 'TB' | 'BT' | 'LR' | 'RL';
+        marginX?: number;
+        marginY?: number;
+        resizeCluster?: boolean;
+        setPosition?: (element: dia.Element, position: dia.BBox) => void;
+        setLinkVertices?: (link: dia.Link, vertices: Position[]) => void;
+    }
+
+    class DirectedGraph {
+        static layout(graph: dia.Graph | dia.Cell[], options?: LayoutOptions): dia.BBox;
+    }
+}
diff --git a/jqgrid/jqgrid-tests.ts b/jqgrid/jqgrid-tests.ts
index 7354f527dc..832a94d909 100644
--- a/jqgrid/jqgrid-tests.ts
+++ b/jqgrid/jqgrid-tests.ts
@@ -2,8 +2,6 @@
 // Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="jquery" />
-
 var mydata: any[] = [];
 
 $('#jqGrid')
diff --git a/jqrangeslider/jqrangeslider-tests.ts b/jqrangeslider/jqrangeslider-tests.ts
index 1af815806f..cb6b417656 100644
--- a/jqrangeslider/jqrangeslider-tests.ts
+++ b/jqrangeslider/jqrangeslider-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 // Arrows
 $("#arrowsExample").rangeSlider({ arrows: false });
 $("#arrowsExample").editRangeSlider({ arrows: false });
@@ -133,7 +131,7 @@ $("#rulersExample").rangeSlider({
     next: function(val){ return val + 10; },
     stop: function(val){ return false; },
     label: function(val){ return val; },
-    format: function(tickContainer, tickStart, tickEnd){ 
+    format: function(tickContainer, tickStart, tickEnd){
       tickContainer.addClass("myCustomClass");
     }
   },
@@ -179,7 +177,7 @@ $("#rangeExample").dateRangeSlider({
 // Symmetric Positionning
 $("#symmetricExample").rangeSlider({
   symmetricPositionning: true,
-  range: {min: 0}  
+  range: {min: 0}
 });
 // Type
 $("#typeExample").editRangeSlider({type: "number"});
diff --git a/jquery-ajax-chain/jquery-ajax-chain-tests.ts b/jquery-ajax-chain/jquery-ajax-chain-tests.ts
index e5cbb8a26f..56ea354543 100644
--- a/jquery-ajax-chain/jquery-ajax-chain-tests.ts
+++ b/jquery-ajax-chain/jquery-ajax-chain-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery-ajax-chain" />
-/// <reference types="jquery" />
-
 function test_public_methods(): void {
 
     let ajaxChain: ajaxChain.JQueryAjaxChain,
@@ -171,7 +168,7 @@ function test_optional_parameters(): void {
         },
 
         hasCache: function (xmlResponse): XMLDocument {
-            
+
             let $tempXmlResponse: JQuery,
                 itemId: String;
 
diff --git a/jquery-alertable/jquery-alertable-tests.ts b/jquery-alertable/jquery-alertable-tests.ts
index a61dca01b4..61d6e2c06c 100644
--- a/jquery-alertable/jquery-alertable-tests.ts
+++ b/jquery-alertable/jquery-alertable-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery-alertable" />
-/// <reference types="jquery" />
-
 //
 // Examples from https://github.com/claviska/jquery-alertable
 //
diff --git a/jquery-backstretch/jquery-backstretch-tests.ts b/jquery-backstretch/jquery-backstretch-tests.ts
index 7220458769..22835b4e43 100644
--- a/jquery-backstretch/jquery-backstretch-tests.ts
+++ b/jquery-backstretch/jquery-backstretch-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 var backstretch = jQuery.backstretch(['image.png'], {
     centeredX: false,
     centeredY: false,
diff --git a/jquery-cropbox/jquery-cropbox-tests.ts b/jquery-cropbox/jquery-cropbox-tests.ts
index ddc5389625..eadb754088 100644
--- a/jquery-cropbox/jquery-cropbox-tests.ts
+++ b/jquery-cropbox/jquery-cropbox-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 var cropboxWithDefaultSettings = $("#element").cropbox();
 
 var cropboxOptions: jQueryCropBox.CropboxOptions = {
@@ -38,7 +36,7 @@ cropboxWithOptions.getBlob();
 cropboxWithOptions.remove();
 
 cropboxWithOptions.on("cropbox",(e: Event, data: any, img: jQueryCropBox.Cropbox) => {
-   
-   //DoStuff 
-    
+
+   //DoStuff
+
 });
diff --git a/jquery-easy-loading/jquery-easy-loading-tests.ts b/jquery-easy-loading/jquery-easy-loading-tests.ts
index 7a59d3d617..ece98fd6d0 100644
--- a/jquery-easy-loading/jquery-easy-loading-tests.ts
+++ b/jquery-easy-loading/jquery-easy-loading-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="jquery" />
-
 function test_options() {
 
     const jqElement: JQuery = $("body").loading({
diff --git a/jquery-handsontable/jquery-handsontable-tests.ts b/jquery-handsontable/jquery-handsontable-tests.ts
index 267ab30d8a..a2e10b4827 100644
--- a/jquery-handsontable/jquery-handsontable-tests.ts
+++ b/jquery-handsontable/jquery-handsontable-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 var data = [
     ["", "Maserati", "Mazda", "Mercedes", "Mini", "Mitsubishi"],
     ["2009", 0, 2941, 4303, 354, 5814],
diff --git a/jquery-jsonrpcclient/jquery-jsonrpcclient-tests.ts b/jquery-jsonrpcclient/jquery-jsonrpcclient-tests.ts
index f680dbb688..0e42508202 100644
--- a/jquery-jsonrpcclient/jquery-jsonrpcclient-tests.ts
+++ b/jquery-jsonrpcclient/jquery-jsonrpcclient-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 var foo = new $.JsonRpcClient({ ajaxUrl: '/backend/jsonrpc' });
 foo.call(
     'bar', ['A parameter', 'B parameter'],
diff --git a/jquery-mockjax/jquery-mockjax-tests.ts b/jquery-mockjax/jquery-mockjax-tests.ts
index 7688645f8e..3090a1c3cc 100644
--- a/jquery-mockjax/jquery-mockjax-tests.ts
+++ b/jquery-mockjax/jquery-mockjax-tests.ts
@@ -1,4 +1,3 @@
-/// <reference types="jquery"/>
 /// <reference types="qunit" />
 
 class Tests {
diff --git a/jquery-steps/index.d.ts b/jquery-steps/index.d.ts
index 6abe640417..7670245480 100644
--- a/jquery-steps/index.d.ts
+++ b/jquery-steps/index.d.ts
@@ -1,8 +1,9 @@
 // Type definitions for jQuery Steps v1.1.1
 // Project: http://www.jquery-steps.com/
-// Definitions by: Joseph Blank <https://github.com/jblank/>
+// Definitions by: Joseph Blank <https://github.com/jblank/>, Nicholas Wong <https://github.com/nickwph>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Updated by: Nicholas Wong <https://github.com/nickwph>
+
+/// <reference types="jquery" />
 
 interface JQuery {
     steps(param?: JQuerySteps.Settings): JQuerySteps.JQuerySteps;
diff --git a/jquery-steps/jquery-steps-tests.ts b/jquery-steps/jquery-steps-tests.ts
index 35346d1f7b..6659212e20 100644
--- a/jquery-steps/jquery-steps-tests.ts
+++ b/jquery-steps/jquery-steps-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-/// <reference types="jquery-steps" />
-
 var labels: JQuerySteps.LabelSettings = {
     cancel: 'Cancel',
     current: 'Current:',
diff --git a/jquery-timeentry/jquery-timeentry-tests.ts b/jquery-timeentry/jquery-timeentry-tests.ts
index ccfe0794a3..8910487c65 100644
--- a/jquery-timeentry/jquery-timeentry-tests.ts
+++ b/jquery-timeentry/jquery-timeentry-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 var selector = '#example';
 
 // basic
diff --git a/jquery-toastmessage-plugin/index.d.ts b/jquery-toastmessage-plugin/index.d.ts
new file mode 100644
index 0000000000..2666ecbd0b
--- /dev/null
+++ b/jquery-toastmessage-plugin/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for jquery-toastmessage-plugin 0.2
+// Project: https://github.com/akquinet/jquery-toastmessage-plugin
+// Definitions by: Joe Skeen <https://github.com/joeskeen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare interface JQuery {
+    toastmessage: JQueryToastmessage.ToastmessageStatic;
+}
+
+/** jQuery Toastmessage (http://akquinet.github.io/jquery-toastmessage-plugin/) */
+declare namespace JQueryToastmessage {
+    interface ToastmessageStatic {
+        /* shows a toast message of the specified type */
+        (command: ShowToastCommand, message: string): JQuery;
+        /** shows a custom toast */
+        (command: 'showToast', toastOpts: ToastOptions): JQuery;
+        /** removes the specified toast and returns it */
+        (command: 'removeToast', toast: JQuery, closeOpts?: ToastOptions): void;
+        /** configures the default toast options */
+        (toastOpts: ToastOptions): void;
+    }
+
+    type ShowToastCommand = 'showNoticeToast' | 'showSuccessToast' | 'showWarningToast' | 'showErrorToast';
+    type ToastType = 'notice' | 'warning' | 'error' | 'success';
+    type ToastPosition = 'top-left' | 'top-center' | 'top-right' | 'middle-left' | 'middle-center' | 'middle-right';
+
+    interface ToastOptions {
+        /** in effect duration in miliseconds @default 600 */
+        inEffectDuration?: number;
+        /**
+         * time in miliseconds before the item has to disappear @default 3000 */
+        stayTime?: number;
+        /** content of the item @default '' */
+        text?: string;
+        /** should the toast item sticky or not? @default false */
+        sticky?: boolean;
+        /** the type of toast @default 'notice' */
+        type?: ToastType;
+        /**
+         * Position of the toast container holding different toast.
+         * Position can be set only once at the very first call,
+         * changing the position after the first call does nothing
+         * @default 'top-right'
+         */
+        position?: ToastPosition;
+        /**
+         * text which will be shown as close button,
+         * set to '' when you want to introduce an image via css
+         * @default ''
+         */
+        closeText?: string;
+        /** callback function when the toastmessage is closed @default null */
+        close?: () => void;
+    }
+}
\ No newline at end of file
diff --git a/jquery-toastmessage-plugin/jquery-toastmessage-plugin-tests.ts b/jquery-toastmessage-plugin/jquery-toastmessage-plugin-tests.ts
new file mode 100644
index 0000000000..f11813cfbb
--- /dev/null
+++ b/jquery-toastmessage-plugin/jquery-toastmessage-plugin-tests.ts
@@ -0,0 +1,85 @@
+/* code examples from documentation */
+
+$().toastmessage('showNoticeToast', 'some message here');
+$().toastmessage('showSuccessToast', "some message here");
+$().toastmessage('showWarningToast', "some message here");
+$().toastmessage('showErrorToast', "some message here");
+
+// user configured toastmessage:
+const toastObject = $().toastmessage('showToast', {
+  text     : 'Hello World',
+  sticky   : true,
+  position : 'top-right',
+  type     : 'success',
+  close    : function () {console.log("toast is closed ...");}
+});
+
+$().toastmessage('removeToast', toastObject);
+
+// reconfiguring the toasts as sticky
+$().toastmessage({sticky : true});
+
+// saving the newly created toast into a variable
+var myToast =  $().toastmessage('showNoticeToast', 'some message here');
+
+// removing the toast
+$().toastmessage('removeToast', myToast);
+
+// user configuration of all toastmessages to come:
+$().toastmessage({
+    text     : 'Hello World',
+    sticky   : true,
+    position : 'top-right',
+    type     : 'success',
+    close    : function () {console.log("toast is closed ...");}
+});
+
+$().toastmessage({
+  inEffectDuration:  600,   // in effect duration in miliseconds
+  stayTime:         3000,   // time in miliseconds before the item has to disappear
+  text:               '',   // content of the item
+  sticky:          false,   // should the toast item sticky or not?
+  type:         'notice',   // notice, warning, error, success
+  position:  'top-right',   // top-left, top-center, top-right, middle-left, middle-center, middle-right
+                            // Position of the toast container holding different toast.
+                            // Position can be set only once at the very first call,
+                            // changing the position after the first call does nothing
+  closeText:         '',    // text which will be shown as close button,
+                            // set to '' when you want to introduce an image via css
+  close:            undefined    // callback function when the toastmessage is closed
+});
+
+/* code examples from tests */
+
+$('.toast-container').remove();
+
+$().toastmessage('showSuccessToast', "SUCCESS");
+$().toastmessage('showNoticeToast', "NOTICE");
+$().toastmessage('showWarningToast', "WARNING");
+$().toastmessage('showErrorToast', "ERROR");
+$().toastmessage({
+    sticky   : true,
+    position : 'top-right',
+    closeText: ''
+});
+$().toastmessage('showToast', {
+    text     : 'Success Dialog',
+    type     : 'success'
+});
+$().toastmessage('showToast', {
+    text     : 'Success Dialog',
+    sticky   : true,
+    position : 'top-right',
+    type     : 'success',
+    closeText: '',
+    close    : () => {}
+});
+var toast = $().toastmessage('showToast', {
+    text     : 'Success Dialog',
+    sticky   : true,
+    position : 'top-right',
+    type     : 'success',
+    closeText: '',
+    close    : () => {}
+});
+$().toastmessage('removeToast', toast, { close : () => {} });
diff --git a/jquery-toastmessage-plugin/tsconfig.json b/jquery-toastmessage-plugin/tsconfig.json
new file mode 100644
index 0000000000..193619fa0a
--- /dev/null
+++ b/jquery-toastmessage-plugin/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "lib": ["es6", "dom"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-toastmessage-plugin-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-toastmessage-plugin/tslint.json b/jquery-toastmessage-plugin/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/jquery-toastmessage-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/jquery-urlparam/jquery-urlparam-tests.ts b/jquery-urlparam/jquery-urlparam-tests.ts
index a8ca144bb3..8d855e0e35 100644
--- a/jquery-urlparam/jquery-urlparam-tests.ts
+++ b/jquery-urlparam/jquery-urlparam-tests.ts
@@ -1,4 +1 @@
-/// <reference types="jquery" />
-
-
 console.log($.urlParam('variable'));
diff --git a/jquery.ajaxfile/jquery.ajaxfile-tests.ts b/jquery.ajaxfile/jquery.ajaxfile-tests.ts
index 364220325a..73bc6662dc 100644
--- a/jquery.ajaxfile/jquery.ajaxfile-tests.ts
+++ b/jquery.ajaxfile/jquery.ajaxfile-tests.ts
@@ -1,7 +1,3 @@
-
-/// <reference types="jquery" />
-/// <reference types="knockout" />
-
 function testRawApi(){
 	var inputElement:HTMLInputElement = null;
 	var resultPromise = AjaxFile.send<number>({
diff --git a/jquery.are-you-sure/jquery.are-you-sure-tests.ts b/jquery.are-you-sure/jquery.are-you-sure-tests.ts
index cd400f90c1..37cb487602 100644
--- a/jquery.are-you-sure/jquery.are-you-sure-tests.ts
+++ b/jquery.are-you-sure/jquery.are-you-sure-tests.ts
@@ -1,10 +1,3 @@
-// Type definitions for jquery.are-you-sure.js
-// Project: https://github.com/codedance/jquery.AreYouSure
-// Definitions by: Jon Egerton <https://github.com/jonegerton>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="jquery"/>
-
 //Use defaults
 $("test").areYouSure();
 
diff --git a/jquery.base64/jquery.base64-tests.ts b/jquery.base64/jquery.base64-tests.ts
index 447a917620..c9c6955716 100644
--- a/jquery.base64/jquery.base64-tests.ts
+++ b/jquery.base64/jquery.base64-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 var encoded = $.base64.encode("");
 $.base64.decode(encoded);
 
diff --git a/jquery.cleditor/jquery.cleditor-tests.ts b/jquery.cleditor/jquery.cleditor-tests.ts
index 7fe997c4c5..b4f4917551 100644
--- a/jquery.cleditor/jquery.cleditor-tests.ts
+++ b/jquery.cleditor/jquery.cleditor-tests.ts
@@ -1,5 +1,3 @@
-///<reference types="jquery" />
-
 // cribbed from http://premiumsoftware.net/CLEditor/GettingStarted
 
 $(document).ready(function () { $("#input").cleditor(); });
diff --git a/jquery.color/jquery.color-tests.ts b/jquery.color/jquery.color-tests.ts
index c94a1cffed..e1439f4cd4 100644
--- a/jquery.color/jquery.color-tests.ts
+++ b/jquery.color/jquery.color-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 var color = $.Color("rgba(255, 255, 255, 0.4)");
 var color1 = $.Color({red: 255, green: 255, blue: 255});
 var color2 = $.Color({hue: 359, saturation: 0.5, lightness: 0.5});
diff --git a/jquery.colorbox/jquery.colorbox-tests.ts b/jquery.colorbox/jquery.colorbox-tests.ts
index 66d54240db..3c05f213c9 100644
--- a/jquery.colorbox/jquery.colorbox-tests.ts
+++ b/jquery.colorbox/jquery.colorbox-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 //Image gallery
 var gallery : JQuery = $('a.gallery').colorbox({ rel: 'gal' });
 
diff --git a/jquery.cookie/jquery.cookie-tests.ts b/jquery.cookie/jquery.cookie-tests.ts
index e93d29110c..998d7bf2df 100644
--- a/jquery.cookie/jquery.cookie-tests.ts
+++ b/jquery.cookie/jquery.cookie-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery" />
-
 class TestObject {
     text: string;
     value: number;
diff --git a/jquery.customselect/jquery.customselect-tests.ts b/jquery.customselect/jquery.customselect-tests.ts
index b0dc9554a9..5cb28a9f05 100644
--- a/jquery.customselect/jquery.customselect-tests.ts
+++ b/jquery.customselect/jquery.customselect-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 class CustomSelectOptions implements JQueryCustomSelectOption {
     "customClass": string;
     "mapClass": boolean;
diff --git a/jquery.cycle/jquery.cycle-tests.ts b/jquery.cycle/jquery.cycle-tests.ts
index e93be101f6..df8ed24b22 100644
--- a/jquery.cycle/jquery.cycle-tests.ts
+++ b/jquery.cycle/jquery.cycle-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 // As basic as it can be
 $('#element').cycle();
 
@@ -284,7 +282,7 @@ $('#s2').cycle({
 $('#slideshow2').cycle({
     fx: 'scrollLeft,scrollDown,scrollRight,scrollUp',
     randomizeEffects: false,
-    easing: 'easeInBack' // easing supported via the easing plugin 
+    easing: 'easeInBack' // easing supported via the easing plugin
 });
 
 // Another Advanced "pager" Demo
@@ -294,7 +292,7 @@ $('#slideshow').cycle({
     timeout: 0,
     pager: '#nav',
     pagerAnchorBuilder: function (idx, slide) {
-        // return selector string for existing anchor 
+        // return selector string for existing anchor
         return '#nav li:eq(' + idx + ') a';
     }
 });
@@ -304,7 +302,7 @@ $('#slideshow').cycle({ slideExpr: 'img' });
 
 // Defeating IE's ClearType bug
 $('#slideshow').cycle({
-    cleartype: false // disable cleartype corrections 
+    cleartype: false // disable cleartype corrections
 });
 
 // Using the 'nowrap' option (manual slideshow)
diff --git a/jquery.cycle2/jquery.cycle2-tests.ts b/jquery.cycle2/jquery.cycle2-tests.ts
index 0e16629a3e..9d88e92532 100644
--- a/jquery.cycle2/jquery.cycle2-tests.ts
+++ b/jquery.cycle2/jquery.cycle2-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 // basic
 $('#element').cycle();
 
diff --git a/jquery.fancytree/index.d.ts b/jquery.fancytree/index.d.ts
index 5533e89cb7..c5e84d69f7 100644
--- a/jquery.fancytree/index.d.ts
+++ b/jquery.fancytree/index.d.ts
@@ -21,18 +21,21 @@ interface JQuery {
 declare namespace Fancytree {
     interface Fancytree {
         $div: JQuery;
-
+        widget: any; //JQueryUI.Widget;
         rootNode: FancytreeNode;
+        $container: JQuery;
+        focusNode: FancytreeNode;
+        options: FancytreeOptions;
 
         /** Activate node with a given key and fire focus and
-         * activate events. A prevously activated node will be
+         * activate events. A previously activated node will be
          * deactivated. If activeVisible option is set, all parents
          * will be expanded as necessary. Pass key = false, to deactivate
          * the current node only.
          *
          * @returns {FancytreeNode} activate node (null, if not found)
          */
-        activateKey(key: string): FancytreeNode;
+        activateKey(key: string | boolean): FancytreeNode;
 
         /** (experimental)
          *
@@ -199,7 +202,7 @@ declare namespace Fancytree {
         /** Display name (may contain HTML) */
         title: string;
         /** Contains all extra data that was passed on node creation */
-        data: Object;
+        data: any;
         /** Array of child nodes. For lazy nodes, null or undefined means 'not yet loaded'. Use an empty array to define a node that has no children. */
         children: FancytreeNode[];
         /** Use isExpanded(), setExpanded() to access this property. */
@@ -214,6 +217,10 @@ declare namespace Fancytree {
         lazy: boolean;
         /** Alternative description used as hover banner */
         tooltip: string;
+        /** Outer element of single nodes */
+        span: HTMLElement;
+        /** Outer element of single nodes for table extension */
+        tr: HTMLElement;
         //#endregion
 
         //#region Methods
@@ -639,7 +646,7 @@ declare namespace Fancytree {
         /** The tree instance */
         tree: Fancytree;
         /** The jQuery UI tree widget */
-        widget: Object;
+        widget: any;    // JQueryUI.Widget;
         /** Shortcut to tree.options */
         options: FancytreeOptions;
         /** The jQuery Event that initially triggered this call */
@@ -773,7 +780,7 @@ declare namespace Fancytree {
         /** Add tabindex='0' to node title span, so it can receive keyboard focus */
         titlesTabbable?: boolean;
         /** Animation options, false:off (default: { effect: "blind", options: {direction: "vertical", scale: "box"}, duration: 200 }) */
-        toggleEffect?: Object;
+        toggleEffect?: JQueryUI.EffectOptions;
     }
 
     /** Data object passed to FancytreeNode() constructor. Note: typically these attributes are accessed by meber methods, e.g. `node.isExpanded()` and `node.setSelected(false)`.  */
diff --git a/jquery.finger/jquery.finger-tests.ts b/jquery.finger/jquery.finger-tests.ts
index 3f35e7322c..c4734610b2 100644
--- a/jquery.finger/jquery.finger-tests.ts
+++ b/jquery.finger/jquery.finger-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 $.Finger.doubleTapInterval = 400;
 $.Finger.flickDuration = 250;
 $.Finger.pressDuration = 100;
diff --git a/jquery.flagstrap/jquery.flagstrap-tests.ts b/jquery.flagstrap/jquery.flagstrap-tests.ts
index 3bfcf0294e..6d262dc17f 100644
--- a/jquery.flagstrap/jquery.flagstrap-tests.ts
+++ b/jquery.flagstrap/jquery.flagstrap-tests.ts
@@ -1,14 +1,11 @@
-///<reference types="jquery" />
-///<reference types="jquery.flagstrap" />
-
 class TestObject {
-    
+
 }
 
 $(function () {
-    // basic test 
-    // written in according to basic example from documentation 
-    var htmlSelect = '<form class="form-horizontal">' + 
+    // basic test
+    // written in according to basic example from documentation
+    var htmlSelect = '<form class="form-horizontal">' +
                     '   <div class="form-group">' +
                     '       <label>Select Country</label><br>' +
                     '       <div class="flagstrap" data-input-name="country"></div>' +
@@ -21,7 +18,7 @@ $(function () {
     console.log('characters count: ' + $('#flagstrap').html().length + '\n' +  $('#flagstrap').html());
 
     // options test
-    // options -> data attributes 
+    // options -> data attributes
     // written in according to options -> data attributes example from documentation
     htmlSelect = '<form>' +
                 '   <div class="form-group">' +
@@ -42,7 +39,7 @@ $(function () {
     console.log('\n\ncharacters count: ' + $('#flagstrap2').html().length + '\n' +  $('#flagstrap2').html());
 
     // options test
-    // options -> instance options 
+    // options -> instance options
     // written in according to options -> instance options example from documentation
     htmlSelect = '<form>' +
                 '   <div class="form-group">' +
diff --git a/jquery.form/jquery.form-tests.ts b/jquery.form/jquery.form-tests.ts
index f115a97f57..c4d3d636bf 100644
--- a/jquery.form/jquery.form-tests.ts
+++ b/jquery.form/jquery.form-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 // Basic usage
 
 jQuery('#myFormId').ajaxForm();
@@ -30,112 +28,112 @@ jQuery.fn.ajaxSubmit.debug = true;
 
 // ajaxForm
 
-// bind form using 'ajaxForm' 
+// bind form using 'ajaxForm'
 $('#myForm1').ajaxForm({
-    target: '#output1',   // target element(s) to be updated with server response 
+    target: '#output1',   // target element(s) to be updated with server response
     beforeSubmit: function (formData, jqForm, options) {  // pre-submit callback
-        // formData is an array; here we use $.param to convert it to a string to display it 
-        // but the form plugin does this for you automatically when it submits the data 
+        // formData is an array; here we use $.param to convert it to a string to display it
+        // but the form plugin does this for you automatically when it submits the data
         var queryString = $.param(formData);
 
-        // jqForm is a jQuery object encapsulating the form element.  To access the 
-        // DOM element for the form do this: 
-        // var formElement = jqForm[0]; 
+        // jqForm is a jQuery object encapsulating the form element.  To access the
+        // DOM element for the form do this:
+        // var formElement = jqForm[0];
 
         alert('About to submit: \n\n' + queryString);
 
-        // here we could return false to prevent the form from being submitted; 
-        // returning anything other than false will allow the form submit to continue 
+        // here we could return false to prevent the form from being submitted;
+        // returning anything other than false will allow the form submit to continue
         return true;
     },
     success: function (responseText, statusText, xhr) {  // post-submit callback
-        // for normal html responses, the first argument to the success callback 
-        // is the XMLHttpRequest object's responseText property 
-    
-        // if the ajaxForm method was passed an Options Object with the dataType 
-        // property set to 'xml' then the first argument to the success callback 
-        // is the XMLHttpRequest object's responseXML property 
-    
-        // if the ajaxForm method was passed an Options Object with the dataType 
-        // property set to 'json' then the first argument to the success callback 
-        // is the json data object returned by the server 
-    
+        // for normal html responses, the first argument to the success callback
+        // is the XMLHttpRequest object's responseText property
+
+        // if the ajaxForm method was passed an Options Object with the dataType
+        // property set to 'xml' then the first argument to the success callback
+        // is the XMLHttpRequest object's responseXML property
+
+        // if the ajaxForm method was passed an Options Object with the dataType
+        // property set to 'json' then the first argument to the success callback
+        // is the json data object returned by the server
+
         alert('status: ' + statusText + '\n\nresponseText: \n' + responseText +
             '\n\nThe output div should have already been updated with the responseText.');
     }
 
-    // other available options: 
-    //url:       url         // override for form's 'action' attribute 
-    //type:      type        // 'get' or 'post', override for form's 'method' attribute 
-    //dataType:  null        // 'xml', 'script', or 'json' (expected server response type) 
-    //clearForm: true        // clear all form fields after successful submit 
-    //resetForm: true        // reset the form after successful submit 
+    // other available options:
+    //url:       url         // override for form's 'action' attribute
+    //type:      type        // 'get' or 'post', override for form's 'method' attribute
+    //dataType:  null        // 'xml', 'script', or 'json' (expected server response type)
+    //clearForm: true        // clear all form fields after successful submit
+    //resetForm: true        // reset the form after successful submit
 
-    // $.ajax options can be used here too, for example: 
-    //timeout:   3000 
+    // $.ajax options can be used here too, for example:
+    //timeout:   3000
 });
 
 // ajaxSubmit
 
 $('#myForm2').ajaxSubmit({
-    target: '#output2',   // target element(s) to be updated with server response 
+    target: '#output2',   // target element(s) to be updated with server response
     beforeSubmit: function (formData, jqForm, options) {  // pre-submit callback
-        // formData is an array; here we use $.param to convert it to a string to display it 
-        // but the form plugin does this for you automatically when it submits the data 
+        // formData is an array; here we use $.param to convert it to a string to display it
+        // but the form plugin does this for you automatically when it submits the data
         var queryString = $.param(formData);
 
-        // jqForm is a jQuery object encapsulating the form element.  To access the 
-        // DOM element for the form do this: 
-        // var formElement = jqForm[0]; 
+        // jqForm is a jQuery object encapsulating the form element.  To access the
+        // DOM element for the form do this:
+        // var formElement = jqForm[0];
 
         alert('About to submit: \n\n' + queryString);
 
-        // here we could return false to prevent the form from being submitted; 
-        // returning anything other than false will allow the form submit to continue 
+        // here we could return false to prevent the form from being submitted;
+        // returning anything other than false will allow the form submit to continue
         return true;
     },
     success: function showResponse(responseText, statusText, xhr) {  // post-submit callback
-        // for normal html responses, the first argument to the success callback 
-        // is the XMLHttpRequest object's responseText property 
+        // for normal html responses, the first argument to the success callback
+        // is the XMLHttpRequest object's responseText property
 
-        // if the ajaxSubmit method was passed an Options Object with the dataType 
-        // property set to 'xml' then the first argument to the success callback 
-        // is the XMLHttpRequest object's responseXML property 
+        // if the ajaxSubmit method was passed an Options Object with the dataType
+        // property set to 'xml' then the first argument to the success callback
+        // is the XMLHttpRequest object's responseXML property
 
-        // if the ajaxSubmit method was passed an Options Object with the dataType 
-        // property set to 'json' then the first argument to the success callback 
-        // is the json data object returned by the server 
+        // if the ajaxSubmit method was passed an Options Object with the dataType
+        // property set to 'json' then the first argument to the success callback
+        // is the json data object returned by the server
 
         alert('status: ' + statusText + '\n\nresponseText: \n' + responseText +
             '\n\nThe output div should have already been updated with the responseText.');
     }
 
-    // other available options: 
-    //url:       url         // override for form's 'action' attribute 
-    //type:      type        // 'get' or 'post', override for form's 'method' attribute 
-    //dataType:  null        // 'xml', 'script', or 'json' (expected server response type) 
-    //clearForm: true        // clear all form fields after successful submit 
-    //resetForm: true        // reset the form after successful submit 
+    // other available options:
+    //url:       url         // override for form's 'action' attribute
+    //type:      type        // 'get' or 'post', override for form's 'method' attribute
+    //dataType:  null        // 'xml', 'script', or 'json' (expected server response type)
+    //clearForm: true        // clear all form fields after successful submit
+    //resetForm: true        // reset the form after successful submit
 
-    // $.ajax options can be used here too, for example: 
-    //timeout:   3000 
+    // $.ajax options can be used here too, for example:
+    //timeout:   3000
 });
 
 // Validation
 
 $('#myForm2').ajaxForm({
     beforeSubmit: function (formData, jqForm, options) {
-        // formData is an array of objects representing the name and value of each field 
-        // that will be sent to the server;  it takes the following form: 
-        // 
-        // [ 
-        //     { name:  username, value: valueOfUsernameInput }, 
-        //     { name:  password, value: valueOfPasswordInput } 
-        // ] 
-        // 
-        // To validate, we can examine the contents of this array to see if the 
-        // username and password fields have values.  If either value evaluates 
-        // to false then we return false from this method. 
+        // formData is an array of objects representing the name and value of each field
+        // that will be sent to the server;  it takes the following form:
+        //
+        // [
+        //     { name:  username, value: valueOfUsernameInput },
+        //     { name:  password, value: valueOfPasswordInput }
+        // ]
+        //
+        // To validate, we can examine the contents of this array to see if the
+        // username and password fields have values.  If either value evaluates
+        // to false then we return false from this method.
 
         for (var i = 0; i < formData.length; i++) {
             if (!formData[i].value) {
@@ -150,13 +148,13 @@ $('#myForm2').ajaxForm({
 // JSON
 
 $('#jsonForm').ajaxForm({
-    // dataType identifies the expected content type of the server response 
+    // dataType identifies the expected content type of the server response
     dataType: 'json',
 
-    // success identifies the function to invoke when the server response 
-    // has been received 
+    // success identifies the function to invoke when the server response
+    // has been received
     success: function (data) {
-        // 'data' is the json object returned from the server 
+        // 'data' is the json object returned from the server
         alert(data.message);
     }
 });
@@ -164,14 +162,14 @@ $('#jsonForm').ajaxForm({
 // XML
 
 $('#xmlForm').ajaxForm({
-    // dataType identifies the expected content type of the server response 
+    // dataType identifies the expected content type of the server response
     dataType: 'xml',
 
-    // success identifies the function to invoke when the server response 
-    // has been received 
+    // success identifies the function to invoke when the server response
+    // has been received
     success: function (responseXML) {
-        // 'responseXML' is the XML document returned by the server; we use 
-        // jQuery to extract the content of the message node from the XML doc 
+        // 'responseXML' is the XML document returned by the server; we use
+        // jQuery to extract the content of the message node from the XML doc
         var message = $('message', responseXML).text();
         alert(message);
     }
@@ -180,11 +178,11 @@ $('#xmlForm').ajaxForm({
 // HTML
 
 $('#htmlForm').ajaxForm({
-    // target identifies the element(s) to update with the server response 
+    // target identifies the element(s) to update with the server response
     target: '#htmlExampleTarget',
 
-    // success identifies the function to invoke when the server response 
-    // has been received; here we apply a fade-in effect to the new content 
+    // success identifies the function to invoke when the server response
+    // has been received; here we apply a fade-in effect to the new content
     success: function () {
         $('#htmlExampleTarget').fadeIn('slow');
     }
diff --git a/jquery.jnotify/jquery.jnotify-tests.ts b/jquery.jnotify/jquery.jnotify-tests.ts
index b5ad3927e2..f38a99760a 100644
--- a/jquery.jnotify/jquery.jnotify-tests.ts
+++ b/jquery.jnotify/jquery.jnotify-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 $(document).ready(function () {
     $('#StatusBar').jnotifyInizialize({
         oneAtTime: true
diff --git a/jquery.joyride/jquery.joyride-tests.ts b/jquery.joyride/jquery.joyride-tests.ts
index f0a51b5270..c7324dd6c9 100644
--- a/jquery.joyride/jquery.joyride-tests.ts
+++ b/jquery.joyride/jquery.joyride-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 var options: JoyrideOptions;
 options.autoStart = true;
 options.postStepCallback = (index, tip)=> {
diff --git a/jquery.jsignature/jquery.jsignature-tests.ts b/jquery.jsignature/jquery.jsignature-tests.ts
index 5ec4bc486d..58d73fe24b 100644
--- a/jquery.jsignature/jquery.jsignature-tests.ts
+++ b/jquery.jsignature/jquery.jsignature-tests.ts
@@ -1,8 +1,6 @@
-/// <reference types="jquery"/>
-
 /*
  * Taken from the tests section on jSignature
- */ 
+ */
 $(document).ready(function () {
 
     var $sigdiv = $('#signature');
@@ -10,7 +8,7 @@ $(document).ready(function () {
     $sigdiv.jSignature();
 
     $sigdiv.jSignature("reset");
-  
+
     var data = $sigdiv.jSignature("getData", "svgbase64");
 
     $sigdiv.jSignature("setData", "data:" + data);
diff --git a/jquery.leanmodal/jquery.leanmodal-tests.ts b/jquery.leanmodal/jquery.leanmodal-tests.ts
index fb6c4ae344..1884cb25d9 100644
--- a/jquery.leanmodal/jquery.leanmodal-tests.ts
+++ b/jquery.leanmodal/jquery.leanmodal-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 class LeanModalOptions implements JQueryLeanModalOption {
     top : number;
     overlay : number;
diff --git a/jquery.livestampjs/jquery.livestampjs-tests.ts b/jquery.livestampjs/jquery.livestampjs-tests.ts
index dc713819c9..6b5bd01835 100644
--- a/jquery.livestampjs/jquery.livestampjs-tests.ts
+++ b/jquery.livestampjs/jquery.livestampjs-tests.ts
@@ -1,4 +1,3 @@
-/// <reference types="jquery"/>
 import * as moment from 'moment';
 
 $('#test1').livestamp(new Date('June 18, 1987'));
diff --git a/jquery.menuaim/jquery.menuaim-tests.ts b/jquery.menuaim/jquery.menuaim-tests.ts
index e2a1b36aff..01baa59e03 100644
--- a/jquery.menuaim/jquery.menuaim-tests.ts
+++ b/jquery.menuaim/jquery.menuaim-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery" />
-
 $('div').menuAim({
     activate: function () { },
     deactivate: function () { },
diff --git a/jquery.mmenu/jquery.mmenu-tests.ts b/jquery.mmenu/jquery.mmenu-tests.ts
index 385f479507..a08f4371ec 100644
--- a/jquery.mmenu/jquery.mmenu-tests.ts
+++ b/jquery.mmenu/jquery.mmenu-tests.ts
@@ -1,7 +1,3 @@
-///<reference types="jquery" />
-///<reference types="jquery.mmenu" />
-
-
 // --------------------------------------------------------
 // ---------------- TEST DEFAULT OPTIONS ------------------
 // --------------------------------------------------------
diff --git a/jquery.payment/index.d.ts b/jquery.payment/index.d.ts
index 341e695a9a..88ecd255a5 100644
--- a/jquery.payment/index.d.ts
+++ b/jquery.payment/index.d.ts
@@ -3,6 +3,8 @@
 // Definitions by: Eric J. Smith <https://github.com/ejsmith/>, John Rutherford <https://github.com/johnrutherford/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="jquery" />
+
 declare namespace JQueryPayment {
 
     interface Payment {
diff --git a/jquery.payment/jquery.payment-tests.ts b/jquery.payment/jquery.payment-tests.ts
index db02b96d90..9eaad853cb 100644
--- a/jquery.payment/jquery.payment-tests.ts
+++ b/jquery.payment/jquery.payment-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery.payment" />
-/// <reference types="jquery" />
-
 $.payment.cards.push({
   // Card type, as returned by $.payment.cardType.
   type: 'mastercard',
diff --git a/jquery.pjax.falsandtru/jquery.pjax.falsandtru-tests.ts b/jquery.pjax.falsandtru/jquery.pjax.falsandtru-tests.ts
index 8bfb91a27e..b215b02b35 100644
--- a/jquery.pjax.falsandtru/jquery.pjax.falsandtru-tests.ts
+++ b/jquery.pjax.falsandtru/jquery.pjax.falsandtru-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="jquery" />
-
 function test_pjax() {
     $.pjax();
 }
diff --git a/jquery.pjax/jquery.pjax-tests.ts b/jquery.pjax/jquery.pjax-tests.ts
index 25422922d8..91cc9391a2 100644
--- a/jquery.pjax/jquery.pjax-tests.ts
+++ b/jquery.pjax/jquery.pjax-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="jquery" />
-
 function test_fn_pjax() {
     $(document).pjax("a");
     $(document).pjax("a", "#pjax-container");
diff --git a/jquery.placeholder/jquery.placeholder-tests.ts b/jquery.placeholder/jquery.placeholder-tests.ts
index edaf3ea111..04c526b352 100644
--- a/jquery.placeholder/jquery.placeholder-tests.ts
+++ b/jquery.placeholder/jquery.placeholder-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 $('input').placeholder();
 
 // specify custom class
diff --git a/jquery.pnotify/jquery.pnotify-tests.ts b/jquery.pnotify/jquery.pnotify-tests.ts
index 41cd7d3fda..f1b8ffb73e 100644
--- a/jquery.pnotify/jquery.pnotify-tests.ts
+++ b/jquery.pnotify/jquery.pnotify-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery"/>
-
-
 function test_pnotify() {
 
 
diff --git a/jquery.prettyphoto/jquery.prettyphoto-tests.ts b/jquery.prettyphoto/jquery.prettyphoto-tests.ts
index 4fcbf9ecdf..888d68ada4 100644
--- a/jquery.prettyphoto/jquery.prettyphoto-tests.ts
+++ b/jquery.prettyphoto/jquery.prettyphoto-tests.ts
@@ -1,8 +1,3 @@
-// Tests for prettyPhoto library 
-
-/// <reference types="jquery" />
-
-
 // JQUERY
 
 $('#id').prettyPhoto();
diff --git a/jquery.qrcode/jquery.qrcode-tests.ts b/jquery.qrcode/jquery.qrcode-tests.ts
index a634bd6f07..d007b203da 100644
--- a/jquery.qrcode/jquery.qrcode-tests.ts
+++ b/jquery.qrcode/jquery.qrcode-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 // Examples from website (note: the examples use color instead of fill, which is not supported)
 $('.container').qrcode();
 
diff --git a/jquery.rowgrid/jquery.rowgrid-tests.ts b/jquery.rowgrid/jquery.rowgrid-tests.ts
index ba3e5f822d..3f1427c94a 100644
--- a/jquery.rowgrid/jquery.rowgrid-tests.ts
+++ b/jquery.rowgrid/jquery.rowgrid-tests.ts
@@ -1,12 +1,10 @@
-/// <reference types="jquery"/>
-
 /*
  * Test different options
  */
 
 var options = {
-    minMargin: 10, 
-    maxMargin: 35, 
+    minMargin: 10,
+    maxMargin: 35,
     itemSelector: ".item"
 };
 
diff --git a/jquery.scrollto/jquery.scrollto-tests.ts b/jquery.scrollto/jquery.scrollto-tests.ts
index 303ce0cd01..fcdc2f50bb 100644
--- a/jquery.scrollto/jquery.scrollto-tests.ts
+++ b/jquery.scrollto/jquery.scrollto-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 $('div').scrollTo(340);
 
 $('div').scrollTo('+=340px', { axis: 'y' });
diff --git a/jquery.simplemodal/jquery.simplemodal-tests.ts b/jquery.simplemodal/jquery.simplemodal-tests.ts
index 8e73e057cc..0784f0eeeb 100644
--- a/jquery.simplemodal/jquery.simplemodal-tests.ts
+++ b/jquery.simplemodal/jquery.simplemodal-tests.ts
@@ -1,7 +1,5 @@
 // Tests taken from documentation: http://www.ericmmartin.com/projects/simplemodal/
 
-/// <reference types="jquery"/>
-
 // Chained call with no options
 $("#sample").modal();
 
diff --git a/jquery.simplepagination/jquery.simplepagination-tests.ts b/jquery.simplepagination/jquery.simplepagination-tests.ts
index b35a6f42a0..075fe02628 100644
--- a/jquery.simplepagination/jquery.simplepagination-tests.ts
+++ b/jquery.simplepagination/jquery.simplepagination-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 var selector = '#elementId';
 
 $(function () {
diff --git a/jquery.slimscroll/jquery.slimscroll-tests.ts b/jquery.slimscroll/jquery.slimscroll-tests.ts
index 0d4be5af94..a0368d07e9 100644
--- a/jquery.slimscroll/jquery.slimscroll-tests.ts
+++ b/jquery.slimscroll/jquery.slimscroll-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 $("div").slimScroll();
 
 $("div").slimScroll({
diff --git a/jquery.tagsmanager/jquery.tagsmanager-tests.ts b/jquery.tagsmanager/jquery.tagsmanager-tests.ts
index 33af6a8b7b..26a75e8310 100644
--- a/jquery.tagsmanager/jquery.tagsmanager-tests.ts
+++ b/jquery.tagsmanager/jquery.tagsmanager-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery"/>
-
-
 var options: ITagsManagerOptions = {
 	prefilled: ["Pisa", "Rome"],
 	CapitalizeFirstLetter: true,
diff --git a/jquery.timeago/jquery.timeago-tests.ts b/jquery.timeago/jquery.timeago-tests.ts
index 2a852331be..f77b40b121 100644
--- a/jquery.timeago/jquery.timeago-tests.ts
+++ b/jquery.timeago/jquery.timeago-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 // Basic usage
 
 var jQueryElement: JQuery = jQuery("abbr.timeago").timeago();
diff --git a/jquery.timepicker/jquery.timepicker-tests.ts b/jquery.timepicker/jquery.timepicker-tests.ts
index cbb14dfe7c..52329cf11a 100644
--- a/jquery.timepicker/jquery.timepicker-tests.ts
+++ b/jquery.timepicker/jquery.timepicker-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 var beforeShowCallback, onSelectCallback, onCloseCallback, onHourShow, onMinuteShow;
 $('#timepicker').timepicker({
     timeSeparator: ':',
diff --git a/jquery.timer/jquery.timer-tests.ts b/jquery.timer/jquery.timer-tests.ts
index e5d1cdaa3a..1c6653bfdb 100644
--- a/jquery.timer/jquery.timer-tests.ts
+++ b/jquery.timer/jquery.timer-tests.ts
@@ -1,31 +1,28 @@
-/// <reference types="jquery" />
+// Create the timer
+$("body").timer(
+	function () {
+		console.log("This function just got called");
+	}, 10000, true
+);
 
+$("body").timer.set({ time: 5000 }); // Change the time from 10000 millseconds to 5000 milliseconds
+$("body").timer.toggle(false); // Reset the timer
+$("body").timer.stop(); // Stop the timer
+$("body").timer.play(); // Start / play the timer
 
-    // Create the timer
-    $("body").timer(
-        function () {
-            console.log("This function just got called");
-        }, 10000, true
-    );
+// #region Outputting if timer is active or not
+var isTimerActive = $("body").timer.isActive; // Define boolean isActive as isTimerActive
+if (isTimerActive == true){
+	console.log("Timer is active!");
+}
+else{
+	console.log("Timer is not active!");
+}
+// #endregion
 
-    $("body").timer.set({ time: 5000 }); // Change the time from 10000 millseconds to 5000 milliseconds
-    $("body").timer.toggle(false); // Reset the timer
-    $("body").timer.stop(); // Stop the timer
-    $("body").timer.play(); // Start / play the timer
+// #region Get time remaining
+console.log("Time remaining on timer: " + $("body").timer.remaining.toString);
+// #endregion
 
-    // #region Outputting if timer is active or not
-    var isTimerActive = $("body").timer.isActive; // Define boolean isActive as isTimerActive
-    if (isTimerActive == true){
-        console.log("Timer is active!");
-    }
-    else{
-        console.log("Timer is not active!");
-    }
-    // #endregion
-
-    // #region Get time remaining
-    console.log("Time remaining on timer: " + $("body").timer.remaining.toString);
-    // #endregion
-
-    $("body").timer.stop(); // Stop the timer once more for the purpose of the tests (to test once())
-    $("body").timer.once(1000); // Run the timer ONCE in 1 second
\ No newline at end of file
+$("body").timer.stop(); // Stop the timer once more for the purpose of the tests (to test once())
+$("body").timer.once(1000); // Run the timer ONCE in 1 second
\ No newline at end of file
diff --git a/jquery.tipsy/jquery.tipsy-tests.ts b/jquery.tipsy/jquery.tipsy-tests.ts
index e307e5d364..09ba7f2d68 100644
--- a/jquery.tipsy/jquery.tipsy-tests.ts
+++ b/jquery.tipsy/jquery.tipsy-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 // basic
 $('#example-1').tipsy();
 
diff --git a/jquery.tools/jquery.tools-tests.ts b/jquery.tools/jquery.tools-tests.ts
index f8a4e39f90..443425e76b 100644
--- a/jquery.tools/jquery.tools-tests.ts
+++ b/jquery.tools/jquery.tools-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts" />
-
 /* from documentation at http://jquerytools.github.io/documentation/overlay/index.html */
 
  $("img[rel]").overlay();
@@ -40,7 +38,7 @@ $("#prompt form").submit(function(this: JQuery, e: JQueryEventObject) {
  
       // close the overlay
       triggers.eq(1).overlay<JQueryTools.overlay.Overlay>().close();
-      //or more straightforward:
+      // or more straightforward:
       triggers.data('overlay').close();
  
       // get user input
@@ -53,7 +51,7 @@ $("#prompt form").submit(function(this: JQuery, e: JQueryEventObject) {
       return e.preventDefault();
   });
 
-$.tools.overlay.addEffect('', function() {}, function() {});
+$.tools.overlay.addEffect('', () => {}, () => {});
 
 /* custom effects */
 $.tools.overlay.addEffect("myEffect", function(position, done) {
@@ -101,8 +99,7 @@ $(function() {
         mask: 'darkred',
         effect: 'apple',
  
-        onBeforeLoad: function() {
- 
+        onBeforeLoad() {
             // grab wrapper element inside content
             var wrap = this.getOverlay().find(".contentWrap");
  
@@ -113,7 +110,7 @@ $(function() {
     });
 });
 
-$(function() {
+$(() => {
     // positions for each overlay
     var positions = [
         [0, 530],
@@ -169,7 +166,7 @@ $.tools.overlay.addEffect("drop", function(css, done) {
     /* closing animation */
 }, function(done) {
     this.getOverlay().animate(
-        {top:'-=55', opacity:0, width:'-=20'}, 300, 'drop',
+        { top: '-=55', opacity: 0, width: '-=20' }, 300, 'drop',
         function(this: JQuery) {
             $(this).hide();
             done.call(null);
diff --git a/jquery.total-storage/jquery.total-storage-tests.ts b/jquery.total-storage/jquery.total-storage-tests.ts
index 0a23dd67cf..37ebb1ca73 100644
--- a/jquery.total-storage/jquery.total-storage-tests.ts
+++ b/jquery.total-storage/jquery.total-storage-tests.ts
@@ -1,10 +1,3 @@
-// Type definitions for jQueryTotalStorage 1.1.2
-// Project: https://github.com/Upstatement/jquery-total-storage
-// Definitions by: Jeremy Brooks <https://github.com/JeremyCBrooks/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="jquery"/>
-
 //direct call
 $.totalStorage("test_key1", "test_value");
 var val1:string = $.totalStorage("test_key");
diff --git a/jquery.transit/jquery.transit-tests.ts b/jquery.transit/jquery.transit-tests.ts
index 2a672ec979..4f3b41f228 100644
--- a/jquery.transit/jquery.transit-tests.ts
+++ b/jquery.transit/jquery.transit-tests.ts
@@ -1,5 +1,3 @@
-///<reference types="jquery" />
-
 class TransitOptions implements JQueryTransitOptions {
 	opacity: number;
 	duration: number;
diff --git a/jquery.ui.datetimepicker/jquery.ui.datetimepicker-tests.ts b/jquery.ui.datetimepicker/jquery.ui.datetimepicker-tests.ts
index 44996637da..00ba4fe297 100644
--- a/jquery.ui.datetimepicker/jquery.ui.datetimepicker-tests.ts
+++ b/jquery.ui.datetimepicker/jquery.ui.datetimepicker-tests.ts
@@ -1,9 +1,6 @@
-/// <reference types="jquery"/>
-
-
 // basic no options
 $('#datetimepicker').datetimepicker({
-    
+
 });
 
 // basic with some options
diff --git a/jquery.validation/jquery.validation-tests.ts b/jquery.validation/jquery.validation-tests.ts
index 0b2de520f2..68062d6e1c 100644
--- a/jquery.validation/jquery.validation-tests.ts
+++ b/jquery.validation/jquery.validation-tests.ts
@@ -1,6 +1,4 @@
-/// <reference types="jquery"/>
-/// <reference types="jquery.form"/>
-
+/// <reference types="jquery.form" />
 
 function test_validate() {
     $("#commentForm").validate();
@@ -264,4 +262,3 @@ function test_static_methods() {
     jQuery.validator.format('{0} {1}', 'a', 2);
     jQuery.validator.format('{0} {1}', ['a', 2]);
 }
-    
\ No newline at end of file
diff --git a/jquery.watermark/jquery.watermark-tests.ts b/jquery.watermark/jquery.watermark-tests.ts
index 225ba0a482..e92ec0df11 100644
--- a/jquery.watermark/jquery.watermark-tests.ts
+++ b/jquery.watermark/jquery.watermark-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 $('#inputId').watermark('Required information');
 $('#inputId').watermark('Required information', { className: 'myClassName' });
 $('#inputId').watermark('Search', { useNative: false });
diff --git a/jquery.window/jquery.window-tests.ts b/jquery.window/jquery.window-tests.ts
index 4b1b9b6eb2..15021cad7d 100644
--- a/jquery.window/jquery.window-tests.ts
+++ b/jquery.window/jquery.window-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 function example_1() {
 	$.window({
 		title: "Cyclops Studio",
@@ -20,13 +18,13 @@ function example_2() {
 
 function example_3() {
 	// prepare customerized static attributes, see static attributes
-	// Note: you should call this method before starting to create window instances, or windows might display wrong. 
+	// Note: you should call this method before starting to create window instances, or windows might display wrong.
 	$.window.prepare({
 		dock: 'bottom',       // change the dock direction: 'left', 'right', 'top', 'bottom'
 		animationSpeed: 200,  // set animation speed
 		minWinLong: 180       // set minimized window long dimension width in pixel
 	});
- 
+
 	// limit window within body
 	$.window({
 			icon: 'http://www.fstoke.me/favicon.ico',
@@ -51,7 +49,7 @@ function example_3() {
 		x: 80,
 		y: 80
 	});
- 
+
 	// assign the dock area
 	$.window.prepare({
 		dock: 'bottom',       // change the dock direction: 'left', 'right', 'top', 'bottom'
diff --git a/jquery/index.d.ts b/jquery/index.d.ts
index 3a785530aa..0a47546193 100644
--- a/jquery/index.d.ts
+++ b/jquery/index.d.ts
@@ -1166,25 +1166,28 @@ interface JQueryStatic {
      * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
      *
      * @param collection The object or array to iterate over.
-     * @param callback The function that will be executed on every object.
+     * @param callback The function that will be executed on every object. Will break the loop by returning false.
+     * @returns the first argument, the object that is iterated.
      * @see {@link https://api.jquery.com/jQuery.each/#jQuery-each-array-callback}
      */
     each<T>(
         collection: T[],
-        callback: (indexInArray: number, valueOfElement: T) => any
-        ): any;
+        callback: (indexInArray: number, valueOfElement: T) => boolean | void
+        ): T[];
 
     /**
      * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
      *
      * @param collection The object or array to iterate over.
-     * @param callback The function that will be executed on every object.
+     * @param callback The function that will be executed on every object. Will break the loop by returning false.
+     * @returns the first argument, the object that is iterated.
      * @see {@link https://api.jquery.com/jQuery.each/#jQuery-each-object-callback}
      */
-    each(
-        collection: any,
-        callback: (indexInArray: any, valueOfElement: any) => any
-        ): any;
+    each<T extends Object>(
+        collection: T,
+        // TODO: `(keyInObject: keyof T, valueOfElement: T[keyof T])`, when TypeScript 2.1 allowed in repository
+        callback: (keyInObject: string, valueOfElement: any) => boolean | void
+        ): T;
 
     /**
      * Merge the contents of two or more objects together into the first object.
@@ -1240,7 +1243,7 @@ interface JQueryStatic {
      * @param obj Object to test whether or not it is an array.
      * @see {@link https://api.jquery.com/jQuery.isArray/}
      */
-    isArray(obj: any): boolean;
+    isArray(obj: any): obj is Array<any>;
     /**
      * Check to see if an object is empty (contains no enumerable properties).
      *
@@ -1254,7 +1257,7 @@ interface JQueryStatic {
      * @param obj Object to test whether or not it is a function.
      * @see {@link https://api.jquery.com/jQuery.isFunction/}
      */
-    isFunction(obj: any): boolean;
+    isFunction(obj: any): obj is Function;
     /**
      * Determines whether its argument is a number.
      *
@@ -1275,7 +1278,7 @@ interface JQueryStatic {
      * @param obj Object to test whether or not it is a window.
      * @see {@link https://api.jquery.com/jQuery.isWindow/}
      */
-    isWindow(obj: any): boolean;
+    isWindow(obj: any): obj is Window;
     /**
      * Check to see if a DOM node is within an XML document (or is an XML document).
      *
@@ -1360,7 +1363,7 @@ interface JQueryStatic {
      * @param obj Object to get the internal JavaScript [[Class]] of.
      * @see {@link https://api.jquery.com/jQuery.type/}
      */
-    type(obj: any): string;
+    type(obj: any): "array" | "boolean" | "date" | "error" | "function" | "null" | "number" | "object" | "regexp" | "string" | "symbol" | "undefined";
 
     /**
      * Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on arrays of DOM elements, not strings or numbers.
@@ -1368,7 +1371,7 @@ interface JQueryStatic {
      * @param array The Array of DOM elements.
      * @see {@link https://api.jquery.com/jQuery.unique/}
      */
-    unique(array: Element[]): Element[];
+    unique<T extends Element>(array: T[]): T[];
 
     /**
      * Parses a string into an array of DOM nodes.
@@ -3301,10 +3304,10 @@ interface JQuery {
     /**
      * Iterate over a jQuery object, executing a function for each matched element.
      *
-     * @param func A function to execute for each matched element.
+     * @param func A function to execute for each matched element. Can stop the loop by returning false.
      * @see {@link https://api.jquery.com/each/}
      */
-    each(func: (index: number, elem: Element) => any): JQuery;
+    each(func: (index: number, elem: Element) => boolean | void): JQuery;
 
     /**
      * Retrieve one of the elements matched by the jQuery object.
@@ -3457,7 +3460,7 @@ interface JQuery {
      * @param func A function used as a test for each element in the set. this is the current DOM element.
      * @see {@link https://api.jquery.com/filter/#filter-function}
      */
-    filter(func: (index: number, element: Element) => any): JQuery;
+    filter(func: (index: number, element: Element) => boolean): JQuery;
     /**
      * Reduce the set of matched elements to those that match the selector or pass the function's test.
      *
diff --git a/jquery/jquery-tests.ts b/jquery/jquery-tests.ts
index e11a8b806f..d2d58aa2a2 100644
--- a/jquery/jquery-tests.ts
+++ b/jquery/jquery-tests.ts
@@ -100,16 +100,18 @@ function test_ajax() {
             if (getAllResponseHeaders()) {
                 return getAllResponseHeaders();
             }
-            var allHeaders = "";
-            $(["Cache-Control", "Content-Language", "Content-Type",
-                    "Expires", "Last-Modified", "Pragma"]).each(function (i, header_name) {
 
-                        if (xhr.getResponseHeader(header_name)) {
-                            allHeaders += header_name + ": " + xhr.getResponseHeader(header_name) + "\n";
-                        }
-                        return allHeaders;
-                    });
+            var allHeaders = "";
+            var headersFieldNames = ["Cache-Control", "Content-Language", "Content-Type",
+                "Expires", "Last-Modified", "Pragma"];
+            $(headersFieldNames).each(function (i, header_name) {
+                if (xhr.getResponseHeader(header_name)) {
+                    allHeaders += header_name + ": " + xhr.getResponseHeader(header_name) + "\n";
+                }
+            });
+            return allHeaders;
         };
+
         return xhr;
     };
     $.ajax({
@@ -1392,9 +1394,24 @@ function test_detach() {
 }
 
 function test_each() {
-    $.each([52, 97], function (index, value) {
+    var numArray: number[];
+    numArray = $.each([1, 2, 3, 4], function (index: number, value: number) {
         alert(index + ': ' + value);
     });
+    numArray = $.each([1, 2, 3, 4], function (index: number, value: number) {
+        alert(index + ': ' + value);
+        return value < 2;
+    });
+
+    var res: {one: number, 2: string};
+    res = $.each({ one: 1, 2: "two" }, function(key: string, value: any) {
+        alert(key + ': ' + value);
+    });
+    res = $.each({ one: 1, 2: "two" }, function(key: string, value: any) {
+        alert(key + ': ' + value);
+        return key === "2";
+    });
+
     var map = {
         'flammable': 'inflammable',
         'duh': 'no duh'
@@ -1404,8 +1421,7 @@ function test_each() {
     });
     var arr = ["one", "two", "three", "four", "five"];
     var obj = { one: 1, two: 2, three: 3, four: 4, five: 5 };
-    // TODO: Should not need explicit type annotation https://github.com/Microsoft/TypeScript/issues/10072
-    jQuery.each<string>(arr, function () {
+    jQuery.each(arr, function () {
         $("#" + this).text("Mine is " + this + ".");
         return (this != "three");
     });
@@ -1482,9 +1498,10 @@ function test_error() {
             $(this).hide();
         })
         .attr("src", "missing.png");
+    jQuery.error("Oups");
     jQuery.error = (message?: string) => {
         console.error(message); return this;
-    }
+    };
 }
 
 function test_eventParams() {
@@ -1516,7 +1533,7 @@ function test_eventParams() {
     function propStopped(e) {
         var msg = "";
         if (e.isPropagationStopped()) {
-            msg = "called"
+            msg = "called";
         } else {
             msg = "not called";
         }
@@ -1703,11 +1720,11 @@ function test_fadeToggle() {
 function test_filter() {
     $('li').filter(':even').css('background-color', 'red');
     $('li').filter(function (index) {
-        return index % 3 == 2;
+        return index % 3 === 2;
     }).css('background-color', 'red');
     $("div").css("background", "#b4b0da")
         .filter(function (index) {
-            return index == 1 || $(this).attr("id") == "fourth";
+            return index === 1 || $(this).attr("id") === "fourth";
         })
         .css("border", "3px double red");
     $("div").filter(document.getElementById("unique"));
@@ -1879,7 +1896,7 @@ function test_getJSON() {
     function (data) {
         $.each(data.items, function (i, item) {
             $("<img/>").attr("src", item.media.m).appendTo("#images");
-            if (i == 3) return false;
+            if (i === "3") return false;
         });
     });
     $.getJSON("test.js", function (json) {
@@ -2524,6 +2541,17 @@ function test_is() {
     });
 }
 
+function test_isTypeGuards() {
+    var foo: number[] | ((x: string) => number) | Window;
+    if (jQuery.isArray(foo)) {
+        foo.push(1515);
+    } else if (jQuery.isWindow(foo)) {
+        foo.close();
+    } else if (jQuery.isFunction(foo)) {
+        foo("hello world");
+    }
+}
+
 function test_isArray() {
     $("b").append("" + $.isArray([]));
 }
@@ -2582,6 +2610,16 @@ function test_isXMLDoc() {
     jQuery.isXMLDoc(document.body);
 }
 
+function test_unique() {
+    jQuery.unique($('div.foo, div.bar').get());
+    jQuery.unique($('div.foo, div.bar').toArray());
+
+    var divs: HTMLDivElement[];
+    var unique: HTMLDivElement[];
+    unique = jQuery.unique(divs);
+    unique = jQuery.unique<HTMLDivElement>(divs);
+}
+
 function test_jQuery() {
     $('div.foo');
     $('div.foo').click(function () {
diff --git a/jquerymobile/jquerymobile-tests.ts b/jquerymobile/jquerymobile-tests.ts
index 105edc3f88..e7fbf3bfff 100644
--- a/jquerymobile/jquerymobile-tests.ts
+++ b/jquerymobile/jquerymobile-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 function test_api() {
     $.mobile.changePage("about/us.html", { transition: "slideup" });
     $.mobile.changePage("searchresults.php", {
diff --git a/jqueryui/jqueryui-tests.ts b/jqueryui/jqueryui-tests.ts
index 2cce742f86..5755738622 100644
--- a/jqueryui/jqueryui-tests.ts
+++ b/jqueryui/jqueryui-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 function test_draggable() {
 
     $("#draggable").draggable({ axis: "y" });
diff --git a/jsonwebtoken/jsonwebtoken-tests.ts b/jsonwebtoken/jsonwebtoken-tests.ts
index 4a939becbc..e591f31159 100644
--- a/jsonwebtoken/jsonwebtoken-tests.ts
+++ b/jsonwebtoken/jsonwebtoken-tests.ts
@@ -1,10 +1,8 @@
-/** 
- * Test suite created by Maxime LUCE <https://github.com/SomaticIT> 
- *  
+/**
+ * Test suite created by Maxime LUCE <https://github.com/SomaticIT>
+ *
  * Created by using code samples from https://github.com/auth0/node-jsonwebtoken.
- */ 
- 
-/// <reference types="node" /> 
+ */
 
 import jwt = require("jsonwebtoken");
 import fs = require("fs");
@@ -49,7 +47,7 @@ jwt.verify(token, 'shhhhh', function(err, decoded) {
 
 // invalid token
 jwt.verify(token, 'wrong-secret', function(err, decoded) {
-  // err 
+  // err
   // decoded undefined
 });
 
diff --git a/jsrender/jsrender-tests.ts b/jsrender/jsrender-tests.ts
index d728f968ae..7b5bf5a525 100644
--- a/jsrender/jsrender-tests.ts
+++ b/jsrender/jsrender-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 $.views.converters("upper", function(val) {
   return val.toUpperCase();
 });
diff --git a/jsx-chai/jsx-chai-tests.ts b/jsx-chai/jsx-chai-tests.ts
index d421ae0874..48c49e7b25 100644
--- a/jsx-chai/jsx-chai-tests.ts
+++ b/jsx-chai/jsx-chai-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="chai"/>
-
 import chai = require('chai');
 import jsxChai = require('jsx-chai');
 
diff --git a/jwt-simple/index.d.ts b/jwt-simple/index.d.ts
index 1ae8f18519..b70aa8c720 100644
--- a/jwt-simple/index.d.ts
+++ b/jwt-simple/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jwt-simple v0.5.0
+// Type definitions for jwt-simple v0.5.1
 // Project: https://github.com/hokaccha/node-jwt-simple
 // Definitions by: Ken Fukuyama <https://github.com/kenfdev>, Gael Magnan <https://github.com/GaelMagnan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -11,7 +11,7 @@
    * @param algorithm default is HS256
  * @api public
  */
-export function decode(token: any, key: string, noVerify?: boolean): any;
+export function decode(token: any, key: string, noVerify?: boolean, algorithm?: string): any;
 /**
  * Encode jwt
  * @param payload
diff --git a/kafka-node/index.d.ts b/kafka-node/index.d.ts
index 018b1a6f9e..a9992ccc52 100644
--- a/kafka-node/index.d.ts
+++ b/kafka-node/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for kafka-node 1.3.3
 // Project: https://github.com/SOHU-Co/kafka-node/
-// Definitions by: Daniel Imrie-Situnayake <https://github.com/dansitu/>
+// Definitions by: Daniel Imrie-Situnayake <https://github.com/dansitu/>, Bill <https://github.com/bkim54>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
@@ -9,22 +9,26 @@ export declare class Client {
     constructor(connectionString: string, clientId: string, options?: ZKOptions);
     close(callback?: Function): void;
     topicExists(topics: Array<string>, callback: Function): void;
+    refreshMetadata(topics: Array<string>, cb?: (error: any, data: any) => any): void;
+    close(cb: (error: any) => any): void;
 }
 
 export declare class Producer {
-    constructor(client: Client);
+    constructor(client: Client, options?: any, customPartitioner?: any);
     on(eventName: string, cb: () => any): void;
     on(eventName: string, cb: (error: any) => any): void;
     send(payloads: Array<ProduceRequest>, cb: (error: any, data: any) => any): void;
     createTopics(topics: Array<string>, async: boolean, cb?: (error: any, data: any) => any): void;
+    close(cb: (error: any) => any): void;
 }
 
 export declare class HighLevelProducer {
-    constructor(client: Client, options?: any);
+    constructor(client: Client, options?: any, customPartitioner?: any);
     on(eventName: string, cb: () => any): void;
     on(eventName: string, cb: (error: any) => any): void;
     send(payloads: Array<ProduceRequest>, cb: (error: any, data: any) => any): void;
     createTopics(topics: Array<string>, async: boolean, cb?: (error: any, data: any) => any): void;
+    close(cb: (error: any) => any): void;
 }
 
 export declare class Consumer {
@@ -96,7 +100,7 @@ export interface ZKOptions {
 export interface ProduceRequest {
     topic: string;
     messages: any; // Array<string> | Array<KeyedMessage> | string | KeyedMessage
-    key?: string;
+    key?: any;
     partition?: number;
     attributes?: number;
 }
diff --git a/karma-coverage/tsconfig.json b/karma-coverage/tsconfig.json
index 57290fb7be..404aa4ec66 100644
--- a/karma-coverage/tsconfig.json
+++ b/karma-coverage/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/karma/tsconfig.json b/karma/tsconfig.json
index 2c74d40398..b2d5e469ba 100644
--- a/karma/tsconfig.json
+++ b/karma/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/kendo-ui/kendo-ui-tests.ts b/kendo-ui/kendo-ui-tests.ts
index d1cc528edb..0b79f87954 100644
--- a/kendo-ui/kendo-ui-tests.ts
+++ b/kendo-ui/kendo-ui-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 var is = {
     string: (msg: string) => {
         return true;
diff --git a/kii-cloud-sdk/index.d.ts b/kii-cloud-sdk/index.d.ts
index 26decd07a0..8dec3a94c8 100644
--- a/kii-cloud-sdk/index.d.ts
+++ b/kii-cloud-sdk/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Kii Cloud SDK v2.4.6
+// Type definitions for Kii Cloud SDK v2.4.9
 // Project: http://en.kii.com/
 // Definitions by: Kii Consortium <http://jp.kii.com/consortium/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,6 +10,9 @@ declare namespace KiiCloud {
         KiiACLBucketActionDropBucket,
         KiiACLObjectActionRead,
         KiiACLObjectActionWrite,
+        KiiACLBucketActionReadObjects,
+        KiiACLSubscribeToTopic,
+        KiiACLSendMessageToTopic,
     }
 
     export enum KiiSite {
@@ -44,7 +47,7 @@ declare namespace KiiCloud {
     } | {
         oauth_token: string,
         oauth_token_secret: string
-    }
+    };
 
     interface KiiSocialAccountInfo {
         createdAt: number;
@@ -195,6 +198,12 @@ declare namespace KiiCloud {
         portWSS: number;
     }
 
+    interface KiiError {
+        status: number;
+        code: string;
+        message: string;
+    }
+
     /**
      * The main SDK class
      */
@@ -245,7 +254,9 @@ declare namespace KiiCloud {
          * @example
          *     Kii.setAccessTokenExpiration(3600);
          */
-        static setAccessTokenExpiration(expiresIn: number): void;
+        static setAccessTokenExpiration(
+          expiresIn: number
+        ): void;
 
         /**
          * Returns access token lifetime in seconds.
@@ -266,7 +277,9 @@ declare namespace KiiCloud {
          * @param appID The application ID found in your Kii developer console
          * @param appKey The application key found in your Kii developer console
          * @param site Can be one of the constants KiiSite.US, KiiSite.JP, KiiSite.CN or KiiSite.SG depending on your location.
-         * @param analyticsOption An object used for initializing KiiAnalytics, If not provided or invalid object provided, KiiAnalytics won't be initialized. If provided, it can be empty object or with analyticsOption.deviceId.<br> If provided, but deviceId is not provided, SDK generates a new deviceId and use it when upload events. It can be retrieved by {@link KiiAnalytics.getDeviceId()}. It is recommended to retrieve the deviceId and store it to identify the device properly.
+         * @param analyticsOption An object used for initializing KiiAnalytics, If not provided or invalid object provided, KiiAnalytics won't be initialized. If provided, it can be empty object or
+         * with analyticsOption.deviceId.<br> If provided, but deviceId is not provided, SDK generates a new deviceId and use it when upload events. It can be retrieved by {@link
+         * KiiAnalytics.getDeviceId()}. It is recommended to retrieve the deviceId and store it to identify the device properly.
          *
          * @example
          *     // Disable KiiAnalytics
@@ -279,7 +292,12 @@ declare namespace KiiCloud {
          *     // Enable KiiAnalytics without deviceId
          *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiSite.JP, {});
          */
-        static initializeWithSite(appID: string, appKey: string, site: KiiSite, analyticsOption?: any): void;
+        static initializeWithSite(
+          appID: string,
+          appKey: string,
+          site: KiiSite,
+          analyticsOption?: any
+        ): void;
 
         /**
          * Initialize the Kii SDK
@@ -289,7 +307,9 @@ declare namespace KiiCloud {
          *
          * @param appID The application ID found in your Kii developer console
          * @param appKey The application key found in your Kii developer console
-         * @param analyticsOption An object used for initializing KiiAnalytics, If not provided or invalid object provided, KiiAnalytics won't be initialized. If provided, it can be empty object or with analyticsOption.deviceId. <br> If provided, but deviceId is not provided, SDK generates a new deviceId and use it when upload events. It can be retrieved by {@link KiiAnalytics.getDeviceId()}. It is recommended to retrieve the deviceId and store it to identify the device properly.
+         * @param analyticsOption An object used for initializing KiiAnalytics, If not provided or invalid object provided, KiiAnalytics won't be initialized. If provided, it can be empty object or
+         * with analyticsOption.deviceId. <br> If provided, but deviceId is not provided, SDK generates a new deviceId and use it when upload events. It can be retrieved by {@link
+         * KiiAnalytics.getDeviceId()}. It is recommended to retrieve the deviceId and store it to identify the device properly.
          *
          * @example
          *     // Disable KiiAnalytics
@@ -302,7 +322,11 @@ declare namespace KiiCloud {
          *     // Enable KiiAnalytics without deviceId
          *     Kii.initialize("my-app-id", "my-app-key", {});
          */
-        static initialize(appID: string, appKey: string, analyticsOption?: any): void;
+        static initialize(
+          appID: string,
+          appKey: string,
+          analyticsOption?: any
+        ): void;
 
         /**
          * Creates a reference to a bucket for this app
@@ -316,7 +340,9 @@ declare namespace KiiCloud {
          * @example
          *         var bucket = Kii.bucketWithName("myBucket");
          */
-        static bucketWithName(bucketName: string): KiiBucket;
+        static bucketWithName(
+          bucketName: string
+        ): KiiBucket;
 
         /**
          * Creates a reference to a　encrypted bucket for this app
@@ -330,7 +356,9 @@ declare namespace KiiCloud {
          * @example
          *         var bucket = Kii.encryptedBucketWithName("myBucket");
          */
-        static encryptedBucketWithName(bucketName: string): KiiBucket;
+        static encryptedBucketWithName(
+          bucketName: string
+        ): KiiBucket;
 
         /**
          * Creates a reference to a group with the given name
@@ -342,7 +370,9 @@ declare namespace KiiCloud {
          * @example
          *         var group = new Kii.groupWithName("myGroup");
          */
-        static groupWithName(groupName: string): KiiGroup;
+        static groupWithName(
+          groupName: string
+        ): KiiGroup;
 
         /**
          * Creates a reference to a group with the given name and a list of default members
@@ -355,7 +385,10 @@ declare namespace KiiCloud {
          * @example
          *         var group = new KiiGroup.groupWithName("myGroup", members);
          */
-        static groupWithNameAndMembers(groupName: string, members: KiiUser[]): KiiGroup;
+        static groupWithNameAndMembers(
+          groupName: string,
+          members: KiiUser[]
+        ): KiiGroup;
 
         /**
          * Authenticate as app admin.
@@ -405,7 +438,11 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static authenticateAsAppAdmin(clientId: string, clientSecret: string, callbacks?: { success(adminContext: KiiAppAdminContext): any; failure(error: string, statusCode: number): any; }): Promise<KiiAppAdminContext>;
+        static authenticateAsAppAdmin(
+          clientId: string,
+          clientSecret: string,
+          callbacks?: { success(adminContext: KiiAppAdminContext): any; failure(error: string, statusCode: number): any; }
+        ): Promise<KiiAppAdminContext>;
 
         /**
          * Instantiate KiiServerCodeEntry with specified entry name.
@@ -422,7 +459,9 @@ declare namespace KiiCloud {
          * @example
          *         var entry = Kii.serverCodeEntry("main");
          */
-        static serverCodeEntry(entryName: string): KiiServerCodeEntry;
+        static serverCodeEntry(
+          entryName: string
+        ): KiiServerCodeEntry;
 
         /**
          * Instantiate serverCodeEntryWithVersion with specified entry name and version.
@@ -440,7 +479,10 @@ declare namespace KiiCloud {
          * @example
          *         var entry = Kii.serverCodeEntryWithVersion("main", "gulsdf6ful8jvf8uq6fe7vjy6");
          */
-        static serverCodeEntryWithVersion(entryName: string, version: string): KiiServerCodeEntry;
+        static serverCodeEntryWithVersion(
+          entryName: string,
+          version: string
+        ): KiiServerCodeEntry;
 
         /**
          * Instantiate topic belongs to application.
@@ -449,13 +491,16 @@ declare namespace KiiCloud {
          *
          * @return topic instance.
          */
-        static topicWithName(topicName: string): KiiTopic;
+        static topicWithName(
+          topicName: string
+        ): KiiTopic;
 
         /**
          * Gets a list of topics in app scope
          *
          * @param callbacks An object with callback methods defined
-         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success or fullfill callback of promise. If empty string or no string object is provided, this API regards no paginationKey specified.
+         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success or fullfill callback of promise. If empty string or no string object is
+         * provided, this API regards no paginationKey specified.
          *
          * @return return promise object.
          *     <ul>
@@ -513,7 +558,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
+        static listTopics(
+          callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; },
+          paginationKey?: string
+        ): Promise<[KiiTopic[], string]>;
 
         /**
          * Authenticate as Thing.
@@ -562,7 +610,11 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static authenticateAsThing(vendorThingID: string, password: string, callbacks?: { success(thingAuthContext: KiiThingContext): any; failure(error: Error): any; }): Promise<KiiThingContext>;
+        static authenticateAsThing(
+          vendorThingID: string,
+          password: string,
+          callbacks?: { success(thingAuthContext: KiiThingContext): any; failure(error: Error): any; }
+        ): Promise<KiiThingContext>;
 
         /**
          * Create a KiiThingContext reference
@@ -611,7 +663,11 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static authenticateAsThingWithToken(thingID: string, token: string, callbacks?: { success(thingContext: KiiThingContext): any; failure(error: Error): any; }): Promise<KiiThingContext>;
+        static authenticateAsThingWithToken(
+          thingID: string,
+          token: string,
+          callbacks?: { success(thingContext: KiiThingContext): any; failure(error: Error): any; }
+        ): Promise<KiiThingContext>;
     }
 
     /**
@@ -666,10 +722,13 @@ declare namespace KiiCloud {
          *         		// do something with the error response
          *     });
          */
-        listACLEntries(callbacks?: { success(theACL: KiiACL, theEntries: KiiACLEntry[]): any; failure(theACL: KiiACL, anErrorString: string): any; }): Promise<[KiiACL, KiiACLEntry[]]>;
+        listACLEntries(
+          callbacks?: { success(theACL: KiiACL, theEntries: KiiACLEntry[]): any; failure(theACL: KiiACL, anErrorString: string): any; }
+        ): Promise<[KiiACL, KiiACLEntry[]]>;
 
         /**
-         * Add a KiiACLEntry to the local object, if not already present. This does not explicitly grant any permissions, which should be done through the KiiACLEntry itself. This method simply adds the entry to the local ACL object so it can be saved to the server.
+         * Add a KiiACLEntry to the local object, if not already present. This does not explicitly grant any permissions, which should be done through the KiiACLEntry itself. This method simply adds
+         * the entry to the local ACL object so it can be saved to the server.
          *
          * @param entry The KiiACLEntry to add
          *
@@ -680,10 +739,13 @@ declare namespace KiiCloud {
          *     var acl = . . .; // a KiiACL object
          *     acl.putACLEntry(aclEntry);
          */
-        putACLEntry(entry: KiiACLEntry): void;
+        putACLEntry(
+          entry: KiiACLEntry
+        ): void;
 
         /**
-         * Remove a KiiACLEntry to the local object. This does not explicitly revoke any permissions, which should be done through the KiiACLEntry itself. This method simply removes the entry from the local ACL object and will not be saved to the server.
+         * Remove a KiiACLEntry to the local object. This does not explicitly revoke any permissions, which should be done through the KiiACLEntry itself. This method simply removes the entry from the
+         * local ACL object and will not be saved to the server.
          *
          * @param entry The KiiACLEntry to remove
          *
@@ -694,7 +756,9 @@ declare namespace KiiCloud {
          *     var acl = . . .; // a KiiACL object
          *     acl.removeACLEntry(aclEntry);
          */
-        removeACLEntry(entry: KiiACLEntry): void;
+        removeACLEntry(
+          entry: KiiACLEntry
+        ): void;
 
         /**
          * Save the list of ACLEntry objects associated with this ACL object to the server
@@ -737,7 +801,9 @@ declare namespace KiiCloud {
          *             // do something with the error response
          *     });
          */
-        save(callbacks?: { success(theSavedACL: KiiACL): any; failure(theACL: KiiACL, anErrorString: string): any; }): Promise<KiiACL>;
+        save(
+          callbacks?: { success(theSavedACL: KiiACL): any; failure(theACL: KiiACL, anErrorString: string): any; }
+        ): Promise<KiiACL>;
     }
 
     /**
@@ -760,7 +826,9 @@ declare namespace KiiCloud {
          *
          * @throws If the value is not one of the permitted values
          */
-        setAction(value: KiiACLAction): void;
+        setAction(
+          value: KiiACLAction
+        ): void;
 
         /**
          * Get the action that is being permitted/restricted in this entry
@@ -776,7 +844,9 @@ declare namespace KiiCloud {
          *
          * @throws If the value is not one of the permitted values
          */
-        setSubject(subject: KiiACLSubject): void;
+        setSubject(
+          subject: KiiACLSubject
+        ): void;
 
         /**
          * Get the subject that is being permitted/restricted in this entry
@@ -792,7 +862,9 @@ declare namespace KiiCloud {
          *
          * @throws If the value is not a boolean type
          */
-        setGrant(value: boolean): void;
+        setGrant(
+          value: boolean
+        ): void;
 
         /**
          * Get whether or not the action is being permitted to the subject
@@ -817,7 +889,10 @@ declare namespace KiiCloud {
          * @throws If specified subject is invalid.
          * @throws If the specified action is invalid.
          */
-        static entryWithSubject(Subject: KiiACLSubject, action: KiiACLAction): KiiACLEntry;
+        static entryWithSubject(
+          Subject: KiiACLSubject,
+          action: KiiACLAction
+        ): KiiACLEntry;
     }
 
     /**
@@ -839,7 +914,8 @@ declare namespace KiiCloud {
         static getAppKey(): string;
 
         /**
-         * Get the deviceId. If deviceId has not specified while initialization, it returns SDK generated deviceId.It is recommended to retrieve the deviceId and store it to identify the device properly.
+         * Get the deviceId. If deviceId has not specified while initialization, it returns SDK generated deviceId.It is recommended to retrieve the deviceId and store it to identify the device
+         * properly.
          *
          * @return deviceId.
          */
@@ -862,7 +938,9 @@ declare namespace KiiCloud {
          * @example
          *         KiiAnalytics.setLogging(true);
          */
-        static setLogging(True: boolean): void;
+        static setLogging(
+          True: boolean
+        ): void;
 
         /**
          *
@@ -874,7 +952,8 @@ declare namespace KiiCloud {
          * @param appID The application ID found in your Kii developer console
          * @param appKey The application key found in your Kii developer console
          * @param site Can be one of the constants KiiAnalyticsSite.US, KiiAnalyticsSite.JP, KiiAnalyticsSite.CN, KiiAnalyticsSite.CN3 or KiiAnalyticsSite.SG depending on your location.
-         * @param deviceid If deviceId is not provided, SDK generates a new deviceId and use it when upload events.deviceId can be retrieved by {@link KiiAnalytics.getDeviceId()}.It is recommended to retrieve the deviceId and store it to identify the device properly.
+         * @param deviceid If deviceId is not provided, SDK generates a new deviceId and use it when upload events.deviceId can be retrieved by {@link KiiAnalytics.getDeviceId()}.It is recommended to
+         * retrieve the deviceId and store it to identify the device properly.
          *
          * @example
          *     // initialize without deviceId
@@ -882,7 +961,12 @@ declare namespace KiiCloud {
          *     // initialize with deviceId
          *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiAnalyticsSite.JP, "my-device-id");
          */
-        static initializeWithSite(appID: string, appKey: string, site: KiiAnalyticsSite, deviceid: string): void;
+        static initializeWithSite(
+          appID: string,
+          appKey: string,
+          site: KiiAnalyticsSite,
+          deviceid: string
+        ): void;
 
         /**
          *
@@ -893,7 +977,8 @@ declare namespace KiiCloud {
          *
          * @param appID The application ID found in your Kii developer console
          * @param appKey The application key found in your Kii developer console
-         * @param deviceid If deviceId is not provided, SDK generates a new deviceId and use it when upload events. deviceId can be retrieved by {@link KiiAnalytics.getDeviceId()}.It is recommended to retrieve the deviceId and store it to identify the device properly.
+         * @param deviceid If deviceId is not provided, SDK generates a new deviceId and use it when upload events. deviceId can be retrieved by {@link KiiAnalytics.getDeviceId()}.It is recommended to
+         * retrieve the deviceId and store it to identify the device properly.
          *
          * @example
          *     // initialize without deviceId
@@ -901,7 +986,11 @@ declare namespace KiiCloud {
          *     // initialize with deviceId
          *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiAnalyticsSite.JP, "my-device-id");
          */
-        static initialize(appID: string, appKey: string, deviceid: string): void;
+        static initialize(
+          appID: string,
+          appKey: string,
+          deviceid: string
+        ): void;
 
         /**
          * Utilize the KiiAnalytics logger to track SDK-specific actions
@@ -913,7 +1002,9 @@ declare namespace KiiCloud {
          * @example
          *         KiiAnalytics.logger("My message");
          */
-        static logger(message: string): void;
+        static logger(
+          message: string
+        ): void;
 
         /**
          * Log a single event to be uploaded to KiiAnalytics
@@ -932,7 +1023,9 @@ declare namespace KiiCloud {
          *       </li>
          *     </ul>
          */
-        static trackEvent(eventName: string): Promise<void>;
+        static trackEvent(
+          eventName: string
+        ): Promise<void>;
 
         /**
          * Log a single event to be uploaded to KiiAnalytics
@@ -955,7 +1048,10 @@ declare namespace KiiCloud {
          *       </li>
          *     </ul>
          */
-        static trackEventWithExtras(eventName: string, extras: any): Promise<void>;
+        static trackEventWithExtras(
+          eventName: string,
+          extras: any
+        ): Promise<void>;
 
         /**
          * Log a single event to be uploaded to KiiAnalytics
@@ -979,7 +1075,11 @@ declare namespace KiiCloud {
          *       </li>
          *     </ul>
          */
-        static trackEventWithExtrasAndCallbacks(eventName: string, extras: any, callbacks?: { success(): any; failure(error: Error): any; }): Promise<void>;
+        static trackEventWithExtrasAndCallbacks(
+          eventName: string,
+          extras: any,
+          callbacks?: { success(): any; failure(error: Error): any; }
+        ): Promise<void>;
 
         /**
          *
@@ -988,7 +1088,9 @@ declare namespace KiiCloud {
          *
          * @param url A string containing the desired endpoint
          */
-        static setBaseURL(url: string): void;
+        static setBaseURL(
+          url: string
+        ): void;
 
         /**
          *
@@ -1054,7 +1156,9 @@ declare namespace KiiCloud {
          *             }
          *         });
          */
-        bucketWithName(bucketName: string): KiiBucket;
+        bucketWithName(
+          bucketName: string
+        ): KiiBucket;
 
         /**
          * Creates a reference to a encrypted bucket operated by app admin.
@@ -1075,7 +1179,9 @@ declare namespace KiiCloud {
          *             }
          *         });
          */
-        encryptedBucketWithName(bucketName: string): KiiBucket;
+        encryptedBucketWithName(
+          bucketName: string
+        ): KiiBucket;
 
         /**
          * Creates a reference to a group operated by app admin.
@@ -1099,7 +1205,9 @@ declare namespace KiiCloud {
          *             }
          *         });
          */
-        groupWithName(group: string): KiiGroup;
+        groupWithName(
+          group: string
+        ): KiiGroup;
 
         /**
          * Creates a reference to a user operated by app admin.
@@ -1119,7 +1227,9 @@ declare namespace KiiCloud {
          *             }
          *         });
          */
-        userWithID(user: string): KiiUser;
+        userWithID(
+          user: string
+        ): KiiUser;
 
         /**
          * Creates a reference to an object operated by app admin using object`s URI.
@@ -1130,7 +1240,9 @@ declare namespace KiiCloud {
          *
          * @throws If the URI is null, empty or does not have correct format.
          */
-        objectWithURI(object: string): KiiObject;
+        objectWithURI(
+          object: string
+        ): KiiObject;
 
         /**
          * Creates a reference to a group operated by app admin using group's ID.
@@ -1157,7 +1269,9 @@ declare namespace KiiCloud {
          *             }
          *         });
          */
-        groupWithID(group: string): KiiGroup;
+        groupWithID(
+          group: string
+        ): KiiGroup;
 
         /**
          * Register new group own by specified user on Kii Cloud with specified ID.
@@ -1216,7 +1330,13 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        registerGroupWithOwnerAndID(groupID: string, groupName: string, user: string, members: KiiUser[], callbacks?: { success(adminContext: KiiAppAdminContext): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }): Promise<KiiAppAdminContext>;
+        registerGroupWithOwnerAndID(
+          groupID: string,
+          groupName: string,
+          user: string,
+          members: KiiUser[],
+          callbacks?: { success(adminContext: KiiAppAdminContext): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }
+        ): Promise<KiiAppAdminContext>;
 
         /**
          * Creates a reference to a group operated by app admin using group's URI.
@@ -1243,7 +1363,9 @@ declare namespace KiiCloud {
          *             }
          *         });
          */
-        groupWithURI(group: string): KiiGroup;
+        groupWithURI(
+          group: string
+        ): KiiGroup;
 
         /**
          * Find registered KiiUser with the email.<br>
@@ -1317,7 +1439,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        findUserByEmail(email: string, callbacks?: { success(adminContext: KiiAppAdminContext, theMatchedUser: KiiUser): any; failure(adminContext: KiiAppAdminContext, anErrorString: string): any; }): Promise<[KiiAppAdminContext, KiiUser]>;
+        findUserByEmail(
+          email: string,
+          callbacks?: { success(adminContext: KiiAppAdminContext, theMatchedUser: KiiUser): any; failure(adminContext: KiiAppAdminContext, anErrorString: string): any; }
+        ): Promise<[KiiAppAdminContext, KiiUser]>;
 
         /**
          * Find registered KiiUser with the phone.<br>
@@ -1391,7 +1516,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        findUserByPhone(phone: string, callbacks?: { success(adminContext: KiiAppAdminContext, theMatchedUser: KiiUser): any; failure(adminContext: KiiAppAdminContext, anErrorString: string): any; }): Promise<[KiiAppAdminContext, KiiUser]>;
+        findUserByPhone(
+          phone: string,
+          callbacks?: { success(adminContext: KiiAppAdminContext, theMatchedUser: KiiUser): any; failure(adminContext: KiiAppAdminContext, anErrorString: string): any; }
+        ): Promise<[KiiAppAdminContext, KiiUser]>;
 
         /**
          * Find registered KiiUser with the user name.<br>
@@ -1463,7 +1591,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        findUserByUsername(username: string, callbacks?: { success(adminContext: KiiAppAdminContext, theMatchedUser: KiiUser): any; failure(adminContext: KiiAppAdminContext, anErrorString: string): any; }): Promise<[KiiAppAdminContext, KiiUser]>;
+        findUserByUsername(
+          username: string,
+          callbacks?: { success(adminContext: KiiAppAdminContext, theMatchedUser: KiiUser): any; failure(adminContext: KiiAppAdminContext, anErrorString: string): any; }
+        ): Promise<[KiiAppAdminContext, KiiUser]>;
 
         /**
          * Register thing by app admin.
@@ -1533,7 +1664,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        registerThing(fields: KiiThingFields, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+        registerThing(
+          fields: KiiThingFields,
+          callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }
+        ): Promise<KiiThing>;
 
         /**
          * Creates a reference to a thing operated by app admin.
@@ -1546,7 +1680,9 @@ declare namespace KiiCloud {
          *         // Assume you already have adminContext instance.
          *         adminContext.thingWithID(thingID);
          */
-        thingWithID(thing: string): KiiThing;
+        thingWithID(
+          thing: string
+        ): KiiThing;
 
         /**
          * Register user/group as owner of specified thing by app admin.
@@ -1599,7 +1735,11 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        registerOwnerWithThingID<T extends KiiUser | KiiGroup>(thingID: string, owner: T, callbacks?: { success(group: T): any; failure(error: Error): any; }): Promise<T>;
+        registerOwnerWithThingID<T extends KiiUser | KiiGroup>(
+          thingID: string,
+          owner: T,
+          callbacks?: { success(group: T): any; failure(error: Error): any; }
+        ): Promise<T>;
 
         /**
          * Register user/group as owner of specified thing by app admin.
@@ -1651,7 +1791,11 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        registerOwnerWithVendorThingID<T extends KiiUser | KiiGroup>(vendorThingID: string, owner: T, callbacks?: { success(group: T): any; failure(error: Error): any; }): Promise<T>;
+        registerOwnerWithVendorThingID<T extends KiiUser | KiiGroup>(
+          vendorThingID: string,
+          owner: T,
+          callbacks?: { success(group: T): any; failure(error: Error): any; }
+        ): Promise<T>;
 
         /**
          * Load thing with vendor thing ID by app admin.
@@ -1698,7 +1842,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        loadThingWithVendorThingID(vendorThingID: string, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+        loadThingWithVendorThingID(
+          vendorThingID: string,
+          callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }
+        ): Promise<KiiThing>;
 
         /**
          * Load thing with thing ID by app admin.
@@ -1745,7 +1892,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        loadThingWithThingID(thingID: string, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+        loadThingWithThingID(
+          thingID: string,
+          callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }
+        ): Promise<KiiThing>;
 
         /**
          * Creates a reference to a topic operated by app admin
@@ -1754,13 +1904,16 @@ declare namespace KiiCloud {
          *
          * @return topic instance.
          */
-        topicWithName(topicName: string): KiiTopic;
+        topicWithName(
+          topicName: string
+        ): KiiTopic;
 
         /**
          * Gets a list of topics in app scope
          *
          * @param callbacks An object with callback methods defined
-         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no paginationKey specified.
+         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no
+         * paginationKey specified.
          *
          * @return return promise object.
          *     <ul>
@@ -1821,7 +1974,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
+        listTopics(
+          callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; },
+          paginationKey?: string
+        ): Promise<[KiiTopic[], string]>;
     }
 
     /**
@@ -1851,7 +2007,8 @@ declare namespace KiiCloud {
         /**
          * Create a KiiObject within the current bucket, with type
          *
-         * <br><br>The object will not be created on the server until the KiiObject is explicitly saved. This method simply returns an empty working KiiObject with a specified type. The type allows for better indexing and improved query results. It is recommended to use this method - but for lazy creation, the createObject method is also available.
+         * <br><br>The object will not be created on the server until the KiiObject is explicitly saved. This method simply returns an empty working KiiObject with a specified type. The type allows
+         * for better indexing and improved query results. It is recommended to use this method - but for lazy creation, the createObject method is also available.
          *
          * @param type A string representing the desired object type
          *
@@ -1861,7 +2018,9 @@ declare namespace KiiCloud {
          *     var bucket = . . .; // a KiiBucket
          *     var object = bucket.createObjectWithType("scores");
          */
-        createObjectWithType(type: string): KiiObject;
+        createObjectWithType(
+          type: string
+        ): KiiObject;
 
         /**
          * Create a KiiObject within the current bucket, specifying its ID.
@@ -1883,7 +2042,9 @@ declare namespace KiiCloud {
          *      var bucket = . . .; // KiiBucket
          *      var object = bucket.createObjectWithID('__OBJECT_ID_');
          */
-        createObjectWithID(objectID: string): KiiObject;
+        createObjectWithID(
+          objectID: string
+        ): KiiObject;
 
         /**
          * Get the ACL handle for this bucket
@@ -1985,7 +2146,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        executeQuery<T>(query: KiiQuery, callbacks?: { success(queryPerformed: KiiQuery, resultSet: T[], nextQuery: KiiQuery): any; failure(bucket: KiiBucket, anErrorString: string): any; }): Promise<[KiiQuery, T[], KiiQuery]>;
+        executeQuery<T>(
+          query: KiiQuery,
+          callbacks?: { success(queryPerformed: KiiQuery, resultSet: T[], nextQuery: KiiQuery): any; failure(bucket: KiiBucket, anErrorString: string): any; }
+        ): Promise<[KiiQuery, T[], KiiQuery]>;
 
         /**
          * Execute count aggregation of specified query on current bucket.
@@ -2048,7 +2212,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        countWithQuery(query: KiiQuery, callbacks?: { success(bucket: KiiBucket, query: KiiQuery, count: number): any; failure(bucket: KiiBucket, errorString: string): any; }): Promise<[KiiBucket, KiiQuery, number]>;
+        countWithQuery(
+          query: KiiQuery,
+          callbacks?: { success(bucket: KiiBucket, query: KiiQuery, count: number): any; failure(bucket: KiiBucket, errorString: string): any; }
+        ): Promise<[KiiBucket, KiiQuery, number]>;
 
         /**
          * Execute count aggregation of all clause query on current bucket.
@@ -2105,7 +2272,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        count(callbacks?: { success(bucket: KiiBucket, query: KiiQuery, count: number): any; failure(bucket: KiiBucket, errorString: string): any; }): Promise<[KiiBucket, KiiQuery, number]>;
+        count(
+          callbacks?: { success(bucket: KiiBucket, query: KiiQuery, count: number): any; failure(bucket: KiiBucket, errorString: string): any; }
+        ): Promise<[KiiBucket, KiiQuery, number]>;
 
         /**
          * Delete the given bucket from the server
@@ -2155,7 +2324,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        delete(callbacks?: { success(deletedBucket: KiiBucket): any; failure(bucketToDelete: KiiBucket, anErrorString: string): any; }): Promise<KiiBucket>;
+        delete(
+          callbacks?: { success(deletedBucket: KiiBucket): any; failure(bucketToDelete: KiiBucket, anErrorString: string): any; }
+        ): Promise<KiiBucket>;
     }
 
     /**
@@ -2170,17 +2341,36 @@ declare namespace KiiCloud {
          * @example
          *     KiiClause clause = KiiClause.and(clause1, clause2, clause3, . . .)
          */
-        static and(...A: KiiClause[]): KiiClause;
+        static and(
+          ...A: KiiClause[]
+        ): KiiClause;
 
         /**
          * Create a KiiClause with the OR operator concatenating multiple KiiClause objects
+         * <br><br>
+         * <b>Note:</b>
+         * Query performance will be worse as the number of objects in bucket increases, so we recommend you avoid the OR clause if possible.
          *
          * @param A variable-length list of KiiClause objects to concatenate
          *
          * @example
          *     KiiClause clause = KiiClause.or(clause1, clause2, clause3, . . .)
          */
-        static or(...A: KiiClause[]): KiiClause;
+        static or(
+          ...A: KiiClause[]
+        ): KiiClause;
+
+        /**
+         * Create a KiiClause with the NOT operator concatenating a KiiClause object
+         * <br><br>
+         * <b>Note:</b>
+         * Query performance will be worse as the number of objects in bucket increases, so we recommend you avoid the NOT clause if possible.
+         *
+         * @param clause KiiClause object to negate
+         */
+        static not(
+          clause: KiiClause
+        ): KiiClause;
 
         /**
          * Create an expression of the form (key == value)
@@ -2188,7 +2378,10 @@ declare namespace KiiCloud {
          * @param key The key to compare
          * @param value the value to compare
          */
-        static equals(key: string, value: any): KiiClause;
+        static equals(
+          key: string,
+          value: any
+        ): KiiClause;
 
         /**
          * Create an expression of the form (key != value)
@@ -2196,7 +2389,10 @@ declare namespace KiiCloud {
          * @param key The key to compare
          * @param value the value to compare
          */
-        static notEquals(key: string, value: any): KiiClause;
+        static notEquals(
+          key: string,
+          value: any
+        ): KiiClause;
 
         /**
          * Create an expression of the form (key > value)
@@ -2204,7 +2400,10 @@ declare namespace KiiCloud {
          * @param key The key to compare
          * @param value the value to compare
          */
-        static greaterThan(key: string, value: any): KiiClause;
+        static greaterThan(
+          key: string,
+          value: any
+        ): KiiClause;
 
         /**
          * Create an expression of the form (key >= value)
@@ -2212,7 +2411,10 @@ declare namespace KiiCloud {
          * @param key The key to compare
          * @param value the value to compare
          */
-        static greaterThanOrEqual(key: string, value: any): KiiClause;
+        static greaterThanOrEqual(
+          key: string,
+          value: any
+        ): KiiClause;
 
         /**
          * Create an expression of the form (key < value)
@@ -2220,7 +2422,10 @@ declare namespace KiiCloud {
          * @param key The key to compare
          * @param value the value to compare
          */
-        static lessThan(key: string, value: any): KiiClause;
+        static lessThan(
+          key: string,
+          value: any
+        ): KiiClause;
 
         /**
          * Create an expression of the form (key <= value)
@@ -2228,7 +2433,10 @@ declare namespace KiiCloud {
          * @param key The key to compare
          * @param value the value to compare
          */
-        static lessThanOrEqual(key: string, value: any): KiiClause;
+        static lessThanOrEqual(
+          key: string,
+          value: any
+        ): KiiClause;
 
         /**
          * Create an expression of the form (key in values)
@@ -2236,7 +2444,10 @@ declare namespace KiiCloud {
          * @param key The key to compare
          * @param values to compare
          */
-        static inClause(key: string, values: any[]): KiiClause;
+        static inClause(
+          key: string,
+          values: any[]
+        ): KiiClause;
 
         /**
          * Create an expression of the form (key STARTS WITH value)
@@ -2244,7 +2455,10 @@ declare namespace KiiCloud {
          * @param key The key to compare
          * @param value the value to compare
          */
-        static startsWith(key: string, value: any): KiiClause;
+        static startsWith(
+          key: string,
+          value: any
+        ): KiiClause;
 
         /**
          * Create a clause of geo distance. This clause inquires objects in the specified circle.
@@ -2287,7 +2501,12 @@ declare namespace KiiCloud {
          *             };
          *             bucket.executeQuery(query, queryCallback);
          */
-        static geoDistance(key: string, center: KiiGeoPoint, radius: number, putDistanceInto: string): KiiClause;
+        static geoDistance(
+          key: string,
+          center: KiiGeoPoint,
+          radius: number,
+          putDistanceInto: string
+        ): KiiClause;
 
         /**
          * Create a clause of geo box. This clause inquires objects in the specified rectangle.
@@ -2302,7 +2521,54 @@ declare namespace KiiCloud {
          * @throws <li> Specified key is not a string or is an empty string.</li>
          *             <li>northEast or southWest is not a reference of KiiGeoPoint.</li>
          */
-        static geoBox(key: string, northEast: KiiGeoPoint, southWest: KiiGeoPoint): KiiClause;
+        static geoBox(
+          key: string,
+          northEast: KiiGeoPoint,
+          southWest: KiiGeoPoint
+        ): KiiClause;
+
+        /**
+         * Create an expression to returns all entities that have a specified field and type.
+         *
+         * @param key name of the specified field.
+         * @param fieldType The type of the content of the field. The type of the content of the field must be provided, possible values are "STRING", "INTEGER", "DECIMAL" and "BOOLEAN".
+         */
+        static hasField(
+          key: string,
+          fieldType: string
+        ): KiiClause;
+    }
+
+    /**
+     * A Parser for error string or error object returned by SDK.
+     */
+    export class KiiErrorParser {
+        /**
+         * Parse an error string or error object returned by SDK.
+         *
+         * @param error An error string or error object
+         *
+         * @return return parsed error object.
+         *
+         * @example
+         *     var err = KiiErrorParser.parse(errorString);
+         *     var httpStatus = err.status;
+         *     if (httpStatus == 0) {
+         *         // NetworkError
+         *     } else if (httpStatus == -1) {
+         *         // Error is not related the http error. eg. argument error, illegal state error, etc.
+         *     } else if (httpStatus == -2) {
+         *         // Unknown error is detected.
+         *         // Please confirm that you are using the latest version of SDK.
+         *     } else if (httpStatus >= 400 && httpStatus < 600) {
+         *         // Http error
+         *     }
+         *     var errorCode = err.code;
+         *     var errorMessage = err.message;
+         */
+        static parse<T extends string | Error>(
+          error: T
+        ): KiiError;
     }
 
     /**
@@ -2332,7 +2598,10 @@ declare namespace KiiCloud {
          * @example
          *         var point = KiiGeoPoint.geoPoint(35.07, 139.02);
          */
-        static geoPoint(latitude: number, longitude: number): KiiGeoPoint;
+        static geoPoint(
+          latitude: number,
+          longitude: number
+        ): KiiGeoPoint;
     }
 
     /**
@@ -2445,7 +2714,12 @@ declare namespace KiiCloud {
          *             // do something with the error response
          *     });
          */
-        static registerGroupWithID(groupID: string, groupName: string, members: KiiUser[], callbacks?: { success(theSavedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }): Promise<KiiGroup>;
+        static registerGroupWithID(
+          groupID: string,
+          groupName: string,
+          members: KiiUser[],
+          callbacks?: { success(theSavedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }
+        ): Promise<KiiGroup>;
 
         /**
          * Creates a reference to a bucket for this group
@@ -2460,7 +2734,9 @@ declare namespace KiiCloud {
          *     var group = . . .; // a KiiGroup
          *     var bucket = group.bucketWithName("myBucket");
          */
-        bucketWithName(bucketName: string): KiiBucket;
+        bucketWithName(
+          bucketName: string
+        ): KiiBucket;
 
         /**
          * Creates a reference to a encrypted bucket for this group
@@ -2475,7 +2751,9 @@ declare namespace KiiCloud {
          *     var group = . . .; // a KiiGroup
          *     var bucket = group.encryptedBucketWithName("myBucket");
          */
-        encryptedBucketWithName(bucketName: string): KiiBucket;
+        encryptedBucketWithName(
+          bucketName: string
+        ): KiiBucket;
 
         /**
          * Adds a user to the given group
@@ -2490,7 +2768,9 @@ declare namespace KiiCloud {
          *     group.addUser(user);
          *     group.save(callbacks);
          */
-        addUser(member: KiiUser): void;
+        addUser(
+          member: KiiUser
+        ): void;
 
         /**
          * Removes a user from the given group
@@ -2505,7 +2785,9 @@ declare namespace KiiCloud {
          *     group.removeUser(user);
          *     group.save(callbacks);
          */
-        removeUser(member: KiiUser): void;
+        removeUser(
+          member: KiiUser
+        ): void;
 
         /**
          * Gets a list of all current members of a group
@@ -2560,7 +2842,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        getMemberList(callbacks?: { success(theGroup: KiiGroup, memberList: KiiUser[]): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<[KiiGroup, KiiUser[]]>;
+        getMemberList(
+          callbacks?: { success(theGroup: KiiGroup, memberList: KiiUser[]): any; failure(theGroup: KiiGroup, anErrorString: string): any; }
+        ): Promise<[KiiGroup, KiiUser[]]>;
 
         /**
          * Updates the group name on the server
@@ -2603,12 +2887,16 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        changeGroupName(newName: string, callbacks?: { success(theRenamedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<KiiGroup>;
+        changeGroupName(
+          newName: string,
+          callbacks?: { success(theRenamedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string): any; }
+        ): Promise<KiiGroup>;
 
         /**
          * Saves the latest group values to the server
          *
-         * <br><br>If the group does not yet exist, it will be created. If the group already exists, the members that have changed will be updated accordingly. If the group already exists and there is no updates of members, it will allways succeed but does not execute update. To change the name of group, use {@link #changeGroupName}.
+         * <br><br>If the group does not yet exist, it will be created. If the group already exists, the members that have changed will be updated accordingly. If the group already exists and there is
+         * no updates of members, it will allways succeed but does not execute update. To change the name of group, use {@link #changeGroupName}.
          *
          * @param callbacks An object with callback methods defined
          *
@@ -2652,13 +2940,16 @@ declare namespace KiiCloud {
          *             // do something with the error response
          *     });
          */
-        save(callbacks?: { success(theSavedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }): Promise<KiiGroup>;
+        save(
+          callbacks?: { success(theSavedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }
+        ): Promise<KiiGroup>;
 
         /**
          * Saves the latest group values to the server with specified owner.
          * This method can be used only by the group owner or app admin.
          *
-         * <br><br>If the group does not yet exist, it will be created. If the group already exists, the members and owner that have changed will be updated accordingly. If the group already exists and there is no updates of members and owner, it will allways succeed but does not execute update. To change the name of group, use {@link #changeGroupName}.
+         * <br><br>If the group does not yet exist, it will be created. If the group already exists, the members and owner that have changed will be updated accordingly. If the group already exists
+         * and there is no updates of members and owner, it will allways succeed but does not execute update. To change the name of group, use {@link #changeGroupName}.
          *
          * @param user id of owner
          * @param callbacks An object with callback methods defined
@@ -2703,7 +2994,10 @@ declare namespace KiiCloud {
          *             // do something with the error response
          *     });
          */
-        saveWithOwner(user: string, callbacks?: { success(theSavedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }): Promise<KiiGroup>;
+        saveWithOwner(
+          user: string,
+          callbacks?: { success(theSavedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }
+        ): Promise<KiiGroup>;
 
         /**
          * Updates the local group's data with the group data on the server
@@ -2747,7 +3041,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        refresh(callbacks?: { success(theRefreshedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<KiiGroup>;
+        refresh(
+          callbacks?: { success(theRefreshedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string): any; }
+        ): Promise<KiiGroup>;
 
         /**
          * Delete the group from the server
@@ -2795,7 +3091,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        delete(callbacks?: { success(theDeletedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<KiiGroup>;
+        delete(
+          callbacks?: { success(theDeletedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string): any; }
+        ): Promise<KiiGroup>;
 
         /**
          * Gets the owner of the associated group
@@ -2844,7 +3142,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        getOwner(callbacks?: { success(theGroup: KiiGroup, theOwner: KiiUser): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<[KiiGroup, KiiUser]>;
+        getOwner(
+          callbacks?: { success(theGroup: KiiGroup, theOwner: KiiUser): any; failure(theGroup: KiiGroup, anErrorString: string): any; }
+        ): Promise<[KiiGroup, KiiUser]>;
 
         /**
          * Creates a reference to a group with the given name
@@ -2860,7 +3160,9 @@ declare namespace KiiCloud {
          * @example
          *     var group = new KiiGroup.groupWithName("myGroup");
          */
-        static groupWithName(groupName: string): KiiGroup;
+        static groupWithName(
+          groupName: string
+        ): KiiGroup;
 
         /**
          * Creates a reference to a group with the given name and a list of default members
@@ -2877,7 +3179,10 @@ declare namespace KiiCloud {
          * @example
          *     var group = new KiiGroup.groupWithName("myGroup", members);
          */
-        static groupWithNameAndMembers(groupName: string, members: KiiUser[]): KiiGroup;
+        static groupWithNameAndMembers(
+          groupName: string,
+          members: KiiUser[]
+        ): KiiGroup;
 
         /**
          * Instantiate KiiGroup that refers to existing group which has specified ID.
@@ -2895,7 +3200,9 @@ declare namespace KiiCloud {
          * @example
          *     var group = new KiiUser.groupWithID("__GROUP_ID__");
          */
-        static groupWithID(groupId: string): KiiGroup;
+        static groupWithID(
+          groupId: string
+        ): KiiGroup;
 
         /**
          * Generate a new KiiGroup based on a given URI
@@ -2913,7 +3220,9 @@ declare namespace KiiCloud {
          * @example
          *     var group = new KiiGroup.groupWithURI("kiicloud://myuri");
          */
-        static groupWithURI(uri: string): KiiGroup;
+        static groupWithURI(
+          uri: string
+        ): KiiGroup;
 
         /**
          * Instantiate topic belongs to this group.
@@ -2922,13 +3231,16 @@ declare namespace KiiCloud {
          *
          * @return topic instance.
          */
-        topicWithName(topicName: string): KiiTopic;
+        topicWithName(
+          topicName: string
+        ): KiiTopic;
 
         /**
          * Gets a list of topics in this group scope
          *
          * @param callbacks An object with callback methods defined
-         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no paginationKey specified.
+         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no
+         * paginationKey specified.
          *
          * @return return promise object.
          *     <ul>
@@ -2989,7 +3301,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
+        listTopics(
+          callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; },
+          paginationKey?: string
+        ): Promise<[KiiTopic[], string]>;
     }
 
     /**
@@ -3048,7 +3363,8 @@ declare namespace KiiCloud {
          * The reason is:
          *  <li>Will dramatically improve the performance of bucket query.</li>
          *  <li>Bucket query does not support the mixed result of integer and floating point.
-         *  ex.) If you use same key for integer and floating point and inquire object with the integer value, objects which has floating point value with the key would not be evaluated in the query. (and vice versa)</li>
+         *  ex.) If you use same key for integer and floating point and inquire object with the integer value, objects which has floating point value with the key would not be evaluated in the
+         *  query. (and vice versa)</li>
          *
          * @param key The key to set.
          *   if null, empty string or string prefixed with '_' is specified, silently ignored and have no effect.
@@ -3060,7 +3376,10 @@ declare namespace KiiCloud {
          *     var obj = . . .; // a KiiObject
          *     obj.set("score", 4298);
          */
-        set(key: string, value: any): void;
+        set(
+          key: string,
+          value: any
+        ): void;
 
         /**
          * Gets the value associated with the given key
@@ -3073,7 +3392,38 @@ declare namespace KiiCloud {
          *     var obj = . . .; // a KiiObject
          *     var score = obj.get("score");
          */
-        get<T>(key: string): T;
+        get<T>(
+          key: string
+        ): T;
+
+        /**
+         * Gets the array object that contains all keys of custom field.
+         * The array of keys from local cache will be returned.
+         * To get the latest array of keys from cloud, calling refresh() is necessary prior calling this method.
+         * The returned array object does not include reserved keys such as _created, _modified, etc.
+         *
+         * @return keys An array of all keys of custom field.
+         *
+         * @example
+         *     var obj = . . .; // a KiiObject
+         *     for(var key of obj.keys()) {
+         *     }
+         */
+        getKeys(): string[];
+
+        /**
+         * Removes a pair of key/value from this object.
+         * This pair is also removed from server when saveAllFields() is succeeded.
+         *
+         * @param key The key to be removed
+         *
+         * @example
+         *     var obj = . . .; // a KiiObject
+         *     obj.remove("score");
+         */
+        remove(
+          key: string
+        ): void;
 
         /**
          * Set Geo point to this object with the specified key.
@@ -3083,7 +3433,10 @@ declare namespace KiiCloud {
          *
          * @throws Specified kiiGeoPint is not an instance of KiiGeoPoint.
          */
-        setGeoPoint(key: string, KiiGeoPoint: KiiGeoPoint): void;
+        setGeoPoint(
+          key: string,
+          KiiGeoPoint: KiiGeoPoint
+        ): void;
 
         /**
          * Gets the geo point associated with the given key.
@@ -3092,7 +3445,9 @@ declare namespace KiiCloud {
          *
          * @return KiiGeoPoint tied to the key. null if null exists.
          */
-        getGeoPoint(key: string): KiiGeoPoint;
+        getGeoPoint(
+          key: string
+        ): KiiGeoPoint;
 
         /**
          * Get the ACL handle for this file
@@ -3175,7 +3530,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        saveAllFields(callbacks?: { success(theSavedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; }, overwrite?: boolean): Promise<KiiObject>;
+        saveAllFields(
+          callbacks?: { success(theSavedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; },
+          overwrite?: boolean
+        ): Promise<KiiObject>;
 
         /**
          * Create or update the KiiObject on KiiCloud.
@@ -3233,7 +3591,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        save(callbacks?: { success(theSavedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; }, overwrite?: boolean): Promise<KiiObject>;
+        save(
+          callbacks?: { success(theSavedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; },
+          overwrite?: boolean
+        ): Promise<KiiObject>;
 
         /**
          * Updates the local object's data with the user data on the server
@@ -3277,7 +3638,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        refresh(callbacks?: { success(theRefreshedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; }): Promise<KiiObject>;
+        refresh(
+          callbacks?: { success(theRefreshedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; }
+        ): Promise<KiiObject>;
 
         /**
          * Delete the object from the server
@@ -3319,7 +3682,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        delete(callbacks?: { success(theDeletedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; }): Promise<KiiObject>;
+        delete(
+          callbacks?: { success(theDeletedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; }
+        ): Promise<KiiObject>;
 
         /**
          * Generate a new KiiObject based on a given URI
@@ -3333,7 +3698,9 @@ declare namespace KiiCloud {
          * @example
          *     var group = new KiiObject.objectWithURI("kiicloud://myuri");
          */
-        static objectWithURI(uri: string): KiiObject;
+        static objectWithURI(
+          uri: string
+        ): KiiObject;
 
         /**
          * Move KiiObject body from an object to another object.
@@ -3392,7 +3759,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        moveBody(targetObjectUri: string, callbacks?: { success(theSrcObject: KiiObject, theTgtObjectUri: string): any; failure(theSrcObject: KiiObject, theTgtObjectUri: string, anErrorString: string): any; }): Promise<[KiiObject, string]>;
+        moveBody(
+          targetObjectUri: string,
+          callbacks?: { success(theSrcObject: KiiObject, theTgtObjectUri: string): any; failure(theSrcObject: KiiObject, theTgtObjectUri: string, anErrorString: string): any; }
+        ): Promise<[KiiObject, string]>;
 
         /**
          * Upload body data of this object.<br>
@@ -3472,7 +3842,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        uploadBody(srcDataBlob: Blob, callbacks?: { success(obj: KiiObject): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<KiiObject>;
+        uploadBody(
+          srcDataBlob: Blob,
+          callbacks?: { success(obj: KiiObject): any; failure(obj: KiiObject, anErrorString: string): any; }
+        ): Promise<KiiObject>;
 
         /**
          * Download body data of this object.<br>
@@ -3547,7 +3920,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        downloadBody(callbacks?: { success(obj: KiiObject, bodyBlob: Blob): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<[KiiObject, Blob]>;
+        downloadBody(
+          callbacks?: { success(obj: KiiObject, bodyBlob: Blob): any; failure(obj: KiiObject, anErrorString: string): any; }
+        ): Promise<[KiiObject, Blob]>;
 
         /**
          * Publish object body.<br>
@@ -3600,7 +3975,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        publishBody(callbacks?: { success(obj: KiiObject, publishedUrl: string): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<[KiiObject, string]>;
+        publishBody(
+          callbacks?: { success(obj: KiiObject, publishedUrl: string): any; failure(obj: KiiObject, anErrorString: string): any; }
+        ): Promise<[KiiObject, string]>;
 
         /**
          * Publish object body with expiration date.<br>
@@ -3656,7 +4033,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        publishBodyExpiresAt(expiresAt: Date, callbacks?: { success(obj: KiiObject, publishedUrl: string): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<[KiiObject, string]>;
+        publishBodyExpiresAt(
+          expiresAt: Date,
+          callbacks?: { success(obj: KiiObject, publishedUrl: string): any; failure(obj: KiiObject, anErrorString: string): any; }
+        ): Promise<[KiiObject, string]>;
 
         /**
          * Publish object body with expiration duration.<br>
@@ -3712,7 +4092,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        publishBodyExpiresIn(expiresIn: number, callbacks?: { success(obj: KiiObject, publishedUrl: string): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<[KiiObject, string]>;
+        publishBodyExpiresIn(
+          expiresIn: number,
+          callbacks?: { success(obj: KiiObject, publishedUrl: string): any; failure(obj: KiiObject, anErrorString: string): any; }
+        ): Promise<[KiiObject, string]>;
 
         /**
          * Delete the object body from the server.<br>
@@ -3757,7 +4140,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        deleteBody(callbacks?: { success(theDeletedObject: KiiObject): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<KiiObject>;
+        deleteBody(
+          callbacks?: { success(theDeletedObject: KiiObject): any; failure(obj: KiiObject, anErrorString: string): any; }
+        ): Promise<KiiObject>;
 
         /**
          * Check if given ID is valid for object ID.
@@ -3767,7 +4152,9 @@ declare namespace KiiCloud {
          *
          * @return true if given ID is valid, false otherwise.
          */
-        static isValidObjectID(objectID: string): boolean;
+        static isValidObjectID(
+          objectID: string
+        ): boolean;
     }
 
     /**
@@ -3798,7 +4185,11 @@ declare namespace KiiCloud {
          * @example
          *
          */
-        installGcm(installationRegistrationID: string, development: boolean, callbacks?: { success(response: KiiGcmInstallationResponse): any; failure(error: Error): any; }): Promise<KiiGcmInstallationResponse>;
+        installGcm(
+          installationRegistrationID: string,
+          development: boolean,
+          callbacks?: { success(response: KiiGcmInstallationResponse): any; failure(error: Error): any; }
+        ): Promise<KiiGcmInstallationResponse>;
 
         /**
          * Register a MQTT installation to the Kii cloud for current logged in user.
@@ -3824,7 +4215,10 @@ declare namespace KiiCloud {
          * @example
          *
          */
-        installMqtt(development: boolean, callbacks?: { success(response: KiiMqttInstallationResponse): any; failure(error: Error): any; }): Promise<KiiMqttInstallationResponse>;
+        installMqtt(
+          development: boolean,
+          callbacks?: { success(response: KiiMqttInstallationResponse): any; failure(error: Error): any; }
+        ): Promise<KiiMqttInstallationResponse>;
 
         /**
          * Get MQTT endpoint.
@@ -3862,7 +4256,10 @@ declare namespace KiiCloud {
          * @example
          *
          */
-        getMqttEndpoint(installationID: string, callbacks?: { success(response: KiiMqttEndpoint): any; failure(error: Error): any; }): Promise<KiiMqttEndpoint>;
+        getMqttEndpoint(
+          installationID: string,
+          callbacks?: { success(response: KiiMqttEndpoint): any; failure(error: Error): any; }
+        ): Promise<KiiMqttEndpoint>;
 
         /**
          * Unregister the push settings by the id(issued by push provider) that is used for installation.
@@ -3884,7 +4281,11 @@ declare namespace KiiCloud {
          * @example
          *
          */
-        uninstall(installationRegistrationID: string, deviceType: string, callbacks?: { success(): any; failure(error: Error): any; }): Promise<void>;
+        uninstall(
+          installationRegistrationID: string,
+          deviceType: string,
+          callbacks?: { success(): any; failure(error: Error): any; }
+        ): Promise<void>;
 
         /**
          * Unregister the push settings by the id(issued by KiiCloud) that is used for installation.
@@ -3905,7 +4306,10 @@ declare namespace KiiCloud {
          * @example
          *
          */
-        uninstallByInstallationID(installationID: string, callbacks?: { success(): any; failure(error: Error): any; }): Promise<void>;
+        uninstallByInstallationID(
+          installationID: string,
+          callbacks?: { success(): any; failure(error: Error): any; }
+        ): Promise<void>;
     }
 
     /**
@@ -3922,7 +4326,9 @@ declare namespace KiiCloud {
          *
          * @param data sent to all push channels (gcm, apns, jpush, mqtt).
          */
-        constructor(data: any);
+        constructor(
+          data: any
+        );
 
         /**
          * build push message.
@@ -3939,7 +4345,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        setSendToDevelopment(flag: boolean): KiiPushMessageBuilder;
+        setSendToDevelopment(
+          flag: boolean
+        ): KiiPushMessageBuilder;
 
         /**
          * Indicate whether send this message to production environment.
@@ -3949,7 +4357,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        setSendToProduction(flag: boolean): KiiPushMessageBuilder;
+        setSendToProduction(
+          flag: boolean
+        ): KiiPushMessageBuilder;
 
         /**
          * Enable/ Disable message distribution via GCM.
@@ -3959,7 +4369,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        enableGcm(enable: boolean): KiiPushMessageBuilder;
+        enableGcm(
+          enable: boolean
+        ): KiiPushMessageBuilder;
 
         /**
          * Enable/ Disable message distribution via APNS.
@@ -3969,7 +4381,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        enableApns(enable: boolean): KiiPushMessageBuilder;
+        enableApns(
+          enable: boolean
+        ): KiiPushMessageBuilder;
 
         /**
          * Enable/ Disable message distribution via JPush.
@@ -3979,7 +4393,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        enableJpush(enable: boolean): KiiPushMessageBuilder;
+        enableJpush(
+          enable: boolean
+        ): KiiPushMessageBuilder;
 
         /**
          * Enable/ Disable message distribution via MQTT.
@@ -3989,7 +4405,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        enableMqtt(enable: boolean): KiiPushMessageBuilder;
+        enableMqtt(
+          enable: boolean
+        ): KiiPushMessageBuilder;
 
         /**
          * Set specific data for GCM subscribers.
@@ -4002,7 +4420,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        gcmData(data: { [key: string]: string }): KiiPushMessageBuilder;
+        gcmData(
+          data: { [key: string]: string }
+        ): KiiPushMessageBuilder;
 
         /**
          * Set collapse_key for GCM subscribers.
@@ -4013,7 +4433,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        gcmCollapseKey(collapseKey: string): KiiPushMessageBuilder;
+        gcmCollapseKey(
+          collapseKey: string
+        ): KiiPushMessageBuilder;
 
         /**
          * Set delay_while_idle for GCM subscribers.
@@ -4024,7 +4446,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        gcmDelayWhileIdle(delayWhileIdle: boolean): KiiPushMessageBuilder;
+        gcmDelayWhileIdle(
+          delayWhileIdle: boolean
+        ): KiiPushMessageBuilder;
 
         /**
          * Set time_to_live for GCM subscribers.
@@ -4035,7 +4459,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        gcmTimeToLive(timeToLive: number): KiiPushMessageBuilder;
+        gcmTimeToLive(
+          timeToLive: number
+        ): KiiPushMessageBuilder;
 
         /**
          * Set restricted_package_name for GCM subscribers.
@@ -4046,7 +4472,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        gcmRestrictedPackageName(restrictedPackageName: string): KiiPushMessageBuilder;
+        gcmRestrictedPackageName(
+          restrictedPackageName: string
+        ): KiiPushMessageBuilder;
 
         /**
          * Set specific data for APNS subscribers.
@@ -4059,7 +4487,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        apnsData(data: { [key: string]: string | number | boolean }): KiiPushMessageBuilder;
+        apnsData(
+          data: { [key: string]: string | number | boolean }
+        ): KiiPushMessageBuilder;
 
         /**
          * Set alert for APNS subscribers.
@@ -4070,7 +4500,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        apnsAlert(alert: string | APNSAlert): KiiPushMessageBuilder;
+        apnsAlert(
+          alert: string | APNSAlert
+        ): KiiPushMessageBuilder;
 
         /**
          * Set sound for APNS subscribers.
@@ -4081,7 +4513,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        apnsSound(sound: string): KiiPushMessageBuilder;
+        apnsSound(
+          sound: string
+        ): KiiPushMessageBuilder;
 
         /**
          * Set badge for APNS subscribers.
@@ -4092,7 +4526,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        apnsBadge(badge: number): KiiPushMessageBuilder;
+        apnsBadge(
+          badge: number
+        ): KiiPushMessageBuilder;
 
         /**
          * Set content-available for APNS subscribers.
@@ -4104,7 +4540,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        apnsContentAvailable(contentAvailable: number): KiiPushMessageBuilder;
+        apnsContentAvailable(
+          contentAvailable: number
+        ): KiiPushMessageBuilder;
 
         /**
          * Set category for APNS subscribers.
@@ -4115,7 +4553,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        apnsCategory(category: string): KiiPushMessageBuilder;
+        apnsCategory(
+          category: string
+        ): KiiPushMessageBuilder;
 
         /**
          * Set specific data for JPush subscribers.
@@ -4128,7 +4568,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        jpushData(data: { [name: string]: string | number | boolean }): KiiPushMessageBuilder;
+        jpushData(
+          data: { [name: string]: string | number | boolean }
+        ): KiiPushMessageBuilder;
 
         /**
          * Set specific data for MQTT subscribers.
@@ -4141,7 +4583,9 @@ declare namespace KiiCloud {
          *
          * @return builder instance.
          */
-        mqttData(data: { [key: string]: string }): KiiPushMessageBuilder;
+        mqttData(
+          data: { [key: string]: string }
+        ): KiiPushMessageBuilder;
     }
 
     /**
@@ -4197,7 +4641,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        subscribe<T extends KiiBucket | KiiTopic>(target: T, callbacks?: { success(subscription: KiiPushSubscription, topic: T): any; failure(error: Error): any; }): Promise<[KiiPushSubscription, T]>;
+        subscribe<T extends KiiBucket | KiiTopic>(
+          target: T,
+          callbacks?: { success(subscription: KiiPushSubscription, topic: T): any; failure(error: Error): any; }
+        ): Promise<[KiiPushSubscription, T]>;
 
         /**
          * Unsubscribe to bucket or topic.
@@ -4248,7 +4695,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        unsubscribe<T extends KiiBucket | KiiTopic>(target: T, callbacks?: { success(subscription: KiiPushSubscription, topic: T): any; failure(error: Error): any; }): Promise<[KiiPushSubscription, T]>;
+        unsubscribe<T extends KiiBucket | KiiTopic>(
+          target: T,
+          callbacks?: { success(subscription: KiiPushSubscription, topic: T): any; failure(error: Error): any; }
+        ): Promise<[KiiPushSubscription, T]>;
 
         /**
          * Check subscription of bucket, topic.
@@ -4311,7 +4761,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        isSubscribed<T extends KiiBucket | KiiTopic>(target: T, callbacks?: { success(subscription: KiiPushSubscription, topic: T, isSubscribed: boolean): any; failure(error: Error): any; }): Promise<[KiiPushSubscription, T, boolean]>;
+        isSubscribed<T extends KiiBucket | KiiTopic>(
+          target: T,
+          callbacks?: { success(subscription: KiiPushSubscription, topic: T, isSubscribed: boolean): any; failure(error: Error): any; }
+        ): Promise<[KiiPushSubscription, T, boolean]>;
     }
 
     /**
@@ -4332,7 +4785,9 @@ declare namespace KiiCloud {
          *
          * @throws InvalidLimitException
          */
-        setLimit(value: number): void;
+        setLimit(
+          value: number
+        ): void;
 
         /**
          * Create a KiiQuery object based on a KiiClause
@@ -4341,7 +4796,9 @@ declare namespace KiiCloud {
          *
          * @param clause The KiiClause to be executed with the query
          */
-        static queryWithClause(clause: KiiClause): KiiQuery;
+        static queryWithClause(
+          clause: KiiClause
+        ): KiiQuery;
 
         /**
          * Set the query to sort by a field in descending order
@@ -4350,7 +4807,9 @@ declare namespace KiiCloud {
          *
          * @param field The key that should be used to sort
          */
-        sortByDesc(field: string): void;
+        sortByDesc(
+          field: string
+        ): void;
 
         /**
          * Set the query to sort by a field in ascending order
@@ -4359,7 +4818,9 @@ declare namespace KiiCloud {
          *
          * @param field The key that should be used to sort
          */
-        sortByAsc(field: string): void;
+        sortByAsc(
+          field: string
+        ): void;
     }
 
     /**
@@ -4432,7 +4893,12 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        execute<T>(argument: T, callbacks?: { success(entry: KiiServerCodeEntry, argument: T, execResult: KiiServerCodeExecResult): any; failure(entry: KiiServerCodeEntry, argument: T, execResult: KiiServerCodeExecResult, anErrorString: string): any; }): Promise<[KiiServerCodeEntry, T, KiiServerCodeExecResult]>;
+        execute<T>(
+          argument: T,
+          callbacks?: {
+              success(entry: KiiServerCodeEntry, argument: T, execResult: KiiServerCodeExecResult): any;
+              failure(entry: KiiServerCodeEntry, argument: T, execResult: KiiServerCodeExecResult, anErrorString: string): any; }
+        ): Promise<[KiiServerCodeEntry, T, KiiServerCodeExecResult]>;
 
         /**
          * Get the entryName of this server code entry.
@@ -4592,7 +5058,12 @@ declare namespace KiiCloud {
          *
          * @throws For details refer to the table above
          */
-        static setupNetwork(networkName: KiiSocialNetworkName, apiKey: string, apiSecret: string, extras: any): void;
+        static setupNetwork(
+          networkName: KiiSocialNetworkName,
+          apiKey: string,
+          apiSecret: string,
+          extras: any
+        ): void;
 
         /**
          * Log a user into the social network provided
@@ -4761,12 +5232,17 @@ declare namespace KiiCloud {
          *          }
          *      );
          */
-        static logIn(networkName: KiiSocialNetworkName, options: KiiSocialConnectOptions, callbacks?: { success(user: KiiUser, network: KiiSocialNetworkName): any; failure(user: KiiUser, network: KiiSocialNetworkName, anErrorString: string): any; }): Promise<[KiiUser, KiiSocialNetworkName]>;
+        static logIn(
+          networkName: KiiSocialNetworkName,
+          options: KiiSocialConnectOptions,
+          callbacks?: { success(user: KiiUser, network: KiiSocialNetworkName): any; failure(user: KiiUser, network: KiiSocialNetworkName, anErrorString: string): any; }
+        ): Promise<[KiiUser, KiiSocialNetworkName]>;
 
         /**
          * Link the currently logged in user with a social network
          *
-         *  This will initiate the login process for the given network, which for SSO-enabled services like Facebook, will send the user to the Facebook site for authentication. There must be a currently authenticated KiiUser. Otherwise, you can use the logIn: method to create and log in a KiiUser using a network. The network must already be set up via setupNetwork<br>
+         *  This will initiate the login process for the given network, which for SSO-enabled services like Facebook, will send the user to the Facebook site for authentication. There must be a
+         *  currently authenticated KiiUser. Otherwise, you can use the logIn: method to create and log in a KiiUser using a network. The network must already be set up via setupNetwork<br>
          *  If there is not logged-in user to link with, callbacks.failure or reject callback of promise will be called. <br>
          *  If the opitons is invalid, callbacks.failure or reject callback of promise will be called. <br>
          *
@@ -4927,7 +5403,11 @@ declare namespace KiiCloud {
          *          }
          *      );
          */
-        static linkCurrentUserWithNetwork(networkName: KiiSocialNetworkName, options: KiiSocialConnectOptions, callbacks?: { success(user: KiiUser, network: KiiSocialNetworkName): any; failure(user: KiiUser, network: KiiSocialNetworkName, anErrorString: string): any; }): Promise<[KiiUser, KiiSocialNetworkName]>;
+        static linkCurrentUserWithNetwork(
+          networkName: KiiSocialNetworkName,
+          options: KiiSocialConnectOptions,
+          callbacks?: { success(user: KiiUser, network: KiiSocialNetworkName): any; failure(user: KiiUser, network: KiiSocialNetworkName, anErrorString: string): any; }
+        ): Promise<[KiiUser, KiiSocialNetworkName]>;
 
         /**
          * Unlink the currently logged in user with a social network
@@ -4978,7 +5458,10 @@ declare namespace KiiCloud {
          *          }
          *      );
          */
-        static unLinkCurrentUserFromNetwork(networkName: KiiSocialNetworkName, callbacks?: { success(user: KiiUser, network: KiiSocialNetworkName): any; failure(user: KiiUser, network: KiiSocialNetworkName, anErrorString: string): any; }): Promise<[KiiUser, KiiSocialNetworkName]>;
+        static unLinkCurrentUserFromNetwork(
+          networkName: KiiSocialNetworkName,
+          callbacks?: { success(user: KiiUser, network: KiiSocialNetworkName): any; failure(user: KiiUser, network: KiiSocialNetworkName, anErrorString: string): any; }
+        ): Promise<[KiiUser, KiiSocialNetworkName]>;
 
         /**
          * Retrieve the current user's access token from a social network
@@ -4990,7 +5473,9 @@ declare namespace KiiCloud {
          *
          * @return The current access token, null if unavailable
          */
-        static getAccessTokenForNetwork(networkName: KiiSocialNetworkName): string;
+        static getAccessTokenForNetwork(
+          networkName: KiiSocialNetworkName
+        ): string;
 
         /**
          * Retrieve the current user's access token expiration date from a social network
@@ -5003,7 +5488,9 @@ declare namespace KiiCloud {
          *
          * @return The current access token expiration date, null if unavailable
          */
-        static getAccessTokenExpirationForNetwork(networkName: KiiSocialNetworkName): string;
+        static getAccessTokenExpirationForNetwork(
+          networkName: KiiSocialNetworkName
+        ): string;
 
         /**
          * Retrieve the current user's access token object from a social network
@@ -5038,7 +5525,9 @@ declare namespace KiiCloud {
          *
          * @return tokenObject The current access token object, null if unavailable.
          */
-        static getAccessTokenObjectForNetwork(networkName: KiiSocialNetworkName): any;
+        static getAccessTokenObjectForNetwork(
+          networkName: KiiSocialNetworkName
+        ): any;
     }
 
     /**
@@ -5176,7 +5665,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static register(fields: KiiThingFields, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+        static register(
+          fields: KiiThingFields,
+          callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }
+        ): Promise<KiiThing>;
 
         /**
          * Retrieve the latest thing information from KiiCloud.
@@ -5222,7 +5714,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        refresh(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+        refresh(
+          callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }
+        ): Promise<KiiThing>;
 
         /**
          * Update registered thing information in Kii Cloud
@@ -5280,7 +5774,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        update(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+        update(
+          callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }
+        ): Promise<KiiThing>;
 
         /**
          * Delete registered thing in Kii Cloud.
@@ -5330,7 +5826,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        deleteThing(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+        deleteThing(
+          callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }
+        ): Promise<KiiThing>;
 
         /**
          * Check if user/ group is owner of the thing.
@@ -5396,7 +5894,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        isOwner<T extends KiiUser | KiiGroup>(owner: T, callbacks?: { success(thing: KiiThing, user: T, isOwner: boolean): any; failure(error: Error): any; }): Promise<[KiiThing, T, boolean]>;
+        isOwner<T extends KiiUser | KiiGroup>(
+          owner: T,
+          callbacks?: { success(thing: KiiThing, user: T, isOwner: boolean): any; failure(error: Error): any; }
+        ): Promise<[KiiThing, T, boolean]>;
 
         /**
          * Register user/group as owner of this thing.
@@ -5450,7 +5951,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        registerOwner<T extends KiiUser | KiiGroup>(owner: T, callbacks?: { success(thing: KiiThing, group: T): any; failure(error: Error): any; }): Promise<[KiiThing, T]>;
+        registerOwner<T extends KiiUser | KiiGroup>(
+          owner: T,
+          callbacks?: { success(thing: KiiThing, group: T): any; failure(error: Error): any; }
+        ): Promise<[KiiThing, T]>;
 
         /**
          * Register user/group as owner of specified thing.
@@ -5502,7 +6006,11 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static registerOwnerWithThingID<T extends KiiUser | KiiGroup>(thingID: string, owner: T, callbacks?: { success(group: T): any; failure(error: Error): any; }): Promise<T>;
+        static registerOwnerWithThingID<T extends KiiUser | KiiGroup>(
+          thingID: string,
+          owner: T,
+          callbacks?: { success(group: T): any; failure(error: Error): any; }
+        ): Promise<T>;
 
         /**
          * Register user/group as owner of specified thing.
@@ -5553,7 +6061,11 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static registerOwnerWithVendorThingID<T extends KiiUser | KiiGroup>(vendorThingID: string, owner: T, callbacks?: { success(group: T): any; failure(error: Error): any; }): Promise<T>;
+        static registerOwnerWithVendorThingID<T extends KiiUser | KiiGroup>(
+          vendorThingID: string,
+          owner: T,
+          callbacks?: { success(group: T): any; failure(error: Error): any; }
+        ): Promise<T>;
 
         /**
          * Remove ownership of thing from specified user/group.
@@ -5606,7 +6118,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        unregisterOwner<T extends KiiUser | KiiGroup>(owner: T, callbacks?: { success(thing: KiiThing, group: T): any; failure(error: Error): any; }): Promise<[KiiThing, T]>;
+        unregisterOwner<T extends KiiUser | KiiGroup>(
+          owner: T,
+          callbacks?: { success(thing: KiiThing, group: T): any; failure(error: Error): any; }
+        ): Promise<[KiiThing, T]>;
 
         /**
          * Disable the thing.
@@ -5657,7 +6172,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        disable(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+        disable(
+          callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }
+        ): Promise<KiiThing>;
 
         /**
          * Enable the thing.
@@ -5708,7 +6225,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        enable(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+        enable(
+          callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }
+        ): Promise<KiiThing>;
 
         /**
          * Load thing with given vendor thing id.
@@ -5752,7 +6271,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static loadWithVendorThingID(vendorThingID: string, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+        static loadWithVendorThingID(
+          vendorThingID: string,
+          callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }
+        ): Promise<KiiThing>;
 
         /**
          * Load thing with thing id given by Kii Cloud.
@@ -5798,7 +6320,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static loadWithThingID(thingID: string, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+        static loadWithThingID(
+          thingID: string,
+          callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }
+        ): Promise<KiiThing>;
 
         /**
          * Instantiate bucket belongs to this thing.
@@ -5807,7 +6332,9 @@ declare namespace KiiCloud {
          *
          * @return bucket instance.
          */
-        bucketWithName(bucketName: string): KiiBucket;
+        bucketWithName(
+          bucketName: string
+        ): KiiBucket;
 
         /**
          * Creates a reference to a encrypted bucket for this thing
@@ -5822,7 +6349,9 @@ declare namespace KiiCloud {
          *     var thing = . . .; // a KiiThing
          *     var bucket = thing.encryptedBucketWithName("myBucket");
          */
-        encryptedBucketWithName(bucketName: string): KiiBucket;
+        encryptedBucketWithName(
+          bucketName: string
+        ): KiiBucket;
 
         /**
          * Instantiate topic belongs to this thing.
@@ -5831,13 +6360,16 @@ declare namespace KiiCloud {
          *
          * @return topic instance.
          */
-        topicWithName(topicName: string): KiiTopic;
+        topicWithName(
+          topicName: string
+        ): KiiTopic;
 
         /**
          * Gets a list of topics in this thing scope
          *
          * @param callbacks An object with callback methods defined
-         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no paginationKey specified.
+         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no
+         * paginationKey specified.
          *
          * @return return promise object.
          *     <ul>
@@ -5898,7 +6430,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
+        listTopics(
+          callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; },
+          paginationKey?: string
+        ): Promise<[KiiTopic[], string]>;
 
         /**
          * Instantiate push subscription for this thing.
@@ -5929,7 +6464,9 @@ declare namespace KiiCloud {
          *             }
          *         });
          */
-        bucketWithName(bucketName: string): KiiBucket;
+        bucketWithName(
+          bucketName: string
+        ): KiiBucket;
 
         /**
          * Creates a reference to a encrypted bucket in App scope operated by thing.
@@ -5949,7 +6486,9 @@ declare namespace KiiCloud {
          *             }
          *         });
          */
-        encryptedBucketWithName(bucketName: string): KiiBucket;
+        encryptedBucketWithName(
+          bucketName: string
+        ): KiiBucket;
 
         /**
          * Creates a reference to an object operated by thing using object`s URI.
@@ -5960,7 +6499,9 @@ declare namespace KiiCloud {
          *
          * @throws If the URI is null, empty or does not have correct format.
          */
-        objectWithURI(object: string): KiiObject;
+        objectWithURI(
+          object: string
+        ): KiiObject;
 
         /**
          * Creates a reference to a topic in App scope operated by thing.
@@ -5970,13 +6511,16 @@ declare namespace KiiCloud {
          *
          * @return topic instance.
          */
-        topicWithName(topicName: string): KiiTopic;
+        topicWithName(
+          topicName: string
+        ): KiiTopic;
 
         /**
          * Gets a list of topics in app scope
          *
          * @param callbacks An object with callback methods defined
-         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no paginationKey specified.
+         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no
+         * paginationKey specified.
          *
          * @return return promise object.
          *     <ul>
@@ -6037,7 +6581,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
+        listTopics(
+          callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; },
+          paginationKey?: string
+        ): Promise<[KiiTopic[], string]>;
 
         /**
          * Gets authenticated KiiThing instance.
@@ -6105,7 +6652,9 @@ declare namespace KiiCloud {
          *             // Handle error.
          *         });
          */
-        exists(callbacks?: { success(existed: boolean): any; failure(error: Error): any; }): Promise<boolean>;
+        exists(
+          callbacks?: { success(existed: boolean): any; failure(error: Error): any; }
+        ): Promise<boolean>;
 
         /**
          * Save this topic on Kii Cloud.
@@ -6147,7 +6696,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        save(callbacks?: { success(topic: KiiTopic): any; failure(error: Error): any; }): Promise<KiiTopic>;
+        save(
+          callbacks?: { success(topic: KiiTopic): any; failure(error: Error): any; }
+        ): Promise<KiiTopic>;
 
         /**
          * Send message to the topic.
@@ -6202,7 +6753,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        sendMessage<T>(message: T, callbacks?: { success(topic: KiiTopic, message: T): any; failure(error: Error): any; }): Promise<[KiiTopic, T]>;
+        sendMessage<T>(
+          message: T,
+          callbacks?: { success(topic: KiiTopic, message: T): any; failure(error: Error): any; }
+        ): Promise<[KiiTopic, T]>;
 
         /**
          * Delete the topic.
@@ -6243,7 +6797,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        deleteTopic(callbacks?: { success(topic: KiiTopic): any; failure(error: Error): any; }): Promise<KiiTopic>;
+        deleteTopic(
+          callbacks?: { success(topic: KiiTopic): any; failure(error: Error): any; }
+        ): Promise<KiiTopic>;
 
         /**
          * Get ACL object of this topic.
@@ -6305,7 +6861,9 @@ declare namespace KiiCloud {
          *
          * @throws If the displayName is not a valid format
          */
-        setDisplayName(value: string): void;
+        setDisplayName(
+          value: string
+        ): void;
 
         /**
          * Get whether or not the user is pseudo user.
@@ -6368,7 +6926,9 @@ declare namespace KiiCloud {
          *
          * @throws If the country code is not a valid format
          */
-        setCountry(value: string): void;
+        setCountry(
+          value: string
+        ): void;
 
         /**
          * Get the locale associated with this user
@@ -6387,7 +6947,9 @@ declare namespace KiiCloud {
          *
          * @param value The locale to set.
          */
-        setLocale(value: string): void;
+        setLocale(
+          value: string
+        ): void;
 
         /**
          * Get the server's creation date of this user
@@ -6488,7 +7050,10 @@ declare namespace KiiCloud {
          *     var user = . . .; // a KiiUser
          *     user.set("score", 4298);
          */
-        set(key: string, value: any): void;
+        set(
+          key: string,
+          value: any
+        ): void;
 
         /**
          * Gets the value associated with the given key
@@ -6501,7 +7066,9 @@ declare namespace KiiCloud {
          *     var user = . . .; // a KiiUser
          *     var score = user.get("score");
          */
-        get<T>(key: string): T;
+        get<T>(
+          key: string
+        ): T;
 
         /**
          * The currently authenticated user
@@ -6516,7 +7083,8 @@ declare namespace KiiCloud {
         /**
          * Create a user object to prepare for registration with credentials pre-filled
          *
-         * <br><br>Creates an pre-filled user object for manipulation. This user will not be authenticated until one of the authentication methods are called on it. It can be treated as any other KiiObject before it is authenticated.
+         * <br><br>Creates an pre-filled user object for manipulation. This user will not be authenticated until one of the authentication methods are called on it. It can be treated as any other
+         * KiiObject before it is authenticated.
          *
          * @param username The user's desired username. Must be between 3 and 64 characters, which can include alphanumeric characters as well as underscores '_', dashes '-' and periods '.'
          * @param password The user's password. Must be between 4-50 characters, made up of ascii characters excludes control characters.
@@ -6529,12 +7097,16 @@ declare namespace KiiCloud {
          * @example
          *     var user = KiiUser.userWithUsername("myusername", "mypassword");
          */
-        static userWithUsername(username: string, password: string): KiiUser;
+        static userWithUsername(
+          username: string,
+          password: string
+        ): KiiUser;
 
         /**
          * Create a user object to prepare for registration with credentials pre-filled
          *
-         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
+         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before
+         * it is registered.
          *
          * @param phoneNumber The user's phone number
          * @param password The user's password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
@@ -6547,12 +7119,16 @@ declare namespace KiiCloud {
          * @example
          *     var user = KiiUser.userWithPhoneNumber("+874012345678", "mypassword");
          */
-        static userWithPhoneNumber(phoneNumber: string, password: string): KiiUser;
+        static userWithPhoneNumber(
+          phoneNumber: string,
+          password: string
+        ): KiiUser;
 
         /**
          * Create a user object to prepare for registration with credentials pre-filled
          *
-         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
+         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before
+         * it is registered.
          *
          * @param phoneNumber The user's phone number
          * @param username The user's desired username. Must be between 3 and 64 characters, which can include alphanumeric characters as well as underscores '_', dashes '-' and periods '.'
@@ -6567,12 +7143,17 @@ declare namespace KiiCloud {
          * @example
          *     var user = KiiUser.userWithPhoneNumberAndUsername("+874012345678", "johndoe", "mypassword");
          */
-        static userWithPhoneNumberAndUsername(phoneNumber: string, username: string, password: string): KiiUser;
+        static userWithPhoneNumberAndUsername(
+          phoneNumber: string,
+          username: string,
+          password: string
+        ): KiiUser;
 
         /**
          * Create a user object to prepare for registration with credentials pre-filled
          *
-         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
+         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before
+         * it is registered.
          *
          * @param emailAddress The user's email address
          * @param password The user's password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
@@ -6585,12 +7166,16 @@ declare namespace KiiCloud {
          * @example
          *     var user = KiiUser.userWithEmailAddress("johndoe@example.com", "mypassword");
          */
-        static userWithEmailAddress(emailAddress: string, password: string): KiiUser;
+        static userWithEmailAddress(
+          emailAddress: string,
+          password: string
+        ): KiiUser;
 
         /**
          * Create a user object to prepare for registration with credentials pre-filled
          *
-         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
+         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before
+         * it is registered.
          *
          * @param emailAddress The user's email address
          * @param username The user's desired username. Must be between 3 and 64 characters, which can include alphanumeric characters as well as underscores '_', dashes '-' and periods '.'
@@ -6605,12 +7190,17 @@ declare namespace KiiCloud {
          * @example
          *     var user = KiiUser.userWithEmailAddressAndUsername("johndoe@example.com", "johndoe", "mypassword");
          */
-        static userWithEmailAddressAndUsername(emailAddress: string, username: string, password: string): KiiUser;
+        static userWithEmailAddressAndUsername(
+          emailAddress: string,
+          username: string,
+          password: string
+        ): KiiUser;
 
         /**
          * Create a user object to prepare for registration with credentials pre-filled
          *
-         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
+         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before
+         * it is registered.
          *
          * @param emailAddress The user's email address
          * @param phoneNumber The user's phone number
@@ -6625,12 +7215,17 @@ declare namespace KiiCloud {
          * @example
          *     var user = KiiUser.userWithEmailAddressAndPhoneNumber("johndoe@example.com", "+874012345678", "mypassword");
          */
-        static userWithEmailAddressAndPhoneNumber(emailAddress: string, phoneNumber: string, password: string): KiiUser;
+        static userWithEmailAddressAndPhoneNumber(
+          emailAddress: string,
+          phoneNumber: string,
+          password: string
+        ): KiiUser;
 
         /**
          * Create a user object to prepare for registration with credentials pre-filled
          *
-         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
+         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before
+         * it is registered.
          *
          * @param emailAddress The user's email address
          * @param phoneNumber The user's phone number
@@ -6647,7 +7242,12 @@ declare namespace KiiCloud {
          * @example
          *     var user = KiiUser.userWithCredentials("johndoe@example.com", "+874012345678", "johndoe", "mypassword");
          */
-        static userWithCredentials(emailAddress: string, phoneNumber: string, username: string, password: string): KiiUser;
+        static userWithCredentials(
+          emailAddress: string,
+          phoneNumber: string,
+          username: string,
+          password: string
+        ): KiiUser;
 
         /**
          * Instantiate KiiUser that refers to existing user which has specified ID.
@@ -6665,7 +7265,9 @@ declare namespace KiiCloud {
          * @example
          *     var user = new KiiUser.userWithID("__USER_ID__");
          */
-        static userWithID(userID: string): KiiUser;
+        static userWithID(
+          userID: string
+        ): KiiUser;
 
         /**
          * Generate a new KiiUser based on a given URI
@@ -6679,7 +7281,9 @@ declare namespace KiiCloud {
          * @example
          *     var user = new KiiUser.userWithURI("kiicloud://myuri");
          */
-        static userWithURI(uri: string): KiiUser;
+        static userWithURI(
+          uri: string
+        ): KiiUser;
 
         /**
          * Creates a reference to a bucket for this user
@@ -6694,7 +7298,9 @@ declare namespace KiiCloud {
          *     var user = . . .; // a KiiUser
          *     var bucket = user.bucketWithName("myBucket");
          */
-        bucketWithName(bucketName: string): KiiBucket;
+        bucketWithName(
+          bucketName: string
+        ): KiiBucket;
 
         /**
          * Creates a reference to a encrypted bucket for this user
@@ -6709,7 +7315,9 @@ declare namespace KiiCloud {
          *     var user = . . .; // a KiiUser
          *     var bucket = user.encryptedBucketWithName("myBucket");
          */
-        encryptedBucketWithName(bucketName: string): KiiBucket;
+        encryptedBucketWithName(
+          bucketName: string
+        ): KiiBucket;
 
         /**
          * Authenticates a user with the server.
@@ -6756,7 +7364,11 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static authenticate(userIdentifier: string, password: string, callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+        static authenticate(
+          userIdentifier: string,
+          password: string,
+          callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }
+        ): Promise<KiiUser>;
 
         /**
          * Asynchronously authenticates a user with the server using specified access token.
@@ -6822,7 +7434,11 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static authenticateWithToken(accessToken: string, callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }, expiresAt?: Date): Promise<KiiUser>;
+        static authenticateWithToken(
+          accessToken: string,
+          callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; },
+          expiresAt?: Date
+        ): Promise<KiiUser>;
 
         /**
          * Registers a user with the server
@@ -6866,7 +7482,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        register(callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+        register(
+          callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }
+        ): Promise<KiiUser>;
 
         /**
          * Registers a user as pseudo user with the server
@@ -6909,7 +7527,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static registerAsPseudoUser(callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }, userFields?: any): Promise<KiiUser>;
+        static registerAsPseudoUser(
+          callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; },
+          userFields?: any
+        ): Promise<KiiUser>;
 
         /**
          * Sets credentials data and custom fields to pseudo user.
@@ -6975,7 +7596,13 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        putIdentity(identityData: identityData, password: string, callbacks?: { success(user: KiiUser): any; failure(user: KiiUser, errorString: string): any; }, userFields?: any, removeFields?: string[]): Promise<KiiUser>;
+        putIdentity(
+          identityData: identityData,
+          password: string,
+          callbacks?: { success(user: KiiUser): any; failure(user: KiiUser, errorString: string): any; },
+          userFields?: any,
+          removeFields?: string[]
+        ): Promise<KiiUser>;
 
         /**
          * Update user attributes.
@@ -7037,7 +7664,12 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        update(identityData: identityData, callbacks?: { success(user: KiiUser): any; failure(user: KiiUser, errorString: string): any; }, userFields?: any, removeFields?: string[]): Promise<KiiUser>;
+        update(
+          identityData: identityData,
+          callbacks?: { success(user: KiiUser): any; failure(user: KiiUser, errorString: string): any; },
+          userFields?: any,
+          removeFields?: string[]
+        ): Promise<KiiUser>;
 
         /**
          * Update a user's password on the server
@@ -7083,12 +7715,17 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        updatePassword(fromPassword: string, toPassword: string, callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+        updatePassword(
+          fromPassword: string,
+          toPassword: string,
+          callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }
+        ): Promise<KiiUser>;
 
         /**
          * Reset a user's password on the server
          *
-         * <br><br>Reset a user's password on the server. The user is determined by the specified userIdentifier - which is an email address that has already been associated with an account. Reset instructions will be sent to that identifier.
+         * <br><br>Reset a user's password on the server. The user is determined by the specified userIdentifier - which is an email address that has already been associated with an account. Reset
+         * instructions will be sent to that identifier.
          * <br><br><b>Please Note:</b> This will reset the user's access token, so if they are currently logged in - their session will no longer be valid.
          *
          * @param userIdentifier The user's email address
@@ -7126,7 +7763,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static resetPassword(userIdentifier: string, callbacks?: { success(): any; failure(anErrorString: string): any; }): Promise<void>;
+        static resetPassword(
+          userIdentifier: string,
+          callbacks?: { success(): any; failure(anErrorString: string): any; }
+        ): Promise<void>;
 
         /**
          * Reset the password of user <br>
@@ -7136,7 +7776,12 @@ declare namespace KiiCloud {
          * @param userIdentifier should be valid email address,
          *   global phone number or user identifier obtained by {@link #getID}.
          * @param notificationMethod specify the destination of message include link
-         *   of resetting password. must be "EMAIL" or "SMS".
+         *   of resetting password. must one of "EMAIL", "SMS" or "SMS_PIN".
+         *   - "EMAIL": Send email include link URL to reset password or password.
+         *   (Contents are depends on 'Password Reset Flow' setting in app's
+         *   Security settings.)
+         *   - "SMS" : Send SMS include link URL to reset password.
+         *   - "SMS_PIN" : Send SMS include PIN Code for reset password.
          *   different type of identifier and destination can be used
          *   as long as user have verified email, phone.
          *   (ex. User registers both email and phone. Identifier is email and
@@ -7174,7 +7819,65 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static resetPasswordWithNotificationMethod(userIdentifier: string, notificationMethod: string, callbacks?: { success(): any; failure(errString: string): any; }): Promise<void>;
+        static resetPasswordWithNotificationMethod(
+          userIdentifier: string,
+          notificationMethod: string,
+          callbacks?: { success(): any; failure(errString: string): any; }
+        ): Promise<void>;
+
+        /**
+         * Reset password with the PIN code in receipt SMS
+         * After {@link KiiUser.resetPasswordWithNotificationMethod} is called with
+         * "SMS_PIN", SMS includes the PIN code will be sent to the user's phone.
+         * User can request the new password for login with the PIN code.
+         * Need to call method for authentication after the new password is determined.
+         *
+         * @param userIdentifier should be valid email address,
+         *   global phone number or user identifier obtained by {@link #getID}.
+         * @param pinCode Received PIN code.
+         * @param newPassword New password for login.
+         *   If the 'Password Reset Flow' in app's security setting is set to
+         *   'Generate password', it would be ignored and null can be passed.
+         *   In this case, new password is generated on Kii Cloud and sent to user's
+         *   phone. Otherwise valid password is required.
+         * @param callbacks object includes callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(). No parameter used.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // Example using callback
+         *     KiiUser.completeResetPassword("john.doe@kii.com", "new-password", "223789",
+         *     {
+         *         success: function() {
+         *             // Succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error here.
+         *         }
+         *     });
+         *
+         *     // Example using Promise
+         *     KiiUser.completeResetPassword(
+         *         "john.doe@kii.com", "new-password", "223789").then(function() {
+         *             // Succeeded.
+         *         }).catch(function(error) {
+         *             // Handle error here.
+         *         });
+         */
+        static completeResetPassword(
+          userIdentifier: string,
+          pinCode: string,
+          newPassword?: string,
+          callbacks?: { success(): any; failure(error: Error): any; }
+        ): Promise<void>;
 
         /**
          * Verify the current user's phone number
@@ -7230,7 +7933,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        verifyPhoneNumber(verificationCode: string, callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+        verifyPhoneNumber(
+          verificationCode: string,
+          callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }
+        ): Promise<KiiUser>;
 
         /**
          * Resend the email verification code to the user
@@ -7274,7 +7980,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        resendEmailVerification(callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+        resendEmailVerification(
+          callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }
+        ): Promise<KiiUser>;
 
         /**
          * Resend the SMS verification code to the user
@@ -7318,7 +8026,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        resendPhoneNumberVerification(callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+        resendPhoneNumberVerification(
+          callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }
+        ): Promise<KiiUser>;
 
         /**
          * Retrieve a list of groups which the user is a member of
@@ -7373,7 +8083,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        memberOfGroups(callbacks?: { success(theUser: KiiUser, groupList: KiiGroup[]): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<[KiiUser, KiiGroup[]]>;
+        memberOfGroups(
+          callbacks?: { success(theUser: KiiUser, groupList: KiiGroup[]): any; failure(theUser: KiiUser, anErrorString: string): any; }
+        ): Promise<[KiiUser, KiiGroup[]]>;
 
         /**
          * Retrieve the groups owned by this user. Group in the groupList
@@ -7430,7 +8142,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        ownerOfGroups(callbacks?: { success(theUser: KiiUser, groupList: KiiGroup[]): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<[KiiUser, KiiGroup[]]>;
+        ownerOfGroups(
+          callbacks?: { success(theUser: KiiUser, groupList: KiiGroup[]): any; failure(theUser: KiiUser, anErrorString: string): any; }
+        ): Promise<[KiiUser, KiiGroup[]]>;
 
         /**
          * Change phone number of logged in user.
@@ -7478,7 +8192,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        changePhone(newPhoneNumber: string, callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+        changePhone(
+          newPhoneNumber: string,
+          callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }
+        ): Promise<KiiUser>;
 
         /**
          * Change email of logged in user.
@@ -7526,7 +8243,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        changeEmail(newEmail: string, callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+        changeEmail(
+          newEmail: string,
+          callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }
+        ): Promise<KiiUser>;
 
         /**
          * Saves the latest user values to the server
@@ -7570,7 +8290,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        save(callbacks?: { success(theSavedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+        save(
+          callbacks?: { success(theSavedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }
+        ): Promise<KiiUser>;
 
         /**
          * Updates the local user's data with the user data on the server
@@ -7614,7 +8336,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        refresh(callbacks?: { success(theRefreshedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+        refresh(
+          callbacks?: { success(theRefreshedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }
+        ): Promise<KiiUser>;
 
         /**
          * Delete the user from the server
@@ -7656,7 +8380,9 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        delete(callbacks?: { success(theDeletedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+        delete(
+          callbacks?: { success(theDeletedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }
+        ): Promise<KiiUser>;
 
         /**
          * Logs the currently logged-in user out of the KiiSDK
@@ -7723,7 +8449,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static findUserByEmail(email: string, callbacks?: { success(theMatchedUser: KiiUser): any; failure(anErrorString: string): any; }): Promise<KiiUser>;
+        static findUserByEmail(
+          email: string,
+          callbacks?: { success(theMatchedUser: KiiUser): any; failure(anErrorString: string): any; }
+        ): Promise<KiiUser>;
 
         /**
          * Find registered KiiUser with the phone.<br>
@@ -7772,7 +8501,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static findUserByPhone(phone: string, callbacks?: { success(theMatchedUser: KiiUser): any; failure(anErrorString: string): any; }): Promise<KiiUser>;
+        static findUserByPhone(
+          phone: string,
+          callbacks?: { success(theMatchedUser: KiiUser): any; failure(anErrorString: string): any; }
+        ): Promise<KiiUser>;
 
         /**
          * Find registered KiiUser with the user name.<br>
@@ -7820,7 +8552,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        static findUserByUsername(username: string, callbacks?: { success(theMatchedUser: KiiUser): any; failure(anErrorString: string): any; }): Promise<KiiUser>;
+        static findUserByUsername(
+          username: string,
+          callbacks?: { success(theMatchedUser: KiiUser): any; failure(anErrorString: string): any; }
+        ): Promise<KiiUser>;
 
         /**
          * Instantiate topic belongs to this user.
@@ -7829,13 +8564,16 @@ declare namespace KiiCloud {
          *
          * @return topic instance.
          */
-        topicWithName(topicName: string): KiiTopic;
+        topicWithName(
+          topicName: string
+        ): KiiTopic;
 
         /**
          * Gets a list of topics in this user scope
          *
          * @param callbacks An object with callback methods defined
-         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no paginationKey specified.
+         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no
+         * paginationKey specified.
          *
          * @return return promise object.
          *     <ul>
@@ -7896,7 +8634,10 @@ declare namespace KiiCloud {
          *         }
          *     );
          */
-        listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
+        listTopics(
+          callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; },
+          paginationKey?: string
+        ): Promise<[KiiTopic[], string]>;
 
         /**
          * Instantiate push subscription for this user.
@@ -7943,7 +8684,10 @@ declare namespace KiiCloud {
          * @throws If the password is not in the
          *     proper format
          */
-        static builderWithIdentifier(identifier: string, password: string): KiiUserBuilder;
+        static builderWithIdentifier(
+          identifier: string,
+          password: string
+        ): KiiUserBuilder;
 
         /**
          * Create KiiUser builder with email address
@@ -7960,7 +8704,10 @@ declare namespace KiiCloud {
          * @throws If the password is not in the
          *     proper format
          */
-        static builderWithEmailAddress(emailAddress: string, password: string): KiiUserBuilder;
+        static builderWithEmailAddress(
+          emailAddress: string,
+          password: string
+        ): KiiUserBuilder;
 
         /**
          * Create KiiUser builder with global phone number
@@ -7974,7 +8721,10 @@ declare namespace KiiCloud {
          *
          * @throws If the phone number is not in the proper format
          */
-        static builderWithGlobalPhoneNumber(phoneNumber: string, password: string): KiiUserBuilder;
+        static builderWithGlobalPhoneNumber(
+          phoneNumber: string,
+          password: string
+        ): KiiUserBuilder;
 
         /**
          * Create KiiUser builder with local phone number
@@ -7993,7 +8743,11 @@ declare namespace KiiCloud {
          * @throws If the password is not in the
          *     proper format
          */
-        static builderWithLocalPhoneNumber(phoneNumber: string, country: string, password: string): KiiUserBuilder;
+        static builderWithLocalPhoneNumber(
+          phoneNumber: string,
+          country: string,
+          password: string
+        ): KiiUserBuilder;
 
         /**
          * Create KiiUser builder with user name
@@ -8010,7 +8764,10 @@ declare namespace KiiCloud {
          * @throws If the password is not in the
          *     proper format
          */
-        static builderWithUsername(username: string, password: string): KiiUserBuilder;
+        static builderWithUsername(
+          username: string,
+          password: string
+        ): KiiUserBuilder;
 
         /**
          * Set user name.
@@ -8025,7 +8782,9 @@ declare namespace KiiCloud {
          * @throws If the username is not in the
          *     proper format
          */
-        setUsername(username: string): KiiUserBuilder;
+        setUsername(
+          username: string
+        ): KiiUserBuilder;
 
         /**
          * Set email address.
@@ -8040,7 +8799,9 @@ declare namespace KiiCloud {
          * @throws If the email address is not in the
          *     proper format
          */
-        setEmailAddress(emailAddress: string): KiiUserBuilder;
+        setEmailAddress(
+          emailAddress: string
+        ): KiiUserBuilder;
 
         /**
          * Set global phone number.
@@ -8055,7 +8816,9 @@ declare namespace KiiCloud {
          * @throws If the phone number is not
          *     in the proper format
          */
-        setGlobalPhoneNumber(phoneNumber: string): KiiUserBuilder;
+        setGlobalPhoneNumber(
+          phoneNumber: string
+        ): KiiUserBuilder;
 
         /**
          * Set local phone number.
@@ -8072,7 +8835,10 @@ declare namespace KiiCloud {
          *     in the proper format
          * @throws If the country code is not a valid format
          */
-        setLocalPhoneNumber(phoneNumber: string, country: string): KiiUserBuilder;
+        setLocalPhoneNumber(
+          phoneNumber: string,
+          country: string
+        ): KiiUserBuilder;
 
         /**
          * Build KiiUser object.
@@ -8098,6 +8864,7 @@ import KiiAnyAuthenticatedUser = KiiCloud.KiiAnyAuthenticatedUser;
 import KiiAppAdminContext = KiiCloud.KiiAppAdminContext;
 import KiiBucket = KiiCloud.KiiBucket;
 import KiiClause = KiiCloud.KiiClause;
+import KiiErrorParser = KiiCloud.KiiErrorParser;
 import KiiGeoPoint = KiiCloud.KiiGeoPoint;
 import KiiGroup = KiiCloud.KiiGroup;
 import KiiObject = KiiCloud.KiiObject;
diff --git a/kii-cloud-sdk/kii-cloud-sdk-tests.ts b/kii-cloud-sdk/kii-cloud-sdk-tests.ts
index 97f4d40512..40abd1e8d4 100644
--- a/kii-cloud-sdk/kii-cloud-sdk-tests.ts
+++ b/kii-cloud-sdk/kii-cloud-sdk-tests.ts
@@ -18,11 +18,11 @@ function main() {
     });
 
     user.register()
-        .then(function (user: KiiUser) {
+        .then((user: KiiUser) => {
         });
 
     user.pushInstallation().getMqttEndpoint("")
-        .then(function (endpoint: KiiCloud.KiiMqttEndpoint) {
+        .then((endpoint: KiiCloud.KiiMqttEndpoint) => {
             endpoint.installationID;
         });
 
@@ -41,16 +41,16 @@ function main() {
     var query = KiiQuery.queryWithClause(clause3);
 
     bucket.executeQuery(query, {
-        success: function (query: KiiQuery,
-                           results: KiiObject[],
-                           nextQuery: KiiQuery) {
+        success: (query: KiiQuery,
+                  results: KiiObject[],
+                  nextQuery: KiiQuery) => {
         },
-        failure: function (bucket: KiiBucket, message: string) {
+        failure: (bucket: KiiBucket, message: string) => {
         }
     });
 
     bucket.executeQuery<KiiObject>(query)
-        .then(function (params: [KiiQuery, KiiObject[], KiiQuery]) {
+        .then((params: [KiiQuery, KiiObject[], KiiQuery]) => {
             var [query, results, nextQuery] = params;
         });
 
@@ -61,39 +61,43 @@ function main() {
     object.save();
 
     KiiGroup.registerGroupWithID("Group ID", "Group Name", [user], {
-        success: function(theSavedGroup: KiiGroup) {
+        success: (theSavedGroup: KiiGroup) => {
             theSavedGroup.saveWithOwner("user ID");
         },
-        failure: function(theGroup: KiiGroup,
-                          anErrorString: String,
-                          addMembersArray: KiiUser[],
-                          removeMembersArray: KiiUser[]) {
+        failure: (theGroup: KiiGroup,
+                  anErrorString: string,
+                  addMembersArray: KiiUser[],
+                  removeMembersArray: KiiUser[]) => {
         }
     });
 
     Kii.authenticateAsThing("thing id", "password", {
-        success: function (thingAuthContext: KiiThingContext) {
+        success: (thingAuthContext: KiiThingContext) => {
             thingAuthContext.bucketWithName("");
         },
-        failure: function (error) {
+        failure: (error) => {
         }
     })
-        .then(function (thingAuthContext: KiiThingContext) {
+        .then((thingAuthContext: KiiThingContext) => {
         });
 
     Kii.authenticateAsThingWithToken("thing id", "token", {
-        success: function (thingAuthContext: KiiThingContext) {
+        success: (thingAuthContext: KiiThingContext) => {
             thingAuthContext.bucketWithName("");
         },
-        failure: function (error) {
+        failure: (error) => {
         }
     })
-        .then(function (thingAuthContext: KiiThingContext) {
+        .then((thingAuthContext: KiiThingContext) => {
         });
 
     KiiThing.loadWithVendorThingID("thing ID")
-        .then(function (thing) {
+        .then((thing) => {
             var isOnline: boolean = thing.isOnline();
             var onlineStatusModifiedAt: Date = thing.getOnlineStatusModifiedAt();
         });
+
+    var error = KiiErrorParser.parse("");
+
+    error.code.toLowerCase();
 }
diff --git a/kii-cloud-sdk/tslint.json b/kii-cloud-sdk/tslint.json
new file mode 100644
index 0000000000..ad51895c20
--- /dev/null
+++ b/kii-cloud-sdk/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "../tslint.json",
+    "rules": {
+        "dt-header": false
+    }
+}
diff --git a/klaw/klaw-tests.ts b/klaw/klaw-tests.ts
index 312af220ff..acd8b2fcbf 100644
--- a/klaw/klaw-tests.ts
+++ b/klaw/klaw-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="klaw" />
-/// <reference types="node" />
-
 import * as klaw from "klaw";
 const path = require('path');
 
diff --git a/knex/index.d.ts b/knex/index.d.ts
index 0627498962..15ff365756 100644
--- a/knex/index.d.ts
+++ b/knex/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Knex.js
 // Project: https://github.com/tgriesser/knex
-// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions by: Qubo <https://github.com/tkQubo>, Baronfel <https://github.com/baronfel>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -25,7 +25,7 @@ interface Knex extends Knex.QueryInterface {
     transaction: <R>(transactionScope: ((trx: Knex.Transaction) => void)) => Promise<any>;
     destroy(callback: Function): void;
     destroy(): Promise<void>;
-
+    batchInsert(tableName : TableName, data: any[], chunkSize : number) : Knex.QueryBuilder;
     schema: Knex.SchemaBuilder;
 
     client: any;
@@ -165,7 +165,7 @@ declare namespace Knex {
 
     interface Join {
         (raw: Raw): QueryBuilder;
-        (tableName: string, columns: { [key: string]: string | Raw }): QueryBuilder;
+        (tableName: string, columns: { [key: string]: string | number | Raw }): QueryBuilder;
         (tableName: string, callback: Function): QueryBuilder;
         (tableName: TableName, raw: Raw): QueryBuilder;
         (tableName: TableName, column1: string, column2: string): QueryBuilder;
diff --git a/knex/knex-tests.ts b/knex/knex-tests.ts
index 420aafd724..6e49702faf 100644
--- a/knex/knex-tests.ts
+++ b/knex/knex-tests.ts
@@ -188,6 +188,10 @@ knex('users')
   .join('contacts', 'users.id', '=', 'contacts.user_id')
   .select('users.id', 'contacts.phone');
 
+knex('users')
+  .join('contacts', { 'users.id': 12355 })
+  .select('users.id', 'contacts.phone');
+
 knex('users')
   .join('contacts', 'users.id', 'contacts.user_id')
   .select('users.id', 'contacts.phone');
@@ -281,6 +285,8 @@ knex('books')
   .returning('id')
   .insert([{title: 'Great Gatsby'}, {title: 'Fahrenheit 451'}]);
 
+knex.batchInsert('books', [{title:'Great Gatsby'}, {title: 'Fahrenheit 451'}], 200);
+
 knex('books').where('published_date', '<', 2000).update({status: 'archived'});
 knex('books').where('published_date', '<', 2000).update({status: 'archived'}, 'id');
 knex('books').where('published_date', '<', 2000).update({status: 'archived'}, ['id', 'title']);
diff --git a/knockout-amd-helpers/knockout-amd-helpers-tests.ts b/knockout-amd-helpers/knockout-amd-helpers-tests.ts
index d2773dee12..5b9c2983b5 100644
--- a/knockout-amd-helpers/knockout-amd-helpers-tests.ts
+++ b/knockout-amd-helpers/knockout-amd-helpers-tests.ts
@@ -1,8 +1,5 @@
 // Tests for knockout.projections.d.ts
 
-/// <reference types="knockout" />
-
-
 //The baseDir is used in building the path to use in the require statement. If your modules live in the modules directory, then you can specify it globally here.
 ko.bindingHandlers.module.baseDir = "blub";
 
diff --git a/knockout-transformations/knockout-transformations-tests.ts b/knockout-transformations/knockout-transformations-tests.ts
index c8e93fc20e..6725f4f209 100644
--- a/knockout-transformations/knockout-transformations-tests.ts
+++ b/knockout-transformations/knockout-transformations-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="knockout" />
-
-
 // Test map
 var sourceItems: KnockoutObservableArray<number> = ko.observableArray([1, 2, 3, 4, 5]);
 var squares: KnockoutObservableArray<number> = sourceItems.map(function (x) { return x * x; });
diff --git a/knockout.kogrid/knockout.kogrid-tests.ts b/knockout.kogrid/knockout.kogrid-tests.ts
index 8abe83d36d..ba36e78e9f 100644
--- a/knockout.kogrid/knockout.kogrid-tests.ts
+++ b/knockout.kogrid/knockout.kogrid-tests.ts
@@ -1,33 +1,27 @@
-/// <reference types="knockout" />
+export interface IGridItem {
+	name: string;
+}
 
+export class Tests {
+	public items: KnockoutObservableArray<IGridItem>;
+	public selectedItems: KnockoutObservableArray<IGridItem>;
+	public gridOptionsAlarms: kg.GridOptions<IGridItem>;
 
-namespace KoGridTests
-{
-    export interface IGridItem {
-        name: string;
-    }
+	constructor() {
+		this.items = ko.observableArray<IGridItem>();
+		this.selectedItems = ko.observableArray<IGridItem>();
+		this.gridOptionsAlarms = this.createDefaultGridOptions(this.items, this.selectedItems);
+	}
 
-    export class Tests {
-        public items: KnockoutObservableArray<IGridItem>;
-        public selectedItems: KnockoutObservableArray<IGridItem>;
-        public gridOptionsAlarms: kg.GridOptions<IGridItem>;
-
-        constructor() {
-            this.items = ko.observableArray<IGridItem>();
-            this.selectedItems = ko.observableArray<IGridItem>();
-            this.gridOptionsAlarms = this.createDefaultGridOptions(this.items, this.selectedItems);
-        }
-
-        public createDefaultGridOptions<Type>(dataArray: KnockoutObservableArray<Type>, selectedItems: KnockoutObservableArray<Type>): kg.GridOptions<Type> {
-            return {
-                data: dataArray,
-                displaySelectionCheckbox: false,
-                footerVisible: false,
-                multiSelect: false,
-                showColumnMenu: false,
-                plugins: null,
-                selectedItems: selectedItems
-            };
-        }
-    }
+	public createDefaultGridOptions<Type>(dataArray: KnockoutObservableArray<Type>, selectedItems: KnockoutObservableArray<Type>): kg.GridOptions<Type> {
+		return {
+			data: dataArray,
+			displaySelectionCheckbox: false,
+			footerVisible: false,
+			multiSelect: false,
+			showColumnMenu: false,
+			plugins: null,
+			selectedItems: selectedItems
+		};
+	}
 }
diff --git a/knockout.mapping/knockout.mapping-tests.ts b/knockout.mapping/knockout.mapping-tests.ts
index 7b1a9aca8d..6262f36275 100644
--- a/knockout.mapping/knockout.mapping-tests.ts
+++ b/knockout.mapping/knockout.mapping-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="knockout" />
-
 var inputJSON = '{ name: "foo" }';
 var inputData = { name: 'foo' };
 var inputModel = { name: 'bar' };
diff --git a/knockout.projections/knockout.projections-tests.ts b/knockout.projections/knockout.projections-tests.ts
index c0899c81ee..bc8a505484 100644
--- a/knockout.projections/knockout.projections-tests.ts
+++ b/knockout.projections/knockout.projections-tests.ts
@@ -1,8 +1,3 @@
-// Tests for knockout.projections.d.ts
-
-/// <reference types="knockout" />
-
-
 // Test map
 var sourceItems = ko.observableArray([1, 2, 3, 4, 5]);
 var squares = sourceItems.map(function (x) { return x * x; });
diff --git a/knockout.punches/knockout.punches-tests.ts b/knockout.punches/knockout.punches-tests.ts
index 1de89ca570..2eccd25d37 100644
--- a/knockout.punches/knockout.punches-tests.ts
+++ b/knockout.punches/knockout.punches-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="knockout.punches" />
-
-
 function test_enable() {
 	ko.punches.enableAll();
 }
diff --git a/knockout/index.d.ts b/knockout/index.d.ts
index a28d06a220..570d0ee830 100644
--- a/knockout/index.d.ts
+++ b/knockout/index.d.ts
@@ -658,7 +658,7 @@ declare namespace KnockoutComponentTypes {
     }
 
     interface Loader {
-        getConfig? (componentName: string, callback: (result: ComponentConfig) => void): void;
+        getConfig? (componentName: string, callback: (result: ComponentConfig | null) => void): void;
         loadComponent? (componentName: string, config: ComponentConfig, callback: (result: Definition) => void): void;
         loadTemplate? (componentName: string, templateConfig: any, callback: (result: Node[]) => void): void;
         loadViewModel? (componentName: string, viewModelConfig: any, callback: (result: any) => void): void;
diff --git a/knockout/test/templatingBehaviors.ts b/knockout/test/templatingBehaviors.ts
index 7052b716f5..b69cb080f8 100644
--- a/knockout/test/templatingBehaviors.ts
+++ b/knockout/test/templatingBehaviors.ts
@@ -1,12 +1,31 @@
-/// <reference types="jasmine" />
 /// <reference types="knockout.mapping" />
 
+// Jasmine definitions
+declare function describe(desc: string, f: () => void): void;
+declare function it(desc: string, f: () => void): void;
+declare function beforeEach(action: (done: DoneFn) => void, timeout?: number): void;
+declare function expect(spy: Function): jasmine.Matchers;
+declare function expect(actual: any): jasmine.Matchers;
+
+interface DoneFn extends Function {
+    (): void;
+
+    /** fails the spec and indicates that it has completed. If the message is an Error, Error.message is used */
+    fail: (message?: Error|string) => void;
+}
+
 declare namespace jasmine {
   interface Matchers {
+    toEqual(expected: any, expectationFailOutput?: any): boolean;
+    toBeDefined(expectationFailOutput?: any): boolean;
+    toBeNull(expectationFailOutput?: any): boolean;
     toContainHtml(expected: string): boolean;
     toContainText(expected: string): boolean;
+    not: Matchers;
   }
 }
+//End Jasmine definitions
+
 
 var dummyTemplateEngine = function (templates?) {
     var inMemoryTemplates = templates || {};
diff --git a/knockstrap/knockstrap-tests.ts b/knockstrap/knockstrap-tests.ts
index 2033252de2..2fb58fbaf7 100644
--- a/knockstrap/knockstrap-tests.ts
+++ b/knockstrap/knockstrap-tests.ts
@@ -1,9 +1,3 @@
-///<reference types="jquery" />
-///<reference types="bootstrap" />
-///<reference types="knockout" />
-
-
-
 // test unique id
 var adaskoUnitqueId: string = ko.utils.uniqueId('adaskothebeast');
 
diff --git a/knuddels-userapps-api/index.d.ts b/knuddels-userapps-api/index.d.ts
index b388301f68..52183f832f 100644
--- a/knuddels-userapps-api/index.d.ts
+++ b/knuddels-userapps-api/index.d.ts
@@ -1541,7 +1541,7 @@ declare class KnuddelsServer {
 	 * Liefert ein ExternalServerAccess-Objekt, mit dem
 	 * andere Server angesteuert werden können.
 	 */
-	getExternalServerAccess(): ExternalServerAccess;
+	static getExternalServerAccess(): ExternalServerAccess;
 	/**
 	 * Aktualisiert die Liste der genutzten Hooks. Werden zur Laufzeit chatCommands oder App-Hooks (wie mayJoinChannel) dynamisch erzeugt oder gelöscht, so muss danach <code>refreshHooks()</code>
 	 * aufgerufen werden, damit diese Änderung wirksam wird.
diff --git a/knuddels-userapps-api/knuddels-userapps-api-tests.ts b/knuddels-userapps-api/knuddels-userapps-api-tests.ts
index 1faaa193e5..a940b7f19b 100644
--- a/knuddels-userapps-api/knuddels-userapps-api-tests.ts
+++ b/knuddels-userapps-api/knuddels-userapps-api-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="knuddels-userapps-api" />
-
 class Server implements App {
 
 	private usersPlaying: { [nick: string]: number } = {};
diff --git a/ko.plus/ko.plus-tests.ts b/ko.plus/ko.plus-tests.ts
index cbb86d3122..d3472c0d82 100644
--- a/ko.plus/ko.plus-tests.ts
+++ b/ko.plus/ko.plus-tests.ts
@@ -1,30 +1,9 @@
-
-/// <reference types="knockout" />
-
-// Tests for ko.plus.d.ts
-// Project: https://github.com/stevegreatrex/ko.plus
-// Definitions by: Howard Richards <https://github.com/conficient>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
-    Version 1.0 - initial commit
-
-    Version 1.1 - added test for makeEditable
-
-    Version 1.2 - amended callback on commmand.fail() method - accepts response,
-                  status and message values
- 
-    Note: Typescript version 1.4 or higher is required for union types
-    and type declarations
-*/
-
 function CommandTests() {
-    
     // initalize command with an execute method
     var cmd1 = ko.command(() => {
         return "Hello cmd1";
     });
-	
+
     // initialize command and add done and fail callbacks
     var cmd2 = ko.command(() => {
         return "Hello cmd2";
@@ -56,7 +35,7 @@ function CommandTests() {
 
     // test execute the command
     cmd1();
-    	
+
     // test properties of the commmand
     var isRunning = cmd1.isRunning();
     var failed = cmd1.failed();
@@ -75,7 +54,7 @@ function EditableTests() {
     var edit3 = ko.editable<any>({ test: true }); // with anything
 
     var edit4 = ko.editable<string|number>(1); // with union types
-    var edit5 = ko.editable<string|number>("test"); 
+    var edit5 = ko.editable<string|number>("test");
 
     ko.editable.makeEditable(this);
 
@@ -119,7 +98,7 @@ function EditableArrayTests() {
 
 function SortableTests() {
 
-    // sorting is added via an extender, there are no .d.ts 
+    // sorting is added via an extender, there are no .d.ts
     // types for this at present
     var sort1 = ko.observableArray([1, 2, 3]).extend({ sortable: true });
 
diff --git a/koa-cache-control/index.d.ts b/koa-cache-control/index.d.ts
new file mode 100644
index 0000000000..19329fcfec
--- /dev/null
+++ b/koa-cache-control/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for koa-cache-control 2.0
+// Project: https://github.com/DaMouse404/koa-cache-control
+// Definitions by: Peter Safranek <https://github.com/pe8ter>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as Koa from "koa";
+
+declare function cacheControl(options?: {
+    private?: boolean;
+    public?: boolean;
+    noStore?: boolean;
+    noCache?: boolean;
+    noTransform?: boolean;
+    mustRevalidate?: boolean;
+    staleIfError?: number;
+    staleWhileRevalidate?: number;
+    maxAge?: number;
+    sMaxAge?: number;
+}): Koa.Middleware;
+
+declare namespace cacheControl {}
+
+export = cacheControl;
diff --git a/koa-cache-control/koa-cache-control-tests.ts b/koa-cache-control/koa-cache-control-tests.ts
new file mode 100644
index 0000000000..c99f4fe862
--- /dev/null
+++ b/koa-cache-control/koa-cache-control-tests.ts
@@ -0,0 +1,19 @@
+import * as Koa from "koa";
+import * as cacheControl from "koa-cache-control";
+
+const app = new Koa();
+
+app.use(cacheControl());
+app.use(cacheControl({}));
+app.use(cacheControl({
+    private: true,
+    public: true,
+    noStore: true,
+    noCache: true,
+    noTransform: true,
+    mustRevalidate: true,
+    staleIfError: 0,
+    staleWhileRevalidate: 0,
+    maxAge: 0,
+    sMaxAge: 0,
+}));
diff --git a/promises-a-plus/tsconfig.json b/koa-cache-control/tsconfig.json
similarity index 91%
rename from promises-a-plus/tsconfig.json
rename to koa-cache-control/tsconfig.json
index d5ccf86f75..ae4aea7b85 100644
--- a/promises-a-plus/tsconfig.json
+++ b/koa-cache-control/tsconfig.json
@@ -17,6 +17,6 @@
     },
     "files": [
         "index.d.ts",
-        "promises-a-plus-tests.ts"
+        "koa-cache-control-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/koa-cache-control/tslint.json b/koa-cache-control/tslint.json
new file mode 100644
index 0000000000..eb88e553a5
--- /dev/null
+++ b/koa-cache-control/tslint.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../tslint.json",
+
+  "noImplicitAny": "true",
+  "noImplicitThis": "true",
+  "strictNullChecks": "true"
+}
diff --git a/koa-logger/koa-logger-tests.ts b/koa-logger/koa-logger-tests.ts
index f2d17ba090..502c33255d 100644
--- a/koa-logger/koa-logger-tests.ts
+++ b/koa-logger/koa-logger-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="koa"/>
-
 import * as koa from 'koa';
 import * as logger from 'koa-logger';
 
diff --git a/koa/index.d.ts b/koa/index.d.ts
index 99e2c04498..0fd2b73edd 100644
--- a/koa/index.d.ts
+++ b/koa/index.d.ts
@@ -280,34 +280,6 @@ declare interface ContextDelegatedRequest {
     get(field: string): string;
 }
 
-declare interface BaseRequest extends ContextDelegatedRequest {
-    /**
-     * Get the charset when present or undefined.
-     */
-    charset: string;
-
-    /**
-     * Return parsed Content-Length when present.
-     */
-    length: number;
-
-    /**
-     * Return the request mime type void of
-     * parameters such as "charset".
-     */
-    type: string;
-
-    /**
-     * Inspect implementation.
-     */
-    inspect(): any;
-
-    /**
-     * Return JSON representation.
-     */
-    toJSON(): any;
-}
-
 declare interface ContextDelegatedResponse {
     /**
      * Get/Set response status code.
@@ -444,120 +416,14 @@ declare interface ContextDelegatedResponse {
     flushHeaders(): void;
 }
 
-declare interface BaseResponse extends ContextDelegatedResponse {
-    /**
-     * Return the request socket.
-     *
-     * @return {Connection}
-     * @api public
-     */
-    socket: Socket;
-
-    /**
-     * Return response header.
-     */
-    header: any;
-
-    /**
-     * Return response header, alias as response.header
-     */
-    headers: any;
-
-    /**
-     * Check whether the response is one of the listed types.
-     * Pretty much the same as `this.request.is()`.
-     *
-     * @param {String|Array} types...
-     * @return {String|false}
-     * @api public
-     */
-    // is(): string;
-    is(...types: string[]): string;
-    is(types: string[]): string;
-
-    /**
-     * Return response header.
-     *
-     * Examples:
-     *
-     *     this.get('Content-Type');
-     *     // => "text/plain"
-     *
-     *     this.get('content-type');
-     *     // => "text/plain"
-     */
-    get(field: string): string;
-
-    /**
-     * Inspect implementation.
-     */
-    inspect(): any;
-
-    /**
-     * Return JSON representation.
-     */
-    toJSON(): any;
-}
-
-
-declare interface BaseContext extends ContextDelegatedRequest, ContextDelegatedResponse {
-    /**
-     * util.inspect() implementation, which
-     * just returns the JSON output.
-     */
-    inspect(): any;
-
-    /**
-     * Return JSON representation.
-     *
-     * Here we explicitly invoke .toJSON() on each
-     * object, as iteration will otherwise fail due
-     * to the getters and cause utilities such as
-     * clone() to fail.
-     */
-    toJSON(): any;
-
-    /**
-     * Similar to .throw(), adds assertion.
-     *
-     *    this.assert(this.user, 401, 'Please login!');
-     *
-     * See: https://github.com/jshttp/http-assert
-     */
-    assert: typeof httpAssert;
-
-    /**
-     * Throw an error with `msg` and optional `status`
-     * defaulting to 500. Note that these are user-level
-     * errors, and the message may be exposed to the client.
-     *
-     *    this.throw(403)
-     *    this.throw('name required', 400)
-     *    this.throw(400, 'name required')
-     *    this.throw('something exploded')
-     *    this.throw(new Error('invalid'), 400);
-     *    this.throw(400, new Error('invalid'));
-     *
-     * See: https://github.com/jshttp/http-errors
-     */
-    throw(message: string, code?: number, properties?: {}): never;
-    throw(status: number): never;
-    throw(...properties: Array<number | string | {}>): never;
-
-    /**
-     * Default error handling.
-     */
-    onerror(err: Error): void;
-}
-
 declare class Application extends EventEmitter {
     proxy: boolean;
     middleware: Application.Middleware[];
     subdomainOffset: number;
     env: string;
-    context: BaseContext;
-    request: BaseRequest;
-    response: BaseResponse;
+    context: Application.BaseContext;
+    request: Application.BaseRequest;
+    response: Application.BaseResponse;
     silent: boolean;
     keys: Keygrip | string[];
 
@@ -623,6 +489,139 @@ declare class Application extends EventEmitter {
 declare namespace Application {
     type Middleware = compose.Middleware<Context>;
 
+    interface BaseRequest extends ContextDelegatedRequest {
+        /**
+         * Get the charset when present or undefined.
+         */
+        charset: string;
+
+        /**
+         * Return parsed Content-Length when present.
+         */
+        length: number;
+
+        /**
+         * Return the request mime type void of
+         * parameters such as "charset".
+         */
+        type: string;
+
+        /**
+         * Inspect implementation.
+         */
+        inspect(): any;
+
+        /**
+         * Return JSON representation.
+         */
+        toJSON(): any;
+    }
+
+    interface BaseResponse extends ContextDelegatedResponse {
+        /**
+         * Return the request socket.
+         *
+         * @return {Connection}
+         * @api public
+         */
+        socket: Socket;
+
+        /**
+         * Return response header.
+         */
+        header: any;
+
+        /**
+         * Return response header, alias as response.header
+         */
+        headers: any;
+
+        /**
+         * Check whether the response is one of the listed types.
+         * Pretty much the same as `this.request.is()`.
+         *
+         * @param {String|Array} types...
+         * @return {String|false}
+         * @api public
+         */
+        // is(): string;
+        is(...types: string[]): string;
+        is(types: string[]): string;
+
+        /**
+         * Return response header.
+         *
+         * Examples:
+         *
+         *     this.get('Content-Type');
+         *     // => "text/plain"
+         *
+         *     this.get('content-type');
+         *     // => "text/plain"
+         */
+        get(field: string): string;
+
+        /**
+         * Inspect implementation.
+         */
+        inspect(): any;
+
+        /**
+         * Return JSON representation.
+         */
+        toJSON(): any;
+    }
+
+    interface BaseContext extends ContextDelegatedRequest, ContextDelegatedResponse {
+        /**
+         * util.inspect() implementation, which
+         * just returns the JSON output.
+         */
+        inspect(): any;
+
+        /**
+         * Return JSON representation.
+         *
+         * Here we explicitly invoke .toJSON() on each
+         * object, as iteration will otherwise fail due
+         * to the getters and cause utilities such as
+         * clone() to fail.
+         */
+        toJSON(): any;
+
+        /**
+         * Similar to .throw(), adds assertion.
+         *
+         *    this.assert(this.user, 401, 'Please login!');
+         *
+         * See: https://github.com/jshttp/http-assert
+         */
+        assert: typeof httpAssert;
+
+        /**
+         * Throw an error with `msg` and optional `status`
+         * defaulting to 500. Note that these are user-level
+         * errors, and the message may be exposed to the client.
+         *
+         *    this.throw(403)
+         *    this.throw('name required', 400)
+         *    this.throw(400, 'name required')
+         *    this.throw('something exploded')
+         *    this.throw(new Error('invalid'), 400);
+         *    this.throw(400, new Error('invalid'));
+         *
+         * See: https://github.com/jshttp/http-errors
+         */
+        throw(message: string, code?: number, properties?: {}): never;
+        throw(status: number): never;
+        throw(...properties: Array<number | string | {}>): never;
+
+        /**
+         * Default error handling.
+         */
+        onerror(err: Error): void;
+    }
+
     interface Request extends BaseRequest {
         app: Application;
         req: IncomingMessage;
@@ -652,6 +651,10 @@ declare namespace Application {
         cookies: Cookies;
         accept: accepts.Accepts;
         state: any;
+        /**
+         * To bypass Koa's built-in response handling, you may explicitly set `ctx.respond = false;`
+         */
+        respond?: boolean;
     }
 }
 
diff --git a/kolite/kolite-tests.ts b/kolite/kolite-tests.ts
index 539c284861..2ce3cbd0f0 100644
--- a/kolite/kolite-tests.ts
+++ b/kolite/kolite-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-/// <reference types="knockout" />
-
 function test_activityDefaults() {
     ko.bindingHandlers.activity.defaultOptions = {
         activityClass: 'fa fa-spinner fa-spin',
diff --git a/kramed/index.d.ts b/kramed/index.d.ts
new file mode 100644
index 0000000000..41984f9dc5
--- /dev/null
+++ b/kramed/index.d.ts
@@ -0,0 +1,160 @@
+// Type definitions for Kramed 0.5
+// Project: https://github.com/GitbookIO/kramed
+// Definitions by: Matthew Wilkes <https://github.com/tonicblue>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface KramedStatic {
+    /**
+     * Compiles kramdown to HTML.
+     *
+     * @param src String of kramdown source to be compiled
+     * @param callback Function called when the kramdownString has been fully parsed when using async highlighting
+     * @return String of compiled HTML
+     */
+    (src: string, callback: () => void): string;
+
+    /**
+     * Compiles kramdown to HTML.
+     *
+     * @param src String of kramdown source to be compiled
+     * @param options Hash of options
+     * @param callback Function called when the kramdownString has been fully parsed when using async highlighting
+     * @return String of compiled HTML
+     */
+    (src: string, options?: KramedOptions, callback?: () => void): string;
+
+    /**
+     * @param src String of kramdown source to be compiled
+     * @param options Hash of options
+     */
+    lexer(src: string, options?: KramedOptions): any[];
+
+    /**
+     * Compiles kramdown to HTML.
+     *
+     * @param src String of kramdown source to be compiled
+     * @param callback Function called when the kramdownString has been fully parsed when using async highlighting
+     * @return String of compiled HTML
+     */
+    parse(src: string, callback: () => void): string;
+
+    /**
+     * Compiles kramdown to HTML.
+     *
+     * @param src String of kramdown source to be compiled
+     * @param options Hash of options
+     * @param callback Function called when the kramdownString has been fully parsed when using async highlighting
+     * @return String of compiled HTML
+     */
+    parse(src: string, options?: KramedOptions, callback?: () => void): string;
+
+    /**
+     * @param options Hash of options
+     */
+    parser(src: any[], options?: KramedOptions): string;
+
+    /**
+     * Sets the default options.
+     *
+     * @param options Hash of options
+     */
+    setOptions(options: KramedOptions): KramedStatic;
+
+    Renderer: {
+        new(): KramedRenderer;
+    };
+
+    Parser: {
+        new(options: KramedOptions): KramedParser;
+    };
+}
+
+export interface KramedRenderer {
+    code(code: string, language: string): string;
+    blockquote(quote: string): string;
+    html(html: string): string;
+    heading(text: string, level: number, raw: string): string;
+    hr(): string;
+    list(body: string, ordered: boolean): string;
+    listitem(text: string): string;
+    paragraph(text: string): string;
+    table(header: string, body: string): string;
+    tablerow(content: string): string;
+    tablecell(content: string, flags: {
+        header: boolean,
+        align: string
+    }): string;
+    strong(text: string): string;
+    em(text: string): string;
+    codespan(code: string): string;
+    br(): string;
+    del(text: string): string;
+    link(href: string, title: string, text: string): string;
+    image(href: string, title: string, text: string): string;
+    text(text: string): string;
+}
+
+export interface KramedParser {
+    parse(source: any[]): string;
+}
+
+export interface KramedOptions {
+    /**
+     * Type: object Default: new Renderer()
+     *
+     * An object containing functions to render tokens to HTML.
+     */
+    renderer?: KramedRenderer;
+
+    /**
+     * Enable GitHub flavored kramdown.
+     */
+    gfm?: boolean;
+
+    /**
+     * Enable GFM tables. This option requires the gfm option to be true.
+     */
+    tables?: boolean;
+
+    /**
+     * Enable GFM line breaks. This option requires the gfm option to be true.
+     */
+    breaks?: boolean;
+
+    /**
+     * Conform to obscure parts of kramdown.pl as much as possible. Don't fix any of the original kramdown bugs or poor behavior.
+     */
+    pedantic?: boolean;
+
+    /**
+     * Sanitize the output. Ignore any HTML that has been input.
+     */
+    sanitize?: boolean;
+
+    /**
+     * Use smarter list behavior than the original kramdown. May eventually be default with the old behavior moved into pedantic.
+     */
+    smartLists?: boolean;
+
+    /**
+     * Shows an HTML error message when rendering fails.
+     */
+    silent?: boolean;
+
+    /**
+     * A function to highlight code blocks. The function takes three arguments: code, lang, and callback.
+     */
+    highlight?(code: string, lang: string, callback?: () => void): string;
+
+    /**
+     * Set the prefix for code block classes.
+     */
+    langPrefix?: string;
+
+    /**
+     * Use "smart" typograhic punctuation for things like quotes and dashes.
+     */
+    smartypants?: boolean;
+}
+
+export declare var kramed: KramedStatic;
\ No newline at end of file
diff --git a/kramed/kramed-tests.ts b/kramed/kramed-tests.ts
new file mode 100644
index 0000000000..0782742234
--- /dev/null
+++ b/kramed/kramed-tests.ts
@@ -0,0 +1,43 @@
+
+import { KramedOptions, kramed, KramedParser, KramedStatic, KramedRenderer } from 'kramed';
+
+var options: KramedOptions = {
+    gfm: true,
+    tables: true,
+    breaks: false,
+    pedantic: false,
+    sanitize: true,
+    smartLists: true,
+    silent: false,
+    highlight: function (code: string, lang: string) {
+    	return '';
+    },
+    langPrefix: 'lang-',
+    smartypants: false,
+    renderer: new kramed.Renderer()
+};
+
+function callback() {
+	console.log('callback called');
+}
+
+kramed.setOptions(options);
+
+console.log(kramed('i am using __kramdown__.'));
+console.log(kramed('i am using __kramdown__.', options));
+console.log(kramed('i am using __kramdown__.', callback));
+console.log(kramed('i am using __kramdown__.', options, callback));
+
+console.log(kramed.parse('i am using __kramdown__.'));
+console.log(kramed.parse('i am using __kramdown__.', options));
+console.log(kramed.parse('i am using __kramdown__.', callback));
+console.log(kramed.parse('i am using __kramdown__.', options, callback));
+
+var text = 'something';
+var tokens = kramed.lexer(text, options);
+console.log(kramed.parser(tokens));
+
+var renderer = new kramed.Renderer();
+renderer.heading = function(text, level, raw) {
+    return text + level.toString() + raw;
+};
diff --git a/kramed/tsconfig.json b/kramed/tsconfig.json
new file mode 100644
index 0000000000..50f51102f7
--- /dev/null
+++ b/kramed/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "kramed-tests.ts"
+    ]
+}
diff --git a/kramed/tslint.json b/kramed/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/kramed/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/kue/kue-tests.ts b/kue/kue-tests.ts
index a66dc4384c..aa61ff2f6a 100644
--- a/kue/kue-tests.ts
+++ b/kue/kue-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import kue = require('kue');
 
 // create our job queue
diff --git a/lazypipe/tsconfig.json b/lazypipe/tsconfig.json
index 675e6f38cc..801cf4648a 100644
--- a/lazypipe/tsconfig.json
+++ b/lazypipe/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/leaflet-curve/leaflet-curve-tests.ts b/leaflet-curve/leaflet-curve-tests.ts
index ec2461cbd2..3d8b319e63 100644
--- a/leaflet-curve/leaflet-curve-tests.ts
+++ b/leaflet-curve/leaflet-curve-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="leaflet" />
-
 var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
     osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
     osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib}),
diff --git a/leaflet-draw/index.d.ts b/leaflet-draw/index.d.ts
index 9668940c3a..3e2963f18b 100644
--- a/leaflet-draw/index.d.ts
+++ b/leaflet-draw/index.d.ts
@@ -349,4 +349,17 @@ declare namespace L {
 			handler: string;
 		}
 	}
+
+	namespace GeometryUtil {
+
+		/**
+		 * Returns the area of a polygon drawn with leaflet.draw
+		 */
+		export function geodesicArea(coordinates: L.LatLngLiteral[]): number;
+
+		/**
+		 * Returns a readable area string in yards or metric
+		 */
+		export function readableArea(area: number, isMetric: boolean): string;
+	}
 }
diff --git a/leaflet-draw/leaflet-draw-tests.ts b/leaflet-draw/leaflet-draw-tests.ts
index 4260eac263..8ad6e2a804 100644
--- a/leaflet-draw/leaflet-draw-tests.ts
+++ b/leaflet-draw/leaflet-draw-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="leaflet" />
-
 var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
     osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
     osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib}),
@@ -44,3 +42,7 @@ map.on('draw:created', (e: any) => {
 
     drawnItems.addLayer(layer);
 });
+
+let examplePolygon: L.LatLngLiteral[] = [{lng: 0, lat: 0}, {lng: 10, lat: 0}, {lng: 10, lat: 10}, {lng: 0, lat: 10}, {lng: 0, lat: 0}];
+let examplePolygonArea: number = L.GeometryUtil.geodesicArea(examplePolygon);
+L.GeometryUtil.readableArea(examplePolygonArea, true);
diff --git a/libpq/libpq-tests.ts b/libpq/libpq-tests.ts
index 8a9aced3c3..5736577e67 100644
--- a/libpq/libpq-tests.ts
+++ b/libpq/libpq-tests.ts
@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /// <reference types="mocha" />
 
 import {Buffer} from 'buffer';
diff --git a/linq4js/index.d.ts b/linq4js/index.d.ts
new file mode 100644
index 0000000000..e6b9084ea3
--- /dev/null
+++ b/linq4js/index.d.ts
@@ -0,0 +1,283 @@
+// Type definitions for Linq4JS 2.1
+// Project: https://github.com/morrisjdev/Linq4JS
+// Definitions by: Morris Janatzek <https://github.com/morrisjdev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Linq4JS {
+    class GeneratedEntity {
+        _GeneratedId_: number;
+        Id: number;
+    }
+}
+declare namespace Linq4JS {
+    class Helper {
+        private static ConvertStringFunction(functionString);
+        static ConvertFunction<T>(testFunction: string | T): T;
+        static OrderCompareFunction<T>(valueSelector: (item: T) => any, a: T, b: T, invert: boolean): number;
+    }
+}
+interface Array<T> {
+    Order: Linq4JS.OrderEntry[];
+    GroupValue: any;
+    /**
+     * Creates a copy of the array
+     */
+    Clone(): T[];
+    /**
+     * Gets the index of the first item found by a filter
+     * @param filter A function (or function-string) that returns a boolean when matching element was found
+     */
+    FindIndex(filter: ((item: T) => boolean) | string): number;
+    /**
+     * Gets the index of the last item found by a filter
+     * @param filter A function (or function-string) that returns a boolean when matching element was found
+     */
+    FindLastIndex(filter: ((item: T) => boolean) | string): number;
+    /**
+     * Gets the item with the index
+     * @param index Item index
+     */
+    Get(index: number): T;
+    /**
+     * Executes a method for each item in the array
+     * @param action A function (or function-string) that gets executed for each element. If it returns false the loop stops.
+     */
+    ForEach(action: ((item: T, index?: number) => boolean | any) | string): T[];
+    /**
+     * Updates an object in the array
+     * @param object The object to update
+     * @param primaryKeySelector A selector-function (or function-string) to define a property to indentify object in array
+     */
+    Update(object: T, primaryKeySelector?: ((item: T) => any) | string): T[];
+    /**
+     * Updates objects in the array
+     * @param objects The array of objects to update
+     * @param primaryKeySelector A selector-function (or function-string) to define a property to indentify object in array
+     */
+    UpdateRange(objects: T[], primaryKeySelector?: ((item: T) => any) | string): T[];
+    /**
+     * Removes an object from the array
+     * @param object The object to remove
+     * @param primaryKeySelector A selector-function (or function-string) to define a property to indentify object in array
+     */
+    Remove(object: T, primaryKeySelector?: ((item: T) => any) | string): T[];
+    /**
+     * Removes objects from the array
+     * @param objects The array of objects to remove
+     * @param primaryKeySelector A selector-function (or function-string) to define a property to indentify object in array
+     */
+    RemoveRange(objects: T[], primaryKeySelector?: ((item: T) => any) | string): T[];
+    /**
+     * Adds an object to the array
+     * @param object The object to add
+     * @param generateId Auto-generate a property to identify object in later processes
+     */
+    Add(object: T, generateId?: boolean): T[];
+    /**
+     * Adds objects to the array
+     * @param objects The array of objects to add
+     */
+    AddRange(objects: T[], generateId?: boolean): T[];
+    /**
+     * Inserts an entry at a specific position
+     * @param object The object to insert
+     * @param index The position to insert
+     */
+    Insert(object: T, index: number): T[];
+    /**
+     * Searches for all items in array that match the given filter
+     * @param filter A function (or function-string) that returns a boolean when matching element was found
+     */
+    Where(filter: ((item: T, index?: number) => boolean) | string): T[];
+    /**
+     * Takes items in a specific range
+     * @param start The start position
+     * @param length The number of elements to take
+     */
+    Range(start: number, length: number): T[];
+    /**
+     * Repeats an object in the array
+     * @param object The object to repeat
+     * @param count The count of repeats
+     */
+    Repeat(object: T, count: number): T[];
+    /**
+     * Returns the length of the array
+     * @param filter If set the function returns count of elements matched by the condition
+     */
+    Count(filter?: ((item: T) => boolean) | string): number;
+    /**
+     * Tests if all items in the array match the condition
+     * @param filter A function (or function-string) that returns a boolean when matching element was found
+     */
+    All(filter: ((item: T) => boolean) | string): boolean;
+    /**
+     * Tests if any item is in the array
+     * @param filter If set the function tests if any item in the array matches the condition
+     */
+    Any(filter?: ((item: T) => boolean) | string): boolean;
+    /**
+     * Returns the first item of the array - Throws an exception if no item was found
+     * @param filter If set the function returns the first item that matches the filter
+     */
+    First(filter?: ((item: T) => boolean) | string): T;
+    /**
+     * Returns the first item of the array - returns `null` if no suitable item was found
+     * @param filter If set the function returns the first item that matches the filter
+     */
+    FirstOrDefault(filter?: ((item: T) => boolean) | string): (T | null);
+    /**
+     * Returns the last item of the array - Throws an exception if no item was found
+     * @param filter If set the function returns the last item that matches the filter
+     */
+    Last(filter?: ((item: T) => boolean) | string): T;
+    /**
+     * Returns the last item of the array - returns `null` if no suitable item was found
+     * @param filter If set the function returns the last item that matches the filter
+     */
+    LastOrDefault(filter?: ((item: T) => boolean) | string): (T | null);
+    /**
+     * Select the properties for a new array
+     * @param selector A function (or a function-string) that returns a new object
+     */
+    Select(selector: ((item: T) => any) | string): any[];
+    /**
+     * Limits the number of entries taken
+     * @param count The count of elements taken
+     */
+    Take(count: number): T[];
+    /**
+     * Takes entries as long as a condition is true
+     * @param condition The condition-function (or function-string) that returns a boolean. All elements until a false gets thrown are taken
+     * @param initial A initial-function (or function-string) that gets executed once at the start of the loop
+     * @param after A function that gets executed after every element-iteration after the condition-function was evaluated
+     */
+    TakeWhile(condition: ((item: T, storage?: any) => boolean) | string, initial?: ((storage: any) => void) | string, after?: ((item: T, storage: any) => void) | string): T[];
+    /**
+     * Skips entries
+     * @param count The count of elements skipped
+     */
+    Skip(count: number): T[];
+    /**
+     * Orders array by property or value in ascending direction
+     * @param valueSelector The selector-function (or function-string) that selects the property for sorting
+     */
+    OrderBy(valueSelector: ((item: T) => any) | string): T[];
+    /**
+     * Orders array by additional properties in ascending direction in combination with OrderBy/OrderByDescending
+     * @param valueSelector The selector-function (or function-string) that selects the property for sorting
+     */
+    ThenBy(valueSelector: ((item: T) => any) | string): T[];
+    /**
+     * Orders array by property or value in descending direction
+     * @param valueSelector The selector-function (or function-string) that selects the property for sorting
+     */
+    OrderByDescending(valueSelector: ((item: T) => any) | string): T[];
+    /**
+     * Orders array by additional properties in descending direction in combination with OrderBy/OrderByDescending
+     * @param valueSelector The selector-function (or function-string) that selects the property for sorting
+     */
+    ThenByDescending(valueSelector: ((item: T) => any) | string): T[];
+    /**
+     * Returns the smallest element in array
+     * @param valueSelector The selector-function (or function-string) that selects the property for comparison
+     */
+    Min(valueSelector?: ((item: T) => any) | string): (T | null);
+    /**
+     * Returns the greates element in array
+     * @param valueSelector The selector-function (or function-string) that selects the property for comparison
+     */
+    Max(valueSelector?: ((item: T) => any) | string): (T | null);
+    /**
+     * Groups array by property
+     * @param selector The selector-function (or function-string) that selects the property for grouping
+     */
+    GroupBy(selector: ((item: T) => any) | string): T[][];
+    /**
+     * Moves an item from one index to another
+     * @param oldIndex The current position of the item
+     * @param newIndex The new position of the item
+     */
+    Move(oldIndex: number, newIndex: number): T[];
+    /**
+     * Makes all values unique
+     * @param valueSelector A selector-function (or function-string) to select property for comparison and distinction
+     */
+    Distinct(valueSelector?: ((item: T) => any) | string): T[];
+    /**
+     * Tests if array contains specific object
+     * @param object The object to test for
+     */
+    Contains(object: T): boolean;
+    /**
+     * Combines two arrays
+     * @param array The array to combine
+     */
+    Concat(array: T[]): T[];
+    /**
+     * Combines two arrays but only applies values that are in both arrays
+     * @param array The array to combine
+     */
+    Intersect(array: T[]): T[];
+    /**
+     * Joins the entries by a given char
+     * @param character The character for joining
+     * @param selector A selector-function (or function-string) to select property for joining
+     */
+    Join(character: string, selector?: ((item: T) => any) | string): string;
+    /**
+     * Combines the entries using a custom function
+     * @param method A function (or function-string) for aggregation
+     * @param startVal The value to start aggregation
+     */
+    Aggregate(method: ((result: any, item: T) => any) | string, startVal?: any): string;
+    /**
+     * Reverses the array
+     */
+    Reverse(): T[];
+    /**
+     * Computes the average of the elements
+     * @param selector A selector-function (or function-string) to select property for average computing
+     * @param filter If set the function computes the average of elements that match the filter
+     */
+    Average(selector?: ((item: T) => any) | string, filter?: ((item: T) => boolean) | string): number;
+    /**
+     * Computes the sum of the elements
+     * @param selector A selector-function (or function-string) to select property for adding
+     * @param filter If set the function computes the sum of elements that match the filter
+     */
+    Sum(selector?: ((item: T) => any) | string, filter?: ((item: T) => boolean) | string): number;
+    /**
+     * Compares to sequences of objects
+     * @param array The array to compare
+     */
+    SequenceEqual(array: T[]): boolean;
+    /**
+     * Combines the entries of two arrays using a custom function
+     * @param array The array to combine
+     * @param result The function (or function-string) to combine elements
+     */
+    Zip<T, X>(array: X[], result: ((first: T, second: X) => any) | string): any[];
+    /**
+     * Combines two arrays without duplicates
+     * @param array The array to combine
+     */
+    Union(array: T[]): T[];
+    /**
+     * Converts the array to a dictionary
+     * @param keySelector The selector-function (or function-string) to select property for key
+     * @param valueSelector A selector-function (or function-string) to select property for value
+     */
+    ToDictionary(keySelector: ((item: T) => any) | string, valueSelector?: ((item: T) => any) | string): any;
+}
+declare namespace Linq4JS {
+    class OrderEntry {
+        Direction: OrderDirection;
+        ValueSelector: (item: any) => any;
+        constructor(_direction: OrderDirection, _valueSelector: (item: any) => any);
+    }
+    enum OrderDirection {
+        Ascending = 0,
+        Descending = 1,
+    }
+}
diff --git a/linq4js/linq4js-tests.ts b/linq4js/linq4js-tests.ts
new file mode 100644
index 0000000000..9e0bbe7be5
--- /dev/null
+++ b/linq4js/linq4js-tests.ts
@@ -0,0 +1,5 @@
+import "linq4js";
+
+let array: Array<string> = ["test", "test2", "test3", "test4", "test5"];
+
+array.Add("test6").Remove("test3").Insert("test3", 2).Distinct().OrderBy(x => x).OrderByDescending(x => x).Select(x => x.length).Average();
\ No newline at end of file
diff --git a/linq4js/tsconfig.json b/linq4js/tsconfig.json
new file mode 100644
index 0000000000..f053fa2e23
--- /dev/null
+++ b/linq4js/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "files": [
+        "index.d.ts",
+        "linq4js-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "noImplicitAny": true,
+        "noImplicitReturns": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "target": "es6",
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+		"lib":[
+			"es6"
+		],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/linq4js/tslint.json b/linq4js/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/linq4js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/localforage/index.d.ts b/localforage/index.d.ts
deleted file mode 100644
index d0194ec60f..0000000000
--- a/localforage/index.d.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-// Type definitions for Mozilla's localForage
-// Project: https://github.com/mozilla/localforage
-// Definitions by: yuichi david pichsenmeister <https://github.com/3x14159265>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface LocalForageOptions {
-    driver?: string | LocalForageDriver | LocalForageDriver[];
-
-    name?: string;
-
-    size?: number;
-
-    storeName?: string;
-
-    version?: number;
-
-    description?: string;
-}
-
-interface LocalForageDbMethods {
-    getItem<T>(key: string): Promise<T>;
-    getItem<T>(key: string, callback: (err: any, value: T) => void): void;
-
-    setItem<T>(key: string, value: T): Promise<T>;
-    setItem<T>(key: string, value: T, callback: (err: any, value: T) => void): void;
-
-    removeItem(key: string): Promise<void>;
-    removeItem(key: string, callback: (err: any) => void): void;
-
-    clear(): Promise<void>;
-    clear(callback: (err: any) => void): void;
-
-    length(): Promise<number>;
-    length(callback: (err: any, numberOfKeys: number) => void): void;
-
-    key(keyIndex: number): Promise<string>;
-    key(keyIndex: number, callback: (err: any, key: string) => void): void;
-
-    keys(): Promise<string[]>;
-    keys(callback: (err: any, keys: string[]) => void): void;
-
-    iterate(iteratee: (value: any, key: string, iterationNumber: number) => any): Promise<any>;
-    iterate(iteratee: (value: any, key: string, iterationNumber: number) => any,
-        callback: (err: any, result: any) => void): void;
-}
-
-interface LocalForageDriverSupportFunc {
-    (): Promise<boolean>;
-}
-
-interface LocalForageDriver extends LocalForageDbMethods {
-    _driver: string;
-
-    _initStorage(options: LocalForageOptions): void;
-
-    _support?: boolean | LocalForageDriverSupportFunc;
-}
-
-interface LocalForageSerializer {
-    serialize<T>(value: T | ArrayBuffer | Blob, callback: (value: string, error: any) => void): void;
-
-    deserialize<T>(value: string): T | ArrayBuffer | Blob;
-
-    stringToBuffer(serializedString: string): ArrayBuffer;
-
-    bufferToString(buffer: ArrayBuffer): string;
-}
-
-interface LocalForage extends LocalForageDbMethods {
-    LOCALSTORAGE: string;
-    WEBSQL: string;
-    INDEXEDDB: string;
-
-    /**
-     * Set and persist localForage options. This must be called before any other calls to localForage are made, but can be called after localForage is loaded.
-     * If you set any config values with this method they will persist after driver changes, so you can call config() then setDriver()
-     * @param {LocalForageOptions} options?
-     */
-    config(options: LocalForageOptions): boolean;
-
-    /**
-     * Create a new instance of localForage to point to a different store.
-     * All the configuration options used by config are supported.
-     * @param {LocalForageOptions} options
-     */
-    createInstance(options: LocalForageOptions): LocalForage;
-
-    driver(): string;
-    /**
-     * Force usage of a particular driver or drivers, if available.
-     * @param {string} driver
-     */
-    setDriver(driver: string | string[]): Promise<void>;
-    setDriver(driver: string | string[], callback: () => void, errorCallback: (error: any) => void): void;
-    defineDriver(driver: LocalForageDriver): Promise<void>;
-    defineDriver(driver: LocalForageDriver, callback: () => void, errorCallback: (error: any) => void): void;
-    /**
-     * Return a particular driver
-     * @param {string} driver
-     */
-    getDriver(driver: string): Promise<LocalForageDriver>;
-
-    getSerializer(): Promise<LocalForageSerializer>;
-    getSerializer(callback: (serializer: LocalForageSerializer) => void): void;
-
-    supports(driverName: string): boolean;
-
-    ready(callback: () => void): void;
-    ready(): Promise<void>;
-}
-
-declare module "localforage" {
-    let localforage: LocalForage;
-    export = localforage;
-}
diff --git a/localforage/localforage-tests.ts b/localforage/localforage-tests.ts
deleted file mode 100644
index e3edeba2d0..0000000000
--- a/localforage/localforage-tests.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-declare let localForage: LocalForage;
-
-namespace LocalForageTest {
-    localForage.clear((err: any) => {
-        let newError: any = err;
-    });
-
-    localForage.iterate((str: string, key: string, num: number) => {
-        let newStr: string = str;
-        let newKey: string = key;
-        let newNum: number = num;
-    });
-
-    localForage.length((err: any, num: number) => {
-        let newError: any = err;
-        let newNumber: number = num;
-    });
-
-    localForage.length().then((num: number) => {
-        var newNumber: number = num;
-    });
-
-    localForage.key(0, (err: any, value: string) => {
-        let newError: any = err;
-        let newValue: string = value;
-    });
-
-    localForage.keys((err: any, keys: Array<string>) => {
-        let newError: any = err;
-        let newArray: Array<string> = keys;
-    });
-
-    localForage.keys().then((keys: Array<string>) => {
-        var newArray: Array<string> = keys;
-    });
-
-    localForage.getItem("key",(err: any, str: string) => {
-        let newError: any = err;
-        let newStr: string = str
-    });
-
-    localForage.getItem<string>("key").then((str: string) => {
-        let newStr: string = str;
-    });
-  
-    localForage.setItem("key", "value",(err: any, str: string) => {
-        let newError: any = err;
-        let newStr: string = str
-    });
-
-    localForage.setItem("key", "value").then((str: string) => {
-        let newStr: string = str;
-    });
-  
-    localForage.removeItem("key",(err: any) => {
-        let newError: any = err;
-    });
-
-    localForage.removeItem("key").then(() => {
-    });
-    
-    localForage.getDriver("CustomDriver").then((result: LocalForageDriver) => {
-        var driver: LocalForageDriver = result;
-        // we need to use a variable for proper type guards before TS 2.0
-        var _support = driver._support;
-        if (typeof _support === "function") {
-            // _support = _support.bind(driver);
-            _support().then((result: boolean) => {
-                let doesSupport: boolean = result;
-            });
-        } else if (typeof _support === "boolean") {
-            let doesSupport: boolean = _support;
-        }
-    });
-
-    {
-        let config: boolean;
-
-        config = localForage.config({
-        name: "testyo",
-        driver: localForage.LOCALSTORAGE
-    });
-    }
-
-    {
-        let store: LocalForage;
-    
-        store = localForage.createInstance({
-        name: "da instance",
-        driver: localForage.LOCALSTORAGE
-    });
-    }
-
-    {
-        let testSerializer: LocalForageSerializer;
-
-        localForage.getSerializer()
-        .then((serializer: LocalForageSerializer) => {
-            testSerializer = serializer;
-        });
-
-        localForage.getSerializer((serializer: LocalForageSerializer) => {
-            testSerializer = serializer;
-        });
-    }
-
-    {
-        let store: LocalForage;
-
-        store.ready()
-        .then(() => {});
-
-        store.ready(() => {});
-    }
-}
\ No newline at end of file
diff --git a/ltx/ltx-tests.ts b/ltx/ltx-tests.ts
index a207efb4b7..9e924cbe60 100644
--- a/ltx/ltx-tests.ts
+++ b/ltx/ltx-tests.ts
@@ -2,13 +2,13 @@ import * as ltx from './index';
 
 ltx.parse('<document/>');
 
-let p = new ltx.Parser();
+const p = new ltx.Parser();
 
 p.on('tree', (ignored: any) => {});
 
 p.on('error', (ignored: any) => {});
 
-let el = new ltx.Element('root').c('children');
+const el = new ltx.Element('root').c('children');
 el.c('child', {age: 5}).t('Hello').up()
     .c('child', {age: 7}).t('Hello').up()
     .c('child', {age: 99}).t('Hello').up();
diff --git a/magicsuggest/magicsuggest-tests.ts b/magicsuggest/magicsuggest-tests.ts
index 46cb799d25..96a513a7b9 100644
--- a/magicsuggest/magicsuggest-tests.ts
+++ b/magicsuggest/magicsuggest-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 function basicTest() {
     $('#magicSuggest').magicSuggest();
 }
diff --git a/mailcheck/mailcheck-tests.ts b/mailcheck/mailcheck-tests.ts
index 07fc473893..971ecf8218 100644
--- a/mailcheck/mailcheck-tests.ts
+++ b/mailcheck/mailcheck-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 import MC = require('mailcheck');
 
 var domains = ['gmail.com', 'aol.com'];
diff --git a/main-bower-files/tsconfig.json b/main-bower-files/tsconfig.json
index fcdebedf3d..04b363ffc6 100644
--- a/main-bower-files/tsconfig.json
+++ b/main-bower-files/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/markitup/markitup-tests.ts b/markitup/markitup-tests.ts
index f8b12d3c00..b8a7675529 100644
--- a/markitup/markitup-tests.ts
+++ b/markitup/markitup-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 // https://github.com/markitup/1.x/blob/master/markitup/sets/default/set.js
 var mySettings = {
     onShiftEnter: {
diff --git a/maskedinput/maskedinput-tests.ts b/maskedinput/maskedinput-tests.ts
index 6d620ce1b9..99c1ecb8bb 100644
--- a/maskedinput/maskedinput-tests.ts
+++ b/maskedinput/maskedinput-tests.ts
@@ -1,10 +1,3 @@
-// Type definitions for Masked Input plugin for jQuery
-// Project: http://digitalbush.com/projects/masked-input-plugin
-// Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference types="jquery" />
-
 $("#test").mask("9:000");
 $("#test").mask("9:000", { numeric: true });
 
diff --git a/material-ui/index.d.ts b/material-ui/index.d.ts
index f2285f4809..05512e2e9d 100644
--- a/material-ui/index.d.ts
+++ b/material-ui/index.d.ts
@@ -689,6 +689,7 @@ declare namespace __MaterialUI {
         onMouseUp?: React.MouseEventHandler<{}>;
         onTouchEnd?: React.TouchEventHandler<{}>;
         onTouchStart?: React.TouchEventHandler<{}>;
+        overlayStyle?: React.CSSProperties;
         primary?: boolean;
         rippleStyle?: React.CSSProperties;
         secondary?: boolean;
@@ -1766,6 +1767,7 @@ declare namespace __MaterialUI {
         errorText?: React.ReactNode;
         floatingLabelFixed?: boolean;
         floatingLabelFocusStyle?: React.CSSProperties;
+        floatingLabelShrinkStyle?: React.CSSProperties;
         floatingLabelStyle?: React.CSSProperties;
         floatingLabelText?: React.ReactNode;
         fullWidth?: boolean;
@@ -1777,9 +1779,10 @@ declare namespace __MaterialUI {
         name?: string;
         onBlur?: React.FocusEventHandler<{}>;
         onChange?: (e: React.FormEvent<{}>, newValue: string) => void;
-        onEnterKeyDown?: React.KeyboardEventHandler<{}>;
         onFocus?: React.FocusEventHandler<{}>;
         onKeyDown?: React.KeyboardEventHandler<{}>;
+        onKeyUp?: React.KeyboardEventHandler<{}>;
+        onKeyPress?: React.KeyboardEventHandler<{}>;
         rows?: number,
         rowsMax?: number,
         style?: React.CSSProperties;
@@ -1790,6 +1793,7 @@ declare namespace __MaterialUI {
         underlineShow?: boolean;
         underlineStyle?: React.CSSProperties;
         value?: string | number;
+        autoFocus?: boolean;
     }
     export class TextField extends React.Component<TextFieldProps, {}> {
         blur(): void;
diff --git a/material-ui/material-ui-tests.tsx b/material-ui/material-ui-tests.tsx
index 06f75abe9a..0ea5a72352 100644
--- a/material-ui/material-ui-tests.tsx
+++ b/material-ui/material-ui-tests.tsx
@@ -1,8 +1,3 @@
-/// <reference types="react" />
-/// <reference types="react-dom" />
-/// <reference types="react-tap-event-plugin" />
-/// <reference types="material-ui" />
-
 import * as React from 'react';
 import {Component, PropTypes} from 'react';
 import * as ReactDOM from 'react-dom';
diff --git a/mcustomscrollbar/mcustomscrollbar-tests.ts b/mcustomscrollbar/mcustomscrollbar-tests.ts
index aecb236286..f00cd5a491 100644
--- a/mcustomscrollbar/mcustomscrollbar-tests.ts
+++ b/mcustomscrollbar/mcustomscrollbar-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 class SimpleTest {
     element: JQuery;
 
diff --git a/md5/md5-tests.ts b/md5/md5-tests.ts
index 427a93486a..924c9b8d91 100644
--- a/md5/md5-tests.ts
+++ b/md5/md5-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import fs = require("fs");
 import md5 = require("md5");
 /**
@@ -7,7 +5,7 @@ import md5 = require("md5");
  * md5(message)
  * message -- String or Buffer
  * returns String
- * 
+ *
  * Usage
  ****************************************************
  * var md5 = require('md5');                        *
@@ -15,10 +13,10 @@ import md5 = require("md5");
  ****************************************************
  * This will print the following
  * 78e731027d8fd50ed642340b7c9a63b3
- * 
+ *
  * It supports buffers, too
- **************************************************** 
- * var fs = require('fs');                          *    
+ ****************************************************
+ * var fs = require('fs');                          *
  * var md5 = require('md5');                        *
  *                                                  *
  * fs.readFile('example.txt', function(err, buf) {  *
diff --git a/mendixmodelsdk/index.d.ts b/mendixmodelsdk/index.d.ts
index 29192f4bc4..d75cdb97aa 100644
--- a/mendixmodelsdk/index.d.ts
+++ b/mendixmodelsdk/index.d.ts
@@ -207,8 +207,188 @@
    limitations under the License.
 */
 
+// Outdated mobservable typings.
+// TODO: Use the types bundled with mobservable. Or use mobx.
+
+interface _IMobservableStatic {
+    /**
+     * Turns an object, array or function into a reactive structure.
+     * @param value the value which should become observable.
+     */
+    makeReactive: IMakeReactive;
+
+    /**
+     * Extends an object with reactive capabilities.
+     * @param target the object to which reactive properties should be added
+     * @param properties the properties that should be added and made reactive
+     * @returns targer
+     */
+    extendReactive(target: Object, properties: Object):Object;
+
+    /**
+     * Returns true if the provided value is reactive.
+     * @param value object, function or array
+     * @param propertyName if propertyName is specified, checkes whether value.propertyName is reactive.
+     */
+    isReactive(value: any, propertyName?:string): boolean;
+
+    /**
+     * Can be used in combination with makeReactive / extendReactive.
+     * Enforces that a reference to 'value' is stored as property,
+     * but that 'value' itself is not turned into something reactive.
+     * Future assignments to the same property will inherit this behavior.
+     * @param value initial value of the reactive property that is being defined.
+     */
+    asReference<T>(value: any):{value:T};
+
+    /**
+     * ES6 / Typescript decorator which can to make class properties and getter functions reactive.
+     */
+    observable(target: Object, key: string):any; // decorator / annotation
+
+    /**
+     * Creates a reactive view and keeps it alive, so that the view is always
+     * updated if one of the dependencies changes, even when the view is not further used by something else.
+     * @param func The reactive view
+     * @param scope (optional)
+     * @returns disposer function, which can be used to stop the view from being updated in the future.
+     */
+    observe(func: Mobservable.Lambda, scope?: any): Mobservable.Lambda;
+
+    /**
+     * Deprecated, use mobservable.observe instead.
+     */
+    sideEffect(func: Mobservable.Lambda, scope?: any): Mobservable.Lambda;
+
+    /**
+     * Similar to 'observer', observes the given predicate until it returns true.
+     * Once it returns true, the 'effect' function is invoked an the observation is cancelled.
+     * @param predicate
+     * @param effect
+     * @param scope (optional)
+     * @returns disposer function to prematurely end the observer.
+     */
+    observeUntil(predicate: ()=>boolean, effect: Mobservable.Lambda, scope?: any): Mobservable.Lambda;
+
+    /**
+     * During a transaction no views are updated until the end of the transaction.
+     * The transaction will be run synchronously nonetheless.
+     * @param action a function that updates some reactive state
+     * @returns any value that was returned by the 'action' parameter.
+     */
+    transaction<T>(action: ()=>T): T;
+
+    /**
+     * Converts a reactive structure into a non-reactive structure.
+     * Basically a deep-clone.
+     */
+    toJSON<T>(value: T): T;
+
+    /**
+     * Sets the reporting level Defaults to 1. Use 0 for production or 2 for increased verbosity.
+     */
+    logLevel:  number;  // 0 = production, 1 = development, 2 = debugging
+
+    extras: {
+        getDependencyTree(thing:any, property?:string): Mobservable.IDependencyTree;
+
+        getObserverTree(thing:any, property?:string): Mobservable.IObserverTree;
+
+        trackTransitions(extensive?:boolean, onReport?:(lines:Mobservable.ITransitionEvent) => void) : Mobservable.Lambda;
+    }
+}
+
+interface IMakeReactive {
+    <T>(value: T[], opts?: Mobservable.IMakeReactiveOptions): Mobservable.IObservableArray<T>;
+    <T>(value: ()=>T, opts?: Mobservable.IMakeReactiveOptions): Mobservable.IObservableValue<T>;
+    <T extends string|number|boolean|Date|RegExp|Function|void>(value: T, opts?: Mobservable.IMakeReactiveOptions): Mobservable.IObservableValue<T>;
+    <T extends Object>(value: Object, opts?: Mobservable.IMakeReactiveOptions): T;
+}
+
+interface IMobservableStatic extends _IMobservableStatic, IMakeReactive {
+}
+
+declare namespace Mobservable {
+    interface IMakeReactiveOptions {
+        as?:  string /* "auto" | "reference" | TODO:  see #8 "structure" */
+        scope?:  Object,
+        context?: Object,
+        recurse?:  boolean;
+        name?: string;
+        // protected:  boolean TODO:  see #9
+    }
+
+    export interface IContextInfoStruct {
+        object: Object;
+        name: string;
+    }
+
+    export type IContextInfo = IContextInfoStruct | string;
+
+    interface Lambda {
+        (): void;
+        name?: string;
+    }
+
+    interface IObservable {
+        observe(callback: (...args: any[])=>void, fireImmediately?: boolean): Lambda;
+    }
+
+    interface IObservableValue<T> extends IObservable {
+        (): T;
+        (value: T):void;
+        observe(callback: (newValue: T, oldValue: T)=>void, fireImmediately?: boolean): Lambda;
+    }
+
+    interface IObservableArray<T> extends IObservable, Array<T> {
+        spliceWithArray(index: number, deleteCount?: number, newItems?: T[]): T[];
+        observe(listener: (changeData: IArrayChange<T>|IArraySplice<T>)=>void, fireImmediately?: boolean): Lambda;
+        clear(): T[];
+        replace(newItems: T[]): T[];
+        find(predicate: (item: T,index: number,array: IObservableArray<T>)=>boolean,thisArg?: any,fromIndex?: number): T;
+        remove(value: T): boolean;
+    }
+
+    interface IArrayChange<T> {
+        type:  string; // Always:  'update'
+        object:  IObservableArray<T>;
+        index:  number;
+        oldValue:  T;
+    }
+
+    interface IArraySplice<T> {
+        type:  string; // Always:  'splice'
+        object:  IObservableArray<T>;
+        index:  number;
+        removed:  T[];
+        addedCount:  number;
+    }
+
+    interface IDependencyTree {
+        id: number;
+        name: string;
+        context: any;
+        dependencies?: IDependencyTree[];
+    }
+
+    interface IObserverTree {
+        id: number;
+        name: string;
+        context: any;
+        observers?: IObserverTree[];
+        listeners?: number; // amount of functions manually attached using an .observe method
+    }
+
+    interface ITransitionEvent {
+        id: number;
+        name: string;
+        context: Object;
+        state: string;
+        changed: boolean;
+        newValue: string;
+    }
+}
 
-/// <reference types="mobservable" />
 declare module "mendixmodelsdk" {
     namespace sdk {
         namespace internal {
diff --git a/merge2/tsconfig.json b/merge2/tsconfig.json
index 4fd4d60c3f..64cf45c2a6 100644
--- a/merge2/tsconfig.json
+++ b/merge2/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/meteor-roles/meteor-roles-tests.ts b/meteor-roles/meteor-roles-tests.ts
index 8f73f13208..50552c82ff 100644
--- a/meteor-roles/meteor-roles-tests.ts
+++ b/meteor-roles/meteor-roles-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="meteor" />
-
-
 import * as _ from 'underscore';
 
 /**
diff --git a/meteor/README.md b/meteor/README.md
index f560dd005e..374a6213e7 100644
--- a/meteor/README.md
+++ b/meteor/README.md
@@ -2,7 +2,7 @@
 
 ## Description
 
-These are the definitions for version 1.4 of Meteor.  These definitions were generated from the from the same [Meteor data.js file] (https://github.com/meteor/meteor/blob/devel/docs/client/data.js) that is used to generate the official [Meteor docs] (http://docs.meteor.com/).  The code that generates these definitions can be found [here](https://github.com/meteor-typescript/meteor-typescript-libs/).
+These are the definitions for version 1.4 of Meteor.  These definitions were generated from the same [Meteor data.js file](https://github.com/meteor/meteor/blob/devel/docs/client/data.js) that is used to generate the official [Meteor docs](http://docs.meteor.com/).  The code that generates these definitions can be found [here](https://github.com/meteor-typescript/meteor-typescript-libs/).
 
 
 ## Upcoming Meteor `typescript` package
@@ -33,19 +33,21 @@ Compilation will be much faster and code will be cleaner - it's always better to
 
 With the exception of the **body** and **head** templates, Meteor's Template dot notation cannot be used (ie. *Template.mytemplate*). Thanks to Typescript static typing checks, you will need to use the *bracket notation* to access the Template.
 
-    Template['myTemplateName'].helpers({
-      foo: function () {
-        return Session.get("foo");
-      }
-    });
-
-    Template['myTemplateName'].onRendered(function ( ) { ... });
+```js
+Template['myTemplateName'].helpers({
+  foo: function () {
+    return Session.get("foo");
+  }
+});
 
+Template['myTemplateName'].onRendered(function ( ) { ... });
+```
 
 The same is true for `Meteor.settings`:
 
-    Meteor.settings.public['<some config>']
-
+```ts
+Meteor.settings.public['<some config>']
+```
 
 ### Form fields
 
@@ -55,11 +57,11 @@ Form fields typically need to be cast to `<HTMLInputElement>`. For instance to r
 ### Global variables
 
 Preface any global variable declarations with a TypeScript `declare var` statement (or place the statement in a definition file):
-
-    declare var NavbarHelpers;
-    NavbarHelpers = {};
-    NavbarHelpers.someMethod = function() {...}
-
+```ts
+declare var NavbarHelpers;
+NavbarHelpers = {};
+NavbarHelpers.someMethod = function() {...}
+```
 
 ### Collections
 
@@ -67,18 +69,21 @@ The majority of extra work required to use TypeScript with Meteor is creating an
 
 To define collections, you will need to create an interface representing the collection and then declare a Collection type variable with that interface type (as a generic):
 
-    interface JobDAO {
-      _id?: string;
-      name: string;
-      status?: string;
-      queuedAt?: string;
-    }
-
-    declare var Jobs: Mongo.Collection<JobDAO>;
-    Jobs = new Mongo.Collection<JobDAO>('jobs');
+```js
+interface JobDAO {
+  _id?: string;
+  name: string;
+  status?: string;
+  queuedAt?: string;
+}
 
+declare var Jobs: Mongo.Collection<JobDAO>;
+Jobs = new Mongo.Collection<JobDAO>('jobs');
+```
 
 Finally, any TypeScript file using collections will need to contain a reference at the top pointing to the collection definitions:
 
-    /// <reference path=".typescript/package_defs/meteor.d.ts"/>
-    /// <reference path=".typescript/custom_defs/collections.ts"/>
+```ts
+/// <reference path=".typescript/package_defs/meteor.d.ts"/>
+/// <reference path=".typescript/custom_defs/collections.ts"/>
+```
diff --git a/metismenu/metismenu-tests.ts b/metismenu/metismenu-tests.ts
index eb17270021..64aa809cf7 100644
--- a/metismenu/metismenu-tests.ts
+++ b/metismenu/metismenu-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 $('#menu').metisMenu();
 
 $('.metismenu').metisMenu({toggle: false});
diff --git a/microsoft-sdk-soap/index.d.ts b/microsoft-sdk-soap/index.d.ts
index 9effce35ad..de1c43db12 100644
--- a/microsoft-sdk-soap/index.d.ts
+++ b/microsoft-sdk-soap/index.d.ts
@@ -3,2968 +3,2869 @@
 // Definitions by: Markus Mauch <https://github.com/markusmauch/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="q"/>
-
-declare namespace Sdk
-{
-    interface IEntityView
-    {
-        attributes: AttributeCollection;
-        entityState: EntityState;
-        id: string;
-        logicalName: string;
-        relatedEntities: RelatedEntityCollection;
-    }
-
-    interface IEntityCollectionView
-    {
-        entityName: string;
-        entities: Array<IEntityView>;
-        minActiveRowVersion: string;
-        moreRecords: boolean;
-        pagingCookie: string;
-        totalRecordCount: number;
-        totalRecordCountLimitExceeded: boolean;
-    }
-
-    interface IEntityReferenceView
-    {
-        Id: string;
-        Type: string;
-        Name: string;
-    }
-
-    interface IEntityReferenceCollectionView extends Array<IEntityReferenceView>
-    {
-    }
-
-    class Q
-    {
-        /**
-         * Creates a link between records.
-         * @param entityName The logical name of the entity that is specified in the entityId parameter.
-         * @param entityId The ID of the record to which the related records are associated.
-         * @param relationship The name of the relationship to be used to create the link.
-         * @param relatedEntities A collection of Sdk.EntityReference objects to be associated.
-         */
-        static associate( entityName: string, entityId: string, relationship: string, relatedEntities: Sdk.Collection<Sdk.EntityReference> ): Q.Promise<void>;
-        /**
-         * Creates an entity record and returns a string representation of the GUID value that is the Id of the created entity.
-         * @param entity An entity instance.
-         */
-        static create( entity: Sdk.Entity ): Q.Promise<string>;
-
-        /**
-         * Deletes an entity record
-         * @param entityName The LogicalName of the entity to delete.
-         * @param id An ID of the record to delete.
-         */
-        static del( entityName: string, id: string ): Q.Promise<void>;
-
-        /**
-         * Removes a link between records.
-         * @param entityName The logical name of the entity that is specified in the entityId parameter.
-         * @param entityId The ID of the record to which the related records are disassociated.
-         * @param relationship The name of the relationship to be used to remove the link.
-         * @param relatedEntities A collection of Sdk.EntityReference objects to be disassociated.
-         */
-        static disassociate( entityName: string, entityId: string, relationship: string, relatedEntities: Sdk.Collection<Sdk.EntityReference> ): Q.Promise<void>;
-
-        /**
-         * Executes a SOAP Request using the SOAPAction Execute.
-         * @param request A request object.
-         */
-        static execute( request: Sdk.OrganizationRequest ): Q.Promise<OrganizationResponse>;
-
-        /**
-         * Retrieves an entity instance.
-         * @param entityName The logical name of the entity to retrieve.
-         * @param id The id of the entity to retrieve.
-         * @param columnSet The columns of the entities to retrieve.
-         */
-        static retrieve( entityName: string, id: string, columnSet: Sdk.ColumnSet ): Q.Promise<Entity>;
-
-        /**
-         * Retrieves the results of a query
-         * @param query An Sdk.Query.QueryByAttribute query.
-         */
-        static retrieveMultiple( query: Sdk.Query.QueryByAttribute ): Q.Promise<Sdk.EntityCollection>;
-
-        /**
-         * Retrieves the results of a query
-         * @param query An Sdk.Query.QueryExpression query.
-         */
-        static retrieveMultiple( query: Sdk.Query.QueryExpression ): Q.Promise<Sdk.EntityCollection>;
-
-        /**
-         * Retrieves the results of a query
-         * @param query An Sdk.Query.FetchExpression query.
-         */
-        static retrieveMultiple( query: Sdk.Query.FetchExpression ): Q.Promise<Sdk.EntityCollection>;
-
-        /**
-         * Updates an entity instance.
-         * @param entity An entity instance to update.
-         */
-        static update( entity: Entity ): Q.Promise<boolean>;
-    }
-
-    class ColumnSet
-    {
-        /**
-         * Specifies the attributes for which non- null values are returned from a query.
-         * @param columns Comma separated string values for attribute logical names.
-         */
-        constructor( ...columns: string[] );
-
-        /**
-         * Specifies the attributes for which non- null values are returned from a query.
-         * @param columns An array of string values.
-         */
-        constructor( columns: string[] );
-
-        /**
-         * Specifies the attributes for which non- null values are returned from a query.
-         * @param allColumns If Boolean true value is passed as the first parameter all columns will be included. (Not recommended for production code).
-         */
-        constructor( allColumns: boolean );
-
-        /**
-         * Gets the collection of column names.
-         * @returns The collection of column names.
-         */
-        getColumns(): Sdk.Collection<string>;
-
-        /**
-         * Adds a column to the collection.
-         * @param column The logical name of the attribute to add.
-         */
-        addColumn( column: string ): void;
-
-        /**
-         * Adds a string array of column names.
-         * @param columns A string array of column names.
-         */
-        addColumns( columns: Array<string> ): void;
-
-        /**
-         * Sets the AllColumns property.
-         * @params allColumns A boolean value.
-         */
-        setAllColumns( allColumns: boolean ): void;
-
-        /**
-         * Whether all columns will be returned.
-         */
-        getAllColumns(): boolean;
-
-        /**
-         * Gets the number of columns.
-         */
-        getCount(): number;
-
-
-        /// prototype methods
-
-        /**
-         * Removes a column from the ColumnSet.
-         * @param columnName The logical name of an attribute to be removed from the ColumnSet.
-         * @param errorIfNotFound Whether to throw an error when the column to remove is not found. The default is false
-         */
-        removeColumn( columnName: string, errorIfNotFound?: boolean ): void;
-
-        /**
-         * The XML node with "<d:columnSet>" as the root element.
-         */
-        toXml(): string;
-
-        /**
-         * XML nodes for columnSet properties.
-         */
-        toValueXml(): string;
-    }
-
-    class ValueType
-    {
-    }
-
-    class Collection<T>
-    {
-        /**
-         * A Collection for a specified type.
-         * @param type The function that specifies the type.
-         * @param items An array of items to add to the collection.
-         */
-        constructor( type: T, items?: Array<T> );
-
-        /**
-         * Gets the type defined for the collection.
-         */
-        getType(): T;
-
-        /**
-         * Adds an item to the collection.
-         * @param item An item to add to the collection.
-         */
-        add( item: T ): void;
-
-        /**
-         * Adds an array of objects to the collection.
-         * @param items An array of items to add to the collection.
-         */
-        addRange( items: any[] ): void;
-
-        /**
-         * Removes all items from the collection.
-         */
-        clear(): void;
-
-        /**
-         * Returns whether an object exists within the collection.
-         * @param item The item to search in the collection.
-         */
-        contains( item: T ): boolean;
-
-        /**
-         * Returns whether an object exists within the collection.
-         * @param predicate A comparer function which is invoked for each item of the collection.
-         */
-        contains( predicate: ( item: T ) => boolean ): boolean;
-
-        /**
-         * Returns an Sdk.Collection that contains all the items of this collection that satisfy the specified predicate function.
-         * @param predicate A predicate function that takes a collection item as argument and returns a boolean.
-         */
-        select( predicate: ( item: T ) => boolean ): Collection<T>;
-
-        /**
-         * Applies the action contained within a delegate function.
-         * @param fn Delegate function with parameters for item and index.
-         */
-        forEach( fn: ( item: T, index: number ) => any ): void;
-
-        /**
-         * Gets the item in the collection at the specified index.
-         * @param index The index of the item to return.
-         */
-        getByIndex( index: number ): T;
-
-        /**
-         * Removes an item from the collection.
-         * @param item A reference to the item to be removed.
-         */
-        remove( item: T ): void;
-
-        /**
-         * Gets a copy of the array of items in the collection.
-         */
-        toArray(): Array<T>;
-
-        /**
-         * Returns the number of items in the collection.
-         */
-        getCount(): number;
-    }
-
-    class EntityCollection
-    {
-        /**
-         * Contains a collection of entity instances.
-         * @param entities Initializes a new instance of the EntityCollection class setting the Sdk.Collection of Sdk.Entity objects.
-         */
-        constructor( entities: Sdk.Collection<Sdk.Entity> );
-
-        /**
-         * Adds an entity to the collection.
-         * @param entity
-         */
-        addEntity( entity: Sdk.Entity ): void;
-
-        /**
-         * Gets the collection of entities.
-         */
-        getEntities(): Sdk.Collection<Sdk.Entity>;
-
-        /**
-         * Gets an entity in the collection.
-         * @param index The index of the entity in the collection.
-         */
-        getEntity( index: number ): Sdk.Entity;
-
-        /**
-         * Gets an entity in the collection.
-         * @param id The id of the entity in the collection.
-         */
-        getEntity( id: Sdk.Guid ): Sdk.Entity;
-
-        /**
-         * Sets an item in the collection.
-         * @param index The index of the entity in the collection.
-         * @param value The Sdk.Entity value to set.
-         */
-        setEntity( index: number, value: Sdk.Entity ): void;
-
-        /**
-         * Sets an item in the collection.
-         * @param id The Sdk.Guid id of the entity in the collection.
-         * @param value The Sdk.Entity value to set.
-         */
-        setEntity( id: Sdk.Guid, value: Sdk.Entity ): void;
-
-        /**
-         * Gets the logical name of the entity.
-         */
-        getEntityName(): string;
-
-        /**
-         * Sets the logical name of the entity.
-         * @param name The logical name of the entity.
-         */
-        setEntityName( name: string ): void;
-
-        /**
-         * Gets the lowest active row version value.
-         */
-        getMinActiveRowVersion(): string;
-
-        /**
-         * Sets the lowest active row version value.
-         * @param minActiveRowVersion The lowest active row version value.
-         */
-        setMinActiveRowVersion( minActiveRowVersion: string ): void;
-
-        /**
-         * Gets whether there are more records available.
-         */
-        getMoreRecords(): boolean;
-
-        /**
-         * Sets whether there are more records available.
-         * @param moreRecords Whether there are more records available.
-         */
-        setMoreRecords( moreRecords: boolean ): void;
-
-        /**
-         * Gets the current paging information.
-         */
-        getPagingCookie(): string;
-
-        /**
-         * Sets the current paging information.
-         * @param pagingCookie The current paging information.
-         */
-        setPagingCookie( pagingCookie: string ): void;
-
-        /**
-         * Gets the total number of records in the collection if ReturnTotalRecordCount was true when the query was executed.
-         */
-        getTotalRecordCount(): number;
-
-        /**
-         * Sets the total number of records in the collection if ReturnTotalRecordCount was true when the query was executed.
-         * @param totalRecordCount The total number of records in the collection if ReturnTotalRecordCount was true when the query was executed.
-         */
-        setTotalRecordCount( totalRecordCount: number ): void;
-
-        /**
-         * Gets whether the results of the query exceeds the total record count.
-         */
-        getTotalRecordCountLimitExceeded(): boolean;
-
-        /**
-         * Sets whether the results of the query exceeds the total record count.
-         * @param totalRecordCountLimitExceeded Whether the results of the query exceeds the total record count.
-         */
-        setTotalRecordCountLimitExceeded( totalRecordCountLimitExceeded: boolean ): void;
-
-        /**
-         * XML definition of an the child nodes of an entity.
-         */
-        toValueXml(): string;
-
-        /**
-         * Returns a view of the entity collection
-         */
-        view(): IEntityCollectionView;
-    }
-
-    class EntityReferenceCollection
-    {
-        /**
-         * Contains a collection of EntityReference instances.
-         * @param entityReferences Initializes a new instance of the EntityReferenceCollection class setting the Sdk.Collection of Sdk.EntityReference objects.
-         */
-        constructor( entityReferences?: Sdk.Collection<EntityReference> );
-
-        /**
-         * Gets the collection of entity references.
-         */
-        getEntityReferences(): Sdk.Collection<EntityReference>;
-
-        /**
-         * Sets the collection of entity references.
-         * @param entityReferences The entity references
-         */
-        setEntityReferences( entityReferences: Sdk.Collection<EntityReference> ): void;
-
-
-        /// prototype methods
-
-        /**
-         * Removes an entity reference to the collection.
-         * @param entityReference The entity reference to remove.
-         */
-        remove( entityReference: Sdk.EntityReference ): void;
-
-        /**
-         * Returns a view of the data in an entity reference collection instance.
-         */
-        view(): IEntityReferenceCollectionView;
-
-        /**
-         * Returns the values of serialized entity reference collection as XML nodes.
-         */
-        toValueXml(): string;
-    }
-
-    class RelatedEntityCollection extends EntityCollection
-    {
-    }
-
-    class AttributeCollection extends Collection<AttributeBase>
-    {
-        constructor();
-
-        /**
-         * Adds an attribute to the Attribute Collection.
-         * @param attribute The attribute to add.
-         * @param isChanged Override the the attribute IsChanged value.
-         */
-        add( attribute: AttributeBase, isChanged?: boolean ): void;
-
-        /**
-         * Gets the attributes in the collection.
-          */
-        getAttributes(): Collection<AttributeBase>;
-
-
-        /// prototype methods
-
-        /**
-         * Allows for a delegate function to be applied to each attribute in the collection.
-         * @param fm The function to be applied. Function should have parameters for the attribute and the iterator i.e.: '(att,i)'
-         */
-        forEach( fn: ( attribute: AttributeBase, index: number ) => any ): void;
-
-        /**
-         * Returns all attributes in the collection.
-         */
-        get(): Sdk.Collection<AttributeBase>;
-
-        /**
-         * Returns the attribute with matching name.
-         * @param attribuetName
-         */
-        get( attribuetName: string ): AttributeBase;
-
-        /**
-         * Returns the attribute with matching index.
-         * @param attribuetName
-         */
-        get( index: number ): AttributeBase;
-
-        /**
-         * Gets an attribute at a given index.
-         * @param index The index.
-         */
-        getAttributeByIndex( index: number ): AttributeBase;
-
-        /**
-         * Gets an attribute with a given name.
-         * @param name The Logical name of the attribute.
-         */
-        getAttributeByName( name: string ): AttributeBase;
-
-        /**
-         * Gets an array of the names of attributes in a collection.
-         */
-        getNames(): Array<string>;
-        /**
-         * The XML for an attribute collection.
-         */
-        toXml( action: string ): string;
-    }
-
-    class FormattedValueCollection
-    {
-    }
-
-    class RelatedEntitiesCollection
-    {
-    }
-
-    class AttributeBase
-    {
-        /**
-         * Gets whether the value of the attribute has changed.
-         */
-        getIsChanged(): boolean;
-
-        /**
-         * Gets the logical name of the attribute.
-         */
-        getName(): string;
-
-        /**
-         * Gets the value type of the attribute.
-         */
-        getType(): Sdk.ValueType;
-
-        /**
-         * Gets the value of the attribute.
-         * The type of value depends on the type of attribute.
-         */
-        getValue(): any;
-
-        /**
-         * Whether the value of the attribute is set.
-         */
-        isValueSet(): boolean;
-
-        /**
-         * Sets whether the value of the attribute has changed.
-         * @param isChanged Whether the value of the attribute has changed.
-         */
-        setIsChanged( isChanged: boolean ): void;
-
-        /**
-         * Sets the name of the attribute
-         * @param name The name of the attribute.
-         */
-        setName( name: string ): void;
-
-        /**
-         * For internal use only.
-         * @param type The type of the attribute.
-         */
-        setType( type: Sdk.ValueType ): void;
-
-        /**
-         * Sets the general value of the attribute
-         * @param name The value of the attribute.
-         */
-        setValue( value: any ): void;
-
-        /// prototype methods
-        /**
-         * XML node for Attribute.
-         */
-        toXml( action: string ): string;
-    }
-
-    class Boolean extends AttributeBase
-    {
-        /**
-         * A Boolean Attribute.
-         * @param name The logical name of the attribute .
-         * @param value The value of the managed property.
-         */
-        constructor( name: string, value?: boolean )
-
-        /**
-         * Gets the value of a Boolean attribute.
-         */
-        getValue(): boolean;
-
-        /**
-         * Sets the value of a Boolean attribute.
-         * @param value
-         */
-        setValue( value: boolean ): void;
-    }
-
-    class DateTime extends AttributeBase
-    {
-        /**
-         * A DateTime Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: Date );
-
-        /**
-         * Gets the value of a DateTime attribute.
-         */
-        getValue(): Date;
-
-        /**
-         * Sets the value of a DateTime attribute.
-         * @param value The value to set.
-         */
-        setValue( value: Date ): void;
-    }
-
-    class Decimal extends AttributeBase
-    {
-        /**
-         * A Decimal Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: number );
-
-        /**
-         * Gets the value of a Decimal attribute.
-         */
-        getValue(): number;
-
-        /**
-         * Sets the value of a Decimal attribute.
-         * @param value The value to set.
-         */
-        setValue( value: number ): void;
-    }
-
-    class Double
-    {
-        /**
-         * A Double Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: number );
-
-        /**
-         * Gets the value of a Double attribute.
-         */
-        getValue(): number;
-
-        /**
-         * Sets the value of a Double attribute.
-         * @param value The value to set.
-         */
-        setValue( value: number ): void;
-    }
-
-    class Guid extends AttributeBase
-    {
-        /**
-         * A Guid Attribute.
-         * @param name The logical name of the attribute.
-         * @param value" The value of the attribute
-         */
-        constructor( name: string, value?: string );
-
-        /**
-         * Gets the value of a Guid attribute.
-         */
-        getValue(): string;
-
-        /**
-         * Sets the value of a Guid attribute.
-         * @param value The value to set.
-         */
-        setValue( value: string ): void;
-    }
-
-    class Int extends AttributeBase
-    {
-        /**
-         * An Integer Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: number );
-
-        /**
-         * Gets the value of an Integer attribute.
-         */
-        getValue(): number;
-
-        /**
-         * Sets the value of an Integer attribute.
-         * @param value The value to set.
-         */
-        setValue( value: number ): void;
-    }
-
-    class Long extends AttributeBase
-    {
-        /**
-         * A Long Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: number );
-
-        /**
-         * Gets the value of a Long attribute.
-         */
-        getValue(): number;
-
-        /**
-         * Sets the value of a Long attribute.
-         * @param value The value to set.
-         */
-        setValue( value: number ): void;
-    }
-
-    class Lookup extends AttributeBase
-    {
-        /**
-         * A Lookup Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: EntityReference );
-
-        /**
-         * Gets the value of a Lookup attribute.
-         */
-        getValue(): EntityReference;
-
-        /**
-         * Sets the value of a Lookup attribute.
-         * @param value The value to set.
-         */
-        setValue( value: EntityReference ): void;
-    }
-
-    class Money extends AttributeBase
-    {
-        /**
-         * A Money Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: number );
-
-        /**
-         * Gets the value of a Money attribute.
-         */
-        getValue(): number;
-
-        /**
-         * Sets the value of a Money attribute.
-         * @param value The value to set.
-         */
-        setValue( value: number ): void;
-    }
-
-    class OptionSet extends AttributeBase
-    {
-        /**
-         * An OptionSet Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: number );
-
-        /**
-         * Gets the value of a OptionSet attribute.
-         */
-        getValue(): number;
-
-        /**
-         * Sets the value of an OptionSet attribute.
-         * @param value The value to set.
-         */
-        setValue( value: number ): void;
-    }
-
-    class PartyList extends AttributeBase
-    {
-        /**
-         * A PartyList Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: EntityCollection );
-
-        /**
-         * Gets the value of a PartyList attribute.
-         */
-        getValue(): EntityCollection;
-
-        /**
-         * Sets the value of a PartyList attribute.
-         * @param value The value to set.
-         */
-        setValue( value: EntityCollection ): void;
-    }
-
-    class String extends AttributeBase
-    {
-        /**
-         * A String Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: string );
-
-        /**
-         * Gets the value of a String attribute.
-         */
-        getValue(): string;
-
-        /**
-         * Sets the value of a String attribute.
-         * @param value The value to set.
-         */
-        setValue( value: string ): void;
-    }
-
-    class EntityState
-    {
-    }
-
-    class Entity
-    {
-        /**
-         * Represents an instance of an entity (a record).
-         * @param type The logical name of the entity.
-         */
-        constructor( type: string );
-
-        /**
-         * Gets the collection of attributes for the entity.
-         */
-        getAttributes(): Sdk.AttributeCollection;
-
-        /**
-         * Gets the collection of attributes for the entity.
-         * @param attributeName The attribute with matching name is returned.
-         */
-        getAttributes( attributeName: string ): Sdk.AttributeBase;
-
-        /**
-         * Gets the collection of attributes for the entity.
-         * @param index The attribute with matching index is returned.
-         */
-        getAttributes( index: number ): Sdk.AttributeBase;
-
-        /**
-         * Checks whether the entity has an attribute that satisfies the specified predicate.
-         * @param A comparer function that takes an Sdk.AttributeBase as argument and returns a boolean.
-         */
-        containsAttribute( predicate: ( attribute: Sdk.AttributeBase ) => boolean ): boolean;
-
-        /**
-         * Checks whether the entity has an attribute with the specified name.
-         * @param The name of the attribute.
-         */
-        containsAttribute( name: string ): boolean;
-
-        /**
-         * Sets the collection of attributes for the entity.
-         * @param attributes The collection of attributes for the entity.
-         */
-        setAttributes( attributes: Sdk.AttributeCollection ): void;
-
-        /**
-         * Gets the state of the entity.
-         */
-        getEntityState(): Sdk.EntityState;
-
-        /**
-         * Sets the state of the entity.
-         * @param state The state of the entity.
-         */
-        setEntityState( state: Sdk.EntityState ): void;
-
-        /**
-         * Gets the collection of formatted values for the entity attributes.
-         */
-        getFormattedValues(): Sdk.FormattedValueCollection;
-
-        /**
-         * Sets the collection of formatted values for the entity attributes.
-         * @param values" The collection of formatted values for the entity attributes.
-         */
-        setFormattedValues( values: Sdk.FormattedValueCollection ): void;
-
-        /**
-         * Gets the Id of the record represented by this entity instance.
-         */
-        getId(): string;
-
-        /**
-         * Sets the Id of the record represented by this entity instance.
-         * @param id The Id of the record represented by this entity instance.
-         * @param override Allow setting the Id property, for example when creating a new record from an existing one.
-         */
-        setId( id: string, override?: boolean ): void;
-
-        /**
-         * Gets the logical name of the entity.
-         */
-        getType(): string;
-
-        /**
-         * Sets the logical name of the entity.
-         * @param type The logical name of the entity.
-         */
-        setType( type: string ): void;
-
-        /**
-         * Gets a collection of related entities.
-         */
-        getRelatedEntities(): Sdk.RelatedEntitiesCollection;
-
-        /**
-         * Sets a collection of related entities.
-         * @param relatedEntities A collection of related entities.
-         */
-        setRelatedEntities( relatedEntities: Sdk.RelatedEntitiesCollection ): void;
-
-        /**
-         * Adds an attribute with an optional value to a newly instantiated Sdk.Entity
-         * @param attribute The attribute to add
-         * @param isChanged Whether the attribute should be considered changed, the default is true.
-         */
-        addAttribute( attribute: Sdk.AttributeBase, isChanged?: boolean ): void;
-
-        /**
-         * Adds an entity to the related entities.
-         * @param relationshipSchemaName The relationship SchemaName.
-         * @param entity The entity to add.
-         */
-        addRelatedEntity( relationshipSchemaName: string, entity: Sdk.Entity ): void;
-
-        /**
-         * Gets the value to indicate whether data for the entity has changed.
-         */
-        getIsChanged(): boolean;
-
-        /**
-         * Sets the value to indicate whether data for the entity has changed.
-         * @param isChanged The value to indicate whether data for the entity has changed.
-         */
-        setIsChanged( isChanged: boolean ): void;
-
-        /**
-         * Gets the value of the specified attribute.
-         * @param logicalName The logical name of the attribute.
-         */
-        getValue( logicalName: string ): any;
-
-        /**
-         * Generates properties for the entity based on metadata.
-         */
-        initializeSubClass( metadata: Sdk.Mdq.IEntityMetadata ): void;
-
-        /**
-         * Sets the value of the specified attribute.
-         * @param logicalName The logical name of the attribute.
-         * @param value The value for the attribute. Simple JavaScript types may be used for most attribute types. Sdk.EntityReference, Sdk.EntityCollection, and Sdk.BooleanManagedPropertyValue cannot use simple JavaScript types.
-         */
-        setValue( logicalName: string, value: Object ): void;
-
-        /**
-         * Generates an entity reference.
-         */
-        toEntityReference(): Sdk.EntityReference;
-
-        /**
-         * Overrides the default toString method.
-         */
-        toString(): string;
-
-        /**
-         * XML definition of an the child nodes of an entity.
-         * @param action
-         */
-        toValueXml( action: string ): string;
-
-        /**
-         * XML definition of an entity where the root node is <entity>.
-         */
-        toXml( action: string ): string;
-
-        /**
-         * Returns a view of the data in an entity instance
-         */
-        view(): IEntityView;
-    }
-
-    class EntityReference
-    {
-        /**
-         * Identifies a record.
-         * @param logicalName The logical name of the entity.
-         * @param id The id of the record.
-         * @param name The value of the primary attribute of the entity instance. This property can contain a value or null. This property is not automatically populated unless the EntityReference object has been retrieved from the server.
-         */
-        constructor( logicalName: string, id: string, name?: string );
-
-        /**
-         * Gets the logicalName representing the type of referenced entity.
-         */
-        getType(): string;
-
-        /**
-         * Gets the Id value of the referenced entity.
-         */
-        getId(): string;
-
-        /**
-         * Gets the primary attribute value of the referenced entity.
-         */
-        getName(): string;
-
-        /**
-         * Sets the logicalName representing the type of referenced entity.
-         * @param type The logicalName representing the type of referenced entity.
-         */
-        setType( type: string ): void;
-
-        /**
-         * Sets the Id value of the entity.
-         * @param id The Id value of the entity.
-         */
-        setId( id: string ): void;
-
-        /**
-         * Sets the primary attribute value of the referenced entity.
-         * @param name The primary attribute value of the referenced entity.
-         */
-        setName( name: string ): void;
-
-
-        /// prototype methods
-
-        /**
-         * Returns a serialized entity reference where the root element is <a:EntityReference>.
-         */
-        toXml(): string;
-
-        /**
-         * Returns the values of serialized entity reference as XML nodes.
-         */
-        toValueXml(): string;
-
-        /**
-         * Returns a view of the data in an EntityReference
-         */
-        view(): IEntityReferenceView;
-    }
-
-    class OrganizationRequest
-    {
-        /**
-         * Sets the request XML.
-         * @param xml The request XML.
-         */
-        setRequestXml( xml: string ): void;
-
-        /**
-         * Gets the request XML.
-         */
-        getRequestXml(): string;
-
-        /**
-         * Sets the response type.
-         * @param type A class that inherits from Sdk.OrganizationResponse.
-         */
-        setResponseType( type: OrganizationResponse ): void;
-
-        /**
-         * Gets the response type.
-         */
-        getResponseType(): OrganizationResponse;
-    }
-
-    class OrganizationResponse
-    {
-    }
-
-    /**
-     * Contains the data that is needed to convert a query in FetchXML to a QueryExpression.
-     * @param fetchXml Sets the query to convert.
-     */
-    class FetchXmlToQueryExpressionRequest extends Sdk.OrganizationRequest
-    {
-        constructor( fetchXml: string );
-
-        /**
-         * Sets the query to convert.
-         * @param The query to convert.
-         */
-        setFetchXml( value: string ): void;
-    }
-
-    /**
-     * Response to FetchXmlToQueryExpressionRequest.
-     * @param responseXml The response XML to the FetchXmlToQueryExpressionRequest.
-     */
-    class FetchXmlToQueryExpressionResponse extends Sdk.OrganizationResponse
-    {
-        constructor( responseXml: string );
-
-        /**
-         * Gets the results of the query conversion.
-         */
-        public getQuery(): Query.QueryExpression;
-    }
-
-    /**
-     * Contains the data that is needed to  convert a query, which is represented as a QueryExpression class, to its equivalent query, which is represented as FetchXML.
-     * @param query The query.
-     */
-    class QueryExpressionToFetchXmlRequest extends Sdk.OrganizationRequest
-    {
-        constructor( query: Sdk.Query.QueryBase );
-
-        /**
-         * Sets the query to convert.
+import * as Q from "q";
+
+declare global {
+    namespace Sdk {
+        interface IEntityView {
+            attributes: AttributeCollection;
+            entityState: EntityState;
+            id: string;
+            logicalName: string;
+            relatedEntities: RelatedEntityCollection;
+        }
+
+        interface IEntityCollectionView {
+            entityName: string;
+            entities: Array<IEntityView>;
+            minActiveRowVersion: string;
+            moreRecords: boolean;
+            pagingCookie: string;
+            totalRecordCount: number;
+            totalRecordCountLimitExceeded: boolean;
+        }
+
+        interface IEntityReferenceView {
+            Id: string;
+            Type: string;
+            Name: string;
+        }
+
+        interface IEntityReferenceCollectionView extends Array<IEntityReferenceView> {
+        }
+
+        class Q {
+            /**
+             * Creates a link between records.
+             * @param entityName The logical name of the entity that is specified in the entityId parameter.
+             * @param entityId The ID of the record to which the related records are associated.
+             * @param relationship The name of the relationship to be used to create the link.
+             * @param relatedEntities A collection of Sdk.EntityReference objects to be associated.
+             */
+            static associate(entityName: string, entityId: string, relationship: string, relatedEntities: Sdk.Collection<Sdk.EntityReference>): Q.Promise<void>;
+            /**
+             * Creates an entity record and returns a string representation of the GUID value that is the Id of the created entity.
+             * @param entity An entity instance.
+             */
+            static create(entity: Sdk.Entity): Q.Promise<string>;
+
+            /**
+             * Deletes an entity record
+             * @param entityName The LogicalName of the entity to delete.
+             * @param id An ID of the record to delete.
+             */
+            static del(entityName: string, id: string): Q.Promise<void>;
+
+            /**
+             * Removes a link between records.
+             * @param entityName The logical name of the entity that is specified in the entityId parameter.
+             * @param entityId The ID of the record to which the related records are disassociated.
+             * @param relationship The name of the relationship to be used to remove the link.
+             * @param relatedEntities A collection of Sdk.EntityReference objects to be disassociated.
+             */
+            static disassociate(entityName: string, entityId: string, relationship: string, relatedEntities: Sdk.Collection<Sdk.EntityReference>): Q.Promise<void>;
+
+            /**
+             * Executes a SOAP Request using the SOAPAction Execute.
+             * @param request A request object.
+             */
+            static execute(request: Sdk.OrganizationRequest): Q.Promise<OrganizationResponse>;
+
+            /**
+             * Retrieves an entity instance.
+             * @param entityName The logical name of the entity to retrieve.
+             * @param id The id of the entity to retrieve.
+             * @param columnSet The columns of the entities to retrieve.
+             */
+            static retrieve(entityName: string, id: string, columnSet: Sdk.ColumnSet): Q.Promise<Entity>;
+
+            /**
+             * Retrieves the results of a query
+             * @param query An Sdk.Query.QueryByAttribute query.
+             */
+            static retrieveMultiple(query: Sdk.Query.QueryByAttribute): Q.Promise<Sdk.EntityCollection>;
+
+            /**
+             * Retrieves the results of a query
+             * @param query An Sdk.Query.QueryExpression query.
+             */
+            static retrieveMultiple(query: Sdk.Query.QueryExpression): Q.Promise<Sdk.EntityCollection>;
+
+            /**
+             * Retrieves the results of a query
+             * @param query An Sdk.Query.FetchExpression query.
+             */
+            static retrieveMultiple(query: Sdk.Query.FetchExpression): Q.Promise<Sdk.EntityCollection>;
+
+            /**
+             * Updates an entity instance.
+             * @param entity An entity instance to update.
+             */
+            static update(entity: Entity): Q.Promise<boolean>;
+        }
+
+        class ColumnSet {
+            /**
+             * Specifies the attributes for which non- null values are returned from a query.
+             * @param columns Comma separated string values for attribute logical names.
+             */
+            constructor(...columns: string[]);
+
+            /**
+             * Specifies the attributes for which non- null values are returned from a query.
+             * @param columns An array of string values.
+             */
+            constructor(columns: string[]);
+
+            /**
+             * Specifies the attributes for which non- null values are returned from a query.
+             * @param allColumns If Boolean true value is passed as the first parameter all columns will be included. (Not recommended for production code).
+             */
+            constructor(allColumns: boolean);
+
+            /**
+             * Gets the collection of column names.
+             * @returns The collection of column names.
+             */
+            getColumns(): Sdk.Collection<string>;
+
+            /**
+             * Adds a column to the collection.
+             * @param column The logical name of the attribute to add.
+             */
+            addColumn(column: string): void;
+
+            /**
+             * Adds a string array of column names.
+             * @param columns A string array of column names.
+             */
+            addColumns(columns: Array<string>): void;
+
+            /**
+             * Sets the AllColumns property.
+             * @params allColumns A boolean value.
+             */
+            setAllColumns(allColumns: boolean): void;
+
+            /**
+             * Whether all columns will be returned.
+             */
+            getAllColumns(): boolean;
+
+            /**
+             * Gets the number of columns.
+             */
+            getCount(): number;
+
+
+            /// prototype methods
+
+            /**
+             * Removes a column from the ColumnSet.
+             * @param columnName The logical name of an attribute to be removed from the ColumnSet.
+             * @param errorIfNotFound Whether to throw an error when the column to remove is not found. The default is false
+             */
+            removeColumn(columnName: string, errorIfNotFound?: boolean): void;
+
+            /**
+             * The XML node with "<d:columnSet>" as the root element.
+             */
+            toXml(): string;
+
+            /**
+             * XML nodes for columnSet properties.
+             */
+            toValueXml(): string;
+        }
+
+        class ValueType {
+        }
+
+        class Collection<T>
+        {
+            /**
+             * A Collection for a specified type.
+             * @param type The function that specifies the type.
+             * @param items An array of items to add to the collection.
+             */
+            constructor(type: T, items?: Array<T>);
+
+            /**
+             * Gets the type defined for the collection.
+             */
+            getType(): T;
+
+            /**
+             * Adds an item to the collection.
+             * @param item An item to add to the collection.
+             */
+            add(item: T): void;
+
+            /**
+             * Adds an array of objects to the collection.
+             * @param items An array of items to add to the collection.
+             */
+            addRange(items: any[]): void;
+
+            /**
+             * Removes all items from the collection.
+             */
+            clear(): void;
+
+            /**
+             * Returns whether an object exists within the collection.
+             * @param item The item to search in the collection.
+             */
+            contains(item: T): boolean;
+
+            /**
+             * Returns whether an object exists within the collection.
+             * @param predicate A comparer function which is invoked for each item of the collection.
+             */
+            contains(predicate: (item: T) => boolean): boolean;
+
+            /**
+             * Returns an Sdk.Collection that contains all the items of this collection that satisfy the specified predicate function.
+             * @param predicate A predicate function that takes a collection item as argument and returns a boolean.
+             */
+            select(predicate: (item: T) => boolean): Collection<T>;
+
+            /**
+             * Applies the action contained within a delegate function.
+             * @param fn Delegate function with parameters for item and index.
+             */
+            forEach(fn: (item: T, index: number) => any): void;
+
+            /**
+             * Gets the item in the collection at the specified index.
+             * @param index The index of the item to return.
+             */
+            getByIndex(index: number): T;
+
+            /**
+             * Removes an item from the collection.
+             * @param item A reference to the item to be removed.
+             */
+            remove(item: T): void;
+
+            /**
+             * Gets a copy of the array of items in the collection.
+             */
+            toArray(): Array<T>;
+
+            /**
+             * Returns the number of items in the collection.
+             */
+            getCount(): number;
+        }
+
+        class EntityCollection {
+            /**
+             * Contains a collection of entity instances.
+             * @param entities Initializes a new instance of the EntityCollection class setting the Sdk.Collection of Sdk.Entity objects.
+             */
+            constructor(entities: Sdk.Collection<Sdk.Entity>);
+
+            /**
+             * Adds an entity to the collection.
+             * @param entity
+             */
+            addEntity(entity: Sdk.Entity): void;
+
+            /**
+             * Gets the collection of entities.
+             */
+            getEntities(): Sdk.Collection<Sdk.Entity>;
+
+            /**
+             * Gets an entity in the collection.
+             * @param index The index of the entity in the collection.
+             */
+            getEntity(index: number): Sdk.Entity;
+
+            /**
+             * Gets an entity in the collection.
+             * @param id The id of the entity in the collection.
+             */
+            getEntity(id: Sdk.Guid): Sdk.Entity;
+
+            /**
+             * Sets an item in the collection.
+             * @param index The index of the entity in the collection.
+             * @param value The Sdk.Entity value to set.
+             */
+            setEntity(index: number, value: Sdk.Entity): void;
+
+            /**
+             * Sets an item in the collection.
+             * @param id The Sdk.Guid id of the entity in the collection.
+             * @param value The Sdk.Entity value to set.
+             */
+            setEntity(id: Sdk.Guid, value: Sdk.Entity): void;
+
+            /**
+             * Gets the logical name of the entity.
+             */
+            getEntityName(): string;
+
+            /**
+             * Sets the logical name of the entity.
+             * @param name The logical name of the entity.
+             */
+            setEntityName(name: string): void;
+
+            /**
+             * Gets the lowest active row version value.
+             */
+            getMinActiveRowVersion(): string;
+
+            /**
+             * Sets the lowest active row version value.
+             * @param minActiveRowVersion The lowest active row version value.
+             */
+            setMinActiveRowVersion(minActiveRowVersion: string): void;
+
+            /**
+             * Gets whether there are more records available.
+             */
+            getMoreRecords(): boolean;
+
+            /**
+             * Sets whether there are more records available.
+             * @param moreRecords Whether there are more records available.
+             */
+            setMoreRecords(moreRecords: boolean): void;
+
+            /**
+             * Gets the current paging information.
+             */
+            getPagingCookie(): string;
+
+            /**
+             * Sets the current paging information.
+             * @param pagingCookie The current paging information.
+             */
+            setPagingCookie(pagingCookie: string): void;
+
+            /**
+             * Gets the total number of records in the collection if ReturnTotalRecordCount was true when the query was executed.
+             */
+            getTotalRecordCount(): number;
+
+            /**
+             * Sets the total number of records in the collection if ReturnTotalRecordCount was true when the query was executed.
+             * @param totalRecordCount The total number of records in the collection if ReturnTotalRecordCount was true when the query was executed.
+             */
+            setTotalRecordCount(totalRecordCount: number): void;
+
+            /**
+             * Gets whether the results of the query exceeds the total record count.
+             */
+            getTotalRecordCountLimitExceeded(): boolean;
+
+            /**
+             * Sets whether the results of the query exceeds the total record count.
+             * @param totalRecordCountLimitExceeded Whether the results of the query exceeds the total record count.
+             */
+            setTotalRecordCountLimitExceeded(totalRecordCountLimitExceeded: boolean): void;
+
+            /**
+             * XML definition of an the child nodes of an entity.
+             */
+            toValueXml(): string;
+
+            /**
+             * Returns a view of the entity collection
+             */
+            view(): IEntityCollectionView;
+        }
+
+        class EntityReferenceCollection {
+            /**
+             * Contains a collection of EntityReference instances.
+             * @param entityReferences Initializes a new instance of the EntityReferenceCollection class setting the Sdk.Collection of Sdk.EntityReference objects.
+             */
+            constructor(entityReferences?: Sdk.Collection<EntityReference>);
+
+            /**
+             * Gets the collection of entity references.
+             */
+            getEntityReferences(): Sdk.Collection<EntityReference>;
+
+            /**
+             * Sets the collection of entity references.
+             * @param entityReferences The entity references
+             */
+            setEntityReferences(entityReferences: Sdk.Collection<EntityReference>): void;
+
+
+            /// prototype methods
+
+            /**
+             * Removes an entity reference to the collection.
+             * @param entityReference The entity reference to remove.
+             */
+            remove(entityReference: Sdk.EntityReference): void;
+
+            /**
+             * Returns a view of the data in an entity reference collection instance.
+             */
+            view(): IEntityReferenceCollectionView;
+
+            /**
+             * Returns the values of serialized entity reference collection as XML nodes.
+             */
+            toValueXml(): string;
+        }
+
+        class RelatedEntityCollection extends EntityCollection {
+        }
+
+        class AttributeCollection extends Collection<AttributeBase>
+        {
+            constructor();
+
+            /**
+             * Adds an attribute to the Attribute Collection.
+             * @param attribute The attribute to add.
+             * @param isChanged Override the the attribute IsChanged value.
+             */
+            add(attribute: AttributeBase, isChanged?: boolean): void;
+
+            /**
+             * Gets the attributes in the collection.
+              */
+            getAttributes(): Collection<AttributeBase>;
+
+
+            /// prototype methods
+
+            /**
+             * Allows for a delegate function to be applied to each attribute in the collection.
+             * @param fm The function to be applied. Function should have parameters for the attribute and the iterator i.e.: '(att,i)'
+             */
+            forEach(fn: (attribute: AttributeBase, index: number) => any): void;
+
+            /**
+             * Returns all attributes in the collection.
+             */
+            get(): Sdk.Collection<AttributeBase>;
+
+            /**
+             * Returns the attribute with matching name.
+             * @param attribuetName
+             */
+            get(attribuetName: string): AttributeBase;
+
+            /**
+             * Returns the attribute with matching index.
+             * @param attribuetName
+             */
+            get(index: number): AttributeBase;
+
+            /**
+             * Gets an attribute at a given index.
+             * @param index The index.
+             */
+            getAttributeByIndex(index: number): AttributeBase;
+
+            /**
+             * Gets an attribute with a given name.
+             * @param name The Logical name of the attribute.
+             */
+            getAttributeByName(name: string): AttributeBase;
+
+            /**
+             * Gets an array of the names of attributes in a collection.
+             */
+            getNames(): Array<string>;
+            /**
+             * The XML for an attribute collection.
+             */
+            toXml(action: string): string;
+        }
+
+        class FormattedValueCollection {
+        }
+
+        class RelatedEntitiesCollection {
+        }
+
+        class AttributeBase {
+            /**
+             * Gets whether the value of the attribute has changed.
+             */
+            getIsChanged(): boolean;
+
+            /**
+             * Gets the logical name of the attribute.
+             */
+            getName(): string;
+
+            /**
+             * Gets the value type of the attribute.
+             */
+            getType(): Sdk.ValueType;
+
+            /**
+             * Gets the value of the attribute.
+             * The type of value depends on the type of attribute.
+             */
+            getValue(): any;
+
+            /**
+             * Whether the value of the attribute is set.
+             */
+            isValueSet(): boolean;
+
+            /**
+             * Sets whether the value of the attribute has changed.
+             * @param isChanged Whether the value of the attribute has changed.
+             */
+            setIsChanged(isChanged: boolean): void;
+
+            /**
+             * Sets the name of the attribute
+             * @param name The name of the attribute.
+             */
+            setName(name: string): void;
+
+            /**
+             * For internal use only.
+             * @param type The type of the attribute.
+             */
+            setType(type: Sdk.ValueType): void;
+
+            /**
+             * Sets the general value of the attribute
+             * @param name The value of the attribute.
+             */
+            setValue(value: any): void;
+
+            /// prototype methods
+            /**
+             * XML node for Attribute.
+             */
+            toXml(action: string): string;
+        }
+
+        class Boolean extends AttributeBase {
+            /**
+             * A Boolean Attribute.
+             * @param name The logical name of the attribute .
+             * @param value The value of the managed property.
+             */
+            constructor(name: string, value?: boolean)
+
+            /**
+             * Gets the value of a Boolean attribute.
+             */
+            getValue(): boolean;
+
+            /**
+             * Sets the value of a Boolean attribute.
+             * @param value
+             */
+            setValue(value: boolean): void;
+        }
+
+        class DateTime extends AttributeBase {
+            /**
+             * A DateTime Attribute.
+             * @param name The logical name of the attribute.
+             * @param value The value of the attribute.
+             */
+            constructor(name: string, value?: Date);
+
+            /**
+             * Gets the value of a DateTime attribute.
+             */
+            getValue(): Date;
+
+            /**
+             * Sets the value of a DateTime attribute.
+             * @param value The value to set.
+             */
+            setValue(value: Date): void;
+        }
+
+        class Decimal extends AttributeBase {
+            /**
+             * A Decimal Attribute.
+             * @param name The logical name of the attribute.
+             * @param value The value of the attribute.
+             */
+            constructor(name: string, value?: number);
+
+            /**
+             * Gets the value of a Decimal attribute.
+             */
+            getValue(): number;
+
+            /**
+             * Sets the value of a Decimal attribute.
+             * @param value The value to set.
+             */
+            setValue(value: number): void;
+        }
+
+        class Double {
+            /**
+             * A Double Attribute.
+             * @param name The logical name of the attribute.
+             * @param value The value of the attribute.
+             */
+            constructor(name: string, value?: number);
+
+            /**
+             * Gets the value of a Double attribute.
+             */
+            getValue(): number;
+
+            /**
+             * Sets the value of a Double attribute.
+             * @param value The value to set.
+             */
+            setValue(value: number): void;
+        }
+
+        class Guid extends AttributeBase {
+            /**
+             * A Guid Attribute.
+             * @param name The logical name of the attribute.
+             * @param value" The value of the attribute
+             */
+            constructor(name: string, value?: string);
+
+            /**
+             * Gets the value of a Guid attribute.
+             */
+            getValue(): string;
+
+            /**
+             * Sets the value of a Guid attribute.
+             * @param value The value to set.
+             */
+            setValue(value: string): void;
+        }
+
+        class Int extends AttributeBase {
+            /**
+             * An Integer Attribute.
+             * @param name The logical name of the attribute.
+             * @param value The value of the attribute.
+             */
+            constructor(name: string, value?: number);
+
+            /**
+             * Gets the value of an Integer attribute.
+             */
+            getValue(): number;
+
+            /**
+             * Sets the value of an Integer attribute.
+             * @param value The value to set.
+             */
+            setValue(value: number): void;
+        }
+
+        class Long extends AttributeBase {
+            /**
+             * A Long Attribute.
+             * @param name The logical name of the attribute.
+             * @param value The value of the attribute.
+             */
+            constructor(name: string, value?: number);
+
+            /**
+             * Gets the value of a Long attribute.
+             */
+            getValue(): number;
+
+            /**
+             * Sets the value of a Long attribute.
+             * @param value The value to set.
+             */
+            setValue(value: number): void;
+        }
+
+        class Lookup extends AttributeBase {
+            /**
+             * A Lookup Attribute.
+             * @param name The logical name of the attribute.
+             * @param value The value of the attribute.
+             */
+            constructor(name: string, value?: EntityReference);
+
+            /**
+             * Gets the value of a Lookup attribute.
+             */
+            getValue(): EntityReference;
+
+            /**
+             * Sets the value of a Lookup attribute.
+             * @param value The value to set.
+             */
+            setValue(value: EntityReference): void;
+        }
+
+        class Money extends AttributeBase {
+            /**
+             * A Money Attribute.
+             * @param name The logical name of the attribute.
+             * @param value The value of the attribute.
+             */
+            constructor(name: string, value?: number);
+
+            /**
+             * Gets the value of a Money attribute.
+             */
+            getValue(): number;
+
+            /**
+             * Sets the value of a Money attribute.
+             * @param value The value to set.
+             */
+            setValue(value: number): void;
+        }
+
+        class OptionSet extends AttributeBase {
+            /**
+             * An OptionSet Attribute.
+             * @param name The logical name of the attribute.
+             * @param value The value of the attribute.
+             */
+            constructor(name: string, value?: number);
+
+            /**
+             * Gets the value of a OptionSet attribute.
+             */
+            getValue(): number;
+
+            /**
+             * Sets the value of an OptionSet attribute.
+             * @param value The value to set.
+             */
+            setValue(value: number): void;
+        }
+
+        class PartyList extends AttributeBase {
+            /**
+             * A PartyList Attribute.
+             * @param name The logical name of the attribute.
+             * @param value The value of the attribute.
+             */
+            constructor(name: string, value?: EntityCollection);
+
+            /**
+             * Gets the value of a PartyList attribute.
+             */
+            getValue(): EntityCollection;
+
+            /**
+             * Sets the value of a PartyList attribute.
+             * @param value The value to set.
+             */
+            setValue(value: EntityCollection): void;
+        }
+
+        class String extends AttributeBase {
+            /**
+             * A String Attribute.
+             * @param name The logical name of the attribute.
+             * @param value The value of the attribute.
+             */
+            constructor(name: string, value?: string);
+
+            /**
+             * Gets the value of a String attribute.
+             */
+            getValue(): string;
+
+            /**
+             * Sets the value of a String attribute.
+             * @param value The value to set.
+             */
+            setValue(value: string): void;
+        }
+
+        class EntityState {
+        }
+
+        class Entity {
+            /**
+             * Represents an instance of an entity (a record).
+             * @param type The logical name of the entity.
+             */
+            constructor(type: string);
+
+            /**
+             * Gets the collection of attributes for the entity.
+             */
+            getAttributes(): Sdk.AttributeCollection;
+
+            /**
+             * Gets the collection of attributes for the entity.
+             * @param attributeName The attribute with matching name is returned.
+             */
+            getAttributes(attributeName: string): Sdk.AttributeBase;
+
+            /**
+             * Gets the collection of attributes for the entity.
+             * @param index The attribute with matching index is returned.
+             */
+            getAttributes(index: number): Sdk.AttributeBase;
+
+            /**
+             * Checks whether the entity has an attribute that satisfies the specified predicate.
+             * @param A comparer function that takes an Sdk.AttributeBase as argument and returns a boolean.
+             */
+            containsAttribute(predicate: (attribute: Sdk.AttributeBase) => boolean): boolean;
+
+            /**
+             * Checks whether the entity has an attribute with the specified name.
+             * @param The name of the attribute.
+             */
+            containsAttribute(name: string): boolean;
+
+            /**
+             * Sets the collection of attributes for the entity.
+             * @param attributes The collection of attributes for the entity.
+             */
+            setAttributes(attributes: Sdk.AttributeCollection): void;
+
+            /**
+             * Gets the state of the entity.
+             */
+            getEntityState(): Sdk.EntityState;
+
+            /**
+             * Sets the state of the entity.
+             * @param state The state of the entity.
+             */
+            setEntityState(state: Sdk.EntityState): void;
+
+            /**
+             * Gets the collection of formatted values for the entity attributes.
+             */
+            getFormattedValues(): Sdk.FormattedValueCollection;
+
+            /**
+             * Sets the collection of formatted values for the entity attributes.
+             * @param values" The collection of formatted values for the entity attributes.
+             */
+            setFormattedValues(values: Sdk.FormattedValueCollection): void;
+
+            /**
+             * Gets the Id of the record represented by this entity instance.
+             */
+            getId(): string;
+
+            /**
+             * Sets the Id of the record represented by this entity instance.
+             * @param id The Id of the record represented by this entity instance.
+             * @param override Allow setting the Id property, for example when creating a new record from an existing one.
+             */
+            setId(id: string, override?: boolean): void;
+
+            /**
+             * Gets the logical name of the entity.
+             */
+            getType(): string;
+
+            /**
+             * Sets the logical name of the entity.
+             * @param type The logical name of the entity.
+             */
+            setType(type: string): void;
+
+            /**
+             * Gets a collection of related entities.
+             */
+            getRelatedEntities(): Sdk.RelatedEntitiesCollection;
+
+            /**
+             * Sets a collection of related entities.
+             * @param relatedEntities A collection of related entities.
+             */
+            setRelatedEntities(relatedEntities: Sdk.RelatedEntitiesCollection): void;
+
+            /**
+             * Adds an attribute with an optional value to a newly instantiated Sdk.Entity
+             * @param attribute The attribute to add
+             * @param isChanged Whether the attribute should be considered changed, the default is true.
+             */
+            addAttribute(attribute: Sdk.AttributeBase, isChanged?: boolean): void;
+
+            /**
+             * Adds an entity to the related entities.
+             * @param relationshipSchemaName The relationship SchemaName.
+             * @param entity The entity to add.
+             */
+            addRelatedEntity(relationshipSchemaName: string, entity: Sdk.Entity): void;
+
+            /**
+             * Gets the value to indicate whether data for the entity has changed.
+             */
+            getIsChanged(): boolean;
+
+            /**
+             * Sets the value to indicate whether data for the entity has changed.
+             * @param isChanged The value to indicate whether data for the entity has changed.
+             */
+            setIsChanged(isChanged: boolean): void;
+
+            /**
+             * Gets the value of the specified attribute.
+             * @param logicalName The logical name of the attribute.
+             */
+            getValue(logicalName: string): any;
+
+            /**
+             * Generates properties for the entity based on metadata.
+             */
+            initializeSubClass(metadata: Sdk.Mdq.IEntityMetadata): void;
+
+            /**
+             * Sets the value of the specified attribute.
+             * @param logicalName The logical name of the attribute.
+             * @param value The value for the attribute. Simple JavaScript types may be used for most attribute types. Sdk.EntityReference, Sdk.EntityCollection, and Sdk.BooleanManagedPropertyValue cannot use simple JavaScript types.
+             */
+            setValue(logicalName: string, value: Object): void;
+
+            /**
+             * Generates an entity reference.
+             */
+            toEntityReference(): Sdk.EntityReference;
+
+            /**
+             * Overrides the default toString method.
+             */
+            toString(): string;
+
+            /**
+             * XML definition of an the child nodes of an entity.
+             * @param action
+             */
+            toValueXml(action: string): string;
+
+            /**
+             * XML definition of an entity where the root node is <entity>.
+             */
+            toXml(action: string): string;
+
+            /**
+             * Returns a view of the data in an entity instance
+             */
+            view(): IEntityView;
+        }
+
+        class EntityReference {
+            /**
+             * Identifies a record.
+             * @param logicalName The logical name of the entity.
+             * @param id The id of the record.
+             * @param name The value of the primary attribute of the entity instance. This property can contain a value or null. This property is not automatically populated unless the EntityReference object has been retrieved from the server.
+             */
+            constructor(logicalName: string, id: string, name?: string);
+
+            /**
+             * Gets the logicalName representing the type of referenced entity.
+             */
+            getType(): string;
+
+            /**
+             * Gets the Id value of the referenced entity.
+             */
+            getId(): string;
+
+            /**
+             * Gets the primary attribute value of the referenced entity.
+             */
+            getName(): string;
+
+            /**
+             * Sets the logicalName representing the type of referenced entity.
+             * @param type The logicalName representing the type of referenced entity.
+             */
+            setType(type: string): void;
+
+            /**
+             * Sets the Id value of the entity.
+             * @param id The Id value of the entity.
+             */
+            setId(id: string): void;
+
+            /**
+             * Sets the primary attribute value of the referenced entity.
+             * @param name The primary attribute value of the referenced entity.
+             */
+            setName(name: string): void;
+
+
+            /// prototype methods
+
+            /**
+             * Returns a serialized entity reference where the root element is <a:EntityReference>.
+             */
+            toXml(): string;
+
+            /**
+             * Returns the values of serialized entity reference as XML nodes.
+             */
+            toValueXml(): string;
+
+            /**
+             * Returns a view of the data in an EntityReference
+             */
+            view(): IEntityReferenceView;
+        }
+
+        class OrganizationRequest {
+            /**
+             * Sets the request XML.
+             * @param xml The request XML.
+             */
+            setRequestXml(xml: string): void;
+
+            /**
+             * Gets the request XML.
+             */
+            getRequestXml(): string;
+
+            /**
+             * Sets the response type.
+             * @param type A class that inherits from Sdk.OrganizationResponse.
+             */
+            setResponseType(type: OrganizationResponse): void;
+
+            /**
+             * Gets the response type.
+             */
+            getResponseType(): OrganizationResponse;
+        }
+
+        class OrganizationResponse {
+        }
+
+        /**
+         * Contains the data that is needed to convert a query in FetchXML to a QueryExpression.
+         * @param fetchXml Sets the query to convert.
+         */
+        class FetchXmlToQueryExpressionRequest extends Sdk.OrganizationRequest {
+            constructor(fetchXml: string);
+
+            /**
+             * Sets the query to convert.
+             * @param The query to convert.
+             */
+            setFetchXml(value: string): void;
+        }
+
+        /**
+         * Response to FetchXmlToQueryExpressionRequest.
+         * @param responseXml The response XML to the FetchXmlToQueryExpressionRequest.
+         */
+        class FetchXmlToQueryExpressionResponse extends Sdk.OrganizationResponse {
+            constructor(responseXml: string);
+
+            /**
+             * Gets the results of the query conversion.
+             */
+            public getQuery(): Query.QueryExpression;
+        }
+
+        /**
+         * Contains the data that is needed to  convert a query, which is represented as a QueryExpression class, to its equivalent query, which is represented as FetchXML.
          * @param query The query.
-         * @param query
          */
-        public setQuery( query: Sdk.Query.QueryBase ): void;
+        class QueryExpressionToFetchXmlRequest extends Sdk.OrganizationRequest {
+            constructor(query: Sdk.Query.QueryBase);
+
+            /**
+             * Sets the query to convert.
+             * @param query The query.
+             * @param query
+             */
+            public setQuery(query: Sdk.Query.QueryBase): void;
+        }
+
+        /**
+         * Response to QueryExpressionToFetchXmlRequest.
+         */
+        class QueryExpressionToFetchXmlResponse extends Sdk.OrganizationResponse {
+            constructor(responseXml: string);
+
+            /**
+             * Gets the results of the query conversion.
+             */
+            public getFetchXml(): string;
+        }
+
+        /**
+         * Request to retrieve metadata and metadata changes.
+         * @param query The Sdk.Mdq.EntityQueryExpression that defines the query.
+         * @param clientVersionStamp The Sdk.Mdq.RetrieveMetadataChangesResponse.ServerVersionStamp value from a previous request. When included only the metadata changes since the previous request will be returned.
+         * @param deletedMetadataFilters An Sdk.Mdq.DeletedMetadataFilters enumeration value. When included the deleted metadata changes will be limited to the types defined by the enumeration.
+         */
+        class RetrieveMetadataChangesRequest extends Sdk.OrganizationRequest {
+            constructor(query: Sdk.Mdq.EntityQueryExpression, clientVersionStamp?: string, deletedMetadataFilters?: Sdk.Mdq.DeletedMetadataFilters);
+            getEntityMetadata(): Sdk.Mdq.IEntityMetadata[];
+            getServerVersionStamp(): string;
+            getDeletedMetadata(): Object;
+        }
+
+        /**
+         * Response to RetrieveMetadataChangesRequest.
+         * @param resopnseXml The response XML.
+         */
+        class RetrieveMetadataChangesResponse {
+            constructor(responseXml: string);
+
+            /***
+             *
+             */
+            public getEntityMetadata(): Array<Mdq.IEntityMetadata>;
+
+            /***
+             *
+             */
+            public getServerVersionStamp(): string;
+
+            /***
+             *
+             */
+            public getDeletedMetadata(): any;
+        }
+
+
+        /**
+         * Contains the data that is needed to set the state of an entity record.
+         * @param entityMoniker Sets the entity.
+         * @param state Sets the state of the entity record.
+         * @param status Sets the status that corresponds to the State property.
+         */
+        class SetStateRequest extends Sdk.OrganizationRequest {
+            constructor(entityMoniker: EntityReference, state: number, status: number);
+
+            /**
+             * Sets the entity.
+             * @param value The entity.
+             */
+            public setEntityMoniker(value: EntityReference): void;
+
+            /**
+             * Sets the state of the entity record.
+             * @param value The state of the entity record.
+             */
+            setState(value: number): void;
+
+            /**
+             * Sets the status that corresponds to the State property.
+             * @param value The status that corresponds to the State property.
+             */
+            setStatus(value: number): void;
+        }
+
+        /**
+         * Response to SetStateRequest.
+         */
+        class SetStateResponse {
+            constructor(responseXml: string);
+        }
     }
 
-    /**
-     * Response to QueryExpressionToFetchXmlRequest.
-     */
-    class QueryExpressionToFetchXmlResponse extends Sdk.OrganizationResponse
-    {
-        constructor( responseXml: string );
-
-        /**
-         * Gets the results of the query conversion.
-         */
-        public getFetchXml(): string;
-    }
-
-    /**
-     * Request to retrieve metadata and metadata changes.
-     * @param query The Sdk.Mdq.EntityQueryExpression that defines the query.
-     * @param clientVersionStamp The Sdk.Mdq.RetrieveMetadataChangesResponse.ServerVersionStamp value from a previous request. When included only the metadata changes since the previous request will be returned.
-     * @param deletedMetadataFilters An Sdk.Mdq.DeletedMetadataFilters enumeration value. When included the deleted metadata changes will be limited to the types defined by the enumeration.
-     */
-    class RetrieveMetadataChangesRequest extends Sdk.OrganizationRequest
-    {
-        constructor( query: Sdk.Mdq.EntityQueryExpression, clientVersionStamp?: string, deletedMetadataFilters?: Sdk.Mdq.DeletedMetadataFilters );
-        getEntityMetadata(): Sdk.Mdq.IEntityMetadata[];
-        getServerVersionStamp(): string;
-        getDeletedMetadata(): Object;
-    }
-
-    /**
-     * Response to RetrieveMetadataChangesRequest.
-     * @param resopnseXml The response XML.
-     */
-    class RetrieveMetadataChangesResponse
-    {
-        constructor( responseXml: string );
-
-        /***
-         *
-         */
-        public getEntityMetadata(): Array<Mdq.IEntityMetadata>;
-
-        /***
-         *
-         */
-        public getServerVersionStamp(): string;
-
-        /***
-         *
-         */
-        public getDeletedMetadata(): any;
-    }
-
-
-   /**
-    * Contains the data that is needed to set the state of an entity record.
-    * @param entityMoniker Sets the entity.
-    * @param state Sets the state of the entity record.
-    * @param status Sets the status that corresponds to the State property.
-    */
-    class SetStateRequest extends Sdk.OrganizationRequest
-    {
-        constructor( entityMoniker: EntityReference, state: number, status: number );
-
-        /**
-         * Sets the entity.
-         * @param value The entity.
-         */
-        public setEntityMoniker( value: EntityReference ): void;
-
-        /**
-         * Sets the state of the entity record.
-         * @param value The state of the entity record.
-         */
-        setState( value: number ): void;
-
-        /**
-         * Sets the status that corresponds to the State property.
-         * @param value The status that corresponds to the State property.
-         */
-        setStatus( value: number ): void;
-    }
-
-    /**
-     * Response to SetStateRequest.
-     */
-    class SetStateResponse
-    {
-        constructor( responseXml: string );
-    }
-}
-
-declare namespace Sdk.Query
-{
-    class QueryBase
-    {
-        /**
-         * Internal Use Only.
-         * @param type An Abstract class for different query classes to inherit from.
-         */
-        constructor( type: string );
-
-        /**
-         * Gets the columns to include.
-         */
-        getColumnSet(): Sdk.ColumnSet;
-
-        /**
-         * Sets the columns to include.
-         * @param columns An Sdk.ColumnSet instance.
-         */
-        setColumnSet( columns: Sdk.ColumnSet ): void;
-
-        /**
-         * Sets the columns to include.
-         * @param columns An array of attribute logical names for the columns to return.
-         */
-        setColumnSet( columns: Array<string> ): void;
-
-        /**
-         * Sets the columns to include.
-         * @param columns Pass each attribute logical name as an argument.
-         */
-        setColumnSet( ...columns: string[] ): void;
-
-        /**
-         *
-         */
-        getQueryType(): string;
-
-        /**
-         * Gets the logical name of the entity.
-         */
-        getEntityName(): string;
-
-        /**
-         * Sets the logical name of the entity.
-         * @param name The logical name of the entity.
-         */
-        setEntityName( name: string ): void;
-
-        /**
-         * Gets the number of pages and the number of entity instances per page returned from the query.
-         */
-        getPageInfo(): Sdk.Query.PagingInfo;
-
-        /**
-         * Sets the number of pages and the number of entity instances per page returned from the query.
-         * @param pageInfo The number of pages and the number of entity instances per page returned from the query.
-         */
-        setPageInfo( pageInfo: Sdk.Query.PagingInfo ): void;
-
-        /**
-         * Adds the specified column to the column set.
-         * @param columnName The logical name of the column to add.
-         */
-        addColumn( columnName: string ): void;
-
-        /**
-         * Removes a column from the ColumnSet used by the query.
-         * @param columnName The logical name of an attribute to be removed from the ColumnSet.
-         * @param errorIfNotFound Whether to throw an error when the column to remove is not found. The default is false.
-         */
-        removeColumn( columnName: string, errorIfNotFound?: boolean ): void;
-
-        /**
-         * Gets an Sdk.Collection of Sdk.Query.OrderExpression instances that define the order in which the entity instances are returned from the query.
-         */
-        getOrders(): Sdk.Collection<Sdk.Query.OrderExpression>;
-
-        /**
-         * Gets the number of rows to be returned.
-         */
-        getTopCount(): number;
-
-        /**
-         * Sets the number of rows to be returned.
-         * @param count The number of rows to be returned.
-         */
-        setTopCount( count: number ): void;
-
-        /**
-         * Gets the serialized QueryExpression.
-         */
-        toXml(): string;
-
-        /**
-         * Gets the serialized QueryExpression values.
-         */
-        toValueXml(): string;
-    }
-
-    class QueryByAttribute extends QueryBase
-    {
-        /**
-         * Initializes a new instance of the QueryByAttribute class setting the entity name.
-         * @param entityName The logical name of the entity.
-         *
-         */
-        constructor( entityName: string );
-
-        /**
-         * Gets An Sdk.Collection of Sdk.AttributeBase attributes.
-         */
-        getAttributeValues(): Sdk.Collection<Sdk.AttributeBase>;
-
-        /**
-         * Sets an Sdk.Collection of Sdk.Query.OrderExpression instances that define the order in which the entity instances are returned from the query.
-         * @param orders An Sdk.Collection of Sdk.Query.OrderExpression instances that define the order in which the entity instances are returned from the query.
-         */
-        setOrders( orders: Sdk.Collection<Sdk.Query.OrderExpression> ): void;
-
-        /// prototype methods
-
-        /**
-         * Adds the attribute with values to include in the query.
-         * @param attributeValue One of the classes that inherit from Sdk.AttributeBase including the value to use as criteria.
-         */
-        addAttributeValue( attributeValue: Sdk.AttributeBase ): void;
-
-        /**
-         * Adds an order to apply to the results of the query.
-         * @param order An order expression.
-         */
-        addOrder( order: Sdk.Query.OrderExpression ): void;
-
-        /**
-         * Removes an attribute with values to include in the query.
-         * @param attributeValue One of the classes that inherit from Sdk.AttributeBase including the value to use as criteria.
-         * @param errorIfNotFound Whether to throw an error when the attribute to remove is not found. The default is false.
-         */
-        removeAttributeValue( attributeValue: Sdk.AttributeBase, errorIfNotFound?: boolean ): void;
-    }
-
-    class QueryExpression extends QueryBase
-    {
-        /**
-         * Initializes a new instance of the QueryExpression class setting the entity name.
-         * @param entityName The name of the entity.
-         */
-        constructor( entityName: string );
-
-        /**
-         * Gets the complex condition and logical filter expressions that filter the results of the query.
-         */
-        getCriteria(): FilterExpression;
-
-        /**
-         * Sets the complex condition and logical filter expressions that filter the results of the query.
-         * @param criteria The query condition and filter criteria.
-         */
-        setCriteria( criteria: FilterExpression ): void;
-
-        /**
-         * Gets whether the results of the query contain duplicate entity instances.
-         */
-        getDistinct(): boolean;
-
-        /**
-         * Sets whether the results of the query contain duplicate entity instances.
-         */
-        setDistinct( isDistinct: boolean ): void;
-
-        /**
-         * Gets an Sdk.Collection of Sdk.Query.LinkEntity instances.
-         */
-        getLinkEntities(): Sdk.Collection<LinkEntity>;
-
-        /**
-         * Gets a value that indicates that no shared locks are issued against the data that would prohibit other transactions from modifying the data in the records returned from the query.
-         */
-        getNoLock(): boolean;
-
-        /**
-         * Sets a value that indicates that no shared locks are issued against the data that would prohibit other transactions from modifying the data in the records returned from the query.
-         * @param isNoLock True if there are no shared locks are issued against the data that would prohibit other transactions from modifying the data in the records returned from the query; otherwise, false.
-         */
-        setNoLock( isNoLock: boolean ): void;
-
-        /// prototype methods
-
-        /**
-         *  Contains a condition expression used to filter the results of the query.
-         * @param entityName The logical name of the entity in the condition expression.
-         * @param attributeName The logical name of the attribute in the condition expression.
-         * @param operator The condition operator.
-         * @param values The value(s) to compare. Use one of the following classes that inherit from Sdk.Query.ValueBase:
-         *          Sdk.Query.Booleans
-         *          Sdk.Query.BooleanManagedProperties
-         *          Sdk.Query.Dates
-         *          Sdk.Query.Decimals
-         *          Sdk.Query.Doubles
-         *          Sdk.Query.EntityReferences
-         *          Sdk.Query.Guids
-         *          Sdk.Query.Ints
-         *          Sdk.Query.Longs
-         *          Sdk.Query.Money
-         *          Sdk.Query.OptionSets
-         *          Sdk.Query.Strings
-         */
-        addCondition( entityName: string, attributeName: string, conditionOperator: Sdk.Query.ConditionOperator, values: Sdk.Query.ValueBase ): void;
-
-        /**
-         * Adds the specified link to the query expression setting the entity name to link to, the attribute name to link from and the attribute name to link to.
-         * @param firstParam An Sdk.Query.LinkEntity instance.
-         */
-        addLink( firstParam: Sdk.Query.LinkEntity ): void;
-
-        /**
-         * Adds the specified link to the query expression setting the entity name to link to, the attribute name to link from and the attribute name to link to.
-         * @param firstParam The name of entity to link from.
-         * @param linkFromAttributeName The name of the attribute to link from.
-         * @param linkToAttributeName The name of the attribute to link to.
-         * @param joinOperator The join operator. The default value is Inner
-         */
-        addLink( firstParam: string, linkFromAttributeName: string, linkToAttributeName: string, joinOperator: Sdk.Query.JoinOperator ): void;
-
-        /**
-         * Adds the specified order expression to the query expression.
-         * @param attributeName The name of the attribute.
-         * @param orderType The order, ascending or descending. Ascending is the default if not specified.
-         */
-        addOrder( attributeName: string, orderType: Sdk.Query.OrderType ): void;
-    }
-
-    class OrderExpression
-    {
-    }
-
-    class ConditionExpression
-    {
-        /**
-         * Contains a condition expression used to filter the results of the query.
-         * @param name entityName The logical name of the entity in the condition expression.
-         * @param name attributeName The logical name of the attribute in the condition expression.
-         * @param name operator The condition operator.
-         * @param name values The value(s) to compare.
-         *  Use one of the following classes that inherit from Sdk.Query.ValueBase: </para>
-         *  - Sdk.Query.Booleans </para>
-         *  - Sdk.Query.BooleanManagedProperties </para>
-         *  - Sdk.Query.Dates </para>
-         *  - Sdk.Query.Decimals </para>
-         *  - Sdk.Query.Doubles </para>
-         *  - Sdk.Query.EntityReferences </para>
-         *  - Sdk.Query.Guids </para>
-         *  - Sdk.Query.Ints </para>
-         *  - Sdk.Query.Longs </para>
-         *  - Sdk.Query.Money </para>
-         *  - Sdk.Query.OptionSets </para>
-         *  - Sdk.Query.Strings </para>
-         */
-        constructor( entityName: string, attributeName: string, operator: ConditionOperator, values?: ValueBase );
-
-        /**
-         * Returns the logical name of the entity in the condition expression.
-         */
-        getEntityName(): string;
-
-        /**
-         * Sets the logical name of the entity in the condition expression.
-         * @param name The logical name of the entity in the condition expression.
-         */
-        setEntityName( name: string ): void;
-
-        /**
-         * Returns the logical name of the attribute in the condition expression.
-         */
-        getAttributeName(): string;
-
-        /**
-         * Sets the logical name of the attribute in the condition expression.
-         * @param name The logical name of the attribute in the condition expression.
-         */
-        setAttributeName( name: string ): void;
-
-        /**
-         * Returns the condition operator.
-         */
-        getOperator(): ConditionOperator;
-
-        /**
-         * Sets the condition operator.
-         * @param operator The condition operator.
-         */
-        setOperator( operator: ConditionOperator ): void;
-
-        /**
-         * Returns the values for the attribute.
-         */
-        getValues(): ValueBase;
-
-        /**
-         * Sets the values for the attribute.
-         * @param The value(s) to compare
-         *  Use one of the following classes that inherit from Sdk.Query.ValueBase:
-         *  - Sdk.Query.Booleans
-         *  - Sdk.Query.BooleanManagedProperties
-         *  - Sdk.Query.Dates
-         *  - Sdk.Query.Decimals
-         *  - Sdk.Query.Doubles
-         *  - Sdk.Query.EntityReferences
-         *  - Sdk.Query.Guids
-         *  - Sdk.Query.Ints
-         *  - Sdk.Query.Longs
-         *  - Sdk.Query.Money
-         *  - Sdk.Query.OptionSets
-         *  - Sdk.Query.Strings
-         */
-        setValues( values: ValueBase ): void;
-    }
-
-    /**
-     * Specifies complex condition and logical filter expressions used for filtering the results of the query.
-     * @param logicalOperator The filter operator.
-     */
-    class FilterExpression
-    {
-        constructor( logicalOperator: LogicalOperator );
-
-        /**
-         * Adds a condition to the filter expression setting the attribute name, condition operator, and values.
-         * @param conditionExpression The expression that will set the condition.
-         */
-        public addCondition( firstParam: ConditionExpression ): void;
-
-        /**
-         * Adds a condition to the filter expression setting the attribute name, condition operator, and values.
-         * @param entityName The entityName of the new ConditionExpression that will be instantiated using the other parameters.
-         * @param attributeName The attribute name to use in the condition expression.
-         * @param conditionOperator The condition operator if the first parameter is a string.
-         * @param values The value(s) to compare.
-         *  Use one of the following classes that
-         *  - Sdk.Query.Booleans
-         *  - Sdk.Query.BooleanManagedProperties
-         *  - Sdk.Query.Dates
-         *  - Sdk.Query.Decimals
-         *  - Sdk.Query.Doubles
-         *  - Sdk.Query.EntityReferences
-         *  - Sdk.Query.Guids
-         *  - Sdk.Query.Ints
-         *  - Sdk.Query.Longs
-         *  - Sdk.Query.Money
-         *  - Sdk.Query.OptionSets
-         *  - Sdk.Query.Strings
-         */
-        public addCondition( entityName: string, attributeName: string, conditionOperator: ConditionOperator, values?: ValueBase ): void;
-
-        /**
-         * Adds a child filter to the filter expression.
-         * @param filterExpression The filter to add.
-         */
-        addFilter( filterExpression: FilterExpression ): void;
-
-        /**
-         * Adds a child filter to the filter expression.
-         * @param logicalOperator Creates new FilterExpression with the specified logical operator and adds it.
-         */
-        addFilter( logicalOperator: LogicalOperator ): void;
-
-        /**
-         * Returns a collection of Sdk.Query.ConditionExpression values.
-         */
-        getConditions(): Sdk.Collection<ConditionExpression>;
-
-        /**
-         * Gets the logical AND/OR filter operator.
-         */
-        getFilterOperator(): LogicalOperator
-
-        /**
-         * Returns an Sdk.Collection of Sdk.Query.FilterExpression.
-         */
-        getFilters(): Sdk.Collection<FilterExpression>;
-
-        /**
-         * Gets whether the expression is part of a quick find query.
-         */
-        getIsQuickFindFilter(): boolean;
-
-        /**
-         * Sets the filter operator.
-         * @param filterOperator The filter operator.
-         */
-        setFilterOperator( filterOperator: LogicalOperator ): void;
-
-        /**
-         * Sets whether the expression is part of a quick find query.
-         * @param isQuickFind True if the filter is part of a quick find query; otherwise, false.
-         */
-        setIsQuickFindFilter( isQuickFind: boolean ): void;
-    }
-
-    class FetchExpression
-    {
-        /**
-         * @param fetchXml The FetchXml to be used in a query.
-         */
-        constructor( fetchXml: string );
-
-        /**
-         * Gets the FetchXml to be used in a query.
-         */
-        public getFetchXml(): string;
-
-        /**
-         * Sets the FetchXml to be used in a query.
-         * @param fetchXml The FetchXml to be used in a query.
-         */
-        public setFetchXml( fetchXml: string ): void;
-    }
-
-    class LinkEntity
-    {
-        /**
-         * Initializes a new instance of the Sdk.Query.LinkEntity class setting the required properties.
-         * @param linkFromEntityName The logical name of the entity to link from.
-         * @param linkToEntityName The logical name of the entity to link to.
-         * @param linkFromAttributeName The name of the attribute to link from.
-         * @param linkToAttributeName The name of the attribute to link to.
-         * @param joinOperator The join operator.
-         * @param entityAlias The string representing an alias for the linkToEntityName.
-         */
-        constructor(
-            linkFromEntityName: string,
-            linkToEntityName: string,
-            linkFromAttributeName: string,
-            linkToAttributeName: string,
-            joinOperator: Sdk.Query.JoinOperator,
-            entityAlias: string );
-
-        /**
-         * Adds a linked entity.
-         * @param linkEntity An Sdk.Query.LinkEntity to add.
-         */
-        public addLink( linkEntity: Sdk.Query.LinkEntity ): void;
-
-        /**
-         * Gets the column set.
-         */
-        public getColumns(): Sdk.ColumnSet;
-
-        /**
-         * Sets the columns to include.
-         * @param columns An Sdk.ColumnSet instance.
-         */
-        public setColumns( columns: Sdk.ColumnSet ): void;
-
-        /**
-         * Sets the columns to include.
-         * @param columns An Array of attribute logical names for the columns to return.
-         */
-        public setColumns( columns: string[] ): void;
-
-        /**
-         * Sets the columns to include.
-         * @param columns Pass each attribute logical name as an argument.
-         */
-        public setColumns( ...columns: string[] ): void;
-
-        /**
-         * Gets the alias for the entity.
-         */
-        public getEntityAlias(): string;
-
-        /**
-         * Sets the alias for the entity.
-         * @param alias The alias for the entity.
-         */
-        public setEntityAlias( alias: string ): void;
-
-        /**
-         * Gets the join operator.
-         */
-        public getJoinOperator(): Sdk.Query.JoinOperator;
-
-        /**
-         * Sets the join operator.
-         * @param operator The join operator.
-         */
-        public setJoinOperator( operator: Sdk.Query.JoinOperator ): void;
-
-        /**
-         * Gets the complex condition and logical filter expressions that filter the results of the query.
-         */
-        public getLinkCriteria(): Sdk.Query.FilterExpression;
-
-        /**
-         * Sets the complex condition and logical filter expressions that filter the results of the query.
-         * @param criteria The complex condition and logical filter expressions that filter the results of the query.
-         */
-        public setLinkCriteria( criteria: Sdk.Query.FilterExpression ): void;
-
-        /**
-         * Gets the collection of Sdk.Query.LinkEntity that define links between multiple entity types.
-         */
-        public getLinkEntities(): Sdk.Collection<Sdk.Query.LinkEntity>;
-
-        /**
-         * Gets the logical name of the attribute of the entity that you are linking from.
-         */
-        public getLinkFromAttributeName(): string;
-
-        /**
-         * Sets the logical name of the attribute of the entity that you are linking from.
-         * @param name The logical name of the attribute of the entity that you are linking from.
-         */
-        public setLinkFromAttributeName( name: string ): void;
-
-        /**
-         * Gets the logical name of the entity that you are linking from.
-         */
-        public getLinkFromEntityName(): string;
-
-        /**
-         * Sets the logical name of the entity that you are linking from.
-         * @param name The logical name of the entity that you are linking from.
-         */
-        public setLinkFromEntityName( name: string ): void;
-
-        /**
-         * Gets the logical name of the attribute of the entity that you are linking to
-         */
-        public getLinkToAttributeName(): string;
-
-        /**
-         * Sets the logical name of the attribute of the entity that you are linking to.
-         * @param name The logical name of the attribute of the entity that you are linking to.
-         */
-        public setLinkToAttributeName( name: string ): void;
-
-        /**
-         * Gets the logical name of the entity that you are linking to.
-         */
-        public getLinkToEntityName(): string;
-
-        /**
-         * Sets the logical name of the entity that you are linking to.
-         * @param name The logical name of the entity that you are linking to.
-         */
-        public setLinkToEntityName( name: string ): void;
-
-        /**
-         * Gets the serialized link entity.
-         */
-        public toXml(): string;
-
-        /**
-         * Gets the serialized link entity values.
-         */
-        public toValueXml(): string;
-    }
-
-    class PagingInfo
-    {
-        /**
-         * Gets the number of entity instances returned per page.
-         */
-        getCount(): number;
-
-        /**
-         * Sets the number of entity instances returned per page.
-         * @param The number of entity instances returned per page
-         */
-        setCount( count: number ): void;
-
-        /**
-         * Gets the number of pages returned from the query.
-         */
-        getPageNumber(): number;
-
-        /**
-         * Sets the number of pages returned from the query.
-         * @param The number of pages returned from the query.
-         */
-        setPageNumber( pages: number ): void;
-
-        /**
-         * Gets the info used to page large result sets.
-         */
-        getPagingCookie(): string;
-
-        /**
-         * Sets the info used to page large result sets.
-         */
-        setPagingCookie( cookie: string ): void;
-
-        /**
-         * Gets whether the total number of records should be returned from the query.
-         */
-        getReturnTotalRecordCount(): boolean;
-
-        /**
-         * Sets whether the total number of records should be returned from the query.
-         * @param Specifies whether the TotalRecordCount should be set when the query is executed.
-         */
-        setReturnTotalRecordCount( returnTotalRecordsCount: boolean ): void;
-
-
-        /// prototype methods
-
-        /**
-         * Gets the serialized paging info.
-         *
-        toXml():string;
-
-        /**
-         * Gets the serialized paging info values.
-         */
-        toValueXml(): string;
-    }
-
-    export enum ConditionOperator
-    {
-        Equal,
-        NotEqual,
-        GreaterThan,
-        LessThan,
-        GreaterEqual,
-        LessEqual,
-        Like,
-        NotLike,
-        In,
-        NotIn,
-        Between,
-        NotBetween,
-        Null,
-        NotNull,
-        Yesterday,
-        Today,
-        Tomorrow,
-        Last7Days,
-        Next7Days,
-        LastWeek,
-        ThisWeek,
-        NextWeek,
-        LastMonth,
-        ThisMonth,
-        NextMonth,
-        On,
-        OnOrBefore,
-        OnOrAfter,
-        LastYear,
-        ThisYear,
-        NextYear,
-        LastXHours,
-        NextXHours,
-        LastXDays,
-        NextXDays,
-        LastXWeeks,
-        NextXWeeks,
-        LastXMonths,
-        NextXMonths,
-        LastXYears,
-        NextXYears,
-        EqualUserId,
-        NotEqualUserId,
-        EqualBusinessId,
-        NotEqualBusinessId,
-        Mask,
-        NotMask,
-        Contains,
-        DoesNotContain,
-        EqualUserLanguage,
-        NotOn,
-        OlderThanXMonths,
-        BeginsWith,
-        DoesNotBeginWith,
-        EndsWith,
-        DoesNotEndWith,
-        ThisFiscalYear,
-        ThisFiscalPeriod,
-        NextFiscalYear,
-        NextFiscalPeriod,
-        LastFiscalYear,
-        LastFiscalPeriod,
-        LastXFiscalYears,
-        LastXFiscalPeriods,
-        NextXFiscalYears,
-        NextXFiscalPeriods,
-        InFiscalYear,
-        InFiscalPeriod,
-        InFiscalPeriodAndYear,
-        InOrBeforeFiscalPeriodAndYear,
-        InOrAfterFiscalPeriodAndYear,
-        EqualUserOrUserTeams,
-        EqualUserTeams,
-    }
-
-    export enum JoinOperator
-    {
-        Inner,
-        LeftOuter,
-        Natural,
-    }
-
-    export enum OrderType
-    {
-        Ascending,
-        Descending,
-    }
-
-    export class ValueBase
-    { }
-
-    /**
-     * Specifies Boolean values to be compared in the query.
-     * @param args An array of Boolean values.
-     */
-    class Booleans extends ValueBase
-    {
-        constructor( args: boolean[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of boolean values.
-         */
-        public getValues(): Sdk.Collection<boolean>;
-
-
-        /**
-         * Specifies a Boolean value to be compared in the query.
-         * @param setValueArgs An array of boolean values.
-         */
-        public setValues( setValueArgs: boolean[] ): void;
-    }
-
-    /**
-     * Specifies the Date values to be compared in the query.
-     * @param args An array of Date values.
-     */
-    class Dates extends ValueBase
-    {
-        constructor( args: Date[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of Date values.
-         */
-        public getValues(): Sdk.Collection<Date>;
+    namespace Sdk.Query {
+        class QueryBase {
+            /**
+             * Internal Use Only.
+             * @param type An Abstract class for different query classes to inherit from.
+             */
+            constructor(type: string);
+
+            /**
+             * Gets the columns to include.
+             */
+            getColumnSet(): Sdk.ColumnSet;
+
+            /**
+             * Sets the columns to include.
+             * @param columns An Sdk.ColumnSet instance.
+             */
+            setColumnSet(columns: Sdk.ColumnSet): void;
+
+            /**
+             * Sets the columns to include.
+             * @param columns An array of attribute logical names for the columns to return.
+             */
+            setColumnSet(columns: Array<string>): void;
+
+            /**
+             * Sets the columns to include.
+             * @param columns Pass each attribute logical name as an argument.
+             */
+            setColumnSet(...columns: string[]): void;
+
+            /**
+             *
+             */
+            getQueryType(): string;
+
+            /**
+             * Gets the logical name of the entity.
+             */
+            getEntityName(): string;
+
+            /**
+             * Sets the logical name of the entity.
+             * @param name The logical name of the entity.
+             */
+            setEntityName(name: string): void;
+
+            /**
+             * Gets the number of pages and the number of entity instances per page returned from the query.
+             */
+            getPageInfo(): Sdk.Query.PagingInfo;
+
+            /**
+             * Sets the number of pages and the number of entity instances per page returned from the query.
+             * @param pageInfo The number of pages and the number of entity instances per page returned from the query.
+             */
+            setPageInfo(pageInfo: Sdk.Query.PagingInfo): void;
+
+            /**
+             * Adds the specified column to the column set.
+             * @param columnName The logical name of the column to add.
+             */
+            addColumn(columnName: string): void;
+
+            /**
+             * Removes a column from the ColumnSet used by the query.
+             * @param columnName The logical name of an attribute to be removed from the ColumnSet.
+             * @param errorIfNotFound Whether to throw an error when the column to remove is not found. The default is false.
+             */
+            removeColumn(columnName: string, errorIfNotFound?: boolean): void;
+
+            /**
+             * Gets an Sdk.Collection of Sdk.Query.OrderExpression instances that define the order in which the entity instances are returned from the query.
+             */
+            getOrders(): Sdk.Collection<Sdk.Query.OrderExpression>;
+
+            /**
+             * Gets the number of rows to be returned.
+             */
+            getTopCount(): number;
+
+            /**
+             * Sets the number of rows to be returned.
+             * @param count The number of rows to be returned.
+             */
+            setTopCount(count: number): void;
+
+            /**
+             * Gets the serialized QueryExpression.
+             */
+            toXml(): string;
+
+            /**
+             * Gets the serialized QueryExpression values.
+             */
+            toValueXml(): string;
+        }
+
+        class QueryByAttribute extends QueryBase {
+            /**
+             * Initializes a new instance of the QueryByAttribute class setting the entity name.
+             * @param entityName The logical name of the entity.
+             *
+             */
+            constructor(entityName: string);
+
+            /**
+             * Gets An Sdk.Collection of Sdk.AttributeBase attributes.
+             */
+            getAttributeValues(): Sdk.Collection<Sdk.AttributeBase>;
+
+            /**
+             * Sets an Sdk.Collection of Sdk.Query.OrderExpression instances that define the order in which the entity instances are returned from the query.
+             * @param orders An Sdk.Collection of Sdk.Query.OrderExpression instances that define the order in which the entity instances are returned from the query.
+             */
+            setOrders(orders: Sdk.Collection<Sdk.Query.OrderExpression>): void;
+
+            /// prototype methods
+
+            /**
+             * Adds the attribute with values to include in the query.
+             * @param attributeValue One of the classes that inherit from Sdk.AttributeBase including the value to use as criteria.
+             */
+            addAttributeValue(attributeValue: Sdk.AttributeBase): void;
+
+            /**
+             * Adds an order to apply to the results of the query.
+             * @param order An order expression.
+             */
+            addOrder(order: Sdk.Query.OrderExpression): void;
+
+            /**
+             * Removes an attribute with values to include in the query.
+             * @param attributeValue One of the classes that inherit from Sdk.AttributeBase including the value to use as criteria.
+             * @param errorIfNotFound Whether to throw an error when the attribute to remove is not found. The default is false.
+             */
+            removeAttributeValue(attributeValue: Sdk.AttributeBase, errorIfNotFound?: boolean): void;
+        }
+
+        class QueryExpression extends QueryBase {
+            /**
+             * Initializes a new instance of the QueryExpression class setting the entity name.
+             * @param entityName The name of the entity.
+             */
+            constructor(entityName: string);
+
+            /**
+             * Gets the complex condition and logical filter expressions that filter the results of the query.
+             */
+            getCriteria(): FilterExpression;
+
+            /**
+             * Sets the complex condition and logical filter expressions that filter the results of the query.
+             * @param criteria The query condition and filter criteria.
+             */
+            setCriteria(criteria: FilterExpression): void;
+
+            /**
+             * Gets whether the results of the query contain duplicate entity instances.
+             */
+            getDistinct(): boolean;
+
+            /**
+             * Sets whether the results of the query contain duplicate entity instances.
+             */
+            setDistinct(isDistinct: boolean): void;
+
+            /**
+             * Gets an Sdk.Collection of Sdk.Query.LinkEntity instances.
+             */
+            getLinkEntities(): Sdk.Collection<LinkEntity>;
+
+            /**
+             * Gets a value that indicates that no shared locks are issued against the data that would prohibit other transactions from modifying the data in the records returned from the query.
+             */
+            getNoLock(): boolean;
+
+            /**
+             * Sets a value that indicates that no shared locks are issued against the data that would prohibit other transactions from modifying the data in the records returned from the query.
+             * @param isNoLock True if there are no shared locks are issued against the data that would prohibit other transactions from modifying the data in the records returned from the query; otherwise, false.
+             */
+            setNoLock(isNoLock: boolean): void;
+
+            /// prototype methods
+
+            /**
+             *  Contains a condition expression used to filter the results of the query.
+             * @param entityName The logical name of the entity in the condition expression.
+             * @param attributeName The logical name of the attribute in the condition expression.
+             * @param operator The condition operator.
+             * @param values The value(s) to compare. Use one of the following classes that inherit from Sdk.Query.ValueBase:
+             *          Sdk.Query.Booleans
+             *          Sdk.Query.BooleanManagedProperties
+             *          Sdk.Query.Dates
+             *          Sdk.Query.Decimals
+             *          Sdk.Query.Doubles
+             *          Sdk.Query.EntityReferences
+             *          Sdk.Query.Guids
+             *          Sdk.Query.Ints
+             *          Sdk.Query.Longs
+             *          Sdk.Query.Money
+             *          Sdk.Query.OptionSets
+             *          Sdk.Query.Strings
+             */
+            addCondition(entityName: string, attributeName: string, conditionOperator: Sdk.Query.ConditionOperator, values: Sdk.Query.ValueBase): void;
+
+            /**
+             * Adds the specified link to the query expression setting the entity name to link to, the attribute name to link from and the attribute name to link to.
+             * @param firstParam An Sdk.Query.LinkEntity instance.
+             */
+            addLink(firstParam: Sdk.Query.LinkEntity): void;
+
+            /**
+             * Adds the specified link to the query expression setting the entity name to link to, the attribute name to link from and the attribute name to link to.
+             * @param firstParam The name of entity to link from.
+             * @param linkFromAttributeName The name of the attribute to link from.
+             * @param linkToAttributeName The name of the attribute to link to.
+             * @param joinOperator The join operator. The default value is Inner
+             */
+            addLink(firstParam: string, linkFromAttributeName: string, linkToAttributeName: string, joinOperator: Sdk.Query.JoinOperator): void;
+
+            /**
+             * Adds the specified order expression to the query expression.
+             * @param attributeName The name of the attribute.
+             * @param orderType The order, ascending or descending. Ascending is the default if not specified.
+             */
+            addOrder(attributeName: string, orderType: Sdk.Query.OrderType): void;
+        }
+
+        class OrderExpression {
+        }
+
+        class ConditionExpression {
+            /**
+             * Contains a condition expression used to filter the results of the query.
+             * @param name entityName The logical name of the entity in the condition expression.
+             * @param name attributeName The logical name of the attribute in the condition expression.
+             * @param name operator The condition operator.
+             * @param name values The value(s) to compare.
+             *  Use one of the following classes that inherit from Sdk.Query.ValueBase: </para>
+             *  - Sdk.Query.Booleans </para>
+             *  - Sdk.Query.BooleanManagedProperties </para>
+             *  - Sdk.Query.Dates </para>
+             *  - Sdk.Query.Decimals </para>
+             *  - Sdk.Query.Doubles </para>
+             *  - Sdk.Query.EntityReferences </para>
+             *  - Sdk.Query.Guids </para>
+             *  - Sdk.Query.Ints </para>
+             *  - Sdk.Query.Longs </para>
+             *  - Sdk.Query.Money </para>
+             *  - Sdk.Query.OptionSets </para>
+             *  - Sdk.Query.Strings </para>
+             */
+            constructor(entityName: string, attributeName: string, operator: ConditionOperator, values?: ValueBase);
+
+            /**
+             * Returns the logical name of the entity in the condition expression.
+             */
+            getEntityName(): string;
+
+            /**
+             * Sets the logical name of the entity in the condition expression.
+             * @param name The logical name of the entity in the condition expression.
+             */
+            setEntityName(name: string): void;
+
+            /**
+             * Returns the logical name of the attribute in the condition expression.
+             */
+            getAttributeName(): string;
+
+            /**
+             * Sets the logical name of the attribute in the condition expression.
+             * @param name The logical name of the attribute in the condition expression.
+             */
+            setAttributeName(name: string): void;
+
+            /**
+             * Returns the condition operator.
+             */
+            getOperator(): ConditionOperator;
+
+            /**
+             * Sets the condition operator.
+             * @param operator The condition operator.
+             */
+            setOperator(operator: ConditionOperator): void;
+
+            /**
+             * Returns the values for the attribute.
+             */
+            getValues(): ValueBase;
+
+            /**
+             * Sets the values for the attribute.
+             * @param The value(s) to compare
+             *  Use one of the following classes that inherit from Sdk.Query.ValueBase:
+             *  - Sdk.Query.Booleans
+             *  - Sdk.Query.BooleanManagedProperties
+             *  - Sdk.Query.Dates
+             *  - Sdk.Query.Decimals
+             *  - Sdk.Query.Doubles
+             *  - Sdk.Query.EntityReferences
+             *  - Sdk.Query.Guids
+             *  - Sdk.Query.Ints
+             *  - Sdk.Query.Longs
+             *  - Sdk.Query.Money
+             *  - Sdk.Query.OptionSets
+             *  - Sdk.Query.Strings
+             */
+            setValues(values: ValueBase): void;
+        }
+
+        /**
+         * Specifies complex condition and logical filter expressions used for filtering the results of the query.
+         * @param logicalOperator The filter operator.
+         */
+        class FilterExpression {
+            constructor(logicalOperator: LogicalOperator);
+
+            /**
+             * Adds a condition to the filter expression setting the attribute name, condition operator, and values.
+             * @param conditionExpression The expression that will set the condition.
+             */
+            public addCondition(firstParam: ConditionExpression): void;
+
+            /**
+             * Adds a condition to the filter expression setting the attribute name, condition operator, and values.
+             * @param entityName The entityName of the new ConditionExpression that will be instantiated using the other parameters.
+             * @param attributeName The attribute name to use in the condition expression.
+             * @param conditionOperator The condition operator if the first parameter is a string.
+             * @param values The value(s) to compare.
+             *  Use one of the following classes that
+             *  - Sdk.Query.Booleans
+             *  - Sdk.Query.BooleanManagedProperties
+             *  - Sdk.Query.Dates
+             *  - Sdk.Query.Decimals
+             *  - Sdk.Query.Doubles
+             *  - Sdk.Query.EntityReferences
+             *  - Sdk.Query.Guids
+             *  - Sdk.Query.Ints
+             *  - Sdk.Query.Longs
+             *  - Sdk.Query.Money
+             *  - Sdk.Query.OptionSets
+             *  - Sdk.Query.Strings
+             */
+            public addCondition(entityName: string, attributeName: string, conditionOperator: ConditionOperator, values?: ValueBase): void;
+
+            /**
+             * Adds a child filter to the filter expression.
+             * @param filterExpression The filter to add.
+             */
+            addFilter(filterExpression: FilterExpression): void;
+
+            /**
+             * Adds a child filter to the filter expression.
+             * @param logicalOperator Creates new FilterExpression with the specified logical operator and adds it.
+             */
+            addFilter(logicalOperator: LogicalOperator): void;
+
+            /**
+             * Returns a collection of Sdk.Query.ConditionExpression values.
+             */
+            getConditions(): Sdk.Collection<ConditionExpression>;
+
+            /**
+             * Gets the logical AND/OR filter operator.
+             */
+            getFilterOperator(): LogicalOperator
+
+            /**
+             * Returns an Sdk.Collection of Sdk.Query.FilterExpression.
+             */
+            getFilters(): Sdk.Collection<FilterExpression>;
+
+            /**
+             * Gets whether the expression is part of a quick find query.
+             */
+            getIsQuickFindFilter(): boolean;
+
+            /**
+             * Sets the filter operator.
+             * @param filterOperator The filter operator.
+             */
+            setFilterOperator(filterOperator: LogicalOperator): void;
+
+            /**
+             * Sets whether the expression is part of a quick find query.
+             * @param isQuickFind True if the filter is part of a quick find query; otherwise, false.
+             */
+            setIsQuickFindFilter(isQuickFind: boolean): void;
+        }
+
+        class FetchExpression {
+            /**
+             * @param fetchXml The FetchXml to be used in a query.
+             */
+            constructor(fetchXml: string);
+
+            /**
+             * Gets the FetchXml to be used in a query.
+             */
+            public getFetchXml(): string;
+
+            /**
+             * Sets the FetchXml to be used in a query.
+             * @param fetchXml The FetchXml to be used in a query.
+             */
+            public setFetchXml(fetchXml: string): void;
+        }
+
+        class LinkEntity {
+            /**
+             * Initializes a new instance of the Sdk.Query.LinkEntity class setting the required properties.
+             * @param linkFromEntityName The logical name of the entity to link from.
+             * @param linkToEntityName The logical name of the entity to link to.
+             * @param linkFromAttributeName The name of the attribute to link from.
+             * @param linkToAttributeName The name of the attribute to link to.
+             * @param joinOperator The join operator.
+             * @param entityAlias The string representing an alias for the linkToEntityName.
+             */
+            constructor(
+                linkFromEntityName: string,
+                linkToEntityName: string,
+                linkFromAttributeName: string,
+                linkToAttributeName: string,
+                joinOperator: Sdk.Query.JoinOperator,
+                entityAlias: string);
+
+            /**
+             * Adds a linked entity.
+             * @param linkEntity An Sdk.Query.LinkEntity to add.
+             */
+            public addLink(linkEntity: Sdk.Query.LinkEntity): void;
+
+            /**
+             * Gets the column set.
+             */
+            public getColumns(): Sdk.ColumnSet;
+
+            /**
+             * Sets the columns to include.
+             * @param columns An Sdk.ColumnSet instance.
+             */
+            public setColumns(columns: Sdk.ColumnSet): void;
+
+            /**
+             * Sets the columns to include.
+             * @param columns An Array of attribute logical names for the columns to return.
+             */
+            public setColumns(columns: string[]): void;
+
+            /**
+             * Sets the columns to include.
+             * @param columns Pass each attribute logical name as an argument.
+             */
+            public setColumns(...columns: string[]): void;
+
+            /**
+             * Gets the alias for the entity.
+             */
+            public getEntityAlias(): string;
+
+            /**
+             * Sets the alias for the entity.
+             * @param alias The alias for the entity.
+             */
+            public setEntityAlias(alias: string): void;
+
+            /**
+             * Gets the join operator.
+             */
+            public getJoinOperator(): Sdk.Query.JoinOperator;
+
+            /**
+             * Sets the join operator.
+             * @param operator The join operator.
+             */
+            public setJoinOperator(operator: Sdk.Query.JoinOperator): void;
+
+            /**
+             * Gets the complex condition and logical filter expressions that filter the results of the query.
+             */
+            public getLinkCriteria(): Sdk.Query.FilterExpression;
+
+            /**
+             * Sets the complex condition and logical filter expressions that filter the results of the query.
+             * @param criteria The complex condition and logical filter expressions that filter the results of the query.
+             */
+            public setLinkCriteria(criteria: Sdk.Query.FilterExpression): void;
+
+            /**
+             * Gets the collection of Sdk.Query.LinkEntity that define links between multiple entity types.
+             */
+            public getLinkEntities(): Sdk.Collection<Sdk.Query.LinkEntity>;
+
+            /**
+             * Gets the logical name of the attribute of the entity that you are linking from.
+             */
+            public getLinkFromAttributeName(): string;
+
+            /**
+             * Sets the logical name of the attribute of the entity that you are linking from.
+             * @param name The logical name of the attribute of the entity that you are linking from.
+             */
+            public setLinkFromAttributeName(name: string): void;
+
+            /**
+             * Gets the logical name of the entity that you are linking from.
+             */
+            public getLinkFromEntityName(): string;
+
+            /**
+             * Sets the logical name of the entity that you are linking from.
+             * @param name The logical name of the entity that you are linking from.
+             */
+            public setLinkFromEntityName(name: string): void;
+
+            /**
+             * Gets the logical name of the attribute of the entity that you are linking to
+             */
+            public getLinkToAttributeName(): string;
+
+            /**
+             * Sets the logical name of the attribute of the entity that you are linking to.
+             * @param name The logical name of the attribute of the entity that you are linking to.
+             */
+            public setLinkToAttributeName(name: string): void;
+
+            /**
+             * Gets the logical name of the entity that you are linking to.
+             */
+            public getLinkToEntityName(): string;
+
+            /**
+             * Sets the logical name of the entity that you are linking to.
+             * @param name The logical name of the entity that you are linking to.
+             */
+            public setLinkToEntityName(name: string): void;
+
+            /**
+             * Gets the serialized link entity.
+             */
+            public toXml(): string;
+
+            /**
+             * Gets the serialized link entity values.
+             */
+            public toValueXml(): string;
+        }
+
+        class PagingInfo {
+            /**
+             * Gets the number of entity instances returned per page.
+             */
+            getCount(): number;
+
+            /**
+             * Sets the number of entity instances returned per page.
+             * @param The number of entity instances returned per page
+             */
+            setCount(count: number): void;
+
+            /**
+             * Gets the number of pages returned from the query.
+             */
+            getPageNumber(): number;
+
+            /**
+             * Sets the number of pages returned from the query.
+             * @param The number of pages returned from the query.
+             */
+            setPageNumber(pages: number): void;
+
+            /**
+             * Gets the info used to page large result sets.
+             */
+            getPagingCookie(): string;
+
+            /**
+             * Sets the info used to page large result sets.
+             */
+            setPagingCookie(cookie: string): void;
+
+            /**
+             * Gets whether the total number of records should be returned from the query.
+             */
+            getReturnTotalRecordCount(): boolean;
+
+            /**
+             * Sets whether the total number of records should be returned from the query.
+             * @param Specifies whether the TotalRecordCount should be set when the query is executed.
+             */
+            setReturnTotalRecordCount(returnTotalRecordsCount: boolean): void;
+
+
+            /// prototype methods
+
+            /**
+             * Gets the serialized paging info.
+             *
+            toXml():string;
+
+            /**
+             * Gets the serialized paging info values.
+             */
+            toValueXml(): string;
+        }
+
+        export enum ConditionOperator {
+            Equal,
+            NotEqual,
+            GreaterThan,
+            LessThan,
+            GreaterEqual,
+            LessEqual,
+            Like,
+            NotLike,
+            In,
+            NotIn,
+            Between,
+            NotBetween,
+            Null,
+            NotNull,
+            Yesterday,
+            Today,
+            Tomorrow,
+            Last7Days,
+            Next7Days,
+            LastWeek,
+            ThisWeek,
+            NextWeek,
+            LastMonth,
+            ThisMonth,
+            NextMonth,
+            On,
+            OnOrBefore,
+            OnOrAfter,
+            LastYear,
+            ThisYear,
+            NextYear,
+            LastXHours,
+            NextXHours,
+            LastXDays,
+            NextXDays,
+            LastXWeeks,
+            NextXWeeks,
+            LastXMonths,
+            NextXMonths,
+            LastXYears,
+            NextXYears,
+            EqualUserId,
+            NotEqualUserId,
+            EqualBusinessId,
+            NotEqualBusinessId,
+            Mask,
+            NotMask,
+            Contains,
+            DoesNotContain,
+            EqualUserLanguage,
+            NotOn,
+            OlderThanXMonths,
+            BeginsWith,
+            DoesNotBeginWith,
+            EndsWith,
+            DoesNotEndWith,
+            ThisFiscalYear,
+            ThisFiscalPeriod,
+            NextFiscalYear,
+            NextFiscalPeriod,
+            LastFiscalYear,
+            LastFiscalPeriod,
+            LastXFiscalYears,
+            LastXFiscalPeriods,
+            NextXFiscalYears,
+            NextXFiscalPeriods,
+            InFiscalYear,
+            InFiscalPeriod,
+            InFiscalPeriodAndYear,
+            InOrBeforeFiscalPeriodAndYear,
+            InOrAfterFiscalPeriodAndYear,
+            EqualUserOrUserTeams,
+            EqualUserTeams,
+        }
+
+        export enum JoinOperator {
+            Inner,
+            LeftOuter,
+            Natural,
+        }
+
+        export enum OrderType {
+            Ascending,
+            Descending,
+        }
+
+        export class ValueBase
+        { }
+
+        /**
+         * Specifies Boolean values to be compared in the query.
+         * @param args An array of Boolean values.
+         */
+        class Booleans extends ValueBase {
+            constructor(args: boolean[]);
+
+            /**
+             * Returns the type of value with namespace prefix.
+             */
+            public getType(): string;
+
+            /**
+             * Returns an Sdk.Collection of boolean values.
+             */
+            public getValues(): Sdk.Collection<boolean>;
+
+
+            /**
+             * Specifies a Boolean value to be compared in the query.
+             * @param setValueArgs An array of boolean values.
+             */
+            public setValues(setValueArgs: boolean[]): void;
+        }
 
         /**
          * Specifies the Date values to be compared in the query.
-         * @param setValueArgs An array of Date values.
+         * @param args An array of Date values.
          */
-        public setValues( setValueArgs: Date[] ): void;
-    }
+        class Dates extends ValueBase {
+            constructor(args: Date[]);
 
-    /**
-     * Specifies the Decimal values to be compared in the query.
-     * @param args An array of Decimal values.
-     */
-    class Decimals extends ValueBase
-    {
-        constructor( args: number[] );
+            /**
+             * Returns the type of value with namespace prefix.
+             */
+            public getType(): string;
 
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
+            /**
+             * Returns an Sdk.Collection of Date values.
+             */
+            public getValues(): Sdk.Collection<Date>;
 
-        /**
-         * Returns an Sdk.Collection of number values.
-         */
-        public getValues(): Sdk.Collection<number>;
+            /**
+             * Specifies the Date values to be compared in the query.
+             * @param setValueArgs An array of Date values.
+             */
+            public setValues(setValueArgs: Date[]): void;
+        }
 
         /**
          * Specifies the Decimal values to be compared in the query.
-         * @param setValueArgs An array of number values.
+         * @param args An array of Decimal values.
          */
-        public setValues( setValueArgs: number[] ): void;
-    }
+        class Decimals extends ValueBase {
+            constructor(args: number[]);
 
-    /**
-     * Specifies the Double values to be compared in the query.
-     * @param args An array of Double values.
-     */
-    class Doubles extends ValueBase
-    {
-        constructor( args: number[] );
+            /**
+             * Returns the type of value with namespace prefix.
+             */
+            public getType(): string;
 
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
+            /**
+             * Returns an Sdk.Collection of number values.
+             */
+            public getValues(): Sdk.Collection<number>;
 
-        /**
-         * Returns an Sdk.Collection of number values.
-         */
-        public getValues(): Sdk.Collection<number>;
+            /**
+             * Specifies the Decimal values to be compared in the query.
+             * @param setValueArgs An array of number values.
+             */
+            public setValues(setValueArgs: number[]): void;
+        }
 
         /**
          * Specifies the Double values to be compared in the query.
-         * @param setValueArgs An array of number values.
+         * @param args An array of Double values.
          */
-        public setValues( setValueArgs: number[] ): void;
-    }
+        class Doubles extends ValueBase {
+            constructor(args: number[]);
 
-    /**
-     * Specifies the Int values to be compared in the query.
-     * @param args An array of Int values.
-     */
-    class Ints extends ValueBase
-    {
-        constructor( args: number[] );
+            /**
+             * Returns the type of value with namespace prefix.
+             */
+            public getType(): string;
+
+            /**
+             * Returns an Sdk.Collection of number values.
+             */
+            public getValues(): Sdk.Collection<number>;
+
+            /**
+             * Specifies the Double values to be compared in the query.
+             * @param setValueArgs An array of number values.
+             */
+            public setValues(setValueArgs: number[]): void;
+        }
 
         /**
-         * Returns the type of value with namespace prefix.
+         * Specifies the Int values to be compared in the query.
+         * @param args An array of Int values.
          */
-        public getType(): string;
+        class Ints extends ValueBase {
+            constructor(args: number[]);
 
-        /**
-         * Returns an Sdk.Collection of number values.
-         */
-        public getValues(): Sdk.Collection<number>;
+            /**
+             * Returns the type of value with namespace prefix.
+             */
+            public getType(): string;
 
-        /**
-         * Specifies the Int values to be compared in the query
-         * @param setValueArgs An array of number values.
-         */
-        public setValues( setValueArgs: number[] ): void;
-    }
+            /**
+             * Returns an Sdk.Collection of number values.
+             */
+            public getValues(): Sdk.Collection<number>;
 
-    /**
-     * Specifies the Long values to be compared in the query.
-     * @param args An array of Long values.
-     */
-    class Longs extends ValueBase
-    {
-        constructor( args: number[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of number values.
-         */
-        public getValues(): Sdk.Collection<number>;
+            /**
+             * Specifies the Int values to be compared in the query
+             * @param setValueArgs An array of number values.
+             */
+            public setValues(setValueArgs: number[]): void;
+        }
 
         /**
          * Specifies the Long values to be compared in the query.
-         * @param setValueArgs An array of number values.
+         * @param args An array of Long values.
          */
-        public setValues( setValueArgs: number[] ): void;
-    }
+        class Longs extends ValueBase {
+            constructor(args: number[]);
 
-    /**
-     * Specifies the Sdk.EntityReference values to be compared in the query.
-     * @param args An array of Sdk.EntityReference values.
-     */
-    class EntityReferences extends ValueBase
-    {
-        constructor( args: Sdk.EntityReference[] );
+            /**
+             * Returns the type of value with namespace prefix.
+             */
+            public getType(): string;
+
+            /**
+             * Returns an Sdk.Collection of number values.
+             */
+            public getValues(): Sdk.Collection<number>;
+
+            /**
+             * Specifies the Long values to be compared in the query.
+             * @param setValueArgs An array of number values.
+             */
+            public setValues(setValueArgs: number[]): void;
+        }
 
         /**
-         * Returns the type of value with namespace prefix.
+         * Specifies the Sdk.EntityReference values to be compared in the query.
+         * @param args An array of Sdk.EntityReference values.
          */
-        public getType(): string;
+        class EntityReferences extends ValueBase {
+            constructor(args: Sdk.EntityReference[]);
+
+            /**
+             * Returns the type of value with namespace prefix.
+             */
+            public getType(): string;
+
+            /**
+             * Returns an Sdk.Collection of Sdk.EntityReference values.
+             */
+            public getValues(): Sdk.Collection<number>;
+
+            /**
+             * Specifies the Long values to be compared in the query.
+             * @param setValueArgs An array of Sdk.EntityReference values.
+             */
+            public setValues(setValueArgs: Sdk.EntityReference[]): void;
+        }
 
         /**
-         * Returns an Sdk.Collection of Sdk.EntityReference values.
+         * Specifies the Sdk.Query.Guids values to be compared in the query.
+         * @param args An array of GUID string values.
          */
-        public getValues(): Sdk.Collection<number>;
+        class Guids extends ValueBase {
+            constructor(args: string[]);
 
-        /**
-         * Specifies the Long values to be compared in the query.
-         * @param setValueArgs An array of Sdk.EntityReference values.
-         */
-        public setValues( setValueArgs: Sdk.EntityReference[] ): void;
-    }
+            /**
+             * Returns the type of value with namespace prefix.
+             */
+            public getType(): string;
 
-    /**
-     * Specifies the Sdk.Query.Guids values to be compared in the query.
-     * @param args An array of GUID string values.
-     */
-    class Guids extends ValueBase
-    {
-        constructor( args: string[] );
+            /**
+             * Returns an Sdk.Collection of GUID string values.
+             */
+            public getValues(): Sdk.Collection<string>;
 
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of GUID string values.
-         */
-        public getValues(): Sdk.Collection<string>;
-
-        /**
-         * Specifies the Long values to be compared in the query.
-         * @param setValueArgs An array of GUID string values.
-         */
-        public setValues( setValueArgs: string[] ): void;
-    }
-
-    /**
-     * Specifies the Money values to be compared in the query.
-     * @param args An array of number values.
-     */
-    class Money extends ValueBase
-    {
-        constructor( args: number[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of number values.
-         */
-        public getValues(): Sdk.Collection<number>;
+            /**
+             * Specifies the Long values to be compared in the query.
+             * @param setValueArgs An array of GUID string values.
+             */
+            public setValues(setValueArgs: string[]): void;
+        }
 
         /**
          * Specifies the Money values to be compared in the query.
-         * @param setValueArgs An array of number values.
+         * @param args An array of number values.
          */
-        public setValues( setValueArgs: number[] ): void;
-    }
+        class Money extends ValueBase {
+            constructor(args: number[]);
 
-    /**
-     * Specifies the OptionSet values to be compared in the query.
-     * @param args An array of number values.
-     */
-    class OptionSets extends ValueBase
-    {
-        constructor( args: number[] );
+            /**
+             * Returns the type of value with namespace prefix.
+             */
+            public getType(): string;
 
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
+            /**
+             * Returns an Sdk.Collection of number values.
+             */
+            public getValues(): Sdk.Collection<number>;
 
-        /**
-         * Returns an Sdk.Collection of number values.
-         */
-        public getValues(): Sdk.Collection<number>;
+            /**
+             * Specifies the Money values to be compared in the query.
+             * @param setValueArgs An array of number values.
+             */
+            public setValues(setValueArgs: number[]): void;
+        }
 
         /**
          * Specifies the OptionSet values to be compared in the query.
-         * @param setValueArgs An array of number values.
+         * @param args An array of number values.
          */
-        public setValues( setValueArgs: number[] ): void;
-    }
+        class OptionSets extends ValueBase {
+            constructor(args: number[]);
 
-    /**
-     * Specifies the String values to be compared in the query.
-     * @param args An array of String values.
-     */
-    class Strings extends ValueBase
-    {
-        constructor( args: string[] );
+            /**
+             * Returns the type of value with namespace prefix.
+             */
+            public getType(): string;
 
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
+            /**
+             * Returns an Sdk.Collection of number values.
+             */
+            public getValues(): Sdk.Collection<number>;
 
-        /**
-         * Returns an Sdk.Collection of String values.
-         */
-        public getValues(): Sdk.Collection<string>;
+            /**
+             * Specifies the OptionSet values to be compared in the query.
+             * @param setValueArgs An array of number values.
+             */
+            public setValues(setValueArgs: number[]): void;
+        }
 
         /**
          * Specifies the String values to be compared in the query.
-         * @param setValueArgs An array of String values.
+         * @param args An array of String values.
          */
-        public setValues( setValueArgs: string[] ): void
+        class Strings extends ValueBase {
+            constructor(args: string[]);
+
+            /**
+             * Returns the type of value with namespace prefix.
+             */
+            public getType(): string;
+
+            /**
+             * Returns an Sdk.Collection of String values.
+             */
+            public getValues(): Sdk.Collection<string>;
+
+            /**
+             * Specifies the String values to be compared in the query.
+             * @param setValueArgs An array of String values.
+             */
+            public setValues(setValueArgs: string[]): void
+        }
+
+        export enum LogicalOperator {
+            Or,
+            And,
+        }
     }
 
-    export enum LogicalOperator
-    {
-        Or,
-        And,
-    }
-}
-
-declare namespace Sdk.Util
-{
-    /**
-     * Verifies the parameter is a string formatted as a GUID.
-     * @param value The value to check.
-     */
-    function isGuid( value: string ): boolean;
-
-    /**
-     * Verifies the parameter is a string formatted as a GUID or null.
-     * @param value The value to check.
-     */
-    function isGuidOrNull( value: string ): boolean;
-
-    /**
-     * Verifies the parameter is a valid enum value.
-     * @param enumeration The enumeration.
-     * @param value The value to check.
-     */
-
-    /**
-     * Returns an empty GUID.
-     */
-    function getEmptyGuid(): string;
-
-    /**
-     * Formats a string with the arguments from an array.
-     * @param string The string containing placeholders for items in the array.
-     * @param args An array of strings to replace the placeholders.
-     */
-    function format( string: string, args: string[] ): string;
-
-    /**
-     *
-     */
-    function getError( resp: any ): string;
-
-    /**
-     * Returns the clinent URL.
-     */
-    function getClientUrl(): string;
-
-    /**
-     * Provides a way to override the client Url when a client-side context is not available.
-     * @param url The client URL to use instead of the default.
-     */
-    function setClientUrl( url: string ): void;
-
-    /**
-     *
-     */
-    function getXMLHttpRequest( action: string, async: boolean ): any;
-
-    /**
-     * Creates an entity from XML.
-     * @param The serialized entity returned from the SOAP service as XML.
-     */
-    function createEntityFromNode( node: string ): void;
-}
-
-declare namespace Sdk.Xml
-{
-}
-
-declare namespace Sdk.Mdq
-{
-    /**
-     * Defines a complex query to retrieve entity metadata.
-     * @param criteria The filter criteria for the metadata query.
-     * @param properties The properties to be returned by the query.
-     * @param attributeQuery A query expression for the entity attribute metadata to return.
-     * @param relationshipQuery A query expression for the entity relationship metadata to return.
-     * @param labelQuery A query expression for the labels to return.
-     */
-    export class EntityQueryExpression
-    {
-        constructor(
-            criteria: Sdk.Mdq.MetadataFilterExpression,
-            properties: Sdk.Mdq.MetadataPropertiesExpression,
-            attributeQuery?: Sdk.Mdq.AttributeQueryExpression,
-            relationshipQuery?: Sdk.Mdq.RelationshipQueryExpression,
-            labelQuery?: Sdk.Mdq.LabelQueryExpression );
-    }
-
-    /**
-     * An enumeration that specifies the type of deleted metadata to retrieve.
-     */
-    export enum DeletedMetadataFilters
-    {
-        All, // All deleted metadata
-        Attribute, // Deleted Attribute metadata
-        Default, // The value used if not set. Equals Entity
-        Entity, //Deleted Entity metadata
-        Label, //Deleted Label metadata
-        OptionSet, // Deleted OptionSet metadata
-        Relationship, //Deleted Relationship metadata
-    }
-
-    /**
-     * Specifies complex condition and logical filter expressions used for filtering the results of a metadata query.
-     * @param filterOperator The logical AND/OR filter operator.
-     */
-
-    export class MetadataFilterExpression
-    {
-        constructor( filterOperator: Sdk.Mdq.LogicalOperator );
+    namespace Sdk.Util {
+        /**
+         * Verifies the parameter is a string formatted as a GUID.
+         * @param value The value to check.
+         */
+        function isGuid(value: string): boolean;
 
         /**
-         * Adds a condition. This method accepts either the properties to create a new Sdk.Mdq.MetadataConditionExpression or a Sdk.Mdq.MetadataConditionExpression as the first argument.
-         * @param propertyName The metadata property to evaluate.
-         * @param conditionOperator The condition operator.
-         * @param value The metadata value to evaluate.
+         * Verifies the parameter is a string formatted as a GUID or null.
+         * @param value The value to check.
          */
-        public addCondition(
-            propertyName: SearchableEntityMetadataProperties|SearchableAttributeMetadataProperties|SearchableRelationshipMetadataProperties,
-            conditionOperator: MetadataConditionOperator,
-            value: Object ): void;
-        public addCondition(
-            propertyName: SearchableAttributeMetadataProperties, conditionOperator: MetadataConditionOperator, value: any): void;
-        public addCondition(
-            propertyName: SearchableEntityMetadataProperties|SearchableAttributeMetadataProperties|SearchableRelationshipMetadataProperties,
-            conditionOperator: MetadataConditionOperator,
-            value: Object ): void;
-        addCondition(propertyName: SearchableAttributeMetadataProperties, conditionOperator: MetadataConditionOperator): void;
-        public addCondition(
-            propertyName: SearchableEntityMetadataProperties|SearchableAttributeMetadataProperties|SearchableRelationshipMetadataProperties,
-            conditionOperator: MetadataConditionOperator,
-            value: Object): void;
+        function isGuidOrNull(value: string): boolean;
+
+        /**
+         * Verifies the parameter is a valid enum value.
+         * @param enumeration The enumeration.
+         * @param value The value to check.
+         */
+
+        /**
+         * Returns an empty GUID.
+         */
+        function getEmptyGuid(): string;
+
+        /**
+         * Formats a string with the arguments from an array.
+         * @param string The string containing placeholders for items in the array.
+         * @param args An array of strings to replace the placeholders.
+         */
+        function format(string: string, args: string[]): string;
+
+        /**
+         *
+         */
+        function getError(resp: any): string;
+
+        /**
+         * Returns the clinent URL.
+         */
+        function getClientUrl(): string;
+
+        /**
+         * Provides a way to override the client Url when a client-side context is not available.
+         * @param url The client URL to use instead of the default.
+         */
+        function setClientUrl(url: string): void;
+
+        /**
+         *
+         */
+        function getXMLHttpRequest(action: string, async: boolean): any;
+
+        /**
+         * Creates an entity from XML.
+         * @param The serialized entity returned from the SOAP service as XML.
+         */
+        function createEntityFromNode(node: string): void;
     }
 
-    /**
-     * Defines a complex query to retrieve attribute metadata for entities retrieved using an Sdk.Mdq.EntityQueryExpression.
-     * @param criteria The filter criteria for the metadata query.
-     * @param properties The properties to be returned by the query.
-     */
-    export class AttributeQueryExpression
-    {
-        constructor( criteria: MetadataFilterExpression, properties: Sdk.Mdq.MetadataPropertiesExpression );
+    namespace Sdk.Xml {
     }
 
-    /**
-     * Defines a complex query to retrieve entity relationship metadata for entities retrieved using an EntityQueryExpression.
-     * @param criteria The filter criteria for the metadata query.
-     * @param properties The properties to be returned by the query.
-     */
-    export class RelationshipQueryExpression
-    {
-        constructor( criteria: MetadataFilterExpression, properties: Mdq.MetadataPropertiesExpression );
-    }
-
-    /**
-     * Defines the languages for the labels to be retrieved for metadata items that have labels.
-     * @param languages An array of LCID number values.
-     */
-    export class LabelQueryExpression
-    {
-        constructor( languages: Array<number> );
-    }
-
-    /**
-     * Logical operator.
-     */
-    export enum LogicalOperator
-    {
-        And,
-        Or,
-    }
-
-    /**
-     * Specifies the properties for which non-null values are returned from a query.
-     * @param allProperties  Whether to retrieve all the properties of a metadata object.
-     * @param propertyNames: >An array of strings representing the metadata properties to retrieve.
-     */
-    export class MetadataPropertiesExpression
-    {
-        constructor( allProperties: boolean, propertyNames?: Array<EntityMetadataProperties|AttributeMetadataProperties|RelationshipMetadataProperties|any> );
-    }
-
-    export enum RelationshipMetadataProperties
-    {
-        AssociatedMenuConfiguration,
-        CascadeConfiguration,
-        HasChanged,
-        Entity1AssociatedMenuConfiguration,
-        Entity1IntersectAttribute,
-        Entity1LogicalName,
-        Entity2AssociatedMenuConfiguration,
-        Entity2IntersectAttribute,
-        Entity2LogicalName,
-        IntersectEntityName,
-        IsCustomizable,
-        IntroducedVersion,
-        IsCustomRelationship,
-        IsManaged,
-        IsValidForAdvancedFind,
-        MetadataId,
-        ReferencedAttribute,
-        ReferencedEntity,
-        ReferencingAttribute,
-        ReferencingEntity,
-        RelationshipType,
-        SchemaName,
-        SecurityTypes,
-    }
-
-    export enum AttributeMetadataProperties
-    {
-        AttributeOf,
-        AttributeType,
-        AttributeTypeName,
-        CalculationOf,
-        CanBeSecuredForCreate,
-        CanBeSecuredForRead,
-        CanBeSecuredForUpdate,
-        CanModifyAdditionalSettings,
-        ColumnNumber,
-        DefaultFormValue,
-        DefaultValue,
-        DeprecatedVersion,
-        Description,
-        DisplayName,
-        EntityLogicalName,
-        Format,
-        FormatName,
-        ImeMode,
-        IntroducedVersion,
-        IsAuditEnabled,
-        IsCustomAttribute,
-        IsCustomizable,
-        IsManaged,
-        IsPrimaryId,
-        IsPrimaryName,
-        IsRenameable,
-        IsSecured,
-        IsValidForAdvancedFind,
-        IsValidForCreate,
-        IsValidForRead,
-        IsValidForUpdate,
-        LinkedAttributeId,
-        LogicalName,
-        MaxLength,
-        MaxValue,
-        MetadataId,
-        MinValue,
-        OptionSet,
-        Precision,
-        PrecisionSource,
-        RequiredLevel,
-        SchemaName,
-        Targets,
-        YomiOf,
-    }
-
-    export enum EntityMetadataProperties
-    {
-        ActivityTypeMask,
-        Attributes,
-        AutoCreateAccessTeams,
-        AutoRouteToOwnerQueue,
-        CanBeInManyToMany,
-        CanBePrimaryEntityInRelationship,
-        CanBeRelatedEntityInRelationship,
-        CanCreateAttributes,
-        CanCreateCharts,
-        CanCreateForms,
-        CanCreateViews,
-        CanModifyAdditionalSettings,
-        CanTriggerWorkflow,
-        Description,
-        DisplayCollectionName,
-        DisplayName,
-        IconLargeName,
-        IconMediumName,
-        IconSmallName,
-        IntroducedVersion,
-        IsActivity,
-        IsActivityParty,
-        IsAIRUpdated,
-        IsAuditEnabled,
-        IsAvailableOffline,
-        IsBusinessProcessEnabled,
-        IsChildEntity,
-        IsConnectionsEnabled,
-        IsCustomEntity,
-        IsCustomizable,
-        IsDocumentManagementEnabled,
-        IsDuplicateDetectionEnabled,
-        IsEnabledForCharts,
-        IsImportable,
-        IsIntersect,
-        IsMailMergeEnabled,
-        IsManaged,
-        IsMappable,
-        IsQuickCreateEnabled,
-        IsReadingPaneEnabled,
-        IsRenameable,
-        IsValidForAdvancedFind,
-        IsValidForQueue,
-        IsVisibleInMobile,
-        IsVisibleInMobileClient,
-        LogicalName,
-        ManyToManyRelationships,
-        ManyToOneRelationships,
-        MetadataId,
-        ObjectTypeCode,
-        OneToManyRelationships,
-        OwnershipType,
-        PrimaryIdAttribute,
-        PrimaryImageAttribute,
-        PrimaryNameAttribute,
-        Privileges,
-        RecurrenceBaseEntityLogicalName,
-        ReportViewName,
-        SchemaName,
-    }
-
-    export enum SearchableEntityMetadataProperties
-    {
-        ActivityTypeMask,
-        AutoCreateAccessTeams,
-        AutoRouteToOwnerQueue,
-        CanBeInManyToMany,
-        CanBePrimaryEntityInRelationship,
-        CanBeRelatedEntityInRelationship,
-        CanCreateAttributes,
-        CanCreateCharts,
-        CanCreateForms,
-        CanCreateViews,
-        CanModifyAdditionalSettings,
-        CanTriggerWorkflow,
-        IconLargeName,
-        IconMediumName,
-        IconSmallName,
-        IntroducedVersion,
-        IsActivity,
-        IsActivityParty,
-        IsAIRUpdated,
-        IsAuditEnabled,
-        IsAvailableOffline,
-        IsBusinessProcessEnabled,
-        IsChildEntity,
-        IsConnectionsEnabled,
-        IsCustomEntity,
-        IsCustomizable,
-        IsDocumentManagementEnabled,
-        IsDuplicateDetectionEnabled,
-        IsEnabledForCharts,
-        IsImportable,
-        IsIntersect,
-        IsMailMergeEnabled,
-        IsManaged,
-        IsMappable,
-        IsQuickCreateEnabled,
-        IsReadingPaneEnabled,
-        IsRenameable,
-        IsValidForAdvancedFind,
-        IsValidForQueue,
-        IsVisibleInMobile,
-        IsVisibleInMobileClient,
-        LogicalName,
-        MetadataId,
-        ObjectTypeCode,
-        OwnershipType,
-        PrimaryIdAttribute,
-        PrimaryImageAttribute,
-        PrimaryNameAttribute,
-        RecurrenceBaseEntityLogicalName,
-        ReportViewName,
-        SchemaName,
-    }
-
-    export enum SearchableAttributeMetadataProperties
-    {
-        AttributeOf,
-        AttributeType,
-        CalculationOf,
-        CanBeSecuredForCreate,
-        CanBeSecuredForRead,
-        CanBeSecuredForUpdate,
-        CanModifyAdditionalSettings,
-        ColumnNumber,
-        DefaultFormValue,
-        DefaultValue,
-        DeprecatedVersion,
-        EntityLogicalName,
-        Format,
-        FormatName,
-        ImeMode,
-        IntroducedVersion,
-        IsAuditEnabled,
-        IsCustomAttribute,
-        IsCustomizable,
-        IsManaged,
-        IsPrimaryId,
-        IsPrimaryName,
-        IsRenameable,
-        IsSecured,
-        IsValidForAdvancedFind,
-        IsValidForCreate,
-        IsValidForRead,
-        IsValidForUpdate,
-        LinkedAttributeId,
-        LogicalName,
-        MaxLength,
-        MaxValue,
-        MetadataId,
-        MinValue,
-        Precision,
-        PrecisionSource,
-        RequiredLevel,
-        SchemaName,
-        YomiOf,
-    }
-
-    export enum SearchableRelationshipMetadataProperties
-    {
-        HasChanged,
-        Entity1IntersectAttribute,
-        Entity1LogicalName,
-        Entity2IntersectAttribute,
-        Entity2LogicalName,
-        IntersectEntityName,
-        IsCustomizable,
-        IntroducedVersion,
-        IsCustomRelationship,
-        IsManaged,
-        IsValidForAdvancedFind,
-        MetadataId,
-        ReferencedAttribute,
-        ReferencedEntity,
-        ReferencingAttribute,
-        ReferencingEntity,
-        RelationshipType,
-        SchemaName,
-        SecurityTypes,
-    }
-
-    export enum MetadataConditionOperator
-    {
-        Equals,
-        NotEquals,
-        In,
-        NotIn,
-        GreaterThan,
-        LessThan,
-    }
-
-    export interface IEntityMetadata
-    {
-        ActivityTypeMask: number;
-        Attributes: IAttributeMetadata[];
-        AutoCreateAccessTeams: any;
-        AutoRouteToOwnerQueue: boolean;
-        CanBeInManyToMany: ManagedProperty<boolean>;
-        CanBePrimaryEntityInRelationship: ManagedProperty<boolean>;
-        CanBeRelatedEntityInRelationship: ManagedProperty<boolean>;
-        CanCreateAttributes: ManagedProperty<boolean>;
-        CanCreateCharts: ManagedProperty<boolean>;
-        CanCreateForms: ManagedProperty<boolean>;
-        CanCreateViews: ManagedProperty<boolean>;
-        CanModifyAdditionalSettings: ManagedProperty<boolean>;
-        CanTriggerWorkflow: boolean;
-        Description: Label;
-        DisplayCollectionName: Label;
-        DisplayName: Label;
-        IconLargeName: string;
-        IconMediumName: string;
-        IconSmallName: string;
-        IntroducedVersion: any;
-        IsActivity: boolean;
-        IsActivityParty: boolean;
-        IsAIRUpdated: boolean;
-        IsAuditEnabled: ManagedProperty<boolean>;
-        IsAvailableOffline: boolean;
-        IsBusinessProcessEnabled: boolean;
-        IsChildEntity: boolean;
-        IsConnectionsEnabled: ManagedProperty<boolean>;
-        IsCustomEntity: boolean;
-        IsCustomizable: ManagedProperty<boolean>;
-        IsDocumentManagementEnabled: boolean;
-        IsDuplicateDetectionEnabled: ManagedProperty<boolean>;
-        IsEnabledForCharts: boolean;
-        IsImportable: boolean;
-        IsIntersect: boolean;
-        IsMailMergeEnabled: ManagedProperty<boolean>;
-        IsManaged: boolean;
-        IsMappable: ManagedProperty<boolean>;
-        IsQuickCreateEnabled: boolean;
-        IsReadingPaneEnabled: boolean;
-        IsRenameable: boolean;
-        IsValidForAdvancedFind: boolean;
-        IsValidForQueue: ManagedProperty<boolean>;
-        IsVisibleInMobile: ManagedProperty<boolean>;
-        IsVisibleInMobileClient: boolean;
-        LogicalName: string;
-        ManyToManyRelationships: ManyToManyRelationshipMetadata;
-        ManyToOneRelationships: OneToManyRelationshipMetadata;
-        MetadataId: string;
-        ObjectTypeCode: number;
-        OneToManyRelationships: OneToManyRelationshipMetadata;
-        OwnershipType: "BusinessOwned" | "BusinessParented" | "None	OrganizationOwned" | "TeamOwned	UserOwned";
-        PrimaryIdAttribute: string;
-        PrimaryImageAttribute: string;
-        PrimaryNameAttribute: string;
-        Privileges: SecurityPrivilegeMetadata[];
-        RecurrenceBaseEntityLogicalName: string;
-        ReportViewName: string;
-        SchemaName: string;
-    }
-
-    export interface SecurityPrivilegeMetadata
-    {
-        CanBeBasic: boolean;
-        CanBeDeep: boolean;
-        CanBeEntityReference: boolean;
-        CanBeGlobal: boolean;
-        CanBeLocal: boolean;
-        CanBeParentEntityReference: boolean;
-        ExtensionData: boolean;
-        Name: string;
-        PrivilegeId: string;
-        PrivilegeType: "Append" | "AppendTo" | "Assign" | "Create" | "Delete" | "None" | "Read" | "Share" | "Write";
-    }
-
-    export interface OneToManyRelationshipMetadata
-    {
-        AssociatedMenuConfiguration: AssociatedMenuConfiguration;
-        CascadeConfiguration: CascadeConfiguration;
-        HasChanged: any;
-        IntroducedVersion: any;
-        IsCustomizable: ManagedProperty<boolean>;
-        IsCustomRelationship: boolean;
-        IsHierarchical: any;
-        IsManaged: boolean;
-        IsValidForAdvancedFind: boolean;
-        MetadataId: string;
-        ReferencedAttribute: string;
-        ReferencedEntity: string;
-        ReferencingAttribute: string;
-        ReferencingEntity: string;
-        RelationshipType: string;
-        SchemaName: string;
-        SecurityTypes: any;
-    }
-
-    export interface CascadeConfiguration
-    {
-        Assign: CascadeType;
-        Delete: CascadeType;
-        ExtensionData: CascadeType;
-        Merge: CascadeType;
-        Reparent: CascadeType;
-        Share: CascadeType;
-        Unshare: CascadeType;
-    }
-
-    export type CascadeType = "Active" | "Cascade" | "NoCascade" | "UserOwned";
-
-    export interface ManyToManyRelationshipMetadata
-    {
-        Entity1AssociatedMenuConfiguration: AssociatedMenuConfiguration;
-        Entity1IntersectAttribute: string;
-        Entity1LogicalName: string;
-        Entity2AssociatedMenuConfiguration: AssociatedMenuConfiguration;
-        Entity2IntersectAttribute: string;
-        Entity2LogicalName: string;
-        HasChanged: boolean;
-        IntersectEntityName: string;
-        IntroducedVersion: any;
-        IsCustomizable: ManagedProperty<boolean>;
-        IsCustomRelationship: boolean;
-        IsManaged: boolean;
-        IsValidForAdvancedFind: boolean;
-        MetadataId: string;
-        RelationshipType: RelationshipType;
-        SchemaName: string;
-        SecurityTypes: SecurityType;
-    }
-
-    export interface AssociatedMenuConfiguration
-    {
-        Behavior: AssociatedMenuBehavior;
-        Group: AssociatedMenuGroup;
-        Label: Label;
-        Order: number;
-    }
-
-    export type AssociatedMenuBehavior = "DoNotDisplay" | "UseCollectionName" | "UseLabel";
-
-    export type AssociatedMenuGroup = "Details" | "Marketing" | "Sales" | "Service";
-
-    export type RelationshipType = "Default" | "ManyToManyRelationship" | "OneToManyRelationship";
-
-    export type SecurityType = "Append" | "Inheritance" | "None" | "ParentChild" | "Pointer";
-
-    export interface IAttributeMetadata
-    {
-        AttributeOf: string;
-        AttributeType: "Customer" | "DateTime" | "Decimal" | "Double" | "EntityName" | "Integer" | "Lookup" | "ManagedProperty" | "Memo" | "Money" | "Owner" | "PartyList" | "Picklist" | "State" | "Status" | "Uniqueidentifier" | "Virtual"
-        AttributeTypeName: "BigIntType" | "BooleanType" | "CalendarRulesType" | "CustomerType" | "DateTimeType" | "DecimalType" | "DoubleType" | "EntityNameType" | "ImageType" | "IntegerType" | "LookupType" | "ManagedPropertyType" | "MemoType" | "MoneyType" | "OwnerType" | "PartyListType" | "PicklistType" | "StateType	StatusType" | "StringType" | "UniqueidentifierType" | "VirtualType";
-        CalculationOf: any;
-        CanBeSecuredForCreate: boolean;
-        CanBeSecuredForRead: boolean;
-        CanBeSecuredForUpdate: boolean;
-        CanModifyAdditionalSettings: ManagedProperty<boolean>;
-        ColumnNumber: number;
-        DefaultFormValue: any;
-        DefaultValue: any;
-        DeprecatedVersion: any;
-        Description: Label;
-        DisplayName: Label;
-        EntityLogicalName: string;
-        Format: any;
-        FormatName: string;
-        ImeMode: any;
-        IntroducedVersion: any;
-        IsAuditEnabled: boolean;
-        IsCustomAttribute: boolean;
-        IsCustomizable: ManagedProperty<boolean>;
-        IsManaged: boolean;
-        IsPrimaryId: boolean;
-        IsPrimaryName: boolean;
-        IsRenameable: ManagedProperty<boolean>;
-        IsSecured: boolean;
-        IsValidForAdvancedFind: ManagedProperty<boolean>;
-        IsValidForCreate: boolean;
-        IsValidForRead: boolean;
-        IsValidForUpdate: boolean;
-        LinkedAttributeId: string;
-        LogicalName: string;
-        MaxLength: number;
-        MaxValue: any;
-        MetadataId: string;
-        MinValue: number;
-        OptionSet: any;
-        Precision: any;
-        PrecisionSource: any;
-        RequiredLevel: ManagedProperty<string>;
-        SchemaName: string;
-        Targets: string[];
-        YomiOf: any;
-    }
-
-    export interface ManagedProperty<T>
-    {
-        CanBeChanged: boolean;
-        ManagedPropertyLogicalName: string;
-        Value: T;
-    }
-
-    export interface Label
-    {
-        LocalizedLabels: LocalizedLabel[];
-        UserLocalizedLabel: LocalizedLabel;
-    }
-
-    export interface LocalizedLabel
-    {
-        Label: string;
-        LangaugeCode: number;
-        MetadataId: string;
-        HasChanged: boolean;
-        IsManaged: boolean;
-    }
-
-    namespace ValueEnums
-    {
-        export enum OwnershipType
-        {
-            None,
-            OrganizationOwned,
-            TeamOwned,
-            UserOwned,
+    namespace Sdk.Mdq {
+        /**
+         * Defines a complex query to retrieve entity metadata.
+         * @param criteria The filter criteria for the metadata query.
+         * @param properties The properties to be returned by the query.
+         * @param attributeQuery A query expression for the entity attribute metadata to return.
+         * @param relationshipQuery A query expression for the entity relationship metadata to return.
+         * @param labelQuery A query expression for the labels to return.
+         */
+        export class EntityQueryExpression {
+            constructor(
+                criteria: Sdk.Mdq.MetadataFilterExpression,
+                properties: Sdk.Mdq.MetadataPropertiesExpression,
+                attributeQuery?: Sdk.Mdq.AttributeQueryExpression,
+                relationshipQuery?: Sdk.Mdq.RelationshipQueryExpression,
+                labelQuery?: Sdk.Mdq.LabelQueryExpression);
         }
 
-        export enum AttributeTypeCode
-        {
-            BigInt,
-            Boolean,
-            CalendarRules,
-            Customer,
-            DateTime,
-            Decimal,
-            Double,
-            EntityName,
-            Integer,
-            Lookup,
-            ManagedProperty,
-            Memo,
-            Money,
-            Owner,
-            PartyList,
-            Picklist,
-            State,
-            Status,
-            String,
-            Uniqueidentifier,
-            Virtual,
+        /**
+         * An enumeration that specifies the type of deleted metadata to retrieve.
+         */
+        export enum DeletedMetadataFilters {
+            All, // All deleted metadata
+            Attribute, // Deleted Attribute metadata
+            Default, // The value used if not set. Equals Entity
+            Entity, //Deleted Entity metadata
+            Label, //Deleted Label metadata
+            OptionSet, // Deleted OptionSet metadata
+            Relationship, //Deleted Relationship metadata
         }
 
+        /**
+         * Specifies complex condition and logical filter expressions used for filtering the results of a metadata query.
+         * @param filterOperator The logical AND/OR filter operator.
+         */
 
-        export enum AttributeRequiredLevel
-        {
-            ApplicationRequired,
-            None,
-            Recommended,
-            SystemRequired,
+        export class MetadataFilterExpression {
+            constructor(filterOperator: Sdk.Mdq.LogicalOperator);
+
+            /**
+             * Adds a condition. This method accepts either the properties to create a new Sdk.Mdq.MetadataConditionExpression or a Sdk.Mdq.MetadataConditionExpression as the first argument.
+             * @param propertyName The metadata property to evaluate.
+             * @param conditionOperator The condition operator.
+             * @param value The metadata value to evaluate.
+             */
+            public addCondition(
+                propertyName: SearchableEntityMetadataProperties | SearchableAttributeMetadataProperties | SearchableRelationshipMetadataProperties,
+                conditionOperator: MetadataConditionOperator,
+                value: Object): void;
+            public addCondition(
+                propertyName: SearchableAttributeMetadataProperties, conditionOperator: MetadataConditionOperator, value: any): void;
+            public addCondition(
+                propertyName: SearchableEntityMetadataProperties | SearchableAttributeMetadataProperties | SearchableRelationshipMetadataProperties,
+                conditionOperator: MetadataConditionOperator,
+                value: Object): void;
+            addCondition(propertyName: SearchableAttributeMetadataProperties, conditionOperator: MetadataConditionOperator): void;
+            public addCondition(
+                propertyName: SearchableEntityMetadataProperties | SearchableAttributeMetadataProperties | SearchableRelationshipMetadataProperties,
+                conditionOperator: MetadataConditionOperator,
+                value: Object): void;
         }
 
-
-        export enum DateTimeFormat
-        {
-            DateAndTime,
-            DateOnly,
+        /**
+         * Defines a complex query to retrieve attribute metadata for entities retrieved using an Sdk.Mdq.EntityQueryExpression.
+         * @param criteria The filter criteria for the metadata query.
+         * @param properties The properties to be returned by the query.
+         */
+        export class AttributeQueryExpression {
+            constructor(criteria: MetadataFilterExpression, properties: Sdk.Mdq.MetadataPropertiesExpression);
         }
 
-        export enum ImeMode
-        {
-            Active,
-            Auto,
-            Disabled,
-            Inactive,
+        /**
+         * Defines a complex query to retrieve entity relationship metadata for entities retrieved using an EntityQueryExpression.
+         * @param criteria The filter criteria for the metadata query.
+         * @param properties The properties to be returned by the query.
+         */
+        export class RelationshipQueryExpression {
+            constructor(criteria: MetadataFilterExpression, properties: Mdq.MetadataPropertiesExpression);
         }
 
-
-
-        export enum IntegerFormat
-        {
-            Duration,
-            Language,
-            Locale,
-            None,
-            TimeZone,
+        /**
+         * Defines the languages for the labels to be retrieved for metadata items that have labels.
+         * @param languages An array of LCID number values.
+         */
+        export class LabelQueryExpression {
+            constructor(languages: Array<number>);
         }
 
-
-        export enum SecurityTypes
-        {
-            Append,
-            Inheritance,
-            None,
-            ParentChild,
-            Pointer,
+        /**
+         * Logical operator.
+         */
+        export enum LogicalOperator {
+            And,
+            Or,
         }
 
-        export enum StringFormat
-        {
-            Email,
-            PhoneticGuide,
-            Text,
-            TextArea,
-            TickerSymbol,
-            Url,
-            VersionNumber,
+        /**
+         * Specifies the properties for which non-null values are returned from a query.
+         * @param allProperties  Whether to retrieve all the properties of a metadata object.
+         * @param propertyNames: >An array of strings representing the metadata properties to retrieve.
+         */
+        export class MetadataPropertiesExpression {
+            constructor(allProperties: boolean, propertyNames?: Array<EntityMetadataProperties | AttributeMetadataProperties | RelationshipMetadataProperties | any>);
+        }
+
+        export enum RelationshipMetadataProperties {
+            AssociatedMenuConfiguration,
+            CascadeConfiguration,
+            HasChanged,
+            Entity1AssociatedMenuConfiguration,
+            Entity1IntersectAttribute,
+            Entity1LogicalName,
+            Entity2AssociatedMenuConfiguration,
+            Entity2IntersectAttribute,
+            Entity2LogicalName,
+            IntersectEntityName,
+            IsCustomizable,
+            IntroducedVersion,
+            IsCustomRelationship,
+            IsManaged,
+            IsValidForAdvancedFind,
+            MetadataId,
+            ReferencedAttribute,
+            ReferencedEntity,
+            ReferencingAttribute,
+            ReferencingEntity,
+            RelationshipType,
+            SchemaName,
+            SecurityTypes,
+        }
+
+        export enum AttributeMetadataProperties {
+            AttributeOf,
+            AttributeType,
+            AttributeTypeName,
+            CalculationOf,
+            CanBeSecuredForCreate,
+            CanBeSecuredForRead,
+            CanBeSecuredForUpdate,
+            CanModifyAdditionalSettings,
+            ColumnNumber,
+            DefaultFormValue,
+            DefaultValue,
+            DeprecatedVersion,
+            Description,
+            DisplayName,
+            EntityLogicalName,
+            Format,
+            FormatName,
+            ImeMode,
+            IntroducedVersion,
+            IsAuditEnabled,
+            IsCustomAttribute,
+            IsCustomizable,
+            IsManaged,
+            IsPrimaryId,
+            IsPrimaryName,
+            IsRenameable,
+            IsSecured,
+            IsValidForAdvancedFind,
+            IsValidForCreate,
+            IsValidForRead,
+            IsValidForUpdate,
+            LinkedAttributeId,
+            LogicalName,
+            MaxLength,
+            MaxValue,
+            MetadataId,
+            MinValue,
+            OptionSet,
+            Precision,
+            PrecisionSource,
+            RequiredLevel,
+            SchemaName,
+            Targets,
+            YomiOf,
+        }
+
+        export enum EntityMetadataProperties {
+            ActivityTypeMask,
+            Attributes,
+            AutoCreateAccessTeams,
+            AutoRouteToOwnerQueue,
+            CanBeInManyToMany,
+            CanBePrimaryEntityInRelationship,
+            CanBeRelatedEntityInRelationship,
+            CanCreateAttributes,
+            CanCreateCharts,
+            CanCreateForms,
+            CanCreateViews,
+            CanModifyAdditionalSettings,
+            CanTriggerWorkflow,
+            Description,
+            DisplayCollectionName,
+            DisplayName,
+            IconLargeName,
+            IconMediumName,
+            IconSmallName,
+            IntroducedVersion,
+            IsActivity,
+            IsActivityParty,
+            IsAIRUpdated,
+            IsAuditEnabled,
+            IsAvailableOffline,
+            IsBusinessProcessEnabled,
+            IsChildEntity,
+            IsConnectionsEnabled,
+            IsCustomEntity,
+            IsCustomizable,
+            IsDocumentManagementEnabled,
+            IsDuplicateDetectionEnabled,
+            IsEnabledForCharts,
+            IsImportable,
+            IsIntersect,
+            IsMailMergeEnabled,
+            IsManaged,
+            IsMappable,
+            IsQuickCreateEnabled,
+            IsReadingPaneEnabled,
+            IsRenameable,
+            IsValidForAdvancedFind,
+            IsValidForQueue,
+            IsVisibleInMobile,
+            IsVisibleInMobileClient,
+            LogicalName,
+            ManyToManyRelationships,
+            ManyToOneRelationships,
+            MetadataId,
+            ObjectTypeCode,
+            OneToManyRelationships,
+            OwnershipType,
+            PrimaryIdAttribute,
+            PrimaryImageAttribute,
+            PrimaryNameAttribute,
+            Privileges,
+            RecurrenceBaseEntityLogicalName,
+            ReportViewName,
+            SchemaName,
+        }
+
+        export enum SearchableEntityMetadataProperties {
+            ActivityTypeMask,
+            AutoCreateAccessTeams,
+            AutoRouteToOwnerQueue,
+            CanBeInManyToMany,
+            CanBePrimaryEntityInRelationship,
+            CanBeRelatedEntityInRelationship,
+            CanCreateAttributes,
+            CanCreateCharts,
+            CanCreateForms,
+            CanCreateViews,
+            CanModifyAdditionalSettings,
+            CanTriggerWorkflow,
+            IconLargeName,
+            IconMediumName,
+            IconSmallName,
+            IntroducedVersion,
+            IsActivity,
+            IsActivityParty,
+            IsAIRUpdated,
+            IsAuditEnabled,
+            IsAvailableOffline,
+            IsBusinessProcessEnabled,
+            IsChildEntity,
+            IsConnectionsEnabled,
+            IsCustomEntity,
+            IsCustomizable,
+            IsDocumentManagementEnabled,
+            IsDuplicateDetectionEnabled,
+            IsEnabledForCharts,
+            IsImportable,
+            IsIntersect,
+            IsMailMergeEnabled,
+            IsManaged,
+            IsMappable,
+            IsQuickCreateEnabled,
+            IsReadingPaneEnabled,
+            IsRenameable,
+            IsValidForAdvancedFind,
+            IsValidForQueue,
+            IsVisibleInMobile,
+            IsVisibleInMobileClient,
+            LogicalName,
+            MetadataId,
+            ObjectTypeCode,
+            OwnershipType,
+            PrimaryIdAttribute,
+            PrimaryImageAttribute,
+            PrimaryNameAttribute,
+            RecurrenceBaseEntityLogicalName,
+            ReportViewName,
+            SchemaName,
+        }
+
+        export enum SearchableAttributeMetadataProperties {
+            AttributeOf,
+            AttributeType,
+            CalculationOf,
+            CanBeSecuredForCreate,
+            CanBeSecuredForRead,
+            CanBeSecuredForUpdate,
+            CanModifyAdditionalSettings,
+            ColumnNumber,
+            DefaultFormValue,
+            DefaultValue,
+            DeprecatedVersion,
+            EntityLogicalName,
+            Format,
+            FormatName,
+            ImeMode,
+            IntroducedVersion,
+            IsAuditEnabled,
+            IsCustomAttribute,
+            IsCustomizable,
+            IsManaged,
+            IsPrimaryId,
+            IsPrimaryName,
+            IsRenameable,
+            IsSecured,
+            IsValidForAdvancedFind,
+            IsValidForCreate,
+            IsValidForRead,
+            IsValidForUpdate,
+            LinkedAttributeId,
+            LogicalName,
+            MaxLength,
+            MaxValue,
+            MetadataId,
+            MinValue,
+            Precision,
+            PrecisionSource,
+            RequiredLevel,
+            SchemaName,
+            YomiOf,
+        }
+
+        export enum SearchableRelationshipMetadataProperties {
+            HasChanged,
+            Entity1IntersectAttribute,
+            Entity1LogicalName,
+            Entity2IntersectAttribute,
+            Entity2LogicalName,
+            IntersectEntityName,
+            IsCustomizable,
+            IntroducedVersion,
+            IsCustomRelationship,
+            IsManaged,
+            IsValidForAdvancedFind,
+            MetadataId,
+            ReferencedAttribute,
+            ReferencedEntity,
+            ReferencingAttribute,
+            ReferencingEntity,
+            RelationshipType,
+            SchemaName,
+            SecurityTypes,
+        }
+
+        export enum MetadataConditionOperator {
+            Equals,
+            NotEquals,
+            In,
+            NotIn,
+            GreaterThan,
+            LessThan,
+        }
+
+        export interface IEntityMetadata {
+            ActivityTypeMask: number;
+            Attributes: IAttributeMetadata[];
+            AutoCreateAccessTeams: any;
+            AutoRouteToOwnerQueue: boolean;
+            CanBeInManyToMany: ManagedProperty<boolean>;
+            CanBePrimaryEntityInRelationship: ManagedProperty<boolean>;
+            CanBeRelatedEntityInRelationship: ManagedProperty<boolean>;
+            CanCreateAttributes: ManagedProperty<boolean>;
+            CanCreateCharts: ManagedProperty<boolean>;
+            CanCreateForms: ManagedProperty<boolean>;
+            CanCreateViews: ManagedProperty<boolean>;
+            CanModifyAdditionalSettings: ManagedProperty<boolean>;
+            CanTriggerWorkflow: boolean;
+            Description: Label;
+            DisplayCollectionName: Label;
+            DisplayName: Label;
+            IconLargeName: string;
+            IconMediumName: string;
+            IconSmallName: string;
+            IntroducedVersion: any;
+            IsActivity: boolean;
+            IsActivityParty: boolean;
+            IsAIRUpdated: boolean;
+            IsAuditEnabled: ManagedProperty<boolean>;
+            IsAvailableOffline: boolean;
+            IsBusinessProcessEnabled: boolean;
+            IsChildEntity: boolean;
+            IsConnectionsEnabled: ManagedProperty<boolean>;
+            IsCustomEntity: boolean;
+            IsCustomizable: ManagedProperty<boolean>;
+            IsDocumentManagementEnabled: boolean;
+            IsDuplicateDetectionEnabled: ManagedProperty<boolean>;
+            IsEnabledForCharts: boolean;
+            IsImportable: boolean;
+            IsIntersect: boolean;
+            IsMailMergeEnabled: ManagedProperty<boolean>;
+            IsManaged: boolean;
+            IsMappable: ManagedProperty<boolean>;
+            IsQuickCreateEnabled: boolean;
+            IsReadingPaneEnabled: boolean;
+            IsRenameable: boolean;
+            IsValidForAdvancedFind: boolean;
+            IsValidForQueue: ManagedProperty<boolean>;
+            IsVisibleInMobile: ManagedProperty<boolean>;
+            IsVisibleInMobileClient: boolean;
+            LogicalName: string;
+            ManyToManyRelationships: ManyToManyRelationshipMetadata;
+            ManyToOneRelationships: OneToManyRelationshipMetadata;
+            MetadataId: string;
+            ObjectTypeCode: number;
+            OneToManyRelationships: OneToManyRelationshipMetadata;
+            OwnershipType: "BusinessOwned" | "BusinessParented" | "None	OrganizationOwned" | "TeamOwned	UserOwned";
+            PrimaryIdAttribute: string;
+            PrimaryImageAttribute: string;
+            PrimaryNameAttribute: string;
+            Privileges: SecurityPrivilegeMetadata[];
+            RecurrenceBaseEntityLogicalName: string;
+            ReportViewName: string;
+            SchemaName: string;
+        }
+
+        export interface SecurityPrivilegeMetadata {
+            CanBeBasic: boolean;
+            CanBeDeep: boolean;
+            CanBeEntityReference: boolean;
+            CanBeGlobal: boolean;
+            CanBeLocal: boolean;
+            CanBeParentEntityReference: boolean;
+            ExtensionData: boolean;
+            Name: string;
+            PrivilegeId: string;
+            PrivilegeType: "Append" | "AppendTo" | "Assign" | "Create" | "Delete" | "None" | "Read" | "Share" | "Write";
+        }
+
+        export interface OneToManyRelationshipMetadata {
+            AssociatedMenuConfiguration: AssociatedMenuConfiguration;
+            CascadeConfiguration: CascadeConfiguration;
+            HasChanged: any;
+            IntroducedVersion: any;
+            IsCustomizable: ManagedProperty<boolean>;
+            IsCustomRelationship: boolean;
+            IsHierarchical: any;
+            IsManaged: boolean;
+            IsValidForAdvancedFind: boolean;
+            MetadataId: string;
+            ReferencedAttribute: string;
+            ReferencedEntity: string;
+            ReferencingAttribute: string;
+            ReferencingEntity: string;
+            RelationshipType: string;
+            SchemaName: string;
+            SecurityTypes: any;
+        }
+
+        export interface CascadeConfiguration {
+            Assign: CascadeType;
+            Delete: CascadeType;
+            ExtensionData: CascadeType;
+            Merge: CascadeType;
+            Reparent: CascadeType;
+            Share: CascadeType;
+            Unshare: CascadeType;
+        }
+
+        export type CascadeType = "Active" | "Cascade" | "NoCascade" | "UserOwned";
+
+        export interface ManyToManyRelationshipMetadata {
+            Entity1AssociatedMenuConfiguration: AssociatedMenuConfiguration;
+            Entity1IntersectAttribute: string;
+            Entity1LogicalName: string;
+            Entity2AssociatedMenuConfiguration: AssociatedMenuConfiguration;
+            Entity2IntersectAttribute: string;
+            Entity2LogicalName: string;
+            HasChanged: boolean;
+            IntersectEntityName: string;
+            IntroducedVersion: any;
+            IsCustomizable: ManagedProperty<boolean>;
+            IsCustomRelationship: boolean;
+            IsManaged: boolean;
+            IsValidForAdvancedFind: boolean;
+            MetadataId: string;
+            RelationshipType: RelationshipType;
+            SchemaName: string;
+            SecurityTypes: SecurityType;
+        }
+
+        export interface AssociatedMenuConfiguration {
+            Behavior: AssociatedMenuBehavior;
+            Group: AssociatedMenuGroup;
+            Label: Label;
+            Order: number;
+        }
+
+        export type AssociatedMenuBehavior = "DoNotDisplay" | "UseCollectionName" | "UseLabel";
+
+        export type AssociatedMenuGroup = "Details" | "Marketing" | "Sales" | "Service";
+
+        export type RelationshipType = "Default" | "ManyToManyRelationship" | "OneToManyRelationship";
+
+        export type SecurityType = "Append" | "Inheritance" | "None" | "ParentChild" | "Pointer";
+
+        export interface IAttributeMetadata {
+            AttributeOf: string;
+            AttributeType: "Customer" | "DateTime" | "Decimal" | "Double" | "EntityName" | "Integer" | "Lookup" | "ManagedProperty" | "Memo" | "Money" | "Owner" | "PartyList" | "Picklist" | "State" | "Status" | "Uniqueidentifier" | "Virtual"
+            AttributeTypeName: "BigIntType" | "BooleanType" | "CalendarRulesType" | "CustomerType" | "DateTimeType" | "DecimalType" | "DoubleType" | "EntityNameType" | "ImageType" | "IntegerType" | "LookupType" | "ManagedPropertyType" | "MemoType" | "MoneyType" | "OwnerType" | "PartyListType" | "PicklistType" | "StateType	StatusType" | "StringType" | "UniqueidentifierType" | "VirtualType";
+            CalculationOf: any;
+            CanBeSecuredForCreate: boolean;
+            CanBeSecuredForRead: boolean;
+            CanBeSecuredForUpdate: boolean;
+            CanModifyAdditionalSettings: ManagedProperty<boolean>;
+            ColumnNumber: number;
+            DefaultFormValue: any;
+            DefaultValue: any;
+            DeprecatedVersion: any;
+            Description: Label;
+            DisplayName: Label;
+            EntityLogicalName: string;
+            Format: any;
+            FormatName: string;
+            ImeMode: any;
+            IntroducedVersion: any;
+            IsAuditEnabled: boolean;
+            IsCustomAttribute: boolean;
+            IsCustomizable: ManagedProperty<boolean>;
+            IsManaged: boolean;
+            IsPrimaryId: boolean;
+            IsPrimaryName: boolean;
+            IsRenameable: ManagedProperty<boolean>;
+            IsSecured: boolean;
+            IsValidForAdvancedFind: ManagedProperty<boolean>;
+            IsValidForCreate: boolean;
+            IsValidForRead: boolean;
+            IsValidForUpdate: boolean;
+            LinkedAttributeId: string;
+            LogicalName: string;
+            MaxLength: number;
+            MaxValue: any;
+            MetadataId: string;
+            MinValue: number;
+            OptionSet: any;
+            Precision: any;
+            PrecisionSource: any;
+            RequiredLevel: ManagedProperty<string>;
+            SchemaName: string;
+            Targets: string[];
+            YomiOf: any;
+        }
+
+        export interface ManagedProperty<T> {
+            CanBeChanged: boolean;
+            ManagedPropertyLogicalName: string;
+            Value: T;
+        }
+
+        export interface Label {
+            LocalizedLabels: LocalizedLabel[];
+            UserLocalizedLabel: LocalizedLabel;
+        }
+
+        export interface LocalizedLabel {
+            Label: string;
+            LangaugeCode: number;
+            MetadataId: string;
+            HasChanged: boolean;
+            IsManaged: boolean;
+        }
+
+        namespace ValueEnums {
+            export enum OwnershipType {
+                None,
+                OrganizationOwned,
+                TeamOwned,
+                UserOwned,
+            }
+
+            export enum AttributeTypeCode {
+                BigInt,
+                Boolean,
+                CalendarRules,
+                Customer,
+                DateTime,
+                Decimal,
+                Double,
+                EntityName,
+                Integer,
+                Lookup,
+                ManagedProperty,
+                Memo,
+                Money,
+                Owner,
+                PartyList,
+                Picklist,
+                State,
+                Status,
+                String,
+                Uniqueidentifier,
+                Virtual,
+            }
+
+
+            export enum AttributeRequiredLevel {
+                ApplicationRequired,
+                None,
+                Recommended,
+                SystemRequired,
+            }
+
+
+            export enum DateTimeFormat {
+                DateAndTime,
+                DateOnly,
+            }
+
+            export enum ImeMode {
+                Active,
+                Auto,
+                Disabled,
+                Inactive,
+            }
+
+
+
+            export enum IntegerFormat {
+                Duration,
+                Language,
+                Locale,
+                None,
+                TimeZone,
+            }
+
+
+            export enum SecurityTypes {
+                Append,
+                Inheritance,
+                None,
+                ParentChild,
+                Pointer,
+            }
+
+            export enum StringFormat {
+                Email,
+                PhoneticGuide,
+                Text,
+                TextArea,
+                TickerSymbol,
+                Url,
+                VersionNumber,
+            }
         }
     }
-}
 
-declare namespace Sdk.Mdq.ValueEnums
-{ }
+    namespace Sdk.Mdq.ValueEnums
+    { }
+}
\ No newline at end of file
diff --git a/microsoft-sdk-soap/microsoft-sdk-soap-tests.ts b/microsoft-sdk-soap/microsoft-sdk-soap-tests.ts
index 2e55285870..3be28629c3 100644
--- a/microsoft-sdk-soap/microsoft-sdk-soap-tests.ts
+++ b/microsoft-sdk-soap/microsoft-sdk-soap-tests.ts
@@ -1,4 +1,5 @@
 
+import * as Q from "q";
 
 // QueryByAttribute
 var queryByAttribute = new Sdk.Query.QueryByAttribute( "account" );
@@ -17,4 +18,4 @@ queryExpression.addCondition( "account", "accountname", Sdk.Query.ConditionOpera
 Sdk.Q.retrieveMultiple( queryExpression ).then( entityCollection =>
 {
 	console.log( "Query matches " + entityCollection.getTotalRecordCount() + " records." );
-} ); 
\ No newline at end of file
+} );
\ No newline at end of file
diff --git a/microsoft-sdk-soap/tsconfig.json b/microsoft-sdk-soap/tsconfig.json
index ef973bcb22..41ffa9a040 100644
--- a/microsoft-sdk-soap/tsconfig.json
+++ b/microsoft-sdk-soap/tsconfig.json
@@ -12,6 +12,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/mobservable/index.d.ts b/mobservable/index.d.ts
deleted file mode 100644
index 719eddaf31..0000000000
--- a/mobservable/index.d.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-// Type definitions for mobservable 0.6
-// Project: https://mweststrate.github.io/mobservable
-// Definitions by: Michel Weststrate <https://github.com/mweststrate/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Mobservable {
-    interface Static extends MakeReactive {
-        /**
-         * Turns an object, array or function into a reactive structure.
-         * @param value the value which should become observable.
-         */
-        makeReactive: MakeReactive;
-
-        /**
-         * Extends an object with reactive capabilities.
-         * @param target the object to which reactive properties should be added
-         * @param properties the properties that should be added and made reactive
-         * @returns targer
-         */
-        extendReactive(target: Object, properties: Object): Object;
-
-        /**
-         * Returns true if the provided value is reactive.
-         * @param value object, function or array
-         * @param propertyName if propertyName is specified, checkes whether value.propertyName is reactive.
-         */
-        isReactive(value: any, propertyName?: string): boolean;
-
-        /**
-         * Can be used in combination with makeReactive / extendReactive.
-         * Enforces that a reference to 'value' is stored as property,
-         * but that 'value' itself is not turned into something reactive.
-         * Future assignments to the same property will inherit this behavior.
-         * @param value initial value of the reactive property that is being defined.
-         */
-        asReference<T>(value: any): {value: T};
-
-        /**
-         * ES6 / Typescript decorator which can to make class properties and getter functions reactive.
-         */
-        observable(target: Object, key: string): any; // decorator / annotation
-
-        /**
-         * Creates a reactive view and keeps it alive, so that the view is always
-         * updated if one of the dependencies changes, even when the view is not further used by something else.
-         * @param func The reactive view
-         * @param scope (optional)
-         * @returns disposer function, which can be used to stop the view from being updated in the future.
-         */
-        observe(func: Mobservable.Lambda, scope?: any): Mobservable.Lambda;
-
-        /**
-         * Deprecated, use mobservable.observe instead.
-         */
-        sideEffect(func: Mobservable.Lambda, scope?: any): Mobservable.Lambda;
-
-        /**
-         * Similar to 'observer', observes the given predicate until it returns true.
-         * Once it returns true, the 'effect' function is invoked an the observation is cancelled.
-         * @param predicate
-         * @param effect
-         * @param scope (optional)
-         * @returns disposer function to prematurely end the observer.
-         */
-        observeUntil(predicate: () => boolean, effect: Mobservable.Lambda, scope?: any): Mobservable.Lambda;
-
-        /**
-         * During a transaction no views are updated until the end of the transaction.
-         * The transaction will be run synchronously nonetheless.
-         * @param action a function that updates some reactive state
-         * @returns any value that was returned by the 'action' parameter.
-         */
-        transaction<T>(action: () => T): T;
-
-        /**
-         * Converts a reactive structure into a non-reactive structure.
-         * Basically a deep-clone.
-         */
-        toJSON<T>(value: T): T;
-
-        /**
-         * Sets the reporting level Defaults to 1. Use 0 for production or 2 for increased verbosity.
-         */
-        logLevel: number;  // 0 = production, 1 = development, 2 = debugging
-
-        extras: {
-            getDependencyTree(thing: any, property?: string): Mobservable.DependencyTree;
-
-            getObserverTree(thing: any, property?: string): Mobservable.ObserverTree;
-
-            trackTransitions(extensive?: boolean, onReport?: (lines: Mobservable.TransitionEvent) => void): Mobservable.Lambda;
-        };
-    }
-
-    interface MakeReactive {
-        <T>(value: T[], opts?: Mobservable.MakeReactiveOptions): Mobservable.ObservableArray<T>;
-        <T>(value: () => T, opts?: Mobservable.MakeReactiveOptions): Mobservable.ObservableValue<T>;
-        <T extends string|number|boolean|Date|RegExp|Function|undefined>(value: T, opts?: Mobservable.MakeReactiveOptions): Mobservable.ObservableValue<T>;
-        <T extends Object>(value: Object, opts?: Mobservable.MakeReactiveOptions): T;
-    }
-
-    interface MakeReactiveOptions {
-        as?: string; /* "auto" | "reference" | TODO: see #8 "structure" */
-        scope?: Object;
-        context?: Object;
-        recurse?: boolean;
-        name?: string;
-        // protected: boolean TODO: see #9
-    }
-
-    type ContextInfo = { object: Object; name: string } | string;
-
-    interface Lambda {
-        (): void;
-        name?: string;
-    }
-
-    interface Observable {
-        observe(callback: (...args: any[]) => void, fireImmediately?: boolean): Lambda;
-    }
-
-    interface ObservableValue<T> extends Observable {
-        (): T;
-        (value: T): void;
-        observe(callback: (newValue: T, oldValue: T) => void, fireImmediately?: boolean): Lambda;
-    }
-
-    interface ObservableArray<T> extends Observable, Array<T> {
-        spliceWithArray(index: number, deleteCount?: number, newItems?: T[]): T[];
-        observe(listener: (changeData: ArrayChange<T>|ArraySplice<T>) => void, fireImmediately?: boolean): Lambda;
-        clear(): T[];
-        replace(newItems: T[]): T[];
-        find(predicate: (item: T, index: number, array: ObservableArray<T>) => boolean, thisArg?: any, fromIndex?: number): T;
-        remove(value: T): boolean;
-    }
-
-    interface ArrayChange<T> {
-        type: string; // Always: 'update'
-        object: ObservableArray<T>;
-        index: number;
-        oldValue: T;
-    }
-
-    interface ArraySplice<T> {
-        type: string; // Always: 'splice'
-        object: ObservableArray<T>;
-        index: number;
-        removed: T[];
-        addedCount: number;
-    }
-
-    interface DependencyTree {
-        id: number;
-        name: string;
-        context: any;
-        dependencies?: DependencyTree[];
-    }
-
-    interface ObserverTree {
-        id: number;
-        name: string;
-        context: any;
-        observers?: ObserverTree[];
-        listeners?: number; // amount of functions manually attached using an .observe method
-    }
-
-    interface TransitionEvent {
-        id: number;
-        name: string;
-        context: Object;
-        state: string;
-        changed: boolean;
-        newValue: string;
-    }
-}
-
-declare const Mobservable: Mobservable.Static;
-export = Mobservable;
diff --git a/mobservable/mobservable-tests.ts b/mobservable/mobservable-tests.ts
deleted file mode 100644
index 060f0d14b3..0000000000
--- a/mobservable/mobservable-tests.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import mobservable = require('mobservable');
-import {observable} from "mobservable";
-
-var v = mobservable(3);
-v.observe(() => {});
-
-var a = mobservable([1, 2, 3]);
-
-class Order {
-    @observable price: number = 3;
-    @observable amount: number = 2;
-    @observable orders: string[] = [];
-
-    @observable get total() {
-        return this.amount * this.price * (1 + this.orders.length);
-    }
-}
-
-export function testObservable() {
-    var a = mobservable(3);
-    var b = mobservable(() => a() * 2);
-}
-
-export function testAnnotations() {
-    var order1totals: number[] = [];
-    var order1 = new Order();
-    var order2 = new Order();
-
-    var disposer = mobservable.observe(() => {
-        order1totals.push(order1.total);
-    });
-
-    order2.price = 4;
-    order1.amount = 1;
-
-    order2.orders.push('bla');
-
-    order1.orders.splice(0, 0, 'boe', 'hoi');
-
-    disposer();
-    order1.orders.pop();
-};
-
-export function testTyping() {
-    var ar: mobservable.ObservableArray<number> = mobservable.makeReactive([1, 2]);
-    ar.observe((d: mobservable.ArrayChange<number> | mobservable.ArraySplice<number>) => {
-        console.log(d.type);
-    });
-
-    var ar2: mobservable.ObservableArray<number> = mobservable([1, 2]);
-    ar2.observe((d: mobservable.ArrayChange<number> | mobservable.ArraySplice<number>) => {
-        console.log(d.type);
-    });
-
-    var x: mobservable.ObservableValue<number> = mobservable(3);
-}
\ No newline at end of file
diff --git a/mobservable/tsconfig.json b/mobservable/tsconfig.json
deleted file mode 100644
index cee6db4b01..0000000000
--- a/mobservable/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "baseUrl": "../",
-        "experimentalDecorators": true,
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "mobservable-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/mocha/index.d.ts b/mocha/index.d.ts
index 40210dc69d..b87a6e7d9b 100644
--- a/mocha/index.d.ts
+++ b/mocha/index.d.ts
@@ -112,23 +112,23 @@ declare class Mocha {
 // merge the Mocha class declaration with a module
 declare namespace Mocha {
     interface ISuiteCallbackContext {
-        timeout(ms: number): void;
-        retries(n: number): void;
-        slow(ms: number): void;
+        timeout(ms: number): this;
+        retries(n: number): this;
+        slow(ms: number): this;
     }
 
     interface IHookCallbackContext {
-        skip(): void;
-        timeout(ms: number): void;
+        skip(): this;
+        timeout(ms: number): this;
         [index: string]: any;
     }
 
 
     interface ITestCallbackContext {
-        skip(): void;
-        timeout(ms: number): void;
-        retries(n: number): void;
-        slow(ms: number): void;
+        skip(): this;
+        timeout(ms: number): this;
+        retries(n: number): this;
+        slow(ms: number): this;
         [index: string]: any;
     }
 
diff --git a/mocha/mocha-tests.ts b/mocha/mocha-tests.ts
index 8e8dc0d938..7271ebbd0c 100644
--- a/mocha/mocha-tests.ts
+++ b/mocha/mocha-tests.ts
@@ -9,9 +9,7 @@ function test_describe() {
     describe.skip('something', () => { });
 
     describe('something', function () {
-        this.retries(3);
-        this.slow(1000);
-        this.timeout(2000);
+        this.retries(3).slow(1000).timeout(2000).retries(3);
     });
 }
 
@@ -23,9 +21,7 @@ function test_context() {
     context.skip('some context', () => { });
 
     context('some context', function () {
-        this.retries(3);
-        this.slow(1000);
-        this.timeout(2000);
+        this.retries(3).slow(1000).timeout(2000).retries(3);
     });
 }
 
@@ -37,9 +33,7 @@ function test_suite() {
     suite.skip('some context', () => { });
 
     suite('some context', function () {
-        this.retries(3);
-        this.slow(1000);
-        this.timeout(2000);
+        this.retries(3).slow(1000).timeout(2000).retries(3);
     });
 }
 
@@ -56,9 +50,7 @@ function test_it() {
     it.skip('does something', () => { });
 
     it('does something', function () {
-        this.skip();
-        this.retries(3);
-        this.timeout(2000);
+        this.skip().retries(3).slow(1000).timeout(2000).skip();
     });
 }
 
@@ -75,9 +67,7 @@ function test_test() {
     test.skip('does something', () => { });
 
     test('does something', function () {
-        this.skip();
-        this.retries(3);
-        this.timeout(2000);
+        this.skip().retries(3).slow(1000).timeout(2000).skip();
     });
 }
 
@@ -94,9 +84,7 @@ function test_specify() {
     specify.skip('does something', () => { });
 
     specify('does something', function () {
-        this.skip();
-        this.retries(3);
-        this.timeout(2000);
+        this.skip().retries(3).slow(1000).timeout(2000).skip();
     });
 }
 
@@ -112,8 +100,7 @@ function test_before() {
     before("my description", done => { });
 
     before("my description", function () {
-        this.skip();
-        this.timeout(2000);
+        this.skip().timeout(2000).skip();
     });
 }
 
diff --git a/mongoose-seeder/tsconfig.json b/mongoose-seeder/tsconfig.json
index 143fcc1ce4..8e3f193dbf 100644
--- a/mongoose-seeder/tsconfig.json
+++ b/mongoose-seeder/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/msportalfx-test/index.d.ts b/msportalfx-test/index.d.ts
index a3fbc2d26f..c2d64f95d4 100644
--- a/msportalfx-test/index.d.ts
+++ b/msportalfx-test/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Julio Casal <https://github.com/julioct>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="q" />
-
 import * as Q from "q";
 
 export = MsPortalTestFx;
diff --git a/msportalfx-test/tsconfig.json b/msportalfx-test/tsconfig.json
index 115af8c6ef..16c68ed3a8 100644
--- a/msportalfx-test/tsconfig.json
+++ b/msportalfx-test/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/mssql/index.d.ts b/mssql/index.d.ts
index 8aaca045e2..5f013e33a1 100644
--- a/mssql/index.d.ts
+++ b/mssql/index.d.ts
@@ -1,91 +1,96 @@
 // Type definitions for mssql 3.3
 // Project: https://www.npmjs.com/package/mssql
-// Definitions by: COLSA Corporation <http://www.colsa.com/>, Ben Farr <https://github.com/jaminfarr>, Vitor Buzinaro <https://github.com/buzinas>, Matt Richardson <https://github.com/mrrichar/>
+// Definitions by: COLSA Corporation <http://www.colsa.com/>, Ben Farr <https://github.com/jaminfarr>, Vitor Buzinaro <https://github.com/buzinas>, Matt Richardson <https://github.com/mrrichar/>, Jørgen Elgaard Larsen <https://github.com/elhaard/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
 
 import events = require('events');
+export interface ISqlType {
+  type: ISqlTypeFactory;
+}
+export interface ISqlTypeWithNoParams extends ISqlType { type: ISqlTypeFactoryWithNoParams }
+export interface ISqlTypeWithLength extends ISqlType { type: ISqlTypeFactoryWithLength; length: number }
+export interface ISqlTypeWithScale extends ISqlType { type: ISqlTypeFactoryWithScale; scale: number }
+export interface ISqlTypeWithPrecisionScale extends ISqlType { type: ISqlTypeFactoryWithPrecisionScale; precision: number, scale: number }
+export interface ISqlTypeWithTvpType extends ISqlType { type: ISqlTypeFactoryWithTvpType; tvpType: any }
 
-type sqlTypeWithNoParams = { type: sqlTypeFactoryWithNoParams }
-type sqlTypeWithLength = { type: sqlTypeFactoryWithLength, length: number }
-type sqlTypeWithScale = { type: sqlTypeFactoryWithScale, scale: number }
-type sqlTypeWithPrecisionScale = { type: sqlTypeFactoryWithPrecisionScale, precision: number, scale: number }
-type sqlTypeWithTvpType = { type: sqlTypeFactoryWithTvpType, tvpType: any }
+export interface ISqlTypeFactory {
+}
+export interface ISqlTypeFactoryWithNoParams extends ISqlTypeFactory { (): ISqlTypeWithNoParams; }
+export interface ISqlTypeFactoryWithLength extends ISqlTypeFactory { (length?: number): ISqlTypeWithLength }
+export interface ISqlTypeFactoryWithScale extends ISqlTypeFactory { (scale?: number): ISqlTypeWithScale }
+export interface ISqlTypeFactoryWithPrecisionScale extends ISqlTypeFactory { (precision?: number, scale?: number): ISqlTypeWithPrecisionScale; }
+export interface ISqlTypeFactoryWithTvpType extends ISqlTypeFactory { (tvpType: any): ISqlTypeWithTvpType }
 
-type sqlTypeFactoryWithNoParams = () => sqlTypeWithNoParams;
-type sqlTypeFactoryWithLength = (length?: number) => sqlTypeWithLength;
-type sqlTypeFactoryWithScale = (scale?: number) => sqlTypeWithScale;
-type sqlTypeFactoryWithPrecisionScale = (precision?: number, scale?: number) => sqlTypeWithPrecisionScale;
-type sqlTypeFactoryWithTvpType = (tvpType: any) => sqlTypeWithTvpType;
 
-export declare var VarChar: sqlTypeFactoryWithLength;
-export declare var NVarChar: sqlTypeFactoryWithLength;
-export declare var Text: sqlTypeFactoryWithNoParams;
-export declare var Int: sqlTypeFactoryWithNoParams;
-export declare var BigInt: sqlTypeFactoryWithNoParams;
-export declare var TinyInt: sqlTypeFactoryWithNoParams;
-export declare var SmallInt: sqlTypeFactoryWithNoParams;
-export declare var Bit: sqlTypeFactoryWithNoParams;
-export declare var Float: sqlTypeFactoryWithNoParams;
-export declare var Numeric: sqlTypeFactoryWithPrecisionScale;
-export declare var Decimal: sqlTypeFactoryWithPrecisionScale;
-export declare var Real: sqlTypeFactoryWithNoParams;
-export declare var Date: sqlTypeFactoryWithNoParams;
-export declare var DateTime: sqlTypeFactoryWithNoParams;
-export declare var DateTime2: sqlTypeFactoryWithScale;
-export declare var DateTimeOffset: sqlTypeFactoryWithScale;
-export declare var SmallDateTime: sqlTypeFactoryWithNoParams;
-export declare var Time: sqlTypeFactoryWithScale;
-export declare var UniqueIdentifier: sqlTypeFactoryWithNoParams;
-export declare var SmallMoney: sqlTypeFactoryWithNoParams;
-export declare var Money: sqlTypeFactoryWithNoParams;
-export declare var Binary: sqlTypeFactoryWithNoParams;
-export declare var VarBinary: sqlTypeFactoryWithLength;
-export declare var Image: sqlTypeFactoryWithNoParams;
-export declare var Xml: sqlTypeFactoryWithNoParams;
-export declare var Char: sqlTypeFactoryWithLength;
-export declare var NChar: sqlTypeFactoryWithLength;
-export declare var NText: sqlTypeFactoryWithNoParams;
-export declare var TVP: sqlTypeFactoryWithTvpType;
-export declare var UDT: sqlTypeFactoryWithNoParams;
-export declare var Geography: sqlTypeFactoryWithNoParams;
-export declare var Geometry: sqlTypeFactoryWithNoParams;
+export declare var VarChar: ISqlTypeFactoryWithLength;
+export declare var NVarChar: ISqlTypeFactoryWithLength;
+export declare var Text: ISqlTypeFactoryWithNoParams;
+export declare var Int: ISqlTypeFactoryWithNoParams;
+export declare var BigInt: ISqlTypeFactoryWithNoParams;
+export declare var TinyInt: ISqlTypeFactoryWithNoParams;
+export declare var SmallInt: ISqlTypeFactoryWithNoParams;
+export declare var Bit: ISqlTypeFactoryWithNoParams;
+export declare var Float: ISqlTypeFactoryWithNoParams;
+export declare var Numeric: ISqlTypeFactoryWithPrecisionScale;
+export declare var Decimal: ISqlTypeFactoryWithPrecisionScale;
+export declare var Real: ISqlTypeFactoryWithNoParams;
+export declare var Date: ISqlTypeFactoryWithNoParams;
+export declare var DateTime: ISqlTypeFactoryWithNoParams;
+export declare var DateTime2: ISqlTypeFactoryWithScale;
+export declare var DateTimeOffset: ISqlTypeFactoryWithScale;
+export declare var SmallDateTime: ISqlTypeFactoryWithNoParams;
+export declare var Time: ISqlTypeFactoryWithScale;
+export declare var UniqueIdentifier: ISqlTypeFactoryWithNoParams;
+export declare var SmallMoney: ISqlTypeFactoryWithNoParams;
+export declare var Money: ISqlTypeFactoryWithNoParams;
+export declare var Binary: ISqlTypeFactoryWithNoParams;
+export declare var VarBinary: ISqlTypeFactoryWithLength;
+export declare var Image: ISqlTypeFactoryWithNoParams;
+export declare var Xml: ISqlTypeFactoryWithNoParams;
+export declare var Char: ISqlTypeFactoryWithLength;
+export declare var NChar: ISqlTypeFactoryWithLength;
+export declare var NText: ISqlTypeFactoryWithNoParams;
+export declare var TVP: ISqlTypeFactoryWithTvpType;
+export declare var UDT: ISqlTypeFactoryWithNoParams;
+export declare var Geography: ISqlTypeFactoryWithNoParams;
+export declare var Geometry: ISqlTypeFactoryWithNoParams;
 
 export declare var TYPES: {
-    VarChar: sqlTypeFactoryWithLength;
-    NVarChar: sqlTypeFactoryWithLength;
-    Text: sqlTypeFactoryWithNoParams;
-    Int: sqlTypeFactoryWithNoParams;
-    BigInt: sqlTypeFactoryWithNoParams;
-    TinyInt: sqlTypeFactoryWithNoParams;
-    SmallInt: sqlTypeFactoryWithNoParams;
-    Bit: sqlTypeFactoryWithNoParams;
-    Float: sqlTypeFactoryWithNoParams;
-    Numeric: sqlTypeFactoryWithPrecisionScale;
-    Decimal: sqlTypeFactoryWithPrecisionScale;
-    Real: sqlTypeFactoryWithNoParams;
-    Date: sqlTypeFactoryWithNoParams;
-    DateTime: sqlTypeFactoryWithNoParams;
-    DateTime2: sqlTypeFactoryWithScale;
-    DateTimeOffset: sqlTypeFactoryWithScale;
-    SmallDateTime: sqlTypeFactoryWithNoParams;
-    Time: sqlTypeFactoryWithScale;
-    UniqueIdentifier: sqlTypeFactoryWithNoParams;
-    SmallMoney: sqlTypeFactoryWithNoParams;
-    Money: sqlTypeFactoryWithNoParams;
-    Binary: sqlTypeFactoryWithNoParams;
-    VarBinary: sqlTypeFactoryWithLength;
-    Image: sqlTypeFactoryWithNoParams;
-    Xml: sqlTypeFactoryWithNoParams;
-    Char: sqlTypeFactoryWithLength;
-    NChar: sqlTypeFactoryWithLength;
-    NText: sqlTypeFactoryWithNoParams;
-    TVP: sqlTypeFactoryWithTvpType;
-    UDT: sqlTypeFactoryWithNoParams;
-    Geography: sqlTypeFactoryWithNoParams;
-    Geometry: sqlTypeFactoryWithNoParams;
+    VarChar: ISqlTypeFactoryWithLength;
+    NVarChar: ISqlTypeFactoryWithLength;
+    Text: ISqlTypeFactoryWithNoParams;
+    Int: ISqlTypeFactoryWithNoParams;
+    BigInt: ISqlTypeFactoryWithNoParams;
+    TinyInt: ISqlTypeFactoryWithNoParams;
+    SmallInt: ISqlTypeFactoryWithNoParams;
+    Bit: ISqlTypeFactoryWithNoParams;
+    Float: ISqlTypeFactoryWithNoParams;
+    Numeric: ISqlTypeFactoryWithPrecisionScale;
+    Decimal: ISqlTypeFactoryWithPrecisionScale;
+    Real: ISqlTypeFactoryWithNoParams;
+    Date: ISqlTypeFactoryWithNoParams;
+    DateTime: ISqlTypeFactoryWithNoParams;
+    DateTime2: ISqlTypeFactoryWithScale;
+    DateTimeOffset: ISqlTypeFactoryWithScale;
+    SmallDateTime: ISqlTypeFactoryWithNoParams;
+    Time: ISqlTypeFactoryWithScale;
+    UniqueIdentifier: ISqlTypeFactoryWithNoParams;
+    SmallMoney: ISqlTypeFactoryWithNoParams;
+    Money: ISqlTypeFactoryWithNoParams;
+    Binary: ISqlTypeFactoryWithNoParams;
+    VarBinary: ISqlTypeFactoryWithLength;
+    Image: ISqlTypeFactoryWithNoParams;
+    Xml: ISqlTypeFactoryWithNoParams;
+    Char: ISqlTypeFactoryWithLength;
+    NChar: ISqlTypeFactoryWithLength;
+    NText: ISqlTypeFactoryWithNoParams;
+    TVP: ISqlTypeFactoryWithTvpType;
+    UDT: ISqlTypeFactoryWithNoParams;
+    Geography: ISqlTypeFactoryWithNoParams;
+    Geometry: ISqlTypeFactoryWithNoParams;
 };
 
 export declare var MAX: number;
@@ -100,8 +105,19 @@ interface IMap extends Array<{ js: any, sql: any }> {
 export declare var map: IMap;
 
 export declare var DRIVERS: string[];
+export interface IColumnMetadata {
+    [name: string]: {
+        index: number;
+        name: string;
+        length: number;
+        type:  ISqlType;
+        udt?: any;
+    }
+}
+export interface IRecordSet<T> extends Array<T> {
+    columns: IColumnMetadata;
+}
 
-type recordSet = any;
 type IIsolationLevel = number;
 
 export declare var ISOLATION_LEVEL: {
@@ -204,22 +220,23 @@ export declare class Request extends events.EventEmitter {
     public constructor(connection?: Connection);
     public constructor(transaction: Transaction);
     public constructor(preparedStatement: PreparedStatement);
-    public execute(procedure: string): Promise<recordSet>;
-    public execute<Entity>(procedure: string, callback: (err?: any, recordsets?: Entity[], returnValue?: any, rowsAffected?: number) => void): void;
-    public input(name: string, value: any): void;
-    public input(name: string, type: any, value: any): void;
-    public output(name: string, type: any, value?: any): void;
-    public pipe(stream: NodeJS.WritableStream): void;
-    public query(command: string): Promise<void>;
-    public query<Entity>(command: string): Promise<Entity[]>;
-    public query(command: string, callback: (err?: any, recordset?: any, rowsAffected?: number) => void): void;
-    public query<Entity>(command: string, callback: (err?: any, recordset?: Entity[]) => void): void;
-    public batch(batch: string): Promise<recordSet>;
-    public batch<Entity>(batch: string): Promise<Entity[]>;
-    public batch(batch: string, callback: (err?: any, recordset?: any) => void): void;
-    public batch<Entity>(batch: string, callback: (err?: any, recordset?: Entity[]) => void): void;
-    public bulk(table: Table): Promise<void>;
-    public bulk(table: Table, callback: (err: any, rowCount: any) => void): void;
+    public execute(procedure: string): Promise<IRecordSet<any>>;
+    public execute<Entity>(procedure: string): Promise<IRecordSet<Entity>>;
+    public execute<Entity>(procedure: string, callback: (err?: any, recordsets?: IRecordSet<Entity>, returnValue?: any, rowsAffected?: number) => void): void;
+    public input(name: string, value: any): Request;
+    public input(name: string, type: any, value: any): Request;
+    public output(name: string, type: any, value?: any): Request;
+    public pipe(stream: NodeJS.WritableStream): NodeJS.WritableStream;
+    public query(command: string): Promise<IRecordSet<any>>;
+    public query<Entity>(command: string): Promise<IRecordSet<Entity>>;
+    public query<Entity>(command: string, callback: (err?: Error, recordset?: IRecordSet<Entity>, rowsAffected?: number) => void): void;
+    public query<Entity>(command: string, callback: (err?: Error, recordset?: IRecordSet<Entity>) => void): void;
+    public batch(batch: string): Promise<IRecordSet<any>>;
+    public batch<Entity>(batch: string): Promise<IRecordSet<Entity>>;
+    public batch(batch: string, callback: (err?: Error, recordset?: IRecordSet<any>) => void): void;
+    public batch<Entity>(batch: string, callback: (err?: any, recordset?: IRecordSet<Entity>) => void): void;
+    public bulk(table: Table): Promise<number>;
+    public bulk(table: Table, callback: (err: Error, rowCount: any) => void): void;
     public cancel(): void;
 }
 
@@ -258,16 +275,14 @@ export declare class PreparedStatement extends events.EventEmitter {
     public multiple: boolean;
     public stream: any;
     public constructor(connection?: Connection);
-    public input(name: string, type: any): void;
-    public output(name: string, type: any): void;
+    public input(name: string, type: ISqlType): PreparedStatement;
+    public output(name: string, type: ISqlType): PreparedStatement;
     public prepare(statement?: string): Promise<void>;
-    public prepare(statement?: string, callback?: (err?: any) => void): void;
-    public execute(values: Object): Promise<recordSet>;
-    public execute<Entity>(values: Object): Promise<Entity[]>;
-    public execute(values: Object, callback: (err: any, recordSet: recordSet, rowsAffected: number) => void): void;
-    public execute<Entity>(values: Object, callback: (err: any, recordSet: Entity[]) => void): void;
+    public prepare(statement?: string, callback?: (err?: Error) => void): PreparedStatement;
+    public execute(values: Object): Promise<void>;
+    public execute(values: Object, callback: (err?: Error) => void): Request;
     public unprepare(): Promise<void>;
-    public unprepare(callback: (err?: any) => void): void;
+    public unprepare(callback: (err?: Error) => void): PreparedStatement;
 }
 
 export declare class PreparedStatementError implements Error {
diff --git a/mssql/mssql-tests.ts b/mssql/mssql-tests.ts
index 52ae6f953c..764f6da8e1 100644
--- a/mssql/mssql-tests.ts
+++ b/mssql/mssql-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import sql = require('mssql');
 
 interface Entity{
diff --git a/mu2/mu2-tests.ts b/mu2/mu2-tests.ts
index dc960f20d7..d85e1463b9 100644
--- a/mu2/mu2-tests.ts
+++ b/mu2/mu2-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import mu2 = require('mu2');
 import stream = require('stream');
 
diff --git a/multiparty/multiparty-tests.ts b/multiparty/multiparty-tests.ts
index be49092189..839ca92882 100644
--- a/multiparty/multiparty-tests.ts
+++ b/multiparty/multiparty-tests.ts
@@ -1,5 +1,3 @@
-
-/// <reference types="node" />
 import multiparty = require('multiparty');
 import http = require('http');
 import util = require('util');
diff --git a/mz/mz-tests.ts b/mz/mz-tests.ts
index 8246eecbab..7eda9f28bf 100644
--- a/mz/mz-tests.ts
+++ b/mz/mz-tests.ts
@@ -1,7 +1,4 @@
 /// <reference types="mocha" />
-/// <reference types="node" />
-
-
 
 import assert = require('assert')
 import fs = require('mz/fs')
diff --git a/n3/n3-tests.ts b/n3/n3-tests.ts
index a7e529bc7d..13247dfdb2 100644
--- a/n3/n3-tests.ts
+++ b/n3/n3-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import * as N3 from "n3";
 import * as fs from "fs";
 import * as stream from "stream";
@@ -26,7 +24,7 @@ function test_serialize() {
     });
 }
 
-/** 
+/**
 The following tests are taken from ...
 https://github.com/RubenVerborgh/N3.js/blob/master/README.md
 */
diff --git a/nanoscroller/nanoscroller-tests.ts b/nanoscroller/nanoscroller-tests.ts
index 3b9eeea820..46e61c1aaf 100644
--- a/nanoscroller/nanoscroller-tests.ts
+++ b/nanoscroller/nanoscroller-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery" />
-
 $('.nano').nanoScroller();
 
 $('.nano').nanoScroller({
diff --git a/navigation/index.d.ts b/navigation/index.d.ts
index 953255f8eb..eb045d8bfe 100644
--- a/navigation/index.d.ts
+++ b/navigation/index.d.ts
@@ -1,603 +1,553 @@
-// Type definitions for Navigation 2.0.0
+// Type definitions for Navigation 4.0
 // Project: http://grahammendick.github.io/navigation/
 // Definitions by: Graham Mendick <https://github.com/grahammendick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-export = Navigation;
 
-declare namespace Navigation {
+/**
+ * Defines a contract a class must implement in order to configure a State
+ */
+interface StateInfo {
     /**
-     * Defines a contract a class must implement in order to configure a State
+     * Gets the unique key
      */
-    interface StateInfo {
-        /**
-         * Gets the unique key
-         */
-        key: string;
-        /**
-         * Gets the default NavigationData for this State
-         */
-        defaults?: any;
-        /**
-         * Gets the default NavigationData Types for  this State
-         */
-        defaultTypes?: any;
-        /**
-         * Gets the textual description of the state
-         */
-        title?: string;
-        /**
-         * Gets the route Url patterns
-         */
-        route?: string | string[];
-        /**
-         * Gets a value that indicates whether to maintain the crumb trail 
-         */
-        trackCrumbTrail?: boolean | string;
-        /**
-         * Gets a value that indicates whether NavigationData Types are
-         * preserved when navigating
-         */
-        trackTypes?: boolean;
-        /**
-         * Gets the additional state attributes
-         */
-        [extras: string]: any;
-    }
-
+    key: string;
     /**
-     * Represents a view and is the destination of a navigation
+     * Gets the default NavigationData for this State
      */
-    class State implements StateInfo {
-        /**
-         * Gets the unique key
-         */
-        key: string;
-        /**
-         * Gets the default NavigationData for this State
-         */
-        defaults: any;
-        /**
-         * Gets the default NavigationData Types for  this State
-         */
-        defaultTypes: any;
-        /**
-         * Gets the formatted default NavigationData for this State
-         */
-        formattedDefaults: any;
-        /**
-         * Gets the formatted default array NavigationData for this State
-         */
-        formattedArrayDefaults: { [index: string]: string[]; };
-        /**
-         * Gets the textual description of the state
-         */
-        title: string;
-        /**
-         * Gets the route Url patterns
-         */
-        route: string | string[];
-        /**
-         * Gets a value that indicates whether to maintain the crumb trail 
-         */
-        trackCrumbTrail: boolean;
-        /**
-         * Gets the crumb trail key
-         */
-        crumbTrailKey: string;
-        /**
-         * Gets a value that indicates whether NavigationData Types are
-         * preserved when navigating
-         */
-        trackTypes: boolean;
-        /**
-         * Gets the additional state attributes
-         */
-        [extras: string]: any;        
-        /**
-         * Called on the old State before navigating to a different State
-         * @param state The new State
-         * @param data The new NavigationData
-         * @param url The new target location
-         * @param unload The function to call to continue to navigate
-         * @param history A value indicating whether browser history was used
-         */
-        unloading: (state: State, data: any, url: string, unload: () => void, history?: boolean) => void;
-        /**
-         * Called on the old State after navigating to a different State
-         */
-        dispose: () => void;
-        /**
-         * Called on the current State after navigating to it
-         * @param data The current NavigationData
-         * @param asyncData The data passed asynchronously while navigating
-         */
-        navigated: (data: any, asyncData: any) => void;
-        /**
-         * Called on the new State before navigating to it
-         * @param data The new NavigationData
-         * @param url The new target location
-         * @param navigate The function to call to continue to navigate
-         * @param history A value indicating whether browser history was used
-         */
-        navigating: (data: any, url: string, navigate: (asyncData?: any) => void, history: boolean) => void;
-        /**
-         * Encodes the Url value
-         * @param state The State navigated to
-         * @param key The key of the navigation data item
-         * @param val The Url value of the navigation data item
-         * @param queryString A value indicating the Url value's location
-         */
-        urlEncode(state: State, key: string, val: string, queryString: boolean): string;
-        /**
-         * Decodes the Url value
-         * @param state The State navigated to
-         * @param key The key of the navigation data item
-         * @param val The Url value of the navigation data item
-         * @param queryString A value indicating the Url value's location
-         */
-        urlDecode(state: State, key: string, val: string, queryString: boolean): string;
-        /**
-         * Validates the NavigationData before navigating to the new State
-         * @param data The new NavigationData
-         * @returns Validation success indicator
-         */
-        validate(data: any): boolean;
-        /**
-         * Truncates the crumb trail whenever a repeated or initial State is
-         * encountered
-         * @param The State navigated to
-         * @param The Crumb collection representing the crumb trail
-         * @returns Truncated crumb trail
-         */
-        truncateCrumbTrail(state: State, crumbs: Crumb[]): Crumb[];
-    }
-
+    defaults?: any;
     /**
-     * Defines a contract a class must implement in order to manage the browser
-     * Url
+     * Gets the default NavigationData Types for  this State
      */
-    interface HistoryManager {
-        /**
-         * Gets or sets a value indicating whether to disable browser history
-         */
-        disabled: boolean;
-        /**
-         * Registers browser history event listeners
-         * @param navigateHistory The history navigation event handler
-         */
-        init(navigateHistory: () => void): void;
-        /**
-         * Adds browser history
-         * @param url The current url
-         * @param replace A value indicating whether to replace the current
-         * browser history entry
-         */
-        addHistory(url: string, replace: boolean): void;
-        /**
-         * Gets the current location
-         */
-        getCurrentUrl(): string;
-        /**
-         * Gets an Href from the url
-         */
-        getHref(url: string): string;
-        /**
-         * Gets a Url from the anchor or location
-         */
-        getUrl(hrefElement: HTMLAnchorElement | Location): string;
-        /**
-         * Removes browser history event listeners
-         */
-        stop(): void;
-    }
-
+    defaultTypes?: any;
     /**
-     * Manages history using the browser Url's hash. If used in a browser
-     * without the hashchange event or outside of a browser environment, then
-     * history is disabled
+     * Gets the textual description of the state
      */
-    class HashHistoryManager implements HistoryManager {
-        /**
-         * Gets or sets a value indicating whether to disable browser history.
-         * Set to true if used in a browser without the hashchange event or 
-         * outside of a browser environment
-         */
-        disabled: boolean;
-        /**
-         * Initializes a new instance of the HashHistoryManager class
-         */
-        constructor();
-        /**
-         * Initializes a new instance of the HashHistoryManager class
-         * @param replaceQueryIdentifier a value indicating whether to use '#'
-         * in place of '?'. Set to true for Internet explorer 6 and 7 support
-         */
-        constructor(replaceQueryIdentifier: boolean);
-        /**
-         * Registers a listener for the hashchange event
-         * @param navigateHistory The history navigation event handler
-         */
-        init(navigateHistory: any): void;
-        /**
-         * Sets the browser Url's hash to the url
-         * @param url The current url 
-         * @param replace A value indicating whether to replace the current
-         * browser history entry
-         */
-        addHistory(url: string, replace: boolean): void;
-        /**
-         * Gets the current location
-         */
-        getCurrentUrl(): string;
-        /**
-         * Gets an Href from the url
-         */
-        getHref(url: string): string;
-        /**
-         * Gets a Url from the anchor or location
-         */
-        getUrl(hrefElement: HTMLAnchorElement | Location): string;
-        /**
-         * Removes a listener for the hashchange event
-         */
-        stop(): void;
-    }
-
+    title?: string;
     /**
-     * Manages history using the HTML5 history api. If used in a browser
-     * without the HTML5 history api or outside of a browser environment, then
-     * history is disabled
+     * Gets the route Url patterns
      */
-    class HTML5HistoryManager implements HistoryManager {
-        /**
-         * Gets or sets a value indicating whether to disable browser history.
-         * Set to true if used in a browser without the HTML5 history api or 
-         * outside of a browser environment
-         */
-        disabled: boolean;
-        /**
-         * Initializes a new instance of the HTML5HistoryManager class
-         */
-        constructor();
-        /**
-         * Initializes a new instance of the HTML5HistoryManager class
-         * @param applicationPath The application path
-         */
-        constructor(applicationPath: string);
-        /**
-         * Registers a listener for the popstate event
-         * @param navigateHistory The history navigation event handler
-         */
-        init(navigateHistory: () => void): void;
-        /**
-         * Sets the browser Url to the url using pushState
-         * @param url The current url 
-         * @param replace A value indicating whether to replace the current
-         * browser history entry
-         */
-        addHistory(url: string, replace: boolean): void;
-        /**
-         * Gets the current location
-         */
-        getCurrentUrl(): string;
-        /**
-         * Gets an Href from the url
-         */
-        getHref(url: string): string;
-        /**
-         * Gets a Url from the anchor or location
-         */
-        getUrl(hrefElement: HTMLAnchorElement | Location): string;
-        /**
-         * Removes a listener for the popstate event
-         */
-        stop(): void;
-    }
-
+    route?: string | string[];
     /**
-     * Represents one piece of the crumb trail and holds the information need
-     * to return to and recreate the State as previously visited
+     * Gets a value that indicates whether to maintain the crumb trail 
      */
-    class Crumb {
-        /**
-         * Gets the Context Data held at the time of navigating away from this
-         * State
-         */
-        data: any;
-        /**
-         * Gets the configuration information associated with this navigation
-         */
-        state: State;
-        /**
-         * Gets a value indicating whether the Crumb is the last in the crumb
-         * trail
-         */
-        last: boolean;
-        /**
-         * Gets the State Title
-         */
-        title: string;
-        /**
-         * Gets the link navigation to return to the State and pass the
-         * associated Data
-         */
-        url: string;
-        /**
-         * Gets the link navigation without crumb trail to return to the State
-         * and pass the associated Data
-         */
-        crumblessUrl: string;
-        /**
-         * Initializes a new instance of the Crumb class
-         * @param data The Context Data held at the time of navigating away
-         * from this State
-         * @param state The configuration information associated with this
-         * navigation
-         * @param link The link navigation to return to the State and pass the
-         * associated Data
-         * @param crumblessLink The link navigation without crumb trail to
-         * return to the State and pass the associated Data
-         * @param last A value indicating whether the Crumb is the last in the
-         * crumb trail
-         */
-        constructor(data: any, state: State, link: string, crumblessLink: string, last: boolean);
-    }
-
+    trackCrumbTrail?: boolean | string;
     /**
-     * Provides properties for accessing context sensitive navigation
-     * information. Holds the current State and NavigationData
+     * Gets a value that indicates whether NavigationData Types are
+     * preserved when navigating
      */
-    class StateContext {
-        /**
-         * Gets the last State displayed before the current State
-         */
-        oldState: State;
-        /**
-         * Gets the NavigationData for the last displayed State
-         */
-        oldData: any;
-        /**
-         * Gets the State of the last Crumb in the crumb trail
-         */
-        previousState: State;
-        /**
-         * Gets the NavigationData of the last Crumb in the crumb trail
-         */
-        previousData: any;
-        /**
-         * Gets the current State
-         */
-        state: State;
-        /**
-         * Gets the NavigationData for the current State
-         */
-        data: any;
-        /**
-         * Gets the current Url
-         */
-        url: string;
-        /**
-         * Gets or sets the current title
-         */
-        title: string;
-        /**
-         * Gets a Crumb collection representing the crumb trail, ordered oldest
-         * Crumb first
-         */
-        crumbs: Crumb[];
-        /**
-         * Gets the next crumb
-         */
-        nextCrumb: Crumb;
-        /**
-         * Clears the Context Data
-         */
-        clear(): void;
-        /** 
-         * Combines the data with all the current NavigationData
-         * @param The data to add to the current NavigationData
-         * @returns The combined data
-         */
-        includeCurrentData(data: any): any;
-        /** 
-         * Combines the data with a subset of the current NavigationData
-         * @param The data to add to the current NavigationData
-         * @returns The combined data
-         */
-        includeCurrentData(data: any, keys: string[]): any;
-    }
-
+    trackTypes?: boolean;
     /**
-     * Manages all navigation. These can be forward, backward or refreshing the
-     * current State
+     * Gets the additional state attributes
      */
-    class StateNavigator {
-        /**
-         * Provides access to context sensitive navigation information
-         */
-        stateContext: StateContext;
-        /**
-         * Gets the browser Url manager
-         */
-        historyManager: HistoryManager;
-        /**
-         * Gets a list of States
-         */
-        states: { [index: string]: State; };
-        /**
-         * Initializes a new instance of the StateNavigator class
-         */
-        constructor();
-        /**
-         * Initializes a new instance of the StateNavigator class
-         * @param states A collection of States
-         */
-        constructor(states: StateInfo[]);
-        /**
-         * Initializes a new instance of the StateNavigator class
-         * @param states A collection of States
-         * @param historyManager The manager of the browser Url
-         */
-        constructor(states: StateInfo[], historyManager: HistoryManager);
-        /**
-         * Configures the StateNavigator
-         * @param stateInfos A collection of State Infos
-         */
-        configure(stateInfos: StateInfo[]): void;
-        /**
-         * Configures the StateNavigator
-         * @param stateInfos A collection of State Infos
-         * @param historyManager The manager of the browser Url
-         */
-        configure(stateInfos: StateInfo[], historyManager: HistoryManager): void;
-        /**
-         * Registers a navigate event listener
-         * @param handler The navigate event listener
-         */
-        onNavigate(handler: (oldState: State, state: State, data: any, asyncData: any) => void): void;
-        /**
-         * Unregisters a navigate event listener
-         * @param handler The navigate event listener
-         */
-        offNavigate(handler: (oldState: State, state: State, data: any, asyncData: any) => void): void;
-        /**
-         * Navigates to a State
-         * @param stateKey The key of a State
-         * @throws state does not match the key of a State or there is 
-         * NavigationData that cannot be converted to a String
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        navigate(stateKey: string): void;
-        /**
-         * Navigates to a State
-         * @param stateKey The key of a State
-         * @param navigationData The NavigationData to be passed to the next
-         * State and stored in the StateContext
-         * @throws state does not match the key of a State or there is 
-         * NavigationData that cannot be converted to a String
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        navigate(stateKey: string, navigationData: any): void;
-        /**
-         * Navigates to a State
-         * @param stateKey The key of a State
-         * @param navigationData The NavigationData to be passed to the next
-         * State and stored in the StateContext
-         * @param A value determining the effect on browser history
-         * @throws state does not match the key of a State or there is 
-         * NavigationData that cannot be converted to a String
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        navigate(stateKey: string, navigationData: any, historyAction: 'add' | 'replace' | 'none'): void;
-        /**
-         * Gets a Url to navigate to a State
-         * @param stateKey The key of a State
-         * @returns Url that will navigate to State specified in the action
-         * @throws state does not match the key of a State or there is 
-         * NavigationData that cannot be converted to a String
-         */
-        getNavigationLink(stateKey: string): string;
-        /**
-         * Gets a Url to navigate to a State
-         * @param stateKey The key of a State
-         * @param navigationData The NavigationData to be passed to the next
-         * State and stored in the StateContext
-         * @returns Url that will navigate to State specified in the action
-         * @throws state does not match the key of a State or there is 
-         * NavigationData that cannot be converted to a String
-         */
-        getNavigationLink(stateKey: string, navigationData: any): string;
-        /**
-         * Determines if the distance specified is within the bounds of the
-         * crumb trail represented by the Crumbs collection
-         */
-        canNavigateBack(distance: number): boolean;
-        /**
-         * Navigates back along the crumb trail
-         * @param distance Starting at 1, the number of Crumb steps to go back
-         * @throws canNavigateBack returns false for this distance
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        navigateBack(distance: number): void;
-        /**
-         * Navigates back along the crumb trail
-         * @param distance Starting at 1, the number of Crumb steps to go back
-         * @param A value determining the effect on browser history
-         * @throws canNavigateBack returns false for this distance
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        navigateBack(distance: number, historyAction: 'add' | 'replace' | 'none'): void;
-        /**
-         * Gets a Url to navigate back along the crumb trail
-         * @param distance Starting at 1, the number of Crumb steps to go back
-         * @throws canNavigateBack returns false for this distance
-         */
-        getNavigationBackLink(distance: number): string;
-        /**
-         * Navigates to the current State passing no NavigationData
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        refresh(): void;
-        /**
-         * Navigates to the current State
-         * @param navigationData The NavigationData to be passed to the current
-         * State and stored in the StateContext
-         * @throws There is NavigationData that cannot be converted to a String
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        refresh(navigationData: any): void;
-        /**
-         * Navigates to the current State
-         * @param navigationData The NavigationData to be passed to the current
-         * State and stored in the StateContext
-         * @param A value determining the effect on browser history
-         * @throws There is NavigationData that cannot be converted to a String
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        refresh(navigationData: any, historyAction: 'add' | 'replace' | 'none'): void;
-        /**
-         * Gets a Url to navigate to the current State
-         */
-        getRefreshLink(): string;
-        /**
-         * Gets a Url to navigate to the current State
-         * @param navigationData The NavigationData to be passed to the current
-         * State and stored in the StateContext
-         * @returns Url that will navigate to the current State
-         * @throws There is NavigationData that cannot be converted to a String
-         */
-        getRefreshLink(navigationData: any): string;
-        /**
-         * Navigates to the url
-         * @param url The target location
-         */
-        navigateLink(url: string): void;
-        /**
-         * Navigates to the url
-         * @param url The target location
-         * @param A value determining the effect on browser history
-         */
-        navigateLink(url: string, historyAction: 'add' | 'replace' | 'none'): void;
-        /**
-         * Navigates to the url
-         * @param url The target location
-         * @param A value determining the effect on browser history
-         * @param history A value indicating whether browser history was used
-         */
-        navigateLink(url: string, historyAction: 'add' | 'replace' | 'none', history: boolean): void;
-        /**
-         * Parses the url out into State and Navigation Data
-         * @param url The url to parse
-         */
-        parseLink(url: string): { state: State; data: any; };
-        /**
-         * Navigates to the current location 
-         */
-        start(): void;
-        /**
-         * Navigates to the passed in url
-         * @param url The url to navigate to 
-         */
-        start(url: string): void;
-    }
+    [extras: string]: any;
 }
+
+/**
+ * Represents a view and is the destination of a navigation
+ */
+export class State implements StateInfo {
+    /**
+     * Gets the unique key
+     */
+    key: string;
+    /**
+     * Gets the default NavigationData for this State
+     */
+    defaults: any;
+    /**
+     * Gets the default NavigationData Types for  this State
+     */
+    defaultTypes: any;
+    /**
+     * Gets the formatted default NavigationData for this State
+     */
+    formattedDefaults: any;
+    /**
+     * Gets the formatted default array NavigationData for this State
+     */
+    formattedArrayDefaults: { [index: string]: string[]; };
+    /**
+     * Gets the textual description of the state
+     */
+    title: string;
+    /**
+     * Gets the route Url patterns
+     */
+    route: string | string[];
+    /**
+     * Gets a value that indicates whether to maintain the crumb trail 
+     */
+    trackCrumbTrail: boolean;
+    /**
+     * Gets the crumb trail key
+     */
+    crumbTrailKey: string;
+    /**
+     * Gets a value that indicates whether NavigationData Types are
+     * preserved when navigating
+     */
+    trackTypes: boolean;
+    /**
+     * Gets the additional state attributes
+     */
+    [extras: string]: any;        
+    /**
+     * Called on the old State before navigating to a different State
+     * @param state The new State
+     * @param data The new NavigationData
+     * @param url The new target location
+     * @param unload The function to call to continue to navigate
+     * @param history A value indicating whether browser history was used
+     */
+    unloading: (state: State, data: any, url: string, unload: () => void, history?: boolean) => void;
+    /**
+     * Called on the old State after navigating to a different State
+     */
+    dispose: () => void;
+    /**
+     * Called on the current State after navigating to it
+     * @param data The current NavigationData
+     * @param asyncData The data passed asynchronously while navigating
+     */
+    navigated: (data: any, asyncData: any) => void;
+    /**
+     * Called on the new State before navigating to it
+     * @param data The new NavigationData
+     * @param url The new target location
+     * @param navigate The function to call to continue to navigate
+     * @param history A value indicating whether browser history was used
+     */
+    navigating: (data: any, url: string, navigate: (asyncData?: any) => void, history: boolean) => void;
+    /**
+     * Encodes the Url value
+     * @param state The State navigated to
+     * @param key The key of the navigation data item
+     * @param val The Url value of the navigation data item
+     * @param queryString A value indicating the Url value's location
+     */
+    urlEncode(state: State, key: string, val: string, queryString: boolean): string;
+    /**
+     * Decodes the Url value
+     * @param state The State navigated to
+     * @param key The key of the navigation data item
+     * @param val The Url value of the navigation data item
+     * @param queryString A value indicating the Url value's location
+     */
+    urlDecode(state: State, key: string, val: string, queryString: boolean): string;
+    /**
+     * Validates the NavigationData before navigating to the new State
+     * @param data The new NavigationData
+     * @returns Validation success indicator
+     */
+    validate(data: any): boolean;
+    /**
+     * Truncates the crumb trail whenever a repeated or initial State is
+     * encountered
+     * @param The State navigated to
+     * @param The new NavigationData
+     * @param The Crumb collection representing the crumb trail
+     * @returns Truncated crumb trail
+     */
+    truncateCrumbTrail(state: State, data: any, crumbs: Crumb[]): Crumb[];
+}
+
+/**
+ * Defines a contract a class must implement in order to manage the browser
+ * Url
+ */
+interface HistoryManager {
+    /**
+     * Gets or sets a value indicating whether to disable browser history
+     */
+    disabled: boolean;
+    /**
+     * Registers browser history event listeners
+     * @param navigateHistory The history navigation event handler
+     */
+    init(navigateHistory: () => void): void;
+    /**
+     * Adds browser history
+     * @param url The current url
+     * @param replace A value indicating whether to replace the current
+     * browser history entry
+     */
+    addHistory(url: string, replace: boolean): void;
+    /**
+     * Gets the current location
+     */
+    getCurrentUrl(): string;
+    /**
+     * Gets an Href from the url
+     */
+    getHref(url: string): string;
+    /**
+     * Gets a Url from the anchor or location
+     */
+    getUrl(hrefElement: HTMLAnchorElement | Location): string;
+    /**
+     * Removes browser history event listeners
+     */
+    stop(): void;
+}
+
+/**
+ * Manages history using the browser Url's hash. If used in a browser
+ * without the hashchange event or outside of a browser environment, then
+ * history is disabled
+ */
+export class HashHistoryManager implements HistoryManager {
+    /**
+     * Gets or sets a value indicating whether to disable browser history.
+     * Set to true if used in a browser without the hashchange event or 
+     * outside of a browser environment
+     */
+    disabled: boolean;
+    /**
+     * Initializes a new instance of the HashHistoryManager class
+     * @param replaceQueryIdentifier a value indicating whether to use '#'
+     * in place of '?'. Set to true for Internet explorer 6 and 7 support
+     */
+    constructor(replaceQueryIdentifier?: boolean);
+    /**
+     * Registers a listener for the hashchange event
+     * @param navigateHistory The history navigation event handler
+     */
+    init(navigateHistory: any): void;
+    /**
+     * Sets the browser Url's hash to the url
+     * @param url The current url 
+     * @param replace A value indicating whether to replace the current
+     * browser history entry
+     */
+    addHistory(url: string, replace: boolean): void;
+    /**
+     * Gets the current location
+     */
+    getCurrentUrl(): string;
+    /**
+     * Gets an Href from the url
+     */
+    getHref(url: string): string;
+    /**
+     * Gets a Url from the anchor or location
+     */
+    getUrl(hrefElement: HTMLAnchorElement | Location): string;
+    /**
+     * Removes a listener for the hashchange event
+     */
+    stop(): void;
+}
+
+/**
+ * Manages history using the HTML5 history api. If used in a browser
+ * without the HTML5 history api or outside of a browser environment, then
+ * history is disabled
+ */
+export class HTML5HistoryManager implements HistoryManager {
+    /**
+     * Gets or sets a value indicating whether to disable browser history.
+     * Set to true if used in a browser without the HTML5 history api or 
+     * outside of a browser environment
+     */
+    disabled: boolean;
+    /**
+     * Initializes a new instance of the HTML5HistoryManager class
+     * @param applicationPath The application path
+     */
+    constructor(applicationPath?: string);
+    /**
+     * Registers a listener for the popstate event
+     * @param navigateHistory The history navigation event handler
+     */
+    init(navigateHistory: () => void): void;
+    /**
+     * Sets the browser Url to the url using pushState
+     * @param url The current url 
+     * @param replace A value indicating whether to replace the current
+     * browser history entry
+     */
+    addHistory(url: string, replace: boolean): void;
+    /**
+     * Gets the current location
+     */
+    getCurrentUrl(): string;
+    /**
+     * Gets an Href from the url
+     */
+    getHref(url: string): string;
+    /**
+     * Gets a Url from the anchor or location
+     */
+    getUrl(hrefElement: HTMLAnchorElement | Location): string;
+    /**
+     * Removes a listener for the popstate event
+     */
+    stop(): void;
+}
+
+/**
+ * Represents one piece of the crumb trail and holds the information need
+ * to return to and recreate the State as previously visited
+ */
+export class Crumb {
+    /**
+     * Gets the Context Data held at the time of navigating away from this
+     * State
+     */
+    data: any;
+    /**
+     * Gets the configuration information associated with this navigation
+     */
+    state: State;
+    /**
+     * Gets a value indicating whether the Crumb is the last in the crumb
+     * trail
+     */
+    last: boolean;
+    /**
+     * Gets the State Title
+     */
+    title: string;
+    /**
+     * Gets the link navigation to return to the State and pass the
+     * associated Data
+     */
+    url: string;
+    /**
+     * Gets the link navigation without crumb trail to return to the State
+     * and pass the associated Data
+     */
+    crumblessUrl: string;
+    /**
+     * Initializes a new instance of the Crumb class
+     * @param data The Context Data held at the time of navigating away
+     * from this State
+     * @param state The configuration information associated with this
+     * navigation
+     * @param link The link navigation to return to the State and pass the
+     * associated Data
+     * @param crumblessLink The link navigation without crumb trail to
+     * return to the State and pass the associated Data
+     * @param last A value indicating whether the Crumb is the last in the
+     * crumb trail
+     */
+    constructor(data: any, state: State, link: string, crumblessLink: string, last: boolean);
+}
+
+/**
+ * Provides properties for accessing context sensitive navigation
+ * information. Holds the current State and NavigationData
+ */
+export class StateContext {
+    /**
+     * Gets the last State displayed before the current State
+     */
+    oldState: State;
+    /**
+     * Gets the NavigationData for the last displayed State
+     */
+    oldData: any;
+    /**
+     * Gets the State of the last Crumb in the crumb trail
+     */
+    previousState: State;
+    /**
+     * Gets the NavigationData of the last Crumb in the crumb trail
+     */
+    previousData: any;
+    /**
+     * Gets the current State
+     */
+    state: State;
+    /**
+     * Gets the NavigationData for the current State
+     */
+    data: any;
+    /**
+     * Gets the current Url
+     */
+    url: string;
+    /**
+     * Gets or sets the current title
+     */
+    title: string;
+    /**
+     * Gets a Crumb collection representing the crumb trail, ordered oldest
+     * Crumb first
+     */
+    crumbs: Crumb[];
+    /**
+     * Gets the next crumb
+     */
+    nextCrumb: Crumb;
+    /**
+     * Clears the Context Data
+     */
+    clear(): void;
+    /** 
+     * Combines the data with a subset of the current NavigationData
+     * @param The data to add to the current NavigationData
+     * @returns The combined data
+     */
+    includeCurrentData(data: any, keys?: string[]): any;
+}
+
+/**
+ * Fluently manages all navigation. These can be forward, backward or
+ * refreshing the current State
+ */
+interface FluentNavigator {
+    /**
+     * Gets the current Url
+     */
+    url: string;
+    /**
+     * Navigates to a State
+     * @param stateKey The key of a State
+     * @param navigationData The NavigationData to be passed to the next
+     * State and stored in the StateContext
+     * @throws state does not match the key of a State or there is 
+     * NavigationData that cannot be converted to a String
+     * @throws A mandatory route parameter has not been supplied a value
+     */
+    navigate(stateKey: string, navigationData?: any): FluentNavigator;
+    /**
+     * Navigates back along the crumb trail
+     * @param distance Starting at 1, the number of Crumb steps to go back
+     * @throws canNavigateBack returns false for this distance
+     * @throws A mandatory route parameter has not been supplied a value
+     */
+    navigateBack(distance: number): FluentNavigator;
+    /**
+     * Navigates to the current State
+     * @param navigationData The NavigationData to be passed to the current
+     * State and stored in the StateContext
+     * @param A value determining the effect on browser history
+     * @throws There is NavigationData that cannot be converted to a String
+     * @throws A mandatory route parameter has not been supplied a value
+     */
+    refresh(navigationData?: any): FluentNavigator;
+}
+
+/**
+ * Manages all navigation. These can be forward, backward or refreshing the
+ * current State
+ */
+export class StateNavigator {
+    /**
+     * Provides access to context sensitive navigation information
+     */
+    stateContext: StateContext;
+    /**
+     * Gets the browser Url manager
+     */
+    historyManager: HistoryManager;
+    /**
+     * Gets a list of States
+     */
+    states: { [index: string]: State; };
+    /**
+     * Initializes a new instance of the StateNavigator class
+     * @param states A collection of States
+     * @param historyManager The manager of the browser Url
+     */
+    constructor(states?: StateInfo[], historyManager?: HistoryManager);
+    /**
+     * Configures the StateNavigator
+     * @param stateInfos A collection of State Infos
+     * @param historyManager The manager of the browser Url
+     */
+    configure(stateInfos: StateInfo[], historyManager?: HistoryManager): void;
+    /**
+     * Registers a navigate event listener
+     * @param handler The navigate event listener
+     */
+    onNavigate(handler: (oldState: State, state: State, data: any, asyncData: any) => void): void;
+    /**
+     * Unregisters a navigate event listener
+     * @param handler The navigate event listener
+     */
+    offNavigate(handler: (oldState: State, state: State, data: any, asyncData: any) => void): void;
+    /**
+     * Navigates to a State
+     * @param stateKey The key of a State
+     * @param navigationData The NavigationData to be passed to the next
+     * State and stored in the StateContext
+     * @param A value determining the effect on browser history
+     * @throws state does not match the key of a State or there is 
+     * NavigationData that cannot be converted to a String
+     * @throws A mandatory route parameter has not been supplied a value
+     */
+    navigate(stateKey: string, navigationData?: any, historyAction?: 'add' | 'replace' | 'none'): void;
+    /**
+     * Gets a Url to navigate to a State
+     * @param stateKey The key of a State
+     * @param navigationData The NavigationData to be passed to the next
+     * State and stored in the StateContext
+     * @returns Url that will navigate to State specified in the action
+     * @throws state does not match the key of a State or there is 
+     * NavigationData that cannot be converted to a String
+     */
+    getNavigationLink(stateKey: string, navigationData?: any): string;
+    /**
+     * Determines if the distance specified is within the bounds of the
+     * crumb trail represented by the Crumbs collection
+     */
+    canNavigateBack(distance: number): boolean;
+    /**
+     * Navigates back along the crumb trail
+     * @param distance Starting at 1, the number of Crumb steps to go back
+     * @param A value determining the effect on browser history
+     * @throws canNavigateBack returns false for this distance
+     * @throws A mandatory route parameter has not been supplied a value
+     */
+    navigateBack(distance: number, historyAction?: 'add' | 'replace' | 'none'): void;
+    /**
+     * Gets a Url to navigate back along the crumb trail
+     * @param distance Starting at 1, the number of Crumb steps to go back
+     * @throws canNavigateBack returns false for this distance
+     */
+    getNavigationBackLink(distance: number): string;
+    /**
+     * Navigates to the current State
+     * @param navigationData The NavigationData to be passed to the current
+     * State and stored in the StateContext
+     * @param A value determining the effect on browser history
+     * @throws There is NavigationData that cannot be converted to a String
+     * @throws A mandatory route parameter has not been supplied a value
+     */
+    refresh(navigationData?: any, historyAction?: 'add' | 'replace' | 'none'): void;
+    /**
+     * Gets a Url to navigate to the current State
+     * @param navigationData The NavigationData to be passed to the current
+     * State and stored in the StateContext
+     * @returns Url that will navigate to the current State
+     * @throws There is NavigationData that cannot be converted to a String
+     */
+    getRefreshLink(navigationData?: any): string;
+    /**
+     * Navigates to the url
+     * @param url The target location
+     * @param A value determining the effect on browser history
+     * @param history A value indicating whether browser history was used
+     */
+    navigateLink(url: string, historyAction?: 'add' | 'replace' | 'none', history?: boolean): void;
+    /**
+     * Parses the url out into State and Navigation Data
+     * @param url The url to parse
+     */
+    parseLink(url: string): { state: State; data: any; };
+    /**
+     * Creates a FluentNavigator
+     * @param withContext a value indicating whether to inherit the current
+     * context
+     * @returns A FluentNavigator
+     */
+    fluent(withContext?: boolean): FluentNavigator;
+    /**
+     * Navigates to the passed in url
+     * @param url The url to navigate to 
+     */
+    start(url?: string): void;
+}
+
diff --git a/navigation/navigation-tests.ts b/navigation/navigation-tests.ts
index bec19b7f62..7d1ea6bff8 100644
--- a/navigation/navigation-tests.ts
+++ b/navigation/navigation-tests.ts
@@ -1,91 +1,98 @@
-import Navigation = require("navigation");
+import { Crumb, HashHistoryManager, StateNavigator, State } from 'navigation';
 
-
-namespace NavigationTests {
-	// History Manager
-	class LogHistoryManager extends Navigation.HashHistoryManager  {
-	    addHistory(url: string) {
-			console.log('add history');
-			super.addHistory(url, false);
-	    }
-	}
-	
-	// Configuration
-	var config = [
-        { key: 'people', route: ['people/{page}', 'people/{page}/sort/{sort}'], defaults: { page: 1 }, help: 'people.htm' },
-        { key: 'person', route: 'person/{id}', trackTypes: false, defaultTypes: { id: 'number' }, trackCrumbTrail: true }
-	];
-    var stateNavigator = new Navigation.StateNavigator(config);
-    stateNavigator.configure(config, new LogHistoryManager());
-	
-	// States
-	var states = stateNavigator.states;
-	var people = states['people'];
-	var person = states['person'];
-    var help = people['help'];
-	var pageDefault = people.defaults.page;
-	var idDefaultType = person.defaultTypes.id;
-	
-	// State Controller
-	people.dispose = () => {};
-	people.navigating = (data, url, navigate) => {
-		navigate([]);
-	};
-	people.navigated = (data, asyncData) => {};
-	person.navigating = (data, url, navigate) => {
-		navigate();
-	};
-	person.navigated = (data) => {};
-    person.urlEncode = function urlEncode(state: Navigation.State, key: string, val: string, queryString: boolean): string {
-        return queryString ? val.replace(/\s/g, '+') : encodeURIComponent(val);
-    };
-    person.urlDecode = function urlDecode(state: Navigation.State, key: string, val: string, queryString: boolean): string {
-        return queryString ? val.replace(/\+/g, ' ') : decodeURIComponent(val);
-    };
-	person.validate = (data: any) => data.id > 0;
-	
-	// Navigation Event
-	var navigationListener = (oldState: Navigation.State, state: Navigation.State, data: any, asyncData: any) => {
-		stateNavigator.offNavigate(navigationListener);
-	};
-	stateNavigator.onNavigate(navigationListener);
-	
-	// Navigation
-	stateNavigator.navigate('people');
-	stateNavigator.navigate('people', null, 'add');
-	stateNavigator.refresh();
-	stateNavigator.refresh({ page: 3 });
-	stateNavigator.refresh({ page: 2 }, 'replace');
-	stateNavigator.navigate('person', { id: 10 });
-	var canGoBack: boolean = stateNavigator.canNavigateBack(1);
-	stateNavigator.navigateBack(1);
-	stateNavigator.stateContext.clear();
-	
-	// Navigation Link
-	var link = stateNavigator.getNavigationLink('people');
-	link = stateNavigator.getRefreshLink();
-	link = stateNavigator.getRefreshLink({ page: 2 });
-	stateNavigator.navigateLink(link);
-	link = stateNavigator.getNavigationLink('person', { id: 10 });
-	stateNavigator.navigateLink(link, 'replace');
-	link = stateNavigator.getNavigationBackLink(1);
-	var crumb = stateNavigator.stateContext.crumbs[0];
-	link = crumb.url;
-	stateNavigator.navigateLink(link, 'none', true);
-	
-	// State Context
-	var state: Navigation.State = stateNavigator.stateContext.state;
-	var url: string = stateNavigator.stateContext.url;
-	var title: string = stateNavigator.stateContext.title;
-	var page: number = stateNavigator.stateContext.data.page;
-	state = stateNavigator.stateContext.oldState;
-	page = stateNavigator.stateContext.oldData.page;
-	state = stateNavigator.stateContext.previousState;
-	page = stateNavigator.stateContext.previousData.page;
-	
-	// Navigation Data
-	var data = stateNavigator.stateContext.includeCurrentData({ sort: 'name' }, ['page']);
-	stateNavigator.refresh(data);
-	var data = stateNavigator.stateContext.includeCurrentData({ pageSize: 10 });
-	stateNavigator.refresh(data);
+// History Manager
+class LogHistoryManager extends HashHistoryManager  {
+    addHistory(url: string) {
+        console.log('add history');
+        super.addHistory(url, false);
+    }
 }
+
+// Configuration
+var config = [
+    { key: 'people', route: ['people/{page}', 'people/{page}/sort/{sort}'], defaults: { page: 1 }, help: 'people.htm' },
+    { key: 'person', route: 'person/{id}', trackTypes: false, defaultTypes: { id: 'number' }, trackCrumbTrail: true }
+];
+var stateNavigator = new StateNavigator(config);
+stateNavigator.configure(config, new LogHistoryManager());
+
+// States
+var states = stateNavigator.states;
+var people = states['people'];
+var person = states['person'];
+var help = people['help'];
+var pageDefault = people.defaults.page;
+var idDefaultType = person.defaultTypes.id;
+
+// State Controller
+people.dispose = () => {};
+people.navigating = (data, url, navigate) => {
+    navigate([]);
+};
+people.navigated = (data, asyncData) => {};
+person.navigating = (data, url, navigate) => {
+    navigate();
+};
+person.navigated = (data) => {};
+person.urlEncode = function urlEncode(state: State, key: string, val: string, queryString: boolean): string {
+    return queryString ? val.replace(/\s/g, '+') : encodeURIComponent(val);
+};
+person.urlDecode = function urlDecode(state: State, key: string, val: string, queryString: boolean): string {
+    return queryString ? val.replace(/\+/g, ' ') : decodeURIComponent(val);
+};
+person.validate = (data: any) => data.id > 0;
+person.truncateCrumbTrail = (state: State, data: any, crumbs: Crumb[]) => crumbs;
+
+// Navigation Event
+var navigationListener = (oldState: State, state: State, data: any, asyncData: any) => {
+    stateNavigator.offNavigate(navigationListener);
+};
+stateNavigator.onNavigate(navigationListener);
+
+// Navigation
+stateNavigator.navigate('people');
+stateNavigator.navigate('people', null, 'add');
+stateNavigator.refresh();
+stateNavigator.refresh({ page: 3 });
+stateNavigator.refresh({ page: 2 }, 'replace');
+stateNavigator.navigate('person', { id: 10 });
+var canGoBack: boolean = stateNavigator.canNavigateBack(1);
+stateNavigator.navigateBack(1);
+stateNavigator.stateContext.clear();
+
+// Navigation Link
+var link = stateNavigator.getNavigationLink('people');
+link = stateNavigator.getRefreshLink();
+link = stateNavigator.getRefreshLink({ page: 2 });
+stateNavigator.navigateLink(link);
+link = stateNavigator.getNavigationLink('person', { id: 10 });
+stateNavigator.navigateLink(link, 'replace');
+link = stateNavigator.getNavigationBackLink(1);
+var crumb = stateNavigator.stateContext.crumbs[0];
+link = crumb.url;
+stateNavigator.navigateLink(link, 'none', true);
+
+// Fluent Navigation
+var link = stateNavigator.fluent()
+    .navigate('people')
+    .refresh()
+    .refresh({ page: 3 })
+    .navigate('person', { id: 10 })
+    .navigateBack(1)
+    .url;
+
+// State Context
+var state: State = stateNavigator.stateContext.state;
+var url: string = stateNavigator.stateContext.url;
+var title: string = stateNavigator.stateContext.title;
+var page: number = stateNavigator.stateContext.data.page;
+state = stateNavigator.stateContext.oldState;
+page = stateNavigator.stateContext.oldData.page;
+state = stateNavigator.stateContext.previousState;
+page = stateNavigator.stateContext.previousData.page;
+
+// Navigation Data
+var data = stateNavigator.stateContext.includeCurrentData({ sort: 'name' }, ['page']);
+stateNavigator.refresh(data);
+var data = stateNavigator.stateContext.includeCurrentData({ pageSize: 10 });
+stateNavigator.refresh(data);
diff --git a/navigation/tslint.json b/navigation/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/navigation/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/navigo/index.d.ts b/navigo/index.d.ts
new file mode 100644
index 0000000000..35c9f009f6
--- /dev/null
+++ b/navigo/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for navigo 4.0
+// Project: https://github.com/krasimir/navigo
+// Definitions by: Adrian Ehrsam <https://github.com/aersamkull>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface NavigoHooks {
+    before?: ((done: (suppress?: boolean) => void) => void);
+    after?: () => void;
+}
+type RouteHandler = ((parametersObj: any, query: string) => void) | { as: string; uses: (parametersObj: any) => void };
+
+declare class Navigo {
+
+    /**
+     * Constructs the router
+     * @param root The main URL of your application.
+     * @param useHash If useHash set to true then the router uses an old routing approach with hash in the URL. Navigo anyways falls back to this mode if there is no History API supported.
+     */
+    constructor(root?: string | null, useHash?: boolean);
+
+
+    on(location: string, handler: RouteHandler, hooks?: NavigoHooks): Navigo;
+    on(location: RegExp, handler: (...parameters: string[]) => void, hooks?: NavigoHooks): Navigo;
+    on(routes: { [key: string]: RouteHandler }): Navigo;
+
+    on(rootHandler: RouteHandler, hooks?: NavigoHooks): Navigo;
+
+    notFound(handler: ((query: string) => void), hooks?: NavigoHooks): void;
+
+    navigate(path: string, absolute?: boolean): void;
+
+    updatePageLinks(): void;
+
+    generate(path: string, params?: any): string;
+
+    resolve(currentURL?: string): boolean;
+
+    link(path: string): string;
+
+    disableIfAPINotAvailable(): void;
+
+    pause(): void;
+
+    resume(): void;
+
+    destroy(): void;
+}
+export = Navigo;
+export as namespace Navigo;
\ No newline at end of file
diff --git a/navigo/navigo-tests.ts b/navigo/navigo-tests.ts
new file mode 100644
index 0000000000..73ea91f416
--- /dev/null
+++ b/navigo/navigo-tests.ts
@@ -0,0 +1,123 @@
+import Navigo = require("navigo");
+
+var root = null;
+var useHash = false;
+
+var router = new Navigo(root, useHash);
+
+router
+    .on('/products/list', () => {
+        // display all the products
+    })
+    .resolve();
+
+router
+    .on(() => {
+        // show home page here
+    })
+    .resolve();
+
+router
+    .on({
+        '/products/list': () => {
+            // do something
+        },
+        '/products': () => {
+            // do something
+        }
+    })
+    .resolve();
+
+router
+    .on({
+        'products/:id': () => {
+            // do something
+        },
+        'products': () => {
+            // do something
+        },
+        '*': () => {
+            // do something
+        }
+    })
+    .resolve();
+
+
+router
+    .on('/user/:id/:action', (params: { id: string; action: string }) => {
+        // If we have http://site.com/user/42/save as a url then
+        // params.id = 42
+        // params.action = save
+    })
+    .resolve();
+
+router
+    .on('/user/:id/:action', (params: { id: string; action: string }, query: string) => {
+        // If we have http://site.com/user/42/save?answer=42 as a url then
+        // params.id = 42
+        // params.action = save
+        // query = answer=42
+    })
+    .resolve();
+
+router.notFound((query: string) => {
+    // ...
+});
+
+router
+    .on(/users\/(\d+)\/(\w+)\/?/, (id: string, action: string) => {
+        // If we have http://site.com/user/42/save as a url then
+        // id = 42
+        // action = save
+    })
+    .resolve();
+
+router
+    .on('/user/*', () => {
+        // This function will be called on every
+        // URL that starts with /user
+    })
+    .resolve();
+
+router.notFound(() => {
+    // called when there is path specified but
+    // there is no route matching
+});
+
+router.navigate('/products/list');
+
+router.navigate('http://site.com/products/list', true);
+
+router = new Navigo('http://site.com/', true);
+var handler = () => {
+    // do something
+};
+router.on({
+    '/trip/:tripId/edit': { as: 'trip.edit', uses: handler },
+    '/trip/save': { as: 'trip.save', uses: handler },
+    '/trip/:action/:tripId': { as: 'trip.action', uses: handler }
+});
+var a: string = (router.generate('trip.edit', { tripId: 42 })); // --> /trip/42/edit
+a = (router.generate('trip.action', { tripId: 42, action: 'save' })); // --> /trip/save/42
+a = (router.generate('trip.save')); // --> /trip/save
+
+router.pause();
+router.navigate('/en/products');
+router.resume(); // or .pause(false)
+
+router.on(
+    '/user/edit',
+    () => {
+        // show user edit page
+    },
+    {
+        before: (done) => {
+            // doing some async operation
+            done(false);
+            done();
+        },
+        after: () => {
+            // do something
+        }
+    }
+);
diff --git a/navigo/tsconfig.json b/navigo/tsconfig.json
new file mode 100644
index 0000000000..18a90350c6
--- /dev/null
+++ b/navigo/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "navigo-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/navigo/tslint.json b/navigo/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/navigo/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/nedb-logger/index.d.ts b/nedb-logger/index.d.ts
new file mode 100644
index 0000000000..4c47ee0dad
--- /dev/null
+++ b/nedb-logger/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for NeDB Logger 1.8
+// Project: https://github.com/louischatriot/nedb-logger
+// Definitions by: Joe vanderstelt <https://github.com/thisboyiscrazy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = NeDBLoggerDataStore;
+export as namespace NedbLogger;
+
+declare namespace NeDBLoggerDataStore { }
+declare class NeDBLoggerDataStore {
+
+    constructor(path?: string | {filename: string});
+
+    /**
+     * Insert a new document
+     * @param {Function} cb Optional callback, signature: err, insertedDoc
+     */
+    insert<T>(newDoc: T, cb?: (err: Error, document: T) => void): void;
+
+}
diff --git a/nedb-logger/nedb-logger-tests.ts b/nedb-logger/nedb-logger-tests.ts
new file mode 100644
index 0000000000..b6665ad44d
--- /dev/null
+++ b/nedb-logger/nedb-logger-tests.ts
@@ -0,0 +1,64 @@
+/**
+ * Created by Joe Vanderstelt 2017-02-22.
+ */
+
+/// <reference types="node" />
+
+
+import * as es6styleimport from 'nedb-logger';
+
+import Q = require('q');
+import nedblogger = require('nedb-logger');
+
+class BaseCollection<T> {
+
+    private dataStore: nedblogger;
+
+    constructor(dataStore: nedblogger) {
+
+        this.dataStore = dataStore;
+    }
+
+    insert(document: T): Q.Promise<T> {
+
+        var deferred = Q.defer<T>();
+
+        this.dataStore.insert<T>(document, function(err: Error, newDoc: T) {   // Callback is optional
+            // newDoc is the newly inserted document, including its _id
+            if (err) {
+                deferred.reject(err);
+            } else {
+                deferred.resolve(newDoc);
+            }
+        });
+
+        return deferred.promise;
+    }
+
+}
+
+// Type 1: Persistent datastore with manual loading
+
+import Datastore = require('nedb-logger');
+var db = new Datastore({filename: 'path/to/datafile'});
+
+var doc: any = {
+    hello: 'world'
+    , n: 5
+    , today: new Date()
+    , nedbIsAwesome: true
+    , notthere: null
+    , notToBeSaved: undefined  // Will not be saved
+    , fruits: ['apple', 'orange', 'pear']
+    , infos: {name: 'nedb'}
+};
+
+db.insert(doc, function(err: Error, newDoc: any) {   // Callback is optional
+    // newDoc is the newly inserted document, including its _id
+    // newDoc has no key called notToBeSaved since its value was undefined
+});
+
+db.insert([{a: 5}, {a: 42}], function(err: Error, newdocs: any[]) {
+    // Two documents were inserted in the database
+    // newDocs is an array with these documents, augmented with their _id
+});
diff --git a/nedb-logger/tsconfig.json b/nedb-logger/tsconfig.json
new file mode 100644
index 0000000000..917e72a038
--- /dev/null
+++ b/nedb-logger/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "nedb-logger-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nedb-logger/tslint.json b/nedb-logger/tslint.json
new file mode 100644
index 0000000000..2221e40e4a
--- /dev/null
+++ b/nedb-logger/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
\ No newline at end of file
diff --git a/nedb/index.d.ts b/nedb/index.d.ts
index 23519d3579..790f3f6d06 100644
--- a/nedb/index.d.ts
+++ b/nedb/index.d.ts
@@ -1,34 +1,31 @@
-// Type definitions for NeDB
+// Type definitions for NeDB 1.8
 // Project: https://github.com/louischatriot/nedb
 // Definitions by: Stefan Steinhart <https://github.com/reppners>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export = NeDBDataStore;
+export = Nedb;
 export as namespace Nedb;
 
-declare namespace NeDBDataStore { }
-declare class NeDBDataStore {
-    constructor();
-    constructor(path:string);
-    constructor(options:NeDB.DataStoreOptions);
+declare class Nedb {
+    constructor(pathOrOptions?: string | Nedb.DataStoreOptions);
 
-    persistence:NeDB.Persistence;
+    persistence: Nedb.Persistence;
 
     /**
      * Load the database from the datafile, and trigger the execution of buffered commands if any
      */
-    loadDatabase(cb?:(err:Error)=>void):void;
+    loadDatabase(cb?: (err: Error) => void): void;
 
     /**
      * Get an array of all the data in the database
      */
-    getAllData():Array<any>;
+    getAllData(): Array<any>;
 
 
     /**
      * Reset all currently defined indexes
      */
-    resetIndexes(newData:any):void;
+    resetIndexes(newData: any): void;
 
     /**
      * Ensure an index is kept for this field. Same parameters as lib/indexes
@@ -39,34 +36,32 @@ declare class NeDBDataStore {
      * @param {Boolean} options.sparse
      * @param {Function} cb Optional callback, signature: err
      */
-    ensureIndex(options:NeDB.EnsureIndexOptions, cb?:(err:Error)=>void):void;
+    ensureIndex(options: Nedb.EnsureIndexOptions, cb?: (err: Error) => void): void;
 
     /**
      * Remove an index
      * @param {String} fieldName
      * @param {Function} cb Optional callback, signature: err
      */
-    removeIndex(fieldName:string, cb?:(err:Error)=>void):void;
+    removeIndex(fieldName: string, cb?: (err: Error) => void): void;
 
     /**
      * Add one or several document(s) to all indexes
      */
-    addToIndexes<T>(doc:T):void;
-    addToIndexes<T>(doc:Array<T>):void;
+    addToIndexes<T>(doc: T | T[]): void;
 
     /**
      * Remove one or several document(s) from all indexes
      */
-    removeFromIndexes<T>(doc:T):void;
-    removeFromIndexes<T>(doc:Array<T>):void;
+    removeFromIndexes<T>(doc: T | T[]): void;
 
     /**
      * Update one or several documents in all indexes
      * To update multiple documents, oldDoc must be an array of { oldDoc, newDoc } pairs
      * If one update violates a constraint, all changes are rolled back
      */
-    updateIndexes<T>(oldDoc:T, newDoc:T):void;
-    updateIndexes<T>(updates:Array<{oldDoc:T; newDoc:T;}>):void;
+    updateIndexes<T>(oldDoc: T, newDoc: T): void;
+    updateIndexes<T>(updates: Array<{oldDoc: T; newDoc: T}>): void;
 
     /**
      * Return the list of candidates for a given query
@@ -77,20 +72,20 @@ declare class NeDBDataStore {
      *
      * TODO: needs to be moved to the Cursor module
      */
-    getCandidates(query:any):void;
+    getCandidates(query: any): void;
 
     /**
      * Insert a new document
      * @param {Function} cb Optional callback, signature: err, insertedDoc
      */
-    insert<T>(newDoc:T, cb?:(err:Error, document:T)=>void):void;
+    insert<T>(newDoc: T, cb?: (err: Error, document: T) => void): void;
 
     /**
      * Count all documents matching the query
      * @param {any} query MongoDB-style query
      */
-    count(query:any, callback:(err:Error, n:number)=>void):void;
-    count(query:any):NeDB.CursorCount;
+    count(query: any, callback: (err: Error, n: number) => void): void;
+    count(query: any): Nedb.CursorCount;
 
     /**
      * Find all documents matching the query
@@ -98,61 +93,61 @@ declare class NeDBDataStore {
      * @param {any} query MongoDB-style query
      * @param {any} projection MongoDB-style projection
      */
-    find<T>(query:any, projection:T, callback:(err:Error, documents:Array<T>)=>void):void;
-    find<T>(query:any, projection:T):NeDB.Cursor<T>;
+    find<T>(query: any, projection: T, callback: (err: Error, documents: Array<T>) => void): void;
+    find<T>(query: any, projection?: T): Nedb.Cursor<T>;
 
     /**
      * Find all documents matching the query
      * If no callback is passed, we return the cursor so that user can limit, skip and finally exec
      * * @param {any} query MongoDB-style query
      */
-    find<T>(query:any, callback:(err:Error, documents:Array<T>)=>void):void;
-    find<T>(query:any):NeDB.Cursor<T>;
+    find<T>(query: any, callback: (err: Error, documents: Array<T>) => void): void;
 
     /**
      * Find one document matching the query
      * @param {any} query MongoDB-style query
      * @param {any} projection MongoDB-style projection
      */
-    findOne<T>(query:any, projection:T, callback:(err:Error, document:T)=>void):void;
+    findOne<T>(query: any, projection: T, callback: (err: Error, document: T) => void): void;
 
     /**
      * Find one document matching the query
      * @param {any} query MongoDB-style query
      */
-    findOne<T>(query:any, callback:(err:Error, document:T)=>void):void;
+    findOne<T>(query: any, callback: (err: Error, document: T) => void): void;
 
     /**
-         * Update all docs matching query v1.7.4 and prior signature.
+     * Update all docs matching query v1.7.4 and prior signature.
      * For now, very naive implementation (recalculating the whole database)
      * @param {any} query
      * @param {any} updateQuery
      * @param {Object} options Optional options
      *                 options.multi If true, can update multiple documents (defaults to false)
      *                 options.upsert If true, document is inserted if the query doesn't match anything
-         * @param {Function} cb Optional callback, signature: err,
-         *                                                    numReplaced,
-         *                                                    upsert (set to true if the update was in fact an upsert)
+     * @param {Function} cb Optional callback, signature: err,
+     *                                                    numReplaced,
+     *                                                    upsert (set to true if the update was in fact an upsert)
      *
      * @api private Use Datastore.update which has the same signature
      */
-    update(query:any, updateQuery:any, options?:NeDB.UpdateOptions, cb?:(err:Error, numberOfUpdated:number, upsert:boolean)=>void):void;
-         /**
-         * Update all docs matching query v1.8 signature.
-         * For now, very naive implementation (recalculating the whole database)
-         * @param {any} query
-         * @param {any} updateQuery
-         * @param {Object} options Optional options
-         *                 options.multi If true, can update multiple documents (defaults to false)
-         *                 options.upsert If true, document is inserted if the query doesn't match anything
-         * @param {Function} cb Optional callback, signature: err,
-         *                                                    numAffected,
-         *                                                    affectedDocuments (when returnUpdatedDocs is set to true), obj or array
-         *                                                    upsert (set to true if the update was in fact an upsert)
-         *
-         * @api private Use Datastore.update which has the same signature
-         */
-        update<T>(query:any, updateQuery:any, options?:NeDB.UpdateOptions, cb?:(err:Error, numberOfUpdated:number, affectedDocuments:any, upsert:boolean)=>void):void;
+    update(query: any, updateQuery: any, options?: Nedb.UpdateOptions, cb?: (err: Error, numberOfUpdated: number, upsert: boolean) => void): void;
+
+    /**
+     * Update all docs matching query v1.8 signature.
+     * For now, very naive implementation (recalculating the whole database)
+     * @param {any} query
+     * @param {any} updateQuery
+     * @param {Object} options Optional options
+     *                 options.multi If true, can update multiple documents (defaults to false)
+     *                 options.upsert If true, document is inserted if the query doesn't match anything
+     * @param {Function} cb Optional callback, signature: err,
+     *                                                    numAffected,
+     *                                                    affectedDocuments (when returnUpdatedDocs is set to true), obj or array
+     *                                                    upsert (set to true if the update was in fact an upsert)
+     *
+     * @api private Use Datastore.update which has the same signature
+     */
+    update<T>(query: any, updateQuery: any, options?: Nedb.UpdateOptions, cb?: (err: Error, numberOfUpdated: number, affectedDocuments: any, upsert: boolean) => void): void;
 
     /**
      * Remove all docs matching the query
@@ -164,32 +159,45 @@ declare class NeDBDataStore {
      *
      * @api private Use Datastore.remove which has the same signature
      */
-    remove(query:any, options:NeDB.RemoveOptions, cb?:(err:Error, n:number)=>void):void;
-    remove(query:any, cb?:(err:Error, n:number)=>void):void;
+    remove(query: any, options: Nedb.RemoveOptions, cb?: (err: Error, n: number) => void): void;
+    remove(query: any, cb?: (err: Error, n: number) => void): void;
 }
 
-declare namespace NeDB {
+declare namespace Nedb {
     interface Cursor<T> {
-        sort(query:any):Cursor<T>;
-        skip(n:number):Cursor<T>;
-        limit(n:number):Cursor<T>;
-        projection(query:any):Cursor<T>;
-        exec(callback:(err:Error, documents:Array<T>)=>void):void;
+        sort(query: any): Cursor<T>;
+        skip(n: number): Cursor<T>;
+        limit(n: number): Cursor<T>;
+        projection(query: any): Cursor<T>;
+        exec(callback: (err: Error, documents: Array<T>) => void): void;
     }
 
     interface CursorCount {
-        exec(callback:(err:Error, count:number)=>void):void;
+        exec(callback: (err: Error, count: number) => void): void;
     }
 
     interface DataStoreOptions {
-        filename?:string // Optional, datastore will be in-memory only if not provided
-        inMemoryOnly?:boolean // Optional, default to false
-        nodeWebkitAppName?:boolean // Optional, specify the name of your NW app if you want options.filename to be relative to the directory where
-        autoload?:boolean // Optional, defaults to false
-        onload?:(error:Error)=>any // Optional, if autoload is used this will be called after the load database with the error object as parameter. If you don't pass it the error will be thrown
-        afterSerialization?:(line:string)=>string; // (optional): hook you can use to transform data after it was serialized and before it is written to disk. Can be used for example to encrypt data before writing database to disk. This function takes a string as parameter (one line of an NeDB data file) and outputs the transformed string, which must absolutely not contain a \n character (or data will be lost)
-        beforeDeserialization?:(line:string)=>string; // (optional): reverse of afterSerialization. Make sure to include both and not just one or you risk data loss. For the same reason, make sure both functions are inverses of one another. Some failsafe mechanisms are in place to prevent data loss if you misuse the serialization hooks: NeDB checks that never one is declared without the other, and checks that they are reverse of one another by testing on random strings of various lengths. In addition, if too much data is detected as corrupt, NeDB will refuse to start as it could mean you're not using the deserialization hook corresponding to the serialization hook used before (see below)
-        corruptAlertThreshold?:number; // (optional): between 0 and 1, defaults to 10%. NeDB will refuse to start if more than this percentage of the datafile is corrupt. 0 means you don't tolerate any corruption, 1 means you don't care
+        filename?: string // Optional, datastore will be in-memory only if not provided
+        inMemoryOnly?: boolean // Optional, default to false
+        nodeWebkitAppName?: boolean // Optional, specify the name of your NW app if you want options.filename to be relative to the directory where
+        autoload?: boolean // Optional, defaults to false
+        // Optional, if autoload is used this will be called after the load database with the error object as parameter. If you don't pass it the error will be thrown
+        onload?: (error: Error) => any
+        // (optional): hook you can use to transform data after it was serialized and before it is written to disk.
+        // Can be used for example to encrypt data before writing database to disk.
+        // This function takes a string as parameter (one line of an NeDB data file) and outputs the transformed string, which must absolutely not contain a \n character (or data will be lost)
+        afterSerialization?: (line: string) => string;
+        // (optional): reverse of afterSerialization.
+        // Make sure to include both and not just one or you risk data loss.
+        // For the same reason, make sure both functions are inverses of one another.
+        // Some failsafe mechanisms are in place to prevent data loss if you misuse the serialization hooks:
+        // NeDB checks that never one is declared without the other, and checks that they are reverse of one another by testing on random strings of various lengths.
+        // In addition, if too much data is detected as corrupt,
+        // NeDB will refuse to start as it could mean you're not using the deserialization hook corresponding to the serialization hook used before (see below)
+        beforeDeserialization?: (line: string) => string;
+        // (optional): between 0 and 1, defaults to 10%. NeDB will refuse to start if more than this percentage of the datafile is corrupt.
+        // 0 means you don't tolerate any corruption, 1 means you don't care
+        corruptAlertThreshold?: number;
     }
 
     /**
@@ -206,18 +214,18 @@ declare namespace NeDB {
      * options only one option for now: multi which allows the removal of multiple documents if set to true. Default is false
      */
     interface RemoveOptions {
-        multi?:boolean
+        multi?: boolean
     }
 
     interface EnsureIndexOptions {
-        fieldName:string;
-        unique?:boolean;
-        sparse?:boolean;
+        fieldName: string;
+        unique?: boolean;
+        sparse?: boolean;
     }
 
     interface Persistence {
-        compactDatafile():void;
-        setAutocompactionInterval(interval:number):void;
-        stopAutocompaction():void;
+        compactDatafile(): void;
+        setAutocompactionInterval(interval: number): void;
+        stopAutocompaction(): void;
     }
 }
diff --git a/nedb/nedb-tests.ts b/nedb/nedb-tests.ts
index 5faa3d0ffb..e90b682c68 100644
--- a/nedb/nedb-tests.ts
+++ b/nedb/nedb-tests.ts
@@ -2,193 +2,152 @@
  * Created by stefansteinhart on 31.01.15.
  */
 
-/// <reference types="q" />
 /// <reference types="node" />
 
-
 import * as es6styleimport from 'nedb';
 
-import Q = require('q');
 import nedb = require('nedb');
 
 class BaseCollection<T> {
+    private dataStore: nedb;
 
-    private dataStore:nedb;
-
-    constructor(dataStore:nedb) {
-
+    constructor(dataStore: nedb) {
         this.dataStore = dataStore;
     }
 
-    public insert(document:T):Q.Promise<T> {
-
-        var deferred = Q.defer<T>();
-
-        this.dataStore.insert<T>(document, function (err:Error, newDoc:T) {   // Callback is optional
-            // newDoc is the newly inserted document, including its _id
-            if (err) {
-                deferred.reject(err);
-            }
-            else {
-                deferred.resolve(newDoc);
-            }
+    insert(document: T): Promise<T> {
+        return new Promise((resolve, reject) => {
+            this.dataStore.insert<T>(document, (err: Error, newDoc: T) => {   // Callback is optional
+                // newDoc is the newly inserted document, including its _id
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(newDoc);
+                }
+            });
         });
-
-        return deferred.promise;
     }
 
-    public count():Q.Promise<number> {
-
-        var deferred = Q.defer<number>();
-
-        this.dataStore.count({}, function (err:Error, count:number) {
-            if (err) {
-                deferred.reject(err);
-            }
-            else {
-                deferred.resolve(count);
-            }
+    count(): Promise<number> {
+        return new Promise((resolve, reject) => {
+            this.dataStore.count({}, (err: Error, count: number) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(count);
+                }
+            });
         });
-
-        return deferred.promise;
     }
 
-    public countBy(criteria:any):Q.Promise<number> {
-
-        var deferred = Q.defer<number>();
-
-        this.dataStore.count(criteria, function (err:Error, count:number) {
-            if (err) {
-                deferred.reject(err);
-            }
-            else {
-                deferred.resolve(count);
-            }
+    countBy(criteria: any): Promise<number> {
+        return new Promise((resolve, reject) => {
+            this.dataStore.count(criteria, (err: Error, count: number) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(count);
+                }
+            });
         });
-
-        return deferred.promise;
     }
 
-    public findByID(id:string):Q.Promise<T> {
-
-        var deferred = Q.defer<T>();
-
-        this.dataStore.findOne<T>({_id: id}, function (err:Error, doc:T) {
-            if (err) {
-                deferred.reject(err);
-            }
-            else {
-                deferred.resolve(doc);
-            }
+    findByID(id: string): Promise<T> {
+        return new Promise((resolve, reject) => {
+            this.dataStore.findOne<T>({_id: id}, (err: Error, doc: T) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(doc);
+                }
+            });
         });
-
-        return deferred.promise;
     }
 
-    public findOne(criteria:any):Q.Promise<T> {
-
-        var deferred = Q.defer<T>();
-
-        this.dataStore.findOne<T>(criteria, function (err:Error, doc:T) {
-            if (err) {
-                deferred.reject(err);
-            }
-            else {
-                deferred.resolve(doc);
-            }
+    findOne(criteria: any): Promise<T> {
+        return new Promise((resolve, reject) => {
+            this.dataStore.findOne<T>(criteria, (err: Error, doc: T) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(doc);
+                }
+            });
         });
-
-        return deferred.promise;
     }
 
-    public find(criteria:any):Q.Promise<Array<T>> {
-
-        var deferred = Q.defer<Array<T>>();
-
-        this.dataStore.find(criteria, function (err:Error, docs:Array<T>) {
-            if (err) {
-                deferred.reject(err);
-            }
-            else {
-                deferred.resolve(docs);
-            }
+    find(criteria: any): Promise<T[]> {
+        return new Promise((resolve, reject) => {
+            this.dataStore.find(criteria, (err: Error, docs: T[]) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(docs);
+                }
+            });
         });
-
-        return deferred.promise;
     }
 
-    public all():Q.Promise<Array<T>> {
-
-        var deferred = Q.defer<Array<T>>();
-
-        this.dataStore.find({}, function (err:Error, docs:Array<T>) {
-            if (err) {
-                deferred.reject(err);
-            }
-            else {
-                deferred.resolve(docs);
-            }
+    all(): Promise<T[]> {
+        return new Promise((resolve, reject) => {
+            this.dataStore.find({}, (err: Error, docs: T[]) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(docs);
+                }
+            });
         });
-
-        return deferred.promise;
     }
 
-    public upsert(query:any, updateQuery:any):Q.Promise<T> {
-
-        var deferred = Q.defer<T>();
-
-        this.dataStore.update(query, updateQuery, {upsert: true}, function (err:Error, numberOfUpdated:number, upsert: boolean) {
-            if (err) {
-                deferred.reject(err);
-            }
-            else {
-                //deferred.resolve(newDoc);
-            }
+    upsert(query: any, updateQuery: any): Promise<T[]> {
+        const a: Promise<T[]> = new Promise((resolve, reject) => {
+            this.dataStore.update(query, updateQuery, {upsert: true}, (err: Error, numberOfUpdated: number, upsert: boolean) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    //resolve(newDoc);
+                }
+            });
         });
 
-        this.dataStore.update(query, updateQuery, {upsert: true}, function (err:Error, numberOfUpdated:number, affectedDocs:any, upsert: boolean) {
-            if (err) {
-                deferred.reject(err);
-            }
-            else {
-                //deferred.resolve(newDoc);
-            }
+        const b: Promise<T[]> = new Promise((resolve, reject) => {
+            this.dataStore.update(query, updateQuery, {upsert: true}, (err: Error, numberOfUpdated: number, affectedDocs: any, upsert: boolean) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    //resolve(newDoc);
+                }
+            });
         });
 
-        return deferred.promise;
+        return a || b;
     }
 
-    public update(query:Object, updateQuery:Object, options?:any):Q.Promise<number> {
-
-        var deferred = Q.defer<number>();
-
-        this.dataStore.update(query, updateQuery, options, function (err:Error, numberOfUpdated:number) {
-            if (err) {
-                deferred.reject(err);
-            }
-            else {
-                deferred.resolve(numberOfUpdated);
-            }
+    update(query: {}, updateQuery: {}, options?: any): Promise<number> {
+        return new Promise((resolve, reject) => {
+            this.dataStore.update(query, updateQuery, options, (err: Error, numberOfUpdated: number) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(numberOfUpdated);
+                }
+            });
         });
-
-        return deferred.promise;
     }
 
-    public remove(criteria:any):Q.Promise<number> {
-
-        var deferred = Q.defer<number>();
-
-        this.dataStore.remove(criteria, function (err:Error, numberOfDeletedEntrys:number) {
-
-            if (err) {
-                deferred.reject(err);
-            }
-            else {
-                deferred.resolve(numberOfDeletedEntrys);
-            }
+    remove(criteria: any): Promise<number> {
+        return new Promise((resolve, reject) => {
+            this.dataStore.remove(criteria, (err: Error, numberOfDeletedEntrys: number) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(numberOfDeletedEntrys);
+                }
+            });
         });
-
-        return deferred.promise;
     }
 }
 
@@ -199,7 +158,7 @@ var db = new Datastore();
 
 // Type 2: Persistent datastore with manual loading
 db = new Datastore({filename: 'path/to/datafile'});
-db.loadDatabase(function (err) {    // Callback is optional
+db.loadDatabase((err) => {    // Callback is optional
     // Now commands will be executed
 });
 
@@ -217,7 +176,7 @@ db = new Datastore({filename: path.join(require('nw.gui').App.dataPath, 'somethi
 
 // Of course you can create multiple datastores if you need several
 // collections. In this case it's usually a good idea to use autoload for all collections.
-var dbContainer:any = {};
+var dbContainer: any = {};
 dbContainer.users = new Datastore('path/to/users.db');
 dbContainer.robots = new Datastore('path/to/robots.db');
 
@@ -225,7 +184,7 @@ dbContainer.robots = new Datastore('path/to/robots.db');
 dbContainer.users.loadDatabase();
 dbContainer.robots.loadDatabase();
 
-var doc:any = {
+var doc: any = {
     hello: 'world'
     , n: 5
     , today: new Date()
@@ -236,151 +195,151 @@ var doc:any = {
     , infos: {name: 'nedb'}
 };
 
-db.insert(doc, function (err:Error, newDoc:any) {   // Callback is optional
+db.insert(doc, (err: Error, newDoc: any) => {   // Callback is optional
     // newDoc is the newly inserted document, including its _id
     // newDoc has no key called notToBeSaved since its value was undefined
 });
 
-db.insert([{a: 5}, {a: 42}], function (err:Error, newdocs:Array<any>) {
+db.insert([{a: 5}, {a: 42}], (err: Error, newdocs: any[]) => {
     // Two documents were inserted in the database
     // newDocs is an array with these documents, augmented with their _id
 });
 
 // If there is a unique constraint on field 'a', this will fail
-db.insert([{a: 5}, {a: 42}, {a: 5}], function (err:Error) {
+db.insert([{a: 5}, {a: 42}, {a: 5}], (err: Error) => {
     // err is a 'uniqueViolated' error
     // The database was not modified
 });
 
 // Finding all planets in the solar system
-db.find({system: 'solar'}, function (err:Error, docs:Array<any>) {
+db.find({system: 'solar'}, (err: Error, docs: any[]) => {
     // docs is an array containing documents Mars, Earth, Jupiter
     // If no document is found, docs is equal to []
 });
 
 // Finding all planets whose name contain the substring 'ar' using a regular expression
-db.find({planet: /ar/}, function (err:Error, docs:Array<any>) {
+db.find({planet: /ar/}, (err: Error, docs: any[]) => {
     // docs contains Mars and Earth
 });
 
 // Finding all inhabited planets in the solar system
-db.find({system: 'solar', inhabited: true}, function (err:Error, docs:Array<any>) {
+db.find({system: 'solar', inhabited: true}, (err: Error, docs: any[]) => {
     // docs is an array containing document Earth only
 });
 
 // Use the dot-notation to match fields in subdocuments
-db.find({"humans.genders": 2}, function (err:Error, docs:Array<any>) {
+db.find({"humans.genders": 2}, (err: Error, docs: any[]) => {
     // docs contains Earth
 });
 
 // Use the dot-notation to navigate arrays of subdocuments
-db.find({"completeData.planets.name": "Mars"}, function (err:Error, docs:Array<any>) {
+db.find({"completeData.planets.name": "Mars"}, (err: Error, docs: any[]) => {
     // docs contains document 5
 });
 
-db.find({"completeData.planets.name": "Jupiter"}, function (err:Error, docs:Array<any>) {
+db.find({"completeData.planets.name": "Jupiter"}, (err: Error, docs: any[]) => {
     // docs is empty
 });
 
-db.find({"completeData.planets.0.name": "Earth"}, function (err:Error, docs:Array<any>) {
+db.find({"completeData.planets.0.name": "Earth"}, (err: Error, docs: any[]) => {
     // docs contains document 5
     // If we had tested against "Mars" docs would be empty because we are matching against a specific array element
 });
 
 
 // You can also deep-compare objects. Don't confuse this with dot-notation!
-db.find({humans: {genders: 2}}, function (err:Error, docs:Array<any>) {
+db.find({humans: {genders: 2}}, (err: Error, docs: any[]) => {
     // docs is empty, because { genders: 2 } is not equal to { genders: 2, eyes: true }
 });
 
 // Find all documents in the collection
-db.find({}, function (err:Error, docs:Array<any>) {
+db.find({}, (err: Error, docs: any[]) => {
 });
 
 // The same rules apply when you want to only find one document
-db.findOne({_id: 'id1'}, function (err:Error, doc:any) {
+db.findOne({_id: 'id1'}, (err: Error, doc: any) => {
     // doc is the document Mars
     // If no document is found, doc is null
 });
 
 // $lt, $lte, $gt and $gte work on numbers and strings
-db.find({"humans.genders": {$gt: 5}}, function (err:Error, docs:Array<any>) {
+db.find({"humans.genders": {$gt: 5}}, (err: Error, docs: any[]) => {
     // docs contains Omicron Persei 8, whose humans have more than 5 genders (7).
 });
 
 // When used with strings, lexicographical order is used
-db.find({planet: {$gt: 'Mercury'}}, function (err:Error, docs:Array<any>) {
+db.find({planet: {$gt: 'Mercury'}}, (err: Error, docs: any[]) => {
     // docs contains Omicron Persei 8
 })
 
 // Using $in. $nin is used in the same way
-db.find({planet: {$in: ['Earth', 'Jupiter']}}, function (err:Error, docs:Array<any>) {
+db.find({planet: {$in: ['Earth', 'Jupiter']}}, (err: Error, docs: any[]) => {
     // docs contains Earth and Jupiter
 });
 
 // Using $exists
-db.find({satellites: {$exists: true}}, function (err:Error, docs:Array<any>) {
+db.find({satellites: {$exists: true}}, (err: Error, docs: any[]) => {
     // docs contains only Mars
 });
 
 // Using $regex with another operator
-db.find({planet: {$regex: /ar/, $nin: ['Jupiter', 'Earth']}}, function (err:Error, docs:Array<any>) {
+db.find({planet: {$regex: /ar/, $nin: ['Jupiter', 'Earth']}}, (err: Error, docs: any[]) => {
     // docs only contains Mars because Earth was excluded from the match by $nin
 });
 
 // Using an array-specific comparison function
 // Note: you can't use nested comparison functions, e.g. { $size: { $lt: 5 } } will throw an error
-db.find({satellites: {$size: 2}}, function (err:Error, docs:Array<any>) {
+db.find({satellites: {$size: 2}}, (err: Error, docs: any[]) => {
     // docs contains Mars
 });
 
-db.find({satellites: {$size: 1}}, function (err:Error, docs:Array<any>) {
+db.find({satellites: {$size: 1}}, (err: Error, docs: any[]) => {
     // docs is empty
 });
 
 // If a document's field is an array, matching it means matching any element of the array
-db.find({satellites: 'Phobos'}, function (err:Error, docs:Array<any>) {
+db.find({satellites: 'Phobos'}, (err: Error, docs: any[]) => {
     // docs contains Mars. Result would have been the same if query had been { satellites: 'Deimos' }
 });
 
 // This also works for queries that use comparison operators
-db.find({satellites: {$lt: 'Amos'}}, function (err:Error, docs:Array<any>) {
+db.find({satellites: {$lt: 'Amos'}}, (err: Error, docs: any[]) => {
     // docs is empty since Phobos and Deimos are after Amos in lexicographical order
 });
 
 // This also works with the $in and $nin operator
-db.find({satellites: {$in: ['Moon', 'Deimos']}}, function (err:Error, docs:Array<any>) {
+db.find({satellites: {$in: ['Moon', 'Deimos']}}, (err: Error, docs: any[]) => {
     // docs contains Mars (the Earth document is not complete!)
 });
 
-db.find({$or: [{planet: 'Earth'}, {planet: 'Mars'}]}, function (err:Error, docs:Array<any>) {
+db.find({$or: [{planet: 'Earth'}, {planet: 'Mars'}]}, (err: Error, docs: any[]) => {
     // docs contains Earth and Mars
 });
 
-db.find({$not: {planet: 'Earth'}}, function (err:Error, docs:Array<any>) {
+db.find({$not: {planet: 'Earth'}}, (err: Error, docs: any[]) => {
     // docs contains Mars, Jupiter, Omicron Persei 8
 });
 
 db.find({
-    $where: function () {
+    $where() {
         return parseInt(Object.keys(this)[0]) > 6;
     }
-}, function (err:Error, docs:Array<any>) {
+}, (err: Error, docs: any[]) => {
     // docs with more than 6 properties
 });
 
 // You can mix normal queries, comparison queries and logical operators
-db.find({$or: [{planet: 'Earth'}, {planet: 'Mars'}], inhabited: true}, function (err:Error, docs:Array<any>) {
+db.find({$or: [{planet: 'Earth'}, {planet: 'Mars'}], inhabited: true}, (err: Error, docs: any[]) => {
     // docs contains Earth
 });
 
 // No query used means all results are returned (before the Cursor modifiers)
-db.find({}).sort({planet: 1}).skip(1).limit(2).exec(function (err:Error, docs:Array<any>) {
+db.find({}).sort({planet: 1}).skip(1).limit(2).exec((err: Error, docs: any[]) => {
     // docs is [doc3, doc1]
 });
 
 // You can sort in reverse order like this
-db.find({system: 'solar'}).sort({planet: -1}).exec(function (err:Error, docs:Array<any>) {
+db.find({system: 'solar'}).sort({planet: -1}).exec((err: Error, docs: any[]) => {
     // docs is [doc1, doc3, doc2]
 });
 
@@ -390,38 +349,38 @@ db.find({}).sort({firstField: 1, secondField: -1});
 // Same database as above
 
 // Keeping only the given fields
-db.find({planet: 'Mars'}, {planet: 1, system: 1}, function (err:Error, docs:Array<any>) {
+db.find({planet: 'Mars'}, {planet: 1, system: 1}, (err: Error, docs: any[]) => {
     // docs is [{ planet: 'Mars', system: 'solar', _id: 'id1' }]
 });
 
 // Keeping only the given fields but removing _id
-db.find({planet: 'Mars'}, {planet: 1, system: 1, _id: 0}, function (err:Error, docs:Array<any>) {
+db.find({planet: 'Mars'}, {planet: 1, system: 1, _id: 0}, (err: Error, docs: any[]) => {
     // docs is [{ planet: 'Mars', system: 'solar' }]
 });
 
 // Omitting only the given fields and removing _id
-db.find({planet: 'Mars'}, {planet: 0, system: 0, _id: 0}, function (err:Error, docs:Array<any>) {
+db.find({planet: 'Mars'}, {planet: 0, system: 0, _id: 0}, (err: Error, docs: any[]) => {
     // docs is [{ inhabited: false, satellites: ['Phobos', 'Deimos'] }]
 });
 
 // Failure: using both modes at the same time
-db.find({planet: 'Mars'}, {planet: 0, system: 1}, function (err:Error, docs:Array<any>) {
+db.find({planet: 'Mars'}, {planet: 0, system: 1}, (err: Error, docs: any[]) => {
     // err is the error message, docs is undefined
 });
 
 // You can also use it in a Cursor way but this syntax is not compatible with MongoDB
 // If upstream compatibility is important don't use this method
-db.find({planet: 'Mars'}).projection({planet: 1, system: 1}).exec(function (err:Error, docs:Array<any>) {
+db.find({planet: 'Mars'}).projection({planet: 1, system: 1}).exec((err: Error, docs: any[]) => {
     // docs is [{ planet: 'Mars', system: 'solar', _id: 'id1' }]
 });
 
 // Count all planets in the solar system
-db.count({system: 'solar'}, function (err:Error, count:number) {
+db.count({system: 'solar'}, (err: Error, count: number) => {
     // count equals to 3
 });
 
 // Count all documents in the datastore
-db.count({}, function (err:Error, count:number) {
+db.count({}, (err: Error, count: number) => {
     // count equals to 4
 });
 
@@ -432,7 +391,7 @@ db.count({}, function (err:Error, count:number) {
 // { _id: 'id4', planet: 'Omicron Persia 8', system: 'futurama', inhabited: true }
 
 // Replace a document by another
-db.update({planet: 'Jupiter'}, {planet: 'Pluton'}, {}, function (err:Error, numReplaced:number) {
+db.update({planet: 'Jupiter'}, {planet: 'Pluton'}, {}, (err: Error, numReplaced: number) => {
     // numReplaced = 1
     // The doc #3 has been replaced by { _id: 'id3', planet: 'Pluton' }
     // Note that the _id is kept unchanged, and the document has been replaced
@@ -440,19 +399,19 @@ db.update({planet: 'Jupiter'}, {planet: 'Pluton'}, {}, function (err:Error, numR
 });
 
 // Set an existing field's value
-db.update({system: 'solar'}, {$set: {system: 'solar system'}}, {multi: true}, function (err:Error, numReplaced:number) {
+db.update({system: 'solar'}, {$set: {system: 'solar system'}}, {multi: true}, (err: Error, numReplaced: number) => {
     // numReplaced = 3
     // Field 'system' on Mars, Earth, Jupiter now has value 'solar system'
 });
 
 // Setting the value of a non-existing field in a subdocument by using the dot-notation
-db.update({planet: 'Mars'}, {$set: {"data.satellites": 2, "data.red": true}}, {}, function () {
+db.update({planet: 'Mars'}, {$set: {"data.satellites": 2, "data.red": true}}, {}, () => {
     // Mars document now is { _id: 'id1', system: 'solar', inhabited: false
     //                      , data: { satellites: 2, red: true }
     //                      }
     // Not that to set fields in subdocuments, you HAVE to use dot-notation
     // Using object-notation will just replace the top-level field
-    db.update({planet: 'Mars'}, {$set: {data: {satellites: 3}}}, {}, function () {
+    db.update({planet: 'Mars'}, {$set: {data: {satellites: 3}}}, {}, () => {
         // Mars document now is { _id: 'id1', system: 'solar', inhabited: false
         //                      , data: { satellites: 3 }
         //                      }
@@ -461,7 +420,7 @@ db.update({planet: 'Mars'}, {$set: {"data.satellites": 2, "data.red": true}}, {}
 });
 
 // Deleting a field
-db.update({planet: 'Mars'}, {$unset: {planet: true}}, {}, function () {
+db.update({planet: 'Mars'}, {$unset: {planet: true}}, {}, () => {
     // Now the document for Mars doesn't contain the planet field
     // You can unset nested fields with the dot notation of course
 });
@@ -470,14 +429,14 @@ db.update({planet: 'Mars'}, {$unset: {planet: true}}, {}, function () {
 db.update({planet: 'Pluton'}, {
     planet: 'Pluton',
     inhabited: false
-}, {upsert: true}, function (err:Error, numReplaced:number, upsert:boolean) {
+}, {upsert: true}, (err: Error, numReplaced: number, upsert: boolean) => {
     // numReplaced = 1, upsert = { _id: 'id5', planet: 'Pluton', inhabited: false }
     // A new document { _id: 'id5', planet: 'Pluton', inhabited: false } has been added to the collection
 });
 
 // If you upsert with a modifier, the upserted doc is the query modified by the modifier
 // This is simpler than it sounds :)
-db.update({planet: 'Pluton'}, {$inc: {distance: 38}}, {upsert: true}, function () {
+db.update({planet: 'Pluton'}, {$inc: {distance: 38}}, {upsert: true}, () => {
     // A new document { _id: 'id5', planet: 'Pluton', distance: 38 } has been added to the collection
 });
 
@@ -485,12 +444,12 @@ db.update({planet: 'Pluton'}, {$inc: {distance: 38}}, {upsert: true}, function (
 // let's see how we can modify the array field atomically
 
 // $push inserts new elements at the end of the array
-db.update({_id: 'id6'}, {$push: {fruits: 'banana'}}, {}, function () {
+db.update({_id: 'id6'}, {$push: {fruits: 'banana'}}, {}, () => {
     // Now the fruits array is ['apple', 'orange', 'pear', 'banana']
 });
 
 // $pop removes an element from the end (if used with 1) or the front (if used with -1) of the array
-db.update({_id: 'id6'}, {$pop: {fruits: 1}}, {}, function () {
+db.update({_id: 'id6'}, {$pop: {fruits: 1}}, {}, () => {
     // Now the fruits array is ['apple', 'orange']
     // With { $pop: { fruits: -1 } }, it would have been ['orange', 'pear']
 });
@@ -498,23 +457,23 @@ db.update({_id: 'id6'}, {$pop: {fruits: 1}}, {}, function () {
 // $addToSet adds an element to an array only if it isn't already in it
 // Equality is deep-checked (i.e. $addToSet will not insert an object in an array already containing the same object)
 // Note that it doesn't check whether the array contained duplicates before or not
-db.update({_id: 'id6'}, {$addToSet: {fruits: 'apple'}}, {}, function () {
+db.update({_id: 'id6'}, {$addToSet: {fruits: 'apple'}}, {}, () => {
     // The fruits array didn't change
     // If we had used a fruit not in the array, e.g. 'banana', it would have been added to the array
 });
 
 // $pull removes all values matching a value or even any NeDB query from the array
-db.update({_id: 'id6'}, {$pull: {fruits: 'apple'}}, {}, function () {
+db.update({_id: 'id6'}, {$pull: {fruits: 'apple'}}, {}, () => {
     // Now the fruits array is ['orange', 'pear']
 });
-db.update({_id: 'id6'}, {$pull: {fruits: {$in: ['apple', 'pear']}}}, {}, function () {
+db.update({_id: 'id6'}, {$pull: {fruits: {$in: ['apple', 'pear']}}}, {}, () => {
     // Now the fruits array is ['orange']
 });
 
 
 // $each can be used to $push or $addToSet multiple values at once
 // This example works the same way with $addToSet
-db.update({_id: 'id6'}, {$push: {fruits: {$each: ['banana', 'orange']}}}, {}, function () {
+db.update({_id: 'id6'}, {$push: {fruits: {$each: ['banana', 'orange']}}}, {}, () => {
     // Now the fruits array is ['apple', 'orange', 'pear', 'banana', 'orange']
 });
 
@@ -526,33 +485,33 @@ db.update({_id: 'id6'}, {$push: {fruits: {$each: ['banana', 'orange']}}}, {}, fu
 
 // Remove one document from the collection
 // options set to {} since the default for multi is false
-db.remove({_id: 'id2'}, {}, function (err:Error, numRemoved:number) {
+db.remove({_id: 'id2'}, {}, (err: Error, numRemoved: number) => {
     // numRemoved = 1
 });
 
 // Remove multiple documents
-db.remove({system: 'solar'}, {multi: true}, function (err:Error, numRemoved:number) {
+db.remove({system: 'solar'}, {multi: true}, (err: Error, numRemoved: number) => {
     // numRemoved = 3
     // All planets from the solar system were removed
 });
 
-db.ensureIndex({fieldName: 'somefield'}, function (err:Error) {
+db.ensureIndex({fieldName: 'somefield'}, (err: Error) => {
     // If there was an error, err is not null
 });
 
 // Using a unique constraint with the index
-db.ensureIndex({fieldName: 'somefield', unique: true}, function (err:Error) {
+db.ensureIndex({fieldName: 'somefield', unique: true}, (err: Error) => {
 });
 
 // Using a sparse unique index
-db.ensureIndex({fieldName: 'somefield', unique: true, sparse: true}, function (err:Error) {
+db.ensureIndex({fieldName: 'somefield', unique: true, sparse: true}, (err: Error) => {
 });
 
 
 // Format of the error message when the unique constraint is not met
-db.insert({somefield: 'nedb'}, function (err:Error) {
+db.insert({somefield: 'nedb'}, (err: Error) => {
     // err is null
-    db.insert({somefield: 'nedb'}, function (err:Error) {
+    db.insert({somefield: 'nedb'}, (err: Error) => {
         // err is { errorType: 'uniqueViolated'
         //        , key: 'name'
         //        , message: 'Unique constraint violated for key name' }
@@ -560,5 +519,5 @@ db.insert({somefield: 'nedb'}, function (err:Error) {
 });
 
 // Remove index on field somefield
-db.removeIndex('somefield', function (err:Error) {
+db.removeIndex('somefield', (err: Error) => {
 });
\ No newline at end of file
diff --git a/nedb/tslint.json b/nedb/tslint.json
new file mode 100644
index 0000000000..192203ab54
--- /dev/null
+++ b/nedb/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "../tslint.json"
+}
\ No newline at end of file
diff --git a/ng-command/ng-command-tests.ts b/ng-command/ng-command-tests.ts
index c6eb344ed7..32f9bef158 100644
--- a/ng-command/ng-command-tests.ts
+++ b/ng-command/ng-command-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="angular" />
-
 var app = angular.module('testModule', ['ng-command']);
 
 class CommandTestController {
diff --git a/ng-dialog/ng-dialog-tests.ts b/ng-dialog/ng-dialog-tests.ts
index 6c867f422d..b66ed173b7 100644
--- a/ng-dialog/ng-dialog-tests.ts
+++ b/ng-dialog/ng-dialog-tests.ts
@@ -1,4 +1,3 @@
-/// <reference types="angular" />
 import * as angular from 'angular';
 
 var app = angular.module('testModule', ['ngDialog']);
diff --git a/ng-file-upload/index.d.ts b/ng-file-upload/index.d.ts
index d9aadbd2d5..cc5a59b2bf 100644
--- a/ng-file-upload/index.d.ts
+++ b/ng-file-upload/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for Angular File Upload 11.1.1
+// Type definitions for Angular File Upload 12.2
 // Project: https://github.com/danialfarid/ng-file-upload
-// Definitions by: John Reilly <https://github.com/johnnyreilly>
+// Definitions by: John Reilly <https://github.com/johnnyreilly>,
+//   Eduardo Garcia <https://github.com/thewarpaint>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="angular" />
@@ -103,10 +104,12 @@ declare module 'angular' {
         interface FileResizeOptions {
             centerCrop?: boolean;
             height?: number;
-            ratio?: number;
+            pattern?: string;
+            ratio?: number | string;
             resizeIf?: ResizeIfFunction;
             restoreExif?: boolean;
             quality?: number;
+            type?: string;
             width?: number;
         }
 
diff --git a/ng-file-upload/ng-file-upload-tests.ts b/ng-file-upload/ng-file-upload-tests.ts
index 08fbafdb6b..cc7f98d5bf 100644
--- a/ng-file-upload/ng-file-upload-tests.ts
+++ b/ng-file-upload/ng-file-upload-tests.ts
@@ -85,9 +85,11 @@ class UploadController {
 				ratio: 0.9,
 				centerCrop: true,
 				restoreExif: true,
-                                resizeIf: (width: number, height: number) => {
+				resizeIf: (width: number, height: number) => {
 					return true;
-				}
+				},
+				pattern: '.jpg',
+				type: 'image/jpeg'
 			})
 			.then((resizedFile) => {
 				console.log(resizedFile);
diff --git a/ng-grid/ng-grid-tests.ts b/ng-grid/ng-grid-tests.ts
index f14e9cb540..c6331fdc15 100644
--- a/ng-grid/ng-grid-tests.ts
+++ b/ng-grid/ng-grid-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="angular" />
-
 var options1: ngGrid.IGridOptions = {
     data: [{ 'Name': 'Bob' }, { 'Name': 'Jane' }]
 };
diff --git a/ng-notify/ng-notify-tests.ts b/ng-notify/ng-notify-tests.ts
index e140cb6130..9f81d25e87 100644
--- a/ng-notify/ng-notify-tests.ts
+++ b/ng-notify/ng-notify-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="angular"/>
-
 class NgNotifyTestController {
 
     static $inject = ['$scope', 'ngNotify'];
diff --git a/ng-stomp/index.d.ts b/ng-stomp/index.d.ts
index d686031bbf..3a91a64844 100644
--- a/ng-stomp/index.d.ts
+++ b/ng-stomp/index.d.ts
@@ -1,36 +1,31 @@
-// Type definitions for ngStomp
+// Type definitions for ngStomp 0.2
 // Project: https://github.com/beevelop/ng-stomp
 // Definitions by: Lukasz Potapczuk <https://github.com/lpotapczuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
 /// <reference types="angular" />
 
-
 interface ngStomp {
-        sock:any;
-        stomp:any;
-        debug:any;
-        off: any;
+	sock: any;
+	stomp: any;
+	debug: any;
+	off: any;
 
-        setDebug:(callback:Function)=> void;
-
-        connect: (endpoint:string, headers?:Headers)=> angular.IHttpPromise<any>;
-
-        disconnect: (callback:()=>void) => angular.IHttpPromise<any>;
-
-        subscribe: (destination:string, callback:(payload:string, headers:Headers, res:Function)=>void, headers?:Headers, scope?:any) => any;
-
-        unsubscribe: () => any;
-
-        send: (destination:string, body:any, headers:Headers)=> any;
-
-    }
-
-     interface Headers {
-        [key: string]: any;
-    }
+	setDebug(callback: Function): void;
 
+	connect(endpoint: string, headers?: ngStomp.Headers): angular.IHttpPromise<any>;
 
+	disconnect(callback: () => void): angular.IHttpPromise<any>;
 
+	subscribe(destination: string, callback: (payload: string, headers: ngStomp.Headers, res: Function) => void, headers?: ngStomp.Headers, scope?: any): any;
 
+	unsubscribe(): any;
 
+	send(destination: string, body: any, headers: ngStomp.Headers): any;
+}
 
+declare namespace ngStomp {
+	interface Headers {
+		[key: string]: any;
+	}
+}
diff --git a/ng-stomp/ng-stomp-tests.ts b/ng-stomp/ng-stomp-tests.ts
index b579a3aa06..c1b662d1a5 100644
--- a/ng-stomp/ng-stomp-tests.ts
+++ b/ng-stomp/ng-stomp-tests.ts
@@ -1,48 +1,34 @@
-/// <reference types="angular" />
+class test {
+	constructor(private ngstomp: ngStomp) {
+		const connectHeaders = {
+			Auth: "user",
+			Accept: "lol"
+		};
 
-namespace ngStompTesting {
+		ngstomp.connect('/endpoint', connectHeaders)
+		// frame = CONNECTED headers
+		.then(function (frame) {
+			this.subscription = ngstomp.subscribe('/dest', function (payload, headers, res) {
+				this.payload = payload;
+			}, {
+				headers: "are awesome"
+			});
 
-    "use strict";
-    var ngStompTest = "ngStompTest";
+			// Unsubscribe
+			this.subscription.unsubscribe();
 
-    class test {
-        constructor(private ngstomp:ngStomp) {
-            var connectHeaders ={
-                "Auth": "user",
-                "Accept": "lol"
-            };
+			// Send message
+			ngstomp.send('/dest', {
+				message: 'body'
+			}, {
+				priority: 9,
+				custom: 42 //Custom Headers
+			});
 
-            ngstomp.connect('/endpoint', connectHeaders)
-
-
-                // frame = CONNECTED headers
-                .then(function (frame) {
-
-                    this.subscription = ngstomp.subscribe('/dest', function (payload, headers, res) {
-                        this.payload = payload;
-                    }, {
-                        "headers": "are awesome"
-                    });
-
-                    // Unsubscribe
-                    this.subscription.unsubscribe();
-
-                    // Send message
-                    ngstomp.send('/dest', {
-                        message: 'body'
-                    }, {
-                        priority: 9,
-                        custom: 42 //Custom Headers
-                    });
-
-                    // Disconnect
-                    ngstomp.disconnect(function () {
-
-                    });
-                });
-        }
-
-    }
-
-    angular.module("app").controller(ngStompTest, test);
+			// Disconnect
+			ngstomp.disconnect(() => {});
+		});
+	}
 }
+
+angular.module("app").controller("ngStompTest", test);
diff --git a/ng-stomp/tslint.json b/ng-stomp/tslint.json
new file mode 100644
index 0000000000..2ab0c36fa8
--- /dev/null
+++ b/ng-stomp/tslint.json
@@ -0,0 +1,6 @@
+{
+	"extends": "../tslint.json",
+	"rules": {
+		"forbidden-types": false
+	}
+}
\ No newline at end of file
diff --git a/ngprogress-lite/ngprogress-lite-tests.ts b/ngprogress-lite/ngprogress-lite-tests.ts
index c7df7f9b6b..c4b903d78b 100644
--- a/ngprogress-lite/ngprogress-lite-tests.ts
+++ b/ngprogress-lite/ngprogress-lite-tests.ts
@@ -1,6 +1,3 @@
-///<reference types="angular" />
-
-
 var app = angular.module('testApp', ['ngProgressLite']);
 
 app.config(
diff --git a/node-form/index.d.ts b/node-form/index.d.ts
deleted file mode 100644
index 41781ee154..0000000000
--- a/node-form/index.d.ts
+++ /dev/null
@@ -1,711 +0,0 @@
-// Type definitions for node-form v1.0.13
-// Project: https://github.com/rsamec/form
-// Definitions by: Roman Samec <https://github.com/rsamec>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="q" />
-
-import * as Q from "q";
-
-export as namespace Validation;
-
-export = Validation;
-
-declare namespace Validation {
-    /**
-    * Custom message functions.
-    */
-    interface IErrorCustomMessage {
-        (config: any, args: any): string;
-    }
-    /**
-    * It represents a property validator for atomic object.
-    */
-    interface IPropertyValidator {
-        isAcceptable(s: any): boolean;
-        customMessage?: IErrorCustomMessage;
-        tagName?: string;
-    }
-    /**
-    * It represents a property validator for simple string value.
-    */
-    interface IStringValidator extends IPropertyValidator {
-        isAcceptable(s: string): boolean;
-    }
-    /**
-    * It represents an async property validator for atomic object.
-    */
-    interface IAsyncPropertyValidator {
-        isAcceptable(s: any): Q.Promise<boolean>;
-        customMessage?: IErrorCustomMessage;
-        isAsync: boolean;
-        tagName?: string;
-    }
-    /**
-    * It represents an async property validator for simple string value.
-    */
-    interface IAsyncStringPropertyValidator extends IAsyncPropertyValidator {
-        isAcceptable(s: string): Q.Promise<boolean>;
-    }
-    /**
-    * It defines compare operators.
-    */
-    enum CompareOperator {
-        LessThan = 0,
-        LessThanEqual = 1,
-        Equal = 2,
-        NotEqual = 3,
-        GreaterThanEqual = 4,
-        GreaterThan = 5,
-    }
-    class StringFce {
-        static format(s: string, args: any): string;
-    }
-    class NumberFce {
-        static GetNegDigits(value: string): number;
-    }
-    class LettersOnlyValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class ZipCodeValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class EmailValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class UrlValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class RequiredValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class DateValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class DateISOValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class NumberValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class DigitValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class SignedDigitValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class MinLengthValidator implements IStringValidator {
-        public MinLength: number;
-        constructor(MinLength?: number);
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class MaxLengthValidator implements IStringValidator {
-        public MaxLength: number;
-        constructor(MaxLength?: number);
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class RangeLengthValidator implements IStringValidator {
-        public RangeLength: number[];
-        constructor(RangeLength?: number[]);
-        public isAcceptable(s: string): boolean;
-        public MinLength : number;
-        public MaxLength : number;
-        public tagName: string;
-    }
-    class MinValidator implements IPropertyValidator {
-        public Min: number;
-        constructor(Min?: number);
-        public isAcceptable(s: any): boolean;
-        public tagName: string;
-    }
-    class MaxValidator implements IPropertyValidator {
-        public Max: number;
-        constructor(Max?: number);
-        public isAcceptable(s: any): boolean;
-        public tagName: string;
-    }
-    class RangeValidator implements IPropertyValidator {
-        public Range: number[];
-        constructor(Range?: number[]);
-        public isAcceptable(s: any): boolean;
-        public Min : number;
-        public Max : number;
-        public tagName: string;
-    }
-    class StepValidator implements IPropertyValidator {
-        public Step: string;
-        constructor(Step?: string);
-        public isAcceptable(s: any): boolean;
-        public tagName: string;
-    }
-    class PatternValidator implements IStringValidator {
-        public Pattern: string;
-        constructor(Pattern?: string);
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class ContainsValidator implements IAsyncPropertyValidator {
-        public Options: Q.Promise<any[]>;
-        constructor(Options: Q.Promise<any[]>);
-        public isAcceptable(s: string): Q.Promise<boolean>;
-        public isAsync: boolean;
-        public tagName: string;
-    }
-}
-declare namespace Validation {
-    /**
-    * basic error structure
-    */
-    interface IError {
-        HasError: boolean;
-        ErrorMessage: string;
-        TranslateArgs?: IErrorTranslateArgs;
-    }
-    /**
-    *  support for localization of error messages
-    */
-    interface IErrorTranslateArgs {
-        TranslateId: string;
-        MessageArgs: any;
-        CustomMessage?: IErrorCustomMessage;
-    }
-    /**
-    * It defines conditional function.
-    */
-    interface IOptional {
-        (): boolean;
-    }
-    /**
-    * It represents the validation result.
-    */
-    interface IValidationFailure extends IError {
-        IsAsync: boolean;
-        Error: IError;
-    }
-    /**
-    * This class provides unit of information about error.
-    * Implements composite design pattern to enable nesting of error information.
-    */
-    interface IValidationResult {
-        /**
-        * The name of error collection.
-        */
-        Name: string;
-        /**
-        * Add error information to child collection of errors.
-        * @param validationResult - error information to be added.
-        */
-        Add(validationResult: IValidationResult): void;
-        /**
-        * Remove error information from child collection of errors.
-        * @param index - index of error information to be removed.
-        */
-        Remove(index: number): void;
-        /**
-        * Return collections of child errors information.
-        */
-        Children: IValidationResult[];
-        /**
-        * Return true if there is any error.
-        */
-        HasErrors: boolean;
-        /**
-        * Return true if there is any error and hasw dirty state.
-        */
-        HasErrorsDirty: boolean;
-        /**
-        * Return error message, if there is no error, return empty string.
-        */
-        ErrorMessage: string;
-        /**
-        * Return number of errors.
-        */
-        ErrorCount: number;
-        /**
-        * It enables to have errors optional.
-        */
-        Optional?: IOptional;
-        /**
-        * It enables support for localization of error messages.
-        */
-        TranslateArgs?: IErrorTranslateArgs[];
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  Error
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents basic error structure.
-    */
-    class Error implements IError {
-        public HasError: boolean;
-        public ErrorMessage: string;
-        constructor();
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  ValidationFailure
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents validation failure.
-    */
-    class ValidationFailure implements IError {
-        public Error: IError;
-        public IsAsync: boolean;
-        constructor(Error: IError, IsAsync: boolean);
-        public HasError : boolean;
-        public ErrorMessage : string;
-        public TranslateArgs : IErrorTranslateArgs;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  ValidationResult
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents simple abstract error object.
-    */
-    class ValidationResult implements IValidationResult {
-        public Name: string;
-        constructor(Name: string);
-        public IsDirty: boolean;
-        public Children : IValidationResult[];
-        public Add(error: IValidationResult): void;
-        public Remove(index: number): void;
-        public Optional: IOptional;
-        public TranslateArgs: IErrorTranslateArgs[];
-        public HasErrorsDirty : boolean;
-        public HasErrors : boolean;
-        public ErrorCount : number;
-        public ErrorMessage : string;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  CompositeValidationResult
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents composite error object.
-    */
-    class CompositeValidationResult implements IValidationResult {
-        public Name: string;
-        public Children: IValidationResult[];
-        constructor(Name: string);
-        public Optional: IOptional;
-        public AddFirst(error: IValidationResult): void;
-        public Add(error: IValidationResult): void;
-        public Remove(index: number): void;
-        public HasErrorsDirty : boolean;
-        public HasErrors : boolean;
-        public ErrorCount : number;
-        public ErrorMessage : string;
-        public TranslateArgs : IErrorTranslateArgs[];
-        public LogErrors(headerMessage?: string): void;
-        public Errors : {
-            [name: string]: IValidationResult;
-        };
-        private FlattenErros;
-        public SetDirty(): void;
-        public SetPristine(): void;
-        private SetDirtyEx(node, dirty);
-        private flattenErrors(node, errorCollection);
-        private traverse(node, indent);
-    }
-}
-declare namespace Validation {
-    /**
-    * @ngdoc module
-    * @name Validation
-    *
-    *
-    * @description
-    * # Validation (core module)
-    * The module itself contains the essential components for an validation engine to function. The table below
-    * lists a high level breakdown of each of the components (object, functions) available within this core module.
-    *
-    * <div doc-module-components="Validation"></div>
-    */
-    /**
-    * It defines validation function.
-    */
-    interface IValidate {
-        (args: IError): void;
-    }
-    /**
-    * It defines async validation function.
-    */
-    interface IAsyncValidate {
-        (args: IError): Q.Promise<any>;
-    }
-    /**
-    * It represents named validation function.
-    */
-    interface IValidatorFce {
-        Name: string;
-        ValidationFce?: IValidate;
-        AsyncValidationFce?: IAsyncValidate;
-    }
-    /**
-    * This class represents custom validator.
-    */
-    interface IValidator {
-        Validate(context: any): IValidationFailure;
-        ValidateAsync(context: any): Q.Promise<IValidationFailure>;
-        Error: IError;
-    }
-    /**
-    * It represents abstract validator for type of <T>.
-    */
-    interface IAbstractValidator<T> {
-        RuleFor(prop: string, validator: IPropertyValidator): any;
-        ValidationFor(prop: string, validator: IValidatorFce): any;
-        ValidatorFor<K>(prop: string, validator: IAbstractValidator<K>): any;
-        /**
-        * It creates new concrete validation rule and assigned data context to this rule.
-        * @param name of the rule
-        * @constructor
-        */
-        CreateRule(name: string): IAbstractValidationRule<any>;
-        CreateAbstractRule(name: string): IAbstractValidationRule<any>;
-        CreateAbstractListRule(name: string): IAbstractValidationRule<any>;
-        /**
-        * return true if this validation rule is intended for list of items, otherwise true
-        */
-        ForList: boolean;
-    }
-    /**
-    * It represents concrete validation rule for type of <T>.
-    */
-    interface IAbstractValidationRule<T> {
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures.
-        */
-        Validate(context: T): IValidationResult;
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
-        */
-        ValidateAsync(context: T): Q.Promise<IValidationResult>;
-        /**
-        * Performs validation and async validation using a validation context.
-        */
-        ValidateAll(context: T): void;
-        /**
-        * Performs validation and async validation using a validation context for a passed field.
-        */
-        ValidateField(context: T, propName: string): void;
-        /**
-        * Return validation results.
-        */
-        ValidationResult: IValidationResult;
-        Rules: {
-            [name: string]: IPropertyValidationRule<T>;
-        };
-        Validators: {
-            [name: string]: IValidator;
-        };
-        Children: {
-            [name: string]: AbstractValidationRule<any>;
-        };
-    }
-    /**
-    * It represents property validation rule for type of <T>.
-    */
-    interface IPropertyValidationRule<T> {
-        /**
-        *The validators that are grouped under this rule.
-        */
-        Validators: {
-            [name: string]: any;
-        };
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures.
-        */
-        Validate(context: IValidationContext<T>): IValidationFailure[];
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
-        */
-        ValidateAsync(context: IValidationContext<T>): Q.Promise<IValidationFailure[]>;
-    }
-    /**
-    *  It represents a data context for validation rule.
-    */
-    interface IValidationContext<T> {
-        /**
-        * Return current value.
-        */
-        Value: string;
-        /**
-        * Return property name for current data context.
-        */
-        Key: string;
-        /**
-        * Data context for validation rule.
-        */
-        Data: T;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  AbstractValidator
-    * @module Validation
-    *
-    *
-    * @description
-    * It enables to create custom validator for your own abstract object (class) and to assign validation rules to its properties.
-    * You can assigned these rules
-    *
-    * +  property validation rules - use _RuleFor_ property
-    * +  property async validation rules - use _RuleFor_ property
-    * +  shared validation rules - use _ValidationFor_ property
-    * +  custom object validator - use _ValidatorFor_ property - enables composition of child custom validators
-    */
-    class AbstractValidator<T> implements IAbstractValidator<T> {
-        public Validators: {
-            [name: string]: IPropertyValidator[];
-        };
-        public AbstractValidators: {
-            [name: string]: IAbstractValidator<any>;
-        };
-        public ValidationFunctions: {
-            [name: string]: IValidatorFce[];
-        };
-        public RuleFor(prop: string, validator: IPropertyValidator): void;
-        public ValidationFor(prop: string, fce: IValidatorFce): void;
-        public ValidatorFor<K>(prop: string, validator: IAbstractValidator<K>, forList?: boolean): void;
-        public CreateAbstractRule(name: string): AbstractValidationRule<T>;
-        public CreateAbstractListRule(name: string): AbstractListValidationRule<T>;
-        public CreateRule(name: string): AbstractValidationRule<T>;
-        /**
-        * Return true if this validation rule is intended for list of items, otherwise true.
-        */
-        public ForList: boolean;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  AbstractValidationRule
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents concreate validator for custom object. It enables to assign validation rules to custom object properties.
-    */
-    class AbstractValidationRule<T> implements IAbstractValidationRule<T> {
-        public Name: string;
-        public validator: AbstractValidator<T>;
-        public ValidationResult: IValidationResult;
-        public Rules: {
-            [name: string]: IPropertyValidationRule<T>;
-        };
-        public Validators: {
-            [name: string]: IValidator;
-        };
-        public Children: {
-            [name: string]: AbstractValidationRule<any>;
-        };
-        /**
-        * Return true if this validation rule is intended for list of items, otherwise true.
-        */
-        public ForList: boolean;
-        constructor(Name: string, validator: AbstractValidator<T>, forList?: boolean);
-        public addChildren(): void;
-        public SetOptional(fce: IOptional): void;
-        private createRuleFor(prop);
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures.
-        */
-        public Validate(context: T): IValidationResult;
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
-        */
-        public ValidateAsync(context: T): Q.Promise<IValidationResult>;
-        public ValidateAll(context: T): void;
-        public ValidateField(context: T, propName: string): void;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  AbstractListValidationRule
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents an validator for custom object. It enables to assign rules to custom object properties.
-    */
-    class AbstractListValidationRule<T> extends AbstractValidationRule<T> {
-        public Name: string;
-        public validator: AbstractValidator<T>;
-        constructor(Name: string, validator: AbstractValidator<T>);
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures.
-        */
-        public Validate(context: any): IValidationResult;
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
-        */
-        public ValidateAsync(context: any): Q.Promise<IValidationResult>;
-        private getValidationRule(i);
-        private getIndexedKey(i);
-        public NotifyListChanged(list: any[]): void;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  ValidationContext
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents a data context for validation rule.
-    */
-    class ValidationContext<T> implements IValidationContext<T> {
-        public Key: string;
-        public Data: T;
-        constructor(Key: string, Data: T);
-        public Value : any;
-    }
-    class MessageLocalization {
-        static customMsg: string;
-        static defaultMessages: {
-            "required": string;
-            "remote": string;
-            "email": string;
-            "url": string;
-            "date": string;
-            "dateISO": string;
-            "number": string;
-            "digits": string;
-            "signedDigits": string;
-            "creditcard": string;
-            "equalTo": string;
-            "maxlength": string;
-            "minlength": string;
-            "rangelength": string;
-            "range": string;
-            "max": string;
-            "min": string;
-            "step": string;
-            "contains": string;
-            "mask": string;
-            "custom": string;
-        };
-        static ValidationMessages: {
-            "required": string;
-            "remote": string;
-            "email": string;
-            "url": string;
-            "date": string;
-            "dateISO": string;
-            "number": string;
-            "digits": string;
-            "signedDigits": string;
-            "creditcard": string;
-            "equalTo": string;
-            "maxlength": string;
-            "minlength": string;
-            "rangelength": string;
-            "range": string;
-            "max": string;
-            "min": string;
-            "step": string;
-            "contains": string;
-            "mask": string;
-            "custom": string;
-        };
-        static GetValidationMessage(validator: any): string;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  PropertyValidationRule
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents a property validation rule. The property has assigned collection of property validators.
-    */
-    class PropertyValidationRule<T> extends ValidationResult implements IPropertyValidationRule<T> {
-        public Name: string;
-        public Validators: {
-            [name: string]: any;
-        };
-        public ValidationFailures: {
-            [name: string]: IValidationFailure;
-        };
-        constructor(Name: string, validatorsToAdd?: IPropertyValidator[]);
-        public AddValidator(validator: any): void;
-        public Errors : {
-            [name: string]: IValidationFailure;
-        };
-        public HasErrors : boolean;
-        public ErrorCount : number;
-        public ErrorMessage : string;
-        public TranslateArgs : IErrorTranslateArgs[];
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures.
-        */
-        public Validate(context: IValidationContext<T>): IValidationFailure[];
-        public ValidateEx(value: any): IValidationFailure[];
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
-        */
-        public ValidateAsync(context: IValidationContext<T>): Q.Promise<IValidationFailure[]>;
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
-        */
-        public ValidateAsyncEx(value: string): Q.Promise<IValidationFailure[]>;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  Validator
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents a custom validator. It enables to define your own shared validation rules
-    */
-    class Validator extends ValidationResult implements IValidator {
-        public Name: string;
-        private ValidateFce;
-        private AsyncValidationFce;
-        public Error: IError;
-        public ValidationFailures: {
-            [name: string]: IValidationFailure;
-        };
-        constructor(Name: string, ValidateFce?: IValidate, AsyncValidationFce?: IAsyncValidate);
-        public Optional: IOptional;
-        public Validate(context: any): IValidationFailure;
-        public ValidateAsync(context: any): Q.Promise<IValidationFailure>;
-        public HasError : boolean;
-        public Errors : {
-            [name: string]: IValidationFailure;
-        };
-        public HasErrors : boolean;
-        public ErrorCount : number;
-        public ErrorMessage : string;
-        public TranslateArgs : IErrorTranslateArgs[];
-    }
-}
diff --git a/node-form/node-form-tests.ts b/node-form/node-form-tests.ts
deleted file mode 100644
index 75d98f6b13..0000000000
--- a/node-form/node-form-tests.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-interface IPerson{
-    Checked:boolean;
-    FirstName:string;
-    LastName:string;
-    Email:string;
-}
-
-//create custom composite validator
-var personValidator = new Validation.AbstractValidator<IPerson>();
-
-//create field validators
-var required = new Validation.RequiredValidator();
-var email = new Validation.EmailValidator();
-var maxLength = new Validation.MaxLengthValidator();
-maxLength.MaxLength = 15;
-
-
-personValidator.RuleFor("FirstName", required);
-personValidator.RuleFor("FirstName", maxLength);
-
-personValidator.RuleFor("LastName", required);
-personValidator.RuleFor("LastName", maxLength);
-
-personValidator.RuleFor("Email", required);
-personValidator.RuleFor("Email", email);
diff --git a/node-hue-api/node-hue-api-tests.ts b/node-hue-api/node-hue-api-tests.ts
index 44903fa4da..44e24da9b1 100644
--- a/node-hue-api/node-hue-api-tests.ts
+++ b/node-hue-api/node-hue-api-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts" />
-
 import hue = require('node-hue-api');
 
 hue.nupnpSearch().then(function (bridges) {
diff --git a/node-int64/node-int64-tests.ts b/node-int64/node-int64-tests.ts
index 16df3a00ca..3235efa3d8 100644
--- a/node-int64/node-int64-tests.ts
+++ b/node-int64/node-int64-tests.ts
@@ -1,9 +1,5 @@
-/// <reference types="node" />
-
 // Play example copy
 
-
-
 // First, let's illustrate the problem ...
 (0x123456789).toString(16);
 //!! '123456789' // <- what we expect.
diff --git a/node-mysql-wrapper/node-mysql-wrapper-tests.ts b/node-mysql-wrapper/node-mysql-wrapper-tests.ts
index 5b67969ffe..2811292fe6 100644
--- a/node-mysql-wrapper/node-mysql-wrapper-tests.ts
+++ b/node-mysql-wrapper/node-mysql-wrapper-tests.ts
@@ -1,7 +1,3 @@
-
-/// <reference types="node" />
-/// <reference types="bluebird" />
-
 var express = require('express');
 var app = express();
 var server = require('http').createServer(app);
diff --git a/node-persist/index.d.ts b/node-persist/index.d.ts
index 42d72fe587..bb8df33369 100644
--- a/node-persist/index.d.ts
+++ b/node-persist/index.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
-/// <reference types="q" />
 
 import * as Q from "q";
 
diff --git a/node-persist/tsconfig.json b/node-persist/tsconfig.json
index f6bd656274..b2563c2ac3 100644
--- a/node-persist/tsconfig.json
+++ b/node-persist/tsconfig.json
@@ -12,6 +12,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/node-xmpp-client/node-xmpp-client-tests.ts b/node-xmpp-client/node-xmpp-client-tests.ts
index 734067738e..0f7a4205ac 100644
--- a/node-xmpp-client/node-xmpp-client-tests.ts
+++ b/node-xmpp-client/node-xmpp-client-tests.ts
@@ -1,6 +1,6 @@
 import {Client} from './index';
 
-let client = new Client({
+const client = new Client({
     jid: 'user@example.com',
     password: 'password'
 });
@@ -10,10 +10,10 @@ client.connect();
 client.on('online', () => {});
 
 client.on('stanza', stanza => {
-    let _ = stanza;
+    const _ = stanza;
 });
 
-let stanza = new Client.Stanza('chat', {})
+const stanza = new Client.Stanza('chat', {})
     .c('show').t('chat').up()
     .c('status').t('message');
 client.send(stanza);
diff --git a/notNeededPackages.json b/notNeededPackages.json
index 01368791b7..d8d1b53cf2 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1,94 +1,34 @@
 {
     "packages": [
         {
-            "libraryName": "Moment",
-            "typingsPackageName": "moment",
-            "sourceRepoURL": "https://github.com/moment/moment",
-            "asOfVersion": "2.13.0"
+            "libraryName": "ajv",
+            "typingsPackageName": "ajv",
+            "sourceRepoURL": "https://github.com/epoberezkin/ajv",
+            "asOfVersion": "1.0.0"
+        },
+		{
+            "libraryName": "Numbro",
+            "typingsPackageName": "numbro",
+            "sourceRepoURL": "https://github.com/foretagsplatsen/numbro/",
+            "asOfVersion": "1.9.3"
         },
         {
-            "libraryName": "ng-table",
-            "typingsPackageName": "ng-table",
-            "sourceRepoURL": "https://github.com/esvit/ng-table",
-            "asOfVersion": "2.0.1"
-        },
-        {
-            "libraryName": "spotify-web-api-js",
-            "typingsPackageName": "spotify-web-api-js",
-            "sourceRepoURL": "https://github.com/JMPerez/spotify-web-api-js",
-            "asOfVersion": "0.21.0"
-        },
-        {
-            "libraryName": "Linq.JS",
-            "typingsPackageName": "linq",
-            "sourceRepoURL": "https://linqjs.codeplex.com/",
-            "asOfVersion": "2.2.33"
-        },
-        {
-            "libraryName": "Protractor",
-            "typingsPackageName": "protractor",
-            "sourceRepoURL": "https://github.com/angular/protractor",
-            "asOfVersion": "4.0.0"
-        },
-        {
-            "libraryName": "Dexie.js",
-            "typingsPackageName": "dexie",
-            "sourceRepoURL": "https://github.com/dfahlander/Dexie.js",
-            "asOfVersion": "1.3.1"
-        },
-        {
-            "libraryName": "LinqSharp",
-            "typingsPackageName": "linqsharp",
-            "sourceRepoURL": "https://github.com/brunolm/LinqSharp",
+            "libraryName": "antd",
+            "typingsPackageName": "antd",
+            "sourceRepoURL": "https://github.com/ant-design/ant-design",
             "asOfVersion": "1.0.0"
         },
         {
-            "libraryName": "TypeScript",
-            "typingsPackageName": "typescript",
-            "sourceRepoURL": "https://github.com/Microsoft/TypeScript",
-            "asOfVersion": "2.0.0"
+            "libraryName": "Argon2",
+            "typingsPackageName": "argon2",
+            "sourceRepoURL": "https://github.com/ranisalt/node-argon2",
+            "asOfVersion": "0.15.0"
         },
         {
-            "libraryName": "TypeScript",
-            "typingsPackageName": "typescript-services",
-            "sourceRepoURL": "https://github.com/Microsoft/TypeScript",
-            "asOfVersion": "2.0.0"
-        },
-        {
-            "libraryName": "Prando",
-            "typingsPackageName": "prando",
-            "sourceRepoURL": "https://github.com/zeh/prando",
-            "asOfVersion": "1.0.0"
-        },
-        {
-            "libraryName": "Shopify Prime",
-            "typingsPackageName": "shopify-prime",
-            "sourceRepoURL": "https://github.com/nozzlegear/shopify-prime",
-            "asOfVersion": "2.0.0"
-        },
-        {
-            "libraryName": "SimpleSignal",
-            "typingsPackageName": "simplesignal",
-            "sourceRepoURL": "https://github.com/zeh/simplesignal",
-            "asOfVersion": "1.0.0"
-        },
-        {
-            "libraryName": "Redux",
-            "typingsPackageName": "redux",
-            "sourceRepoURL": "https://github.com/reactjs/redux",
-            "asOfVersion": "3.6.0"
-        },
-        {
-            "libraryName": "Redux Thunk",
-            "typingsPackageName": "redux-thunk",
-            "sourceRepoURL": "https://github.com/gaearon/redux-thunk",
-            "asOfVersion": "2.1.0"
-        },
-        {
-            "libraryName": "Normalizr",
-            "typingsPackageName": "normalizr",
-            "sourceRepoURL": "https://github.com/paularmstrong/normalizr",
-            "asOfVersion": "2.0.18"
+            "libraryName": "axios",
+            "typingsPackageName": "axios",
+            "sourceRepoURL": "https://github.com/mzabriskie/axios",
+            "asOfVersion": "0.14.0"
         },
         {
             "libraryName": "camel-case",
@@ -108,12 +48,90 @@
             "sourceRepoURL": "https://github.com/blakeembrey/constant-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "date-fns",
+            "typingsPackageName": "date-fns",
+            "sourceRepoURL": "https://github.com/date-fns/date-fns",
+            "asOfVersion": "2.6.0"
+        },
+        {
+            "libraryName": "Dexie.js",
+            "typingsPackageName": "dexie",
+            "sourceRepoURL": "https://github.com/dfahlander/Dexie.js",
+            "asOfVersion": "1.3.1"
+        },
         {
             "libraryName": "dot-case",
             "typingsPackageName": "dot-case",
             "sourceRepoURL": "https://github.com/blakeembrey/dot-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "dva",
+            "typingsPackageName": "dva",
+            "sourceRepoURL": "https://github.com/dvajs/dva",
+            "asOfVersion": "1.1.0"
+        },
+        {
+            "libraryName": "ecmarkup",
+            "typingsPackageName": "ecmarkup",
+            "sourceRepoURL": "https://github.com/bterlson/ecmarkup",
+            "asOfVersion": "3.4.0"
+        },
+        {
+            "libraryName": "FineUploader",
+            "typingsPackageName": "fine-uploader",
+            "sourceRepoURL": "http://fineuploader.com/",
+            "asOfVersion": "5.14.0"
+        },
+        {
+            "libraryName": "gaea-model",
+            "typingsPackageName": "gaea-model",
+            "sourceRepoURL": "https://github.com/ascoders/gaea-model",
+            "asOfVersion": "0.0.0"
+        },
+        {
+            "libraryName": "Facebook's Immutable",
+            "typingsPackageName": "immutable",
+            "sourceRepoURL": "https://github.com/facebook/immutable-js",
+            "asOfVersion": "3.8.7"
+        },
+        {
+            "libraryName": "inversify",
+            "typingsPackageName": "inversify",
+            "sourceRepoURL": "http://inversify.io",
+            "asOfVersion": "2.0.33"
+        },
+        {
+            "libraryName": "inversify-binding-decorators",
+            "typingsPackageName": "inversify-binding-decorators",
+            "sourceRepoURL": "https://github.com/inversify/inversify-binding-decorators",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "inversify-express-utils",
+            "typingsPackageName": "inversify-express-utils",
+            "sourceRepoURL": "https://github.com/inversify/inversify-express-utils",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "inversify-inject-decorators",
+            "typingsPackageName": "inversify-inject-decorators",
+            "sourceRepoURL": "https://github.com/inversify/inversify-inject-decorators",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "inversify-logger-middleware",
+            "typingsPackageName": "inversify-logger-middleware",
+            "sourceRepoURL": "https://github.com/inversify/inversify-logger-middleware",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "inversify-restify-utils",
+            "typingsPackageName": "inversify-restify-utils",
+            "sourceRepoURL": "https://github.com/inversify/inversify-restify-utils",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "is-lower-case",
             "typingsPackageName": "is-lower-case",
@@ -126,6 +144,30 @@
             "sourceRepoURL": "https://github.com/blakeembrey/is-upper-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "jsonschema",
+            "typingsPackageName": "jsonschema",
+            "sourceRepoURL": "https://github.com/tdegrunt/jsonschema",
+            "asOfVersion": "1.1.1"
+        },
+        {
+            "libraryName": "Linq.JS",
+            "typingsPackageName": "linq",
+            "sourceRepoURL": "https://linqjs.codeplex.com/",
+            "asOfVersion": "2.2.33"
+        },
+        {
+            "libraryName": "LinqSharp",
+            "typingsPackageName": "linqsharp",
+            "sourceRepoURL": "https://github.com/brunolm/LinqSharp",
+            "asOfVersion": "1.0.0"
+        },
+        {
+             "libraryName": "localforage", 
+             "typingsPackageName": "localforage", 
+             "sourceRepoURL": "https://github.com/localForage/localForage", 
+             "asOfVersion": "0.0.34" 
+        },
         {
             "libraryName": "lower-case",
             "typingsPackageName": "lower-case",
@@ -138,6 +180,30 @@
             "sourceRepoURL": "https://github.com/blakeembrey/lower-case-first",
             "asOfVersion": "1.0.1"
         },
+        {
+            "libraryName": "mobservable",
+            "typingsPackageName": "mobservable",
+            "sourceRepoURL": "github.com/mweststrate/mobservable",
+            "asOfVersion": "1.2.5"
+        },
+        {
+            "libraryName": "Moment",
+            "typingsPackageName": "moment",
+            "sourceRepoURL": "https://github.com/moment/moment",
+            "asOfVersion": "2.13.0"
+        },
+        {
+            "libraryName": "ng-table",
+            "typingsPackageName": "ng-table",
+            "sourceRepoURL": "https://github.com/esvit/ng-table",
+            "asOfVersion": "2.0.1"
+        },
+        {
+            "libraryName": "Normalizr",
+            "typingsPackageName": "normalizr",
+            "sourceRepoURL": "https://github.com/paularmstrong/normalizr",
+            "asOfVersion": "2.0.18"
+        },
         {
             "libraryName": "param-case",
             "typingsPackageName": "param-case",
@@ -156,18 +222,90 @@
             "sourceRepoURL": "https://github.com/blakeembrey/path-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "pixi-spine",
+            "typingsPackageName": "pixi-spine",
+            "sourceRepoURL": "https://github.com/pixijs/pixi-spine",
+            "asOfVersion": "1.4.2"
+        },
+        {
+            "libraryName": "Prando",
+            "typingsPackageName": "prando",
+            "sourceRepoURL": "https://github.com/zeh/prando",
+            "asOfVersion": "1.0.0"
+        },
+        {
+            "libraryName": "Protractor",
+            "typingsPackageName": "protractor",
+            "sourceRepoURL": "https://github.com/angular/protractor",
+            "asOfVersion": "4.0.0"
+        },
+        {
+            "libraryName": "Raven JS",
+            "typingsPackageName": "raven-js",
+            "sourceRepoURL": "https://github.com/getsentry/raven-js",
+            "asOfVersion": "3.10.0"
+        },
+        {
+            "libraryName": "Redux",
+            "typingsPackageName": "redux",
+            "sourceRepoURL": "https://github.com/reactjs/redux",
+            "asOfVersion": "3.6.0"
+        },
+        {
+            "libraryName": "redux-saga",
+            "typingsPackageName": "redux-saga",
+            "sourceRepoURL": "https://github.com/redux-saga/redux-saga",
+            "asOfVersion": "0.10.5"
+        },
+        {
+            "libraryName": "Redux Thunk",
+            "typingsPackageName": "redux-thunk",
+            "sourceRepoURL": "https://github.com/gaearon/redux-thunk",
+            "asOfVersion": "2.1.0"
+        },
+        {
+            "libraryName": "node-scanf",
+            "typingsPackageName": "scanf",
+            "sourceRepoURL": "https://github.com/Lellansin/node-scanf",
+            "asOfVersion": "0.7.3"
+        },
         {
             "libraryName": "sentence-case",
             "typingsPackageName": "sentence-case",
             "sourceRepoURL": "https://github.com/blakeembrey/sentence-case",
             "asOfVersion": "1.1.3"
         },
+        {
+            "libraryName": "Shopify Prime",
+            "typingsPackageName": "shopify-prime",
+            "sourceRepoURL": "https://github.com/nozzlegear/shopify-prime",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "SimpleSignal",
+            "typingsPackageName": "simplesignal",
+            "sourceRepoURL": "https://github.com/zeh/simplesignal",
+            "asOfVersion": "1.0.0"
+        },
         {
             "libraryName": "snake-case",
             "typingsPackageName": "snake-case",
             "sourceRepoURL": "https://github.com/blakeembrey/snake-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "spotify-web-api-js",
+            "typingsPackageName": "spotify-web-api-js",
+            "sourceRepoURL": "https://github.com/JMPerez/spotify-web-api-js",
+            "asOfVersion": "0.21.0"
+        },
+        {
+            "libraryName": "Sugar",
+            "typingsPackageName": "sugar",
+            "sourceRepoURL": "https://github.com/andrewplummer/Sugar",
+            "asOfVersion": "2.0.2"
+        },
         {
             "libraryName": "swap-case",
             "typingsPackageName": "swap-case",
@@ -180,6 +318,18 @@
             "sourceRepoURL": "https://github.com/blakeembrey/title-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "TypeScript",
+            "typingsPackageName": "typescript",
+            "sourceRepoURL": "https://github.com/Microsoft/TypeScript",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "TypeScript",
+            "typingsPackageName": "typescript-services",
+            "sourceRepoURL": "https://github.com/Microsoft/TypeScript",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "upper-case",
             "typingsPackageName": "upper-case",
@@ -192,90 +342,12 @@
             "sourceRepoURL": "https://github.com/blakeembrey/upper-case-first",
             "asOfVersion": "1.1.2"
         },
-        {
-            "libraryName": "Sugar",
-            "typingsPackageName": "sugar",
-            "sourceRepoURL": "https://github.com/andrewplummer/Sugar",
-            "asOfVersion": "2.0.2"
-        },
-        {
-            "libraryName": "ajv",
-            "typingsPackageName": "ajv",
-            "sourceRepoURL": "https://github.com/epoberezkin/ajv",
-            "asOfVersion": "1.0.0"
-        },
-        {
-            "libraryName": "date-fns",
-            "typingsPackageName": "date-fns",
-            "sourceRepoURL": "https://github.com/date-fns/date-fns",
-            "asOfVersion": "2.6.0"
-        },
         {
             "libraryName": "vuejs",
             "typingsPackageName": "vue",
             "sourceRepoURL": "https://github.com/vuejs/vue",
             "asOfVersion": "2.0.0"
         },
-        {
-            "libraryName": "Facebook's Immutable",
-            "typingsPackageName": "immutable",
-            "sourceRepoURL": "https://github.com/facebook/immutable-js",
-            "asOfVersion": "3.8.7"
-        },
-        {
-            "libraryName": "dva",
-            "typingsPackageName": "dva",
-            "sourceRepoURL": "https://github.com/dvajs/dva",
-            "asOfVersion": "1.1.0"
-        },
-        {
-            "libraryName": "inversify",
-            "typingsPackageName": "inversify",
-            "sourceRepoURL": "http://inversify.io",
-            "asOfVersion": "2.0.33"
-        },
-        {
-            "libraryName": "inversify-express-utils",
-            "typingsPackageName": "inversify-express-utils",
-            "sourceRepoURL": "https://github.com/inversify/inversify-express-utils",
-            "asOfVersion": "2.0.0"
-        },
-        {
-            "libraryName": "inversify-binding-decorators",
-            "typingsPackageName": "inversify-binding-decorators",
-            "sourceRepoURL": "https://github.com/inversify/inversify-binding-decorators",
-            "asOfVersion": "2.0.0"
-        },
-        {
-            "libraryName": "inversify-logger-middleware",
-            "typingsPackageName": "inversify-logger-middleware",
-            "sourceRepoURL": "https://github.com/inversify/inversify-logger-middleware",
-            "asOfVersion": "2.0.0"
-        },
-        {
-            "libraryName": "inversify-inject-decorators",
-            "typingsPackageName": "inversify-inject-decorators",
-            "sourceRepoURL": "https://github.com/inversify/inversify-inject-decorators",
-            "asOfVersion": "2.0.0"
-        },
-        {
-            "libraryName": "inversify-restify-utils",
-            "typingsPackageName": "inversify-restify-utils",
-            "sourceRepoURL": "https://github.com/inversify/inversify-restify-utils",
-            "asOfVersion": "2.0.0"
-        },
-        {
-            "libraryName": "Argon2",
-            "typingsPackageName": "argon2",
-            "sourceRepoURL": "https://github.com/ranisalt/node-argon2",
-            "asOfVersion": "0.15.0"
-        },
-        {
-            "libraryName": "node-scanf",
-            "typingsPackageName": "scanf",
-            "sourceRepoURL": "https://github.com/Lellansin/node-scanf",
-            "asOfVersion": "0.7.3"
-        },
         {
             "libraryName": "vue-router",
             "typingsPackageName": "vue-router",
@@ -335,6 +407,12 @@
             "typingsPackageName": "antd",
             "sourceRepoURL": "https://github.com/ant-design/ant-design",
             "asOfVersion": "1.0.0"
+        },
+        {
+            "libraryName": "@xmpp/jid",
+            "typingsPackageName": "xmpp-jid",
+            "sourceRepoURL": "github.com/node-xmpp/node-xmpp/",
+            "asOfVersion": "1.2.0"
         }
     ]
 }
diff --git a/nouislider/v7/nouislider-tests.ts b/nouislider/v7/nouislider-tests.ts
index 0bb6023774..08f9ebd74d 100644
--- a/nouislider/v7/nouislider-tests.ts
+++ b/nouislider/v7/nouislider-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="jquery" />
-
 //basic
 var basicSlider = $("<div/>").noUiSlider({
 	start: 80,
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
deleted file mode 100644
index efbf716a77..0000000000
--- a/npm-shrinkwrap.json
+++ /dev/null
@@ -1,210 +0,0 @@
-{
-  "name": "definitely-typed",
-  "version": "0.0.1",
-  "dependencies": {
-    "assertion-error": {
-      "version": "1.0.1",
-      "from": "assertion-error@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.1.tgz"
-    },
-    "balanced-match": {
-      "version": "0.3.0",
-      "from": "balanced-match@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-    },
-    "bluebird": {
-      "version": "3.3.4",
-      "from": "bluebird@>=3.3.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.3.4.tgz"
-    },
-    "brace-expansion": {
-      "version": "1.1.3",
-      "from": "brace-expansion@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz"
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "from": "concat-map@0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "from": "core-util-is@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-    },
-    "findup-sync": {
-      "version": "0.3.0",
-      "from": "findup-sync@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
-      "dependencies": {
-        "glob": {
-          "version": "5.0.15",
-          "from": "glob@>=5.0.0 <5.1.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
-        }
-      }
-    },
-    "git-wrapper": {
-      "version": "0.1.1",
-      "from": "git-wrapper@>=0.1.1 <0.2.0",
-      "resolved": "https://registry.npmjs.org/git-wrapper/-/git-wrapper-0.1.1.tgz"
-    },
-    "glob": {
-      "version": "7.0.3",
-      "from": "glob@>=7.0.0 <8.0.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz"
-    },
-    "hoek": {
-      "version": "3.0.4",
-      "from": "hoek@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-3.0.4.tgz"
-    },
-    "inflight": {
-      "version": "1.0.4",
-      "from": "inflight@>=1.0.4 <2.0.0",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
-    },
-    "inherits": {
-      "version": "2.0.1",
-      "from": "inherits@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-    },
-    "isarray": {
-      "version": "0.0.1",
-      "from": "isarray@0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-    },
-    "isemail": {
-      "version": "2.1.0",
-      "from": "isemail@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/isemail/-/isemail-2.1.0.tgz"
-    },
-    "joi": {
-      "version": "8.0.4",
-      "from": "joi@>=8.0.4 <9.0.0",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-8.0.4.tgz"
-    },
-    "joi-assert": {
-      "version": "0.0.3",
-      "from": "joi-assert@>=0.0.3 <0.0.4",
-      "resolved": "https://registry.npmjs.org/joi-assert/-/joi-assert-0.0.3.tgz"
-    },
-    "jsonparse": {
-      "version": "0.0.5",
-      "from": "jsonparse@0.0.5",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"
-    },
-    "JSONStream": {
-      "version": "0.8.4",
-      "from": "JSONStream@>=0.8.4 <0.9.0",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz"
-    },
-    "lazy.js": {
-      "version": "0.4.2",
-      "from": "lazy.js@>=0.4.2 <0.5.0",
-      "resolved": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.4.2.tgz"
-    },
-    "manticore": {
-      "version": "0.2.4",
-      "from": "manticore@>=0.2.4 <0.3.0",
-      "resolved": "https://registry.npmjs.org/manticore/-/manticore-0.2.4.tgz",
-      "dependencies": {
-        "bluebird": {
-          "version": "1.2.4",
-          "from": "bluebird@>=1.2.4 <2.0.0",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-1.2.4.tgz"
-        }
-      }
-    },
-    "minimatch": {
-      "version": "3.0.0",
-      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
-    },
-    "minimist": {
-      "version": "0.0.10",
-      "from": "minimist@>=0.0.1 <0.1.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
-    },
-    "moment": {
-      "version": "2.12.0",
-      "from": "moment@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.12.0.tgz"
-    },
-    "once": {
-      "version": "1.3.3",
-      "from": "once@>=1.3.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz"
-    },
-    "optimist": {
-      "version": "0.6.1",
-      "from": "optimist@>=0.6.1 <0.7.0",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"
-    },
-    "parsimmon": {
-      "version": "0.7.0",
-      "from": "parsimmon@>=0.7.0 <0.8.0",
-      "resolved": "https://registry.npmjs.org/parsimmon/-/parsimmon-0.7.0.tgz"
-    },
-    "path-is-absolute": {
-      "version": "1.0.0",
-      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-    },
-    "pjs": {
-      "version": "5.1.1",
-      "from": "pjs@>=5.0.0 <6.0.0",
-      "resolved": "https://registry.npmjs.org/pjs/-/pjs-5.1.1.tgz"
-    },
-    "readable-stream": {
-      "version": "1.0.33",
-      "from": "readable-stream@>=1.0.17 <1.1.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"
-    },
-    "string_decoder": {
-      "version": "0.10.31",
-      "from": "string_decoder@>=0.10.0 <0.11.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-    },
-    "through": {
-      "version": "2.3.8",
-      "from": "through@>=2.2.7 <3.0.0",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-    },
-    "through2": {
-      "version": "0.5.1",
-      "from": "through2@>=0.5.1 <0.6.0",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz"
-    },
-    "topo": {
-      "version": "2.0.0",
-      "from": "topo@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/topo/-/topo-2.0.0.tgz"
-    },
-    "type-detect": {
-      "version": "0.1.2",
-      "from": "type-detect@>=0.1.2 <0.2.0",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.2.tgz"
-    },
-    "wordwrap": {
-      "version": "0.0.3",
-      "from": "wordwrap@>=0.0.2 <0.1.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
-    },
-    "wrappy": {
-      "version": "1.0.1",
-      "from": "wrappy@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-    },
-    "xregexp": {
-      "version": "3.1.0",
-      "from": "xregexp@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-3.1.0.tgz"
-    },
-    "xtend": {
-      "version": "3.0.0",
-      "from": "xtend@>=3.0.0 <3.1.0",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
-    }
-  }
-}
diff --git a/npm/npm-tests.ts b/npm/npm-tests.ts
index ccebbdb35a..8ca5f01887 100644
--- a/npm/npm-tests.ts
+++ b/npm/npm-tests.ts
@@ -4,9 +4,6 @@
 * Created by using code samples from https://github.com/npm/npm#using-npm-programmatically.
 */
 
-/// <reference types="node" />
-
-
 import npm = require("npm");
 
 npm.load({}, function (er) {
diff --git a/numbro/index.d.ts b/numbro/index.d.ts
deleted file mode 100644
index ccb0892a0d..0000000000
--- a/numbro/index.d.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-// Type definitions for Numbro.js
-// Project: https://github.com/foretagsplatsen/numbro
-// Definitions by: Vincent Bortone <https://github.com/vbortone/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface NumbroLanguage {
-	delimiters: {
-		thousands: string;
-		decimal: string;
-	};
-	abbreviations: {
-		thousand: string;
-		million: string;
-		billion: string;
-		trillion: string;
-	};
-	ordinal(num: number): string;
-	currency: {
-		symbol: string;
-	};
-}
-
-interface Numbro {
-	(value?: any): Numbro;
-	version: string;
-	isNumbro: boolean;
-	language(key: string, values?: NumbroLanguage): Numbro;
-	zeroFormat(format: string): string;
-	clone(): Numbro;
-	format(inputString?: string): string;
-	formatCurrency(inputString?: string): string;
-	unformat(inputString: string): number;
-	value(): number;
-	valueOf(): number;
-	set (value: any): Numbro;
-	add(value: any): Numbro;
-	subtract(value: any): Numbro;
-	multiply(value: any): Numbro;
-	divide(value: any): Numbro;
-	difference(value: any): number;
-}
-
-declare var numbro: Numbro;
-
-declare module "numbro" {
-
-    export = numbro;
-
-}
diff --git a/numbro/numbro-tests.ts b/numbro/numbro-tests.ts
deleted file mode 100644
index 5b5b762353..0000000000
--- a/numbro/numbro-tests.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-var valueFormat: string = numbro(1000).format('0,0');
-// '1,000'
-
-var valueUnformat: number = numbro().unformat('($10,000.00)');
-// '-10000'
-
-var value3: Numbro = numbro(1000);
-var added: Numbro = value3.add(10);
-// 1010
-
-var value4: Numbro = numbro(1000);
-var formatValue4a: string = value4.format('0,0');
-// '1,000'
-var formatValue4b: number = value4.value();
-// 1000
-
-var value5: Numbro = numbro();
-value5.set(1000);
-var value5Num: number = value5.value();
-// 1000
-
-var value6: Numbro = numbro(1000);
-var value: number = 100;
-var difference = value6.difference(value);
-// 900
-
-var value7: Numbro = numbro(0);
-numbro.zeroFormat('N/A');
-var zeroString: string = value7.format('0.0');
-// 'N/A'
-
-var a: Numbro = numbro(1000);
-var b: Numbro = numbro(a);
-var c: Numbro = a.clone();
-
-var aVal: number = a.set(2000).value();
-// 2000
-var bVal: number = b.value();
-// 1000
-var cVal: number = c.add(10).value();
-// 1010
diff --git a/o.js/index.d.ts b/o.js/index.d.ts
index eaa6732c40..00a5f2b5ae 100644
--- a/o.js/index.d.ts
+++ b/o.js/index.d.ts
@@ -3,9 +3,9 @@
 // Definitions by: Matteo Antony Mistretta <https://github.com/IceOnFire>, Brad Zacher <https://github.com/bradzacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="q" />
-
 declare module 'o.js' {
+    import Q = require("q");
+
     interface Options {
         endpoint : string
         json ?: boolean
diff --git a/o.js/tsconfig.json b/o.js/tsconfig.json
index a72850afef..b16d5111e8 100644
--- a/o.js/tsconfig.json
+++ b/o.js/tsconfig.json
@@ -12,6 +12,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/on-finished/on-finished-tests.ts b/on-finished/on-finished-tests.ts
index 57040531fc..081e2cd37b 100644
--- a/on-finished/on-finished-tests.ts
+++ b/on-finished/on-finished-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import events = require('events');
 import onFinished = require('on-finished');
 
diff --git a/onoff/onoff-tests.ts b/onoff/onoff-tests.ts
index cd39dc4a8d..21b47e7f99 100644
--- a/onoff/onoff-tests.ts
+++ b/onoff/onoff-tests.ts
@@ -1,5 +1,3 @@
-
-/// <reference types="node" />
 import * as onoff from 'onoff';
 
 var led:onoff.Gpio = new onoff.Gpio(17, 'out');
diff --git a/openfin/openfin-tests.ts b/openfin/openfin-tests.ts
index 63a53f7cb5..cb08f60a62 100644
--- a/openfin/openfin-tests.ts
+++ b/openfin/openfin-tests.ts
@@ -1,4 +1,4 @@
-function test_application() {
+function test_application() {
 	let application: fin.OpenFinApplication;
     // constructor
 	application = new fin.desktop.Application({
diff --git a/openfin/v15/openfin-tests.ts b/openfin/v15/openfin-tests.ts
index 69b024ce90..c3c1ef1cc6 100644
--- a/openfin/v15/openfin-tests.ts
+++ b/openfin/v15/openfin-tests.ts
@@ -1,4 +1,3 @@
-
 function test_application() {
 	let application: fin.OpenFinApplication;
     // constructor
diff --git a/openui5/openui5-tests.ts b/openui5/openui5-tests.ts
index 8dc19922ee..bb411a9a1e 100644
--- a/openui5/openui5-tests.ts
+++ b/openui5/openui5-tests.ts
@@ -1,7 +1,3 @@
-/// <reference path="./jquery.sap.d.ts" />
-/// <reference path="./sap.m.d.ts" />
-/// <reference path="./sap.ui.d.ts" />
-
 sap.ui.getCore().attachInit(function () {
     new sap.m.Text({
         text: "Hello World"
diff --git a/oracledb/oracledb-tests.ts b/oracledb/oracledb-tests.ts
index 15446df243..b4d1cf5fe9 100644
--- a/oracledb/oracledb-tests.ts
+++ b/oracledb/oracledb-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="oracledb" />
-
 import * as OracleDB from 'oracledb';
 
 OracleDB.getConnection(
diff --git a/orchestrator/index.d.ts b/orchestrator/index.d.ts
index 23c8a0f507..c1eae16416 100644
--- a/orchestrator/index.d.ts
+++ b/orchestrator/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Qubo <https://github.com/tkQubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="q" />
-
 import * as Q from "q";
 
 declare type Strings = string|string[];
diff --git a/orchestrator/tsconfig.json b/orchestrator/tsconfig.json
index 1ce0c08b62..d3af83cd62 100644
--- a/orchestrator/tsconfig.json
+++ b/orchestrator/tsconfig.json
@@ -12,6 +12,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/owlcarousel/owlcarousel-tests.ts b/owlcarousel/owlcarousel-tests.ts
index 3d9ed9a69b..0d2e1b6118 100644
--- a/owlcarousel/owlcarousel-tests.ts
+++ b/owlcarousel/owlcarousel-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery"/>
-
-
 $(".className").owlCarousel();
 
 $(".className").owlCarousel({
diff --git a/passport-beam/passport-beam-tests.ts b/passport-beam/passport-beam-tests.ts
index edfa3f1396..4448dad045 100644
--- a/passport-beam/passport-beam-tests.ts
+++ b/passport-beam/passport-beam-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./index.d.ts" />
-
 /**
  * Created by AtlasDev on 4/10/2016.
  */
diff --git a/passport-http/passport-http-tests.ts b/passport-http/passport-http-tests.ts
index 22a486e6ec..4a70d30b89 100644
--- a/passport-http/passport-http-tests.ts
+++ b/passport-http/passport-http-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./index.d.ts"/>
-
 /**
  * Created by Christophe Vidal <https://github.com/krizalys>
  */
diff --git a/pathwatcher/index.d.ts b/pathwatcher/index.d.ts
index 0a44ee596b..61f084b6ca 100644
--- a/pathwatcher/index.d.ts
+++ b/pathwatcher/index.d.ts
@@ -4,8 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
-/// <reference types="q" />
 
+import { EventEmitter } from "events";
 import * as Q from "q";
 
 export as namespace PathWatcher;
@@ -28,7 +28,7 @@ export interface IFile {
 	getBaseName():string;
 	write(text:string):void;
 	readSync(flushCache:boolean):string;
-	read(flushCache?:boolean):Q.Promise<string>;
+	read(flushCache?:boolean): Promise<string>;
 	// exists():boolean;
 	existsSync():boolean;
 	setDigest(contents:string):void;
@@ -62,10 +62,7 @@ export interface IDirectory {
 	isPathPrefixOf(prefix:string, fullPath:string):boolean;
 }
 
-
-import events = require("events");
-
-export interface IHandleWatcher extends events.EventEmitter {
+export interface IHandleWatcher extends EventEmitter {
 	onEvent(event:any, filePath:any, oldFilePath:any):any;
 	start():void;
 	closeIfNoListener():void;
diff --git a/pathwatcher/tsconfig.json b/pathwatcher/tsconfig.json
index 199b1ce4e0..00b8e7052f 100644
--- a/pathwatcher/tsconfig.json
+++ b/pathwatcher/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/paymentrequest/index.d.ts b/paymentrequest/index.d.ts
deleted file mode 100644
index 5231f53bc3..0000000000
--- a/paymentrequest/index.d.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-// Type definitions for PaymentRequest
-// Project: https://www.w3.org/TR/payment-request/
-// Definitions by: Adam Cmiel <https://github.com/adamcmiel>, Eiji Kitamura <https://github.com/agektmr>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface PaymentRequest extends EventTarget {
-    new (methodData: PaymentMethodData[], details: PaymentDetails, options?: PaymentOptions): PaymentRequest;
-    show(): PromiseLike<PaymentResponse>;
-    abort(): PromiseLike<void>;
-    canMakePayment(): Promise<boolean>;
-    readonly paymentRequestID: string;
-    readonly shippingAddress?: PaymentAddress;
-    readonly shippingOption?: string;
-    readonly shippingType?: string;
-    onshippingaddresschange: PaymentUpdateEventListener;
-    onshippingoptionchange: PaymentUpdateEventListener;
-}
-
-interface PaymentMethodData {
-    supportedMethods: string[];
-    data?: {
-        supportedNetworks: string[];
-        supportedTypes: string[];
-    };
-}
-
-interface PaymentCurrencyAmount {
-    currency: string;
-    value: string;
-    currencySystem?:string;
-}
-
-interface PaymentDetails {
-    total: PaymentItem;
-    displayItems?: PaymentItem[];
-    shippingOptions?: PaymentShippingOption[];
-    modifiers?: PaymentDetailsModifier[];
-    error?: string;
-}
-
-interface PaymentDetailsModifier {
-    supportedMethods: string[];
-    total?: PaymentItem;
-    additionalDisplayItems?: PaymentItem[];
-    data?: Object;
-}
-
-interface PaymentOptions {
-    requestShipping?: boolean;
-    requestPayerEmail?: boolean;
-    requestPayerPhone?: boolean;
-    requestPayerName?: boolean;
-    shippingType?: 'shipping' | 'delivery' | 'pickup';
-}
-
-interface PaymentItem {
-    label: string;
-    amount: PaymentCurrencyAmount;
-    pending?: boolean;
-}
-
-interface PaymentAddress {
-    readonly country: string;
-    readonly addressLine: string[];
-    readonly region: string;
-    readonly city: string;
-    readonly dependentLocality: string;
-    readonly postalCode: string;
-    readonly sortingCode: string;
-    readonly languageCode: string;
-    readonly organization: string;
-    readonly recipient: string;
-    readonly phone: string;
-}
-
-interface PaymentShippingOption {
-    id: string;
-    label: string;
-    amount: PaymentCurrencyAmount;
-    selected?: boolean;
-}
-
-interface PaymentResponse {
-    readonly paymentRequestID: string;
-    readonly methodName: string;
-    readonly details: Object;
-    readonly shippingAddress?: PaymentAddress;
-    readonly shippingOption?: string;
-    readonly payerEmail?: string;
-    readonly payerPhone?: string;
-    readonly payerName?: string;
-
-    complete(result?: '' | 'success' | 'fail'): PromiseLike<void>;
-    toJSON(): Object;
-}
-
-interface PaymentUpdateEventListener extends EventListener {
-    (evt: PaymentRequestUpdateEvent): void;
-}
-
-interface PaymentRequestUpdateEvent extends Event {
-    updateWith(d: PromiseLike<PaymentDetails>): void;
-}
-
-interface Window {
-	PaymentRequest?: PaymentRequest;
-}
-
diff --git a/paymentrequest/paymentrequest-tests.ts b/paymentrequest/paymentrequest-tests.ts
deleted file mode 100644
index 62c2721bfb..0000000000
--- a/paymentrequest/paymentrequest-tests.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-/// <reference path="index.d.ts" />
-
-/// Code examples derived from
-/// https://developers.google.com/web/fundamentals/discovery-and-monetization/payment-request/
-
-async function makeRequest() {
-    if (!window.PaymentRequest) {
-        return Promise.reject(new Error("PaymentRequest not available"))
-    }
-
-    const methodData = [
-        {
-            supportedMethods: ["visa", "mastercard"]
-        }
-    ]
-
-    const details: PaymentDetails = {
-        displayItems: [
-            {
-                label: "Original donation amount",
-                amount: { currency: "USD", value : "65.00" }, // US$65.00
-            },
-            {
-                label: "Friends and family discount",
-                amount: { currency: "USD", value : "-10.00" }, // -US$10.00
-            }
-        ],
-        total:  {
-            label: "Total",
-            amount: { currency: "USD", value : "55.00" }, // US$55.00
-        }
-    }
-
-    const options: PaymentOptions = {
-        requestShipping: true,
-        requestPayerEmail: true,
-        requestPayerPhone: true,
-        requestPayerName: true,
-        shippingType: 'delivery'
-    }
-
-    const request = new window.PaymentRequest(methodData, details, options)
-    request.addEventListener("shippingaddresschange", (e: any) => {
-		e.updateWith(((details, addr) => {
-			if (addr.country === 'US') {
-				var shippingOption = {
-					id: '',
-					label: '',
-					amount: {currency: 'USD', value: '0.00'},
-					selected: true
-				};
-				if (addr.region === 'US') {
-					shippingOption.id = 'us';
-					shippingOption.label = 'Standard shipping in US';
-					shippingOption.amount.value = '0.00';
-					details.total.amount.value = '55.00';
-				} else {
-					shippingOption.id = 'others';
-					shippingOption.label = 'International shipping';
-					shippingOption.amount.value = '10.00';
-					details.total.amount.value = '65.00';
-				}
-				if (details.displayItems.length === 2) {
-					details.displayItems.splice(1, 0, shippingOption);
-				} else {
-					details.displayItems.splice(1, 1, shippingOption);
-				}
-
-				details.shippingOptions = [shippingOption];
-			} else {
-				details.shippingOptions = [];
-			}
-			return Promise.resolve(details);
-		})(details, request.shippingAddress));
-	})
-
-    let canMakePayment = await request.canMakePayment()
-    if (canMakePayment) {
-        return request.show()
-    } else {
-        throw 'can not make payment on this environment.'
-    }
-}
-
-async function processPayment(): Promise<PaymentResponse> {
-	let paymentResponse: PaymentResponse;
-    try {
-        paymentResponse = await makeRequest()
-    } catch (error) {
-        location.href = '/checkout';
-        return;
-    }
-
-    var paymentData = {
-        // payment method string
-        method: paymentResponse.methodName,
-        // payment details as you requested
-        details: paymentResponse.details,
-        // shipping address information
-        address: paymentResponse.shippingAddress,
-        // shipping option
-        shippingOption: paymentResponse.shippingOption
-    }
-
-    // make call to backend to process payment data
-    const ok = await Promise.resolve(true)
-
-    if (ok) {
-        paymentResponse.complete("success")
-    } else {
-        paymentResponse.complete("fail")
-    }
-}
-
-function onShippingAddressChange(e: any) {
-}
-
-document.querySelector("#pay").addEventListener("click", processPayment)
diff --git a/pdfkit/index.d.ts b/pdfkit/index.d.ts
index 8bd1c7014e..053aa7f029 100644
--- a/pdfkit/index.d.ts
+++ b/pdfkit/index.d.ts
@@ -269,7 +269,7 @@ declare namespace PDFKit {
         new (options?: PDFDocumentOptions): PDFDocument;
 
         addPage(options?: PDFDocumentOptions): PDFDocument;
-        bufferedPageRanges(): { start: number; count: number };
+        bufferedPageRange(): { start: number; count: number };
         switchToPage(n?: number): PDFPage;
         flushPages(): void;
         ref(data: {}): PDFKitReference;
diff --git a/peerjs/peerjs-tests.ts b/peerjs/peerjs-tests.ts
index 373df3ba2f..2246e6a8fd 100644
--- a/peerjs/peerjs-tests.ts
+++ b/peerjs/peerjs-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="webrtc" />
-
 var peerByOption: PeerJs.Peer = new Peer({
     key: 'peerKey',
     debug: 3,
diff --git a/phantomcss/index.d.ts b/phantomcss/index.d.ts
index 451c250372..688c706199 100644
--- a/phantomcss/index.d.ts
+++ b/phantomcss/index.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Amaury Bauzac <https://github.com/abauzac>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import { Casper } from 'casperjs';
 /// <reference types="resemblejs" />
+import { Casper } from 'casperjs';
 
 declare global {
   namespace PhantomCSS {
diff --git a/phantomcss/phantomcss-tests.ts b/phantomcss/phantomcss-tests.ts
index 8478bbd323..ee16832fae 100644
--- a/phantomcss/phantomcss-tests.ts
+++ b/phantomcss/phantomcss-tests.ts
@@ -1,7 +1,3 @@
-
-/// <reference types="casperjs" />
-/// <reference types="resemblejs" />
-
 // phantomCSS 0.11.1 is based on resemblejs 1.2.1, phantomJS 1.9.2 , casperJS 1.1.0-DEV
 
 var options: PhantomCSS.PhantomCSSOptions = {
@@ -39,8 +35,8 @@ var options: PhantomCSS.PhantomCSSOptions = {
         });
     },
 
-    fileNameGetter: function(root:string,filename:string){ 
-       
+    fileNameGetter: function(root:string,filename:string){
+
        return root+filename;
     },
 
@@ -65,7 +61,7 @@ declare var phantomcss:PhantomCSS.PhantomCSS;
 phantomcss.turnOffAnimations();
 phantomcss.init(options);
 
-phantomcss.compareAll('exclude.test'); 
+phantomcss.compareAll('exclude.test');
 phantomcss.compareMatched('include.test', 'exclude.test');
 phantomcss.compareMatched( new RegExp('include.test'), new RegExp('exclude.test'));
 phantomcss.compareSession();
diff --git a/phonon/index.d.ts b/phonon/index.d.ts
index bd41d448c8..ce07b5a19b 100644
--- a/phonon/index.d.ts
+++ b/phonon/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Kévin SERIN <https://github.com/kserin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="awesomplete"/>
+/// <reference types="awesomplete" />
 
 declare namespace Phonon {
     /*** Main object ***/
@@ -28,7 +28,7 @@ declare namespace Phonon {
         popover(id?: string): PhononPopoverComponent;
         preloader(element: string | Element): PhononPreloaderComponent;
         tab(): PhononTabComponent;
-        autocomplete(input: Element | HTMLElement | string, o?: AwesompleteOptions): Awesomplete;
+        autocomplete(input: Element | HTMLElement | string, o?: Awesomplete.Options): Awesomplete;
     }
     interface PhononDeviceObject {
         os: string;
diff --git a/phonon/phonon-tests.ts b/phonon/phonon-tests.ts
index 0d5df50b4e..6b9851b642 100644
--- a/phonon/phonon-tests.ts
+++ b/phonon/phonon-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="index.d.ts"/>
-
 // Code examples from http://phonon.quarkdev.com/docs/navigator
 phonon.options({
     navigator: {
@@ -19,23 +17,22 @@ phonon.options({
 });
 
 phonon.navigator().on({
-  page: 'pagename',
-  content: 'content.html',
-  preventClose: false,
-  readyDelay: 1
-}, function(activity) {
-  activity.onCreate(function() {});
-  activity.onReady(function() {});
-  activity.onTransitionEnd(function() {});
-  activity.onClose(function(self) {});
-  activity.onHidden(function() {});
-  activity.onHashChanged(function(req1, req2) {});
-  activity.onTabChanged(function() {})
+    page: 'pagename',
+    content: 'content.html',
+    preventClose: false,
+    readyDelay: 1
+}, activity => {
+    activity.onCreate(() => {});
+    activity.onReady(() => {});
+    activity.onTransitionEnd(() => {});
+    activity.onClose(self => {});
+    activity.onHidden(() => {});
+    activity.onHashChanged((req1, req2) => {});
+    activity.onTabChanged(() => {});
 });
 
-phonon.navigator().onPage('home').addEvent('create', function () {
-});
-phonon.navigator().onPage('home').addEvent('close', function (api) {
+phonon.navigator().onPage('home').addEvent('create', () => {});
+phonon.navigator().onPage('home').addEvent('close', api => {
     api.close();
 });
 
@@ -47,11 +44,11 @@ page = phonon.navigator().previousPage;
 
 
 let ev = document.createEvent('');
-document.on('pagecreated', function(event) {
-  console.log('global state pagecreated: ' + event.detail.page)
+document.on('pagecreated', event => {
+  console.log('global state pagecreated: ' + event.detail.page);
 });
-document.on('pagehash', function(event) {
-    console.log('global state pagehash: ' + event.detail.page)
+document.on('pagehash', event => {
+    console.log('global state pagehash: ' + event.detail.page);
     console.log(event.detail.req[0]);
     console.log(event.detail.req[1]);
     console.log(event.detail.req[2]);
@@ -60,13 +57,13 @@ document.on('pagehash', function(event) {
 // Code examples from http://phonon.quarkdev.com/docs/i18n
 let element = document.createElement('<element>');
 phonon.i18n().bind();
-phonon.i18n().bind(function() {});
+phonon.i18n().bind(() => {});
 phonon.i18n().bind(element);
-phonon.i18n().bind(element, function() {});
+phonon.i18n().bind(element, () => {});
 
-phonon.i18n().getAll(function(json) {});
-phonon.i18n().get('my_key', function(value) {});
-phonon.i18n().get(['my_key_1', 'my_key_two'], function(values) {});
+phonon.i18n().getAll(json => {});
+phonon.i18n().get('my_key', value => {});
+phonon.i18n().get(['my_key_1', 'my_key_two'], values => {});
 
 phonon.updateLocale('new-language');
 phonon.i18n().setPreference("fr");
@@ -86,10 +83,10 @@ var req = phonon.ajax({
         'header-name1': 'value1',
         'header-name2': 'value2'
     },
-    success: function(res, xhr) {
+    success(res, xhr) {
         console.log(res);
     },
-    error: function(res, flagError, xhr) {
+    error(res, flagError, xhr) {
         console.error(flagError);
         console.log(res);
     }
@@ -104,14 +101,14 @@ let browsername: string = phonon.browser.name;
 let browserVersion: string = phonon.browser.version;
 
 // Code examples from http://phonon.quarkdev.com/docs/events
-element.on('tap', function() {});
-phonon.onReady(function() {});
-document.querySelectorAll('.elements').on('tap', function() {});
+element.on('tap', () => {});
+phonon.onReady(() => {});
+document.querySelectorAll('.elements').on('tap', () => {});
 
-element.off('tap', function() {});
-document.querySelectorAll('.elements').off('tap', function() {});
+element.off('tap', () => {});
+document.querySelectorAll('.elements').off('tap', () => {});
 
-document.on('pageopened', function(evt) {
+document.on('pageopened', evt => {
     console.log(evt.detail.page + ' is opened');
 });
 
@@ -128,22 +125,22 @@ phonon.sidePanel('#side-panel-id').close();
 
 // Code examples from http://phonon.quarkdev.com/docs/dialogs
 let pAlert = phonon.alert("text", "title", true, "textOk");
-pAlert.on('confirm', function() {});
+pAlert.on('confirm', () => {});
 
 var pconfirm = phonon.confirm("text", "title", true, "textOk", "textCancel");
-pconfirm.on('confirm', function() {})
-pconfirm.on('cancel', function() {});
+pconfirm.on('confirm', () => {});
+pconfirm.on('cancel', () => {});
 
 let pPrompt = phonon.prompt("text", "title", true, "textOk", "textCancel");
-pPrompt.on('confirm', function(inputValue) {})
-pPrompt.on('cancel', function() {});
+pPrompt.on('confirm', inputValue => {});
+pPrompt.on('cancel', () => {});
 
 phonon.indicator("title", true);
 
 let myDialog = phonon.dialog('#my-dialog');
 myDialog.open();
 myDialog.close();
-myDialog.on('confirm', function() {});
+myDialog.on('confirm', () => {});
 
 // Code examples from http://phonon.quarkdev.com/docs/notifications
 let notif = phonon.notif('Hello', 3000, true, 'CANCEL');
@@ -168,7 +165,7 @@ popover.setList([
         value: 'tg'
     }
 ]);
-popover.setList(['a', 'b', 'c'], function (item) {
+popover.setList(['a', 'b', 'c'], item => {
     var text = typeof item === 'string' ? item : item.text;
     var value = typeof item === 'string' ? item : item.value;
     return '<li><a class="padded-list" data-value="' + value + '">' + text + '</a></li>';
@@ -180,18 +177,18 @@ popover.attachButton(element, true);
 popover.openFrom('.button-for-popover');
 popover.openFrom(element);
 
-popover.onItemChanged(function (data) {
-    console.log('onItemChanged')
-    console.error(data)
+popover.onItemChanged(data => {
+    console.log('onItemChanged');
+    console.error(data);
 });
-element.on('itemchanged', function(event) {
+element.on('itemchanged', event => {
   console.log(event.detail);
 });
 
 popover = phonon.popover()
   .setList(['a', 'b', 'c'])
   .attachButton('.my-button', true)
-  .onItemChanged(function (data) {
+  .onItemChanged(data => {
       console.log(data);
   }).openFrom('.my-button');
 
@@ -220,39 +217,39 @@ phonon.options({
 
 let app = phonon.navigator();
 app.on({page: 'home', preventClose: false, content: null});
-app.on({page: 'pagetwo', preventClose: true, content: 'pagetwo.html', readyDelay: 1}, function(activity) {
+app.on({page: 'pagetwo', preventClose: true, content: 'pagetwo.html', readyDelay: 1}, activity => {
     let action: string | null = null;
-    var onAction = function(evt: any) {
+    var onAction = (evt: any) => {
         var target = evt.target;
         action = 'ok';
-        if(target.getAttribute('data-order') === 'order') {
+        if (target.getAttribute('data-order') === 'order') {
             phonon.alert('Thank you for your order!', 'Dear customer');
         } else {
             phonon.alert('Your order has been canceled.', 'Dear customer');
         }
     };
-    activity.onCreate(function() {
-        let order = document.querySelector('.order');
+    activity.onCreate(() => {
+        const order = document.querySelector('.order');
         if (order != null) {
             order.on('tap', onAction);
         }
-        let cancel = document.querySelector('.cancel');
+        const cancel = document.querySelector('.cancel');
         if (cancel != null) {
             cancel.on('tap', onAction);
         }
     });
-    activity.onClose(function(self) {
-        if(action !== null) {
+    activity.onClose(self => {
+        if (action !== null) {
             self.close();
         } else {
             phonon.alert('Before leaving this page, you must perform an action.', 'Action required');
         }
     });
-    activity.onHidden(function() {
+    activity.onHidden(() => {
         action = null;
     });
-    activity.onHashChanged(function(pizza) {
-        let pizzaElt = document.querySelector('.pizza');
+    activity.onHashChanged(pizza => {
+        const pizzaElt = document.querySelector('.pizza');
         if (pizzaElt != null) {
             pizzaElt.textContent = pizza;
         }
@@ -262,66 +259,66 @@ app.start();
 
 // Code example from http://phonon.quarkdev.com/App/public/phonon/kitchen-sink/index.html
 phonon.options({
-	navigator: {
-		defaultPage: 'home',
-		animatePages: true,
-		templateRootDirectory: 'contents/',
-		enableBrowserBackButton: true // should be disabled on Cordova
-	},
-	i18n: {
-		directory: 'lang/',
-		localeFallback: 'en',
-		localePreferred: 'en-US'
-	}
+    navigator: {
+        defaultPage: 'home',
+        animatePages: true,
+        templateRootDirectory: 'contents/',
+        enableBrowserBackButton: true // should be disabled on Cordova
+    },
+    i18n: {
+        directory: 'lang/',
+        localeFallback: 'en',
+        localePreferred: 'en-US'
+    }
 });
 
 var app2 = phonon.navigator();
 app2.on({page: 'home', content: 'home.html'});
-app2.on({page: 'pagedialog', content: 'pagedialog.html'}, function(activity) {
-	activity.onCreate(function() {
-    let showAlert = document.querySelector('#show-alert');
-    if (showAlert) {
-      showAlert.on('tap', function() {
-        phonon.alert('Example', 'Hello');
-      });
-    }
+app2.on({page: 'pagedialog', content: 'pagedialog.html'}, activity => {
+    activity.onCreate(() => {
+        const showAlert = document.querySelector('#show-alert');
+        if (showAlert) {
+            showAlert.on('tap', () => {
+                phonon.alert('Example', 'Hello');
+            });
+        }
 
-    let showConfirm = document.querySelector('#show-confirm');
-    if (showConfirm) {
-        showConfirm.on('tap', function() {
-        let confirm = phonon.confirm('Example', 'Hello');
-        confirm.on('confirm', function() {
-            phonon.alert('Confirmed!');
-        });
-        confirm.on('cancel', function(value) {
-            phonon.alert('Canceled!');
-        });
-      });
-    }
+        const showConfirm = document.querySelector('#show-confirm');
+        if (showConfirm) {
+            showConfirm.on('tap', () => {
+                const confirm = phonon.confirm('Example', 'Hello');
+                confirm.on('confirm', () => {
+                    phonon.alert('Confirmed!');
+                });
+                confirm.on('cancel', value => {
+                    phonon.alert('Canceled!');
+                });
+            });
+        }
 
-    let showPrompt = document.querySelector('#show-prompt');
-    if (showPrompt) {
-        showPrompt.on('tap', function() {
-        var prompt = phonon.prompt('Example', 'Hello');
-        prompt.on('confirm', function(value) {
-            phonon.alert(value, 'Inserted Value');
+        const showPrompt = document.querySelector('#show-prompt');
+        if (showPrompt) {
+            showPrompt.on('tap', () => {
+            var prompt = phonon.prompt('Example', 'Hello');
+            prompt.on('confirm', value => {
+                phonon.alert(value, 'Inserted Value');
+            });
+            prompt.on('cancel', () => {
+                phonon.alert('Prompt Canceled');
+            });
         });
-        prompt.on('cancel', function() {
-            phonon.alert('Prompt Canceled');
-        });
-      });
-    }
+        }
 
-    let showIndicator = document.querySelector('#show-indicator');
-    if (showIndicator) {
-        showIndicator.on('tap', function() {
-        let indicator = phonon.indicator('Please wait 3 seconds', false);
-        window.setTimeout(function() {
-          indicator.close();
-        }, 3000);
-      });
-    }
-	});
+        const showIndicator = document.querySelector('#show-indicator');
+        if (showIndicator) {
+            showIndicator.on('tap', () => {
+                const indicator = phonon.indicator('Please wait 3 seconds', false);
+                window.setTimeout(() => {
+                indicator.close();
+                }, 3000);
+            });
+        }
+    });
 });
 
 app2.on({page: 'pageform', content: 'pageform.html'});
@@ -331,69 +328,66 @@ app2.on({page: 'pagegrid', content: 'pagegrid.html'});
 app2.on({page: 'pagelist', content: 'pagelist.html'});
 app2.on({page: 'pageaccordion', content: 'pageaccordion.html'});
 
-app2.on({page: 'pagenotif', content: 'pagenotif.html', readyDelay: 500}, function(activity) {
+app2.on({page: 'pagenotif', content: 'pagenotif.html', readyDelay: 500}, activity => {
+    activity.onCreate(() => {
+        const showAutoNotif = document.querySelector('#show-auto-notif');
+        if (showAutoNotif) {
+            showAutoNotif.on('tap', () => {
+                phonon.notif('HELLO', 3000, false);
+            });
+        }
 
-	activity.onCreate(function() {
-    let showAutoNotif = document.querySelector('#show-auto-notif');
-    if (showAutoNotif) {
-        showAutoNotif.on('tap', function() {
-            phonon.notif('HELLO', 3000, false);
-        });
-    }
+        const showNotif = document.querySelector('#show-notif');
+        if (showNotif) {
+            showNotif.on('tap', () => {
+                phonon.notif('#notif-example').show();
+            });
+        }
 
-    let showNotif = document.querySelector('#show-notif');
-    if (showNotif) {
-        showNotif.on('tap', function() {
-            phonon.notif('#notif-example').show();
-        });
-    }
+        const showNotifButton = document.querySelector('#show-notif-button');
+        if (showNotifButton) {
+            showNotifButton.on('tap', () => {
+                phonon.notif('HELLO', 3000, true, 'Bye');
+            });
+        }
+    });
 
-    let showNotifButton = document.querySelector('#show-notif-button');
-    if (showNotifButton) {
-        showNotifButton.on('tap', function() {
-            phonon.notif('HELLO', 3000, true, 'Bye');
-        });
-    }
-	});
-
-	activity.onReady(function() {
-		phonon.notif('Welcome!', 3000, true);
-
-	});
+    activity.onReady(() => {
+        phonon.notif('Welcome!', 3000, true);
+    });
 });
 
 app2.on({page: 'pagepanel', content: 'pagepanel.html'});
 app2.on({page: 'pagepopover', content: 'pagepopover.html'});
-app2.on({page: 'pagepreloader', content: 'pagepreloader.html'}, function(activity) {
+app2.on({page: 'pagepreloader', content: 'pagepreloader.html'}, activity => {
+    activity.onReady(() => {
+        const myCircle = document.querySelector('#my-circle');
+        if (myCircle) {
+            phonon.preloader(myCircle).show();
+        }
+        const myDeterminate = document.querySelector('#my-determinate');
+        if (myDeterminate) {
+            phonon.preloader(myDeterminate).show();
+        }
+    });
 
-	activity.onReady(function() {
-    let myCircle = document.querySelector('#my-circle');
-    if (myCircle) {
-        phonon.preloader(myCircle).show();
-    }
-    let myDeterminate = document.querySelector('#my-determinate');
-    if (myDeterminate) {
-        phonon.preloader(myDeterminate).show();
-    }
-	});
-
-	activity.onHidden(function() {
-    let myCircle = document.querySelector('#my-circle');
-    if (myCircle) {
-        phonon.preloader(myCircle).hide();
-    }
-    let myDeterminate = document.querySelector('#my-determinate');
-    if (myDeterminate) {
-        phonon.preloader(myDeterminate).hide();
-    }
-	});
+    activity.onHidden(() => {
+        const myCircle = document.querySelector('#my-circle');
+        if (myCircle) {
+            phonon.preloader(myCircle).hide();
+        }
+        const myDeterminate = document.querySelector('#my-determinate');
+        if (myDeterminate) {
+            phonon.preloader(myDeterminate).hide();
+        }
+    });
 });
 
 app2.on({page: 'pagesidepanel', content: 'pagesidepanel.html'});
 app2.on({page: 'pagetable', content: 'pagetable.html'});
-app2.on({page: 'pagetabs', content: 'pagetabs.html'}, function(activity) {
-    activity.onTabChanged(function(tabNumber) {
-        let tab = document.querySelector('.tab-number');
+app2.on({page: 'pagetabs', content: 'pagetabs.html'}, activity => {
+    activity.onTabChanged(tabNumber => {
+        const tab = document.querySelector('.tab-number');
         if (tab) {
             tab.innerHTML = tabNumber + "";
         }
@@ -417,29 +411,27 @@ phonon.options({
     },
     i18n: null
 });
-phonon.navigator().on({ page: 'home' }, function(activity) {
-    activity.onReady(function(){
-    		// input where user typed words to query
-    		let input = document.querySelector( '#searchJS' );
+phonon.navigator().on({ page: 'home' }, activity => {
+    activity.onReady(() => {
+        // input where user typed words to query
+        const input = document.querySelector( '#searchJS' );
         let list = '';
         // external autocomplete
         var req = phonon.ajax({
             method: "GET",
-    				url: 'https://restcountries.eu/rest/v1/lang/en',
-    				dataType: "json",
-    				success: function( res, xhr ){
-        				list = res.map( function(i: any){
-        						return i.name;
-        				});
-        				// initialize autocomplete
+            url: 'https://restcountries.eu/rest/v1/lang/en',
+            dataType: "json",
+            success(res, xhr) {
+                list = res.map((i: any) => i.name);
+                // initialize autocomplete
                 if (input) {
-                    phonon.autocomplete( input, {list:list} );
+                    phonon.autocomplete(input, {list});
                 }
-    		    },
-            error: function( res, flagError, xhr ){
+            },
+            error(res, flagError, xhr) {
                 console.error(flagError);
-    				    console.log(res);
-    		    }
+                console.log(res);
+            }
         });
     });
 });
@@ -457,23 +449,23 @@ phonon.options({
 });
 
 let app3 = phonon.navigator();
-app3.on({page: 'home', content: null}, function(activity) {
-    activity.onCreate(function() {
+app3.on({page: 'home', content: null}, activity => {
+    activity.onCreate(() => {
         let element = document.querySelector('#show-alert');
         if (element) {
-          element.on('tap', function() {
+          element.on('tap', () => {
             phonon.alert('Example', 'Hello');
           });
         }
 
         element = document.querySelector('#show-confirm');
         if (element) {
-            element.on('tap', function() {
+            element.on('tap', () => {
               var confirm = phonon.confirm('Example', 'Hello');
-              confirm.on('confirm', function() {
+              confirm.on('confirm', () => {
                 phonon.alert('Confirmed!');
               });
-              confirm.on('cancel', function(value) {
+              confirm.on('cancel', value => {
                 phonon.alert('Canceled!');
               });
             });
@@ -481,12 +473,12 @@ app3.on({page: 'home', content: null}, function(activity) {
 
         element = document.querySelector('#show-prompt');
         if (element) {
-          element.on('tap', function() {
+          element.on('tap', () => {
             var prompt = phonon.prompt('Example', 'Hello');
-            prompt.on('confirm', function(value) {
+            prompt.on('confirm', value => {
               phonon.alert(value, 'Inserted Value');
             });
-            prompt.on('cancel', function() {
+            prompt.on('cancel', () => {
               phonon.alert('Prompt Canceled');
             });
           });
@@ -494,11 +486,11 @@ app3.on({page: 'home', content: null}, function(activity) {
 
         element = document.querySelector('#show-indicator');
         if (element) {
-          element.on('tap', function() {
+          element.on('tap', () => {
             var indicator = phonon.indicator('Please wait 3 seconds', false);
-            window.setTimeout(function() {
+            window.setTimeout(() => {
               indicator.close();
-            },3000);
+            }, 3000);
           });
         }
     });
@@ -516,27 +508,27 @@ let elSetEnUs = document.querySelector('.set-en-us');
 let defaultLocale = 'fr';
 
 function setupHTML() {
-	let pref = (phonon.i18n().getPreference() ? phonon.i18n().getPreference() : 'not used');
-  if (elPrefLang) {
-      elPrefLang.textContent = 'Preferred language : ' + pref;
-  }
-  if (elLang) {
-      elLang.textContent = 'Locale language : ' + phonon.i18n().getLocale();
-  }
-  if (elDefault) {
-      elDefault.textContent = 'Default language : ' + defaultLocale;
-  }
+    const pref = (phonon.i18n().getPreference() ? phonon.i18n().getPreference() : 'not used');
+    if (elPrefLang) {
+        elPrefLang.textContent = 'Preferred language : ' + pref;
+    }
+    if (elLang) {
+        elLang.textContent = 'Locale language : ' + phonon.i18n().getLocale();
+    }
+    if (elDefault) {
+        elDefault.textContent = 'Default language : ' + defaultLocale;
+    }
 
-	// The parameter is optional, if you pass nothing, i18n will bind all the document
-	phonon.i18n().bind();
+    // The parameter is optional, if you pass nothing, i18n will bind all the document
+    phonon.i18n().bind();
 }
 
-var setPreference = function (evt: any) {
-	var target = evt.target;
-	var lang = target.getAttribute('data-l');
-	if(lang) {
-		  phonon.updateLocale(lang);
-	}
+var setPreference = (evt: any) => {
+    var target = evt.target;
+    var lang = target.getAttribute('data-l');
+    if (lang) {
+          phonon.updateLocale(lang);
+    }
 };
 
 if (elSetFr) {
@@ -553,9 +545,9 @@ phonon.options({
         defaultPage: 'home',
     },
     i18n: {
-		    directory: 'res/lang/',
-		    localeFallback: defaultLocale,
-		    localePreferred: 'en'
+        directory: 'res/lang/',
+        localeFallback: defaultLocale,
+        localePreferred: 'en'
     }
 });
 setupHTML();
diff --git a/piwik-tracker/piwik-tracker-tests.ts b/piwik-tracker/piwik-tracker-tests.ts
index 3e7506d5fd..f1545a843a 100644
--- a/piwik-tracker/piwik-tracker-tests.ts
+++ b/piwik-tracker/piwik-tracker-tests.ts
@@ -1,22 +1,20 @@
-/// <reference types="node" />
-
 // Example code taken from https://www.npmjs.com/package/piwik-tracker
 
 var PiwikTracker = require('piwik-tracker');
- 
-// Initialize with your site ID and Piwik URL 
+
+// Initialize with your site ID and Piwik URL
 var piwik = new PiwikTracker(1, 'http://mywebsite.com/piwik.php');
- 
-// Optional: Respond to tracking errors 
+
+// Optional: Respond to tracking errors
 piwik.on('error', function(err : Error) {
   console.log('error tracking request: ', err)
 })
- 
-// Track a request URL: 
-// Either as a simple string … 
+
+// Track a request URL:
+// Either as a simple string …
 piwik.track('http://example.com/track/this/url');
- 
-// … or provide further options: 
+
+// … or provide further options:
 piwik.track({
   url: 'http://example.com/track/this/url',
   action_name: 'This will be shown in your dashboard',
diff --git a/pixi-spine/index.d.ts b/pixi-spine/index.d.ts
deleted file mode 100644
index deb614c749..0000000000
--- a/pixi-spine/index.d.ts
+++ /dev/null
@@ -1,1042 +0,0 @@
-// Type definitions for Pixi-spine 1.3
-// Project: https://github.com/pixijs/pixi-spine/tree/master
-// Definitions by: Ivan Popelyshev <https://github.com/pixijs/pixi-spine>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-import * as PPP from "pixi.js";
-
-declare module "pixi.js" {
-    namespace spine.core {
-        class Animation {
-            name: string;
-            timelines: Timeline[];
-            duration: number;
-            constructor(name: string, timelines: Timeline[], duration: number);
-            apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-            static binarySearch(values: ArrayLike<number>, target: number, step?: number): number;
-            static linearSearch(values: ArrayLike<number>, target: number, step: number): number;
-        }
-        interface Timeline {
-            apply(skeleton: Skeleton, lastTime: number, time: number, events: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-            getPropertyId(): number;
-        }
-        enum TimelineType {
-            rotate = 0,
-            translate = 1,
-            scale = 2,
-            shear = 3,
-            attachment = 4,
-            color = 5,
-            deform = 6,
-            event = 7,
-            drawOrder = 8,
-            ikConstraint = 9,
-            transformConstraint = 10,
-            pathConstraintPosition = 11,
-            pathConstraintSpacing = 12,
-            pathConstraintMix = 13,
-        }
-        abstract class CurveTimeline implements Timeline {
-            static LINEAR: number;
-            static STEPPED: number;
-            static BEZIER: number;
-            static BEZIER_SIZE: number;
-            private curves;
-            abstract getPropertyId(): number;
-            constructor(frameCount: number);
-            getFrameCount(): number;
-            setLinear(frameIndex: number): void;
-            setStepped(frameIndex: number): void;
-            getCurveType(frameIndex: number): number;
-            setCurve(frameIndex: number, cx1: number, cy1: number, cx2: number, cy2: number): void;
-            getCurvePercent(frameIndex: number, percent: number): number;
-            abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-        class RotateTimeline extends CurveTimeline {
-            static ENTRIES: number;
-            static PREV_TIME: number;
-            static PREV_ROTATION: number;
-            static ROTATION: number;
-            boneIndex: number;
-            frames: ArrayLike<number>;
-            constructor(frameCount: number);
-            getPropertyId(): number;
-            setFrame(frameIndex: number, time: number, degrees: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, events: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-        class TranslateTimeline extends CurveTimeline {
-            static ENTRIES: number;
-            static PREV_TIME: number;
-            static PREV_X: number;
-            static PREV_Y: number;
-            static X: number;
-            static Y: number;
-            boneIndex: number;
-            frames: ArrayLike<number>;
-            constructor(frameCount: number);
-            getPropertyId(): number;
-            setFrame(frameIndex: number, time: number, x: number, y: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, events: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-        class ScaleTimeline extends TranslateTimeline {
-            constructor(frameCount: number);
-            getPropertyId(): number;
-            apply(skeleton: Skeleton, lastTime: number, time: number, events: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-        class ShearTimeline extends TranslateTimeline {
-            constructor(frameCount: number);
-            getPropertyId(): number;
-            apply(skeleton: Skeleton, lastTime: number, time: number, events: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-        class ColorTimeline extends CurveTimeline {
-            static ENTRIES: number;
-            static PREV_TIME: number;
-            static PREV_R: number;
-            static PREV_G: number;
-            static PREV_B: number;
-            static PREV_A: number;
-            static R: number;
-            static G: number;
-            static B: number;
-            static A: number;
-            slotIndex: number;
-            frames: ArrayLike<number>;
-            constructor(frameCount: number);
-            getPropertyId(): number;
-            setFrame(frameIndex: number, time: number, r: number, g: number, b: number, a: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, events: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-        class AttachmentTimeline implements Timeline {
-            slotIndex: number;
-            frames: ArrayLike<number>;
-            attachmentNames: string[];
-            constructor(frameCount: number);
-            getPropertyId(): number;
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, attachmentName: string): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, events: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-        class DeformTimeline extends CurveTimeline {
-            slotIndex: number;
-            attachment: VertexAttachment;
-            frames: ArrayLike<number>;
-            frameVertices: Array<ArrayLike<number>>;
-            constructor(frameCount: number);
-            getPropertyId(): number;
-            setFrame(frameIndex: number, time: number, vertices: ArrayLike<number>): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-        class EventTimeline implements Timeline {
-            frames: ArrayLike<number>;
-            events: Event[];
-            constructor(frameCount: number);
-            getPropertyId(): number;
-            getFrameCount(): number;
-            setFrame(frameIndex: number, event: Event): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-        class DrawOrderTimeline implements Timeline {
-            frames: ArrayLike<number>;
-            drawOrders: number[][];
-            constructor(frameCount: number);
-            getPropertyId(): number;
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, drawOrder: number[]): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-        class IkConstraintTimeline extends CurveTimeline {
-            static ENTRIES: number;
-            static PREV_TIME: number;
-            static PREV_MIX: number;
-            static PREV_BEND_DIRECTION: number;
-            static MIX: number;
-            static BEND_DIRECTION: number;
-            ikConstraintIndex: number;
-            frames: ArrayLike<number>;
-            constructor(frameCount: number);
-            getPropertyId(): number;
-            setFrame(frameIndex: number, time: number, mix: number, bendDirection: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-        class TransformConstraintTimeline extends CurveTimeline {
-            static ENTRIES: number;
-            static PREV_TIME: number;
-            static PREV_ROTATE: number;
-            static PREV_TRANSLATE: number;
-            static PREV_SCALE: number;
-            static PREV_SHEAR: number;
-            static ROTATE: number;
-            static TRANSLATE: number;
-            static SCALE: number;
-            static SHEAR: number;
-            transformConstraintIndex: number;
-            frames: ArrayLike<number>;
-            constructor(frameCount: number);
-            getPropertyId(): number;
-            setFrame(frameIndex: number, time: number, rotateMix: number, translateMix: number, scaleMix: number, shearMix: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-        class PathConstraintPositionTimeline extends CurveTimeline {
-            static ENTRIES: number;
-            static PREV_TIME: number;
-            static PREV_VALUE: number;
-            static VALUE: number;
-            pathConstraintIndex: number;
-            frames: ArrayLike<number>;
-            constructor(frameCount: number);
-            getPropertyId(): number;
-            setFrame(frameIndex: number, time: number, value: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-        class PathConstraintSpacingTimeline extends PathConstraintPositionTimeline {
-            constructor(frameCount: number);
-            getPropertyId(): number;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-        class PathConstraintMixTimeline extends CurveTimeline {
-            static ENTRIES: number;
-            static PREV_TIME: number;
-            static PREV_ROTATE: number;
-            static PREV_TRANSLATE: number;
-            static ROTATE: number;
-            static TRANSLATE: number;
-            pathConstraintIndex: number;
-            frames: ArrayLike<number>;
-            constructor(frameCount: number);
-            getPropertyId(): number;
-            setFrame(frameIndex: number, time: number, rotateMix: number, translateMix: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number, setupPose: boolean, mixingOut: boolean): void;
-        }
-    }
-    namespace spine.core {
-        class AnimationState {
-            static emptyAnimation: Animation;
-            data: AnimationStateData;
-            tracks: TrackEntry[];
-            events: Event[];
-            listeners: AnimationStateListener2[];
-            queue: EventQueue;
-            propertyIDs: IntSet;
-            animationsChanged: boolean;
-            timeScale: number;
-            trackEntryPool: Pool<TrackEntry>;
-            constructor(data: AnimationStateData);
-            update(delta: number): void;
-            updateMixingFrom(entry: TrackEntry, delta: number, canEnd: boolean): void;
-            apply(skeleton: Skeleton): void;
-            applyMixingFrom(entry: TrackEntry, skeleton: Skeleton): number;
-            applyRotateTimeline(timeline: Timeline, skeleton: Skeleton, time: number, alpha: number, setupPose: boolean, timelinesRotation: number[], i: number, firstFrame: boolean): void;
-            queueEvents(entry: TrackEntry, animationTime: number): void;
-            clearTracks(): void;
-            clearTrack(trackIndex: number): void;
-            setCurrent(index: number, current: TrackEntry): void;
-            setAnimation(trackIndex: number, animationName: string, loop: boolean): TrackEntry;
-            setAnimationWith(trackIndex: number, animation: Animation, loop: boolean): TrackEntry;
-            addAnimation(trackIndex: number, animationName: string, loop: boolean, delay: number): TrackEntry;
-            addAnimationWith(trackIndex: number, animation: Animation, loop: boolean, delay: number): TrackEntry;
-            setEmptyAnimation(trackIndex: number, mixDuration: number): TrackEntry;
-            addEmptyAnimation(trackIndex: number, mixDuration: number, delay: number): TrackEntry;
-            setEmptyAnimations(mixDuration: number): void;
-            expandToIndex(index: number): TrackEntry;
-            trackEntry(trackIndex: number, animation: Animation, loop: boolean, last: TrackEntry): TrackEntry;
-            disposeNext(entry: TrackEntry): void;
-            _animationsChanged(): void;
-            setTimelinesFirst(entry: TrackEntry): void;
-            checkTimelinesFirst(entry: TrackEntry): void;
-            checkTimelinesUsage(entry: TrackEntry, usageArray: boolean[]): void;
-            getCurrent(trackIndex: number): TrackEntry;
-            addListener(listener: AnimationStateListener2): void;
-            removeListener(listener: AnimationStateListener2): void;
-            clearListeners(): void;
-            clearListenerNotifications(): void;
-            onComplete: (trackIndex: number, loopCount: number) => any;
-            onEvent: (trackIndex: number, event: Event) => any;
-            onStart: (trackIndex: number) => any;
-            onEnd: (trackIndex: number) => any;
-            private static deprecatedWarning1;
-            setAnimationByName(trackIndex: number, animationName: string, loop: boolean): void;
-            private static deprecatedWarning2;
-            addAnimationByName(trackIndex: number, animationName: string, loop: boolean, delay: number): void;
-            private static deprecatedWarning3;
-            hasAnimationByName(animationName: string): boolean;
-        }
-        class TrackEntry {
-            animation: Animation;
-            next: TrackEntry;
-            mixingFrom: TrackEntry;
-            listener: AnimationStateListener2;
-            trackIndex: number;
-            loop: boolean;
-            eventThreshold: number;
-            attachmentThreshold: number;
-            drawOrderThreshold: number;
-            animationStart: number;
-            animationEnd: number;
-            animationLast: number;
-            nextAnimationLast: number;
-            delay: number;
-            trackTime: number;
-            trackLast: number;
-            nextTrackLast: number;
-            trackEnd: number;
-            timeScale: number;
-            alpha: number;
-            mixTime: number;
-            mixDuration: number;
-            mixAlpha: number;
-            timelinesFirst: boolean[];
-            timelinesRotation: number[];
-            reset(): void;
-            getAnimationTime(): number;
-            setAnimationLast(animationLast: number): void;
-            isComplete(): boolean;
-            resetRotationDirections(): void;
-            onComplete: (trackIndex: number, loopCount: number) => any;
-            onEvent: (trackIndex: number, event: Event) => any;
-            onStart: (trackIndex: number) => any;
-            onEnd: (trackIndex: number) => any;
-            private static deprecatedWarning1;
-            private static deprecatedWarning2;
-            time: number;
-            endTime: number;
-            loopsCount(): number;
-        }
-        class EventQueue {
-            objects: any[];
-            drainDisabled: boolean;
-            animState: AnimationState;
-            constructor(animState: AnimationState);
-            start(entry: TrackEntry): void;
-            interrupt(entry: TrackEntry): void;
-            end(entry: TrackEntry): void;
-            dispose(entry: TrackEntry): void;
-            complete(entry: TrackEntry): void;
-            event(entry: TrackEntry, event: Event): void;
-            private static deprecatedWarning1;
-            deprecateStuff(): boolean;
-            drain(): void;
-            clear(): void;
-        }
-        enum EventType {
-            start = 0,
-            interrupt = 1,
-            end = 2,
-            dispose = 3,
-            complete = 4,
-            event = 5,
-        }
-        interface AnimationStateListener2 {
-            start(entry: TrackEntry): void;
-            interrupt(entry: TrackEntry): void;
-            end(entry: TrackEntry): void;
-            dispose(entry: TrackEntry): void;
-            complete(entry: TrackEntry): void;
-            event(entry: TrackEntry, event: Event): void;
-        }
-        abstract class AnimationStateAdapter2 implements AnimationStateListener2 {
-            start(entry: TrackEntry): void;
-            interrupt(entry: TrackEntry): void;
-            end(entry: TrackEntry): void;
-            dispose(entry: TrackEntry): void;
-            complete(entry: TrackEntry): void;
-            event(entry: TrackEntry, event: Event): void;
-        }
-    }
-    namespace spine.core {
-        class AnimationStateData {
-            skeletonData: SkeletonData;
-            animationToMixTime: Map<number>;
-            defaultMix: number;
-            constructor(skeletonData: SkeletonData);
-            setMix(fromName: string, toName: string, duration: number): void;
-            private static deprecatedWarning1;
-            setMixByName(fromName: string, toName: string, duration: number): void;
-            setMixWith(from: Animation, to: Animation, duration: number): void;
-            getMix(from: Animation, to: Animation): number;
-        }
-    }
-    namespace spine.core {
-        class AtlasAttachmentLoader implements AttachmentLoader {
-            atlas: TextureAtlas;
-            constructor(atlas: TextureAtlas);
-            newRegionAttachment(skin: Skin, name: string, path: string): RegionAttachment;
-            newMeshAttachment(skin: Skin, name: string, path: string): MeshAttachment;
-            newBoundingBoxAttachment(skin: Skin, name: string): BoundingBoxAttachment;
-            newPathAttachment(skin: Skin, name: string): PathAttachment;
-        }
-    }
-    namespace spine.core {
-        abstract class Attachment {
-            name: string;
-            constructor(name: string);
-        }
-        abstract class VertexAttachment extends Attachment {
-            bones: number[];
-            vertices: ArrayLike<number>;
-            worldVerticesLength: number;
-            constructor(name: string);
-            computeWorldVertices(slot: Slot, worldVertices: ArrayLike<number>): void;
-            computeWorldVerticesWith(slot: Slot, start: number, count: number, worldVertices: ArrayLike<number>, offset: number): void;
-            applyDeform(sourceAttachment: VertexAttachment): boolean;
-        }
-    }
-    namespace spine.core {
-        interface AttachmentLoader {
-            newRegionAttachment(skin: Skin, name: string, path: string): RegionAttachment;
-            newMeshAttachment(skin: Skin, name: string, path: string): MeshAttachment;
-            newBoundingBoxAttachment(skin: Skin, name: string): BoundingBoxAttachment;
-            newPathAttachment(skin: Skin, name: string): PathAttachment;
-        }
-    }
-    namespace spine.core {
-        enum AttachmentType {
-            Region = 0,
-            BoundingBox = 1,
-            Mesh = 2,
-            LinkedMesh = 3,
-            Path = 4,
-        }
-    }
-    namespace spine.core {
-        class BoundingBoxAttachment extends VertexAttachment {
-            color: Color;
-            constructor(name: string);
-        }
-    }
-    namespace spine.core {
-        class MeshAttachment extends VertexAttachment {
-            region: TextureRegion;
-            path: string;
-            regionUVs: ArrayLike<number>;
-            triangles: number[];
-            color: Color;
-            hullLength: number;
-            private parentMesh;
-            inheritDeform: boolean;
-            tempColor: Color;
-            constructor(name: string);
-            updateWorldVertices(slot: Slot, premultipliedAlpha: boolean): ArrayLike<number>;
-            updateUVs(region: TextureRegion, uvs: ArrayLike<number>): ArrayLike<number>;
-            applyDeform(sourceAttachment: VertexAttachment): boolean;
-            getParentMesh(): MeshAttachment;
-            setParentMesh(parentMesh: MeshAttachment): void;
-        }
-    }
-    namespace spine.core {
-        class PathAttachment extends VertexAttachment {
-            lengths: number[];
-            closed: boolean;
-            constantSpeed: boolean;
-            color: Color;
-            constructor(name: string);
-        }
-    }
-    namespace spine.core {
-        class RegionAttachment extends Attachment {
-            x: number;
-            y: number;
-            scaleX: number;
-            scaleY: number;
-            rotation: number;
-            width: number;
-            height: number;
-            color: Color;
-            path: string;
-            region: TextureRegion;
-            constructor(name: string);
-            updateWorldVertices(slot: Slot, premultipliedAlpha: boolean): ArrayLike<number>;
-        }
-    }
-    namespace spine.core {
-        enum BlendMode {
-            Normal = 0,
-            Additive = 1,
-            Multiply = 2,
-            Screen = 3,
-        }
-    }
-    namespace spine.core {
-        class Bone implements Updatable {
-            static yDown: boolean;
-            matrix: Matrix;
-            readonly worldX: number;
-            readonly worldY: number;
-            data: BoneData;
-            skeleton: Skeleton;
-            parent: Bone;
-            children: Bone[];
-            x: number;
-            y: number;
-            rotation: number;
-            scaleX: number;
-            scaleY: number;
-            shearX: number;
-            shearY: number;
-            ax: number;
-            ay: number;
-            arotation: number;
-            ascaleX: number;
-            ascaleY: number;
-            ashearX: number;
-            ashearY: number;
-            appliedValid: boolean;
-            sorted: boolean;
-            constructor(data: BoneData, skeleton: Skeleton, parent: Bone);
-            update(): void;
-            updateWorldTransform(): void;
-            updateWorldTransformWith(x: number, y: number, rotation: number, scaleX: number, scaleY: number, shearX: number, shearY: number): void;
-            setToSetupPose(): void;
-            getWorldRotationX(): number;
-            getWorldRotationY(): number;
-            getWorldScaleX(): number;
-            getWorldScaleY(): number;
-            worldToLocalRotationX(): number;
-            worldToLocalRotationY(): number;
-            rotateWorld(degrees: number): void;
-            updateAppliedTransform(): void;
-            worldToLocal(world: Vector2): Vector2;
-            localToWorld(local: Vector2): Vector2;
-        }
-    }
-    namespace spine.core {
-        class BoneData {
-            index: number;
-            name: string;
-            parent: BoneData;
-            length: number;
-            x: number;
-            y: number;
-            rotation: number;
-            scaleX: number;
-            scaleY: number;
-            shearX: number;
-            shearY: number;
-            transformMode: TransformMode;
-            constructor(index: number, name: string, parent: BoneData);
-        }
-        enum TransformMode {
-            Normal = 0,
-            OnlyTranslation = 1,
-            NoRotationOrReflection = 2,
-            NoScale = 3,
-            NoScaleOrReflection = 4,
-        }
-    }
-    namespace spine.core {
-        interface Constraint extends Updatable {
-            getOrder(): number;
-        }
-    }
-    namespace spine.core {
-        class Event {
-            data: EventData;
-            intValue: number;
-            floatValue: number;
-            stringValue: string;
-            time: number;
-            constructor(time: number, data: EventData);
-        }
-    }
-    namespace spine.core {
-        class EventData {
-            name: string;
-            intValue: number;
-            floatValue: number;
-            stringValue: string;
-            constructor(name: string);
-        }
-    }
-    namespace spine.core {
-        class IkConstraint implements Constraint {
-            data: IkConstraintData;
-            bones: Bone[];
-            target: Bone;
-            mix: number;
-            bendDirection: number;
-            level: number;
-            constructor(data: IkConstraintData, skeleton: Skeleton);
-            getOrder(): number;
-            apply(): void;
-            update(): void;
-            apply1(bone: Bone, targetX: number, targetY: number, alpha: number): void;
-            apply2(parent: Bone, child: Bone, targetX: number, targetY: number, bendDir: number, alpha: number): void;
-        }
-    }
-    namespace spine.core {
-        class IkConstraintData {
-            name: string;
-            order: number;
-            bones: BoneData[];
-            target: BoneData;
-            bendDirection: number;
-            mix: number;
-            constructor(name: string);
-        }
-    }
-    namespace spine.core {
-        class PathConstraint implements Constraint {
-            static NONE: number;
-            static BEFORE: number;
-            static AFTER: number;
-            data: PathConstraintData;
-            bones: Bone[];
-            target: Slot;
-            position: number;
-            spacing: number;
-            rotateMix: number;
-            translateMix: number;
-            spaces: number[];
-            positions: number[];
-            world: number[];
-            curves: number[];
-            lengths: number[];
-            segments: number[];
-            constructor(data: PathConstraintData, skeleton: Skeleton);
-            apply(): void;
-            update(): void;
-            computeWorldPositions(path: PathAttachment, spacesCount: number, tangents: boolean, percentPosition: boolean, percentSpacing: boolean): number[];
-            addBeforePosition(p: number, temp: number[], i: number, out: number[], o: number): void;
-            addAfterPosition(p: number, temp: number[], i: number, out: number[], o: number): void;
-            addCurvePosition(p: number, x1: number, y1: number, cx1: number, cy1: number, cx2: number, cy2: number, x2: number, y2: number, out: number[], o: number, tangents: boolean): void;
-            getOrder(): number;
-        }
-    }
-    namespace spine.core {
-        class PathConstraintData {
-            name: string;
-            order: number;
-            bones: BoneData[];
-            target: SlotData;
-            positionMode: PositionMode;
-            spacingMode: SpacingMode;
-            rotateMode: RotateMode;
-            offsetRotation: number;
-            position: number;
-            spacing: number;
-            rotateMix: number;
-            translateMix: number;
-            constructor(name: string);
-        }
-        enum PositionMode {
-            Fixed = 0,
-            Percent = 1,
-        }
-        enum SpacingMode {
-            Length = 0,
-            Fixed = 1,
-            Percent = 2,
-        }
-        enum RotateMode {
-            Tangent = 0,
-            Chain = 1,
-            ChainScale = 2,
-        }
-    }
-    namespace spine.core {
-        class Skeleton {
-            data: SkeletonData;
-            bones: Bone[];
-            slots: Slot[];
-            drawOrder: Slot[];
-            ikConstraints: IkConstraint[];
-            transformConstraints: TransformConstraint[];
-            pathConstraints: PathConstraint[];
-            _updateCache: Updatable[];
-            updateCacheReset: Updatable[];
-            skin: Skin;
-            color: Color;
-            time: number;
-            flipX: boolean;
-            flipY: boolean;
-            x: number;
-            y: number;
-            constructor(data: SkeletonData);
-            updateCache(): void;
-            sortIkConstraint(constraint: IkConstraint): void;
-            sortPathConstraint(constraint: PathConstraint): void;
-            sortTransformConstraint(constraint: TransformConstraint): void;
-            sortPathConstraintAttachment(skin: Skin, slotIndex: number, slotBone: Bone): void;
-            sortPathConstraintAttachmentWith(attachment: Attachment, slotBone: Bone): void;
-            sortBone(bone: Bone): void;
-            sortReset(bones: Bone[]): void;
-            updateWorldTransform(): void;
-            setToSetupPose(): void;
-            setBonesToSetupPose(): void;
-            setSlotsToSetupPose(): void;
-            getRootBone(): Bone;
-            findBone(boneName: string): Bone;
-            findBoneIndex(boneName: string): number;
-            findSlot(slotName: string): Slot;
-            findSlotIndex(slotName: string): number;
-            setSkinByName(skinName: string): void;
-            setSkin(newSkin: Skin): void;
-            getAttachmentByName(slotName: string, attachmentName: string): Attachment;
-            getAttachment(slotIndex: number, attachmentName: string): Attachment;
-            setAttachment(slotName: string, attachmentName: string): void;
-            findIkConstraint(constraintName: string): IkConstraint;
-            findTransformConstraint(constraintName: string): TransformConstraint;
-            findPathConstraint(constraintName: string): PathConstraint;
-            getBounds(offset: Vector2, size: Vector2): void;
-            update(delta: number): void;
-        }
-    }
-    namespace spine.core {
-        class SkeletonBounds {
-            minX: number;
-            minY: number;
-            maxX: number;
-            maxY: number;
-            boundingBoxes: BoundingBoxAttachment[];
-            polygons: Array<ArrayLike<number>>;
-            private polygonPool;
-            update(skeleton: Skeleton, updateAabb: boolean): void;
-            aabbCompute(): void;
-            aabbContainsPoint(x: number, y: number): boolean;
-            aabbIntersectsSegment(x1: number, y1: number, x2: number, y2: number): boolean;
-            aabbIntersectsSkeleton(bounds: SkeletonBounds): boolean;
-            containsPoint(x: number, y: number): BoundingBoxAttachment;
-            containsPointPolygon(polygon: ArrayLike<number>, x: number, y: number): boolean;
-            intersectsSegment(x1: number, y1: number, x2: number, y2: number): BoundingBoxAttachment;
-            intersectsSegmentPolygon(polygon: ArrayLike<number>, x1: number, y1: number, x2: number, y2: number): boolean;
-            getPolygon(boundingBox: BoundingBoxAttachment): ArrayLike<number>;
-            getWidth(): number;
-            getHeight(): number;
-        }
-    }
-    namespace spine.core {
-        class SkeletonData {
-            name: string;
-            bones: BoneData[];
-            slots: SlotData[];
-            skins: Skin[];
-            defaultSkin: Skin;
-            events: EventData[];
-            animations: Animation[];
-            ikConstraints: IkConstraintData[];
-            transformConstraints: TransformConstraintData[];
-            pathConstraints: PathConstraintData[];
-            width: number;
-            height: number;
-            version: string;
-            hash: string;
-            fps: number;
-            imagesPath: string;
-            findBone(boneName: string): BoneData;
-            findBoneIndex(boneName: string): number;
-            findSlot(slotName: string): SlotData;
-            findSlotIndex(slotName: string): number;
-            findSkin(skinName: string): Skin;
-            findEvent(eventDataName: string): EventData;
-            findAnimation(animationName: string): Animation;
-            findIkConstraint(constraintName: string): IkConstraintData;
-            findTransformConstraint(constraintName: string): TransformConstraintData;
-            findPathConstraint(constraintName: string): PathConstraintData;
-            findPathConstraintIndex(pathConstraintName: string): number;
-        }
-    }
-    namespace spine.core {
-        class SkeletonJson {
-            attachmentLoader: AttachmentLoader;
-            scale: number;
-            private linkedMeshes;
-            constructor(attachmentLoader: AttachmentLoader);
-            readSkeletonData(json: string | any): SkeletonData;
-            readAttachment(map: any, skin: Skin, slotIndex: number, name: string): Attachment;
-            readVertices(map: any, attachment: VertexAttachment, verticesLength: number): void;
-            readAnimation(map: any, name: string, skeletonData: SkeletonData): void;
-            readCurve(map: any, timeline: CurveTimeline, frameIndex: number): void;
-            getValue(map: any, prop: string, defaultValue: any): any;
-            static blendModeFromString(str: string): number;
-            static positionModeFromString(str: string): PositionMode;
-            static spacingModeFromString(str: string): SpacingMode;
-            static rotateModeFromString(str: string): RotateMode;
-            static transformModeFromString(str: string): TransformMode;
-            static transformModeLegacy(inheritRotation: boolean, inheritScale: boolean): TransformMode;
-        }
-    }
-    namespace spine.core {
-        class Skin {
-            name: string;
-            attachments: Array<Map<Attachment>>;
-            constructor(name: string);
-            addAttachment(slotIndex: number, name: string, attachment: Attachment): void;
-            getAttachment(slotIndex: number, name: string): Attachment;
-            attachAll(skeleton: Skeleton, oldSkin: Skin): void;
-        }
-    }
-    namespace spine.core {
-        class Slot {
-            currentMesh: any;
-            currentSprite: any;
-            meshes: any;
-            currentMeshName: string;
-            sprites: any;
-            currentSpriteName: string;
-            blendMode: number;
-            tempRegion: TextureRegion;
-            tempAttachment: Attachment;
-            data: SlotData;
-            bone: Bone;
-            color: Color;
-            attachment: Attachment;
-            private attachmentTime;
-            attachmentVertices: number[];
-            constructor(data: SlotData, bone: Bone);
-            getAttachment(): Attachment;
-            setAttachment(attachment: Attachment): void;
-            setAttachmentTime(time: number): void;
-            getAttachmentTime(): number;
-            setToSetupPose(): void;
-        }
-    }
-    namespace spine.core {
-        class SlotData {
-            index: number;
-            name: string;
-            boneData: BoneData;
-            color: Color;
-            attachmentName: string;
-            blendMode: number;
-            constructor(index: number, name: string, boneData: BoneData);
-        }
-    }
-    namespace spine.core {
-        abstract class Texture {
-            protected _image: HTMLImageElement;
-            constructor(image: HTMLImageElement);
-            getImage(): HTMLImageElement;
-            abstract setFilters(minFilter: TextureFilter, magFilter: TextureFilter): void;
-            abstract setWraps(uWrap: TextureWrap, vWrap: TextureWrap): void;
-            abstract dispose(): void;
-            static filterFromString(text: string): TextureFilter;
-            static wrapFromString(text: string): TextureWrap;
-        }
-        enum TextureFilter {
-            Nearest = 9728,
-            Linear = 9729,
-            MipMap = 9987,
-            MipMapNearestNearest = 9984,
-            MipMapLinearNearest = 9985,
-            MipMapNearestLinear = 9986,
-            MipMapLinearLinear = 9987,
-        }
-        enum TextureWrap {
-            MirroredRepeat = 33648,
-            ClampToEdge = 33071,
-            Repeat = 10497,
-        }
-        class TextureRegion {
-            texture: Texture;
-            size: Rectangle;
-            readonly width: number;
-            readonly height: number;
-            readonly u: number;
-            readonly v: number;
-            readonly u2: number;
-            readonly v2: number;
-            readonly offsetX: number;
-            readonly offsetY: number;
-            readonly pixiOffsetY: number;
-            readonly spineOffsetY: number;
-            readonly originalWidth: number;
-            readonly originalHeight: number;
-            readonly x: number;
-            readonly y: number;
-            readonly rotate: boolean;
-        }
-    }
-    namespace spine.core {
-        class TextureAtlas implements Disposable {
-            pages: TextureAtlasPage[];
-            regions: TextureAtlasRegion[];
-            constructor(atlasText: string, textureLoader: (path: string, loaderFunction: (tex: BaseTexture) => any) => any, callback: (obj: TextureAtlas) => any);
-            addTexture(name: string, texture: Texture): TextureAtlasRegion;
-            addTextureHash(textures: Map<Texture>, stripExtension: boolean): void;
-            addSpineAtlas(atlasText: string, textureLoader: (path: string, loaderFunction: (tex: BaseTexture) => any) => any, callback: (obj: TextureAtlas) => any): void;
-            private load(atlasText, textureLoader, callback);
-            findRegion(name: string): TextureAtlasRegion;
-            dispose(): void;
-        }
-        class TextureAtlasPage {
-            name: string;
-            minFilter: TextureFilter;
-            magFilter: TextureFilter;
-            uWrap: TextureWrap;
-            vWrap: TextureWrap;
-            baseTexture: BaseTexture;
-            width: number;
-            height: number;
-            setFilters(): void;
-        }
-        class TextureAtlasRegion extends TextureRegion {
-            page: TextureAtlasPage;
-            name: string;
-            index: number;
-        }
-    }
-    namespace spine.core {
-        class TransformConstraint implements Constraint {
-            data: TransformConstraintData;
-            bones: Bone[];
-            target: Bone;
-            rotateMix: number;
-            translateMix: number;
-            scaleMix: number;
-            shearMix: number;
-            temp: Vector2;
-            constructor(data: TransformConstraintData, skeleton: Skeleton);
-            apply(): void;
-            update(): void;
-            getOrder(): number;
-        }
-    }
-    namespace spine.core {
-        class TransformConstraintData {
-            name: string;
-            order: number;
-            bones: BoneData[];
-            target: BoneData;
-            rotateMix: number;
-            translateMix: number;
-            scaleMix: number;
-            shearMix: number;
-            offsetRotation: number;
-            offsetX: number;
-            offsetY: number;
-            offsetScaleX: number;
-            offsetScaleY: number;
-            offsetShearY: number;
-            constructor(name: string);
-        }
-    }
-    namespace spine.core {
-        interface Updatable {
-            update(): void;
-        }
-    }
-    namespace spine.core {
-        interface Map<T> {
-            [key: string]: T;
-        }
-        class IntSet {
-            array: number[];
-            add(value: number): boolean;
-            contains(value: number): boolean;
-            remove(value: number): void;
-            clear(): void;
-        }
-        interface Disposable {
-            dispose(): void;
-        }
-        class Color {
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-            static WHITE: Color;
-            static RED: Color;
-            static GREEN: Color;
-            static BLUE: Color;
-            static MAGENTA: Color;
-            constructor(r?: number, g?: number, b?: number, a?: number);
-            set(r: number, g: number, b: number, a: number): this;
-            setFromColor(c: Color): this;
-            setFromString(hex: string): this;
-            add(r: number, g: number, b: number, a: number): this;
-            clamp(): this;
-        }
-        class MathUtils {
-            static PI: number;
-            static PI2: number;
-            static radiansToDegrees: number;
-            static radDeg: number;
-            static degreesToRadians: number;
-            static degRad: number;
-            static clamp(value: number, min: number, max: number): number;
-            static cosDeg(degrees: number): number;
-            static sinDeg(degrees: number): number;
-            static signum(value: number): number;
-            static toInt(x: number): number;
-            static cbrt(x: number): number;
-        }
-        class Utils {
-            static SUPPORTS_TYPED_ARRAYS: boolean;
-            static arrayCopy<T>(source: ArrayLike<T>, sourceStart: number, dest: ArrayLike<T>, destStart: number, numElements: number): void;
-            static setArraySize<T>(array: T[], size: number, value?: any): T[];
-            static ensureArrayCapacity<T>(array: T[], size: number, value?: any): T[];
-            static newArray<T>(size: number, defaultValue: T): T[];
-            static newFloatArray(size: number): ArrayLike<number>;
-            static toFloatArray(array: number[]): number[] | Float32Array;
-        }
-        class DebugUtils {
-            static logBones(skeleton: Skeleton): void;
-        }
-        class Pool<T> {
-            private items;
-            private instantiator;
-            constructor(instantiator: () => T);
-            obtain(): T;
-            free(item: T): void;
-            freeAll(items: ArrayLike<T>): void;
-            clear(): void;
-        }
-        class Vector2 {
-            x: number;
-            y: number;
-            constructor(x?: number, y?: number);
-            set(x: number, y: number): Vector2;
-            length(): number;
-            normalize(): this;
-        }
-        class TimeKeeper {
-            maxDelta: number;
-            framesPerSecond: number;
-            delta: number;
-            totalTime: number;
-            private lastTime;
-            private frameCount;
-            private frameTime;
-            update(): void;
-        }
-        interface ArrayLike<T> {
-            length: number;
-            [n: number]: T;
-        }
-    }
-    namespace spine {
-        function atlasParser(): (resource: loaders.Resource, next: () => any) => any;
-        function imageLoaderAdapter(loader: any, namePrefix: any, baseUrl: any, imageOptions: any): (line: string, callback: (baseTexture: BaseTexture) => any) => void;
-        function syncImageLoaderAdapter(baseUrl: any, crossOrigin: any): (line: any, callback: any) => void;
-    }
-    namespace spine {
-        class SpineSprite extends Sprite {
-            region: core.TextureRegion;
-            constructor(tex: Texture);
-        }
-        class SpineMesh extends mesh.Mesh {
-            region: core.TextureRegion;
-            constructor(texture: Texture, vertices?: Float32Array, uvs?: Float32Array, indices?: Uint16Array, drawMode?: number);
-        }
-        class Spine extends Container {
-            static globalAutoUpdate: boolean;
-            tintRgb: ArrayLike<number>;
-            spineData: core.SkeletonData;
-            skeleton: core.Skeleton;
-            stateData: core.AnimationStateData;
-            state: core.AnimationState;
-            slotContainers: Container[];
-            constructor(spineData: core.SkeletonData);
-            autoUpdate: boolean;
-            tint: number;
-            update(dt: number): void;
-            private setSpriteRegion(attachment, sprite, region);
-            private setMeshRegion(attachment, mesh, region);
-            protected lastTime: number;
-            autoUpdateTransform(): void;
-            createSprite(slot: core.Slot, attachment: core.RegionAttachment, defName: string): SpineSprite;
-            createMesh(slot: core.Slot, attachment: core.MeshAttachment): SpineMesh;
-            hackTextureBySlotIndex(slotIndex: number, texture?: Texture, size?: Rectangle): boolean;
-            hackTextureBySlotName: (slotName: string, texture?: Texture, size?: Rectangle) => any;
-        }
-    }
-}
diff --git a/pixi-spine/pixi-spine-tests.ts b/pixi-spine/pixi-spine-tests.ts
deleted file mode 100644
index 51e4c7806f..0000000000
--- a/pixi-spine/pixi-spine-tests.ts
+++ /dev/null
@@ -1,311 +0,0 @@
-import * as PIXI from "pixi.js";
-
-namespace Spine {
-
-    export class Dragon {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private dragon: PIXI.spine.Spine;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            PIXI.loader.add('dragon', '../../_assets/spine/dragon.json').load(this.onAssetsLoaded);
-
-        }
-
-        private onAssetsLoaded = (loader: PIXI.loaders.Loader, res: any): void => {
-
-            // initiate the spine animation
-            this.dragon = new PIXI.spine.Spine(res.dragon.spineData);
-            this.dragon.skeleton.setToSetupPose();
-            this.dragon.update(0);
-            this.dragon.autoUpdate = false;
-
-            // create a container for the spin animation and add the animation to it
-            var dragonCage: PIXI.Container = new PIXI.Container();
-            dragonCage.addChild(this.dragon);
-
-            // measure the spine animation and position it inside its container to align it to the origin
-            var localRect: PIXI.Rectangle = this.dragon.getLocalBounds();
-            this.dragon.position.set(-localRect.x, -localRect.y);
-
-            // now we can scale, position and rotate the container as any other display object
-            var scale = Math.min((this.renderer.width * 0.7) / dragonCage.width, (this.renderer.height * 0.7) / dragonCage.height);
-            dragonCage.scale.set(scale, scale);
-            dragonCage.position.set((this.renderer.width - dragonCage.width) * 0.5, (this.renderer.height - dragonCage.height) * 0.5);
-
-            // add the container to the stage
-            this.stage.addChild(dragonCage);
-
-            // once position and scaled, set the animation to play
-            this.dragon.state.setAnimation(0, 'flying', true);
-
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            // update the spine animation, only needed if dragon.autoupdate is set to false
-            this.dragon.update(0.01666666666667); // HARDCODED FRAMERATE!
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-}
-
-namespace Spine {
-
-    export class Goblin {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private goblin: PIXI.spine.Spine;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-            this.stage.interactive = true;
-
-            PIXI.loader.add('goblins', '../../_assets/spine/goblins.json').load(this.onAssetsLoaded);
-
-        }
-
-        private onAssetsLoaded = (loader: PIXI.loaders.Loader, res: any): void => {
-
-            // initiate the spine animation
-            this.goblin = new PIXI.spine.Spine(res.goblins.spineData);
-            this.goblin.skeleton.setSkinByName('goblin');
-            this.goblin.skeleton.setSlotsToSetupPose();
-
-            this.goblin.position.x = 400;
-            this.goblin.position.y = 600;
-            this.goblin.scale.set(1.5);
-
-            this.goblin.state.setAnimationByName(0, 'walk', true);
-
-            this.stage.addChild(this.goblin);
-
-            this.stage.on('click', () => {
-
-                // change current skin
-                var currentSkinName = this.goblin.skeleton.skin.name;
-                var newSkinName = (currentSkinName === 'goblin' ? 'goblingirl' : 'goblin');
-                this.goblin.skeleton.setSkinByName(newSkinName);
-                this.goblin.skeleton.setSlotsToSetupPose();
-
-            });
-
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-}
-
-namespace Spine {
-
-    export class Pixie {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private pixie: PIXI.spine.Spine;
-
-        private position: number;
-        private background: PIXI.Sprite;
-        private background2: PIXI.Sprite;
-        private foreground: PIXI.Sprite;
-        private foreground2: PIXI.Sprite;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-            this.stage.interactive = true;
-
-            PIXI.loader.add('pixie', '../../_assets/spine/pixie.json').load(this.onAssetsLoaded);
-
-        }
-
-        private onAssetsLoaded = (loader: PIXI.loaders.Loader, res: any): void => {
-
-            this.background = PIXI.Sprite.fromImage('../../_assets/spine/iP4_BGtile.jpg');
-            this.background2 = PIXI.Sprite.fromImage('../../_assets/spine/iP4_BGtile.jpg');
-            this.stage.addChild(this.background);
-            this.stage.addChild(this.background2);
-
-            this.foreground = PIXI.Sprite.fromImage('../../_assets/spine/iP4_ground.png');
-            this.foreground2 = PIXI.Sprite.fromImage('../../_assets/spine/iP4_ground.png');
-            this.stage.addChild(this.foreground);
-            this.stage.addChild(this.foreground2);
-            this.foreground.position.y = this.foreground2.position.y = 640 - this.foreground2.height;
-
-            this.pixie = new PIXI.spine.Spine(res.pixie.spineData);
-
-            var scale = 0.3;
-
-            this.pixie.position.x = 1024 / 3;
-            this.pixie.position.y = 500;
-
-            this.pixie.scale.x = this.pixie.scale.y = scale;
-
-            this.stage.addChild(this.pixie);
-
-            this.pixie.stateData.setMix('running', 'jump', 0.2);
-            this.pixie.stateData.setMix('jump', 'running', 0.4);
-
-            this.pixie.state.setAnimation(0, 'running', true);
-
-            this.stage.on('mousedown', this.onTouchStart);
-            this.stage.on('touchstart', this.onTouchStart);
-
-            this.animate();
-
-        }
-
-        private onTouchStart = (): void => {
-
-            this.pixie.state.setAnimation(0, 'jump', false);
-            this.pixie.state.addAnimation(0, 'running', true, 0);
-
-        }
-
-        private animate = (): void => {
-
-            this.position += 10;
-
-            this.background.position.x = -(this.position * 0.6);
-            this.background.position.x %= 1286 * 2;
-            if (this.background.position.x < 0) {
-                this.background.position.x += 1286 * 2;
-            }
-            this.background.position.x -= 1286;
-
-            this.background2.position.x = -(this.position * 0.6) + 1286;
-            this.background2.position.x %= 1286 * 2;
-            if (this.background2.position.x < 0) {
-                this.background2.position.x += 1286 * 2;
-            }
-            this.background2.position.x -= 1286;
-
-            this.foreground.position.x = -this.position;
-            this.foreground.position.x %= 1286 * 2;
-            if (this.foreground.position.x < 0) {
-                this.foreground.position.x += 1286 * 2;
-            }
-            this.foreground.position.x -= 1286;
-
-            this.foreground2.position.x = -this.position + 1286;
-            this.foreground2.position.x %= 1286 * 2;
-            if (this.foreground2.position.x < 0) {
-                this.foreground2.position.x += 1286 * 2;
-            }
-            this.foreground2.position.x -= 1286;
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-    namespace Spine {
-
-        export class SpineBoy {
-
-            private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-            private stage: PIXI.Container;
-
-            private spineboy: PIXI.spine.Spine;
-
-            constructor() {
-
-                this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-                document.body.appendChild(this.renderer.view);
-
-                // create the root of the scene graph
-                this.stage = new PIXI.Container();
-                this.stage.interactive = true;
-
-                PIXI.loader.add('spineboy', '../../_assets/spine/spineboy.json').load(this.onAssetsLoaded);
-
-            }
-
-            private onAssetsLoaded = (loader: PIXI.loaders.Loader, res: any): void => {
-
-                // initiate the spine animation
-                this.spineboy = new PIXI.spine.Spine(res.spineboy.spineData);
-                this.spineboy.position.x = this.renderer.width / 2;
-                this.spineboy.position.y = this.renderer.height;
-                this.spineboy.scale.set(1.5);
-
-                // set up the mixes!
-                this.spineboy.stateData.setMix('walk', 'jump', 0.2);
-                this.spineboy.stateData.setMix('jump', 'walk', 0.4);
-
-                // play animation
-                this.spineboy.state.setAnimation(0, 'walk', true);
-
-                this.stage.addChild(this.spineboy);
-
-
-                this.stage.on('click', () => {
-
-                    this.spineboy.state.setAnimation(0, 'jump', false);
-                    this.spineboy.state.addAnimation(0, 'walk', true, 0);
-
-                });
-
-                this.animate();
-
-            }
-
-            private animate = (): void => {
-
-                requestAnimationFrame(this.animate);
-
-                this.renderer.render(this.stage);
-
-            }
-
-        }
-
-    }
-
-}
diff --git a/pixi-spine/tslint.json b/pixi-spine/tslint.json
deleted file mode 100644
index c21d1d3fb1..0000000000
--- a/pixi-spine/tslint.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "extends": "../tslint.json",
-    "rules": {}
-}
diff --git a/pixi.js/index.d.ts b/pixi.js/index.d.ts
index bacdfd23aa..cccbc1fbd9 100644
--- a/pixi.js/index.d.ts
+++ b/pixi.js/index.d.ts
@@ -1,2891 +1,3122 @@
-// Type definitions for Pixi.js 4.3
-// Project: https://github.com/pixijs/pixi.js/
-// Definitions by: Clark Stevenson <https://github.com/clark-stevenson>
+// Type definitions for Pixi.js 4.4
+// Project: https://github.com/pixijs/pixi.js/tree/dev
+// Definitions by: clark-stevenson <https://github.com/pixijs/pixi-typescript>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+declare namespace PIXI {
+
+    // from CONST
+    export const VERSION: typeof CONST.VERSION;
+    export const PI_2: typeof CONST.PI_2;
+    export const RAD_TO_DEG: typeof CONST.RAD_TO_DEG;
+    export const DEG_TO_RAD: typeof CONST.DEG_TO_RAD;
+    export const RENDERER_TYPE: typeof CONST.RENDERER_TYPE;
+    export const BLEND_MODES: typeof CONST.BLEND_MODES;
+    export const DRAW_MODES: typeof CONST.DRAW_MODES;
+    export const SCALE_MODES: typeof CONST.SCALE_MODES;
+    export const WRAP_MODES: typeof CONST.WRAP_MODES;
+    export const TRANSFORM_MODE: typeof CONST.TRANSFORM_MODE;
+    export const PRECISION: typeof CONST.PRECISION;
+    export const GC_MODES: typeof CONST.GC_MODES;
+    export const SHAPES: typeof CONST.SHAPES;
+    export const TEXT_GRADIENT: typeof CONST.TEXT_GRADIENT;
+
+    export function autoDetectRenderer(width: number, height: number, options?: PIXI.IRendererOptions, noWebGL?: boolean): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
+    export const loader: PIXI.loaders.Loader;
+
+    //////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////SETTINGS///////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export namespace settings {
+        export let TARGET_FPMS: number;
+        export let MIPMAP_TEXTURES: boolean;
+        export let RESOLUTION: number;
+        export let FILTER_RESOLUTION: number;
+        export let SPRITE_MAX_TEXTURES: number;
+        export let SPRITE_BATCH_SIZE: number;
+        export let RETINA_PREFIX: RegExp;
+        export const RENDER_OPTIONS: {
+            view: HTMLCanvasElement | null,
+            antialias: boolean,
+            forceFXAA: boolean,
+            autoResize: boolean,
+            transparent: boolean,
+            backgroundColor: number,
+            clearBeforeRender: boolean,
+            preserveDrawingBuffer: boolean,
+            roundPixels: boolean
+        };
+        export let TRANSFORM_MODE: number;
+        export let GC_MODE: number;
+        export let GC_MAX_IDLE: number;
+        export let GC_MAX_CHECK_COUNT: number;
+        export let WRAP_MODE: number;
+        export let SCALE_MODE: number;
+        export let PRECISION: string;
+        export let UPLOADS_PER_FRAME: number;
+        export let CAN_UPLOAD_SAME_BUFFER: boolean;
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////ACCESSIBILITY////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export namespace accessibility {
+
+        // accessibility
+        export class AccessibilityManager {
+
+            constructor(renderer: CanvasRenderer | WebGLRenderer);
+
+            protected div: HTMLElement;
+            protected pool: HTMLElement[];
+            protected renderId: number;
+            debug: boolean;
+            renderer: SystemRenderer;
+            protected children: IAccessibleTarget[];
+            protected isActive: boolean;
+
+            protected activate(): void;
+            protected deactivate(): void;
+            protected updateAccessibleObjects(displayObject: DisplayObject): void;
+            protected update(): void;
+            protected capHitArea(hitArea: IHitArea): void;
+            protected addChild(displayObject: DisplayObject): void;
+            protected _onClick(e: interaction.InteractionEvent): void;
+            protected _onFocus(e: interaction.InteractionEvent): void;
+            protected _onFocusOut(e: interaction.InteractionEvent): void;
+            protected _onKeyDown(e: interaction.InteractionEvent): void;
+            protected _onMouseMove(): void;
+
+            destroy(): void;
+
+        }
+        export interface IAccessibleTarget {
+
+            accessible: boolean;
+            accessibleTitle: string | null;
+            accessibleHint: string | null;
+            tabIndex: number;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////CORE//////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    // const
+
+    export namespace CONST {
+        export const VERSION: string;
+        export const PI_2: number;
+        export const RAD_TO_DEG: number;
+        export const DEG_TO_RAD: number;
+        export const TARGET_FPMS: number;
+        export const RENDERER_TYPE: {
+            UNKNOWN: number;
+            WEBGL: number;
+            CANVAS: number;
+        };
+        export const BLEND_MODES: {
+            NORMAL: number;
+            ADD: number;
+            MULTIPLY: number;
+            SCREEN: number;
+            OVERLAY: number;
+            DARKEN: number;
+            LIGHTEN: number;
+            COLOR_DODGE: number;
+            COLOR_BURN: number;
+            HARD_LIGHT: number;
+            SOFT_LIGHT: number;
+            DIFFERENCE: number;
+            EXCLUSION: number;
+            HUE: number;
+            SATURATION: number;
+            COLOR: number;
+            LUMINOSITY: number;
+        };
+        export const DRAW_MODES: {
+            POINTS: number;
+            LINES: number;
+            LINE_LOOP: number;
+            LINE_STRIP: number;
+            TRIANGLES: number;
+            TRIANGLE_STRIP: number;
+            TRIANGLE_FAN: number;
+        };
+        export const SCALE_MODES: {
+            LINEAR: number,
+            NEAREST: number
+        };
+        export const GC_MODES: {
+            AUTO: number;
+            MANUAL: number;
+        };
+        export const WRAP_MODES: {
+            CLAMP: number;
+            MIRRORED_REPEAT: number;
+            REPEAT: number;
+        };
+        export const TRANSFORM_MODE: {
+            DEFAULT: number;
+            DYNAMIC: number;
+            STATIC: number;
+        };
+        export const URL_FILE_EXTENSION: RegExp | string;
+        export const DATA_URI: RegExp | string;
+        export const SVG_SIZE: RegExp | string;
+        export const SHAPES: {
+            POLY: number;
+            RECT: number;
+            CIRC: number;
+            ELIP: number;
+            RREC: number;
+        };
+        export const PRECISION: {
+            LOW: string;
+            MEDIUM: string;
+            HIGH: string;
+        };
+        export const TEXT_GRADIENT: {
+            LINEAR_VERTICAL: number;
+            LINEAR_HORIZONTAL: number;
+        };
+    }
+
+    // display
+
+    export interface IApplicationOptions extends IRendererOptions {
+
+        view?: HTMLCanvasElement;
+        transparent?: boolean;
+        autoResize?: boolean;
+        antialias?: boolean;
+        resolution?: number;
+        clearBeforeRender?: boolean;
+        backgroundColor?: number;
+        roundPixels?: boolean;
+        context?: WebGLRenderingContext;
+        preserveDrawingBuffer?: boolean;
+        legacy?: boolean;
+
+    }
+
+    export class Application {
+
+        constructor(width?: number, height?: number, options?: IApplicationOptions, noWebGL?: boolean, useSharedTicker?: boolean);
+
+        private _ticker: ticker.Ticker;
+
+        renderer: PIXI.WebGLRenderer | PIXI.CanvasRenderer;
+        stage: Container;
+        ticker: ticker.Ticker;
+        readonly screen: Rectangle;
+
+        stop(): void;
+        start(): void;
+        render(): void;
+        destroy(removeView?: boolean): void;
+        readonly view: HTMLCanvasElement;
+
+    }
+
+    export interface IDestroyOptions {
+        children?: boolean;
+        texture?: boolean;
+        baseTexture?: boolean;
+    }
+    export class Bounds {
+
+        minX: number;
+        minY: number;
+        maxX: number;
+        maxY: number;
+        rect: Rectangle;
+
+        isEmpty(): boolean;
+        clear(): void;
+
+        getRectangle(rect?: Rectangle): Rectangle;
+        addPoint(point: Point): void;
+        addQuad(vertices: number[]): Bounds | undefined;
+        addFrame(transform: Transform, x0: number, y0: number, x1: number, y1: number): void;
+        addVertices(transform: Transform, vertices: number[], beginOffset: number, endOffset: number): void;
+        addBounds(bounds: Bounds): void;
+        addBoundsMask(bounds: Bounds, mask: Bounds): void;
+        addBoundsArea(bounds: Bounds, area: Rectangle): void;
+
+    }
+    export class Container extends DisplayObject {
+
+        // begin extras.getChildByName
+        getChildByName(name: string): DisplayObject;
+        // end extras.getChildByName
+
+        children: DisplayObject[];
+        width: number;
+        height: number;
+
+        protected onChildrenChange: (...args: any[]) => void;
+        addChild<T extends DisplayObject>(child: T, ...additionalChildren: DisplayObject[]): T;
+        addChildAt<T extends DisplayObject>(child: T, index: number): T;
+        swapChildren(child: DisplayObject, child2: DisplayObject): void;
+        getChildIndex(child: DisplayObject): number;
+        setChildIndex(child: DisplayObject, index: number): void;
+        getChildAt(index: number): DisplayObject;
+        removeChild(child: DisplayObject): DisplayObject;
+        removeChildAt(index: number): DisplayObject;
+        removeChildren(beginIndex?: number, endIndex?: number): DisplayObject[];
+        updateTransform(): void;
+        calculateBounds(): void;
+        protected _calculateBounds(): void;
+        protected containerUpdateTransform(): void;
+        renderWebGL(renderer: WebGLRenderer): void;
+        renderAdvancedWebGL(renderer: WebGLRenderer): void;
+        protected _renderWebGL(renderer: WebGLRenderer): void;
+        protected _renderCanvas(renderer: CanvasRenderer): void;
+        renderCanvas(renderer: CanvasRenderer): void;
+        destroy(options?: IDestroyOptions | boolean): void;
+
+        once(event: "added", fn: (displayObject: DisplayObject) => void, context?: any): this;
+        once(event: "removed", fn: (DisplayObject: DisplayObject) => void, context?: any): this;
+        once(event: string, fn: Function, context?: any): this;
+        on(event: "added", fn: (displayObject: DisplayObject) => void, context?: any): this;
+        on(event: "removed", fn: (DisplayObject: DisplayObject) => void, context?: any): this;
+        on(event: string, fn: Function, context?: any): this;
+        off(event: string, fn: Function, context?: any): this;
+
+    }
+    export class DisplayObject extends utils.EventEmitter implements interaction.InteractiveTarget, accessibility.IAccessibleTarget {
+
+        // begin extras.cacheAsBitmap
+        protected _cacheAsBitmap: boolean;
+        protected _cacheData: boolean;
+        cacheAsBitmap: boolean;
+        protected _renderCachedWebGL(renderer: WebGLRenderer): void;
+        protected _initCachedDisplayObject(renderer: WebGLRenderer): void;
+        protected _renderCachedCanvas(renderer: CanvasRenderer): void;
+        protected _initCachedDisplayObjectCanvas(renderer: CanvasRenderer): void;
+        protected _calculateCachedBounds(): Rectangle;
+        protected _getCachedLocalBounds(): Rectangle;
+        protected _destroyCachedDisplayObject(): void;
+        protected _cacheAsBitmapDestroy(): void;
+        // end extras.cacheAsBitmap
+
+        // begin extras.getChildByName
+        name: string | null;
+        // end extras.getChildByName
+
+        // begin extras.getGlobalPosition
+        getGlobalPosition(point?: Point, skipUpdate?: boolean): Point;
+        // end extras.getGlobalPosition
+
+        // begin accessible target
+        accessible: boolean;
+        accessibleTitle: string | null;
+        accessibleHint: string | null;
+        tabIndex: number;
+        // end accessible target
+
+        // begin interactive target
+        interactive: boolean;
+        interactiveChildren: boolean;
+        hitArea: PIXI.Rectangle | PIXI.Circle | PIXI.Ellipse | PIXI.Polygon | PIXI.RoundedRectangle;
+        buttonMode: boolean;
+        cursor: string;
+        trackedPointers(): { [key: number]: interaction.InteractionTrackingData; };
+        // depricated
+        defaultCursor: string;
+        // end interactive target
+
+        transform: TransformBase;
+        alpha: number;
+        visible: boolean;
+        renderable: boolean;
+        parent: Container;
+        worldAlpha: number;
+        filterArea: Rectangle;
+        protected _filters: Filter[] | null;
+        protected _enabledFilters: Filter[] | null;
+        protected _bounds: Bounds;
+        protected _boundsID: number;
+        protected _lastBoundsID: number;
+        protected _boundsRect: Rectangle;
+        protected _localBoundsRect: Rectangle;
+        protected _mask: PIXI.Graphics | PIXI.Sprite;
+        x: number;
+        y: number;
+        worldTransform: Matrix;
+        localTransform: Matrix;
+        position: Point;
+        scale: Point;
+        pivot: Point;
+        skew: Point;
+        rotation: number;
+        worldVisible: boolean;
+        mask: PIXI.Graphics | PIXI.Sprite;
+        filters: Filter[] | null;
+
+        updateTransform(): void;
+        protected displayObjectUpdateTransform(): void;
+        protected _recursivePostUpdateTransform(): void;
+        getBounds(skipUpdate?: boolean, rect?: Rectangle): Rectangle;
+        getLocalBounds(rect?: Rectangle): Rectangle;
+        toGlobal(position: Point, point?: Point, skipUpdate?: boolean): Point;
+        toLocal(position: Point, from?: DisplayObject, point?: Point, skipUpdate?: boolean): Point;
+        renderWebGL(renderer: WebGLRenderer): void;
+        renderCanvas(renderer: CanvasRenderer): void;
+        setParent(container: Container): Container;
+        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, pivotX?: number, pivotY?: number): DisplayObject;
+        destroy(): void;
+
+        on(event: string, fn: Function, context?: any): this;
+        once(event: string, fn: Function, context?: any): this;
+        off(event: string, fn: Function, context?: any): this;
+
+        /*
+         on(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         on(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+
+         once(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         once(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+         */
+
+    }
+
+    export class TransformBase {
+
+        static IDENTITY: TransformBase;
+
+        worldTransform: Matrix;
+        localTransform: Matrix;
+        protected _worldID: number;
+        updateLocalTransform(): void;
+        updateTransform(parentTransform: TransformBase): void;
+        updateWorldTransform(parentTransform: TransformBase): void;
+
+    }
+    export class TransformStatic extends TransformBase {
+
+        position: ObservablePoint;
+        scale: ObservablePoint;
+        pivot: ObservablePoint;
+        skew: ObservablePoint;
+
+        protected _rotation: number;
+        protected _sr?: number;
+        protected _cr?: number;
+        protected _cy?: number;
+        protected _sy?: number;
+        protected _nsx?: number;
+        protected _cx?: number;
+        protected _currentLocalID: number;
+
+        protected onChange(): void;
+        updateSkew(): void;
+        updateLocalTransform(): void;
+        updateTransform(parentTransform: TransformBase): void;
+        setFromMatrix(matrix: Matrix): void;
+
+        rotation: number;
+
+    }
+    export class Transform extends TransformBase {
+
+        constructor();
+
+        position: Point;
+        scale: Point;
+        skew: ObservablePoint;
+        pivot: Point;
+
+        protected _rotation: number;
+        protected _sr?: number;
+        protected _cr?: number;
+        protected _cy?: number;
+        protected _sy?: number;
+        protected _nsx?: number;
+        protected _cx?: number;
+
+        updateSkew(): void;
+        setFromMatrix(matrix: Matrix): void;
+
+        rotation: number;
+
+    }
+
+    // graphics
+
+    export class GraphicsData {
+
+        constructor(lineWidth: number, lineColor: number, lineAlpha: number, fillColor: number, fillAlpha: number, fill: boolean, nativeLines: boolean, shape: IShape | Circle | Rectangle | RoundedRectangle | Ellipse | Polygon);
+
+        lineWidth: number;
+        nativeLines: boolean;
+        lineColor: number;
+        lineAlpha: number;
+        protected _lineTint: number;
+        fillColor: number;
+        fillAlpha: number;
+        protected _fillTint: number;
+        fill: boolean;
+        protected holes: IShape[];
+        shape: IShape | Circle | Rectangle | RoundedRectangle | Ellipse | Polygon;
+        type?: number;
+        clone(): GraphicsData;
+        addHole(shape: IShape | Circle | Rectangle | RoundedRectangle | Ellipse | Polygon): void;
+        destroy(options?: IDestroyOptions | boolean): void;
+
+    }
+    export class Graphics extends Container {
+
+        constructor(nativeLines?: boolean);
+
+        fillAlpha: number;
+        lineWidth: number;
+        nativeLines: boolean;
+        lineColor: number;
+        protected graphicsData: GraphicsData[];
+        tint: number;
+        protected _prevTint: number;
+        blendMode: number;
+        currentPath: GraphicsData;
+        protected _webGL: any;
+        isMask: boolean;
+        boundsPadding: number;
+        protected _localBounds: Bounds;
+        dirty: boolean;
+        fastRectDirty: number;
+        clearDirty: number;
+        boundsDirty: number;
+        protected cachedSpriteDirty: boolean;
+        protected _spriteRect: Rectangle;
+        protected _fastRect: boolean;
+
+        static _SPRITE_TEXTURE: Texture;
+
+        clone(): Graphics;
+        lineStyle(lineWidth?: number, color?: number, alpha?: number): Graphics;
+        moveTo(x: number, y: number): Graphics;
+        lineTo(x: number, y: number): Graphics;
+        quadraticCurveTo(cpX: number, cpY: number, toX: number, toY: number): Graphics;
+        bezierCurveTo(cpX: number, cpY: number, cpX2: number, cpY2: number, toX: number, toY: number): Graphics;
+        arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): Graphics;
+        arc(cx: number, cy: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): Graphics;
+        beginFill(color: number, alpha?: number): Graphics;
+        endFill(): Graphics;
+        drawRect(x: number, y: number, width: number, height: number): Graphics;
+        drawRoundedRect(x: number, y: number, width: number, height: number, radius: number): Graphics;
+        drawCircle(x: number, y: number, radius: number): Graphics;
+        drawEllipse(x: number, y: number, width: number, height: number): Graphics;
+        drawPolygon(path: number[] | Point[]): Graphics;
+        clear(): Graphics;
+        isFastRect(): boolean;
+        protected _renderCanvas(renderer: CanvasRenderer): void;
+        protected _calculateBounds(): Rectangle;
+        protected _renderSpriteRect(renderer: PIXI.SystemRenderer): void;
+        containsPoint(point: Point): boolean;
+        updateLocalBounds(): void;
+        drawShape(shape: IShape | Circle | Rectangle | Ellipse | Polygon | RoundedRectangle): GraphicsData;
+        generateCanvasTexture(scaleMode?: number, resolution?: number): Texture;
+        protected closePath(): Graphics;
+        protected addHole(): Graphics;
+        destroy(options?: IDestroyOptions | boolean): void;
+
+    }
+    export class CanvasGraphicsRenderer {
+
+        constructor(renderer: SystemRenderer);
+        render(graphics: Graphics): void;
+        protected updateGraphicsTint(graphics: Graphics): void;
+        protected renderPolygon(points: Point[], close: boolean, context: CanvasRenderingContext2D): void;
+        destroy(): void;
+
+    }
+    export class GraphicsRenderer extends ObjectRenderer {
+
+        constructor(renderer: PIXI.CanvasRenderer);
+
+        protected graphicsDataPool: GraphicsData[];
+        protected primitiveShader: PrimitiveShader;
+        gl: WebGLRenderingContext;
+
+        CONTEXT_UID: number;
+
+        destroy(): void;
+        render(graphics: Graphics): void;
+        protected updateGraphics(graphics: PIXI.Graphics): void;
+        getWebGLData(webGL: WebGLRenderingContext, type: number): WebGLGraphicsData;
+
+    }
+    export class WebGLGraphicsData {
+
+        constructor(gl: WebGLRenderingContext, shader: glCore.GLShader, attribsState: glCore.IAttribState);
+
+        gl: WebGLRenderingContext;
+        color: number[];
+        points: Point[];
+        indices: number[];
+        buffer: WebGLBuffer;
+        indexBuffer: WebGLBuffer;
+        dirty: boolean;
+        glPoints: number[];
+        glIndices: number[];
+        shader: glCore.GLShader;
+        vao: glCore.VertexArrayObject;
+
+        reset(): void;
+        upload(): void;
+        destroy(): void;
+
+    }
+    export class PrimitiveShader extends glCore.GLShader { }
+
+    // math
+
+    export namespace GroupD8 {
+
+        export const E: number;
+        export const SE: number;
+        export const S: number;
+        export const SW: number;
+        export const W: number;
+        export const NW: number;
+        export const N: number;
+        export const NE: number;
+        export const MIRROR_HORIZONTAL: number;
+        export const MIRROR_VERTICAL: number;
+
+        export function uX(ind: number): number;
+        export function uY(ind: number): number;
+        export function vX(ind: number): number;
+        export function vY(ind: number): number;
+        export function inv(rotation: number): number;
+        export function add(rotationSecond: number, rotationFirst: number): number;
+        export function sub(rotationSecond: number, rotationFirst: number): number;
+        export function rotate180(rotation: number): number;
+        export function isSwapWidthHeight(rotation: number): boolean;
+        export function byDirection(dx: number, dy: number): number;
+        export function matrixAppendRotationInv(matrix: Matrix, rotation: number, tx: number, ty: number): void;
+
+    }
+    export class Matrix {
+
+        constructor(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number);
+
+        a: number;
+        b: number;
+        c: number;
+        d: number;
+        tx: number;
+        ty: number;
+
+        fromArray(array: number[]): void;
+        set(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix;
+        toArray(transpose?: boolean, out?: number[]): number[];
+        apply(pos: Point, newPos?: Point): Point;
+        applyInverse(pos: Point, newPos?: Point): Point;
+        translate(x: number, y: number): Matrix;
+        scale(x: number, y: number): Matrix;
+        rotate(angle: number): Matrix;
+        append(matrix: Matrix): Matrix;
+        setTransform(x: number, y: number, pivotX: number, pivotY: number, scaleX: number, scaleY: number, rotation: number, skewX: number, skewY: number): PIXI.Matrix;
+        prepend(matrix: Matrix): Matrix;
+        invert(): Matrix;
+        identity(): Matrix;
+        decompose(transform: TransformBase): TransformBase;
+        clone(): Matrix;
+        copy(matrix: Matrix): Matrix;
+
+        static IDENTITY: Matrix;
+        static TEMP_MATRIX: Matrix;
+
+    }
+    export class ObservablePoint {
+
+        constructor(cb: Function, scope?: any, x?: number, y?: number);
+
+        x: number;
+        y: number;
+        cb: () => any;
+        scope: any;
+
+        set(x?: number, y?: number): void;
+        copy(point: Point | ObservablePoint): void;
+
+    }
+    export class Point {
+
+        constructor(x?: number, y?: number);
+
+        x: number;
+        y: number;
+
+        clone(): Point;
+        copy(p: Point): void;
+        equals(p: Point): boolean;
+        set(x?: number, y?: number): void;
+
+    }
+
+    export interface IShape {
+    }
+    export interface IHitArea extends IShape {
+
+        contains(x: number, y: number): boolean;
+
+    }
+    export class Circle {
+
+        constructor(x?: number, y?: number, radius?: number);
+
+        x: number;
+        y: number;
+        radius: number;
+        type: number;
+
+        clone(): Circle;
+        contains(x: number, y: number): boolean;
+        getBounds(): Rectangle;
+
+    }
+    export class Ellipse {
+
+        constructor(x?: number, y?: number, width?: number, height?: number);
+
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        type: number;
+
+        clone(): Ellipse;
+        contains(x: number, y: number): boolean;
+        getBounds(): Rectangle;
+
+    }
+    export class Polygon {
+
+        constructor(points: Point[] | number[]);
+        constructor(...points: Point[]);
+        constructor(...points: number[]);
+
+        closed: boolean;
+        points: number[];
+        type: number;
+
+        clone(): Polygon;
+        contains(x: number, y: number): boolean;
+        close(): void;
+
+    }
+    export class Rectangle {
+
+        constructor(x?: number, y?: number, width?: number, height?: number);
+
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        type: number;
+        left: number;
+        right: number;
+        top: number;
+        bottom: number;
+
+        static EMPTY: Rectangle;
+
+        clone(): Rectangle;
+        copy(rectangle: Rectangle): Rectangle;
+        contains(x: number, y: number): boolean;
+        pad(paddingX: number, paddingY: number): void;
+        fit(rectangle: Rectangle): void;
+        enlarge(rectangle: Rectangle): void;
+
+    }
+    export class RoundedRectangle {
+
+        constructor(x?: number, y?: number, width?: number, height?: number, radius?: number);
+
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        radius: number;
+        type: number;
+
+        clone(): RoundedRectangle;
+        contains(x: number, y: number): boolean;
+
+    }
+
+    // renderers
+
+    export interface IRendererOptions {
+
+        view?: HTMLCanvasElement;
+        transparent?: boolean;
+        autoResize?: boolean;
+        antialias?: boolean;
+        resolution?: number;
+        clearBeforeRender?: boolean;
+        backgroundColor?: number;
+        roundPixels?: boolean;
+        context?: WebGLRenderingContext;
+
+    }
+    export class SystemRenderer extends utils.EventEmitter {
+
+        constructor(system: string, screenWidth?: number, screenHeight?: number, options?: IRendererOptions);
+
+        type: number;
+        screen: Rectangle;
+        readonly width: number;
+        readonly height: number;
+        view: HTMLCanvasElement;
+        resolution: number;
+        transparent: boolean;
+        autoResize: boolean;
+        blendModes: any; // todo?
+        preserveDrawingBuffer: boolean;
+        clearBeforeRender: boolean;
+        roundPixels: boolean;
+        protected _backgroundColor: number;
+        protected _backgroundColorRgba: number[];
+        protected _backgroundColorString: string;
+        protected _tempDisplayObjectParent: Container;
+        protected _lastObjectRendered: DisplayObject;
+        backgroundColor: number;
+
+        resize(screenWidth: number, screenHeight: number): void;
+        generateTexture(displayObject: DisplayObject, scaleMode?: number, resolution?: number): RenderTexture;
+        render(...args: any[]): void;
+        destroy(removeView?: boolean): void;
+
+    }
+    export class CanvasRenderer extends SystemRenderer {
+
+        // plugintarget mixin start
+        static __plugins: Object;
+        static registerPlugin(pluginName: string, ctor: Function): void;
+        plugins: any;
+        initPlugins(): void;
+        destroyPlugins(): void;
+        // plugintarget mixin end
+
+        // from InteractionManager
+        interaction?: interaction.InteractionManager;
+
+        constructor(screenWidth?: number, screenHeight?: number, options?: IRendererOptions);
+
+        rootContext: CanvasRenderingContext2D;
+        rootResolution?: number;
+        refresh: boolean;
+        maskManager: CanvasMaskManager;
+        smoothProperty: string;
+        extract: extract.CanvasExtract;
+
+        context: CanvasRenderingContext2D | null;
+
+        render(displayObject: PIXI.DisplayObject, renderTexture?: PIXI.RenderTexture, clear?: boolean, transform?: PIXI.Transform, skipUpdateTransform?: boolean): void
+        setBlendMode(blendMode: number): void;
+        destroy(removeView?: boolean): void;
+        clear(clearColor?: string): void;
+
+        on(event: "prerender", fn: () => void, context?: any): this;
+        on(event: "postrender", fn: () => void, context?: any): this;
+        on(event: string, fn: Function, context?: any): this;
+        once(event: "prerender", fn: () => void, context?: any): this;
+        once(event: "postrender", fn: () => void, context?: any): this;
+        once(event: string, fn: Function, context?: any): this;
+        off(event: string, fn: Function, context?: any): this;
+
+    }
+    export class CanvasMaskManager {
+
+        constructor(renderer: CanvasRenderer);
+
+        pushMask(maskData: any): void;
+        protected renderGraphicsShape(graphics: Graphics): void;
+        popMask(renderer: WebGLRenderer | CanvasRenderer): void;
+        destroy(): void;
+
+    }
+    export class CanvasRenderTarget {
+
+        constructor(width: number, height: number, resolution: number);
+
+        canvas: HTMLCanvasElement;
+        context: CanvasRenderingContext2D;
+        resolution: number;
+
+        width: number;
+        height: number;
+
+        clear(): void;
+        resize(width: number, height: number): void;
+        destroy(): void;
+
+    }
+
+    export interface IWebGLRendererOptions {
+
+        view?: HTMLCanvasElement;
+        transparent?: boolean;
+        autoResize?: boolean;
+        antialias?: boolean;
+        forceFXAA?: boolean;
+        resolution?: number;
+        clearBeforeRender?: boolean;
+        preserveDrawingBuffer?: boolean;
+        roundPixels?: boolean;
+        legacy?: boolean;
+
+    }
+    export class WebGLRenderer extends SystemRenderer {
+
+        // plugintarget mixin start
+        static __plugins: Object;
+        static registerPlugin(pluginName: string, ctor: Function): void;
+        plugins: any;
+        initPlugins(): void;
+        destroyPlugins(): void;
+        // plugintarget mixin end
+
+        // from InteractionManager
+        interaction: interaction.InteractionManager;
+
+        constructor(screenWidth?: number, screenHeight?: number, options?: IWebGLRendererOptions);
+
+        protected _contextOptions: {
+            alpha: boolean;
+            antiAlias?: boolean;
+            premultipliedAlpha: boolean;
+            stencil: boolean;
+            preseveDrawingBuffer?: boolean;
+        };
+        protected _backgroundColorRgba: number[];
+        maskManager: MaskManager;
+        stencilManager?: StencilManager;
+        emptyRenderer: ObjectRenderer;
+        currentRenderer: ObjectRenderer;
+        gl: WebGLRenderingContext;
+        CONTEXT_UID: number;
+        state?: WebGLState;
+        renderingToScreen: boolean;
+        boundTextures: Texture[];
+        filterManager: FilterManager;
+        textureManager?: TextureManager;
+        extract: extract.WebGLExtract;
+        protected drawModes: any;
+        protected _activeShader: Shader;
+        _activeRenderTarget: RenderTarget;
+        protected _initContext(): void;
+
+        render(displayObject: PIXI.DisplayObject, renderTexture?: PIXI.RenderTexture, clear?: boolean, transform?: PIXI.Transform, skipUpdateTransform?: boolean): void
+        setObjectRenderer(objectRenderer: ObjectRenderer): void;
+        flush(): void;
+        setBlendMode(blendMode: number): void;
+        clear(clearColor?: number): void;
+        setTransform(matrix: Matrix): void;
+        clearRenderTexture(renderTexture: RenderTexture, clearColor?: number): WebGLRenderer;
+        bindRenderTexture(renderTexture: RenderTexture, transform: Transform): WebGLRenderer;
+        bindRenderTarget(renderTarget: RenderTarget): WebGLRenderer;
+        bindShader(shader: Shader, autoProject?: boolean): WebGLRenderer;
+        bindTexture(texture: Texture | BaseTexture, location?: number, forceLocation?: boolean): number;
+        unbindTexture(texture: Texture | BaseTexture): WebGLRenderer | undefined;
+        createVao(): glCore.VertexArrayObject;
+        bindVao(vao: glCore.VertexArrayObject): WebGLRenderer;
+        reset(): WebGLRenderer;
+        handleContextLost: (event: WebGLContextEvent) => void;
+        handleContextRestored: () => void;
+        destroy(removeView?: boolean): void;
+
+        on(event: "context", fn: (gl: WebGLRenderingContext) => void, context?: any): this;
+        on(event: "prerender", fn: () => void, context?: any): this;
+        on(event: "postrender", fn: () => void, context?: any): this;
+        on(event: string, fn: Function, context?: any): this;
+        once(event: "context", fn: (gl: WebGLRenderingContext) => void, context?: any): this;
+        once(event: "prerender", fn: () => void, context?: any): this;
+        once(event: "postrender", fn: () => void, context?: any): this;
+        once(event: string, fn: Function, context?: any): this;
+        off(event: string, fn: Function, context?: any): this;
+
+    }
+    export class WebGLState {
+
+        constructor(gl: WebGLRenderingContext);
+
+        activeState: number[];
+        defaultState: number[];
+        stackIndex: number;
+        stack: number[];
+        gl: WebGLRenderingContext;
+        maxAttribs: number;
+        attribState: glCore.IAttribState;
+        nativeVaoExtension: any;
+
+        push(): void;
+        pop(): void;
+        setState(state: number[]): void;
+        setBlend(value: number): void;
+        setBlendMode(value: number): void;
+        setDepthTest(value: number): void;
+        setCullFace(value: number): void;
+        setFrontFace(value: number): void;
+        resetAttributes(): void;
+        resetToDefault(): void;
+
+    }
+    export class TextureManager {
+
+        constructor(renderer: WebGLRenderer);
+
+        renderer: WebGLRenderer;
+        gl: WebGLRenderingContext;
+        protected _managedTextures: WebGLTexture[];
+
+        bindTexture(): void;
+        getTexture(): WebGLTexture;
+        updateTexture(texture: BaseTexture | Texture): WebGLTexture;
+        destroyTexture(texture: BaseTexture, _skipRemove?: boolean): void;
+        removeAll(): void;
+        destroy(): void;
+
+    }
+    export class TextureGarbageCollector {
+
+        constructor(renderer: WebGLRenderer);
+
+        renderer: WebGLRenderer;
+        count: number;
+        checkCount: number;
+        maxIdle: number;
+        checkCountMax: number;
+        mode: number;
+
+        update(): void;
+        run(): void;
+        unload(): void;
+
+    }
+    export abstract class ObjectRenderer extends WebGLManager {
+
+        constructor(renderer: WebGLRenderer);
+
+        start(): void;
+        stop(): void;
+        flush(): void;
+
+        render(...args: any[]): void;
+
+    }
+    export class Quad {
+
+        constructor(gl: WebGLRenderingContext);
+
+        gl: WebGLRenderingContext;
+        vertices: number[];
+        uvs: number[];
+        interleaved: number[];
+        indices: number[];
+        vertexBuffer: WebGLBuffer;
+        vao: glCore.VertexArrayObject;
+        initVao(shader: glCore.GLShader): void;
+        map(targetTextureFrame: Rectangle, destinationFrame: Rectangle): Quad;
+        upload(): Quad;
+        destroy(): void;
+
+    }
+    export class RenderTarget {
+
+        constructor(gl: WebGLRenderingContext, width: number, height: number, scaleMode: number, resolution: number, root?: boolean);
+
+        gl: WebGLRenderingContext;
+        frameBuffer: glCore.GLFramebuffer;
+        texture: Texture;
+        clearColor: number[];
+        size: Rectangle;
+        resolution: number;
+        projectionMatrix: Matrix;
+        transform: Matrix;
+        frame: Rectangle;
+        defaultFrame: Rectangle;
+        destinationFrame: Rectangle;
+        sourceFrame?: Rectangle;
+        stencilBuffer: glCore.GLFramebuffer;
+        stencilMaskStack: Graphics[];
+        filterData: {
+            index: number,
+            stack: {
+                renderTarget: RenderTarget,
+                filter: any[];
+                bounds: Rectangle
+            }[]
+        };
+        scaleMode: number;
+        root: boolean;
+
+        clear(clearColor?: number[]): void;
+        attachStencilBuffer(): void;
+        setFrame(destinationFrame: Rectangle, sourceFrame: Rectangle): void;
+        activate(): void;
+        calculateProjection(destinationFrame: Rectangle, sourceFrame: Rectangle): void;
+        resize(width: number, height: number): void;
+        destroy(): void;
+
+    }
+
+    export class BlendModeManager extends WebGLManager {
+
+        constructor(renderer: WebGLRenderer);
+
+        currentBlendMode: number;
+
+        setBlendMode(blendMode: number): boolean;
+
+    }
+    export class FilterManager extends WebGLManager {
+
+        constructor(renderer: WebGLRenderer);
+
+        gl: WebGLRenderingContext;
+        quad: Quad;
+        stack: {
+            renderTarget: RenderTarget;
+            sourceFrame: Rectangle;
+            destinationFrame: Rectangle;
+            filters: Filter[];
+            target: any;
+            resolution: number;
+        }[];
+        stackIndex: number;
+        shaderCache: any;
+        filterData: any;
+
+        pushFilter(target: RenderTarget, filters: Filter[]): void;
+        popFilter(): void;
+        applyFilter(shader: glCore.GLShader | Filter, inputTarget: RenderTarget, outputTarget: RenderTarget, clear?: boolean): void;
+        syncUniforms(shader: glCore.GLShader, filter: Filter): void;
+        getRenderTarget(clear?: boolean, resolution?: number): RenderTarget;
+        returnRenderTarget(renderTarget: RenderTarget): RenderTarget;
+        calculateScreenSpaceMatrix(outputMatrix: Matrix): Matrix;
+        calculateNormalisedScreenSpaceMatrix(outputMatrix: Matrix): Matrix;
+        calculateSpriteMatrix(outputMatrix: Matrix, sprite: Sprite): Matrix;
+        destroy(): void;
+        emptyPool(): void;
+        getPotRenderTarget(gl: WebGLRenderingContext, minWidth: number, minHeight: number, resolution: number): RenderTarget;
+        freePotRenderTarget(renderTarget: RenderTarget): void;
+
+    }
+    export class StencilMaskStack {
+
+        stencilStack: any[];
+        reverse: boolean;
+        count: number;
+
+    }
+    export class MaskManager extends WebGLManager {
+
+        scissor: boolean;
+        scissorData: any;
+        scissorRenderTarget: RenderTarget;
+        enableScissor: boolean;
+        alphaMaskPool: number[];
+        alphaMaskIndex: number;
+        pushMask(target: RenderTarget, maskData: Sprite | Graphics): void;
+        popMask(target: RenderTarget, maskData: Sprite | Graphics): void;
+        pushSpriteMask(target: RenderTarget, maskData: Sprite | Graphics): void;
+        popSpriteMask(): void;
+        pushStencilMask(maskData: Sprite | Graphics): void;
+        popStencilMask(): void;
+        pushScissorMask(target: RenderTarget, maskData: Sprite | Graphics): void;
+        popScissorMask(): void;
+
+    }
+    export class StencilManager extends WebGLManager {
+
+        constructor(renderer: WebGLRenderer);
+
+        stencilMaskStack: Graphics[];
+
+        setMaskStack(stencilMasStack: Graphics[]): void;
+        pushStencil(graphics: Graphics): void;
+        popStencil(): void;
+        destroy(): void;
+
+    }
+    export class WebGLManager {
+
+        constructor(renderer: WebGLRenderer);
+
+        renderer: SystemRenderer;
+        onContextChange(): void;
+        destroy(): void;
+
+    }
+    export interface IUniformData {
+
+        type: string;
+        value: any;
+
+        // name is set by pixi if uniforms were automatically extracted from shader code, but not used anywhere
+        name?: string;
+
+    }
+    export class Filter {
+
+        constructor(vertexSrc?: string, fragmentSrc?: string, uniforms?: { [name: string]: IUniformData });
+
+        vertextSrc?: string;
+        fragmentSrc: string;
+        blendMode: number;
+        protected uniformData: { [name: string]: IUniformData };
+        uniforms: { [name: string]: any } | any;
+        glShaders: any;
+        glShaderKey?: number;
+        padding: number;
+        resolution: number;
+        enabled: boolean;
+        apply(filterManager: FilterManager, input: RenderTarget, output: RenderTarget, clear?: boolean): void;
+
+        static defaultVertexSrc: string;
+        static defaultFragmentSrc: string;
+
+    }
+    export class SpriteMaskFilter extends Filter {
+
+        constructor(sprite: Sprite);
+
+        maskSprite: Sprite;
+        maskMatrix: Matrix;
+        apply(filterManager: FilterManager, input: RenderTarget, output: RenderTarget): void;
+
+    }
+
+    // sprites
+
+    export class Sprite extends Container {
+
+        constructor(texture?: Texture);
+
+        protected _anchor: ObservablePoint;
+        anchor: ObservablePoint;
+        protected _texture: Texture;
+        protected _transformTrimmedID: number;
+        protected _textureTrimmedID: number;
+        protected _width: number;
+        protected _height: number;
+        tint: number;
+        protected _tint: number;
+        protected _tintRGB: number;
+        blendMode: number;
+        pluginName: string;
+        protected cachedTint: number;
+        texture: Texture;
+        protected textureDirty: boolean;
+        protected _textureID: number;
+        protected _transformID: number;
+        protected vertexTrimmedData: Float32Array;
+        vertexData: Float32Array;
+        width: number;
+        height: number;
+
+        protected _onTextureUpdate(): void;
+        calculateVertices(): void;
+        protected _calculateBounds(): void;
+        protected calculateTrimmedVertices(): void;
+        protected onAnchorUpdate(): void;
+        protected _renderWebGL(renderer: WebGLRenderer): void;
+        protected _renderCanvas(renderer: CanvasRenderer): void;
+        getLocalBounds(): Rectangle;
+        containsPoint(point: Point): boolean;
+        destroy(options?: IDestroyOptions | boolean): void;
+
+        static from(source: number | string | BaseTexture | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement): Sprite;
+        static fromFrame(frameId: string): Sprite;
+        static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
+
+    }
+    export class BatchBuffer {
+
+        vertices: ArrayBuffer;
+        float32View: number[];
+        uint32View: number[];
+
+        destroy(): void;
+
+    }
+    export class SpriteRenderer extends ObjectRenderer {
+
+        constructor(renderer: PIXI.WebGLRenderer);
+
+        vertSize: number;
+        vertByteSize: number;
+        size: number;
+        buffers: BatchBuffer[];
+        indices: number[];
+        shaders: Shader[];
+        currentIndex: number;
+        tick: number;
+        groups: any[];
+        sprites: Sprite[];
+        vertexBuffers: number[];
+        vaos: glCore.VertexArrayObject[];
+        vaoMax: number;
+        vertexCount: number;
+
+        protected onContextChanged: () => void;
+        protected onPrerender: () => void;
+        render(sprite: Sprite): void;
+        flush(): void;
+        start(): void;
+        stop(): void;
+        destroy(): void;
+
+    }
+    export class CanvasSpriteRenderer extends ObjectRenderer {
+
+        constructor(renderer: WebGLRenderer);
+
+        render(sprite: Sprite): void;
+        destroy(): void;
+
+    }
+    export namespace CanvasTinter {
+
+        export function getTintedTexture(sprite: Sprite, color: number): HTMLCanvasElement;
+        export function tintWithMultiply(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
+        export function tintWithOverlay(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
+        export function tintWithPerPixel(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
+        export function roundColor(color: number): number;
+
+        export let cacheStepsPerColorChannel: number;
+        export let convertTintToImage: boolean;
+        export let canUseMultiply: boolean;
+        export let tintMethod: Function;
+
+    }
+
+    // text
+    export interface TextStyleOptions {
+        align?: string;
+        breakWords?: boolean;
+        dropShadow?: boolean;
+        dropShadowAlpha?: number;
+        dropShadowAngle?: number;
+        dropShadowBlur?: number;
+        dropShadowColor?: string | number;
+        dropShadowDistance?: number;
+        fill?: string | string[] | number | number[] | CanvasGradient | CanvasPattern;
+        fillGradientType?: number;
+        fillGradientStops?: number[];
+        fontFamily?: string | string[];
+        fontSize?: number | string;
+        fontStyle?: string;
+        fontVariant?: string;
+        fontWeight?: string;
+        letterSpacing?: number;
+        lineHeight?: number;
+        lineJoin?: string;
+        miterLimit?: number;
+        padding?: number;
+        stroke?: string | number;
+        strokeThickness?: number;
+        textBaseline?: string;
+        trim?: boolean;
+        wordWrap?: boolean;
+        wordWrapWidth?: number;
+    }
+
+    export class TextStyle implements TextStyleOptions {
+
+        constructor(style: TextStyleOptions)
+
+        styleID: number;
+
+        clone(): TextStyle;
+        reset(): void;
+
+        protected _align: string;
+        align: string;
+        protected _breakWords: boolean;
+        breakWords: boolean;
+        protected _dropShadow: boolean;
+        dropShadow: boolean;
+        protected _dropShadowAlpha: number;
+        dropShadowAlpha: number;
+        protected _dropShadowAngle: number;
+        dropShadowAngle: number;
+        protected _dropShadowBlur: number;
+        dropShadowBlur: number;
+        protected _dropShadowColor: string | number;
+        dropShadowColor: string | number;
+        protected _dropShadowDistance: number;
+        dropShadowDistance: number;
+        protected _fill: string | string[] | number | number[] | CanvasGradient | CanvasPattern;
+        fill: string | string[] | number | number[] | CanvasGradient | CanvasPattern;
+        protected _fillGradientType: number;
+        fillGradientType: number;
+        protected _fillGradientStops: number[];
+        fillGradientStops: number[];
+        protected _fontFamily: string | string[];
+        fontFamily: string | string[];
+        protected _fontSize: number | string;
+        fontSize: number | string;
+        protected _fontStyle: string;
+        fontStyle: string;
+        protected _fontVariant: string;
+        fontVariant: string;
+        protected _fontWeight: string;
+        fontWeight: string;
+        protected _letterSpacing: number;
+        letterSpacing: number;
+        protected _lineHeight: number;
+        lineHeight: number;
+        protected _lineJoin: string;
+        lineJoin: string;
+        protected _miterLimit: number;
+        miterLimit: number;
+        protected _padding: number;
+        padding: number;
+        protected _stroke: string | number;
+        stroke: string | number;
+        protected _strokeThickness: number;
+        strokeThickness: number;
+        protected _textBaseline: string;
+        textBaseline: string;
+        protected _trim: boolean;
+        trim: boolean;
+        protected _wordWrap: boolean;
+        wordWrap: boolean;
+        protected _wordWrapWidth: number;
+        wordWrapWidth: number;
+
+    }
+
+    export class Text extends Sprite {
+
+        static getFontStyle(style: TextStyleOptions): string;
+        static calculateFontProperties(style: string): any;
+
+        constructor(text?: string, style?: TextStyleOptions, canvas?: HTMLCanvasElement);
+
+        canvas: HTMLCanvasElement;
+        context: CanvasRenderingContext2D;
+        resolution: number;
+        protected _text: string;
+        protected _style: TextStyle;
+        protected _styleListener: Function;
+        protected _font: string;
+        protected localStyleID: number;
+
+        static fontPropertiesCache: any;
+        static fontPropertiesCanvas: HTMLCanvasElement;
+        static fontPropertiesContext: CanvasRenderingContext2D;
+
+        width: number;
+        height: number;
+        style: TextStyle;
+        text: string;
+
+        protected updateText(respectDirty?: boolean): void;
+        protected drawLetterSpacing(text: string, x: number, y: number, isStroke?: boolean): void;
+        protected updateTexture(): void;
+        renderWebGL(renderer: WebGLRenderer): void;
+        protected _renderCanvas(renderer: CanvasRenderer): void;
+        protected wordWrap(text: string): string;
+        getLocalBounds(rect?: Rectangle): Rectangle;
+        protected _calculateBounds(): void;
+        protected _onStyleChange: () => void;
+        protected _generateFillStyle(style: TextStyle, lines: string[]): string | number | CanvasGradient;
+        destroy(options?: IDestroyOptions | boolean): void;
+        dirty: boolean;
+
+    }
+
+    // textures
+
+    export class BaseRenderTexture extends BaseTexture {
+
+        constructor(width?: number, height?: number, scaleMode?: number, resolution?: number);
+
+        height: number;
+        width: number;
+        realHeight: number;
+        realWidth: number;
+        resolution: number;
+        scaleMode: number;
+        hasLoaded: boolean;
+        protected _glRenderTargets: { [n: number]: WebGLTexture; };
+        protected _canvasRenderTarget: { [n: number]: WebGLTexture; };
+        valid: boolean;
+
+        resize(width: number, height: number): void;
+        destroy(): void;
+
+        once(event: "update", fn: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
+        once(event: string, fn: Function, context?: any): this;
+        on(event: "update", fn: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
+        on(event: string, fn: Function, context?: any): this;
+        off(event: string, fn: Function, context?: any): this;
+
+    }
+    export class BaseTexture extends utils.EventEmitter {
+
+        static from(source: string | HTMLImageElement | HTMLCanvasElement, scaleMode?: number, sourceScale?: number): BaseTexture;
+
+        constructor(source?: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, scaleMode?: number, resolution?: number);
+
+        protected uuid?: number;
+        protected touched: number;
+        resolution: number;
+        width: number;
+        height: number;
+        realWidth: number;
+        realHeight: number;
+        scaleMode: number;
+        hasLoaded: boolean;
+        isLoading: boolean;
+        wrapMode: number;
+        source: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement | null;
+        origSource: HTMLImageElement | null;
+        imageType: string | null;
+        sourceScale: number;
+        premultipliedAlpha: boolean;
+        imageUrl: string | null;
+        protected isPowerOfTwo: boolean;
+        mipmap: boolean;
+        wrap?: boolean;
+        protected _glTextures: any;
+        protected _enabled: number;
+        protected _id?: number;
+
+        update(): void;
+        protected _updateDimensions(): void;
+        protected _updateImageType(): void;
+        protected _loadSvgSource(): void;
+        protected _loadSvgSourceUsingDataUri(dataUri: string): void;
+        protected _loadSvgSourceUsingXhr(): void;
+        protected _loadSvgSourceUsingString(svgString: string): void;
+        protected loadSource(source: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement): void;
+        protected _sourceLoaded(): void;
+        destroy(): void;
+        dispose(): void;
+        updateSourceImage(newSrc: string): void;
+
+        static fromImage(imageUrl: string, crossorigin?: boolean, scaleMode?: number, sourceScale?: number): BaseTexture;
+        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): BaseTexture;
+
+        on(event: "update", fn: (baseTexture: BaseTexture) => void, context?: any): this;
+        on(event: "loaded", fn: (baseTexture: BaseTexture) => void, context?: any): this;
+        on(event: "error", fn: (baseTexture: BaseTexture) => void, context?: any): this;
+        on(event: "dispose", fn: (baseTexture: BaseTexture) => void, context?: any): this;
+        on(event: string, fn: Function, context?: any): this;
+        once(event: "update", fn: (baseTexture: BaseTexture) => void, context?: any): this;
+        once(event: "loaded", fn: (baseTexture: BaseTexture) => void, context?: any): this;
+        once(event: "error", fn: (baseTexture: BaseTexture) => void, context?: any): this;
+        once(event: "dispose", fn: (baseTexture: BaseTexture) => void, context?: any): this;
+        once(event: string, fn: Function, context?: any): this;
+        off(event: string, fn: Function, context?: any): this;
+
+    }
+    export class RenderTexture extends Texture {
+
+        constructor(baseRenderTexture: BaseRenderTexture, frame?: Rectangle);
+
+        protected legacyRenderer: any;
+        valid: boolean;
+
+        resize(width: number, height: number, doNotResizeBaseTexture?: boolean): void;
+
+        static create(width?: number, height?: number, scaleMode?: number, resolution?: number): RenderTexture;
+
+    }
+    export class Texture extends utils.EventEmitter {
+
+        static from(source: number | string | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement | PIXI.BaseTexture): Texture;
+
+        constructor(baseTexture: BaseTexture, frame?: Rectangle, orig?: Rectangle, trim?: Rectangle, rotate?: number);
+
+        noFrame: boolean;
+        baseTexture: BaseTexture;
+        protected _frame: Rectangle;
+        trim?: Rectangle;
+        valid: boolean;
+        requiresUpdate: boolean;
+        protected _uvs: TextureUvs;
+        orig: Rectangle;
+        protected _updateID: number;
+        transform: any;
+
+        update(): void;
+        protected onBaseTextureLoaded(baseTexture: BaseTexture): void;
+        protected onBaseTextureUpdated(baseTexture: BaseTexture): void;
+        destroy(destroyBase?: boolean): void;
+        clone(): Texture;
+        protected _updateUvs(): void;
+
+        static fromImage(imageUrl: string, crossOrigin?: boolean, scaleMode?: number, sourceScale?: number): Texture;
+        static fromFrame(frameId: string): Texture;
+        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): Texture;
+        static fromVideo(video: HTMLVideoElement | string, scaleMode?: number): Texture;
+        static fromVideoUrl(videoUrl: string, scaleMode?: number): Texture;
+        static from(source: string | BaseTexture | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement): Texture;
+        static fromLoader(source: HTMLImageElement | HTMLCanvasElement, imageUrl: string, name?: string): Texture;
+        static addTextureToCache(texture: Texture, id: string): void;
+        static removeTextureFromCache(id: string): Texture | undefined;
+
+        frame: Rectangle;
+        protected _rotate: boolean | 0;
+        rotate: number;
+        width: number;
+        height: number;
+
+        static EMPTY: Texture;
+
+        on(event: "update", fn: (texture: Texture) => void, context?: any): this;
+        on(event: string, fn: Function, context?: any): this;
+        once(event: "update", fn: (texture: Texture) => void, context?: any): this;
+        once(event: string, fn: Function, context?: any): this;
+        off(event: string, fn: Function, context?: any): this;
+
+    }
+    export class TextureUvs {
+
+        x0: number;
+        y0: number;
+        x1: number;
+        y1: number;
+        x2: number;
+        y2: number;
+        x3: number;
+        y3: number;
+
+        uvsUint32: Uint32Array;
+
+        protected set(frame: Rectangle, baseFrame: Rectangle, rotate: number): void;
+
+    }
 
-// from CONST
-export var VERSION: typeof CONST.VERSION;
-export var PI_2: typeof CONST.PI_2;
-export var RAD_TO_DEG: typeof CONST.RAD_TO_DEG;
-export var DEG_TO_RAD: typeof CONST.DEG_TO_RAD;
-export var RENDERER_TYPE: typeof CONST.RENDERER_TYPE;
-export var BLEND_MODES: typeof CONST.BLEND_MODES;
-export var DRAW_MODES: typeof CONST.DRAW_MODES;
-export var SCALE_MODES: typeof CONST.SCALE_MODES;
-export var WRAP_MODES: typeof CONST.WRAP_MODES;
-export var TRANSFORM_MODE: typeof CONST.TRANSFORM_MODE;
-export var PRECISION: typeof CONST.PRECISION;
-export var TEXT_STYLE_CHANGED: typeof CONST.TEXT_STYLE_CHANGED;
-export var GC_MODES: typeof CONST.GC_MODES;
-export var SHAPES: typeof CONST.SHAPES;
-export var TEXT_GRADIENT: typeof CONST.TEXT_GRADIENT;
-
-export function autoDetectRenderer(width: number, height: number, options?: PIXI.IRendererOptions, noWebGL?: boolean): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
-export var loader: PIXI.loaders.Loader;
-
-//////////////////////////////////////////////////////////////////////////////
-///////////////////////////////SETTINGS///////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-export namespace settings {
-	export var TARGET_FPMS: number;
-	export var MIPMAP_TEXTURES: boolean;
-	export var RESOLUTION: number;
-	export var FILTER_RESOLUTION: number;
-	export var SPRITE_MAX_TEXTURES: number;
-	export var SPRITE_BATCH_SIZE: number;
-	export var RETINA_PREFIX: RegExp;
-	export var RENDER_OPTIONS: {
-		view: HTMLCanvasElement,
-		antialias: boolean,
-		forceFXAA: boolean,
-		autoResize: boolean,
-		transparent: boolean,
-		backgroundColor: number,
-		clearBeforeRender: boolean,
-		preserveDrawingBuffer: boolean,
-		roundPixels: boolean
-	};
-	export var TRANSFORM_MODE: number;
-	export var GC_MODE: number;
-	export var GC_MAX_IDLE: number;
-	export var GC_MAX_CHECK_COUNT: number;
-	export var WRAP_MODE: number;
-	export var SCALE_MODE: number;
-	export var PRECISION: string;
-	export var UPLOADS_PER_FRAME: number;
-	export var CAN_UPLOAD_SAME_BUFFER: boolean;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-/////////////////////////////ACCESSIBILITY////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-export namespace accessibility {
-
-	// accessibility
-	export class AccessibilityManager {
-
-		constructor(renderer: CanvasRenderer | WebGLRenderer);
-
-		protected div: HTMLElement;
-		protected pool: HTMLElement[];
-		protected renderId: number;
-		debug: boolean;
-		renderer: SystemRenderer;
-		protected children: IAccessibleTarget[];
-		protected isActive: boolean;
-
-		protected activate(): void;
-		protected deactivate(): void;
-		protected updateAccessibleObjects(displayObject: DisplayObject): void;
-		protected update(): void;
-		protected capHitArea(hitArea: IHitArea): void;
-		protected addChild(displayObject: DisplayObject): void;
-		protected _onClick(e: interaction.InteractionEvent): void;
-		protected _onFocus(e: interaction.InteractionEvent): void;
-		protected _onFocusOut(e: interaction.InteractionEvent): void;
-		protected _onKeyDown(e: interaction.InteractionEvent): void;
-		protected _onMouseMove(): void;
-
-		destroy(): void;
-
-	}
-	export interface IAccessibleTarget {
-
-		accessible: boolean;
-		accessibleTitle: string;
-		accessibleHint: string;
-		tabIndex: number;
-
-	}
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-////////////////////////////////CORE//////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-// const
-
-export namespace CONST {
-	export var VERSION: string;
-	export var PI_2: number;
-	export var RAD_TO_DEG: number;
-	export var DEG_TO_RAD: number;
-	export var TARGET_FPMS: number;
-	export var RENDERER_TYPE: {
-		UNKNOWN: number;
-		WEBGL: number;
-		CANVAS: number;
-	};
-	export var BLEND_MODES: {
-		NORMAL: number;
-		ADD: number;
-		MULTIPLY: number;
-		SCREEN: number;
-		OVERLAY: number;
-		DARKEN: number;
-		LIGHTEN: number;
-		COLOR_DODGE: number;
-		COLOR_BURN: number;
-		HARD_LIGHT: number;
-		SOFT_LIGHT: number;
-		DIFFERENCE: number;
-		EXCLUSION: number;
-		HUE: number;
-		SATURATION: number;
-		COLOR: number;
-		LUMINOSITY: number;
-	};
-	export var DRAW_MODES: {
-		POINTS: number;
-		LINES: number;
-		LINE_LOOP: number;
-		LINE_STRIP: number;
-		TRIANGLES: number;
-		TRIANGLE_STRIP: number;
-		TRIANGLE_FAN: number;
-	};
-	export var SCALE_MODES: {
-		LINEAR: number,
-		NEAREST: number
-	};
-	export var GC_MODES: {
-		AUTO: number;
-		MANUAL: number;
-	};
-	export var WRAP_MODES: {
-		CLAMP: number;
-		MIRRORED_REPEAT: number;
-		REPEAT: number;
-	};
-	export var TRANSFORM_MODE: {
-		DEFAULT: number;
-		DYNAMIC: number;
-		STATIC: number;
-	};
-	export var URL_FILE_EXTENSION: RegExp | string;
-	export var DATA_URI: RegExp | string;
-	export var SVG_SIZE: RegExp | string;
-	export var SHAPES: {
-		POLY: number;
-		RECT: number;
-		CIRC: number;
-		ELIP: number;
-		RREC: number;
-	};
-	export var PRECISION: {
-		LOW: string;
-		MEDIUM: string;
-		HIGH: string;
-	};
-	export var TEXT_GRADIENT: {
-		LINEAR_VERTICAL: number;
-		LINEAR_HORIZONTAL: number;
-	};
-	export var TEXT_STYLE_CHANGED: string;
-
-}
-
-// display
-
-export interface IDestroyOptions {
-	children?: boolean;
-	texture?: boolean;
-	baseTexture?: boolean;
-}
-export class Bounds {
-
-	minX: number;
-	minY: number;
-	maxX: number;
-	maxY: number;
-	rect: Rectangle;
-
-	isEmpty(): boolean;
-	clear(): void;
-
-	getRectangle(rect?: Rectangle): Rectangle;
-	addPoint(point: Point): void;
-	addQuad(vertices: number[]): Bounds;
-	addFrame(transform: Transform, x0: number, y0: number, x1: number, y1: number): void;
-	addVertices(transform: Transform, vertices: number[], beginOffset: number, endOffset: number): void;
-	addBounds(bounds: Bounds): void;
-	addBoundsMask(bounds: Bounds, mask: Bounds): void;
-	addBoundsArea(bounds: Bounds, area: Rectangle): void;
-
-}
-export class Container extends DisplayObject {
-
-	// begin extras.getChildByName
-	getChildByName(name: string): DisplayObject;
-	// end extras.getChildByName
-
-	children: DisplayObject[];
-	width: number;
-	height: number;
-
-	protected onChildrenChange: (...args: any[]) => void;
-	addChild<T extends DisplayObject>(child: T, ...additionalChildren: DisplayObject[]): T;
-	addChildAt<T extends DisplayObject>(child: T, index: number): T;
-	swapChildren(child: DisplayObject, child2: DisplayObject): void;
-	getChildIndex(child: DisplayObject): number;
-	setChildIndex(child: DisplayObject, index: number): void;
-	getChildAt(index: number): DisplayObject;
-	removeChild(child: DisplayObject): DisplayObject;
-	removeChildAt(index: number): DisplayObject;
-	removeChildren(beginIndex?: number, endIndex?: number): DisplayObject[];
-	updateTransform(): void;
-	calculateBounds(): void;
-	protected _calculateBounds(): void;
-	protected containerUpdateTransform(): void;
-	renderWebGL(renderer: WebGLRenderer): void;
-	renderAdvancedWebGL(renderer: WebGLRenderer): void;
-	protected _renderWebGL(renderer: WebGLRenderer): void;
-	protected _renderCanvas(renderer: CanvasRenderer): void;
-	renderCanvas(renderer: CanvasRenderer): void;
-	destroy(options?: IDestroyOptions | boolean): void;
-
-	once(event: "added", fn: (displayObject: DisplayObject) => void, context?: any): utils.EventEmitter;
-	once(event: "removed", fn: (DisplayObject: DisplayObject) => void, context?: any): utils.EventEmitter;
-	once(event: string, fn: Function, context?: any): utils.EventEmitter;
-	on(event: "added", fn: (displayObject: DisplayObject) => void, context?: any): utils.EventEmitter;
-	on(event: "removed", fn: (DisplayObject: DisplayObject) => void, context?: any): utils.EventEmitter;
-	on(event: string, fn: Function, context?: any): utils.EventEmitter;
-	off(event: string, fn: Function, context?: any): utils.EventEmitter;
-
-}
-export class DisplayObject extends utils.EventEmitter implements interaction.InteractiveTarget {
-
-	// begin extras.cacheAsBitmap
-	protected _cacheAsBitmap: boolean;
-	protected _cacheData: boolean;
-	cacheAsBitmap: boolean;
-	protected _renderCachedWebGL(renderer: WebGLRenderer): void;
-	protected _initCachedDisplayObject(renderer: WebGLRenderer): void;
-	protected _renderCachedCanvas(renderer: CanvasRenderer): void;
-	protected _initCachedDisplayObjectCanvas(renderer: CanvasRenderer): void;
-	protected _calculateCachedBounds(): Rectangle;
-	protected _getCachedLocalBounds(): Rectangle;
-	protected _destroyCachedDisplayObject(): void;
-	protected _cacheAsBitmapDestroy(): void;
-	// end extras.cacheAsBitmap
-
-	// begin extras.getChildByName
-	name: string;
-	// end extras.getChildByName
-
-	// begin extras.getGlobalPosition
-	getGlobalPosition(point?: Point, skipUpdate?: boolean): Point;
-	// end extras.getGlobalPosition
-
-	// begin accessible target
-	accessible: boolean;
-	accessibleTitle: string;
-	accessibleHint: string;
-	tabIndex: number;
-	// end accessible target
-
-	// begin interactive target
-	interactive: boolean;
-	buttonMode: boolean;
-	hitArea: IHitArea;
-	interactiveChildren: boolean;
-	defaultCursor: string;
-	_isRightDown: boolean;
-	_isLeftDown: boolean;
-	// end interactive target
-
-	transform: TransformBase;
-	alpha: number;
-	visible: boolean;
-	renderable: boolean;
-	parent: Container;
-	worldAlpha: number;
-	filterArea: Rectangle;
-	protected _filters: Filter[];
-	protected _enabledFilters: Filter[];
-	protected _bounds: Bounds;
-	protected _boundsID: number;
-	protected _lastBoundsID: number;
-	protected _boundsRect: Rectangle;
-	protected _localBoundsRect: Rectangle;
-	protected _mask: Rectangle;
-	x: number;
-	y: number;
-	worldTransform: Matrix;
-	localTransform: Matrix;
-	position: Point;
-	scale: Point;
-	pivot: Point;
-	skew: Point;
-	rotation: number;
-	worldVisible: boolean;
-	mask: PIXI.Graphics | PIXI.Sprite;
-	filters: Filter[];
-
-	updateTransform(): void;
-	protected displayObjectUpdateTransform(): void;
-	protected _recursivePostUpdateTransform(): void;
-	getBounds(skipUpdate?: boolean, rect?: Rectangle): Rectangle;
-	getLocalBounds(rect?: Rectangle): Rectangle;
-	toGlobal(position: Point, point?: Point, skipUpdate?: boolean): Point;
-	toLocal(position: Point, from?: DisplayObject, point?: Point, skipUpdate?: boolean): Point;
-	protected renderWebGL(renderer: WebGLRenderer): void;
-	renderCanvas(renderer: CanvasRenderer): void;
-	setParent(container: Container): Container;
-	setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, pivotX?: number, pivotY?: number): DisplayObject;
-	destroy(): void;
-
-	on(event: string, fn: Function, context?: any): utils.EventEmitter;
-	once(event: string, fn: Function, context?: any): utils.EventEmitter;
-	off(event: string, fn: Function, context?: any): utils.EventEmitter;
-
-	/*
-		on(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		on(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-
-		once(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		once(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
-		*/
-
-}
-
-export class TransformBase {
-
-	static IDENTITY: TransformBase;
-
-	worldTransform: Matrix;
-	localTransform: Matrix;
-	protected _worldID: number;
-	updateLocalTransform(): void;
-	updateTransform(parentTransform: TransformBase): void;
-	updateWorldTransform(parentTransform: TransformBase): void;
-
-}
-export class TransformStatic extends TransformBase {
-
-	position: ObservablePoint;
-	scale: ObservablePoint;
-	pivot: ObservablePoint;
-	skew: ObservablePoint;
-
-	protected _rotation: number;
-	protected _sr: number;
-	protected _cr: number;
-	protected _cy: number;
-	protected _sy: number;
-	protected _nsx: number;
-	protected _cx: number;
-	protected _currentLocalID: number;
-
-	protected onChange(): void;
-	updateSkew(): void;
-	updateLocalTransform(): void;
-	updateTransform(parentTransform: TransformBase): void;
-	setFromMatrix(matrix: Matrix): void;
-
-	rotation: number;
-
-}
-export class Transform extends TransformBase {
-
-	constructor();
-
-	position: Point;
-	scale: Point;
-	skew: ObservablePoint;
-	pivot: Point;
-
-	protected _rotation: number;
-	protected _sr: number;
-	protected _cr: number;
-	protected _cy: number;
-	protected _sy: number;
-	protected _nsx: number;
-	protected _cx: number;
-
-	updateSkew(): void;
-	setFromMatrix(matrix: Matrix): void;
-
-	rotation: number;
-
-}
-
-// graphics
-
-export class GraphicsData {
-
-	constructor(lineWidth: number, lineColor: number, lineAlpha: number, fillColor: number, fillAlpha: number, fill: boolean, shape: IShape | Circle | Rectangle | RoundedRectangle | Ellipse | Polygon);
-
-	lineWidth: number;
-	lineColor: number;
-	lineAlpha: number;
-	protected _lineTint: number;
-	fillColor: number;
-	fillAlpha: number;
-	protected _fillTint: number;
-	fill: boolean;
-	protected holes: IShape[];
-	shape: IShape | Circle | Rectangle | RoundedRectangle | Ellipse | Polygon;
-	type: number;
-	clone(): GraphicsData;
-	addHole(shape: IShape | Circle | Rectangle | RoundedRectangle | Ellipse | Polygon): void;
-	destroy(options?: IDestroyOptions | boolean): void;
-
-}
-export class Graphics extends Container {
-
-	fillAlpha: number;
-	lineWidth: number;
-	lineColor: number;
-	protected graphicsData: GraphicsData[];
-	tint: number;
-	protected _prevTint: number;
-	blendMode: number;
-	currentPath: GraphicsData;
-	protected _webGL: any;
-	isMask: boolean;
-	boundsPadding: number;
-	protected _localBounds: Bounds;
-	dirty: boolean;
-	fastRectDirty: number;
-	clearDirty: number;
-	boundsDirty: number;
-	protected cachedSpriteDirty: boolean;
-	protected _spriteRect: Rectangle;
-	protected _fastRect: boolean;
-
-	static _SPRITE_TEXTURE: Texture;
-
-	clone(): Graphics;
-	lineStyle(lineWidth?: number, color?: number, alpha?: number): Graphics;
-	moveTo(x: number, y: number): Graphics;
-	lineTo(x: number, y: number): Graphics;
-	quadraticCurveTo(cpX: number, cpY: number, toX: number, toY: number): Graphics;
-	bezierCurveTo(cpX: number, cpY: number, cpX2: number, cpY2: number, toX: number, toY: number): Graphics;
-	arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): Graphics;
-	arc(cx: number, cy: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): Graphics;
-	beginFill(color: number, alpha?: number): Graphics;
-	endFill(): Graphics;
-	drawRect(x: number, y: number, width: number, height: number): Graphics;
-	drawRoundedRect(x: number, y: number, width: number, height: number, radius: number): Graphics;
-	drawCircle(x: number, y: number, radius: number): Graphics;
-	drawEllipse(x: number, y: number, width: number, height: number): Graphics;
-	drawPolygon(path: number[] | Point[]): Graphics;
-	clear(): Graphics;
-	isFastRect(): boolean;
-	protected _renderCanvas(renderer: CanvasRenderer): void;
-	protected _calculateBounds(): Rectangle;
-	protected _renderSpriteRect(renderer: PIXI.SystemRenderer): void;
-	containsPoint(point: Point): boolean;
-	updateLocalBounds(): void;
-	drawShape(shape: IShape | Circle | Rectangle | Ellipse | Polygon | RoundedRectangle): GraphicsData;
-	generateCanvasTexture(scaleMode?: number, resolution?: number): Texture;
-	protected closePath(): Graphics;
-	protected addHole(): Graphics;
-	destroy(options?: IDestroyOptions | boolean): void;
-
-}
-export class CanvasGraphicsRenderer {
-
-	constructor(renderer: SystemRenderer);
-	render(graphics: Graphics): void;
-	protected updateGraphicsTint(graphics: Graphics): void;
-	protected renderPolygon(points: Point[], close: boolean, context: CanvasRenderingContext2D): void;
-	destroy(): void;
-
-}
-export class GraphicsRenderer extends ObjectRenderer {
-
-	constructor(renderer: PIXI.CanvasRenderer);
-
-	protected graphicsDataPool: GraphicsData[];
-	protected primitiveShader: PrimitiveShader;
-	gl: WebGLRenderingContext;
-
-	CONTEXT_UID: number;
-
-	destroy(): void;
-	render(graphics: Graphics): void;
-	protected updateGraphics(graphics: PIXI.Graphics): void;
-	getWebGLData(webGL: WebGLRenderingContext, type: number): WebGLGraphicsData;
-
-}
-export class WebGLGraphicsData {
-
-	constructor(gl: WebGLRenderingContext, shader: glCore.GLShader, attribsState: glCore.IAttribState);
-
-	gl: WebGLRenderingContext;
-	color: number[];
-	points: Point[];
-	indices: number[];
-	buffer: WebGLBuffer;
-	indexBuffer: WebGLBuffer;
-	dirty: boolean;
-	glPoints: number[];
-	glIndices: number[];
-	shader: glCore.GLShader;
-	vao: glCore.VertexArrayObject;
-
-	reset(): void;
-	upload(): void;
-	destroy(): void;
-
-}
-export class PrimitiveShader extends glCore.GLShader { }
-
-// math
-
-export namespace GroupD8 {
-
-	export var E: number;
-	export var SE: number;
-	export var S: number;
-	export var SW: number;
-	export var W: number;
-	export var NW: number;
-	export var N: number;
-	export var NE: number;
-	export var MIRROR_HORIZONTAL: number;
-	export var MIRROR_VERTICAL: number;
-
-	export function uX(ind: number): number;
-	export function uY(ind: number): number;
-	export function vX(ind: number): number;
-	export function vY(ind: number): number;
-	export function inv(rotation: number): number;
-	export function add(rotationSecond: number, rotationFirst: number): number;
-	export function sub(rotationSecond: number, rotationFirst: number): number;
-	export function rotate180(rotation: number): number;
-	export function isSwapWidthHeight(rotation: number): boolean;
-	export function byDirection(dx: number, dy: number): number;
-	export function matrixAppendRotationInv(matrix: Matrix, rotation: number, tx: number, ty: number): void;
-
-}
-export class Matrix {
-
-	a: number;
-	b: number;
-	c: number;
-	d: number;
-	tx: number;
-	ty: number;
-
-	fromArray(array: number[]): void;
-	set(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix;
-	toArray(transpose?: boolean, out?: number[]): number[];
-	apply(pos: Point, newPos?: Point): Point;
-	applyInverse(pos: Point, newPos?: Point): Point;
-	translate(x: number, y: number): Matrix;
-	scale(x: number, y: number): Matrix;
-	rotate(angle: number): Matrix;
-	append(matrix: Matrix): Matrix;
-	setTransform(x: number, y: number, pivotX: number, pivotY: number, scaleX: number, scaleY: number, rotation: number, skewX: number, skewY: number): PIXI.Matrix;
-	prepend(matrix: Matrix): Matrix;
-	invert(): Matrix;
-	identity(): Matrix;
-	decompose(transform: TransformBase): TransformBase;
-	clone(): Matrix;
-	copy(matrix: Matrix): Matrix;
-
-	static IDENTITY: Matrix;
-	static TEMP_MATRIX: Matrix;
-
-}
-export class ObservablePoint {
-
-	constructor(cb: Function, scope?: any, x?: number, y?: number);
-
-	x: number;
-	y: number;
-	cb: () => void;
-	scope: any;
-
-	set(x?: number, y?: number): void;
-	copy(point: Point | ObservablePoint): void;
-
-}
-export class Point {
-
-	constructor(x?: number, y?: number);
-
-	x: number;
-	y: number;
-
-	clone(): Point;
-	copy(p: Point): void;
-	equals(p: Point): boolean;
-	set(x?: number, y?: number): void;
-
-}
-
-export interface IShape {
-}
-export interface IHitArea extends IShape {
+    export class Spritesheet {
 
-	contains(x: number, y: number): boolean;
+        static BATCH_SIZE: number;
 
-}
-export class Circle {
-
-	constructor(x?: number, y?: number, radius?: number);
-
-	x: number;
-	y: number;
-	radius: number;
-	type: number;
-
-	clone(): Circle;
-	contains(x: number, y: number): boolean;
-	getBounds(): Rectangle;
-
-}
-export class Ellipse {
-
-	constructor(x?: number, y?: number, width?: number, height?: number);
+        constructor(baseTexture: BaseTexture, data: any, resolutionFilename?: string);
 
-	x: number;
-	y: number;
-	width: number;
-	height: number;
-	type: number;
+        baseTexture: BaseTexture;
+        textures: { [key: string]: Texture; };
+        data: any;
+        resolution: number;
+        protected _frames: any;
+        protected _frameKeys: string;
+        protected _batchIndex: number;
+        protected _callback: (spriteSheet: this, textures: { [key: string]: Texture; }) => void;
+        protected _updateResolution(resolutionFilename: string): number;
+        parse(callback: (spriteSheet: this, textures: { [key: string]: Texture; }) => void): void;
+        protected _processFrames(initialFrameIndex: number): void;
+        protected _parseComplete(): void;
+        protected _nextBatch(): void;
+        destroy(destroyBase?: boolean): void;
 
-	clone(): Ellipse;
-	contains(x: number, y: number): boolean;
-	getBounds(): Rectangle;
+    }
 
-}
-export class Polygon {
+    export class VideoBaseTexture extends BaseTexture {
 
-	constructor(points: Point[] | number[]);
-	constructor(...points: Point[]);
-	constructor(...points: number[]);
+        constructor(source: HTMLVideoElement, scaleMode?: number);
 
-	closed: boolean;
-	points: number[];
-	type: number;
+        autoUpdate: boolean;
+        autoPlay: boolean;
+        protected _isAutoUpdating: boolean;
 
-	clone(): Polygon;
-	contains(x: number, y: number): boolean;
-	close(): void;
-
-}
-export class Rectangle {
+        update(): void;
+        protected _onCanPlay(): void;
+        protected _onPlayStart(): void;
+        protected _onPlayStop(): void;
+        destroy(): void;
+        protected _isSourcePlaying(): boolean;
+        protected _isSourceReady(): boolean;
 
-	constructor(x?: number, y?: number, width?: number, height?: number);
+        static fromVideo(video: HTMLVideoElement, scaleMode?: number): VideoBaseTexture;
+        static fromUrl(videoSrc: string | any | string[] | any[]): VideoBaseTexture;
+        static fromUrls(videoSrc: string | any | string[] | any[]): VideoBaseTexture;
 
-	x: number;
-	y: number;
-	width: number;
-	height: number;
-	type: number;
-	left: number;
-	right: number;
-	top: number;
-	bottom: number;
-
-	static EMPTY: Rectangle;
-
-	clone(): Rectangle;
-	copy(rectangle: Rectangle): Rectangle;
-	contains(x: number, y: number): boolean;
-	pad(paddingX: number, paddingY: number): void;
-	fit(rectangle: Rectangle): void;
-	enlarge(rect: Rectangle): void;
-
-}
-export class RoundedRectangle {
-
-	constructor(x?: number, y?: number, width?: number, height?: number, radius?: number);
-
-	x: number;
-	y: number;
-	width: number;
-	height: number;
-	radius: number;
-	type: number;
-
-	clone(): RoundedRectangle;
-	contains(x: number, y: number): boolean;
-
-}
+        source: HTMLVideoElement;
+        protected loadSource(source: HTMLVideoElement): void;
+    }
 
-// renderers
-
-export interface IRendererOptions {
-
-	view?: HTMLCanvasElement;
-	transparent?: boolean;
-	autoResize?: boolean;
-	antialias?: boolean;
-	resolution?: number;
-	clearBeforeRender?: boolean;
-	backgroundColor?: number;
-	roundPixels?: boolean;
-	context?: WebGLRenderingContext;
-
-}
-export class SystemRenderer extends utils.EventEmitter {
-
-	constructor(system: string, width?: number, height?: number, options?: IRendererOptions);
-
-	type: number;
-	width: number;
-	height: number;
-	view: HTMLCanvasElement;
-	resolution: number;
-	transparent: boolean;
-	autoResize: boolean;
-	blendModes: any; // todo?
-	preserveDrawingBuffer: boolean;
-	clearBeforeRender: boolean;
-	roundPixels: boolean;
-	protected _backgroundColor: number;
-	protected _backgroundColorRgba: number[];
-	protected _backgroundColorString: string;
-	protected _tempDisplayObjectParent: Container;
-	protected _lastObjectRendered: DisplayObject;
-	backgroundColor: number;
-
-	resize(width: number, height: number): void;
-	generateTexture(displayObject: DisplayObject, scaleMode?: number, resolution?: number): RenderTexture;
-	render(...args: any[]): void;
-	destroy(removeView?: boolean): void;
-
-}
-export class CanvasRenderer extends SystemRenderer {
-
-	// plugintarget mixin start
-	static __plugins: any[];
-	static registerPlugin(pluginName: string, ctor: Function): void;
-	plugins: any;
-	initPlugins(): void;
-	destroyPlugins(): void;
-	// plugintarget mixin end
-
-	constructor(width?: number, height?: number, options?: IRendererOptions);
-
-	rootContext: CanvasRenderingContext2D;
-	rootResolution: number;
-	refresh: boolean;
-	maskManager: CanvasMaskManager;
-	smoothProperty: string;
-	extract: extract.CanvasExtract;
-
-	context: CanvasRenderingContext2D;
-
-	render(displayObject: PIXI.DisplayObject, renderTexture?: PIXI.RenderTexture, clear?: boolean, transform?: PIXI.Transform, skipUpdateTransform?: boolean): void
-	setBlendMode(blendMode: number): void;
-	destroy(removeView?: boolean): void;
-	resize(w: number, h: number): void;
-
-	on(event: "prerender", fn: () => void, context?: any): utils.EventEmitter;
-	on(event: "postrender", fn: () => void, context?: any): utils.EventEmitter;
-	on(event: string, fn: Function, context?: any): utils.EventEmitter;
-	once(event: "prerender", fn: () => void, context?: any): utils.EventEmitter;
-	once(event: "postrender", fn: () => void, context?: any): utils.EventEmitter;
-	once(event: string, fn: Function, context?: any): utils.EventEmitter;
-	off(event: string, fn: Function, context?: any): utils.EventEmitter;
-
-}
-export class CanvasMaskManager {
-
-	constructor(renderer: CanvasRenderer);
-
-	pushMask(maskData: any): void;
-	protected renderGraphicsShape(graphics: Graphics): void;
-	popMask(renderer: WebGLRenderer | CanvasRenderer): void;
-	destroy(): void;
-
-}
-export class CanvasRenderTarget {
-
-	constructor(width: number, height: number, resolution: number);
-
-	canvas: HTMLCanvasElement;
-	context: CanvasRenderingContext2D;
-	resolution: number;
-
-	width: number;
-	height: number;
-
-	clear(): void;
-	resize(width: number, height: number): void;
-	destroy(): void;
-
-}
+    // ticker
 
-export interface IWebGLRendererOptions {
+    namespace ticker {
 
-	view?: HTMLCanvasElement;
-	transparent?: boolean;
-	autoResize?: boolean;
-	antialias?: boolean;
-	forceFXAA?: boolean;
-	resolution?: number;
-	clearBeforeRender?: boolean;
-	preserveDrawingBuffer?: boolean;
-	roundPixels?: boolean;
+        export const shared: Ticker;
 
-}
-export class WebGLRenderer extends SystemRenderer {
-
-	// plugintarget mixin start
-	static __plugins: any[];
-	static registerPlugin(pluginName: string, ctor: Function): void;
-	plugins: any;
-	initPlugins(): void;
-	destroyPlugins(): void;
-	// plugintarget mixin end
-
-	constructor(width?: number, height?: number, options?: IWebGLRendererOptions);
-
-	protected _contextOptions: {
-		alpha: boolean;
-		antiAlias: boolean;
-		premultipliedAlpha: boolean;
-		stencil: boolean;
-		preseveDrawingBuffer: boolean;
-	};
-	protected _backgroundColorRgba: number[];
-	maskManager: MaskManager;
-	stencilManager: StencilManager;
-	emptyRenderer: ObjectRenderer;
-	currentRenderer: ObjectRenderer;
-	gl: WebGLRenderingContext;
-	CONTEXT_UID: number;
-	state: WebGLState;
-	renderingToScreen: boolean;
-	boundTextures: Texture[];
-	filterManager: FilterManager;
-	textureManager: TextureManager;
-	extract: extract.WebGLExtract;
-	protected drawModes: any;
-	protected _activeShader: Shader;
-	_activeRenderTarget: RenderTarget;
-	protected _initContext(): void;
-
-	render(displayObject: PIXI.DisplayObject, renderTexture?: PIXI.RenderTexture, clear?: boolean, transform?: PIXI.Transform, skipUpdateTransform?: boolean): void
-	setObjectRenderer(objectRenderer: ObjectRenderer): void;
-	flush(): void;
-	resize(width: number, height: number): void;
-	setBlendMode(blendMode: number): void;
-	clear(clearColor?: number): void;
-	setTransform(matrix: Matrix): void;
-	bindRenderTexture(renderTexture: RenderTexture, transform: Transform): WebGLRenderer;
-	bindRenderTarget(renderTarget: RenderTarget): WebGLRenderer;
-	bindShader(shader: Shader): WebGLRenderer;
-	bindTexture(texture: Texture | BaseTexture, location?: number, forceLocation?: boolean): number;
-	unbindTexture(texture: Texture | BaseTexture): WebGLRenderer;
-	createVao(): glCore.VertexArrayObject;
-	bindVao(vao: glCore.VertexArrayObject): WebGLRenderer;
-	reset(): WebGLRenderer;
-	handleContextLost: (event: WebGLContextEvent) => void;
-	handleContextRestored: () => void;
-	destroy(removeView?: boolean): void;
-
-	on(event: "context", fn: (gl: WebGLRenderingContext) => void, context?: any): utils.EventEmitter;
-	on(event: "prerender", fn: () => void, context?: any): utils.EventEmitter;
-	on(event: "postrender", fn: () => void, context?: any): utils.EventEmitter;
-	on(event: string, fn: Function, context?: any): utils.EventEmitter;
-	once(event: "context", fn: (gl: WebGLRenderingContext) => void, context?: any): utils.EventEmitter;
-	once(event: "prerender", fn: () => void, context?: any): utils.EventEmitter;
-	once(event: "postrender", fn: () => void, context?: any): utils.EventEmitter;
-	once(event: string, fn: Function, context?: any): utils.EventEmitter;
-	off(event: string, fn: Function, context?: any): utils.EventEmitter;
+        export class Ticker {
 
-}
-export class WebGLState {
-
-	constructor(gl: WebGLRenderingContext);
-
-	activeState: number[];
-	defaultState: number[];
-	stackIndex: number;
-	stack: number[];
-	gl: WebGLRenderingContext;
-	maxAttribs: number;
-	attribState: glCore.IAttribState;
-	nativeVaoExtension: any;
-
-	push(): void;
-	pop(): void;
-	setState(state: number[]): void;
-	setBlend(value: number): void;
-	setBlendMode(value: number): void;
-	setDepthTest(value: number): void;
-	setCullFace(value: number): void;
-	setFrontFace(value: number): void;
-	resetAttributes(): void;
-	resetToDefault(): void;
+            protected _tick(time: number): void;
+            protected _emitter: utils.EventEmitter;
+            protected _requestId: number | null;
+            protected _maxElapsedMS: number;
 
-}
-export class TextureManager {
+            protected _requestIfNeeded(): void;
+            protected _cancelIfNeeded(): void;
+            protected _startIfPossible(): void;
 
-	constructor(renderer: WebGLRenderer);
+            autoStart: boolean;
+            deltaTime: number;
+            elapsedMS: number;
+            lastTime: number;
+            speed: number;
+            started: boolean;
 
-	renderer: WebGLRenderer;
-	gl: WebGLRenderingContext;
-	protected _managedTextures: WebGLTexture[];
+            FPS: number;
+            minFPS: number;
 
-	bindTexture(): void;
-	getTexture(): WebGLTexture;
-	updateTexture(texture: BaseTexture | Texture): WebGLTexture;
-	destroyTexture(texture: BaseTexture, _skipRemove?: boolean): void;
-	removeAll(): void;
-	destroy(): void;
+            add(fn: (deltaTime: number) => void, context?: any): Ticker;
+            addOnce(fn: (deltaTime: number) => void, context?: any): Ticker;
+            remove(fn: (deltaTime: number) => void, context?: any): Ticker;
+            start(): void;
+            stop(): void;
+            update(): void;
 
-}
-export class TextureGarbageCollector {
+        }
 
-	constructor(renderer: WebGLRenderer);
+    }
 
-	renderer: WebGLRenderer;
-	count: number;
-	checkCount: number;
-	maxIdle: number;
-	checkCountMax: number;
-	mode: number;
+    // shader
 
-	update(): void;
-	run(): void;
-	unload(): void;
+    export class Shader extends glCore.GLShader { }
 
-}
-export abstract class ObjectRenderer extends WebGLManager {
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////EXTRACT///////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
 
-	constructor(renderer: WebGLRenderer);
+    export namespace extract {
 
-	start(): void;
-	stop(): void;
-	flush(): void;
+        export class CanvasExtract {
 
-	render(...args: any[]): void;
+            protected renderer: CanvasRenderer;
+
+            constructor(renderer: CanvasRenderer);
+
+            image(target?: DisplayObject | RenderTexture): HTMLImageElement;
+            base64(target?: DisplayObject | RenderTexture): string;
+            canvas(target?: DisplayObject | RenderTexture): HTMLCanvasElement;
+            pixels(renderTexture?: DisplayObject | RenderTexture): number[];
+
+            destroy(): void;
+
+        }
+        export class WebGLExtract {
+            protected renderer: WebGLRenderer;
+
+            constructor(renderer: WebGLRenderer);
 
-}
-export class Quad {
-
-	constructor(gl: WebGLRenderingContext);
-
-	gl: WebGLRenderingContext;
-	vertices: number[];
-	uvs: number[];
-	interleaved: number[];
-	indices: number[];
-	vertexBuffer: WebGLBuffer;
-	vao: glCore.VertexArrayObject;
-	initVao(shader: glCore.GLShader): void;
-	map(targetTextureFrame: Rectangle, destinationFrame: Rectangle): Quad;
-	upload(): Quad;
-	destroy(): void;
+            image(target?: DisplayObject | RenderTexture): HTMLImageElement;
+            base64(target?: DisplayObject | RenderTexture): string;
+            canvas(target?: DisplayObject | RenderTexture): HTMLCanvasElement;
+            pixels(renderTexture?: DisplayObject | RenderTexture): number[];
 
-}
-export class RenderTarget {
-
-	constructor(gl: WebGLRenderingContext, width: number, height: number, scaleMode: number, resolution: number, root?: boolean);
-
-	gl: WebGLRenderingContext;
-	frameBuffer: glCore.GLFramebuffer;
-	texture: Texture;
-	clearColor: number[];
-	size: Rectangle;
-	resolution: number;
-	projectionMatrix: Matrix;
-	transform: Matrix;
-	frame: Rectangle;
-	defaultFrame: Rectangle;
-	destinationFrame: Rectangle;
-	sourceFrame: Rectangle;
-	stencilBuffer: glCore.GLFramebuffer;
-	stencilMaskStack: Graphics[];
-	filterData: {
-		index: number,
-		stack: Array<{
-			renderTarget: RenderTarget,
-			filter: any[];
-			bounds: Rectangle
-		}>
-	};
-	scaleMode: number;
-	root: boolean;
-
-	clear(clearColor?: number[]): void;
-	attachStencilBuffer(): void;
-	setFrame(destinationFrame: Rectangle, sourceFrame: Rectangle): void;
-	activate(): void;
-	calculateProjection(destinationFrame: Rectangle, sourceFrame: Rectangle): void;
-	resize(width: number, height: number): void;
-	destroy(): void;
+            destroy(): void;
+        }
 
-}
+    }
 
-export class BlendModeManager extends WebGLManager {
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////EXTRAS////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
 
-	constructor(renderer: WebGLRenderer);
+    export namespace extras {
 
-	currentBlendMode: number;
+        export interface IBitmapTextStyle {
 
-	setBlendMode(blendMode: number): boolean;
+            font?: string | {
+                name?: string;
+                size?: number;
+            };
+            align?: string;
+            tint?: number;
 
-}
-export class FilterManager extends WebGLManager {
-
-	constructor(renderer: WebGLRenderer);
-
-	gl: WebGLRenderingContext;
-	quad: Quad;
-	stack: Array<{
-		renderTarget: RenderTarget;
-		sourceFrame: Rectangle;
-		destinationFrame: Rectangle;
-		filters: Filter[];
-		target: any;
-		resolution: number;
-	}>;
-	stackIndex: number;
-	shaderCache: any;
-	filterData: any;
-
-	pushFilter(target: RenderTarget, filters: Filter[]): void;
-	popFilter(): void;
-	applyFilter(shader: glCore.GLShader | Filter, inputTarget: RenderTarget, outputTarget: RenderTarget, clear?: boolean): void;
-	syncUniforms(shader: glCore.GLShader, filter: Filter): void;
-	getRenderTarget(clear?: boolean, resolution?: number): RenderTarget;
-	returnRenderTarget(renderTarget: RenderTarget): RenderTarget;
-	calculateScreenSpaceMatrix(outputMatrix: Matrix): Matrix;
-	calculateNormalisedScreenSpaceMatrix(outputMatrix: Matrix): Matrix;
-	calculateSpriteMatrix(outputMatrix: Matrix, sprite: Sprite): Matrix;
-	destroy(): void;
-	emptyPool(): void;
-	getPotRenderTarget(gl: WebGLRenderingContext, minWidth: number, minHeight: number, resolution: number): RenderTarget;
-	freePotRenderTarget(renderTarget: RenderTarget): void;
+        }
+        export class BitmapText extends Container {
 
-}
-export class StencilMaskStack {
+            static registerFont(xml: XMLDocument, texture: Texture): any;
 
-	stencilStack: any[];
-	reverse: boolean;
-	count: number;
+            constructor(text: string, style?: IBitmapTextStyle);
 
-}
-export class MaskManager extends WebGLManager {
-
-	scissor: boolean;
-	scissorData: any;
-	scissorRenderTarget: RenderTarget;
-	enableScissor: boolean;
-	alphaMaskPool: number[];
-	alphaMaskIndex: number;
-	pushMask(target: RenderTarget, maskData: Sprite | Graphics): void;
-	popMask(target: RenderTarget, maskData: Sprite | Graphics): void;
-	pushSpriteMask(target: RenderTarget, maskData: Sprite | Graphics): void;
-	popSpriteMask(): void;
-	pushStencilMask(maskData: Sprite | Graphics): void;
-	popStencilMask(): void;
-	pushScissorMask(target: RenderTarget, maskData: Sprite | Graphics): void;
-	popScissorMask(): void;
+            protected _textWidth: number;
+            protected _textHeight: number;
+            textWidth: number;
+            textHeight: number;
+            protected _glyphs: Sprite[];
+            protected _font: string | {
+                name?: string;
+                size?: number;
+            };
+            font: string | {
+                name?: string;
+                size?: number;
+            };
+            protected _text: string;
+            maxWidth: number;
+            maxLineHeight: number;
+            protected _anchor: ObservablePoint;
+            dirty: boolean;
+            tint: number;
+            align: string;
+            text: string;
+            anchor: PIXI.Point | number;
 
-}
-export class StencilManager extends WebGLManager {
+            protected updateText(): void;
+            updateTransform(): void;
+            getLocalBounds(): Rectangle;
+            protected validate(): void;
 
-	constructor(renderer: WebGLRenderer);
+            static fonts: any;
 
-	stencilMaskStack: Graphics[];
+        }
+        export class AnimatedSprite extends Sprite {
 
-	setMaskStack(stencilMasStack: Graphics[]): void;
-	pushStencil(graphics: Graphics): void;
-	popStencil(): void;
-	destroy(): void;
+            constructor(textures: Texture[] | { texture: Texture, time?: number }[], autoUpdate?: boolean);
 
-}
-export class WebGLManager {
+            protected _autoUpdate: boolean;
+            protected _textures: Texture[];
+            protected _durations: number[];
+            textures: Texture[] | { texture: Texture, time?: number }[];
+            animationSpeed: number;
+            loop: boolean;
+            onComplete: () => void;
+            onFrameChange: (currentFrame: number) => void;
+            protected _currentTime: number;
+            playing: boolean;
+            totalFrames: number;
+            currentFrame: number;
+            stop(): void;
+            play(): void;
+            gotoAndStop(frameNumber: number): void;
+            gotoAndPlay(frameNumber: number): void;
+            protected update(deltaTime: number): void;
+            destroy(): void;
+
+            static fromFrames(frame: string[]): AnimatedSprite;
+            static fromImages(images: string[]): AnimatedSprite;
+
+        }
+        export class TextureTransform {
 
-	constructor(renderer: WebGLRenderer);
+            constructor(texture: Texture, clampMargin?: number);
 
-	renderer: WebGLRenderer;
-	onContextChange(): void;
-	destroy(): void;
+            protected _texture: Texture;
+            protected mapCoord: Matrix;
+            protected uClampFrame: Float32Array;
+            protected uClampOffset: Float32Array;
+            protected _lastTextureID: number;
+
+            clampOffset: number;
+            clampMargin: number;
+
+            texture: Texture;
 
-}
-export interface IUniformData {
+            update(forceUpdate?: boolean): void;
+
+        }
+        export class TilingSprite extends Sprite {
+
+            constructor(texture: Texture, width?: number, height?: number);
+
+            tileTransform: TransformStatic;
+            protected _width: number;
+            protected _height: number;
+            protected _canvasPattern: CanvasPattern;
+            uvTransform: TextureTransform;
+            uvRespectAnchor: boolean;
+
+            clampMargin: number;
+            tileScale: Point | ObservablePoint;
+            tilePosition: Point | ObservablePoint;
+
+            protected _onTextureUpdate(): void;
+            protected _renderWebGL(renderer: WebGLRenderer): void;
+            protected _renderCanvas(renderer: CanvasRenderer): void;
+            protected _calculateBounds(): void;
+            getLocalBounds(rect?: Rectangle): Rectangle;
+            containsPoint(point: Point): boolean;
+            destroy(): void;
+
+            static from(source: number | string | BaseTexture | HTMLCanvasElement | HTMLVideoElement, width?: number, height?: number): TilingSprite;
+            static fromFrame(frameId: string, width?: number, height?: number): TilingSprite;
+            // if you remove the next line, the class will break. https://github.com/pixijs/pixi-typescript/issues/96
+            static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
+            static fromImage(imageId: string, width?: number, height?: number, crossorigin?: boolean, scaleMode?: number): TilingSprite;
+
+            width: number;
+            height: number;
+
+        }
+        export class TilingSpriteRenderer extends ObjectRenderer {
+
+            constructor(renderer: WebGLRenderer);
+
+            render(ts: TilingSprite): void;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////FILTERS///////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
 
-	type: string;
-	value: any;
+    export namespace filters {
 
-	// name is set by pixi if uniforms were automatically extracted from shader code, but not used anywhere
-	name?: string;
+        export class FXAAFilter extends Filter { }
+        export class BlurFilter extends Filter {
 
-}
-export class Filter {
-
-	// param uniforms should be an object matching type {[name: string]: IUniformData};
-	// left untyped as there's no way to define the type without requiring an index signature or making this class generic
-	constructor(vertexSrc?: string, fragmentSrc?: string, uniforms?: any);
-
-	vertextSrc: string;
-	fragmentSrc: string;
-	protected uniformData: { [name: string]: IUniformData };
-	uniforms: { [name: string]: any };
-	glShaders: any;
-	glShaderKey: string;
-	padding: number;
-	resolution: number;
-	blendMode: number;
-	enabled: boolean;
-	apply(filterManager: FilterManager, input: RenderTarget, output: RenderTarget, clear?: boolean): void;
-
-	static defaultVertexSrc: string;
-	static defaultFragmentSrc: string;
+            constructor(strength?: number, quality?: number, resolution?: number, kernelSize?: number);
 
-}
-export class SpriteMaskFilter extends Filter {
+            blurXFilter: BlurXFilter;
+            blurYFilter: BlurYFilter;
+            resolution: number;
+            padding: number;
+            passes: number;
+            blur: number;
+            blurX: number;
+            blurY: number;
+            quality: number;
 
-	constructor(sprite: Sprite);
+        }
+        export class BlurXFilter extends Filter {
 
-	maskSprite: Sprite;
-	maskMatrix: Matrix;
-	apply(filterManager: FilterManager, input: RenderTarget, output: RenderTarget): void;
+            constructor(strength?: number, quality?: number, resolution?: number, kernelSize?: number);
 
-}
+            protected _quality: number;
 
-// sprites
-
-export class Sprite extends Container {
-
-	constructor(texture?: Texture);
-
-	protected _anchor: ObservablePoint;
-	anchor: ObservablePoint;
-	protected _texture: Texture;
-	protected _width: number;
-	protected _height: number;
-	tint: number;
-	protected _tint: number;
-	protected _tintRGB: number;
-	blendMode: number;
-	pluginName: string;
-	protected cachedTint: number;
-	texture: Texture;
-	protected textureDirty: boolean;
-	protected _textureID: number;
-	protected _transformID: number;
-	protected vertexTrimmedData: Float32Array;
-	vertexData: Float32Array;
-	width: number;
-	height: number;
-
-	protected _onTextureUpdate(): void;
-	calculateVertices(): void;
-	protected _calculateBounds(): void;
-	protected calculateTrimmedVertices(): void;
-	protected onAnchorUpdate(): void;
-	protected _renderWebGL(renderer: WebGLRenderer): void;
-	protected _renderCanvas(renderer: CanvasRenderer): void;
-	getLocalBounds(): Rectangle;
-	containsPoint(point: Point): boolean;
-	destroy(options?: IDestroyOptions | boolean): void;
-
-	static from(source: number | string | BaseTexture | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement): Sprite;
-	static fromFrame(frameId: string): Sprite;
-	static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
+            quality: number;
+            passes: number;
+            resolution: number;
+            strength: number;
+            firstRun: boolean;
+            blur: number;
 
-}
-export class BatchBuffer {
+        }
+        export class BlurYFilter extends Filter {
 
-	vertices: ArrayBuffer;
-	float32View: number[];
-	uint32View: number[];
+            constructor(strength?: number, quality?: number, resolution?: number, kernelSize?: number);
 
-	destroy(): void;
+            protected _quality: number;
 
-}
-export class SpriteRenderer extends ObjectRenderer {
-
-	constructor(renderer: PIXI.WebGLRenderer);
-
-	vertSize: number;
-	vertByteSize: number;
-	size: number;
-	buffers: BatchBuffer[];
-	indices: number[];
-	shaders: Shader[];
-	currentIndex: number;
-	tick: number;
-	groups: any[];
-	sprites: Sprite[];
-	vertexBuffers: number[];
-	vaos: glCore.VertexArrayObject[];
-	vaoMax: number;
-	vertexCount: number;
-
-	protected onContextChanged: () => void;
-	protected onPrerender: () => void;
-	render(sprite: Sprite): void;
-	flush(): void;
-	start(): void;
-	stop(): void;
-	destroy(): void;
+            quality: number;
+            passes: number;
+            resolution: number;
+            strength: number;
+            firstRun: boolean;
+            blur: number;
 
-}
-export class CanvasSpriteRenderer extends ObjectRenderer {
+        }
+        export class ColorMatrixFilter extends Filter {
 
-	constructor(renderer: WebGLRenderer);
+            constructor();
 
-	render(sprite: Sprite): void;
-	destroy(): void;
+            protected _loadMatrix(matrix: number[], multiply?: boolean): void;
+            protected _multiply(out: number[], a: number[], b: number[]): void;
+            protected _colorMatrix(matrix: number[]): void;
 
-}
-export namespace CanvasTinter {
+            matrix: number[];
 
-	export function getTintedTexture(sprite: Sprite, color: number): HTMLCanvasElement;
-	export function tintWithMultiply(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
-	export function tintWithOverlay(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
-	export function tintWithPerPixel(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
-	export function roundColor(color: number): number;
+            brightness(b: number, multiply?: boolean): void;
+            greyscale(scale: number, multiply?: boolean): void;
+            blackAndWhite(multiply?: boolean): void;
+            hue(rotation: number, multiply?: boolean): void;
+            contrast(amount: number, multiply?: boolean): void;
+            saturate(amount: number, multiply?: boolean): void;
+            desaturate(multiply?: boolean): void;
+            negative(multiply?: boolean): void;
+            sepia(multiply?: boolean): void;
+            technicolor(multiply?: boolean): void;
+            polaroid(multiply?: boolean): void;
+            toBGR(multiply?: boolean): void;
+            kodachrome(multiply?: boolean): void;
+            browni(multiply?: boolean): void;
+            vintage(multiply?: boolean): void;
+            colorTone(desaturation: number, toned: number, lightColor: string, darkColor: string, multiply?: boolean): void;
+            night(intensity: number, multiply?: boolean): void;
+            predator(amount: number, multiply?: boolean): void;
+            lsd(multiply?: boolean): void;
+            reset(): void;
+
+        }
+        export class DisplacementFilter extends Filter {
+
+            constructor(sprite: Sprite, scale?: number);
+
+            scale: Point;
+            map: Texture;
+
+        }
+        export class VoidFilter extends Filter {
+            glShaderKey: number;
+        }
+
+        // pixi-filters.d.ts todo
+        // https://github.com/pixijs/pixi-filters/
+        export class NoiseFilter extends Filter {
+
+            noise: number;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////INTERACTION///////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export namespace interaction {
+
+        export interface InteractiveTarget {
+
+            interactive: boolean;
+            interactiveChildren: boolean;
+            hitArea: PIXI.Rectangle | PIXI.Circle | PIXI.Ellipse | PIXI.Polygon | PIXI.RoundedRectangle;
+            buttonMode: boolean;
+            cursor: string;
+            trackedPointers(): { [key: number]: InteractionTrackingData; };
+
+            // depricated
+            defaultCursor: string;
+
+        }
+        export interface InteractionTrackingData {
+
+            readonly pointerId: number;
+            flags: number;
+            none: number;
+            over: boolean;
+            rightDown: boolean;
+            leftDown: boolean;
+
+        }
+        export interface InteractionEvent {
+
+            stopped: boolean;
+            target: DisplayObject;
+            currentTarget: DisplayObject;
+            type: string;
+            data: InteractionData;
+            stopPropagation(): void;
+
+        }
+        export class InteractionData {
+
+            global: Point;
+            target: DisplayObject;
+            originalEvent: Event;
+            identifier?: number;
+
+            getLocalPosition(displayObject: DisplayObject, point?: Point, globalPos?: Point): Point;
+
+        }
+        export interface InteractionManagerOptions {
+            autoPreventDefault?: boolean;
+            interactionFrequency?: number;
+        }
+        export class InteractionManager extends utils.EventEmitter {
+
+            constructor(renderer: CanvasRenderer | WebGLRenderer | SystemRenderer, options?: InteractionManagerOptions);
+
+            renderer: SystemRenderer;
+            autoPreventDefault: boolean;
+            interactionFrequency: number;
+            mouse: InteractionData;
+            activeInteractionData: { [key: number]: InteractionData; };
+            interactionDataPool: InteractionData[];
+            eventData: InteractionEvent;
+            protected interactionDOMElement: HTMLElement;
+            moveWhenInside: boolean;
+            eventsAdded: boolean;
+            protected mouseOverRenderer: boolean;
+            readonly supportsTouchEvents: boolean;
+            readonly supportsPointerEvents: boolean;
+            protected onPointerUp: (event: PointerEvent) => void;
+            protected processPointerUp: (interactionEvent: InteractionEvent, displayObject: Container | PIXI.Sprite | PIXI.extras.TilingSprite, hit: boolean) => void;
+            protected onPointerCancel: (event: PointerEvent) => void;
+            protected processPointerCancel: (interactionEvent: InteractionEvent, displayObject: PIXI.Container | PIXI.Sprite | PIXI.extras.TilingSprite) => void;
+            protected onPointerDown: (event: PointerEvent) => void;
+            protected processPointerDown: (interactionEvent: InteractionEvent, displayObject: PIXI.Container | PIXI.Sprite | PIXI.extras.TilingSprite, hit: boolean) => void;
+            protected onPointerMove: (event: PointerEvent) => void;
+            protected processPointerMove: (interactionEvent: InteractionEvent, displayObject: PIXI.Container | PIXI.Sprite | PIXI.extras.TilingSprite, hit: boolean) => void;
+            protected onPointerOut: (event: PointerEvent) => void;
+            protected processPointerOverOut: (interactionEvent: InteractionEvent, displayObject: PIXI.Container | PIXI.Sprite | PIXI.extras.TilingSprite, hit: boolean) => void;
+            protected onPointerOver: (event: PointerEvent) => void;
+            cursorStyles: {
+                default: string;
+                pointer: string;
+            };
+            currentCursorMode: string;
+            cursor: string;
+            protected _tempPoint: Point;
+            resolution: number;
+            protected setTargetElement(element: HTMLCanvasElement, resolution?: number): void;
+            protected addEvents(): void;
+            protected removeEvents(): void;
+            update(deltaTime?: number): void;
+            setCursorMode(mode: string): void;
+            protected dispatchEvent(displayObject: Container | Sprite | extras.TilingSprite, eventString: string, eventData: any): void;
+            mapPositionToPoint(point: Point, x: number, y: number): void;
+            protected processInteractive(interactionEvent: InteractionEvent, displayObject: PIXI.Container | PIXI.Sprite | PIXI.extras.TilingSprite, func?: Function, hitTest?: boolean, interactive?: boolean): boolean;
+            protected onPointerComplete(originalEvent: PointerEvent, cancelled: boolean, func: Function): void;
+            protected getInteractionDataForPointerId(pointerId: number): InteractionData;
+            protected releaseInteractionDataForPointerId(pointerId: number): void;
+            protected configureInteractionEventForDOMEvent(interactionEvent: InteractionEvent, pointerEvent: PointerEvent, interactionData: InteractionData): InteractionEvent;
+            protected normalizeToPointerData(event: TouchEvent | MouseEvent | PointerEvent): PointerEvent[];
+            destroy(): void;
+
+            // depricated
+            defaultCursorStyle: string;
+            currentCursorStyle: string;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////LOADER/////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    // pixi loader extends
+    // https://github.com/englercj/resource-loader/
+    // 2.0.6
+
+    class MiniSignalBinding {
+
+        constructor(fn: Function, once?: boolean, thisArg?: any);
+
+        protected _fn: Function;
+        protected _once: boolean;
+        protected _thisArg: any;
+        protected _next: MiniSignalBinding;
+        protected _prev: MiniSignalBinding;
+        protected _owner: MiniSignal;
+
+        detach(): boolean;
+
+    }
+    class MiniSignal {
+
+        constructor();
+
+        protected _head: MiniSignalBinding;
+        protected _tail: MiniSignalBinding;
+
+        handlers(exists?: boolean): MiniSignalBinding[] | boolean;
+        handlers(exists?: true): boolean;
+        handlers(exists?: false): MiniSignalBinding[];
+
+        has(node: MiniSignalBinding): boolean;
+        dispatch(): boolean;
+        add(fn: Function, thisArg?: any): any;
+        once(fn: Function, thisArg?: any): any;
+        detach(node: MiniSignalBinding): MiniSignal;
+        detachAll(): MiniSignal;
+
+    }
+
+    export namespace loaders {
+
+        export interface ILoaderOptions {
+
+            crossOrigin?: boolean | string;
+            loadType?: number;
+            xhrType?: string;
+            metaData?: any;
+            loadElement?: HTMLImageElement | HTMLAudioElement | HTMLVideoElement;
+            skipSource?: boolean;
+
+        }
+        export interface IResourceDictionary {
+
+            [index: string]: PIXI.loaders.Resource;
+
+        }
+
+        // As of ResourceLoader v2 we no longer require EventEmitter
+        // However, for depreciation reasons, it remains.
+        export class Loader extends utils.EventEmitter {
+
+            // pixi overrides here
+            static addPixiMiddleware(fn: Function): void;
+
+            // below this line is the original non-pixi loader
+
+            static Resource: any;
+            static async: any;
+            static base64: any;
+
+            constructor(baseUrl?: string, concurrency?: number);
+
+            baseUrl: string;
+            progress: number;
+            loading: boolean;
+            defaultQueryString: string;
+
+            protected _beforeMiddleware: Function[];
+            protected _afterMiddleware: Function[];
+            protected _resourcesParsing: Resource[];
+            protected _boundLoadResource: (r: Resource, d: Function) => void;
+            protected _queue: any;
+
+            resources: IResourceDictionary;
+
+            onProgress: MiniSignal;
+            onError: MiniSignal;
+            onLoad: MiniSignal;
+            onStart: MiniSignal;
+            onComplete: MiniSignal;
+
+            add(...params: any[]): this;
+            add(name: string, url: string, options?: ILoaderOptions, cb?: Function): this;
+            add(url: string, options?: ILoaderOptions, cb?: Function): this;
+            add(obj: any | any[], options?: ILoaderOptions, cb?: Function): this;
+
+            pre(fn: Function): this;
+            use(fn: Function): this;
+            reset(): this;
+            load(cb?: Function): this;
+
+            protected _prepareUrl(url: string): string;
+            protected _loadResource(resource: Resource, dequeue: Function): void;
+            protected _onComplete(): void;
+            protected _onLoad(resource: Resource): void;
+
+            // depreciation
+
+            on(event: "complete", fn: (loader: loaders.Loader, object: any) => void, context?: any): this;
+            on(event: "error", fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): this;
+            on(event: "load", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): this;
+            on(event: "progress", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): this;
+            on(event: "start", fn: (loader: loaders.Loader) => void, context?: any): this;
+            on(event: string, fn: Function, context?: any): this;
+
+            once(event: "complete", fn: (loader: loaders.Loader, object: any) => void, context?: any): this;
+            once(event: "error", fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): this;
+            once(event: "load", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): this;
+            once(event: "progress", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): this;
+            once(event: "start", fn: (loader: loaders.Loader) => void, context?: any): this;
+            once(event: string, fn: Function, context?: any): this;
+
+        }
+        export interface ITextureDictionary {
+            [index: string]: PIXI.Texture;
+        }
+        export class Resource {
+
+            static setExtensionLoadType(extname: string, loadType: number): void;
+            static setExtensionXhrType(extname: string, xhrType: string): void;
+
+            constructor(name: string, url: string | string[], options?: ILoaderOptions);
+
+            protected _flags: number;
+
+            name: string;
+            url: string;
+            extension: string;
+            data: any;
+            crossOrigin: boolean | string;
+            loadType: number;
+            xhrType: string;
+            metadata: any;
+            error: Error;
+            xhr: XMLHttpRequest | null;
+            children: Resource[];
+            type: number;
+            progressChunk: number;
+
+            protected _dequeue: Function;
+            protected _onLoadBinding: Function;
+            protected _boundComplete: Function;
+            protected _boundOnError: Function;
+            protected _boundOnProgress: Function;
+            protected _boundXhrOnError: Function;
+            protected _boundXhrOnAbort: Function;
+            protected _boundXhrOnLoad: Function;
+            protected _boundXdrOnTimeout: Function;
+
+            onStart: MiniSignal;
+            onProgress: MiniSignal;
+            onComplete: MiniSignal;
+            onAfterMiddleware: MiniSignal;
+
+            isDataUrl: boolean;
+            isComplete: boolean;
+            isLoading: boolean;
+            complete(): void;
+            abort(message?: string): void;
+            load(cb?: Function): void;
+
+            protected _hasFlag(flag: number): boolean;
+            protected _setFlag(flag: number, value: boolean): void;
+            protected _loadElement(type: string): void;
+            protected _loadSourceElement(type: string): void;
+            protected _loadXhr(): void;
+            protected _loadXdr(): void;
+            protected _createSource(type: string, url: string, mime?: string): HTMLSourceElement;
+            protected _onError(event?: any): void;
+            protected _onProgress(event?: any): void;
+            protected _xhrOnError(): void;
+            protected _xhrOnAbort(): void;
+            protected _xdrOnTimeout(): void;
+            protected _xhrOnLoad(): void;
+            protected _determineCrossOrigin(url: string, loc: any): string;
+            protected _determineXhrType(): number;
+            protected _determineLoadType(): number;
+            protected _getExtension(): string;
+            protected _getMimeXhrType(type: number): string;
+
+            static STATUS_FLAGS: {
+                NONE: number;
+                DATA_URL: number;
+                COMPLETE: number;
+                LOADING: number;
+            };
+
+            static TYPE: {
+                UNKNOWN: number;
+                JSON: number;
+                XML: number;
+                IMAGE: number;
+                AUDIO: number;
+                VIDEO: number;
+                TEXT: number;
+            };
+
+            static LOAD_TYPE: {
+                XHR: number;
+                IMAGE: number;
+                AUDIO: number;
+                VIDEO: number;
+            };
+
+            static XHR_RESPONSE_TYPE: {
+                DEFAULT: string;
+                BUFFER: string;
+                BLOB: string;
+                DOCUMENT: string;
+                JSON: string;
+                TEXT: string;
+            };
+
+            static EMPTY_GIF: string;
+
+            texture: Texture;
+            spineAtlas: any;
+            spineData: any;
+            textures?: ITextureDictionary;
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////MESH///////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export namespace mesh {
+
+        export class Mesh extends Container {
+
+            constructor(texture: Texture, vertices?: Float32Array, uvs?: Float32Array, indices?: Uint16Array, drawMode?: number);
+
+            protected _texture: Texture;
+            uvs: Float32Array;
+            vertices: Float32Array;
+            indices: Uint16Array;
+            dirty: number;
+            indexDirty: number;
+            dirtyVertex: boolean;
+            protected _geometryVersion: number;
+            blendMode: number;
+            pluginName: string;
+            canvasPadding: number;
+            drawMode: number;
+            texture: Texture;
+            tintRgb: Float32Array;
+            protected _glDatas: { [n: number]: any; };
+            protected _renderWebGL(renderer: WebGLRenderer): void;
+            protected _renderCanvas(renderer: CanvasRenderer): void;
+            protected _onTextureUpdate(): void;
+            protected _calculateBounds(): void;
+            containsPoint(point: Point): boolean;
+            tint: number;
+
+            static DRAW_MODES: {
+                TRIANGLE_MESH: number;
+                TRIANGLES: number;
+            };
+
+        }
+
+        export class CanvasMeshRenderer {
+
+            constructor(renderer: CanvasRenderer);
+
+            renderer: CanvasRenderer;
+
+            render(mesh: Mesh): void;
+            protected _renderTriangleMesh(mesh: Mesh): void;
+            protected _renderTriangles(mesh: Mesh): void;
+            protected _renderDrawTriangle(mesh: Mesh, index0: number, index1: number, index2: number): void;
+            protected renderMeshFlat(mesh: Mesh): void;
+
+            destroy(): void;
+
+        }
+
+        export class MeshRenderer extends ObjectRenderer {
+
+            constructor(renderer: WebGLRenderer);
+
+            shader: Shader;
+            render(mesh: Mesh): void;
 
-	export var cacheStepsPerColorChannel: number;
-	export var convertTintToImage: boolean;
-	export var canUseMultiply: boolean;
-	export var tintMethod: Function;
+        }
 
-}
+        export class Plane extends Mesh {
+
+            constructor(texture: Texture, verticesX?: number, verticesY?: number);
+            protected _ready: boolean;
+            verticesX: number;
+            verticesY: number;
+            drawMode: number;
+
+            refresh(): void;
 
-// text
-export interface TextStyleOptions {
-	align?: string;
-	breakWords?: boolean;
-	dropShadow?: boolean;
-	dropShadowAngle?: number;
-	dropShadowBlur?: number;
-	dropShadowColor?: string | number;
-	dropShadowDistance?: number;
-	fill?: string | string[] | number | number[] | CanvasGradient | CanvasPattern;
-	fillGradientType?: number;
-	fontFamily?: string;
-	fontSize?: number | string;
-	fontStyle?: string;
-	fontVariant?: string;
-	fontWeight?: string;
-	letterSpacing?: number;
-	lineHeight?: number;
-	lineJoin?: string;
-	miterLimit?: number;
-	padding?: number;
-	stroke?: string | number;
-	strokeThickness?: number;
-	styleID?: number;
-	textBaseline?: string;
-	wordWrap?: boolean;
-	wordWrapWidth?: number;
-}
+            protected _onTexureUpdate(): void;
 
-export class TextStyle implements TextStyleOptions {
-	align: string;
-	breakWords: boolean;
-	dropShadow: boolean;
-	dropShadowAngle: number;
-	dropShadowBlur: number;
-	dropShadowColor: string | number;
-	dropShadowDistance: number;
-	fill: string | string[] | number | number[] | CanvasGradient | CanvasPattern;
-	fillGradientType: number;
-	fontFamily: string;
-	fontSize: number | string;
-	fontStyle: string;
-	fontVariant: string;
-	fontWeight: string;
-	letterSpacing: number;
-	lineHeight: number;
-	lineJoin: string;
-	miterLimit: number;
-	padding: number;
-	stroke: string | number;
-	strokeThickness: number;
-	styleID: number;
-	textBaseline: string;
-	wordWrap: boolean;
-	wordWrapWidth: number;
-	constructor(style?: TextStyleOptions);
-	clone(): TextStyle;
-	reset(): void;
-}
+        }
 
-export class Text extends Sprite {
-
-	static getFontStyle(style: TextStyleOptions): string;
-	static calculateFontProperties(style: string): any;
-
-	constructor(text?: string, style?: TextStyleOptions);
-
-	canvas: HTMLCanvasElement;
-	context: CanvasRenderingContext2D;
-	resolution: number;
-	protected _text: string;
-	protected _style: TextStyle;
-	protected _styleListener: Function;
-	protected _font: string;
-	protected localStyleID: number;
-
-	static fontPropertiesCache: any;
-	static fontPropertiesCanvas: HTMLCanvasElement;
-	static fontPropertiesContext: CanvasRenderingContext2D;
-
-	width: number;
-	height: number;
-	style: TextStyle;
-	text: string;
-
-	protected updateText(respectDirty?: boolean): void;
-	protected drawLetterSpacing(text: string, x: number, y: number, isStroke?: boolean): void;
-	protected updateTexture(): void;
-	renderWebGL(renderer: WebGLRenderer): void;
-	protected _renderCanvas(renderer: CanvasRenderer): void;
-	protected wordWrap(text: string): string;
-	protected _calculateBounds(): void;
-	protected _onStyleChange: () => void;
-	protected _generateFillStyle(style: TextStyle, lines: string[]): string | number | CanvasGradient;
-	destroy(options?: IDestroyOptions | boolean): void;
-	dirty: boolean;
+        export class NineSlicePlane extends Plane {
 
-}
+            constructor(texture: Texture, leftWidth?: number, topHeight?: number, rightWidth?: number, bottomHeight?: number);
 
-// textures
+            width: number;
+            height: number;
+            leftWidth: number;
+            rightWidth: number;
+            topHeight: number;
+            bottomHeight: number;
 
-export class BaseRenderTexture extends BaseTexture {
+            protected _leftWidth: number;
+            protected _rightWidth: number;
+            protected _topHeight: number;
+            protected _bottomHeight: number;
+            protected _height: number;
+            protected _width: number;
+            protected _origHeight: number;
+            protected _origWidth: number;
+            protected _uvh: number;
+            protected _uvw: number;
 
-	constructor(width?: number, height?: number, scaleMode?: number, resolution?: number);
+            updateHorizontalVertices(): void;
+            updateVerticalVertices(): void;
+            protected drawSegment(context: CanvasRenderingContext2D | WebGLRenderingContext, textureSource: any, w: number, h: number, x1: number, y1: number, x2: number, y2: number): void;
 
-	height: number;
-	width: number;
-	realHeight: number;
-	realWidth: number;
-	resolution: number;
-	scaleMode: number;
-	hasLoaded: boolean;
-	protected _glRenderTargets: { [n: number]: WebGLTexture; };
-	protected _canvasRenderTarget: { [n: number]: WebGLTexture; };
-	valid: boolean;
+        }
 
-	resize(width: number, height: number): void;
-	destroy(): void;
+        export class Rope extends Mesh {
 
-	once(event: "update", fn: (baseRenderTexture: BaseRenderTexture) => void, context?: any): utils.EventEmitter;
-	once(event: string, fn: Function, context?: any): utils.EventEmitter;
-	on(event: "update", fn: (baseRenderTexture: BaseRenderTexture) => void, context?: any): utils.EventEmitter;
-	on(event: string, fn: Function, context?: any): utils.EventEmitter;
-	off(event: string, fn: Function, context?: any): utils.EventEmitter;
+            constructor(texture: Texture, points: Point[]);
 
-}
-export class BaseTexture extends utils.EventEmitter {
-
-	constructor(source?: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, scaleMode?: number, resolution?: number);
-
-	protected uuid: number;
-	protected touched: number;
-	resolution: number;
-	width: number;
-	height: number;
-	realWidth: number;
-	realHeight: number;
-	scaleMode: number;
-	hasLoaded: boolean;
-	isLoading: boolean;
-	wrapMode: number;
-	source: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement;
-	origSource: HTMLImageElement;
-	imageType: string;
-	sourceScale: number;
-	premultipliedAlpha: boolean;
-	imageUrl: string;
-	protected isPowerOfTwo: boolean;
-	mipmap: boolean;
-	wrap: boolean;
-	protected _glTextures: any;
-	protected _enabled: number;
-	protected _id: number;
-
-	update(): void;
-	protected _updateImageType(): void;
-	protected _loadSvgSource(): void;
-	protected _loadSvgSourceUsingDataUri(dataUri: string): void;
-	protected _loadSvgSourceUsingXhr(): void;
-	protected _loadSvgSourceUsingString(svgString: string): void;
-	protected loadSource(source: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement): void;
-	protected _sourceLoaded(): void;
-	destroy(): void;
-	dispose(): void;
-	updateSourceImage(newSrc: string): void;
-
-	static fromImage(imageUrl: string, crossorigin?: boolean, scaleMode?: number, sourceScale?: number): BaseTexture;
-	static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): BaseTexture;
-
-	on(event: "update", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
-	on(event: "loaded", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
-	on(event: "error", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
-	on(event: "dispose", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
-	on(event: string, fn: Function, context?: any): utils.EventEmitter;
-	once(event: "update", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
-	once(event: "loaded", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
-	once(event: "error", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
-	once(event: "dispose", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
-	once(event: string, fn: Function, context?: any): utils.EventEmitter;
-	off(event: string, fn: Function, context?: any): utils.EventEmitter;
+            points: Point[];
+            colors: number[];
+            protected _ready: boolean;
+            refresh(): void;
 
-}
-export class RenderTexture extends Texture {
+            protected _onTextureUpdate(): void;
+            updateTransform(): void;
 
-	constructor(baseRenderTexture: BaseRenderTexture, frame?: Rectangle);
+        }
+    }
 
-	protected legacyRenderer: any;
-	valid: boolean;
+    //////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////PARTICLES////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
 
-	resize(width: number, height: number, doNotResizeBaseTexture?: boolean): void;
+    export namespace particles {
 
-	static create(width?: number, height?: number, scaleMode?: number, resolution?: number): RenderTexture;
+        export interface IParticleContainerProperties {
 
-}
-export class Texture extends utils.EventEmitter {
-
-	constructor(baseTexture: BaseTexture, frame?: Rectangle, orig?: Rectangle, trim?: Rectangle, rotate?: number);
-
-	noFrame: boolean;
-	baseTexture: BaseTexture;
-	protected _frame: Rectangle;
-	trim: Rectangle;
-	valid: boolean;
-	requiresUpdate: boolean;
-	protected _uvs: TextureUvs;
-	orig: Rectangle;
-	protected _updateID: number;
-	transform: any;
-
-	update(): void;
-	protected onBaseTextureLoaded(baseTexture: BaseTexture): void;
-	protected onBaseTextureUpdated(baseTexture: BaseTexture): void;
-	destroy(destroyBase?: boolean): void;
-	clone(): Texture;
-	protected _updateUvs(): void;
-
-	static fromImage(imageUrl: string, crossOrigin?: boolean, scaleMode?: number, sourceScale?: number): Texture;
-	static fromFrame(frameId: string): Texture;
-	static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): Texture;
-	static fromVideo(video: HTMLVideoElement | string, scaleMode?: number): Texture;
-	static fromVideoUrl(videoUrl: string, scaleMode?: number): Texture;
-	static from(source: number | string | BaseTexture | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement): Texture;
-	static addTextureToCache(texture: Texture, id: string): void;
-	static removeTextureFromCache(id: string): Texture;
-
-	frame: Rectangle;
-	protected _rotate: boolean;
-	rotate: number;
-	width: number;
-	height: number;
-
-	static EMPTY: Texture;
-
-	on(event: "update", fn: (texture: Texture) => void, context?: any): utils.EventEmitter;
-	on(event: string, fn: Function, context?: any): utils.EventEmitter;
-	once(event: "update", fn: (texture: Texture) => void, context?: any): utils.EventEmitter;
-	once(event: string, fn: Function, context?: any): utils.EventEmitter;
-	off(event: string, fn: Function, context?: any): utils.EventEmitter;
+            scale?: boolean;
+            position?: boolean;
+            rotation?: boolean;
+            uvs?: boolean;
+            alpha?: boolean;
 
-}
-export class TextureUvs {
+        }
+        export class ParticleContainer extends Container {
 
-	x0: number;
-	y0: number;
-	x1: number;
-	y1: number;
-	x2: number;
-	y2: number;
-	x3: number;
-	y3: number;
+            constructor(size?: number, properties?: IParticleContainerProperties, batchSize?: number);
 
-	uvsUint32: Uint32Array;
+            protected _properties: boolean[];
+            protected _maxSize: number;
+            protected _batchSize: number;
+            protected _glBuffers: { [n: number]: WebGLBuffer; };
+            protected _bufferToUpdate: number;
+            interactiveChildren: boolean;
+            blendMode: number;
+            roundPixels: boolean;
+            baseTexture: BaseTexture;
 
-	protected set(frame: Rectangle, baseFrame: Rectangle, rotate: number): void;
+            setProperties(properties: IParticleContainerProperties): void;
+            protected onChildrenChange: (smallestChildIndex?: number) => void;
 
-}
-export class VideoBaseTexture extends BaseTexture {
+            destroy(options?: IDestroyOptions | boolean): void;
 
-	constructor(source: HTMLVideoElement, scaleMode?: number);
+        }
+        export class ParticleBuffer {
 
-	autoUpdate: boolean;
-	autoPlay: boolean;
-	protected _isAutoUpdating: boolean;
+            constructor(gl: WebGLRenderingContext, properties: any, dynamicPropertyFlags: any[], size: number);
 
-	update(): void;
-	protected _onCanPlay(): void;
-	protected _onPlayStart(): void;
-	protected _onPlayStop(): void;
-	destroy(): void;
-	protected _isSourcePlaying(): boolean;
-	protected _isSourceReady(): boolean;
+            gl: WebGLRenderingContext;
+            vertSize: number;
+            vertByteSize: number;
+            size: number;
+            dynamicProperties: any[];
+            staticProperties: any[];
+            staticStride: number;
+            staticBuffer: any;
+            staticData: any;
+            dynamicStride: number;
+            dynamicBuffer: any;
+            dynamicData: any;
 
-	static fromVideo(video: HTMLVideoElement, scaleMode?: number): VideoBaseTexture;
-	static fromUrl(videoSrc: string | any | string[] | any[]): VideoBaseTexture;
-	static fromUrls(videoSrc: string | any | string[] | any[]): VideoBaseTexture;
+            destroy(): void;
 
-	source: HTMLVideoElement;
-	protected loadSource(source: HTMLVideoElement): void;
+        }
+        export interface IParticleRendererProperty {
+            attribute: number;
+            size: number;
+            uploadFunction: (children: PIXI.DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number) => void;
+            offset: number;
+        }
+        export class ParticleRenderer extends ObjectRenderer {
+
+            constructor(renderer: WebGLRenderer);
+
+            shader: glCore.GLShader;
+            indexBuffer: WebGLBuffer;
+            properties: IParticleRendererProperty[];
+            protected tempMatrix: Matrix;
+
+            start(): void;
+            generateBuffers(container: ParticleContainer): ParticleBuffer[];
+            uploadVertices(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
+            uploadPosition(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
+            uploadRotation(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
+            uploadUvs(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
+            uploadAlpha(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
+            destroy(): void;
+
+            indices: Uint16Array;
+
+        }
+        export interface IParticleShader extends glCore.GLShader { }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////PREPARE///////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export namespace prepare {
+
+        interface AddHook {
+            (item: any, queue: any[]): boolean;
+        }
+        interface UploadHook<UploadHookSource> {
+            (prepare: UploadHookSource, item: any): boolean;
+        }
+        export abstract class BasePrepare<UploadHookSource>{
+
+            constructor(renderer: SystemRenderer);
+
+            limiter: CountLimiter | TimeLimiter;
+            protected renderer: SystemRenderer;
+            protected uploadHookHelper: UploadHookSource;
+            protected queue: any[];
+            protected addHooks: AddHook[];
+            protected uploadHooks: UploadHook<UploadHookSource>[];
+            protected completes: Function[];
+            protected ticking: boolean;
+            protected delayedTick: () => void;
+
+            upload(item: Function | DisplayObject | Container | BaseTexture | Texture | Graphics | Text | any, done?: () => void): void;
+            protected tick(): void;
+            protected prepareItems(): void;
+            register(addHook?: AddHook, uploadHook?: UploadHook<UploadHookSource>): this;
+            add(item: PIXI.DisplayObject | PIXI.Container | PIXI.BaseTexture | PIXI.Texture | PIXI.Graphics | PIXI.Text | any): this;
+            destroy(): void;
+
+        }
+        export class CanvasPrepare extends BasePrepare<CanvasPrepare> {
+
+            constructor(renderer: CanvasRenderer);
+
+            protected canvas: HTMLCanvasElement;
+            protected ctx: CanvasRenderingContext2D;
+
+        }
+        export class WebGLPrepare extends BasePrepare<WebGLRenderer> {
+
+            constructor(renderer: WebGLRenderer);
+
+        }
+        export class CountLimiter {
+
+            constructor(maxItemsPerFrame: number);
+
+            protected maxItemsPerFrame: number;
+            protected itemsLeft: number;
+
+        }
+        export class TimeLimiter {
+
+            constructor(maxMilliseconds: number);
+
+            protected maxMilliseconds: number;
+            protected frameStart: number;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////pixi-gl-core/////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+    // pixi-gl-core https://github.com/pixijs/pixi-gl-core
+    // sharedArrayBuffer as a type is not available yet.
+    // need to fully define what an `Attrib` is.
+    export namespace glCore {
+
+        export interface IContextOptions {
+            /**
+             * Boolean that indicates if the canvas contains an alpha buffer.
+             */
+            alpha?: boolean;
+            /**
+             * Boolean that indicates that the drawing buffer has a depth buffer of at least 16 bits.
+             */
+            depth?: boolean;
+            /**
+             * Boolean that indicates that the drawing buffer has a stencil buffer of at least 8 bits.
+             */
+            stencil?: boolean;
+            /**
+             * Boolean that indicates whether or not to perform anti-aliasing.
+             */
+            antialias?: boolean;
+            /**
+             * Boolean that indicates that the page compositor will assume the drawing buffer contains colors with pre-multiplied alpha.
+             */
+            premultipliedAlpha?: boolean;
+            /**
+             * If the value is true the buffers will not be cleared and will preserve their values until cleared or overwritten by the author.
+             */
+            preserveDrawingBuffer?: boolean;
+            /**
+             *  Boolean that indicates if a context will be created if the system performance is low.
+             */
+            failIfMajorPerformanceCaveat?: boolean;
+        }
+        export function createContext(view: HTMLCanvasElement, options?: IContextOptions): WebGLRenderingContext;
+        export function setVertexAttribArrays(gl: WebGLRenderingContext, attribs: IAttrib[], state?: WebGLState): WebGLRenderingContext | undefined;
+        export class GLBuffer {
+
+            constructor(gl: WebGLRenderingContext, type: number, data: ArrayBuffer | ArrayBufferView | any, drawType: number);
+
+            protected _updateID?: number;
+            gl: WebGLRenderingContext;
+            buffer: WebGLBuffer;
+            type: number;
+            drawType: number;
+            data: ArrayBuffer | ArrayBufferView | any;
+
+            upload(data: ArrayBuffer | ArrayBufferView | any, offset?: number, dontBind?: boolean): void;
+            bind(): void;
+
+            static createVertexBuffer(gl: WebGLRenderingContext, data: ArrayBuffer | ArrayBufferView | any, drawType: number): GLBuffer;
+            static createIndexBuffer(gl: WebGLRenderingContext, data: ArrayBuffer | ArrayBufferView | any, drawType: number): GLBuffer;
+            static create(gl: WebGLRenderingContext, type: number, data: ArrayBuffer | ArrayBufferView | any, drawType: number): GLBuffer;
+
+            destroy(): void;
+
+        }
+        export class GLFramebuffer {
+
+            constructor(gl: WebGLRenderingContext, width: number, height: number);
+
+            gl: WebGLRenderingContext;
+            frameBuffer: WebGLFramebuffer;
+            stencil: WebGLRenderbuffer;
+            texture: GLTexture;
+            width: number;
+            height: number;
+
+            enableTexture(texture: GLTexture): void;
+            enableStencil(): void;
+            clear(r: number, g: number, b: number, a: number): void;
+            bind(): void;
+            unbind(): void;
+            resize(width: number, height: number): void;
+            destroy(): void;
+
+            static createRGBA(gl: WebGLRenderingContext, width: number, height: number, data: ArrayBuffer | ArrayBufferView | any): GLFramebuffer;
+            static createFloat32(gl: WebGLRenderingContext, width: number, height: number, data: ArrayBuffer | ArrayBufferView | any): GLFramebuffer;
+
+        }
+        export class GLShader {
+
+            constructor(gl: WebGLRenderingContext, vertexSrc: string | string[], fragmentSrc: string | string[], precision: string, attributeLocations: { [key: string]: number });
+
+            gl: WebGLRenderingContext;
+            program?: WebGLProgram | null;
+            uniformData: any;
+            uniforms: any;
+            attributes: any;
+
+            bind(): void;
+            destroy(): void;
+
+        }
+        export class GLTexture {
+
+            constructor(gl: WebGLRenderingContext, width?: number, height?: number, format?: number, type?: number);
+
+            gl: WebGLRenderingContext;
+            texture: WebGLTexture;
+            mipmap: boolean;
+            premultiplyAlpha: boolean;
+            width: number;
+            height: number;
+            format: number;
+            type: number;
+
+            upload(source: HTMLImageElement | ImageData | HTMLVideoElement | HTMLCanvasElement): void;
+            uploadData(data: number, width: number, height: number): void;
+            bind(location?: number): void;
+            unbind(): void;
+            minFilter(linear: boolean): void;
+            magFilter(linear: boolean): void;
+            enableMipmap(): void;
+            enableLinearScaling(): void;
+            enableNearestScaling(): void;
+            enableWrapClamp(): void;
+            enableWrapRepeat(): void;
+            enableWrapMirrorRepeat(): void;
+            destroy(): void;
+
+            static fromSource(gl: WebGLRenderingContext, source: HTMLImageElement | ImageData | HTMLVideoElement | HTMLCanvasElement, premultipleAlpha?: boolean): GLTexture;
+            static fromData(gl: WebGLRenderingContext, data: number[], width: number, height: number): GLTexture;
+
+        }
+        export interface IAttrib {
+
+            attribute: {
+                location: boolean;
+                size: number;
+            };
+            normalized: boolean;
+            stride: number;
+            start: number;
+            buffer: ArrayBuffer;
+
+        }
+        export interface IWebGLRenderingContextAttribute {
+
+            buffer: WebGLBuffer;
+            attribute: any;
+            type: number;
+            normalized: boolean;
+            stride: number;
+            start: number;
+
+        }
+        export interface IAttribState {
+            tempAttribState: IAttrib[];
+            attribState: IAttrib[];
+        }
+
+        export class VertexArrayObject {
+
+            static FORCE_NATIVE: boolean;
+
+            constructor(gl: WebGLRenderingContext, state: WebGLState);
+
+            protected nativeVaoExtension: any;
+            protected nativeState: IAttribState;
+            protected nativeVao: VertexArrayObject;
+            gl: WebGLRenderingContext;
+            attributes: IAttrib[];
+            indexBuffer: GLBuffer;
+            dirty: boolean;
+
+            bind(): VertexArrayObject;
+            unbind(): VertexArrayObject;
+            activate(): VertexArrayObject;
+            addAttribute(buffer: GLBuffer, attribute: IAttrib, type: number, normalized: boolean, stride: number, start: number): VertexArrayObject;
+            addIndex(buffer: GLBuffer, options?: any): VertexArrayObject;
+            clear(): VertexArrayObject;
+            draw(type: number, size: number, start: number): VertexArrayObject;
+            destroy(): void;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////UTILS//////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export interface IDecomposedDataUri {
+        mediaType: string;
+        subType: string;
+        encoding: string;
+        data: any;
+    }
+
+    export namespace utils {
+
+        export function uid(): number;
+        export function hex2rgb(hex: number, out?: number[]): number[];
+        export function hex2string(hex: number): string;
+        export function rgb2hex(rgb: Number[]): number;
+        export function canUseNewCanvasBlendModes(): boolean;
+        export function getResolutionOfUrl(url: string, defaultValue?: number): number;
+        export function getSvgSize(svgString: string): any;
+        export function decomposeDataUri(dataUri: string): IDecomposedDataUri | void;
+        export function getUrlFileExtension(url: string): string | void;
+        export function sayHello(type: string): void;
+        export function skipHello(): void;
+        export function isWebGLSupported(): boolean;
+        export function sign(n: number): number;
+        export function removeItems<T>(arr: T[], startIdx: number, removeCount: number): void;
+        export const TextureCache: any;
+        export const BaseTextureCache: any;
+
+        // https://github.com/kaimallea/isMobile
+        export namespace isMobile {
+            export const apple: {
+                phone: boolean;
+                ipod: boolean;
+                tablet: boolean;
+                device: boolean;
+            };
+            export const android: {
+                phone: boolean;
+                tablet: boolean;
+                device: boolean;
+            };
+            export const amazon: {
+                phone: boolean;
+                tablet: boolean;
+                device: boolean;
+            };
+            export const windows: {
+                phone: boolean;
+                tablet: boolean;
+                device: boolean;
+            };
+            export const seven_inch: boolean;
+            export const other: {
+                blackberry10: boolean;
+                blackberry: boolean;
+                opera: boolean;
+                firefox: boolean;
+                chrome: boolean;
+                device: boolean;
+            };
+            export const any: boolean;
+            export const phone: boolean;
+            export const tablet: boolean;
+        }
+
+        // https://github.com/primus/eventemitter3
+        export class EventEmitter {
+
+            listeners(event: string, exists?: boolean): Function[];
+            emit(event: string, ...args: any[]): boolean;
+            on(event: string, fn: Function, context?: any): this;
+            once(event: string, fn: Function, context?: any): this;
+            removeListener(event: string, fn: Function, context?: any, once?: boolean): this;
+            removeAllListeners(event?: string): this;
+            eventNames(): string[];
+
+            off(event: string, fn: Function, context?: any, once?: boolean): this;
+            addListener(event: string, fn: Function, context?: any): this;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////depreciation/////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+    // not sure how to handle blendmodes scalemodes basetexturecache
+    namespace core {
+
+        /**
+         * @class
+         * @private
+         * @name SpriteBatch
+         * @memberof PIXI
+         * @see PIXI.ParticleContainer
+         * @throws {ReferenceError} SpriteBatch does not exist any more, please use the new ParticleContainer instead.
+         * @deprecated since version 3.0.0
+         */
+        type SpriteBatch = ParticleContainer;
+
+        /**
+         * @class
+         * @private
+         * @name AssetLoader
+         * @memberof PIXI
+         * @see PIXI.loaders.Loader
+         * @throws {ReferenceError} The loader system was overhauled in pixi v3, please see the new PIXI.loaders.Loader class.
+         * @deprecated since version 3.0.0
+         */
+        type AssetLoader = loaders.Loader;
+
+        /**
+         * @class
+         * @private
+         * @name Stage
+         * @memberof PIXI
+         * @see PIXI.Container
+         * @deprecated since version 3.0.0
+         */
+        type Stage = Container;
+
+        /**
+         * @class
+         * @private
+         * @name DisplayObjectContainer
+         * @memberof PIXI
+         * @see PIXI.Container
+         * @deprecated since version 3.0.0
+         */
+        type DisplayObjectContainer = Container;
+
+        /**
+         * @class
+         * @private
+         * @name Strip
+         * @memberof PIXI
+         * @see PIXI.mesh.Mesh
+         * @deprecated since version 3.0.0
+         */
+        type Strip = mesh.Mesh;
+
+        /**
+         * @class
+         * @private
+         * @name Rope
+         * @memberof PIXI
+         * @see PIXI.mesh.Rope
+         * @deprecated since version 3.0.0
+         */
+        type Rope = mesh.Rope;
+
+        /**
+         * @class
+         * @private
+         * @name ParticleContainer
+         * @memberof PIXI
+         * @see PIXI.particles.ParticleContainer
+         * @deprecated since version 4.0.0
+         */
+        type ParticleContainer = particles.ParticleContainer;
+
+        /**
+         * @class
+         * @private
+         * @name MovieClip
+         * @memberof PIXI
+         * @see PIXI.extras.MovieClip
+         * @deprecated since version 3.0.0
+         */
+        type MovieClip = extras.AnimatedSprite;
+
+        /**
+         * @class
+         * @private
+         * @name TilingSprite
+         * @memberof PIXI
+         * @see PIXI.extras.TilingSprite
+         * @deprecated since version 3.0.0
+         */
+        type TilingSprite = extras.TilingSprite;
+
+        /**
+         * @class
+         * @private
+         * @name BitmapText
+         * @memberof PIXI
+         * @see PIXI.extras.BitmapText
+         * @deprecated since version 3.0.0
+         */
+        type BitmapText = extras.BitmapText;
+
+        /**
+         * @namespace
+         * @private
+         * @name math
+         * @memberof PIXI
+         * @see PIXI
+         * @deprecated since version 3.0.6
+         */
+        type math = any;
+
+        /**
+         * @class
+         * @private
+         * @name PIXI.AbstractFilter
+         * @see PIXI.Filter
+         * @deprecated since version 3.0.6
+         */
+        type AbstractFilter = Filter;
+
+        /**
+         * @class
+         * @private
+         * @name PIXI.TransformManual
+         * @see PIXI.TransformBase
+         * @deprecated since version 4.0.0
+         */
+        type TransformManual = TransformBase;
+
+        /**
+         * @static
+         * @constant
+         * @name PIXI.TARGET_FPMS
+         * @see PIXI.settings.TARGET_FPMS
+         * @deprecated since version 4.2.0
+         */
+        type TARGET_FPMS = number;
+
+        /**
+         * @static
+         * @constant
+         * @name PIXI.FILTER_RESOLUTION
+         * @see PIXI.settings.FILTER_RESOLUTION
+         * @deprecated since version 4.2.0
+         */
+        type FILTER_RESOLUTION = number;
+
+        /**
+         * @static
+         * @constant
+         * @name PIXI.RESOLUTION
+         * @see PIXI.settings.RESOLUTION
+         * @deprecated since version 4.2.0
+         */
+        type RESOLUTION = number;
+
+        /**
+         * @static
+         * @constant
+         * @name PIXI.MIPMAP_TEXTURES
+         * @see PIXI.settings.MIPMAP_TEXTURES
+         * @deprecated since version 4.2.0
+         */
+        type MIPMAP_TEXTURES = any;
+
+        /**
+         * @static
+         * @constant
+         * @name PIXI.SPRITE_BATCH_SIZE
+         * @see PIXI.settings.SPRITE_BATCH_SIZE
+         * @deprecated since version 4.2.0
+         */
+        type SPRITE_BATCH_SIZE = number;
+
+        /**
+         * @static
+         * @constant
+         * @name PIXI.SPRITE_MAX_TEXTURES
+         * @see PIXI.settings.SPRITE_MAX_TEXTURES
+         * @deprecated since version 4.2.0
+         */
+        type SPRITE_MAX_TEXTURES = number;
+
+        /**
+         * @static
+         * @constant
+         * @name PIXI.RETINA_PREFIX
+         * @see PIXI.settings.RETINA_PREFIX
+         * @deprecated since version 4.2.0
+         */
+        type RETINA_PREFIX = RegExp | string;
+
+        /**
+         * @static
+         * @constant
+         * @name PIXI.DEFAULT_RENDER_OPTIONS
+         * @see PIXI.settings.RENDER_OPTIONS
+         * @deprecated since version 4.2.0
+         */
+        type DEFAULT_RENDER_OPTIONS = number;
+
+    }
+
+    export namespace extras {
+
+        /**
+         * @class
+         * @name MovieClip
+         * @memberof PIXI.extras
+         * @see PIXI.extras.AnimatedSprite
+         * @deprecated since version 4.2.0
+         */
+        type MovieClip = extras.AnimatedSprite;
+
+    }
+
+}
+
+declare namespace pixi {
+    export const gl: typeof PIXI.glCore;
+}
+
+declare module "pixi.js" {
+    export = PIXI;
 }
-
-// ticker
-
-export namespace ticker {
-
-	export var shared: Ticker;
-
-	export class Ticker {
-
-		protected _tick(time: number): void;
-		protected _emitter: utils.EventEmitter;
-		protected _requestId: number;
-		protected _maxElapsedMS: number;
-
-		protected _requestIfNeeded(): void;
-		protected _cancelIfNeeded(): void;
-		protected _startIfPossible(): void;
-
-		autoStart: boolean;
-		deltaTime: number;
-		elapsedMS: number;
-		lastTime: number;
-		speed: number;
-		started: boolean;
-
-		FPS: number;
-		minFPS: number;
-
-		add(fn: (deltaTime: number) => void, context?: any): Ticker;
-		addOnce(fn: (deltaTime: number) => void, context?: any): Ticker;
-		remove(fn: (deltaTime: number) => void, context?: any): Ticker;
-		start(): void;
-		stop(): void;
-		update(): void;
-
-	}
-
-}
-
-// shader
-
-export class Shader extends glCore.GLShader { }
-
-//////////////////////////////////////////////////////////////////////////////
-////////////////////////////EXTRACT///////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-export namespace extract {
-
-	export class CanvasExtract {
-
-		protected renderer: CanvasRenderer;
-
-		constructor(renderer: CanvasRenderer);
-
-		image(target?: DisplayObject | RenderTexture): HTMLImageElement;
-		base64(target?: DisplayObject | RenderTexture): string;
-		canvas(target?: DisplayObject | RenderTexture): HTMLCanvasElement;
-		pixels(renderTexture?: DisplayObject | RenderTexture): number[];
-
-		destroy(): void;
-
-	}
-	export class WebGLExtract {
-		protected renderer: WebGLRenderer;
-
-		constructor(renderer: WebGLRenderer);
-
-		image(target?: DisplayObject | RenderTexture): HTMLImageElement;
-		base64(target?: DisplayObject | RenderTexture): string;
-		canvas(target?: DisplayObject | RenderTexture): HTMLCanvasElement;
-		pixels(renderTexture?: DisplayObject | RenderTexture): number[];
-
-		destroy(): void;
-	}
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-////////////////////////////EXTRAS////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-export namespace extras {
-
-	export interface IBitmapTextStyle {
-
-		font?: string | {
-
-			name?: string;
-			size?: number;
-
-		};
-		align?: string;
-		tint?: number;
-
-	}
-	export class BitmapText extends Container {
-
-		constructor(text: string, style?: IBitmapTextStyle);
-
-		textWidth: number;
-		textHeight: number;
-		protected _glyphs: Sprite[];
-		protected _font: string | {
-			name?: string;
-			size?: number;
-		};
-		font: string | {
-			name?: string;
-			size?: number;
-		};
-		protected _text: string;
-		maxWidth: number;
-		maxLineHeight: number;
-		dirty: boolean;
-		tint: number;
-		align: string;
-		text: string;
-		anchor: PIXI.Point | number;
-
-		protected updateText(): void;
-		updateTransform(): void;
-		getLocalBounds(): Rectangle;
-		validate(): void;
-
-		static fonts: any;
-
-	}
-	export class AnimatedSprite extends Sprite {
-
-		constructor(textures: Texture[] | Array<{ texture: Texture, time?: number }>);
-
-		protected _textures: Texture[];
-		protected _durations: number[];
-		textures: Texture[] | Array<{ texture: Texture, time?: number }>;
-		animationSpeed: number;
-		loop: boolean;
-		onComplete: () => void;
-		onFrameChange: (currentFrame: number) => void;
-		protected _currentTime: number;
-		playing: boolean;
-		totalFrames: number;
-		currentFrame: number;
-		stop(): void;
-		play(): void;
-		gotoAndStop(frameNumber: number): void;
-		gotoAndPlay(frameNumber: number): void;
-		protected update(deltaTime: number): void;
-		destroy(): void;
-
-		static fromFrames(frame: string[]): AnimatedSprite;
-		static fromImages(images: string[]): AnimatedSprite;
-
-	}
-	export class TextureTransform {
-
-		constructor(texture: Texture, clampMargin?: number);
-
-		protected _texture: Texture;
-		protected mapCoord: Matrix;
-		protected uClampFrame: Float32Array;
-		protected uClampOffset: Float32Array;
-		protected _lastTextureID: number;
-
-		clampOffset: number;
-		clampMargin: number;
-
-		texture: Texture;
-
-		update(forceUpdate?: boolean): void;
-
-	}
-	export class TilingSprite extends Sprite {
-
-		constructor(texture: Texture, width?: number, height?: number);
-
-		tileTransform: TransformStatic;
-		protected _width: number;
-		protected _height: number;
-		protected _canvasPattern: CanvasPattern;
-		uvTransform: TextureTransform;
-
-		clampMargin: number;
-		tileScale: Point | ObservablePoint;
-		tilePosition: Point | ObservablePoint;
-
-		protected _onTextureUpdate(): void;
-		protected _renderWebGL(renderer: WebGLRenderer): void;
-		protected _renderCanvas(renderer: CanvasRenderer): void;
-		protected _calculateBounds(): void;
-		getLocalBounds(rect?: Rectangle): Rectangle;
-		containsPoint(point: Point): boolean;
-		destroy(): void;
-
-		static from(source: number | string | BaseTexture | HTMLCanvasElement | HTMLVideoElement, width?: number, height?: number): TilingSprite;
-		static fromFrame(frameId: string, width?: number, height?: number): TilingSprite;
-		// if you remove the next line, the class will break. https://github.com/pixijs/pixi-typescript/issues/96
-		static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
-		static fromImage(imageId: string, width?: number, height?: number, crossorigin?: boolean, scaleMode?: number): TilingSprite;
-
-		width: number;
-		height: number;
-
-	}
-	export class TilingSpriteRenderer extends ObjectRenderer {
-
-		constructor(renderer: WebGLRenderer);
-
-		render(ts: TilingSprite): void;
-
-	}
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-////////////////////////////FILTERS///////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-export namespace filters {
-
-	export class FXAAFilter extends Filter { }
-	export class BlurFilter extends Filter {
-
-		constructor(strength?: number, quality?: number, resolution?: number, kernelSize?: number);
-
-		blurXFilter: BlurXFilter;
-		blurYFilter: BlurYFilter;
-		resolution: number;
-		padding: number;
-		passes: number;
-		blur: number;
-		blurX: number;
-		blurY: number;
-		quality: number;
-
-	}
-	export class BlurXFilter extends Filter {
-
-		constructor(strength?: number, quality?: number, resolution?: number, kernelSize?: number);
-
-		protected _quality: number;
-
-		quality: number;
-		passes: number;
-		resolution: number;
-		strength: number;
-		firstRun: boolean;
-		blur: number;
-
-	}
-	export class BlurYFilter extends Filter {
-
-		constructor(strength?: number, quality?: number, resolution?: number, kernelSize?: number);
-
-		protected _quality: number;
-
-		quality: number;
-		passes: number;
-		resolution: number;
-		strength: number;
-		firstRun: boolean;
-		blur: number;
-
-	}
-	export class ColorMatrixFilter extends Filter {
-
-		constructor();
-
-		protected _loadMatrix(matrix: number[], multiply?: boolean): void;
-		protected _multiply(out: number[], a: number[], b: number[]): void;
-		protected _colorMatrix(matrix: number[]): void;
-
-		matrix: number[];
-
-		brightness(b: number, multiply?: boolean): void;
-		greyscale(scale: number, multiply?: boolean): void;
-		blackAndWhite(multiply?: boolean): void;
-		hue(rotation: number, multiply?: boolean): void;
-		contrast(amount: number, multiply?: boolean): void;
-		saturate(amount: number, multiply?: boolean): void;
-		desaturate(multiply?: boolean): void;
-		negative(multiply?: boolean): void;
-		sepia(multiply?: boolean): void;
-		technicolor(multiply?: boolean): void;
-		polaroid(multiply?: boolean): void;
-		toBGR(multiply?: boolean): void;
-		kodachrome(multiply?: boolean): void;
-		browni(multiply?: boolean): void;
-		vintage(multiply?: boolean): void;
-		colorTone(desaturation: number, toned: number, lightColor: string, darkColor: string, multiply?: boolean): void;
-		night(intensity: number, multiply?: boolean): void;
-		predator(amount: number, multiply?: boolean): void;
-		lsd(multiply?: boolean): void;
-		reset(): void;
-
-	}
-	export class DisplacementFilter extends Filter {
-
-		constructor(sprite: Sprite, scale?: number);
-
-		scale: Point;
-		map: Texture;
-
-	}
-	export class VoidFilter extends Filter {
-		glShaderKey: string;
-	}
-
-	// pixi-filters.d.ts todo
-	// https://github.com/pixijs/pixi-filters/
-	export class NoiseFilter extends Filter {
-
-		noise: number;
-
-	}
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-////////////////////////////INTERACTION///////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-export namespace interaction {
-
-	export interface InteractionEvent {
-
-		stopped: boolean;
-		target: DisplayObject;
-		currentTarget: DisplayObject;
-		type: string;
-		data: InteractionData;
-		stopPropagation(): void;
-
-	}
-	export class InteractionData {
-
-		global: Point;
-
-		protected _target: DisplayObject;
-		target: DisplayObject;
-		targetProxy: DisplayObject;
-		originalEvent: Event;
-
-		getLocalPosition(displayObject: DisplayObject, point?: Point, globalPos?: Point): Point;
-
-	}
-	export class InteractionManager extends utils.EventEmitter {
-
-		constructor(renderer: SystemRenderer, options?: { autoPreventDefault?: boolean; interactionFrequency?: number; });
-
-		renderer: SystemRenderer;
-		autoPreventDefault: boolean;
-		interactionFrequency: number;
-		mouse: InteractionData;
-		pointer: InteractionData;
-		eventData: {
-			stopped: boolean;
-			target: any;
-			type: any;
-			data: InteractionData;
-			stopPropagination(): void;
-		};
-		interactiveDataPool: InteractionData[];
-		protected interactionDOMElement: HTMLElement;
-		protected moveWhenInside: boolean;
-		protected eventsAdded: boolean;
-		mouseOverRenderer: boolean;
-		supportsTouchEvents: boolean;
-		supportsPointerEvents: boolean;
-		normalizeTouchEvents: boolean;
-		normalizeMouseEvents: boolean;
-
-		protected onMouseUp: (event: MouseEvent) => void;
-		protected processMouseUp: (displayObject: DisplayObject, hit: boolean) => void;
-		protected onMouseDown: (event: MouseEvent) => void;
-		protected processMouseDown: (displayObject: DisplayObject, hit: boolean) => void;
-		protected onMouseMove: (event: MouseEvent) => void;
-		protected processMouseMove: (displayObject: DisplayObject, hit: boolean) => void;
-		protected onMouseOut: (event: MouseEvent) => void;
-		protected processMouseOverOut: (displayObject: DisplayObject, hit: boolean) => void;
-		protected onMouseOver: (event: MouseEvent) => void;
-
-		protected onPointerUp: (event: PointerEvent) => void;
-		protected processPointerUp: (displayObject: DisplayObject, hit: boolean) => void;
-		protected onPointerDown: (event: PointerEvent) => void;
-		protected processPointerDown: (displayObject: DisplayObject, hit: boolean) => void;
-		protected onPointerMove: (event: PointerEvent) => void;
-		protected processPointerMove: (displayObject: DisplayObject, hit: boolean) => void;
-		protected onPointerOut: (event: PointerEvent) => void;
-		protected processPointerOut: (displayObject: DisplayObject, hit: boolean) => void;
-		protected onPointerOver: (event: PointerEvent) => void;
-
-		protected onTouchStart: (event: TouchEvent) => void;
-		protected processTouchStart: (DisplayObject: DisplayObject, hit: boolean) => void;
-		protected onTouchEnd: (event: TouchEvent) => void;
-		protected processTouchEnd: (displayObject: DisplayObject, hit: boolean) => void;
-		protected onTouchMove: (event: TouchEvent) => void;
-		protected processTouchMove: (displayObject: DisplayObject, hit: boolean) => void;
-		defaultCursorStyle: string;
-		currentCursorStyle: string;
-		protected _tempPoint: Point;
-		resolution: number;
-		protected setTargetElement(element: HTMLElement, resolution: number): void;
-		protected addEvents(): void;
-		protected removeEvents(): void;
-		update(deltaTime: number): void;
-		protected dispatchEvent(displayObject: DisplayObject, eventString: string, eventData: any): void;
-		mapPositionToPoint(point: Point, x: number, y: number): void;
-		protected processInteractive(point: Point, displayObject: DisplayObject, func: (displayObject: DisplayObject, hit: boolean) => void, hitTest: boolean, interactive: boolean): boolean;
-		protected _startInteractionProcess(): void;
-		protected _queueAdd(displayObject: DisplayObject, order: number): void;
-		protected _finishInteractionProcess(func: Function): void;
-		protected getTouchData(touchEvent: InteractionData): InteractionData;
-		protected returnTouchData(touchData: InteractionData): void;
-		protected normalizeToPointerData(Event: Event): void;
-
-		destroy(): void;
-
-	}
-	export interface InteractiveTarget {
-
-		interactive: boolean;
-		interactiveChildren: boolean;
-		hitArea: IHitArea;
-		buttonMode: boolean;
-		defaultCursor: string;
-
-	}
-	export interface InteractiveTargetProxy extends InteractiveTarget {
-	}
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-///////////////////////////////LOADER/////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-// extends
-// https://github.com/englercj/resource-loader/
-// 1.6.4
-
-export namespace loaders {
-
-	export interface ILoaderOptions {
-
-		crossOrigin?: boolean | string;
-		loadType?: number;
-		xhrType?: string;
-		metaData?: any;
-
-	}
-	export interface IResourceDictionary {
-
-		[index: string]: PIXI.loaders.Resource;
-
-	}
-	export class Loader extends utils.EventEmitter {
-
-		protected static _pixiMiddleware: Function[];
-		static addPixiMiddleware(fn: Function): void;
-
-		constructor(baseUrl?: string, concurrency?: number);
-
-		baseUrl: string;
-		progress: number;
-		loading: boolean;
-		resources: IResourceDictionary;
-
-		add(name: string, url: string, options?: ILoaderOptions, cb?: () => void): Loader;
-		add(url: string, options?: ILoaderOptions, cb?: () => void): Loader;
-		// todo I am not sure of object literal notional (or its options) so just allowing any but would love to improve this
-		add(obj: any, options?: ILoaderOptions, cb?: () => void): Loader;
-
-		on(event: "complete", fn: (loader: loaders.Loader, object: any) => void, context?: any): utils.EventEmitter;
-		on(event: "error", fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): utils.EventEmitter;
-		on(event: "load", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): utils.EventEmitter;
-		on(event: "progress", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): utils.EventEmitter;
-		on(event: "start", fn: (loader: loaders.Loader) => void, context?: any): utils.EventEmitter;
-		on(event: string, fn: Function, context?: any): utils.EventEmitter;
-
-		once(event: "complete", fn: (loader: loaders.Loader, object: any) => void, context?: any): utils.EventEmitter;
-		once(event: "error", fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): utils.EventEmitter;
-		once(event: "load", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): utils.EventEmitter;
-		once(event: "progress", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): utils.EventEmitter;
-		once(event: "start", fn: (loader: loaders.Loader) => void, context?: any): utils.EventEmitter;
-		once(event: string, fn: Function, context?: any): utils.EventEmitter;
-
-		before(fn: Function): Loader;
-		pre(fn: Function): Loader;
-
-		after(fn: Function): Loader;
-		use(fn: Function): Loader;
-
-		reset(): void;
-
-		load(cb?: (loader: loaders.Loader, object: any) => void): Loader;
-
-	}
-	export interface ITextureDictionary {
-		[index: string]: PIXI.Texture;
-	}
-
-	export class Resource extends utils.EventEmitter {
-
-		static LOAD_TYPE: {
-			XHR: number;
-			IMAGE: number;
-			AUDIO: number;
-			VIDEO: number;
-		};
-
-		static XHR_READ_STATE: {
-			UNSENT: number;
-			OPENED: number;
-			HEADERS_RECIEVED: number;
-			LOADING: number;
-			DONE: number;
-		};
-
-		static XHR_RESPONSE_TYPE: {
-			DEFAULT: number;
-			BUFFER: number;
-			BLOB: number;
-			DOCUMENT: number;
-			JSON: number;
-			TEXT: number;
-		};
-
-		constructor(name?: string, url?: string | string[], options?: ILoaderOptions);
-
-		protected _loadSourceElement(type: string): void;
-		isLoading: boolean;
-		isComplete: boolean;
-
-		isJson: boolean;
-		isXml: boolean;
-		isImage: boolean;
-		isAudio: boolean;
-		isVideo: boolean;
-
-		name: string;
-		texture: Texture;
-		textures: ITextureDictionary;
-		url: string;
-		data: any;
-		crossOrigin: boolean | string;
-		loadType: number;
-		xhrType: string;
-		error: Error;
-		xhr: XMLHttpRequest;
-		SVGMetadataElement: any;
-
-		metadata: any;
-		spineAtlas: any;
-		spineData: any;
-
-		complete(): void;
-		load(cb?: () => void): void;
-		abort(message: string): void;
-
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-///////////////////////////////MESH///////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-export namespace mesh {
-
-	export class Mesh extends Container {
-
-		constructor(texture: Texture, vertices?: Float32Array, uvs?: Float32Array, indices?: Uint16Array, drawMode?: number);
-
-		protected _texture: Texture;
-		uvs: Float32Array;
-		vertices: Float32Array;
-		indices: Uint16Array;
-		dirty: number;
-		indexDirty: number;
-		dirtyVertex: boolean;
-		protected _geometryVersion: number;
-		blendMode: number;
-		pluginName: string;
-		canvasPadding: number;
-		drawMode: number;
-		texture: Texture;
-		tintRgb: Float32Array;
-		protected _glDatas: { [n: number]: any; };
-		protected _renderWebGL(renderer: WebGLRenderer): void;
-		protected _renderCanvas(renderer: CanvasRenderer): void;
-		protected _onTextureUpdate(): void;
-		protected _calculateBounds(): void;
-		containsPoint(point: Point): boolean;
-		tint: number;
-
-		static DRAW_MODES: {
-			TRIANGLE_MESH: number;
-			TRIANGLES: number;
-		};
-
-	}
-
-	export class CanvasMeshRenderer {
-
-		constructor(renderer: CanvasRenderer);
-
-		renderer: CanvasRenderer;
-
-		render(mesh: Mesh): void;
-		protected _renderTriangleMesh(mesh: Mesh): void;
-		protected _renderTriangles(mesh: Mesh): void;
-		protected _renderDrawTriangle(mesh: Mesh, index0: number, index1: number, index2: number): void;
-		protected renderMeshFlat(mesh: Mesh): void;
-
-		destroy(): void;
-
-	}
-
-	export class MeshRenderer extends ObjectRenderer {
-
-		constructor(renderer: WebGLRenderer);
-
-		shader: Shader;
-		render(mesh: Mesh): void;
-
-	}
-
-	export class Plane extends Mesh {
-
-		constructor(texture: Texture, verticesX?: number, verticesY?: number);
-		protected _ready: boolean;
-		verticesX: number;
-		verticesY: number;
-		drawMode: number;
-
-		refresh(): void;
-
-		protected _onTexureUpdate(): void;
-
-	}
-
-	export class NineSlicePlane extends Plane {
-
-		constructor(texture: Texture, leftWidth?: number, topHeight?: number, rightWidth?: number, bottomHeight?: number);
-
-		width: number;
-		height: number;
-		leftWidth: number;
-		rightWidth: number;
-		topHeight: number;
-		bottomHeight: number;
-
-		protected _leftWidth: number;
-		protected _rightWidth: number;
-		protected _topHeight: number;
-		protected _bottomHeight: number;
-		protected _height: number;
-		protected _width: number;
-		protected _origHeight: number;
-		protected _origWidth: number;
-		protected _uvh: number;
-		protected _uvw: number;
-
-		updateHorizontalVertices(): void;
-		updateVerticalVertices(): void;
-		protected drawSegment(context: CanvasRenderingContext2D | WebGLRenderingContext, textureSource: any, w: number, h: number, x1: number, y1: number, x2: number, y2: number): void;
-
-	}
-
-	export class Rope extends Mesh {
-
-		constructor(texture: Texture, points: Point[]);
-
-		points: Point[];
-		colors: number[];
-		protected _ready: boolean;
-		refresh(): void;
-
-		protected _onTextureUpdate(): void;
-		updateTransform(): void;
-
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-/////////////////////////////PARTICLES////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-export namespace particles {
-
-	export interface IParticleContainerProperties {
-
-		scale?: boolean;
-		position?: boolean;
-		rotation?: boolean;
-		uvs?: boolean;
-		alpha?: boolean;
-
-	}
-	export class ParticleContainer extends Container {
-
-		constructor(size?: number, properties?: IParticleContainerProperties, batchSize?: number);
-
-		protected _properties: boolean[];
-		protected _maxSize: number;
-		protected _batchSize: number;
-		protected _glBuffers: { [n: number]: WebGLBuffer; };
-		protected _bufferToUpdate: number;
-		interactiveChildren: boolean;
-		blendMode: number;
-		roundPixels: boolean;
-		baseTexture: BaseTexture;
-
-		setProperties(properties: IParticleContainerProperties): void;
-		protected onChildrenChange: (smallestChildIndex?: number) => void;
-
-		destroy(options?: IDestroyOptions | boolean): void;
-
-	}
-	export class ParticleBuffer {
-
-		constructor(gl: WebGLRenderingContext, properties: any, dynamicPropertyFlags: any[], size: number);
-
-		gl: WebGLRenderingContext;
-		vertSize: number;
-		vertByteSize: number;
-		size: number;
-		dynamicProperties: any[];
-		staticProperties: any[];
-		staticStride: number;
-		staticBuffer: any;
-		staticData: any;
-		dynamicStride: number;
-		dynamicBuffer: any;
-		dynamicData: any;
-
-		destroy(): void;
-
-	}
-	export interface IParticleRendererProperty {
-		attribute: number;
-		size: number;
-		uploadFunction: (children: PIXI.DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number) => void;
-		offset: number;
-	}
-	export class ParticleRenderer extends ObjectRenderer {
-
-		constructor(renderer: WebGLRenderer);
-
-		shader: glCore.GLShader;
-		indexBuffer: WebGLBuffer;
-		properties: IParticleRendererProperty[];
-		protected tempMatrix: Matrix;
-
-		start(): void;
-		generateBuffers(container: ParticleContainer): ParticleBuffer[];
-		uploadVertices(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
-		uploadPosition(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
-		uploadRotation(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
-		uploadUvs(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
-		uploadAlpha(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
-		destroy(): void;
-
-		indices: Uint16Array;
-
-	}
-	export interface IParticleShader extends glCore.GLShader { }
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-////////////////////////////PREPARE///////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-export namespace prepare {
-
-	type addHook = (item: any, queue: any[]) => boolean;
-	type uploadHook<UploadHookSource> = (prepare: UploadHookSource, item: any) => boolean;
-	export abstract class BasePrepare<UploadHookSource>{
-
-		constructor(renderer: SystemRenderer);
-
-		limiter: CountLimiter | TimeLimiter;
-		protected renderer: SystemRenderer;
-		protected uploadHookHelper: UploadHookSource;
-		protected queue: any[];
-		protected addHooks: addHook[];
-		protected uploadHooks: Array<uploadHook<UploadHookSource>>;
-		protected completes: Function[];
-		protected ticking: boolean;
-		protected delayedTick: () => void;
-
-		upload(item: Function | DisplayObject | BaseTexture | TextStyle | any, done?: () => void): void;
-		protected tick(): void;
-		protected prepareItems(): void;
-		register(addHook?: addHook, uploadHook?: uploadHook<UploadHookSource>): this;
-		add(item: DisplayObject | any): this;
-		destroy(): void;
-
-	}
-	export class CanvasPrepare extends BasePrepare<CanvasPrepare> {
-
-		constructor(renderer: CanvasRenderer);
-
-		protected canvas: HTMLCanvasElement;
-		protected ctx: CanvasRenderingContext2D;
-
-	}
-	export class WebGLPrepare extends BasePrepare<WebGLRenderer> {
-
-		constructor(renderer: WebGLRenderer);
-
-	}
-	export class CountLimiter {
-
-		constructor(maxItemsPerFrame: number);
-
-		protected maxItemsPerFrame: number;
-		protected itemsLeft: number;
-
-	}
-	export class TimeLimiter {
-
-		constructor(maxMilliseconds: number);
-
-		protected maxMilliseconds: number;
-		protected frameStart: number;
-
-	}
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-/////////////////////////////pixi-gl-core/////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-// pixi-gl-core https://github.com/pixijs/pixi-gl-core
-// sharedArrayBuffer as a type is not available yet.
-// need to fully define what an `Attrib` is.
-export namespace glCore {
-
-	export interface IContextOptions {
-		/**
-		 * Boolean that indicates if the canvas contains an alpha buffer.
-		 */
-		alpha?: boolean;
-		/**
-		 * Boolean that indicates that the drawing buffer has a depth buffer of at least 16 bits.
-		 */
-		depth?: boolean;
-		/**
-		 * Boolean that indicates that the drawing buffer has a stencil buffer of at least 8 bits.
-		 */
-		stencil?: boolean;
-		/**
-		 * Boolean that indicates whether or not to perform anti-aliasing.
-		 */
-		antialias?: boolean;
-		/**
-		 * Boolean that indicates that the page compositor will assume the drawing buffer contains colors with pre-multiplied alpha.
-		 */
-		premultipliedAlpha?: boolean;
-		/**
-		 * If the value is true the buffers will not be cleared and will preserve their values until cleared or overwritten by the author.
-		 */
-		preserveDrawingBuffer?: boolean;
-		/**
-		 *  Boolean that indicates if a context will be created if the system performance is low.
-		 */
-		failIfMajorPerformanceCaveat?: boolean;
-	}
-	export function createContext(view: HTMLCanvasElement, options?: IContextOptions): WebGLRenderingContext;
-	export function setVertexAttribArrays(gl: WebGLRenderingContext, attribs: IAttrib[], state?: WebGLState): WebGLRenderingContext;
-	export class GLBuffer {
-
-		static EMPTY_ARRAY_BUFFER: ArrayBuffer;
-
-		constructor(gl: WebGLRenderingContext, type: number, data: ArrayBuffer | ArrayBufferView | any, drawType: number);
-
-		protected _updateID: number;
-		gl: WebGLRenderingContext;
-		buffer: WebGLBuffer;
-		type: number;
-		drawType: number;
-		data: ArrayBuffer | ArrayBufferView | any;
-
-		upload(data: ArrayBuffer | ArrayBufferView | any, offset?: number, dontBind?: boolean): void;
-		bind(): void;
-
-		static createVertexBuffer(gl: WebGLRenderingContext, data: ArrayBuffer | ArrayBufferView | any, drawType: number): GLBuffer;
-		static createIndexBuffer(gl: WebGLRenderingContext, data: ArrayBuffer | ArrayBufferView | any, drawType: number): GLBuffer;
-		static create(gl: WebGLRenderingContext, type: number, data: ArrayBuffer | ArrayBufferView | any, drawType: number): GLBuffer;
-
-		destroy(): void;
-
-	}
-	export class GLFramebuffer {
-
-		constructor(gl: WebGLRenderingContext, width: number, height: number);
-
-		gl: WebGLRenderingContext;
-		frameBuffer: WebGLFramebuffer;
-		stencil: WebGLRenderbuffer;
-		texture: GLTexture;
-		width: number;
-		height: number;
-
-		enableTexture(texture: GLTexture): void;
-		enableStencil(): void;
-		clear(r: number, g: number, b: number, a: number): void;
-		bind(): void;
-		unbind(): void;
-		resize(width: number, height: number): void;
-		destroy(): void;
-
-		static createRGBA(gl: WebGLRenderingContext, width: number, height: number, data: ArrayBuffer | ArrayBufferView | any): GLFramebuffer;
-		static createFloat32(gl: WebGLRenderingContext, width: number, height: number, data: ArrayBuffer | ArrayBufferView | any): GLFramebuffer;
-
-	}
-	export class GLShader {
-
-		constructor(gl: WebGLRenderingContext, vertexSrc: string | string[], fragmentSrc: string | string[]);
-
-		gl: WebGLRenderingContext;
-		program: WebGLProgram;
-		uniforms: any;
-		attributes: any;
-
-		bind(): void;
-		destroy(): void;
-
-	}
-	export class GLTexture {
-
-		constructor(gl: WebGLRenderingContext, width?: number, height?: number, format?: number, type?: number);
-
-		gl: WebGLRenderingContext;
-		texture: WebGLTexture;
-		mipmap: boolean;
-		premultiplyAlpha: boolean;
-		width: number;
-		height: number;
-		format: number;
-		type: number;
-
-		upload(source: HTMLImageElement | ImageData | HTMLVideoElement | HTMLCanvasElement): void;
-		uploadData(data: number, width: number, height: number): void;
-		bind(location?: number): void;
-		unbind(): void;
-		minFilter(linear: boolean): void;
-		magFilter(linear: boolean): void;
-		enableMipmap(): void;
-		enableLinearScaling(): void;
-		enableNearestScaling(): void;
-		enableWrapClamp(): void;
-		enableWrapRepeat(): void;
-		enableWrapMirrorRepeat(): void;
-		destroy(): void;
-
-		static fromSource(gl: WebGLRenderingContext, source: HTMLImageElement | ImageData | HTMLVideoElement | HTMLCanvasElement, premultipleAlpha?: boolean): GLTexture;
-		static fromData(gl: WebGLRenderingContext, data: number[], width: number, height: number): GLTexture;
-
-	}
-	export interface IAttrib {
-
-		attribute: {
-			location: boolean;
-			size: number;
-		};
-		normalized: boolean;
-		stride: number;
-		start: number;
-		buffer: ArrayBuffer;
-
-	}
-	export interface IWebGLRenderingContextAttribute {
-
-		buffer: WebGLBuffer;
-		attribute: any;
-		type: number;
-		normalized: boolean;
-		stride: number;
-		start: number;
-
-	}
-	export interface IAttribState {
-		tempAttribState: IAttrib[];
-		attribState: IAttrib[];
-	}
-
-	export class VertexArrayObject {
-
-		static FORCE_NATIVE: boolean;
-
-		constructor(gl: WebGLRenderingContext, state: WebGLState);
-
-		protected nativeVaoExtension: any;
-		protected nativeState: IAttribState;
-		protected nativeVao: VertexArrayObject;
-		gl: WebGLRenderingContext;
-		attributes: IAttrib[];
-		indexBuffer: GLBuffer;
-		dirty: boolean;
-
-		bind(): VertexArrayObject;
-		unbind(): VertexArrayObject;
-		activate(): VertexArrayObject;
-		addAttribute(buffer: GLBuffer, attribute: IAttrib, type: number, normalized: boolean, stride: number, start: number): VertexArrayObject;
-		addIndex(buffer: GLBuffer, options?: any): VertexArrayObject;
-		clear(): VertexArrayObject;
-		draw(type: number, size: number, start: number): VertexArrayObject;
-		destroy(): void;
-
-	}
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-///////////////////////////////UTILS//////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-export interface IDecomposedDataUri {
-	mediaType: string;
-	subType: string;
-	encoding: string;
-	data: any;
-}
-
-export namespace utils {
-
-	export function uid(): number;
-	export function hex2rgb(hex: number, out?: number[]): number[];
-	export function hex2string(hex: number): string;
-	export function rgb2hex(rgb: Number[]): number;
-	export function canUseNewCanvasBlendModes(): boolean;
-	export function getResolutionOfUrl(url: string, defaultValue?: number): number;
-	export function getSvgSize(svgString: string): any;
-	export function decomposeDataUri(dataUri: string): IDecomposedDataUri;
-	export function getUrlFileExtension(url: string): string;
-	export function sayHello(type: string): void;
-	export function skipHello(): void;
-	export function isWebGLSupported(): boolean;
-	export function sign(n: number): number;
-	export function removeItems<T>(arr: T[], startIdx: number, removeCount: number): void;
-	export var TextureCache: any;
-	export var BaseTextureCache: any;
-
-	// https://github.com/kaimallea/isMobile
-	export namespace isMobile {
-		export var apple: {
-			phone: boolean;
-			ipod: boolean;
-			tablet: boolean;
-			device: boolean;
-		};
-		export var android: {
-			phone: boolean;
-			tablet: boolean;
-			device: boolean;
-		};
-		export var amazon: {
-			phone: boolean;
-			table: boolean;
-			device: boolean;
-		};
-		export var windows: {
-			phone: boolean;
-			tablet: boolean;
-			device: boolean;
-		};
-		export var seven_inch: boolean;
-		export var other: {
-			blackberry_10: boolean;
-			blackberry: boolean;
-			opera: boolean;
-			firefox: boolean;
-			chrome: boolean;
-			device: boolean;
-		};
-		export var any: boolean;
-		export var phone: boolean;
-		export var tablet: boolean;
-	}
-
-	// https://github.com/primus/eventemitter3
-	export class EventEmitter {
-
-		listeners(event: string): Function[];
-		emit(event: string, ...args: any[]): boolean;
-		on(event: string, fn: Function, context?: any): EventEmitter;
-		once(event: string, fn: Function, context?: any): EventEmitter;
-		removeListener(event: string, fn: Function, context?: any, once?: boolean): EventEmitter;
-		removeAllListeners(event: string): EventEmitter;
-		eventNames(): string[];
-
-		off(event: string, fn: Function, context?: any, once?: boolean): EventEmitter;
-		addListener(event: string, fn: Function, context?: any): EventEmitter;
-
-	}
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-/////////////////////////////depreciation/////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-// not sure how to handle blendmodes scalemodes basetexturecache
-export namespace core {
-
-	/**
-	 * @class
-	 * @private
-	 * @name SpriteBatch
-	 * @memberof PIXI
-	 * @see PIXI.ParticleContainer
-	 * @throws {ReferenceError} SpriteBatch does not exist any more, please use the new ParticleContainer instead.
-	 * @deprecated since version 3.0.0
-	 */
-	type SpriteBatch = ParticleContainer;
-
-	/**
-	 * @class
-	 * @private
-	 * @name AssetLoader
-	 * @memberof PIXI
-	 * @see PIXI.loaders.Loader
-	 * @throws {ReferenceError} The loader system was overhauled in pixi v3, please see the new PIXI.loaders.Loader class.
-	 * @deprecated since version 3.0.0
-	 */
-	type AssetLoader = loaders.Loader;
-
-	/**
-	 * @class
-	 * @private
-	 * @name Stage
-	 * @memberof PIXI
-	 * @see PIXI.Container
-	 * @deprecated since version 3.0.0
-	 */
-	type Stage = Container;
-
-	/**
-	 * @class
-	 * @private
-	 * @name DisplayObjectContainer
-	 * @memberof PIXI
-	 * @see PIXI.Container
-	 * @deprecated since version 3.0.0
-	 */
-	type DisplayObjectContainer = Container;
-
-	/**
-	 * @class
-	 * @private
-	 * @name Strip
-	 * @memberof PIXI
-	 * @see PIXI.mesh.Mesh
-	 * @deprecated since version 3.0.0
-	 */
-	type Strip = mesh.Mesh;
-
-	/**
-	 * @class
-	 * @private
-	 * @name Rope
-	 * @memberof PIXI
-	 * @see PIXI.mesh.Rope
-	 * @deprecated since version 3.0.0
-	 */
-	type Rope = mesh.Rope;
-
-	/**
-	 * @class
-	 * @private
-	 * @name ParticleContainer
-	 * @memberof PIXI
-	 * @see PIXI.particles.ParticleContainer
-	 * @deprecated since version 4.0.0
-	 */
-	type ParticleContainer = particles.ParticleContainer;
-
-	/**
-	 * @class
-	 * @private
-	 * @name MovieClip
-	 * @memberof PIXI
-	 * @see PIXI.extras.MovieClip
-	 * @deprecated since version 3.0.0
-	 */
-	type MovieClip = extras.AnimatedSprite;
-
-	/**
-	 * @class
-	 * @private
-	 * @name TilingSprite
-	 * @memberof PIXI
-	 * @see PIXI.extras.TilingSprite
-	 * @deprecated since version 3.0.0
-	 */
-	type TilingSprite = extras.TilingSprite;
-
-	/**
-	 * @class
-	 * @private
-	 * @name BitmapText
-	 * @memberof PIXI
-	 * @see PIXI.extras.BitmapText
-	 * @deprecated since version 3.0.0
-	 */
-	type BitmapText = extras.BitmapText;
-
-	/**
-	 * @namespace
-	 * @private
-	 * @name math
-	 * @memberof PIXI
-	 * @see PIXI
-	 * @deprecated since version 3.0.6
-	 */
-	type math = any;
-
-	/**
-	 * @class
-	 * @private
-	 * @name PIXI.AbstractFilter
-	 * @see PIXI.Filter
-	 * @deprecated since version 3.0.6
-	 */
-	type AbstractFilter = Filter;
-
-	/**
-	 * @class
-	 * @private
-	 * @name PIXI.TransformManual
-	 * @see PIXI.TransformBase
-	 * @deprecated since version 4.0.0
-	 */
-	type TransformManual = TransformBase;
-
-	/**
-	 * @static
-	 * @constant
-	 * @name PIXI.TARGET_FPMS
-	 * @see PIXI.settings.TARGET_FPMS
-	 * @deprecated since version 4.2.0
-	 */
-	type TARGET_FPMS = number;
-
-	/**
-	 * @static
-	 * @constant
-	 * @name PIXI.FILTER_RESOLUTION
-	 * @see PIXI.settings.FILTER_RESOLUTION
-	 * @deprecated since version 4.2.0
-	 */
-	type FILTER_RESOLUTION = number;
-
-	/**
-	 * @static
-	 * @constant
-	 * @name PIXI.RESOLUTION
-	 * @see PIXI.settings.RESOLUTION
-	 * @deprecated since version 4.2.0
-	 */
-	type RESOLUTION = number;
-
-	/**
-	 * @static
-	 * @constant
-	 * @name PIXI.MIPMAP_TEXTURES
-	 * @see PIXI.settings.MIPMAP_TEXTURES
-	 * @deprecated since version 4.2.0
-	 */
-	type MIPMAP_TEXTURES = any;
-
-	/**
-	 * @static
-	 * @constant
-	 * @name PIXI.SPRITE_BATCH_SIZE
-	 * @see PIXI.settings.SPRITE_BATCH_SIZE
-	 * @deprecated since version 4.2.0
-	 */
-	type SPRITE_BATCH_SIZE = number;
-
-	/**
-	 * @static
-	 * @constant
-	 * @name PIXI.SPRITE_MAX_TEXTURES
-	 * @see PIXI.settings.SPRITE_MAX_TEXTURES
-	 * @deprecated since version 4.2.0
-	 */
-	type SPRITE_MAX_TEXTURES = number;
-
-	/**
-	 * @static
-	 * @constant
-	 * @name PIXI.RETINA_PREFIX
-	 * @see PIXI.settings.RETINA_PREFIX
-	 * @deprecated since version 4.2.0
-	 */
-	type RETINA_PREFIX = RegExp | string;
-
-	/**
-	 * @static
-	 * @constant
-	 * @name PIXI.DEFAULT_RENDER_OPTIONS
-	 * @see PIXI.settings.RENDER_OPTIONS
-	 * @deprecated since version 4.2.0
-	 */
-	type DEFAULT_RENDER_OPTIONS = number;
-
-}
-
-export namespace extras {
-
-	/**
-	 * @class
-	 * @name MovieClip
-	 * @memberof PIXI.extras
-	 * @see PIXI.extras.AnimatedSprite
-	 * @deprecated since version 4.2.0
-	 */
-	type MovieClip = extras.AnimatedSprite;
-
-}
-
-declare global {
-	namespace pixi {
-    	export var gl: typeof glCore;
-	}
-}
-
-export as namespace PIXI;
diff --git a/pixi.js/pixi.js-tests.ts b/pixi.js/pixi.js-tests.ts
index 313ad7740e..8cea83df3f 100644
--- a/pixi.js/pixi.js-tests.ts
+++ b/pixi.js/pixi.js-tests.ts
@@ -1,217 +1,124 @@
-import PIXI = require("pixi.js");
 namespace basics {
 
     export class Basics {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
+        private app: PIXI.Application;
 
         private bunny: PIXI.Sprite;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            this.bunny = PIXI.Sprite.fromImage("required/assets/basics/bunny.png");
+            this.bunny.anchor.set(0.5);
+            this.bunny.x = this.app.renderer.width / 2;
+            this.bunny.y = this.app.renderer.height / 2;
+            this.app.stage.addChild(this.bunny);
 
-            // create a texture from an image path
-            var texture: PIXI.Texture = PIXI.Texture.fromImage("../../_assets/basics/bunny.png");
-
-            // create a new Sprite using the texture
-            this.bunny = new PIXI.Sprite(texture);
-
-            // center the sprite's anchor point
-            this.bunny.anchor.x = 0.5;
-            this.bunny.anchor.y = 0.5;
-
-            // move the sprite to the center of the screen
-            this.bunny.position.x = 200;
-            this.bunny.position.y = 150;
-
-            // add it to the stage
-            this.stage.addChild(this.bunny);
-
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.bunny.rotation += 0.1;
-
-            this.renderer.render(this.stage);
+            this.app.ticker.add((delta: number): void => {
+                this.bunny.rotation += 0.1 / delta;
+            });
 
         }
 
     }
 
-}
-
-namespace basics {
-
     export class Click {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
+        private app: PIXI.Application;
 
         private sprite: PIXI.Sprite;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            this.sprite = PIXI.Sprite.fromImage('../../_assets/basics/bunny.png');
-            this.sprite.position.set(230, 264);
+            this.sprite = PIXI.Sprite.fromImage("../../_assets/basics/bunny.png");
+            this.sprite.texture.baseTexture.scaleMode = PIXI.SCALE_MODES.NEAREST;
+            this.sprite.anchor.set(0.5);
+            this.sprite.x = this.app.renderer.width / 2;
+            this.sprite.y = this.app.renderer.height / 2;
             this.sprite.interactive = true;
-            this.sprite.on('mousedown', this.onDown, this);
-            this.sprite.on('touchstart', this.onDown, this);
-
-            // add it to the stage
-            this.stage.addChild(this.sprite);
-
-            // start animatng
-            this.animate();
+            this.sprite.buttonMode = true;
+            this.sprite.on("pointerdown", (): void => {
+                this.sprite.scale.x *= 1.25;
+                this.sprite.scale.y *= 1.25;
+            });
+            this.app.stage.addChild(this.sprite);
 
         }
-
-        private onDown = (eventData: PIXI.interaction.InteractionData): void => {
-
-            this.sprite.scale.x += 0.3;
-            this.sprite.scale.y += 0.3;
-
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
     }
 
-}
-
-namespace basics {
-
-    export class Container {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
+    export class ContainerPivot {
 
+        private app: PIXI.Application;
         private container: PIXI.Container;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            this.app = new PIXI.Application(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.app.view);
 
             this.container = new PIXI.Container();
+            this.app.stage.addChild(this.container);
 
-            this.stage.addChild(this.container);
+            let texture = PIXI.Texture.fromImage("../../_assets/basics/bunny.png");
+
+            for (let i = 0; i < 25; i++) {
+
+                let bunny = new PIXI.Sprite(texture);
+                bunny.anchor.set(0.5);
+                bunny.x = (i % 5) * 40;
+                bunny.y = Math.floor(i / 5) * 40;
+                this.container.addChild(bunny);
 
-            for (var j = 0; j < 5; j++) {
-                for (var i = 0; i < 5; i++) {
-                    var bunny: PIXI.Sprite = PIXI.Sprite.fromImage('../../_assets/basics/bunny.png');
-                    bunny.x = 40 * i;
-                    bunny.y = 40 * j;
-                    this.container.addChild(bunny);
-                }
             }
 
-            /*
-             * All the bunnies are added to the container with the addChild method
-             * when you do this, all the bunnies become children of the container, and when a container moves,
-             * so do all its children.
-             * This gives you a lot of flexibility and makes it easier to position elements on the screen
-             */
-            this.container.x = 100;
-            this.container.y = 60;
+            this.container.x = this.app.renderer.width / 2;
+            this.container.y = this.app.renderer.height / 2;
 
-            // start animating
-            this.animate();
+            this.container.pivot.x = this.container.width / 2;
+            this.container.pivot.y = this.container.height / 2;
+
+            this.app.ticker.add((delta: number): void => {
+                this.container.rotation -= 0.01 / delta;
+            });
 
         }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
     }
 
-}
+    export class Container {
 
-namespace basics {
-
-    export class CustomFilter {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private background: PIXI.Sprite;
-
-        private filter: CustomizedFilter;
+        private app: PIXI.Application;
+        private container: PIXI.Container;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            this.container = new PIXI.Container();
+            this.app.stage.addChild(this.container);
 
-            this.background = PIXI.Sprite.fromImage('../../_assets/bkg-grass.jpg');
-            this.background.scale.set(1.3, 1);
-            this.stage.addChild(this.background);
+            let texture = PIXI.Texture.fromImage("../../_assets/basics/bunny.png");
 
+            for (let i = 0; i < 25; i++) {
 
-            PIXI.loader.add('shader', '../../_assets/basics/shader.frag');
-            PIXI.loader.once('complete', this.onLoaded, this);
-            PIXI.loader.load();
+                let bunny = new PIXI.Sprite(texture);
+                bunny.anchor.set(0.5);
+                bunny.x = (i % 5) * 40;
+                bunny.y = Math.floor(i / 5) * 40;
+                this.container.addChild(bunny);
+
+            }
+
+            this.container.x = this.app.renderer.width / 2;
+            this.container.y = this.app.renderer.height / 2;
 
         }
-
-        private onLoaded(loader: PIXI.loaders.Loader, res: any) {
-
-            var fragmentSrc = res.shader.data;
-
-            this.filter = new CustomizedFilter(fragmentSrc);
-            this.background.filters = [this.filter];
-
-            this.animate();
-
-
-        }
-
-        private animate = (): void => {
-
-            this.filter.uniforms['customUniform'].value += 0.04;
-
-            this.renderer.render(this.stage);
-            requestAnimationFrame(this.animate);
-
-        }
-
     }
 
     export class CustomizedFilter extends PIXI.Filter {
@@ -219,469 +126,361 @@ namespace basics {
         constructor(fragmentSource: string) {
             super(null, fragmentSource, {
                 customUniform: {
-                    type: '1f',
+                    type: "1f",
                     value: 0
                 }
             });
         }
 
     }
+    export class CustomFilter {
 
-}
+        private app: PIXI.Application;
+        private background: PIXI.Sprite;
+        private filter: CustomizedFilter;
 
-namespace basics {
+        constructor() {
+
+            this.app = new PIXI.Application(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.app.view);
+
+            this.background = PIXI.Sprite.fromImage("required/assets/bkg-grass.jpg");
+            this.background.width = this.app.renderer.width;
+            this.background.height = this.app.renderer.height;
+            this.app.stage.addChild(this.background);
+
+            this.app.stop();
+
+            PIXI.loader.add("shader", "_assets/basics/shader.frag")
+
+                .load((loader: PIXI.loaders.Loader, resource: any): void => {
+
+                    this.filter = new PIXI.Filter(null, resource.shader.data);
+                    this.background.filters = [this.filter];
+                    this.app.start();
+
+                    this.app.ticker.add((delta: number) => {
+                        this.filter.uniforms.customUniform += 0.04 / delta;
+                    });
+
+                });
+
+        }
+    }
 
     export class Graphics {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
+        private app: PIXI.Application;
         private graphics: PIXI.Graphics;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application(800, 600, { antialias: true });
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-            this.stage.interactive = true;
+            let graphics = new PIXI.Graphics();
 
-            this.graphics = new PIXI.Graphics();
+            // set a fill and line style
+            graphics.beginFill(0xFF3300);
+            graphics.lineStyle(4, 0xffd900, 1);
 
             // draw a shape
-            this.graphics.moveTo(50, 50);
-            this.graphics.lineTo(250, 50);
-            this.graphics.lineTo(100, 100);
-            this.graphics.lineTo(50, 50);
-            this.graphics.endFill();
+            graphics.moveTo(50, 50);
+            graphics.lineTo(250, 50);
+            graphics.lineTo(100, 100);
+            graphics.lineTo(50, 50);
+            graphics.endFill();
 
             // set a fill and a line style again and draw a rectangle
-            this.graphics.lineStyle(2, 0x0000FF, 1);
-            this.graphics.beginFill(0xFF700B, 1);
-            this.graphics.drawRect(50, 250, 120, 120);
+            graphics.lineStyle(2, 0x0000FF, 1);
+            graphics.beginFill(0xFF700B, 1);
+            graphics.drawRect(50, 250, 120, 120);
 
             // draw a rounded rectangle
-            this.graphics.lineStyle(2, 0xFF00FF, 1);
-            this.graphics.beginFill(0xFF00BB, 0.25);
-            this.graphics.drawRoundedRect(150, 450, 300, 100, 15);
-            this.graphics.endFill();
+            graphics.lineStyle(2, 0xFF00FF, 1);
+            graphics.beginFill(0xFF00BB, 0.25);
+            graphics.drawRoundedRect(150, 450, 300, 100, 15);
+            graphics.endFill();
 
-            // draw a circle, set the lineStyle to zero so the circle doesn't have an outline
-            this.graphics.lineStyle(0);
-            this.graphics.beginFill(0xFFFF0B, 0.5);
-            this.graphics.drawCircle(470, 90, 60);
-            this.graphics.endFill();
+            // draw a circle, set the lineStyle to zero so the circle doesn"t have an outline
+            graphics.lineStyle(0);
+            graphics.beginFill(0xFFFF0B, 0.5);
+            graphics.drawCircle(470, 90, 60);
+            graphics.endFill();
 
-            this.stage.addChild(this.graphics);
-
-            // start animating
-            this.animate();
+            this.graphics = graphics;
 
+            this.app.stage.addChild(this.graphics);
         }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
     }
 
-}
-
-namespace basics {
-
     export class RenderTexture {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
+        private app: PIXI.Application;
         private container: PIXI.Container;
-
         private renderTexture: PIXI.RenderTexture;
-
         private sprite: PIXI.Sprite;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            this.app = new PIXI.Application(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.app.view);
 
             this.container = new PIXI.Container();
+            this.app.stage.addChild(this.container);
 
-            this.stage.addChild(this.container);
+            let texture = PIXI.Texture.fromImage("required/assets/basics/bunny.png");
 
-            for (var j = 0; j < 5; j++) {
-                for (var i = 0; i < 5; i++) {
-                    var bunny: PIXI.Sprite = PIXI.Sprite.fromImage('../../_assets/basics/bunny.png');
-                    bunny.x = 40 * i;
-                    bunny.y = 40 * j;
-                    bunny.rotation = Math.random() * (Math.PI * 2);
-                    this.container.addChild(bunny);
-                }
+            for (let i = 0; i < 25; i++) {
+                let bunny = new PIXI.Sprite(texture);
+                bunny.x = (i % 5) * 30;
+                bunny.y = Math.floor(i / 5) * 30;
+                bunny.rotation = Math.random() * (Math.PI * 2);
+                this.container.addChild(bunny);
             }
 
-            this.renderTexture = PIXI.RenderTexture.create(300, 200, PIXI.SCALE_MODES.LINEAR, 0.1);
+            let brt = new PIXI.BaseRenderTexture(300, 300, PIXI.SCALE_MODES.LINEAR, 1);
+            let rt = new PIXI.RenderTexture(brt);
 
-            this.sprite = new PIXI.Sprite(this.renderTexture);
+            this.sprite = new PIXI.Sprite(rt);
             this.sprite.x = 450;
             this.sprite.y = 60;
-            this.stage.addChild(this.sprite);
+            this.app.stage.addChild(this.sprite);
 
             this.container.x = 100;
             this.container.y = 60;
 
-            // start animating
-            this.animate();
+            this.app.ticker.add((delta: number) => {
+                this.app.renderer.render(this.container, rt);
+            });
 
         }
+    }
 
-        private animate = (): void => {
+    export class SpriteSheet {
 
-            this.renderer.render(this.container, this.renderTexture);
+        private app: PIXI.Application;
+        private anim: PIXI.extras.AnimatedSprite;
 
-            requestAnimationFrame(this.animate);
+        constructor() {
 
-            this.renderer.render(this.stage);
+            PIXI.loader
+                .add("required/assets/basics/fighter.json")
+                .load((loader: PIXI.loaders.Loader, resource: any) => {
+
+                    let frames = [];
+
+                    for (let i = 0; i < 30; i++) {
+
+                        let val = i < 10 ? "0" + i : i;
+
+                        frames.push(PIXI.Texture.fromFrame("rollSequence00" + val + ".png"));
+
+                    }
+
+                    this.anim = new PIXI.extras.AnimatedSprite(frames);
+
+                    this.anim.x = this.app.renderer.width / 2;
+                    this.anim.y = this.app.renderer.height / 2;
+                    this.anim.anchor.set(0.5);
+                    this.anim.animationSpeed = 0.5;
+                    this.anim.play();
+
+                    this.app.stage.addChild(this.anim);
+
+                    this.app.ticker.add((deltaTime: number) => {
+                        this.anim.rotation += 0.01;
+                    });
+
+                });
+        }
+
+    }
+
+    export class Text {
+
+        private app: PIXI.Application;
+        private basicText: PIXI.Text;
+        private richText: PIXI.Text;
+
+        constructor() {
+
+            this.app = new PIXI.Application(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.app.view);
+
+            this.basicText = new PIXI.Text("Basic text in pixi");
+            this.basicText.x = 30;
+            this.basicText.y = 90;
+            this.app.stage.addChild(this.basicText);
+
+            let style = new PIXI.TextStyle({
+                fontFamily: "Arial",
+                fontSize: 36,
+                fontStyle: "italic",
+                fontWeight: "bold",
+                fill: ["#ffffff", "#fff0b5"],
+                stroke: "#4a1850",
+                strokeThickness: 5,
+                dropShadow: true,
+                dropShadowColor: "#000000",
+                dropShadowBlur: 4,
+                dropShadowAngle: Math.PI / 6,
+                dropShadowDistance: 6,
+                wordWrap: true,
+                wordWrapWidth: 440
+            });
+
+            this.richText = new PIXI.Text("Rich text with a lot of options and across multiple lines", style);
+            this.richText.x = 30;
+            this.richText.y = 180;
+            this.app.stage.addChild(this.richText);
 
         }
 
     }
 
-}
+    export class TexturedMesh {
 
-namespace basics {
-
-    export class SpriteSheet {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private movie: PIXI.extras.AnimatedSprite;
+        private app: PIXI.Application;
+        private count: number;
+        private points: PIXI.Point[];
+        private strip: PIXI.mesh.Rope;
+        private graphics: PIXI.Graphics;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            let ropeLength = 918 / 20;
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            for (let i = 0; i < 25; i++) {
+                this.points.push(new PIXI.Point(i * ropeLength, 0));
+            }
 
-            PIXI.loader.add('../../_assets/basics/fighter.json').load((loader: PIXI.loaders.Loader, object: any): void => {
+            this.strip = new PIXI.mesh.Rope(PIXI.Texture.fromImage("required/assets/snake.png"), this.points);
+            this.strip.x = -40;
+            this.strip.y = 300;
+            this.app.stage.addChild(this.strip);
 
-                // create an array of textures from an image path
-                var frames: PIXI.Texture[] = [];
+            this.graphics = new PIXI.Graphics();
+            this.graphics.x = this.strip.x;
+            this.graphics.y = this.strip.y;
+            this.app.stage.addChild(this.graphics);
 
-                for (var i = 0; i < 30; i++) {
+            // start animating
+            this.app.ticker.add((deltaTime: number) => {
 
-                    var val = i < 10 ? '0' + i : i;
+                this.count += 0.1;
 
-                    // magically works since the spritesheet was loaded with the pixi loader
-                    frames.push(PIXI.Texture.fromFrame('rollSequence00' + val + '.png'));
+                // make the snake
+                for (let i = 0; i < this.points.length; i++) {
+                    this.points[i].y = Math.sin((i * 0.5) + this.count) * 30;
+                    this.points[i].x = i * ropeLength + Math.cos((i * 0.3) + this.count) * 20;
                 }
-
-
-                // create a AnimatedSprite (brings back memories from the days of Flash, right ?)
-                this.movie = new PIXI.extras.AnimatedSprite(frames);
-
-                /*
-                 * A AnimatedSprite inherits all the properties of a PIXI sprite
-                 * so you can change its position, its anchor, mask it, etc
-                 */
-                this.movie.position.set(300);
-                this.movie.anchor.set(0.5);
-                this.movie.animationSpeed = 0.5;
-                this.movie.play();
-
-                this.stage.addChild(this.movie);
-
-                this.animate();
+                this.renderPoints();
 
             });
 
         }
 
-        private animate = (): void => {
-
-            this.movie.rotation += 0.01;
-
-            // render the stage container
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-}
-
-namespace basics {
-
-    export class Text {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private basicText: PIXI.Text;
-
-        private richText: PIXI.Text;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            this.basicText = new PIXI.Text('Basic Text in Pixi');
-            this.basicText.x = 30;
-            this.basicText.y = 90;
-
-            this.stage.addChild(this.basicText);
-
-            var style: PIXI.TextStyleOptions = {
-                fontSize: 36,
-                fontFamily: 'Arial',
-                fontWeight: 'bold',
-                fontStyle: 'italic',
-                fill: '#F7EDCA',
-                stroke: '#4a1850',
-                strokeThickness: 5,
-                dropShadow: true,
-                dropShadowColor: '#000000',
-                dropShadowAngle: Math.PI / 6,
-                dropShadowDistance: 6,
-                wordWrap: true,
-                wordWrapWidth: 440
-            };
-
-            this.richText = new PIXI.Text('Rich Text with a lot of options and across multiple lines', style);
-            this.richText.x = 30;
-            this.richText.y = 180;
-
-            this.stage.addChild(this.richText);
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-}
-
-namespace basics {
-
-    export class TexturedMesh {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private strip: PIXI.mesh.Rope;
-
-        private graphics: PIXI.Graphics;
-
-        private count: number;
-
-        private points: PIXI.Point[];
-
-        private ropeLength: number;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            this.count = 0;
-
-            this.ropeLength = 918 / 20;
-            this.ropeLength = 45;
-
-            this.points = [];
-
-            for (var i = 0; i < 25; i++) {
-                this.points.push(new PIXI.Point(i * this.ropeLength, 0));
-            }
-
-            this.strip = new PIXI.mesh.Rope(PIXI.Texture.fromImage('../../_assets/snake.png'), this.points);
-            this.strip.position.x = -40;
-            this.strip.position.y = 300;
-            this.stage.addChild(this.strip);
-
-            this.graphics = new PIXI.Graphics();
-            this.graphics.x = this.strip.x;
-            this.graphics.y = this.strip.y;
-            this.stage.addChild(this.graphics);
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            this.count += 0.1;
-
-            // make the snake
-            for (var i = 0; i < this.points.length; i++) {
-                this.points[i].y = Math.sin((i * 0.5) + this.count) * 30;
-                this.points[i].x = i * this.ropeLength + Math.cos((i * 0.3) + this.count) * 20;
-            }
-
-            // render the stage
-            this.renderer.render(this.stage);
-
-            this.renderPoints();
-
-            requestAnimationFrame(this.animate);
-
-        }
-
         private renderPoints(): void {
-            this.graphics.clear();
 
+            this.graphics.clear();
             this.graphics.lineStyle(2, 0xffc2c2);
             this.graphics.moveTo(this.points[0].x, this.points[0].y);
 
-            for (var i = 1; i < this.points.length; i++) {
+            for (let i = 1; i < this.points.length; i++) {
                 this.graphics.lineTo(this.points[i].x, this.points[i].y);
             }
 
-            for (var i = 1; i < this.points.length; i++) {
+            for (let i = 1; i < this.points.length; i++) {
                 this.graphics.beginFill(0xff0022);
                 this.graphics.drawCircle(this.points[i].x, this.points[i].y, 10);
                 this.graphics.endFill();
             }
+
         }
 
     }
 
-}
-
-namespace basics {
-
     export class TilingSprite {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private texture: PIXI.Texture;
-
+        private app: PIXI.Application;
         private tilingSprite: PIXI.extras.TilingSprite;
-
         private count: number;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application();
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            let texture = PIXI.Texture.fromImage("required/assets/p2.jpeg");
 
-            // create a texture from an image path
-            this.texture = PIXI.Texture.fromImage('../../_assets/p2.jpeg');
-
-            /* create a tiling sprite ...
-             * requires a texture, a width and a height
-             * in WebGL the image size should preferably be a power of two
-             */
-            this.tilingSprite = new PIXI.extras.TilingSprite(this.texture, this.renderer.width, this.renderer.height);
-            this.stage.addChild(this.tilingSprite);
+            this.tilingSprite = new PIXI.extras.TilingSprite(
+                texture,
+                this.app.renderer.width,
+                this.app.renderer.height
+            );
+            this.app.stage.addChild(this.tilingSprite);
 
             this.count = 0;
 
-            this.animate();
+            this.app.ticker.add((deltaTime: number): void => {
 
-        }
+                this.count += 0.005;
 
-        private animate = (): void => {
+                this.tilingSprite.tileScale.x = 2 + Math.sin(this.count);
+                this.tilingSprite.tileScale.y = 2 + Math.cos(this.count);
+                this.tilingSprite.tilePosition.x += 1;
+                this.tilingSprite.tilePosition.y += 1;
 
-            this.count += 0.005;
-
-            this.tilingSprite.tileScale.x = 2 + Math.sin(this.count);
-            this.tilingSprite.tileScale.y = 2 + Math.cos(this.count);
-
-            this.tilingSprite.tilePosition.x += 1;
-            this.tilingSprite.tilePosition.y += 1;
-
-            // render the root container
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
+            });
 
         }
 
     }
 
-}
-
-namespace basics {
-
     export class Video {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private texture: PIXI.Texture;
-
+        private app: PIXI.Application;
+        private button: PIXI.Graphics;
         private videoSprite: PIXI.Sprite;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application(800, 600, { transparent: true });
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            this.button = new PIXI.Graphics()
+                .beginFill(0x0, 0.5)
+                .drawRoundedRect(0, 0, 100, 100, 10)
+                .endFill()
+                .beginFill(0xffffff)
+                .moveTo(36, 30)
+                .lineTo(36, 70)
+                .lineTo(70, 50);
 
-            // create a video texture from a path
-            this.texture = PIXI.Texture.fromVideo('../../_assets/testVideo.mp4');
+            // Position the button
+            this.button.x = (this.app.renderer.width - this.button.width) / 2;
+            this.button.y = (this.app.renderer.height - this.button.height) / 2;
 
-            // create a new sprite using the video texture (yes it's that easy)
-            this.videoSprite = new PIXI.Sprite(this.texture);
-            this.videoSprite.width = this.renderer.width;
-            this.videoSprite.height = this.renderer.height;
-            this.stage.addChild(this.videoSprite);
+            // Enable interactivity on the button
+            this.button.interactive = true;
+            this.button.buttonMode = true;
 
-            this.stage.addChild(this.videoSprite);
+            // Add to the stage
+            this.app.stage.addChild(this.button);
 
-            this.animate();
+            this.button.on("pointertap", (): void => {
 
-        }
+                this.button.destroy();
 
-        private animate = (): void => {
+                let texture = PIXI.Texture.fromVideo("required/assets/testVideo.mp4");
 
-            // render the stage
-            this.renderer.render(this.stage);
+                this.videoSprite = new PIXI.Sprite(texture);
+                this.videoSprite.width = this.app.renderer.width;
+                this.videoSprite.height = this.app.renderer.height;
+                this.app.stage.addChild(this.videoSprite);
 
-            requestAnimationFrame(this.animate);
+            });
 
         }
 
@@ -693,49 +492,48 @@ namespace demos {
 
     export class AlphaMask {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private background: PIXI.Container;
-
+        private app: PIXI.Application;
+        private bg: PIXI.Container;
         private cells: PIXI.Sprite;
-
         private mask: PIXI.Sprite;
-
         private target: PIXI.Point;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application();
+            this.app.stage.interactive = true;
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-            this.stage.interactive = true;
+            this.bg = PIXI.Sprite.fromImage("required/assets/bkg.jpg");
+            this.app.stage.addChild(this.bg);
 
-            this.background = PIXI.Sprite.fromImage('../../_assets/bkg.jpg');
-            this.stage.addChild(this.background);
+            this.cells = PIXI.Sprite.fromImage("required/assets/cells.png");
+            this.cells.scale.set(1.5);
 
-            this.cells = PIXI.Sprite.fromImage('../../_assets/cells.png');
-            this.cells.scale.set(1.5, 1.5);
-
-            this.mask = PIXI.Sprite.fromImage('../../_assets/flowerTop.png');
+            this.mask = PIXI.Sprite.fromImage("required/assets/flowerTop.png");
             this.mask.anchor.set(0.5);
-            this.mask.position.x = 310;
-            this.mask.position.y = 190;
+            this.mask.x = 310;
+            this.mask.y = 190;
 
             this.cells.mask = this.mask;
 
-            this.stage.addChild(this.mask);
-
-            this.stage.addChild(this.cells);
+            this.app.stage.addChild(this.mask, this.cells);
 
             this.target = new PIXI.Point();
 
             this.reset();
 
-            this.animate();
+            this.app.ticker.add((deltaTime: number): void => {
+
+                this.mask.position.x += (this.target.x - this.mask.x) * 0.1;
+                this.mask.position.y += (this.target.y - this.mask.y) * 0.1;
+
+                if (Math.abs(this.mask.x - this.target.x) < 1) {
+                    this.reset();
+                }
+
+
+            });
 
         }
 
@@ -746,492 +544,300 @@ namespace demos {
 
         }
 
-        private animate = (): void => {
+    }
 
-            this.mask.position.x += (this.target.x - this.mask.x) * 0.1;
-            this.mask.position.y += (this.target.y - this.mask.y) * 0.1;
+    export class AnimatedSpriteDemo {
 
-            if (Math.abs(this.mask.x - this.target.x) < 1) {
-                this.reset();
-            }
+        private app: PIXI.Application;
 
-            this.renderer.render(this.stage);
+        constructor() {
 
-            requestAnimationFrame(this.animate);
+            this.app = new PIXI.Application();
+            this.app.stop();
+            document.body.appendChild(this.app.view);
+
+            PIXI.loader
+                .add("spritesheet", "required/assets/mc.json")
+                .load((): void => {
+
+                    let explosionTextures: PIXI.Texture[] = [];
+                    let i: number;
+
+                    for (i = 0; i < 26; i++) {
+                        let texture = PIXI.Texture.fromFrame("Explosion_Sequence_A " + (i + 1) + ".png");
+                        explosionTextures.push(texture);
+                    }
+
+                    for (i = 0; i < 50; i++) {
+
+                        let explosion = new PIXI.extras.AnimatedSprite(explosionTextures);
+
+                        explosion.x = Math.random() * this.app.renderer.width;
+                        explosion.y = Math.random() * this.app.renderer.height;
+                        explosion.anchor.set(0.5);
+                        explosion.rotation = Math.random() * Math.PI;
+                        explosion.scale.set(0.75 + Math.random() * 0.5);
+                        explosion.gotoAndPlay(Math.random() * 27);
+                        this.app.stage.addChild(explosion);
+                    }
+
+                    this.app.start();
+
+                });
 
         }
 
     }
 
-}
-
-namespace demos {
-
     export class Batch {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
+        private app: PIXI.Application;
         private sprites: PIXI.particles.ParticleContainer;
-
-        private maggots: BatchDude[];
-
-        private tick: number;
-
+        private maggots: Dude[];
         private dudeBounds: PIXI.Rectangle;
+        private tick: number;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            this.app = new PIXI.Application();
+            document.body.appendChild(this.app.view);
 
             this.sprites = new PIXI.particles.ParticleContainer(10000, {
-
                 scale: true,
                 position: true,
                 rotation: true,
                 uvs: true,
                 alpha: true
-
             });
-            this.stage.addChild(this.sprites);
+            this.app.stage.addChild(this.sprites);
 
-            // create an array to store all the sprites
             this.maggots = [];
 
-            var totalSprites = this.renderer instanceof PIXI.WebGLRenderer ? 10000 : 100;
+            let totalSprites = this.app.renderer instanceof PIXI.WebGLRenderer ? 10000 : 100;
 
-            for (var i = 0; i < totalSprites; i++) {
+            let dudeTexture = PIXI.Texture.fromImage("required/assets/tinyMaggot.png");
 
-                // create a new Sprite
-                var dude = new BatchDude(PIXI.Texture.fromImage('../../_assets/tinyMaggot.png'));
+            for (let i = 0; i < totalSprites; i++) {
 
+                let dude = new Dude(dudeTexture);
                 dude.tint = Math.random() * 0xE8D4CD;
-
-                // set the anchor point so the texture is centerd on the sprite
                 dude.anchor.set(0.5);
-
-                // different maggots, different sizes
                 dude.scale.set(0.8 + Math.random() * 0.3);
-
-                // scatter them all
-                dude.x = Math.random() * this.renderer.width;
-                dude.y = Math.random() * this.renderer.height;
-
-                dude.tint = Math.random() * 0x808080;
-
-                // create a random direction in radians
+                dude.x = Math.random() * this.app.renderer.width;
+                dude.y = Math.random() * this.app.renderer.height;
                 dude.direction = Math.random() * Math.PI * 2;
-
-                // this number will be used to modify the direction of the sprite over time
                 dude.turningSpeed = Math.random() - 0.8;
-
-                // create a random speed between 0 - 2, and these maggots are slooww
                 dude.speed = (2 + Math.random() * 2) * 0.2;
-
                 dude.offset = Math.random() * 100;
 
-                // finally we push the dude into the maggots array so it it can be easily accessed later
                 this.maggots.push(dude);
-
                 this.sprites.addChild(dude);
 
             }
 
-            // create a bounding box box for the little maggots
-            var dudeBoundsPadding = 100;
-            this.dudeBounds = new PIXI.Rectangle(-dudeBoundsPadding,
+            let dudeBoundsPadding = 100;
+            this.dudeBounds = new PIXI.Rectangle(
                 -dudeBoundsPadding,
-                this.renderer.width + dudeBoundsPadding * 2,
-                this.renderer.height + dudeBoundsPadding * 2);
+                -dudeBoundsPadding,
+                this.app.renderer.width + dudeBoundsPadding * 2,
+                this.app.renderer.height + dudeBoundsPadding * 2
+            );
 
             this.tick = 0;
 
-            // start animating
-            this.animate();
+            this.app.ticker.add((): void => {
 
-        }
+                for (let i = 0; i < this.maggots.length; i++) {
 
-        private animate = (): void => {
+                    let dude = this.maggots[i];
+                    dude.scale.y = 0.95 + Math.sin(this.tick + dude.offset) * 0.05;
+                    dude.direction += dude.turningSpeed * 0.01;
+                    dude.x += Math.sin(dude.direction) * (dude.speed * dude.scale.y);
+                    dude.y += Math.cos(dude.direction) * (dude.speed * dude.scale.y);
+                    dude.rotation = -dude.direction + Math.PI;
 
-            // iterate through the sprites and update their position
-            for (const dude of this.maggots) {
-                dude.scale.y = 0.95 + Math.sin(this.tick + dude.offset) * 0.05;
-                dude.direction += dude.turningSpeed * 0.01;
-                dude.position.x += Math.sin(dude.direction) * (dude.speed * dude.scale.y);
-                dude.position.y += Math.cos(dude.direction) * (dude.speed * dude.scale.y);
-                dude.rotation = -dude.direction + Math.PI;
+                    // wrap the maggots
+                    if (dude.x < this.dudeBounds.x) {
+                        dude.x += this.dudeBounds.width;
+                    }
+                    else if (dude.x > this.dudeBounds.x + this.dudeBounds.width) {
+                        dude.x -= this.dudeBounds.width;
+                    }
 
-                // wrap the maggots
-                if (dude.position.x < this.dudeBounds.x) {
-                    dude.position.x += this.dudeBounds.width;
-                } else if (dude.position.x > this.dudeBounds.x + this.dudeBounds.width) {
-                    dude.position.x -= this.dudeBounds.width;
+                    if (dude.y < this.dudeBounds.y) {
+                        dude.y += this.dudeBounds.height;
+                    }
+                    else if (dude.y > this.dudeBounds.y + this.dudeBounds.height) {
+                        dude.y -= this.dudeBounds.height;
+                    }
                 }
 
-                if (dude.position.y < this.dudeBounds.y) {
-                    dude.position.y += this.dudeBounds.height;
-                } else if (dude.position.y > this.dudeBounds.y + this.dudeBounds.height) {
-                    dude.position.y -= this.dudeBounds.height;
-                }
-            }
+                this.tick += 0.1;
 
-            // increment the ticker
-            this.tick += 0.1;
-
-            // time to render the stage !
-            this.renderer.render(this.stage);
-
-            // request another animation frame...
-            requestAnimationFrame(this.animate);
+            });
 
         }
 
     }
+    export class Dude extends PIXI.Sprite {
 
-    export class BatchDude extends PIXI.Sprite {
-
-        direction: number;
-        speed: number;
-        turningSpeed: number;
-        offset: number;
+        direction: number = 0;
+        speed: number = 0;
+        turningSpeed: number = 0;
+        offset: number = 0;
 
         constructor(texture: PIXI.Texture) {
-
             super(texture);
-
         }
 
     }
 
-}
-
-namespace demos {
-
     export class BlendModes {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
+        private app: PIXI.Application;
         private background: PIXI.Sprite;
-
-        private dudeArray: BlendModesDude[];
-
-        private totalDudes: number;
-
+        private dudeArray: Dude[];
         private dudeBounds: PIXI.Rectangle;
 
-        private tick: number;
-
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application();
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            this.background = PIXI.Sprite.fromImage("required/assets/BGrotate.jpg");
+            this.app.stage.addChild(this.background);
 
-            // create a new background sprite
-            this.background = PIXI.Sprite.fromImage('../../_assets/BGrotate.jpg');
-            this.stage.addChild(this.background);
-
-            // create an array to store a reference to the dudes
             this.dudeArray = [];
 
-            this.totalDudes = 20;
+            let totalDudes = 20;
+            let dudeTexture = PIXI.Texture.fromImage("required/assets/flowerTop.png");
 
-            for (var i = 0; i < this.totalDudes; i++) {
-
-                // create a new Sprite that uses the image name that we just generated as its source
-                var dude = new BlendModesDude(PIXI.Texture.fromImage('../../_assets/flowerTop.png'));
+            for (let i = 0; i < totalDudes; i++) {
 
+                let dude = new Dude(dudeTexture);
                 dude.anchor.set(0.5);
-
-                // set a random scale for the dude
                 dude.scale.set(0.8 + Math.random() * 0.3);
-
-                // finally let's set the dude to be at a random position...
-                dude.position.x = Math.floor(Math.random() * this.renderer.width);
-                dude.position.y = Math.floor(Math.random() * this.renderer.height);
-
-                // The important bit of this example, this is how you change the default blend mode of the sprite
+                dude.x = Math.floor(Math.random() * this.app.renderer.width);
+                dude.y = Math.floor(Math.random() * this.app.renderer.height);
                 dude.blendMode = PIXI.BLEND_MODES.ADD;
-
-                // create some extra properties that will control movement
                 dude.direction = Math.random() * Math.PI * 2;
-
-                // this number will be used to modify the direction of the dude over time
                 dude.turningSpeed = Math.random() - 0.8;
-
-                // create a random speed for the dude between 0 - 2
                 dude.speed = 2 + Math.random() * 2;
 
-                // finally we push the dude into the dudeArray so it it can be easily accessed later
                 this.dudeArray.push(dude);
-
-                this.stage.addChild(dude);
+                this.app.stage.addChild(dude);
 
             }
 
-            // create a bounding box box for the little maggots
-            var dudeBoundsPadding = 100;
-            this.dudeBounds = new PIXI.Rectangle(-dudeBoundsPadding,
+            let dudeBoundsPadding = 100;
+            this.dudeBounds = new PIXI.Rectangle(
                 -dudeBoundsPadding,
-                this.renderer.width + dudeBoundsPadding * 2,
-                this.renderer.height + dudeBoundsPadding * 2);
+                -dudeBoundsPadding,
+                this.app.renderer.width + dudeBoundsPadding * 2,
+                this.app.renderer.height + dudeBoundsPadding * 2
+            );
 
-            this.tick = 0;
+            this.app.ticker.add((): void => {
 
-            // start animating
-            this.animate();
+                for (let i = 0; i < this.dudeArray.length; i++) {
 
-        }
+                    let dude = this.dudeArray[i];
+                    dude.direction += dude.turningSpeed * 0.01;
+                    dude.x += Math.sin(dude.direction) * dude.speed;
+                    dude.y += Math.cos(dude.direction) * dude.speed;
+                    dude.rotation = -dude.direction - Math.PI / 2;
 
-        private animate = (): void => {
+                    // wrap the dudes by testing their bounds...
+                    if (dude.x < this.dudeBounds.x) {
+                        dude.x += this.dudeBounds.width;
+                    }
+                    else if (dude.x > this.dudeBounds.x + this.dudeBounds.width) {
+                        dude.x -= this.dudeBounds.width;
+                    }
 
-            // iterate through the dudes and update the positions
-            for (const dude of this.dudeArray) {
-                dude.direction += dude.turningSpeed * 0.01;
-                dude.position.x += Math.sin(dude.direction) * dude.speed;
-                dude.position.y += Math.cos(dude.direction) * dude.speed;
-                dude.rotation = -dude.direction - Math.PI / 2;
-
-                // wrap the dudes by testing their bounds...
-                if (dude.position.x < this.dudeBounds.x) {
-                    dude.position.x += this.dudeBounds.width;
-                } else if (dude.position.x > this.dudeBounds.x + this.dudeBounds.width) {
-                    dude.position.x -= this.dudeBounds.width;
+                    if (dude.y < this.dudeBounds.y) {
+                        dude.y += this.dudeBounds.height;
+                    }
+                    else if (dude.y > this.dudeBounds.y + this.dudeBounds.height) {
+                        dude.y -= this.dudeBounds.height;
+                    }
                 }
 
-                if (dude.position.y < this.dudeBounds.y) {
-                    dude.position.y += this.dudeBounds.height;
-                } else if (dude.position.y > this.dudeBounds.y + this.dudeBounds.height) {
-                    dude.position.y -= this.dudeBounds.height;
-                }
-            }
-
-            // increment the ticker
-            this.tick += 0.1;
-
-            // time to render the stage !
-            this.renderer.render(this.stage);
-
-            // request another animation frame...
-            requestAnimationFrame(this.animate);
+            });
 
         }
 
     }
 
-    export class BlendModesDude extends PIXI.Sprite {
-
-        direction: number;
-        speed: number;
-        turningSpeed: number;
-        offset: number;
-
-        constructor(texture: PIXI.Texture) {
-
-            super(texture);
-
-        }
-
-    }
-
-}
-
-namespace demos {
-
     export class CacheAsBitmap {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
+        private app: PIXI.Application;
         private aliens: PIXI.Sprite[];
-
-        private alienContainer: PIXI.Container;
-
         private count: number;
+        private alienContainer: PIXI.Container;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application();
+            this.app.stage.interactive = true;
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            this.app.stop();
 
-            // load resources
-            PIXI.loader
-                .add('spritesheet', '../../_assets/monsters.json')
-                .load(this.onAssetsLoaded);
-
-            // holder to store aliens
             this.aliens = [];
+            let alienFrames = [
+                "eggHead.png",
+                "flowerTop.png",
+                "helmlok.png",
+                "skully.png"
+            ];
 
             this.count = 0;
 
-            // create an empty container
             this.alienContainer = new PIXI.Container();
-            this.alienContainer.position.x = 400;
-            this.alienContainer.position.y = 300;
+            this.alienContainer.x = 400;
+            this.alienContainer.y = 300;
+            this.app.stage.addChild(this.alienContainer);
 
-            // make the stage interactive
-            this.stage.interactive = true;
+            PIXI.loader
+                .add("spritesheet", "required/assets/monsters.json")
+                .load((): void => {
 
-            this.stage.addChild(this.alienContainer);
+                    for (let i = 0; i < 100; i++) {
 
-            this.stage.on('click', this.onClick);
-            this.stage.on('tap', this.onClick);
+                        let frameName = alienFrames[i % 4];
 
-        }
+                        let alien = PIXI.Sprite.fromFrame(frameName);
+                        alien.tint = Math.random() * 0xFFFFFF;
+                        alien.x = Math.random() * 800 - 400;
+                        alien.y = Math.random() * 600 - 300;
+                        alien.anchor.x = 0.5;
+                        alien.anchor.y = 0.5;
+                        this.aliens.push(alien);
+                        this.alienContainer.addChild(alien);
+                    }
+                    this.app.start();
 
-        private onClick = (event: PIXI.interaction.InteractionEvent): void => {
+                    this.app.stage.on("pointerTap", (event: PIXI.interaction.InteractionEvent): void => {
+                        this.alienContainer.cacheAsBitmap = !this.alienContainer.cacheAsBitmap;
+                    });
+                    this.app.ticker.add((): void => {
 
-            this.alienContainer.cacheAsBitmap = !this.alienContainer.cacheAsBitmap;
+                        // let"s rotate the aliens a little bit
+                        for (let i = 0; i < 100; i++) {
+                            let alien = this.aliens[i];
+                            alien.rotation += 0.1;
+                        }
 
-            // feel free to play with what's below
-            // var sprite = new PIXI.Sprite(this.alienContainer.generateTexture());
-            // this.stage.addChild(sprite);
-            // sprite.position.x = Math.random() * 800;
-            // sprite.position.y = Math.random() * 600;
+                        this.count += 0.01;
 
-        }
+                        this.alienContainer.scale.x = Math.sin(this.count);
+                        this.alienContainer.scale.y = Math.sin(this.count);
+                        this.alienContainer.rotation += 0.01;
 
-        private onAssetsLoaded = (): void => {
+                    });
 
-            // add a bunch of aliens with textures from image paths
-
-            var alienFrames = ['eggHead.png', 'flowerTop.png', 'helmlok.png', 'skully.png'];
-
-            for (var i = 0; i < 100; i++) {
-
-                var frameName = alienFrames[i % 4];
-
-                // create an alien using the frame name..
-                var alien = PIXI.Sprite.fromFrame(frameName);
-                alien.tint = Math.random() * 0xFFFFFF;
-
-                /*
-                 * fun fact for the day :)
-                 * another way of doing the above would be
-                 * var texture = PIXI.Texture.fromFrame(frameName);
-                 * var alien = new PIXI.Sprite(texture);
-                 */
-                alien.position.x = Math.random() * 800 - 400;
-                alien.position.y = Math.random() * 600 - 300;
-                alien.anchor.x = 0.5;
-                alien.anchor.y = 0.5;
-                this.aliens.push(alien);
-                this.alienContainer.addChild(alien);
-
-            }
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            // let's rotate the aliens a little bit
-            for (var i = 0; i < 100; i++) {
-                var alien = this.aliens[i];
-                alien.rotation += 0.1;
-            }
-
-            this.count += 0.01;
-
-            this.alienContainer.scale.x = Math.sin(this.count);
-            this.alienContainer.scale.y = Math.sin(this.count);
-
-            this.alienContainer.rotation += 0.01;
-
-            // render the stage
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class DraggableBunny extends PIXI.Sprite {
-
-        // todo I dont know what event.data is at this time
-        private data: any;
-
-        private dragging: boolean;
-
-        constructor(texture?: PIXI.Texture) {
-
-            super(texture);
-
-            // enable the bunny to be interactive... this will allow it to respond to mouse and touch events
-            this.interactive = true;
-
-            // this button mode will mean the hand cursor appears when you roll over the bunny with your mouse
-            this.buttonMode = true;
-
-            // center the bunny's anchor point
-            this.anchor.set(0.5);
-
-            // make it a bit bigger, so it's easier to grab
-            this.scale.set(3);
-
-            // setup events
-            this
-            // events for drag start
-                .on('mousedown', this.onDragStart)
-                .on('touchstart', this.onDragStart)
-            // events for drag end
-                .on('mouseup', this.onDragEnd)
-                .on('mouseupoutside', this.onDragEnd)
-                .on('touchend', this.onDragEnd)
-                .on('touchendoutside', this.onDragEnd)
-            // events for drag move
-                .on('mousemove', this.onDragMove)
-                .on('touchmove', this.onDragMove);
-
-        }
-
-        private onDragStart = (event: PIXI.interaction.InteractionEvent): void => {
-
-            // store a reference to the data
-            // the reason for this is because of multitouch
-            // we want to track the movement of this particular touch
-            this.data = event.data;
-            this.alpha = 0.5;
-            this.dragging = true;
-
-        }
-
-        private onDragEnd = (event: PIXI.interaction.InteractionEvent): void => {
-
-            // set interactiondata to null
-            this.data = null;
-            this.alpha = 1;
-            this.dragging = false;
-
-        }
-
-        private onDragMove = (event: PIXI.interaction.InteractionEvent): void => {
-
-            if (this.dragging) {
-                var newPosition = this.data.getLocalPosition(this.parent);
-                this.position.x = newPosition.x;
-                this.position.y = newPosition.y;
-            }
+                });
 
         }
 
@@ -1239,212 +845,191 @@ namespace demos {
 
     export class Dragging {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private texture: PIXI.Texture;
-
+        private app: PIXI.Application;
         private data: PIXI.interaction.InteractionData;
+        private dragging: boolean;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            let texture = PIXI.Texture.fromImage("required/assets/bunny.png");
+            texture.baseTexture.scaleMode = PIXI.SCALE_MODES.NEAREST;
 
-            // create a texture from an image
-            this.texture = PIXI.Texture.fromImage('../../_assets/bunny.png');
-
-            for (var i = 0; i < 10; i++) {
-                this.createBunny(Math.floor(Math.random() * 800), Math.floor(Math.random() * 600));
+            for (let i = 0; i < 10; i++) {
+                this.createBunny(
+                    texture,
+                    Math.floor(Math.random() * this.app.renderer.width),
+                    Math.floor(Math.random() * this.app.renderer.height)
+                );
             }
 
-            // start animating
-            this.animate();
-
         }
 
-        private createBunny(x: number, y: number): void {
+        private createBunny(texture: PIXI.Texture, x: number, y: number): void {
 
-            // create our little bunny friend..
-            var bunny = new DraggableBunny(this.texture);
+            let bunny = new PIXI.Sprite(texture);
+            bunny.interactive = true;
+            bunny.buttonMode = true;
+            bunny.anchor.set(0.5);
+            bunny.scale.set(3);
+            bunny
+                .on("pointerdown", (event: PIXI.interaction.InteractionEvent): void => {
 
-            // move the sprite to its designated position
-            bunny.position.x = x;
-            bunny.position.y = y;
+                    this.data = event.data;
+                    bunny.alpha = 0.5;
+                    this.dragging = true;
 
-            // add it to the stage
-            this.stage.addChild(bunny);
+                })
+                .on("pointerup", (event: PIXI.interaction.InteractionEvent): void => {
 
-        }
+                    this.data = null;
+                    bunny.alpha = 0.5;
+                    this.dragging = false;
 
-        private animate = (): void => {
+                })
+                .on("pointerupoutside", (event: PIXI.interaction.InteractionEvent): void => {
 
-            requestAnimationFrame(this.animate);
+                    this.data = null;
+                    bunny.alpha = 0.5;
+                    this.dragging = false;
 
-            this.renderer.render(this.stage);
+                })
+                .on("pointermove", (event: PIXI.interaction.InteractionEvent): void => {
+
+                    if (this.dragging) {
+                        let newPosition = this.data.getLocalPosition(bunny);
+                        bunny.x = newPosition.x;
+                        bunny.y = newPosition.y;
+                    }
+
+                });
+
+            bunny.x = x;
+            bunny.y = y;
+
+            this.app.stage.addChild(bunny);
 
         }
 
     }
 
-}
-
-namespace demos {
-
     export class GraphicsDemo {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private thing: PIXI.Graphics;
-
+        private app: PIXI.Application;
         private graphics: PIXI.Graphics;
-
+        private thing: PIXI.Graphics;
         private count: number;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application(800, 600, { antialias: true });
+            this.app.stage.interactive = true;
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-            this.stage.interactive = true;
+            let graphics = new PIXI.Graphics();
 
-            this.graphics = new PIXI.Graphics();
+            graphics.beginFill(0xFF3300);
+            graphics.lineStyle(10, 0xffd900, 1);
 
-            // set a fill and line style
-            this.graphics.beginFill(0xFF3300);
-            this.graphics.lineStyle(10, 0xffd900, 1);
+            graphics.moveTo(50, 50);
+            graphics.lineTo(250, 50);
+            graphics.lineTo(100, 100);
+            graphics.lineTo(250, 220);
+            graphics.lineTo(50, 220);
+            graphics.lineTo(50, 50);
+            graphics.endFill();
 
-            // draw a shape
-            this.graphics.moveTo(50, 50);
-            this.graphics.lineTo(250, 50);
-            this.graphics.lineTo(100, 100);
-            this.graphics.lineTo(250, 220);
-            this.graphics.lineTo(50, 220);
-            this.graphics.lineTo(50, 50);
-            this.graphics.endFill();
+            graphics.lineStyle(10, 0xFF0000, 0.8);
+            graphics.beginFill(0xFF700B, 1);
 
-            // set a fill and line style again
-            this.graphics.lineStyle(10, 0xFF0000, 0.8);
-            this.graphics.beginFill(0xFF700B, 1);
+            graphics.moveTo(210, 300);
+            graphics.lineTo(450, 320);
+            graphics.lineTo(570, 350);
+            graphics.quadraticCurveTo(600, 0, 480, 100);
+            graphics.lineTo(330, 120);
+            graphics.lineTo(410, 200);
+            graphics.lineTo(210, 300);
+            graphics.endFill();
 
-            // draw a second shape
-            this.graphics.moveTo(210, 300);
-            this.graphics.lineTo(450, 320);
-            this.graphics.lineTo(570, 350);
-            this.graphics.quadraticCurveTo(600, 0, 480, 100);
-            this.graphics.lineTo(330, 120);
-            this.graphics.lineTo(410, 200);
-            this.graphics.lineTo(210, 300);
-            this.graphics.endFill();
+            graphics.lineStyle(2, 0x0000FF, 1);
+            graphics.drawRect(50, 250, 100, 100);
 
-            // draw a rectangle
-            this.graphics.lineStyle(2, 0x0000FF, 1);
-            this.graphics.drawRect(50, 250, 100, 100);
+            graphics.lineStyle(0);
+            graphics.beginFill(0xFFFF0B, 0.5);
+            graphics.drawCircle(470, 200, 100);
+            graphics.endFill();
 
-            // draw a circle
-            this.graphics.lineStyle(0);
-            this.graphics.beginFill(0xFFFF0B, 0.5);
-            this.graphics.drawCircle(470, 200, 100);
-            this.graphics.endFill();
+            graphics.lineStyle(20, 0x33FF00);
+            graphics.moveTo(30, 30);
+            graphics.lineTo(600, 300);
 
-            this.graphics.lineStyle(20, 0x33FF00);
-            this.graphics.moveTo(30, 30);
-            this.graphics.lineTo(600, 300);
+            this.graphics = graphics;
 
-            this.stage.addChild(this.graphics);
+            this.app.stage.addChild(this.graphics);
 
-            // let's create a moving shape
             this.thing = new PIXI.Graphics();
-            this.stage.addChild(this.thing);
-            this.thing.position.x = 620 / 2;
-            this.thing.position.y = 380 / 2;
+            this.thing.x = 800 / 2;
+            this.thing.y = 600 / 2;
+            this.app.stage.addChild(this.thing);
 
             this.count = 0;
 
-            // Just click on the stage to draw random lines
-            this.stage.on('click', this.onClick);
-            this.stage.on('tap', this.onClick);
+            this.app.stage.on("pointertap", (): void => {
 
-            // start animating
-            this.animate();
+                this.graphics.lineStyle(Math.random() * 30, Math.random() * 0xFFFFFF, 1);
+                this.graphics.moveTo(Math.random() * 800, Math.random() * 600);
+                this.graphics.bezierCurveTo(
+                    Math.random() * 800, Math.random() * 600,
+                    Math.random() * 800, Math.random() * 600,
+                    Math.random() * 800, Math.random() * 600
+                );
 
-        }
+            });
 
-        private onClick = (event: PIXI.interaction.InteractionEvent): void => {
+            this.app.ticker.add((): void => {
 
-            this.graphics.lineStyle(Math.random() * 30, Math.random() * 0xFFFFFF, 1);
-            this.graphics.moveTo(Math.random() * 620, Math.random() * 380);
-            this.graphics.bezierCurveTo(Math.random() * 620, Math.random() * 380,
-                Math.random() * 620, Math.random() * 380,
-                Math.random() * 620, Math.random() * 380);
-        }
+                this.count += 0.1;
 
-        private animate = (): void => {
+                this.thing.clear();
+                this.thing.lineStyle(10, 0xff0000, 1);
+                this.thing.beginFill(0xffFF00, 0.5);
 
-            this.thing.clear();
+                this.thing.moveTo(-120 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
+                this.thing.lineTo(120 + Math.cos(this.count) * 20, -100 + Math.sin(this.count) * 20);
+                this.thing.lineTo(120 + Math.sin(this.count) * 20, 100 + Math.cos(this.count) * 20);
+                this.thing.lineTo(-120 + Math.cos(this.count) * 20, 100 + Math.sin(this.count) * 20);
+                this.thing.lineTo(-120 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
 
-            this.count += 0.1;
+                this.thing.rotation = this.count * 0.1;
 
-            this.thing.clear();
-            this.thing.lineStyle(10, 0xff0000, 1);
-            this.thing.beginFill(0xffFF00, 0.5);
+            });
 
-            this.thing.moveTo(-120 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
-            this.thing.lineTo(120 + Math.cos(this.count) * 20, -100 + Math.sin(this.count) * 20);
-            this.thing.lineTo(120 + Math.sin(this.count) * 20, 100 + Math.cos(this.count) * 20);
-            this.thing.lineTo(-120 + Math.cos(this.count) * 20, 100 + Math.sin(this.count) * 20);
-            this.thing.lineTo(-120 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
-
-            this.thing.rotation = this.count * 0.1;
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
         }
 
     }
 
-}
-
-namespace demos {
-
     export class Interactivity {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
+        private app: PIXI.Application;
         private background: PIXI.Sprite;
-
-        private buttons: InteractivityButton[];
+        private buttons: PIXI.Sprite[];
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application();
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            // create a background...
-            this.background = PIXI.Sprite.fromImage('../../_assets/button_test_BG.jpg');
-            this.background.width = this.renderer.width;
-            this.background.height = this.renderer.height;
-
-            // add background to stage...
-            this.stage.addChild(this.background);
+            let background = PIXI.Sprite.fromImage("required/assets/button_test_BG.jpg");
+            background.width = this.app.renderer.width;
+            background.height = this.app.renderer.height;
+            this.background = background;
+            this.app.stage.addChild(this.background);
 
             this.buttons = [];
 
-            var buttonPositions = [
+            let buttonPositions = [
                 175, 75,
                 655, 75,
                 410, 325,
@@ -1452,376 +1037,149 @@ namespace demos {
                 685, 445
             ];
 
-            function noop(): void {
-                console.log('click');
-            }
+            let textureButton = PIXI.Texture.fromImage("../../_assets/button.png");
+            let textureButtonDown = PIXI.Texture.fromImage("../../_assets/buttonDown.png");
+            let textureButtonOver = PIXI.Texture.fromImage("../../_assets/buttonOver.png");
 
-            // create some textures from an image path
-            var textureButton = PIXI.Texture.fromImage('../../_assets/button.png');
-            var textureButtonDown = PIXI.Texture.fromImage('../../_assets/buttonDown.png');
-            var textureButtonOver = PIXI.Texture.fromImage('../../_assets/buttonOver.png');
+            for (let i = 0; i < 5; i++) {
 
-            for (var i = 0; i < 5; i++) {
+                let button = new PIXI.Sprite(textureButton);
+                button.anchor.set(0.5);
+                button.x = buttonPositions[i * 2];
+                button.y = buttonPositions[i * 2 + 1];
+                button.interactive = true;
+                button.buttonMode = true;
 
-                var button = new InteractivityButton(textureButton, textureButtonDown, textureButtonOver);
+                button
+                    .on("pointerdown", (): void => {
+                        // blah
+                    })
+                    .on("pointerup", (): void => {
+                        // blah
+                    })
+                    .on("pointerupoutside", (): void => {
+                        // blah
+                    })
+                    .on("pointerover", (): void => {
+                        // blah
+                    })
+                    .on("pointerout", (): void => {
+                        // blah
+                    });
 
-                button.position.x = buttonPositions[i * 2];
-                button.position.y = buttonPositions[i * 2 + 1];
-
-                button.tap = noop;
-                button.click = noop;
-
-                // add it to the stage
-                this.stage.addChild(button);
-
-                // add button to array
+                this.app.stage.addChild(button);
                 this.buttons.push(button);
-
             }
 
-            // set some silly values...
             this.buttons[0].scale.set(1.2);
-
             this.buttons[2].rotation = Math.PI / 10;
-
             this.buttons[3].scale.set(0.8);
-
             this.buttons[4].scale.set(0.8, 1.2);
             this.buttons[4].rotation = Math.PI;
 
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
         }
 
     }
 
-    export class InteractivityButton extends PIXI.Sprite {
-
-        private textureButton: PIXI.Texture;
-        private textureButtonDown: PIXI.Texture;
-        private textureButtonOver: PIXI.Texture;
-
-        tap: Function;
-        click: Function;
-
-        isdown: boolean;
-        isOver: boolean;
-
-        constructor(textureButton: PIXI.Texture, textureButtonDown: PIXI.Texture, textureButtonOver: PIXI.Texture) {
-
-            super(textureButton);
-
-            // create some textures from an image path
-            this.textureButton = textureButton;
-            this.textureButtonDown = textureButtonDown;
-            this.textureButtonOver = textureButtonOver;
-
-            this.buttonMode = true;
-            this.anchor.set(0.5);
-
-            // make the button interactive...
-            this.interactive = true;
-
-            this
-            // set the mousedown and touchstart callback...
-                .on('mousedown', this.onButtonDown)
-                .on('touchstart', this.onButtonDown)
-
-            // set the mouseup and touchend callback...
-                .on('mouseup', this.onButtonUp)
-                .on('touchend', this.onButtonUp)
-                .on('mouseupoutside', this.onButtonUp)
-                .on('touchendoutside', this.onButtonUp)
-
-            // set the mouseover callback...
-                .on('mouseover', this.onButtonOver)
-
-            // set the mouseout callback...
-                .on('mouseout', this.onButtonOut);
-
-            // you can also listen to click and tap events :
-            // .on('click', this.noop)
-
-        }
-
-        private onButtonDown = (event: PIXI.interaction.InteractionEvent): void => {
-
-            this.isdown = true;
-            this.texture = this.textureButtonDown;
-            this.alpha = 1;
-
-        }
-
-        private onButtonUp = (event: PIXI.interaction.InteractionEvent): void => {
-
-            this.isdown = false;
-
-            if (this.isOver) {
-                this.texture = this.textureButtonOver;
-            } else {
-                this.texture = this.textureButton;
-            }
-        }
-
-        private onButtonOver = (event: PIXI.interaction.InteractionEvent): void => {
-
-            this.isOver = true;
-
-            if (this.isdown) {
-                return;
-            }
-
-            this.texture = this.textureButtonOver;
-
-        }
-
-        private onButtonOut = (event: PIXI.interaction.InteractionEvent): void => {
-
-            this.isOver = false;
-
-            if (this.isdown) {
-                return;
-            }
-
-            this.texture = this.textureButton;
-        }
-
-    }
-
-}
-
-namespace demos {
-
     export class Masking {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
+        private app: PIXI.Application;
         private bg: PIXI.Sprite;
-
         private container: PIXI.Container;
-
         private bgFront: PIXI.Sprite;
-
         private light1: PIXI.Sprite;
-
         private light2: PIXI.Sprite;
-
         private panda: PIXI.Sprite;
-
         private thing: PIXI.Graphics;
-
         private count: number;
-
         private help: PIXI.Text;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb, antialias: true });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application(800, 600, { antialias: true });
+            this.app.stage.interactive = true;
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-            this.stage.interactive = true;
-
-            this.bg = PIXI.Sprite.fromImage('../../_assets/BGrotate.jpg');
-            this.bg.anchor.x = 0.5;
-            this.bg.anchor.y = 0.5;
-
-            this.bg.position.x = this.renderer.width / 2;
-            this.bg.position.y = this.renderer.height / 2;
-
-            this.stage.addChild(this.bg);
+            this.bg = PIXI.Sprite.fromImage("required/assets/BGrotate.jpg");
+            this.bg.anchor.set(0.5);
+            this.bg.x = this.app.renderer.width / 2;
+            this.bg.y = this.app.renderer.height / 2;
+            this.app.stage.addChild(this.bg);
 
             this.container = new PIXI.Container();
-            this.container.position.x = this.renderer.width / 2;
-            this.container.position.y = this.renderer.height / 2;
+            this.container.x = this.app.renderer.width / 2;
+            this.container.y = this.app.renderer.height / 2;
+            this.app.stage.addChild(this.container);
 
-            // add a bunch of sprites
+            this.bgFront = PIXI.Sprite.fromImage("required/assets/SceneRotate.jpg");
+            this.bgFront.anchor.set(0.5);
 
-            this.bgFront = PIXI.Sprite.fromImage('../../_assets/SceneRotate.jpg');
-            this.bgFront.anchor.x = 0.5;
-            this.bgFront.anchor.y = 0.5;
+            this.light2 = PIXI.Sprite.fromImage("required/assets/LightRotate2.png");
+            this.light2.anchor.set(0.5);
 
-            this.container.addChild(this.bgFront);
+            this.light1 = PIXI.Sprite.fromImage("required/assets/LightRotate1.png");
+            this.light1.anchor.set(0.5);
 
-            this.light2 = PIXI.Sprite.fromImage('../../_assets/LightRotate2.png');
-            this.light2.anchor.x = 0.5;
-            this.light2.anchor.y = 0.5;
-            this.container.addChild(this.light2);
+            this.panda = PIXI.Sprite.fromImage("required/assets/panda.png");
+            this.panda.anchor.set(0.5);
 
-            this.light1 = PIXI.Sprite.fromImage('../../_assets/LightRotate1.png');
-            this.light1.anchor.x = 0.5;
-            this.light1.anchor.y = 0.5;
-            this.container.addChild(this.light1);
+            this.container.addChild(this.bgFront, this.light2, this.light1, this.panda);
 
-            this.panda = PIXI.Sprite.fromImage('../../_assets/panda.png');
-            this.panda.anchor.x = 0.5;
-            this.panda.anchor.y = 0.5;
+            this.app.stage.addChild(this.container);
 
-            this.container.addChild(this.panda);
-
-            this.stage.addChild(this.container);
-
-            // let's create a moving shape
             this.thing = new PIXI.Graphics();
-            this.stage.addChild(this.thing);
-            this.thing.position.x = this.renderer.width / 2;
-            this.thing.position.y = this.renderer.height / 2;
+            this.app.stage.addChild(this.thing);
+            this.thing.x = this.app.renderer.width / 2;
+            this.thing.y = this.app.renderer.height / 2;
             this.thing.lineStyle(0);
-
             this.container.mask = this.thing;
 
             this.count = 0;
 
-            this.stage.on('click', this.onClick);
-            this.stage.on('tap', this.onClick);
+            this.app.stage.on("pointertap", (): void => {
+                if (!this.container.mask) {
+                    this.container.mask = this.thing;
+                }
+                else {
+                    this.container.mask = null;
+                }
+            });
 
-            this.help = new PIXI.Text('Click to turn masking on / off.', { fontFamily: 'Arial', fontSize: 12, fontWeight: 'bold', fill: 'white' });
-            this.help.position.y = this.renderer.height - 26;
-            this.help.position.x = 10;
-            this.stage.addChild(this.help);
+            this.app.ticker.add((): void => {
 
-            // start animating
-            this.animate();
+                this.bg.rotation += 0.01;
+                this.bgFront.rotation -= 0.01;
+
+                this.light1.rotation += 0.02;
+                this.light2.rotation += 0.01;
+
+                this.panda.scale.x = 1 + Math.sin(this.count) * 0.04;
+                this.panda.scale.y = 1 + Math.cos(this.count) * 0.04;
+
+                this.count += 0.1;
+
+                this.thing.clear();
+
+                this.thing.beginFill(0x8bc5ff, 0.4);
+                this.thing.moveTo(-120 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
+                this.thing.lineTo(-320 + Math.cos(this.count) * 20, 100 + Math.sin(this.count) * 20);
+                this.thing.lineTo(120 + Math.cos(this.count) * 20, -100 + Math.sin(this.count) * 20);
+                this.thing.lineTo(120 + Math.sin(this.count) * 20, 100 + Math.cos(this.count) * 20);
+                this.thing.lineTo(-120 + Math.cos(this.count) * 20, 100 + Math.sin(this.count) * 20);
+                this.thing.lineTo(-120 + Math.sin(this.count) * 20, -300 + Math.cos(this.count) * 20);
+                this.thing.lineTo(-320 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
+                this.thing.rotation = this.count * 0.1;
+
+            });
 
         }
 
-        private animate = (): void => {
-
-            this.bg.rotation += 0.01;
-            this.bgFront.rotation -= 0.01;
-
-            this.light1.rotation += 0.02;
-            this.light2.rotation += 0.01;
-
-            this.panda.scale.x = 1 + Math.sin(this.count) * 0.04;
-            this.panda.scale.y = 1 + Math.cos(this.count) * 0.04;
-
-            this.count += 0.1;
-
-            this.thing.clear();
-
-            this.thing.beginFill(0x8bc5ff, 0.4);
-            this.thing.moveTo(-120 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
-            this.thing.lineTo(-320 + Math.cos(this.count) * 20, 100 + Math.sin(this.count) * 20);
-            this.thing.lineTo(120 + Math.cos(this.count) * 20, -100 + Math.sin(this.count) * 20);
-            this.thing.lineTo(120 + Math.sin(this.count) * 20, 100 + Math.cos(this.count) * 20);
-            this.thing.lineTo(-120 + Math.cos(this.count) * 20, 100 + Math.sin(this.count) * 20);
-            this.thing.lineTo(-120 + Math.sin(this.count) * 20, -300 + Math.cos(this.count) * 20);
-            this.thing.lineTo(-320 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
-            this.thing.rotation = this.count * 0.1;
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-        private onClick = (event: PIXI.interaction.InteractionEvent): void => {
-
-            if (!this.container.mask) {
-                this.container.mask = this.thing;
-            } else {
-                this.container.mask = null;
-            }
-        }
 
     }
 
-}
-
-namespace demos {
-
-    export class AnimatedSpriteDemo {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            PIXI.loader
-                .add('spritesheet', '../../_assets/mc.json')
-                .load(this.onAssetsLoaded);
-
-            // start animating
-            this.animate();
-
-        }
-
-        private onAssetsLoaded = (loader: PIXI.loaders.Loader): void => {
-
-            // create an array to store the textures
-            var explosionTextures: PIXI.Texture[] = [];
-            var i: number;
-
-            for (i = 0; i < 26; i++) {
-
-                var texture = PIXI.Texture.fromFrame('Explosion_Sequence_A ' + (i + 1) + '.png');
-                explosionTextures.push(texture);
-
-            }
-
-            for (i = 0; i < 50; i++) {
-
-                // create an explosion AnimatedSprite
-                var explosion = new PIXI.extras.AnimatedSprite(explosionTextures);
-
-                explosion.position.x = Math.random() * 800;
-                explosion.position.y = Math.random() * 600;
-                explosion.anchor.x = 0.5;
-                explosion.anchor.y = 0.5;
-
-                explosion.rotation = Math.random() * Math.PI;
-
-                explosion.scale.set(0.75 + Math.random() * 0.5);
-
-                explosion.gotoAndPlay(Math.random() * 27);
-
-                this.stage.addChild(explosion);
-
-            }
-
-            // start animating
-            this.animate();
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-}
-
-namespace demos {
-
     export class RenderTextureDemo {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
+        private app: PIXI.Application;
 
         private renderTexture: PIXI.RenderTexture;
         private renderTexture2: PIXI.RenderTexture;
@@ -1829,539 +1187,421 @@ namespace demos {
 
         private outputSprite: PIXI.Sprite;
         private stuffContainer: PIXI.Container;
+
         private items: PIXI.Sprite[];
 
         private count: number;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application();
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            // create two render textures... these dynamic textures will be used to draw the scene into itself
-            this.renderTexture = PIXI.RenderTexture.create(this.renderer.width, this.renderer.height);
-            this.renderTexture2 = PIXI.RenderTexture.create(this.renderer.width, this.renderer.height);
+            this.renderTexture = PIXI.RenderTexture.create(
+                this.app.renderer.width,
+                this.app.renderer.height
+            );
+            this.renderTexture2 = PIXI.RenderTexture.create(
+                this.app.renderer.width,
+                this.app.renderer.height
+            );
             this.currentTexture = this.renderTexture;
 
-            // create a new sprite that uses the render texture we created above
             this.outputSprite = new PIXI.Sprite(this.currentTexture);
-
-            // align the sprite
-            this.outputSprite.position.x = 400;
-            this.outputSprite.position.y = 300;
+            this.outputSprite.x = 400;
+            this.outputSprite.y = 300;
             this.outputSprite.anchor.set(0.5);
-
-            // add to stage
-            this.stage.addChild(this.outputSprite);
+            this.app.stage.addChild(this.outputSprite);
 
             this.stuffContainer = new PIXI.Container();
+            this.stuffContainer.x = 400;
+            this.stuffContainer.y = 300;
+            this.app.stage.addChild(this.stuffContainer);
 
-            this.stuffContainer.position.x = 400;
-            this.stuffContainer.position.y = 300;
-
-            this.stage.addChild(this.stuffContainer);
-
-            // create an array of image ids..
-            var fruits = [
-                '../../_assets/spinObj_01.png',
-                '../../_assets/spinObj_02.png',
-                '../../_assets/spinObj_03.png',
-                '../../_assets/spinObj_04.png',
-                '../../_assets/spinObj_05.png',
-                '../../_assets/spinObj_06.png',
-                '../../_assets/spinObj_07.png',
-                '../../_assets/spinObj_08.png'
+            let fruits = [
+                "required/assets/spinObj_01.png",
+                "required/assets/spinObj_02.png",
+                "required/assets/spinObj_03.png",
+                "required/assets/spinObj_04.png",
+                "required/assets/spinObj_05.png",
+                "required/assets/spinObj_06.png",
+                "required/assets/spinObj_07.png",
+                "required/assets/spinObj_08.png"
             ];
 
-            // create an array of items
             this.items = [];
 
-            // now create some items and randomly position them in the stuff container
-            for (var i = 0; i < 20; i++) {
-
-                var item = PIXI.Sprite.fromImage(fruits[i % fruits.length]);
-                item.position.x = Math.random() * 400 - 200;
-                item.position.y = Math.random() * 400 - 200;
-
+            for (let i = 0; i < 20; i++) {
+                let item = PIXI.Sprite.fromImage(fruits[i % fruits.length]);
+                item.x = Math.random() * 400 - 200;
+                item.y = Math.random() * 400 - 200;
                 item.anchor.set(0.5);
-
                 this.stuffContainer.addChild(item);
-
                 this.items.push(item);
-
             }
 
-            // used for spinning!
             this.count = 0;
 
-            // start animating
-            this.animate();
+            this.app.ticker.add((): void => {
 
-        }
+                for (let i = 0; i < this.items.length; i++) {
+                    let item = this.items[i];
+                    item.rotation += 0.1;
+                }
 
-        private animate = (): void => {
+                this.count += 0.01;
 
-            for (const item of this.items) {
-                // rotate each item
-                item.rotation += 0.1;
-            }
+                let temp = this.renderTexture;
+                this.renderTexture = this.renderTexture2;
+                this.renderTexture2 = temp;
 
-            this.count += 0.01;
+                this.outputSprite.texture = this.renderTexture;
 
-            // swap the buffers ...
-            var temp = this.renderTexture;
-            this.renderTexture = this.renderTexture2;
-            this.renderTexture2 = temp;
+                this.stuffContainer.rotation -= 0.01;
+                this.outputSprite.scale.set(1 + Math.sin(this.count) * 0.2);
 
-            // set the new texture
-            this.outputSprite.texture = this.renderTexture;
+                this.app.renderer.render(this.app.stage, this.renderTexture2, false);
 
-            // twist this up!
-            this.stuffContainer.rotation -= 0.01;
-            this.outputSprite.scale.set(1 + Math.sin(this.count) * 0.2);
-
-            // render the stage to the texture
-            // the 'true' clears the texture before the content is rendered
-            this.renderer.render(this.stage, this.renderTexture2, false);
-
-            // and finally render the stage
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
+            });
 
         }
 
     }
 
-}
-
-namespace demos {
-
     export class StripDemo {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
+        private app: PIXI.Application;
         private count: number;
-
         private points: PIXI.Point[];
-
         private strip: PIXI.mesh.Rope;
-
         private snakeContainer: PIXI.Container;
 
-        private ropeLength: number;
-
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            this.app = new PIXI.Application();
+            document.body.appendChild(this.app.view);
 
             this.count = 0;
 
-            // build a rope!
-            this.ropeLength = 918 / 20;
+            let ropeLength = 918 / 20;
 
             this.points = [];
 
-            for (var i = 0; i < 20; i++) {
-                this.points.push(new PIXI.Point(i * this.ropeLength, 0));
+            for (let i = 0; i < 20; i++) {
+                this.points.push(new PIXI.Point(i * ropeLength, 0));
             }
 
-            this.strip = new PIXI.mesh.Rope(PIXI.Texture.fromImage('../../_assets/snake.png'), this.points);
+            this.strip = new PIXI.mesh.Rope(PIXI.Texture.fromImage("required/assets/snake.png"), this.points);
             this.strip.x = -459;
 
             this.snakeContainer = new PIXI.Container();
             this.snakeContainer.position.x = 400;
             this.snakeContainer.position.y = 300;
-
             this.snakeContainer.scale.set(800 / 1100);
-            this.stage.addChild(this.snakeContainer);
-
             this.snakeContainer.addChild(this.strip);
+            this.app.stage.addChild(this.snakeContainer);
 
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            this.count += 0.1;
-
-            // make the snake
-            for (var i = 0; i < this.points.length; i++) {
-
-                this.points[i].y = Math.sin((i * 0.5) + this.count) * 30;
-
-                this.points[i].x = i * this.ropeLength + Math.cos((i * 0.3) + this.count) * 20;
-
-            }
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
+            this.app.ticker.add((): void => {
+                this.count += 0.1;
+                for (let i = 0; i < this.points.length; i++) {
+                    this.points[i].y = Math.sin((i * 0.5) + this.count) * 30;
+                    this.points[i].x = i * ropeLength + Math.cos((i * 0.3) + this.count) * 20;
+                }
+            });
 
         }
 
     }
 
-}
-
-namespace demos {
-
     export class TextDemo {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
+        private app: PIXI.Application;
         private bitmapFontText: PIXI.extras.BitmapText;
-
         private background: PIXI.Sprite;
-
         private textSample: PIXI.Text;
-
         private spinningText: PIXI.Text;
-
         private countingText: PIXI.Text;
-
         private count: number;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            this.app = new PIXI.Application();
+            document.body.appendChild(this.app.view);
 
             PIXI.loader
-                .add('desyrel', '../../_assets/desyrel.xml')
-                .load(this.onAssetsLoaded);
+                .add("desyrel", "required/assets/desyrel.xml")
+                .load((): void => {
 
-            // start animating
-            this.animate();
+                    this.bitmapFontText = new PIXI.extras.BitmapText("bitmap fonts are\n now supported!", { font: "35px Desyrel", align: "right" });
+                    this.bitmapFontText.x = this.app.renderer.width - this.bitmapFontText.textWidth - 20;
+                    this.bitmapFontText.y = 20;
+                    this.app.stage.addChild(this.bitmapFontText);
 
-        }
+                });
 
-        private onAssetsLoaded = (): void  => {
+            this.background = PIXI.Sprite.fromImage("required/assets/textDemoBG.jpg");
+            this.background.width = this.app.renderer.width;
+            this.background.height = this.app.renderer.height;
+            this.app.stage.addChild(this.background);
 
-            this.bitmapFontText = new PIXI.extras.BitmapText('bitmap fonts are\n now supported!', { font: '35px Desyrel', align: 'right' });
-
-            this.bitmapFontText.position.x = 600 - this.bitmapFontText.textWidth;
-            this.bitmapFontText.position.y = 20;
-
-            this.stage.addChild(this.bitmapFontText);
-
-            // add a shiny background...
-            this.background = PIXI.Sprite.fromImage('../../_assets/textDemoBG.jpg');
-            this.stage.addChild(this.background);
-
-            // create some white text using the Snippet webfont
-            this.textSample = new PIXI.Text('Pixi.js can has\n multiline text!', { fontSize: 35, fontFamily: 'Snippet', fill: 'white', align: 'left' });
+            this.textSample = new PIXI.Text("Pixi.js can has\n multiline text!", {
+                fontFamily: "Snippet",
+                fontSize: 35,
+                fill: "white",
+                align: "left"
+            });
             this.textSample.position.set(20);
 
-            // create a text object with a nice stroke
-            this.spinningText = new PIXI.Text('I\'m fun!', { fontWeight: 'bold', fontSize: 60, fontFamily: 'Arial', fill: '#cc00ff', align: 'center', stroke: '#FFFFFF', strokeThickness: 6 });
-
-            // setting the anchor point to 0.5 will center align the text... great for spinning!
+            this.spinningText = new PIXI.Text("I\"m fun!", {
+                fontWeight: "bold",
+                fontSize: 60,
+                fontFamily: "Arial",
+                fill: "#cc00ff",
+                align: "center",
+                stroke: "#FFFFFF",
+                strokeThickness: 6
+            });
             this.spinningText.anchor.set(0.5);
-            this.spinningText.position.x = 310;
-            this.spinningText.position.y = 200;
+            this.spinningText.x = this.app.renderer.width / 2;
+            this.spinningText.y = this.app.renderer.height / 2;
 
-            // create a text object that will be updated...
-            this.countingText = new PIXI.Text('COUNT 4EVAR: 0', {
-                fontWeight: 'bold',
-                fontStyle: 'italic',
-                fontSize: 60, fontFamily:
-                'Arvo', fill: '#3e1707',
-                align: 'center',
-                stroke: '#a4410e',
+            this.countingText = new PIXI.Text("COUNT 4Elet: 0", {
+                fontWeight: "bold",
+                fontStyle: "italic",
+                fontSize: 60,
+                fontFamily: "Arvo",
+                fill: "#3e1707",
+                align: "center",
+                stroke: "#a4410e",
                 strokeThickness: 7
             });
 
-            this.countingText.position.x = 310;
-            this.countingText.position.y = 320;
+            this.countingText.x = this.app.renderer.width / 2;
+            this.countingText.y = 500;
             this.countingText.anchor.x = 0.5;
 
-            this.stage.addChild(this.textSample);
-            this.stage.addChild(this.spinningText);
-            this.stage.addChild(this.countingText);
+            this.app.stage.addChild(this.textSample, this.spinningText, this.countingText);
 
             this.count = 0;
 
-        }
+            this.app.ticker.add((): void => {
 
-        private animate = (): void => {
+                this.count += 0.05;
+                this.countingText.text = "COUNT 4Elet: " + Math.floor(this.count);
 
+                this.spinningText.rotation += 0.03;
 
-            this.renderer.render(this.stage);
+            });
 
-            this.count += 0.05;
-
-            // update the text with a new string
-            this.countingText.text = 'COUNT 4EVAR: ' + Math.floor(this.count);
-
-            // let's spin the spinning text
-            this.spinningText.rotation += 0.03;
-
-            requestAnimationFrame(this.animate);
         }
 
     }
 
-}
-
-namespace demos {
-
-    export class TextureSwap {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
+    export class TextureRotate {
 
+        private app: PIXI.Application;
         private bol: boolean;
-
         private texture: PIXI.Texture;
         private secondTexture: PIXI.Texture;
-
         private dude: PIXI.Sprite;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            this.app = new PIXI.Application();
+            document.body.appendChild(this.app.view);
 
             this.bol = false;
 
-            // an image path
-            this.texture = PIXI.Texture.fromImage('../../_assets/flowerTop.png');
+            PIXI.loader.add("flowerTop", "required/assets/flowerTop.png");
+            PIXI.loader.load((loader: PIXI.loaders.Loader, resources: any) => {
+                this.texture = resources.flowerTop.texture;
+                this.init();
+            });
 
-            // create a second texture
-            this.secondTexture = PIXI.Texture.fromImage('../../_assets/eggHead.png');
+        }
+
+        private init(): void {
+
+            let textures = [this.texture];
+            let D8 = PIXI.GroupD8;
+            for (let rotate = 1; rotate < 16; rotate++) {
+                let h = D8.isSwapWidthHeight(rotate) ? this.texture.frame.width : this.texture.frame.height;
+                let w = D8.isSwapWidthHeight(rotate) ? this.texture.frame.height : this.texture.frame.width;
+
+                let frame = this.texture.frame;
+                let crop = new PIXI.Rectangle(this.texture.frame.x, this.texture.frame.y, w, h);
+                let trim = crop;
+                let rotatedTexture: PIXI.Texture;
+                if (rotate % 2 === 0) {
+                    rotatedTexture = new PIXI.Texture(this.texture.baseTexture, frame, crop, trim, rotate);
+                } else {
+                    rotatedTexture = new PIXI.Texture(this.texture.baseTexture, frame, crop, trim, rotate - 1);
+                    rotatedTexture.rotate++;
+                }
+                textures.push(rotatedTexture);
+            }
+
+            let offsetX = this.app.renderer.width / 16 | 0;
+            let offsetY = this.app.renderer.height / 8 | 0;
+            let gridW = this.app.renderer.width / 4 | 0;
+            let gridH = this.app.renderer.height / 5 | 0;
+
+            for (let i = 0; i < 16; i++) {
+
+                let dude = new PIXI.Sprite(textures[i < 8 ? i * 2 : (i - 8) * 2 + 1]);
+                dude.scale.x = 0.5;
+                dude.scale.y = 0.5;
+                dude.x = offsetX + gridW * (i % 4);
+                dude.y = offsetY + gridH * (i / 4 | 0);
+                this.app.stage.addChild(dude);
+
+                let text = new PIXI.Text("rotate = " + dude.texture.rotate, { fontFamily: "Courier New", fontSize: "12px", fill: "white", align: "left" });
+                text.x = dude.x;
+                text.y = dude.y - 20;
+                this.app.stage.addChild(text);
+
+            }
+
+        }
+
+    }
+
+    export class TextureSwap {
+
+        private app: PIXI.Application;
+        private bol: boolean;
+        private texture: PIXI.Texture;
+        private secondTexture: PIXI.Texture;
+        private dude: PIXI.Sprite;
+
+        constructor() {
+
+            this.app = new PIXI.Application();
+            document.body.appendChild(this.app.view);
+
+            this.bol = false;
+
+            this.texture = PIXI.Texture.fromImage("required/assets/flowerTop.png");
+
+            this.secondTexture = PIXI.Texture.fromImage("required/assets/eggHead.png");
 
-            // create a new Sprite using the texture
             this.dude = new PIXI.Sprite(this.texture);
-
-            // center the sprites anchor point
             this.dude.anchor.set(0.5);
-
-            // move the sprite to the center of the screen
-            this.dude.position.x = this.renderer.width / 2;
-            this.dude.position.y = this.renderer.height / 2;
-
-            this.stage.addChild(this.dude);
-
-            // make the sprite interactive
+            this.dude.x = this.app.renderer.width / 2;
+            this.dude.y = this.app.renderer.height / 2;
             this.dude.interactive = true;
+            this.dude.buttonMode = true;
+            this.app.stage.addChild(this.dude);
 
-            this.dude.on('click', (): void => {
+            this.dude.on("pointertap", (): void => {
                 this.bol = !this.bol;
-
                 if (this.bol) {
                     this.dude.texture = this.secondTexture;
-                } else {
+                }
+                else {
                     this.dude.texture = this.texture;
                 }
             });
 
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            // just for fun, let's rotate mr rabbit a little
-            this.dude.rotation += 0.1;
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
+            this.app.ticker.add((): void => {
+                this.dude.rotation += 0.1;
+            });
 
         }
 
     }
 
-}
-
-namespace demos {
-
     export class Tinting {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private totalDudes: number = 10;
-        private aliens: TintingDude[];
-
-        private dudeBounds: PIXI.Rectangle;
-
-        private tick: number;
+        private app: PIXI.Application;
+        private aliens: Dude[];
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application();
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            // holder to store the aliens
             this.aliens = [];
 
-            this.tick = 0;
+            let totalDudes = 20;
 
-            for (var i = 0; i < this.totalDudes; i++) {
+            let dudeTexture = PIXI.Texture.fromImage("required/assets/eggHead.png");
 
-                // create a new Sprite that uses the image name that we just generated as its source
-                var dude = new TintingDude();
+            for (let i = 0; i < totalDudes; i++) {
 
-                // set the anchor point so the texture is centerd on the sprite
+                let dude = new Dude(dudeTexture);
                 dude.anchor.set(0.5);
-
-                // set a random scale for the dude - no point them all being the same size!
                 dude.scale.set(0.8 + Math.random() * 0.3);
-
-                // finally lets set the dude to be at a random position..
-                dude.position.x = Math.random() * this.renderer.width;
-                dude.position.y = Math.random() * this.renderer.height;
-
+                dude.x = Math.random() * this.app.renderer.width;
+                dude.y = Math.random() * this.app.renderer.height;
                 dude.tint = Math.random() * 0xFFFFFF;
-
-                // create some extra properties that will control movement :
-                // create a random direction in radians. This is a number between 0 and PI*2 which is the equivalent of 0 - 360 degrees
                 dude.direction = Math.random() * Math.PI * 2;
-
-                // this number will be used to modify the direction of the dude over time
                 dude.turningSpeed = Math.random() - 0.8;
-
-                // create a random speed for the dude between 0 - 2
                 dude.speed = 2 + Math.random() * 2;
 
-                // finally we push the dude into the aliens array so it it can be easily accessed later
                 this.aliens.push(dude);
-
-                this.stage.addChild(dude);
+                this.app.stage.addChild(dude);
 
             }
 
-            // create a bounding box for the little dudes
-            var dudeBoundsPadding = 100;
-            this.dudeBounds = new PIXI.Rectangle(-dudeBoundsPadding,
+            let dudeBoundsPadding = 100;
+            let dudeBounds = new PIXI.Rectangle(-dudeBoundsPadding,
                 -dudeBoundsPadding,
-                this.renderer.width + dudeBoundsPadding * 2,
-                this.renderer.height + dudeBoundsPadding * 2);
+                this.app.renderer.width + dudeBoundsPadding * 2,
+                this.app.renderer.height + dudeBoundsPadding * 2);
 
-            // start animating
-            this.animate();
+            this.app.ticker.add((): void => {
 
-        }
+                for (let i = 0; i < this.aliens.length; i++) {
 
-        private animate = (): void => {
+                    let dude = this.aliens[i];
+                    dude.direction += dude.turningSpeed * 0.01;
+                    dude.x += Math.sin(dude.direction) * dude.speed;
+                    dude.y += Math.cos(dude.direction) * dude.speed;
+                    dude.rotation = -dude.direction - Math.PI / 2;
 
-            // iterate through the dudes and update their position
-            for (const dude of this.aliens) {
-                dude.direction += dude.turningSpeed * 0.01;
-                dude.position.x += Math.sin(dude.direction) * dude.speed;
-                dude.position.y += Math.cos(dude.direction) * dude.speed;
-                dude.rotation = -dude.direction - Math.PI / 2;
+                    if (dude.x < dudeBounds.x) {
+                        dude.x += dudeBounds.width;
+                    }
+                    else if (dude.x > dudeBounds.x + dudeBounds.width) {
+                        dude.x -= dudeBounds.width;
+                    }
 
-                // wrap the dudes by testing their bounds...
-                if (dude.position.x < this.dudeBounds.x) {
-                    dude.position.x += this.dudeBounds.width;
-                } else if (dude.position.x > this.dudeBounds.x + this.dudeBounds.width) {
-                    dude.position.x -= this.dudeBounds.width;
+                    if (dude.y < dudeBounds.y) {
+                        dude.y += dudeBounds.height;
+                    }
+                    else if (dude.y > dudeBounds.y + dudeBounds.height) {
+                        dude.y -= dudeBounds.height;
+                    }
                 }
 
-                if (dude.position.y < this.dudeBounds.y) {
-                    dude.position.y += this.dudeBounds.height;
-                } else if (dude.position.y > this.dudeBounds.y + this.dudeBounds.height) {
-                    dude.position.y -= this.dudeBounds.height;
-                }
-
-            }
-
-            // increment the ticker
-            this.tick += 0.1;
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
+            });
         }
 
     }
 
-    export class TintingDude extends PIXI.Sprite {
-
-        direction: number;
-        speed: number;
-        turningSpeed: number;
-
-        constructor() {
-            super(PIXI.Texture.fromImage('../../_assets/eggHead.png'));
-        }
-
-    }
-
-}
-
-namespace demos {
-
     export class TransparentBackground {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
+        private app: PIXI.Application;
         private bunny: PIXI.Sprite;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb, transparent: true });
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application(800, 600, { transparent: true });
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            this.bunny = PIXI.Sprite.fromImage("required/assets/bunny.png");
 
-            // create a new Sprite from an image path.
-            this.bunny = PIXI.Sprite.fromImage('../../_assets/bunny.png');
-
-            // center the sprite's anchor point
             this.bunny.anchor.set(0.5);
 
-            // move the sprite to the center of the screen
-            this.bunny.position.x = 200;
-            this.bunny.position.y = 150;
+            this.bunny.x = this.app.renderer.width / 2;
+            this.bunny.y = this.app.renderer.height / 2;
 
-            this.stage.addChild(this.bunny);
+            this.app.stage.addChild(this.bunny);
 
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            // just for fun, let's rotate mr rabbit a little
-            this.bunny.rotation += 0.1;
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
+            this.app.ticker.add((): void => {
+                this.bunny.rotation += 0.1;
+            });
 
         }
 
@@ -2371,44 +1611,35 @@ namespace demos {
 
 namespace filters {
 
-    export class Blur {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
+    export class BlurFilter {
 
+        private app: PIXI.Application;
         private bg: PIXI.Sprite;
-
         private littleDudes: PIXI.Sprite;
         private littleRobot: PIXI.Sprite;
-
         private blurFilter1: PIXI.filters.BlurFilter;
         private blurFilter2: PIXI.filters.BlurFilter;
-
         private count: number;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600);
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application(800, 600);
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
+            this.bg = PIXI.Sprite.fromImage("required/assets/depth_blur_BG.jpg");
+            this.bg.width = this.app.renderer.width;
+            this.bg.height = this.app.renderer.height;
+            this.app.stage.addChild(this.bg);
 
-            this.bg = PIXI.Sprite.fromImage('../../_assets/depth_blur_BG.jpg');
-            this.bg.width = this.renderer.width;
-            this.bg.height = this.renderer.height;
-            this.stage.addChild(this.bg);
+            this.littleDudes = PIXI.Sprite.fromImage("required/assets/depth_blur_dudes.jpg");
+            this.littleDudes.x = (this.app.renderer.width / 2) - 315;
+            this.littleDudes.y = 200;
+            this.app.stage.addChild(this.littleDudes);
 
-            this.littleDudes = PIXI.Sprite.fromImage('../../_assets/depth_blur_dudes.jpg');
-            this.littleDudes.position.x = (this.renderer.width / 2) - 315;
-            this.littleDudes.position.y = 200;
-            this.stage.addChild(this.littleDudes);
-
-            this.littleRobot = PIXI.Sprite.fromImage('../../_assets/depth_blur_moby.jpg');
-            this.littleRobot.position.x = (this.renderer.width / 2) - 200;
-            this.littleRobot.position.y = 100;
-            this.stage.addChild(this.littleRobot);
+            this.littleRobot = PIXI.Sprite.fromImage("required/assets/depth_blur_moby.jpg");
+            this.littleRobot.x = (this.app.renderer.width / 2) - 200;
+            this.littleRobot.y = 100;
+            this.app.stage.addChild(this.littleRobot);
 
             this.blurFilter1 = new PIXI.filters.BlurFilter();
             this.blurFilter2 = new PIXI.filters.BlurFilter();
@@ -2418,77 +1649,54 @@ namespace filters {
 
             this.count = 0;
 
-            // nimate
-            this.animate();
+            this.app.ticker.add((): void => {
 
-        }
+                this.count += 0.005;
 
-        private animate = (): void => {
+                let blurAmount = Math.cos(this.count);
+                let blurAmount2 = Math.sin(this.count);
 
-            this.count += 0.005;
+                this.blurFilter1.blur = 20 * (blurAmount);
+                this.blurFilter2.blur = 20 * (blurAmount2);
 
-            var blurAmount = Math.cos(this.count);
-            var blurAmount2 = Math.sin(this.count);
-
-            this.blurFilter1.blur = 20 * (blurAmount);
-            this.blurFilter2.blur = 20 * (blurAmount2);
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
+            });
 
         }
 
     }
 
-}
-
-namespace filters {
-
     export class DisplacementMap {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
+        private app: PIXI.Application;
         private container: PIXI.Container;
-
-        private padding: number;
-
-        private bounds: PIXI.Rectangle;
-
         private maggots: DisplacementMapDude[];
-
         private displacementSprite: PIXI.Sprite;
-
         private displacementFilter: PIXI.filters.DisplacementFilter;
-
         private ring: PIXI.Sprite;
-
         private bg: PIXI.Sprite;
-
         private count: number;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600);
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-            this.stage.interactive = true;
+            this.app = new PIXI.Application(800, 600);
+            this.app.stage.interactive = true;
+            document.body.appendChild(this.app.view);
 
             this.container = new PIXI.Container();
-            this.stage.addChild(this.container);
+            this.app.stage.addChild(this.container);
 
-            this.padding = 100;
-
-            this.bounds = new PIXI.Rectangle(-this.padding, -this.padding, this.renderer.width + this.padding * 2, this.renderer.height + this.padding * 2);
+            let padding = 100;
+            let bounds = new PIXI.Rectangle(
+                -padding,
+                -padding,
+                this.app.renderer.width + padding * 2,
+                this.app.renderer.height + padding * 2
+            );
             this.maggots = [];
 
-            for (var i = 0; i < 20; i++) {
+            for (let i = 0; i < 20; i++) {
 
-                var maggot = new DisplacementMapDude();
+                let maggot = new DisplacementMapDude();
                 maggot.anchor.set(0.5);
                 this.container.addChild(maggot);
 
@@ -2496,8 +1704,8 @@ namespace filters {
                 maggot.speed = 1;
                 maggot.turnSpeed = Math.random() - 0.8;
 
-                maggot.position.x = Math.random() * this.bounds.width;
-                maggot.position.y = Math.random() * this.bounds.height;
+                maggot.position.x = Math.random() * bounds.width;
+                maggot.position.y = Math.random() * bounds.height;
 
                 maggot.scale.set(1 + Math.random() * 0.3);
                 maggot.original = maggot.scale.clone();
@@ -2505,234 +1713,185 @@ namespace filters {
 
             }
 
-            this.displacementSprite = PIXI.Sprite.fromImage('../../_assets/displace.png');
-            this.displacementFilter = new PIXI.filters.DisplacementFilter(this.displacementSprite);
+            this.displacementSprite = PIXI.Sprite.fromImage("required/assets/displace.png");
+            let displacementFilter = new PIXI.filters.DisplacementFilter(this.displacementSprite);
+            this.app.stage.addChild(this.displacementSprite);
 
-            this.stage.addChild(this.displacementSprite);
+            this.container.filters = [displacementFilter];
 
-            this.container.filters = [this.displacementFilter];
-
-            this.displacementFilter.scale.x = 110;
-            this.displacementFilter.scale.y = 110;
-
-            this.ring = PIXI.Sprite.fromImage('../../_assets/ring.png');
+            displacementFilter.scale.x = 110;
+            displacementFilter.scale.y = 110;
 
+            this.ring = PIXI.Sprite.fromImage("required/assets/ring.png");
             this.ring.anchor.set(0.5);
-
             this.ring.visible = false;
+            this.app.stage.addChild(this.ring);
 
-            this.stage.addChild(this.ring);
-
-            this.bg = PIXI.Sprite.fromImage('../../_assets/bkg-grass.jpg');
-            this.bg.width = this.renderer.width;
-            this.bg.height = this.renderer.height;
-
+            this.bg = PIXI.Sprite.fromImage("required/assets/bkg-grass.jpg");
+            this.bg.width = this.app.renderer.width;
+            this.bg.height = this.app.renderer.height;
             this.bg.alpha = 0.4;
-
             this.container.addChild(this.bg);
 
-            this.stage
-                .on('mousemove', this.onPointerMove)
-                .on('touchmove', this.onPointerMove);
-
             this.count = 0;
 
-            this.animate();
+            this.app.stage
+                .on("mousemove", this.onPointerMove)
+                .on("touchmove", this.onPointerMove);
+
+            this.app.ticker.add((): void => {
+
+                this.count += 0.05;
+
+                for (let i = 0; i < this.maggots.length; i++) {
+
+                    let maggot = this.maggots[i];
+
+                    maggot.direction += maggot.turnSpeed * 0.01;
+                    maggot.x += Math.sin(maggot.direction) * maggot.speed;
+                    maggot.y += Math.cos(maggot.direction) * maggot.speed;
+
+                    maggot.rotation = -maggot.direction - Math.PI / 2;
+                    maggot.scale.x = maggot.original.x + Math.sin(this.count) * 0.2;
+
+                    if (maggot.x < bounds.x) {
+                        maggot.x += bounds.width;
+                    }
+                    else if (maggot.x > bounds.x + bounds.width) {
+                        maggot.x -= bounds.width;
+                    }
+
+                    if (maggot.y < bounds.y) {
+                        maggot.y += bounds.height;
+                    }
+                    else if (maggot.y > bounds.y + bounds.height) {
+                        maggot.y -= bounds.height;
+                    }
+                }
+
+            });
 
         }
 
         private onPointerMove = (eventData: PIXI.interaction.InteractionEvent): void => {
 
             this.ring.visible = true;
-
             this.displacementSprite.x = eventData.data.global.x - 100;
             this.displacementSprite.y = eventData.data.global.y - this.displacementSprite.height / 2;
-
-            this.ring.position.x = eventData.data.global.x - 25;
-            this.ring.position.y = eventData.data.global.y;
-
-        }
-
-        private animate = (): void => {
-
-            this.count += 0.05;
-
-            for (const maggot of this.maggots) {
-                maggot.direction += maggot.turnSpeed * 0.01;
-                maggot.position.x += Math.sin(maggot.direction) * maggot.speed;
-                maggot.position.y += Math.cos(maggot.direction) * maggot.speed;
-
-                maggot.rotation = -maggot.direction - Math.PI / 2;
-
-                maggot.scale.x = maggot.original.x + Math.sin(this.count) * 0.2;
-
-                // wrap the maggots around as the crawl
-                if (maggot.position.x < this.bounds.x) {
-                    maggot.position.x += this.bounds.width;
-                } else if (maggot.position.x > this.bounds.x + this.bounds.width) {
-                    maggot.position.x -= this.bounds.width;
-                }
-
-                if (maggot.position.y < this.bounds.y) {
-                    maggot.position.y += this.bounds.height;
-                } else if (maggot.position.y > this.bounds.y + this.bounds.height) {
-                    maggot.position.y -= this.bounds.height;
-                }
-            }
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
+            this.ring.x = eventData.data.global.x - 25;
+            this.ring.y = eventData.data.global.y;
 
         }
 
     }
-
     export class DisplacementMapDude extends PIXI.Sprite {
 
-        direction: number;
-        speed: number;
-        turnSpeed: number;
-        original: PIXI.Point;
+        direction: number = 0;
+        speed: number = 0;
+        turnSpeed: number = 0;
+        original: PIXI.Point = new PIXI.Point();
 
         constructor() {
 
-            super(PIXI.Texture.fromImage('../../_assets/maggot.png'));
+            super(PIXI.Texture.fromImage("../../_assets/maggot.png"));
 
         }
 
     }
 
-}
-
-namespace filters {
-
     export class Filter {
 
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private background: PIXI.Sprite;
-
+        private app: PIXI.Application;
+        private bg: PIXI.Sprite;
         private filter: PIXI.filters.ColorMatrixFilter;
-
         private container: PIXI.Container;
-
         private bgFront: PIXI.Sprite;
         private light2: PIXI.Sprite;
         private light1: PIXI.Sprite;
         private panda: PIXI.Sprite;
-
         private count: number;
-        private switchy: boolean;
-
+        private enabled: boolean;
         private help: PIXI.Text;
 
         constructor() {
 
-            this.renderer = PIXI.autoDetectRenderer(800, 600);
-            document.body.appendChild(this.renderer.view);
+            this.app = new PIXI.Application();
+            this.app.stage.interactive = true;
+            document.body.appendChild(this.app.view);
 
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-            this.stage.interactive = true;
-
-            // create a texture from an image path
-            var texture: PIXI.Texture = PIXI.Texture.fromImage("../../_assets/basics/bunny.png");
-
-            this.background = PIXI.Sprite.fromImage('_assets/BGrotate.jpg');
-            this.background.anchor.set(0.5);
-
-            this.background.position.x = this.renderer.width / 2;
-            this.background.position.y = this.renderer.height / 2;
+            this.bg = PIXI.Sprite.fromImage("required/assets/BGrotate.jpg");
+            this.bg.anchor.set(0.5);
+            this.bg.x = this.app.renderer.width / 2;
+            this.bg.y = this.app.renderer.height / 2;
 
             this.filter = new PIXI.filters.ColorMatrixFilter();
 
             this.container = new PIXI.Container();
-            this.container.position.x = this.renderer.width / 2;
-            this.container.position.y = this.renderer.height / 2;
+            this.container.position.x = this.app.renderer.width / 2;
+            this.container.position.y = this.app.renderer.height / 2;
+            this.app.stage.addChild(this.container);
 
-            this.bgFront = PIXI.Sprite.fromImage('../../_assets/SceneRotate.jpg');
+            this.bgFront = PIXI.Sprite.fromImage("required/assets/SceneRotate.jpg");
             this.bgFront.anchor.set(0.5);
-
             this.container.addChild(this.bgFront);
 
-            this.light2 = PIXI.Sprite.fromImage('../../_assets/LightRotate2.png');
+            this.light2 = PIXI.Sprite.fromImage("required/assets/LightRotate2.png");
             this.light2.anchor.set(0.5);
             this.container.addChild(this.light2);
 
-            this.light1 = PIXI.Sprite.fromImage('../../_assets/LightRotate1.png');
+            this.light1 = PIXI.Sprite.fromImage("../../_assets/LightRotate1.png");
             this.light1.anchor.set(0.5);
             this.container.addChild(this.light1);
 
-            this.panda = PIXI.Sprite.fromImage('../../_assets/panda.png');
+            this.panda = PIXI.Sprite.fromImage("required/assets/panda.png");
             this.panda.anchor.set(0.5);
-
             this.container.addChild(this.panda);
 
-            this.stage.addChild(this.container);
-
-            this.stage.filters = [this.filter];
+            this.app.stage.filters = [this.filter];
 
             this.count = 0;
-            this.switchy = false;
+            this.enabled = true;
 
-            this.stage.on('click', this.onClick);
-            this.stage.on('tap', this.onClick);
+            this.app.stage.on("pointertap", (): void => {
+                this.enabled = !this.enabled;
+                this.app.stage.filters = this.enabled ? [this.filter] : null;
+            });
 
+            this.help = new PIXI.Text("Click or tap to turn filters on / off.", {
+                fontFamily: "Arial",
+                fontSize: 12,
+                fontWeight: "bold",
+                fill: "white"
+            });
+            this.help.y = this.app.renderer.height - 25;
+            this.help.x = 10;
+            this.app.stage.addChild(this.help);
 
-            this.help = new PIXI.Text('Click to turn filters on / off.', { fontWeight: 'bold', fontSize: 12, fontFamily: 'Arial', fill: 'white' });
-            this.help.position.y = this.renderer.height - 25;
-            this.help.position.x = 10;
+            this.app.ticker.add((delta: number): void => {
 
-            this.stage.addChild(this.help);
+                this.bg.rotation += 0.01;
+                this.bgFront.rotation -= 0.01;
+                this.light1.rotation += 0.02;
+                this.light2.rotation += 0.01;
 
-            // animate
-            this.animate();
+                this.panda.scale.x = 1 + Math.sin(this.count) * 0.04;
+                this.panda.scale.y = 1 + Math.cos(this.count) * 0.04;
 
-        }
+                this.count += 0.1;
 
-        private onClick = (): void => {
+                let matrix = this.filter.matrix;
 
-            this.switchy = !this.switchy;
+                matrix[1] = Math.sin(this.count) * 3;
+                matrix[2] = Math.cos(this.count);
+                matrix[3] = Math.cos(this.count) * 1.5;
+                matrix[4] = Math.sin(this.count / 3) * 2;
+                matrix[5] = Math.sin(this.count / 2);
+                matrix[6] = Math.sin(this.count / 4);
 
-            if (!this.switchy) {
-                this.stage.filters = [this.filter];
-            } else {
-                this.stage.filters = null;
-            }
-
-        }
-
-        private animate = (): void => {
-
-            this.background.rotation += 0.01;
-            this.bgFront.rotation -= 0.01;
-
-            this.light1.rotation += 0.02;
-            this.light2.rotation += 0.01;
-
-            this.panda.scale.x = 1 + Math.sin(this.count) * 0.04;
-            this.panda.scale.y = 1 + Math.cos(this.count) * 0.04;
-
-            this.count += 0.1;
-
-            var matrix = this.filter.matrix;
-
-            matrix[1] = Math.sin(this.count) * 3;
-            matrix[2] = Math.cos(this.count);
-            matrix[3] = Math.cos(this.count) * 1.5;
-            matrix[4] = Math.sin(this.count / 3) * 2;
-            matrix[5] = Math.sin(this.count / 2);
-            matrix[6] = Math.sin(this.count / 4);
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
+            });
 
         }
 
     }
 
-}
+}
\ No newline at end of file
diff --git a/pixi.js/tslint.json b/pixi.js/tslint.json
index 56ba128af1..1c78047f30 100644
--- a/pixi.js/tslint.json
+++ b/pixi.js/tslint.json
@@ -1,9 +1,98 @@
 {
-    "extends": "../tslint.json",
+    "jsRules": {
+        "class-name": true,
+        "comment-format": [
+            true,
+            "check-space"
+        ],
+        "indent": [
+            true,
+            "spaces"
+        ],
+        "no-duplicate-variable": true,
+        "no-eval": true,
+        "no-trailing-whitespace": true,
+        "no-unsafe-finally": true,
+        "one-line": [
+            true,
+            "check-open-brace",
+            "check-whitespace"
+        ],
+        "quotemark": [
+            true,
+            "double"
+        ],
+        "semicolon": [
+            true,
+            "always"
+        ],
+        "triple-equals": [
+            true,
+            "allow-null-check"
+        ],
+        "variable-name": [
+            true,
+            "ban-keywords"
+        ],
+        "whitespace": [
+            true,
+            "check-branch",
+            "check-decl",
+            "check-operator",
+            "check-separator",
+            "check-type"
+        ]
+    },
     "rules": {
-        "forbidden-types": false,
-        "interface-name": false,
-        "no-empty-interface": false,
-        "unified-signatures": false
+        "class-name": true,
+        "comment-format": [
+            true,
+            "check-space"
+        ],
+        "indent": [
+            true,
+            "spaces"
+        ],
+        "no-eval": true,
+        "no-internal-module": true,
+        "no-trailing-whitespace": true,
+        "no-unsafe-finally": true,
+        "no-var-keyword": true,
+        "one-line": [
+            true,
+            "check-open-brace",
+            "check-whitespace"
+        ],
+        "quotemark": [
+            true,
+            "double"
+        ],
+        "semicolon": [
+            true,
+            "always"
+        ],
+        "triple-equals": [
+            true,
+            "allow-null-check"
+        ],
+        "typedef-whitespace": [
+            true,
+            {
+                "call-signature": "nospace",
+                "index-signature": "nospace",
+                "parameter": "nospace",
+                "property-declaration": "nospace",
+                "variable-declaration": "nospace"
+            }
+        ],
+        "variable-name": false,
+        "whitespace": [
+            true,
+            "check-branch",
+            "check-decl",
+            "check-operator",
+            "check-separator",
+            "check-type"
+        ]
     }
-}
+}
\ No newline at end of file
diff --git a/pixi.js/v3/index.d.ts b/pixi.js/v3/index.d.ts
deleted file mode 100644
index aa573b2201..0000000000
--- a/pixi.js/v3/index.d.ts
+++ /dev/null
@@ -1,1747 +0,0 @@
-// Type definitions for Pixi.js 3.0
-// Project: https://github.com/GoodBoyDigital/pixi.js/
-// Definitions by: clark-stevenson <https://github.com/pixijs/pixi-typescript>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = PIXI;
-export as namespace PIXI;
-
-declare class PIXI {
-
-    static VERSION: string;
-    static PI_2: number;
-    static RAD_TO_DEG: number;
-    static DEG_TO_RAD: number;
-    static TARGET_FPMS: number;
-    static RENDERER_TYPE: {
-        UNKNOWN: number;
-        WEBGL: number;
-        CANVAS: number;
-    };
-    static BLEND_MODES: {
-        NORMAL: number;
-        ADD: number;
-        MULTIPLY: number;
-        SCREEN: number;
-        OVERLAY: number;
-        DARKEN: number;
-        LIGHTEN: number;
-        COLOR_DODGE: number;
-        COLOR_BURN: number;
-        HARD_LIGHT: number;
-        SOFT_LIGHT: number;
-        DIFFERENCE: number;
-        EXCLUSION: number;
-        HUE: number;
-        SATURATION: number;
-        COLOR: number;
-        LUMINOSITY: number;
-
-    };
-    static DRAW_MODES: {
-        POINTS: number;
-        LINES: number;
-        LINE_LOOP: number;
-        LINE_STRIP: number;
-        TRIANGLES: number;
-        TRIANGLE_STRIP: number;
-        TRIANGLE_FAN: number;
-    };
-    static SCALE_MODES: {
-        DEFAULT: number;
-        LINEAR: number;
-        NEAREST: number;
-    };
-    static RETINA_PREFIX: string;
-    static RESOLUTION: number;
-    static FILTER_RESOLUTION: number;
-    static DEFAULT_RENDER_OPTIONS: {
-        view: HTMLCanvasElement;
-        resolution: number;
-        antialias: boolean;
-        forceFXAA: boolean;
-        autoResize: boolean;
-        transparent: boolean;
-        backgroundColor: number;
-        clearBeforeRender: boolean;
-        preserveDrawingBuffer: boolean;
-        roundPixels: boolean;
-    };
-    static SHAPES: {
-        POLY: number;
-        RECT: number;
-        CIRC: number;
-        ELIP: number;
-        RREC: number;
-    };
-    static SPRITE_BATCH_SIZE: number;
-
-}
-
-declare namespace PIXI {
-
-    export function autoDetectRenderer(width: number, height: number, options?: PIXI.RendererOptions, noWebGL?: boolean): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
-    export var loader: PIXI.loaders.Loader;
-
-    // https://github.com/primus/eventemitter3
-    export class EventEmitter {
-
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-        on(event: string, fn: Function, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
-        removeListener(event: string, fn?: Function, context?: any, once?: boolean): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
-
-        off(event: string, fn?: Function, context?: any, once?: boolean): EventEmitter;
-        addListener(event: string, fn: Function, context?: any): EventEmitter;
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ////////////////////////////////CORE//////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-
-    // display
-
-    export class DisplayObject extends EventEmitter implements interaction.InteractiveTarget {
-
-        // begin extras.cacheAsBitmap see https://github.com/pixijs/pixi-typescript/commit/1207b7f4752d79a088d6a9a465a3ec799906b1db
-        protected _originalRenderWebGL: WebGLRenderer;
-        protected _originalRenderCanvas: CanvasRenderer;
-        protected _originalUpdateTransform: boolean;
-        protected _originalHitTest: any;
-        protected _cachedSprite: any;
-        protected _originalDestroy: any;
-
-        cacheAsBitmap: boolean;
-
-        protected _renderCachedWebGL(renderer: WebGLRenderer): void;
-        protected _initCachedDisplayObject(renderer: WebGLRenderer): void;
-        protected _renderCachedCanvas(renderer: CanvasRenderer): void;
-        protected _initCachedDisplayObjectCanvas(renderer: CanvasRenderer): void;
-        protected _getCachedBounds(): Rectangle;
-        protected _destroyCachedDisplayObject(): void;
-        protected _cacheAsBitmapDestroy(): void;
-        // end extras.cacheAsBitmap
-
-        protected _sr: number;
-        protected _cr: number;
-        protected _bounds: Rectangle;
-        protected _currentBounds: Rectangle;
-        protected _mask: Rectangle;
-        protected _cachedObject: any;
-
-        updateTransform(): void;
-
-        position: Point;
-        scale: Point;
-        pivot: Point;
-        rotation: number;
-        renderable: boolean;
-        alpha: number;
-        visible: boolean;
-        parent: Container;
-        worldAlpha: number;
-        worldTransform: Matrix;
-        filterArea: Rectangle;
-
-        x: number;
-        y: number;
-        worldVisible: boolean;
-        mask: Graphics | Sprite;
-        filters: AbstractFilter[];
-        name: string;
-
-        getBounds(matrix?: Matrix): Rectangle;
-        getLocalBounds(): Rectangle;
-        toGlobal(position: Point): Point;
-        toLocal(position: Point, from?: DisplayObject): Point;
-        generateTexture(renderer: CanvasRenderer | WebGLRenderer, scaleMode: number, resolution: number): Texture;
-        setParent(container: Container): Container;
-        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, pivotX?: number, pivotY?: number): DisplayObject;
-        destroy(): void;
-        getChildByName(name: string): DisplayObject;
-        getGlobalPosition(point: Point): Point;
-
-        interactive: boolean;
-        buttonMode: boolean;
-        interactiveChildren: boolean;
-        defaultCursor: string;
-        hitArea: HitArea;
-
-        on(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: string, fn: Function, context?: any): EventEmitter;
-
-        once(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
-
-    }
-
-    export class Container extends DisplayObject {
-
-        protected _renderWebGL(renderer: WebGLRenderer): void;
-        protected _renderCanvas(renderer: CanvasRenderer): void;
-
-        protected onChildrenChange: () => void;
-
-        children: DisplayObject[];
-
-        width: number;
-        height: number;
-
-        addChild(...child: DisplayObject[]): DisplayObject;
-        addChildAt(child: DisplayObject, index: number): DisplayObject;
-        swapChildren(child: DisplayObject, child2: DisplayObject): void;
-        getChildIndex(child: DisplayObject): number;
-        setChildIndex(child: DisplayObject, index: number): void;
-        getChildAt(index: number): DisplayObject;
-        removeChild(child: DisplayObject): DisplayObject;
-        removeChildAt(index: number): DisplayObject;
-        removeChildren(beginIndex?: number, endIndex?: number): DisplayObject[];
-        destroy(destroyChildren?: boolean): void;
-        generateTexture(renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer, resolution?: number, scaleMode?: number): Texture;
-
-        renderWebGL(renderer: WebGLRenderer): void;
-        renderCanvas(renderer: CanvasRenderer): void;
-
-        once(event: 'added', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
-        once(event: 'removed', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
-        on(event: 'added', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: string, fn: Function, context?: any): EventEmitter;
-        on(event: 'removed', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: string, fn: Function, context?: any): EventEmitter;
-
-    }
-
-    // graphics
-
-    export class GraphicsData {
-
-        constructor(lineWidth: number, lineColor: number, lineAlpha: number, fillColor: number, fillAlpha: number, fill: boolean, shape: Circle | Rectangle | Ellipse | Polygon);
-
-        lineWidth: number;
-        lineColor: number;
-        lineAlpha: number;
-        fillColor: number;
-        fillAlpha: number;
-        fill: boolean;
-        shape: Circle | Rectangle | Ellipse | Polygon;
-        type: number;
-
-        clone(): GraphicsData;
-
-        protected _lineTint: number;
-        protected _fillTint: number;
-
-    }
-    export class Graphics extends Container {
-
-        protected boundsDirty: boolean;
-        protected dirty: boolean;
-        protected glDirty: boolean;
-
-        fillAlpha: number;
-        lineWidth: number;
-        lineColor: number;
-        tint: number;
-        blendMode: number;
-        isMask: boolean;
-        boundsPadding: number;
-
-        clone(): Graphics;
-        lineStyle(lineWidth?: number, color?: number, alpha?: number): Graphics;
-        moveTo(x: number, y: number): Graphics;
-        lineTo(x: number, y: number): Graphics;
-        quadraticCurveTo(cpX: number, cpY: number, toX: number, toY: number): Graphics;
-        bezierCurveTo(cpX: number, cpY: number, cpX2: number, cpY2: number, toX: number, toY: number): Graphics;
-        arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): Graphics;
-        arc(cx: number, cy: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): Graphics;
-        beginFill(color: number, alpha?: number): Graphics;
-        endFill(): Graphics;
-        drawRect(x: number, y: number, width: number, height: number): Graphics;
-        drawRoundedRect(x: number, y: number, width: number, height: number, radius: number): Graphics;
-        drawCircle(x: number, y: number, radius: number): Graphics;
-        drawEllipse(x: number, y: number, width: number, height: number): Graphics;
-        drawPolygon(path: number[] | Point[]): Graphics;
-        clear(): Graphics;
-        // todo
-        generateTexture(renderer: WebGLRenderer | CanvasRenderer, resolution?: number, scaleMode?: number): Texture;
-        getBounds(matrix?: Matrix): Rectangle;
-        containsPoint(point: Point): boolean;
-        updateLocalBounds(): void;
-        drawShape(shape: Circle | Rectangle | Ellipse | Polygon): GraphicsData;
-
-    }
-    export interface GraphicsRenderer extends ObjectRenderer {
-        // yikes todo
-    }
-    export interface WebGLGraphicsData {
-        // yikes todo!
-    }
-
-    // math
-
-    export class Point {
-
-        x: number;
-        y: number;
-
-        constructor(x?: number, y?: number);
-
-        clone(): Point;
-        copy(p: Point): void;
-        equals(p: Point): boolean;
-        set(x?: number, y?: number): void;
-
-    }
-    export class Matrix {
-
-        a: number;
-        b: number;
-        c: number;
-        d: number;
-        tx: number;
-        ty: number;
-
-        fromArray(array: number[]): void;
-        toArray(transpose?: boolean, out?: number[]): number[];
-        apply(pos: Point, newPos?: Point): Point;
-        applyInverse(pos: Point, newPos?: Point): Point;
-        translate(x: number, y: number): Matrix;
-        scale(x: number, y: number): Matrix;
-        rotate(angle: number): Matrix;
-        append(matrix: Matrix): Matrix;
-        prepend(matrix: Matrix): Matrix;
-        invert(): Matrix;
-        identity(): Matrix;
-        clone(): Matrix;
-        copy(matrix: Matrix): Matrix;
-        set(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix;
-        setTransform(a: number, b: number, c: number, d: number, sr: number, cr: number, cy: number, sy: number, nsx: number, cs: number): PIXI.Matrix;
-
-        static IDENTITY: Matrix;
-        static TEMP_MATRIX: Matrix;
-
-    }
-
-    export interface HitArea {
-
-        contains(x: number, y: number): boolean;
-
-    }
-
-    export class Circle implements HitArea {
-
-        constructor(x?: number, y?: number, radius?: number);
-
-        x: number;
-        y: number;
-        radius: number;
-        type: number;
-
-        clone(): Circle;
-        contains(x: number, y: number): boolean;
-        getBounds(): Rectangle;
-
-    }
-    export class Ellipse implements HitArea {
-
-        constructor(x?: number, y?: number, width?: number, height?: number);
-
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-        type: number;
-
-        clone(): Ellipse;
-        contains(x: number, y: number): boolean;
-        getBounds(): Rectangle;
-
-    }
-    export class Polygon implements HitArea {
-
-        constructor(points: Point[]);
-        constructor(points: number[]);
-        constructor(...points: Point[]);
-        constructor(...points: number[]);
-
-        closed: boolean;
-        points: number[];
-        type: number;
-
-        clone(): Polygon;
-        contains(x: number, y: number): boolean;
-
-
-    }
-    export class Rectangle implements HitArea {
-
-        constructor(x?: number, y?: number, width?: number, height?: number);
-
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-        type: number;
-
-        static EMPTY: Rectangle;
-
-        clone(): Rectangle;
-        contains(x: number, y: number): boolean;
-
-    }
-    export class RoundedRectangle implements HitArea {
-
-        constructor(x?: number, y?: number, width?: number, height?: number, radius?: number);
-
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-        radius: number;
-        type: number;
-
-        static EMPTY: Rectangle;
-
-        clone(): Rectangle;
-        contains(x: number, y: number): boolean;
-
-    }
-
-    // particles
-
-    export interface ParticleContainerProperties {
-
-        scale?: boolean;
-        position?: boolean;
-        rotation?: boolean;
-        uvs?: boolean;
-        alpha?: boolean;
-
-    }
-    export class ParticleContainer extends Container {
-
-        constructor(size?: number, properties?: ParticleContainerProperties, batchSize?: number);
-
-        protected _maxSize: number;
-        protected _batchSize: number;
-        protected _properties: boolean[];
-        protected _buffers: WebGLBuffer[];
-        protected _bufferToUpdate: number;
-
-        protected onChildrenChange: (smallestChildIndex?: number) => void;
-
-        interactiveChildren: boolean;
-        blendMode: number;
-        roundPixels: boolean;
-
-        setProperties(properties: ParticleContainerProperties): void;
-
-    }
-    export interface ParticleBuffer {
-
-        gl: WebGLRenderingContext;
-        vertSize: number;
-        vertByteSize: number;
-        size: number;
-        dynamicProperties: any[];
-        staticProperties: any[];
-
-        staticStride: number;
-        staticBuffer: any;
-        staticData: any;
-        dynamicStride: number;
-        dynamicBuffer: any;
-        dynamicData: any;
-
-        initBuffers(): void;
-        bind(): void;
-        destroy(): void;
-
-    }
-    export interface ParticleRenderer {
-
-    }
-    export interface ParticleShader {
-
-    }
-
-    // renderers
-
-    export interface RendererOptions {
-
-        view?: HTMLCanvasElement;
-        transparent?: boolean;
-        antialias?: boolean;
-        autoResize?: boolean;
-        resolution?: number;
-        clearBeforeRendering?: boolean;
-        preserveDrawingBuffer?: boolean;
-        forceFXAA?: boolean;
-        roundPixels?: boolean;
-        backgroundColor?: number;
-
-    }
-    export class SystemRenderer extends EventEmitter {
-
-        protected _backgroundColor: number;
-        protected _backgroundColorRgb: number[];
-        protected _backgroundColorString: string;
-        protected _tempDisplayObjectParent: any;
-        protected _lastObjectRendered: DisplayObject;
-
-        constructor(system: string, width?: number, height?: number, options?: RendererOptions);
-
-        type: number;
-        width: number;
-        height: number;
-        view: HTMLCanvasElement;
-        resolution: number;
-        transparent: boolean;
-        autoResize: boolean;
-        blendModes: any; // todo?
-        preserveDrawingBuffer: boolean;
-        clearBeforeRender: boolean;
-        roundPixels: boolean;
-        backgroundColor: number;
-
-        render(object: DisplayObject): void;
-        resize(width: number, height: number): void;
-        destroy(removeView?: boolean): void;
-
-    }
-    export class CanvasRenderer extends SystemRenderer {
-
-        protected renderDisplayObject(displayObject: DisplayObject, context: CanvasRenderingContext2D): void;
-        protected _mapBlendModes(): void;
-
-        constructor(width?: number, height?: number, options?: RendererOptions);
-
-        context: CanvasRenderingContext2D;
-        refresh: boolean;
-        maskManager: CanvasMaskManager;
-        roundPixels: boolean;
-        smoothProperty: string;
-
-        render(object: DisplayObject): void;
-        resize(w: number, h: number): void;
-
-    }
-    export class CanvasBuffer {
-
-        protected clear(): void;
-
-        constructor(width: number, height: number);
-
-        canvas: HTMLCanvasElement;
-        context: CanvasRenderingContext2D;
-
-        width: number;
-        height: number;
-
-        resize(width: number, height: number): void;
-        destroy(): void;
-
-    }
-    export class CanvasGraphics {
-
-        static renderGraphicsMask(graphics: Graphics, context: CanvasRenderingContext2D): void;
-        static updateGraphicsTint(graphics: Graphics): void;
-
-        static renderGraphics(graphics: Graphics, context: CanvasRenderingContext2D): void;
-
-    }
-    export class CanvasMaskManager {
-
-        pushMask(maskData: any, renderer: WebGLRenderer | CanvasRenderer): void;
-        popMask(renderer: WebGLRenderer | CanvasRenderer): void;
-        destroy(): void;
-
-    }
-    export class CanvasTinter {
-
-        static getTintedTexture(sprite: DisplayObject, color: number): HTMLCanvasElement;
-        static tintWithMultiply(texture: Texture, color: number, canvas: HTMLDivElement): void;
-        static tintWithOverlay(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
-        static tintWithPerPixel(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
-        static roundColor(color: number): number;
-        static cacheStepsPerColorChannel: number;
-        static convertTintToImage: boolean;
-        static vanUseMultiply: boolean;
-        static tintMethod: Function;
-
-    }
-    export class WebGLRenderer extends SystemRenderer {
-
-        protected _useFXAA: boolean;
-        protected _FXAAFilter: filters.FXAAFilter;
-        protected _contextOptions: {
-            alpha: boolean;
-            antiAlias: boolean;
-            premultipliedAlpha: boolean;
-            stencil: boolean;
-            preseveDrawingBuffer: boolean;
-        };
-        protected _renderTargetStack: RenderTarget[];
-
-        protected _initContext(): void;
-        protected _createContext(): void;
-        protected handleContextLost: (event: WebGLContextEvent) => void;
-        protected _mapGlModes(): void;
-        protected _managedTextures: Texture[];
-
-        constructor(width?: number, height?: number, options?: RendererOptions);
-
-        drawCount: number;
-        shaderManager: ShaderManager;
-        maskManager: MaskManager;
-        stencilManager: StencilManager;
-        filterManager: FilterManager;
-        blendModeManager: BlendModeManager;
-        currentRenderTarget: RenderTarget;
-        currentRenderer: ObjectRenderer;
-
-        render(object: DisplayObject): void;
-        renderDisplayObject(displayObject: DisplayObject, renderTarget: RenderTarget, clear: boolean): void;
-        setObjectRenderer(objectRenderer: ObjectRenderer): void;
-        setRenderTarget(renderTarget: RenderTarget): void;
-        updateTexture(texture: BaseTexture | Texture): BaseTexture | Texture;
-        destroyTexture(texture: BaseTexture | Texture, _skipRemove?: boolean): void;
-
-    }
-    export class AbstractFilter {
-
-        protected vertexSrc: string[];
-        protected fragmentSrc: string[];
-
-        constructor(vertexSrc?: string | string[], fragmentSrc?: string | string[], uniforms?: any);
-
-        uniforms: any;
-
-        padding: number;
-
-        getShader(renderer: WebGLRenderer): Shader;
-        applyFilter(renderer: WebGLRenderer, input: RenderTarget, output: RenderTarget, clear?: boolean): void;
-        syncUniform(uniform: WebGLUniformLocation): void;
-
-    }
-    export class SpriteMaskFilter extends AbstractFilter {
-
-        constructor(sprite: Sprite);
-
-        maskSprite: Sprite;
-        maskMatrix: Matrix;
-
-        applyFilter(renderer: WebGLRenderbuffer, input: RenderTarget, output: RenderTarget): void;
-        map: Texture;
-        offset: Point;
-
-    }
-    export class BlendModeManager extends WebGLManager {
-
-        constructor(renderer: WebGLRenderer);
-
-        setBlendMode(blendMode: number): boolean;
-
-    }
-
-    export class FilterManager extends WebGLManager {
-
-        constructor(renderer: WebGLRenderer);
-
-        filterStack: any[];
-        renderer: WebGLRenderer;
-        texturePool: any[];
-
-        onContextChange: () => void;
-        setFilterStack(filterStack: any[]): void;
-        pushFilter(target: RenderTarget, filters: any[]): void;
-        popFilter(): AbstractFilter;
-        getRenderTarget(clear?: boolean): RenderTarget;
-        protected returnRenderTarget(renderTarget: RenderTarget): void;
-        applyFilter(shader: Shader | AbstractFilter, inputTarget: RenderTarget, outputTarget: RenderTarget, clear?: boolean): void;
-        calculateMappedMatrix(filterArea: Rectangle, sprite: Sprite, outputMatrix?: Matrix): Matrix;
-        capFilterArea(filterArea: Rectangle): void;
-        resize(width: number, height: number): void;
-        destroy(): void;
-
-    }
-
-    export class MaskManager extends WebGLManager {
-
-        stencilStack: StencilMaskStack;
-        reverse: boolean;
-        count: number;
-        alphaMaskPool: any[];
-
-        pushMask(target: RenderTarget, maskData: any): void;
-        popMask(target: RenderTarget, maskData: any): void;
-        pushSpriteMask(target: RenderTarget, maskData: any): void;
-        popSpriteMask(): void;
-        pushStencilMask(target: RenderTarget, maskData: any): void;
-        popStencilMask(target: RenderTarget, maskData: any): void;
-
-    }
-    export class ShaderManager extends WebGLManager {
-
-        protected _currentId: number;
-        protected currentShader: Shader;
-
-        constructor(renderer: WebGLRenderer);
-
-        maxAttibs: number;
-        attribState: any[];
-        tempAttribState: any[];
-        stack: any[];
-
-        setAttribs(attribs: any[]): void;
-        setShader(shader: Shader): boolean;
-        destroy(): void;
-
-    }
-    export class StencilManager extends WebGLManager {
-
-        constructor(renderer: WebGLRenderer);
-
-        setMaskStack(stencilMaskStack: StencilMaskStack): void;
-        pushStencil(graphics: Graphics, webGLData: WebGLGraphicsData): void;
-        bindGraphics(graphics: Graphics, webGLData: WebGLGraphicsData): void;
-        popStencil(graphics: Graphics, webGLData: WebGLGraphicsData): void;
-        destroy(): void;
-        pushMask(maskData: any[]): void;
-        popMask(maskData: any[]): void;
-
-    }
-    export class WebGLManager {
-
-        protected onContextChange: () => void;
-
-        constructor(renderer: WebGLRenderer);
-
-        renderer: WebGLRenderer;
-
-        destroy(): void;
-
-    }
-    export class Shader {
-
-        protected attributes: any;
-        protected textureCount: number;
-        protected uniforms: any;
-
-        protected _glCompile(type: any, src: any): Shader;
-
-        constructor(shaderManager: ShaderManager, vertexSrc: string, fragmentSrc: string, uniforms: any, attributes: any);
-
-        uuid: number;
-        gl: WebGLRenderingContext;
-        shaderManager: ShaderManager;
-        program: WebGLProgram;
-        vertexSrc: string;
-        fragmentSrc: string;
-
-        init(): void;
-        cacheUniformLocations(keys: string[]): void;
-        cacheAttributeLocations(keys: string[]): void;
-        compile(): WebGLProgram;
-        syncUniform(uniform: any): void;
-        syncUniforms(): void;
-        initSampler2D(uniform: any): void;
-        destroy(): void;
-
-    }
-    export class ComplexPrimitiveShader extends Shader {
-
-        constructor(shaderManager: ShaderManager);
-
-    }
-    export class PrimitiveShader extends Shader {
-
-        constructor(shaderManager: ShaderManager);
-
-    }
-    export class TextureShader extends Shader {
-
-        constructor(shaderManager: ShaderManager, vertexSrc?: string, fragmentSrc?: string, customUniforms?: any, customAttributes?: any);
-
-    }
-    export interface StencilMaskStack {
-
-        stencilStack: any[];
-        reverse: boolean;
-        count: number;
-
-    }
-    export class ObjectRenderer extends WebGLManager {
-
-        start(): void;
-        stop(): void;
-        flush(): void;
-        render(object?: any): void;
-
-    }
-    export class RenderTarget {
-
-        constructor(gl: WebGLRenderingContext, width: number, height: number, scaleMode: number, resolution: number, root: boolean);
-
-        gl: WebGLRenderingContext;
-        frameBuffer: WebGLFramebuffer;
-        texture: Texture;
-        size: Rectangle;
-        resolution: number;
-        projectionMatrix: Matrix;
-        transform: Matrix;
-        frame: Rectangle;
-        stencilBuffer: WebGLRenderbuffer;
-        stencilMaskStack: StencilMaskStack;
-        filterStack: any[];
-        scaleMode: number;
-        root: boolean;
-
-        clear(bind?: boolean): void;
-        attachStencilBuffer(): void;
-        activate(): void;
-        calculateProjection(protectionFrame: Matrix): void;
-        resize(width: number, height: number): void;
-        destroy(): void;
-
-    }
-    export interface Quad {
-
-        gl: WebGLRenderingContext;
-        vertices: number[];
-        uvs: number[];
-        colors: number[];
-        indices: number[];
-        vertexBuffer: WebGLBuffer;
-        indexBuffer: WebGLBuffer;
-
-        map(rect: Rectangle, rect2: Rectangle): void;
-        upload(): void;
-        destroy(): void;
-
-    }
-
-    // sprites
-
-    export class Sprite extends Container {
-
-        static fromFrame(frameId: string): Sprite;
-        static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
-
-        protected _texture: Texture;
-        protected _width: number;
-        protected _height: number;
-        protected cachedTint: number;
-
-        protected _onTextureUpdate(): void;
-
-        constructor(texture?: Texture);
-
-        anchor: Point;
-        tint: number;
-        blendMode: number;
-        shader: Shader | AbstractFilter;
-        texture: Texture;
-
-        width: number;
-        height: number;
-
-        getBounds(matrix?: Matrix): Rectangle;
-        getLocalBounds(): Rectangle;
-        containsPoint(point: Point): boolean;
-        destroy(destroyTexture?: boolean, destroyBaseTexture?: boolean): void;
-
-    }
-    export class SpriteRenderer extends ObjectRenderer {
-
-        protected renderBatch(texture: Texture, size: number, startIndex: number): void;
-
-        vertSize: number;
-        vertByteSize: number;
-        size: number;
-        vertices: number[];
-        positions: number[];
-        colors: number[];
-        indices: number[];
-        currentBatchSize: number;
-        sprites: Sprite[];
-        shader: Shader | AbstractFilter;
-
-        render(sprite: Sprite): void;
-        flush(): void;
-        start(): void;
-        destroy(): void;
-
-    }
-
-    // text
-
-    export interface TextStyle {
-
-        font?: string;
-        fill?: string | number;
-        align?: string;
-        stroke?: string | number;
-        strokeThickness?: number;
-        wordWrap?: boolean;
-        wordWrapWidth?: number;
-        lineHeight?: number;
-        dropShadow?: boolean;
-        dropShadowColor?: string | number;
-        dropShadowAngle?: number;
-        dropShadowDistance?: number;
-        padding?: number;
-        textBaseline?: string;
-        lineJoin?: string;
-        miterLimit?: number;
-
-    }
-    export class Text extends Sprite {
-
-        static fontPropertiesCache: any;
-        static fontPropertiesCanvas: HTMLCanvasElement;
-        static fontPropertiesContext: CanvasRenderingContext2D;
-
-        protected _text: string;
-        protected _style: TextStyle;
-
-        protected updateText(): void;
-        protected updateTexture(): void;
-        protected determineFontProperties(fontStyle: TextStyle): TextStyle;
-        protected wordWrap(text: string): boolean;
-
-        constructor(text?: string, style?: TextStyle, resolution?: number);
-
-        canvas: HTMLCanvasElement;
-        context: CanvasRenderingContext2D;
-        dirty: boolean;
-        resolution: number;
-        text: string;
-        style: TextStyle;
-
-        width: number;
-        height: number;
-
-    }
-
-    // textures
-
-    export class BaseTexture extends EventEmitter {
-
-        static fromImage(imageUrl: string, crossorigin?: boolean, scaleMode?: number): BaseTexture;
-        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): BaseTexture;
-
-        protected _glTextures: any;
-
-        protected _sourceLoaded(): void;
-
-        constructor(source: HTMLImageElement | HTMLCanvasElement, scaleMode?: number, resolution?: number);
-
-        uuid: number;
-        resolution: number;
-        width: number;
-        height: number;
-        realWidth: number;
-        realHeight: number;
-        scaleMode: number;
-        hasLoaded: boolean;
-        isLoading: boolean;
-        source: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement;
-        premultipliedAlpha: boolean;
-        imageUrl: string;
-        isPowerOfTwo: boolean;
-        mipmap: boolean;
-
-        update(): void;
-        loadSource(source: HTMLImageElement | HTMLCanvasElement): void;
-        destroy(): void;
-        dispose(): void;
-        updateSourceImage(newSrc: string): void;
-
-        on(event: 'dispose', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        on(event: 'error', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        on(event: 'loaded', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        on(event: 'update', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        on(event: string, fn: Function, context?: any): EventEmitter;
-
-        once(event: 'dispose', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        once(event: 'error', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        once(event: 'loaded', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        once(event: 'update', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
-
-    }
-    export class RenderTexture extends Texture {
-
-        protected renderWebGL(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
-        protected renderCanvas(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
-
-        constructor(renderer: CanvasRenderer | WebGLRenderer, width?: number, height?: number, scaleMode?: number, resolution?: number);
-
-        width: number;
-        height: number;
-        resolution: number;
-        renderer: CanvasRenderer | WebGLRenderer;
-        valid: boolean;
-
-        render(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
-        resize(width: number, height: number, updateBase?: boolean): void;
-        clear(): void;
-        destroy(): void;
-        getImage(): HTMLImageElement;
-        getPixels(): number[];
-        getPixel(x: number, y: number): number[];
-        getBase64(): string;
-        getCanvas(): HTMLCanvasElement;
-
-    }
-    export class Texture extends BaseTexture {
-
-        static fromImage(imageUrl: string, crossOrigin?: boolean, scaleMode?: number): Texture;
-        static fromFrame(frameId: string): Texture;
-        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): Texture;
-        static fromVideo(video: HTMLVideoElement | string, scaleMode?: number): Texture;
-        static fromVideoUrl(videoUrl: string, scaleMode?: number): Texture;
-        static addTextureToCache(texture: Texture, id: string): void;
-        static removeTextureFromCache(id: string): Texture;
-        static EMPTY: Texture;
-
-        protected _frame: Rectangle;
-        protected _uvs: TextureUvs;
-
-        protected onBaseTextureUpdated(baseTexture: BaseTexture): void;
-        protected onBaseTextureLoaded(baseTexture: BaseTexture): void;
-        protected _updateUvs(): void;
-
-        constructor(baseTexture: BaseTexture, frame?: Rectangle, crop?: Rectangle, trim?: Rectangle, rotate?: boolean);
-
-        noFrame: boolean;
-        baseTexture: BaseTexture;
-        trim: Rectangle;
-        valid: boolean;
-        requiresUpdate: boolean;
-        width: number;
-        height: number;
-        crop: Rectangle;
-        rotate: boolean;
-
-        frame: Rectangle;
-
-        update(): void;
-        destroy(destroyBase?: boolean): void;
-        clone(): Texture;
-
-    }
-    export class TextureUvs {
-
-        x0: number;
-        y0: number;
-        x1: number;
-        y1: number;
-        x2: number;
-        y2: number;
-        x3: number;
-        y3: number;
-
-        set(frame: Rectangle, baseFrame: Rectangle, rotate: boolean): void;
-
-    }
-    export class VideoBaseTexture extends BaseTexture {
-
-        static fromVideo(video: HTMLVideoElement, scaleMode?: number): VideoBaseTexture;
-        static fromUrl(videoSrc: string | any | string[] | any[]): VideoBaseTexture;
-
-        protected _loaded: boolean;
-        protected _onUpdate(): void;
-        protected _onPlayStart(): void;
-        protected _onPlayStop(): void;
-        protected _onCanPlay(): void;
-
-        constructor(source: HTMLVideoElement, scaleMode?: number);
-
-        autoUpdate: boolean;
-
-        destroy(): void;
-
-    }
-
-    // utils
-
-    export class utils {
-
-        static uuid(): number;
-        static hex2rgb(hex: number, out?: number[]): number[];
-        static hex2string(hex: number): string;
-        static rgb2hex(rgb: Number[]): number;
-        static canUseNewCanvasBlendModel(): boolean;
-        static getNextPowerOfTwo(number: number): number;
-        static isPowerOfTwo(width: number, height: number): boolean;
-        static getResolutionOfUrl(url: string): number;
-        static sayHello(type: string): void;
-        static isWebGLSupported(): boolean;
-        static sign(n: number): number;
-        static TextureCache: any;
-        static BaseTextureCache: any;
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ////////////////////////////EXTRAS////////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-
-    export namespace extras {
-
-        export interface BitmapTextStyle {
-
-            font?: string | {
-
-                name?: string;
-                size?: number;
-
-            };
-            align?: string;
-            tint?: number;
-
-        }
-        export class BitmapText extends Container {
-
-            static fonts: any;
-
-            protected _glyphs: Sprite[];
-            protected _font: string | {
-                tint: number;
-                align: string;
-                name: string;
-                size: number;
-            };
-            protected _text: string;
-
-            protected updateText(): void;
-
-            constructor(text: string, style?: BitmapTextStyle);
-
-            textWidth: number;
-            textHeight: number;
-            maxWidth: number;
-            maxLineHeight: number;
-            dirty: boolean;
-
-            tint: number;
-            align: string;
-            font: string | {
-                tint: number;
-                align: string;
-                name: string;
-                size: number;
-            };
-            text: string;
-
-        }
-        export class MovieClip extends Sprite {
-
-            static fromFrames(frame: string[]): MovieClip;
-            static fromImages(images: string[]): MovieClip;
-
-            protected _textures: Texture[];
-            protected _durations: number[];
-            protected _currentTime: number;
-
-            protected update(deltaTime: number): void;
-
-            constructor(textures: Texture[]);
-
-            animationSpeed: number;
-            loop: boolean;
-            onComplete: () => void;
-            currentFrame: number;
-            playing: boolean;
-
-            totalFrames: number;
-            textures: Texture[];
-
-            stop(): void;
-            play(): void;
-            gotoAndStop(frameName: number): void;
-            gotoAndPlay(frameName: number): void;
-            destroy(): void;
-
-        }
-        export class TilingSprite extends Sprite {
-
-            // This is really unclean but is the only way :(
-            // See http://stackoverflow.com/questions/29593905/typescript-declaration-extending-class-with-static-method/29595798#29595798
-            // Thanks bas!
-            static fromFrame(frameId: string): Sprite;
-            static fromFrame(frameId: string, width?: number, height?: number): TilingSprite;
-
-            static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
-            static fromImage(imageId: string, width?: number, height?: number, crossorigin?: boolean, scaleMode?: number): TilingSprite;
-
-            protected _tileScaleOffset: Point;
-            protected _tilingTexture: boolean;
-            protected _refreshTexture: boolean;
-            protected _uvs: TextureUvs[];
-
-            constructor(texture: Texture, width: number, height: number);
-
-            tileScale: Point;
-            tilePosition: Point;
-
-            width: number;
-            height: number;
-            originalTexture: Texture;
-
-            getBounds(): Rectangle;
-            generateTilingTexture(renderer: WebGLRenderer | CanvasRenderer, texture: Texture, forcePowerOfTwo?: boolean): Texture;
-            containsPoint(point: Point): boolean;
-            destroy(): void;
-
-        }
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////FILTERS////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-
-    namespace filters {
-
-        export class AsciiFilter extends AbstractFilter {
-            size: number;
-        }
-        export class BloomFilter extends AbstractFilter {
-
-            blur: number;
-            blurX: number;
-            blurY: number;
-
-        }
-        export class BlurFilter extends AbstractFilter {
-
-            protected blurXFilter: BlurXFilter;
-            protected blurYFilter: BlurYFilter;
-
-            blur: number;
-            passes: number;
-            blurX: number;
-            blurY: number;
-
-        }
-        export class BlurXFilter extends AbstractFilter {
-
-            passes: number;
-            strength: number;
-            blur: number;
-
-        }
-        export class BlurYFilter extends AbstractFilter {
-
-            passes: number;
-            strength: number;
-            blur: number;
-
-        }
-        export class SmartBlurFilter extends AbstractFilter {
-
-        }
-        export class ColorMatrixFilter extends AbstractFilter {
-
-            protected _loadMatrix(matrix: number[], multiply: boolean): void;
-            protected _multiply(out: number[], a: number[], b: number[]): void;
-            protected _colorMatrix(matrix: number[]): void;
-
-            matrix: number[];
-
-            brightness(b: number, multiply?: boolean): void;
-            greyscale(scale: number, multiply?: boolean): void;
-            blackAndWhite(multiply?: boolean): void;
-            hue(rotation: number, multiply?: boolean): void;
-            contrast(amount: number, multiply?: boolean): void;
-            saturate(amount: number, multiply?: boolean): void;
-            desaturate(multiply?: boolean): void;
-            negative(multiply?: boolean): void;
-            sepia(multiply?: boolean): void;
-            technicolor(multiply?: boolean): void;
-            polaroid(multiply?: boolean): void;
-            toBGR(multiply?: boolean): void;
-            kodachrome(multiply?: boolean): void;
-            browni(multiply?: boolean): void;
-            vintage(multiply?: boolean): void;
-            colorTone(desaturation: number, toned: number, lightColor: string, darkColor: string, multiply?: boolean): void;
-            night(intensity: number, multiply?: boolean): void;
-            predator(amount: number, multiply?: boolean): void;
-            lsd(multiply?: boolean): void;
-            reset(): void;
-
-        }
-        export class ColorStepFilter extends AbstractFilter {
-
-            step: number;
-
-        }
-        export class ConvolutionFilter extends AbstractFilter {
-
-            constructor(matrix: number[], width: number, height: number);
-
-            matrix: number[];
-            width: number;
-            height: number;
-
-        }
-        export class CrossHatchFilter extends AbstractFilter {
-
-        }
-        export class DisplacementFilter extends AbstractFilter {
-
-            constructor(sprite: Sprite, scale?: number);
-
-            map: Texture;
-
-            scale: Point;
-
-        }
-        export class DotScreenFilter extends AbstractFilter {
-
-            scale: number;
-            angle: number;
-
-        }
-        export class BlurYTintFilter extends AbstractFilter {
-
-            blur: number;
-
-        }
-        export class DropShadowFilter extends AbstractFilter {
-
-            blur: number;
-            blurX: number;
-            blurY: number;
-            color: number;
-            alpha: number;
-            distance: number;
-            angle: number;
-
-        }
-        export class GrayFilter extends AbstractFilter {
-
-            gray: number;
-
-        }
-        export class InvertFilter extends AbstractFilter {
-
-            invert: number;
-
-        }
-        export class NoiseFilter extends AbstractFilter {
-
-            noise: number;
-
-        }
-        export class PixelateFilter extends AbstractFilter {
-
-            size: Point;
-
-        }
-        export class RGBSplitFilter extends AbstractFilter {
-
-            red: number;
-            green: number;
-            blue: number;
-
-        }
-        export class SepiaFilter extends AbstractFilter {
-
-            sepia: number;
-
-        }
-        export class ShockwaveFilter extends AbstractFilter {
-
-            center: number[];
-            params: any;
-            time: number;
-
-        }
-        export class TiltShiftAxisFilter extends AbstractFilter {
-
-            blur: number;
-            gradientBlur: number;
-            start: number;
-            end: number;
-
-            updateDelta(): void;
-
-        }
-        export class TiltShiftFilter extends AbstractFilter {
-
-            blur: number;
-            gradientBlur: number;
-            start: number;
-            end: number;
-
-        }
-        export class TiltShiftXFilter extends AbstractFilter {
-
-            updateDelta(): void;
-
-        }
-        export class TiltShiftYFilter extends AbstractFilter {
-
-            updateDelta(): void;
-
-        }
-        export class TwistFilter extends AbstractFilter {
-
-            offset: Point;
-            radius: number;
-            angle: number;
-
-        }
-        export class FXAAFilter extends AbstractFilter {
-
-            applyFilter(renderer: WebGLRenderer, input: RenderTarget, output: RenderTarget): void;
-
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ////////////////////////////INTERACTION///////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-
-    export namespace interaction {
-
-        export interface InteractionEvent {
-
-            stopped: boolean;
-            target: any;
-            type: string;
-            data: InteractionData;
-            stopPropagation(): void;
-
-        }
-
-        export class InteractionData {
-
-            global: Point;
-            target: DisplayObject;
-            originalEvent: Event;
-            identifier: number;
-
-            getLocalPosition(displayObject: DisplayObject, point?: Point, globalPos?: Point): Point;
-
-        }
-
-        export class InteractionManager {
-
-            protected interactionDOMElement: HTMLElement;
-            protected eventsAdded: boolean;
-            protected _tempPoint: Point;
-
-            protected setTargetElement(element: HTMLElement, resolution: number): void;
-            protected addEvents(): void;
-            protected removeEvents(): void;
-            protected dispatchEvent(displayObject: DisplayObject, eventString: string, eventData: any): void;
-            protected onMouseDown: (event: Event) => void;
-            protected processMouseDown: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onMouseUp: (event: Event) => void;
-            protected processMouseUp: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onMouseMove: (event: Event) => void;
-            protected processMouseMove: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onMouseOut: (event: Event) => void;
-            protected processMouseOverOut: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onTouchStart: (event: Event) => void;
-            protected processTouchStart: (DisplayObject: DisplayObject, hit: boolean) => void;
-            protected onTouchEnd: (event: Event) => void;
-            protected processTouchEnd: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onTouchMove: (event: Event) => void;
-            protected processTouchMove: (displayObject: DisplayObject, hit: boolean) => void;
-            protected getTouchData(touchEvent: InteractionData): InteractionData;
-            protected returnTouchData(touchData: InteractionData): void;
-
-            constructor(renderer: CanvasRenderer | WebGLRenderer, options?: { autoPreventDefault?: boolean; interactionFrequence?: number; });
-
-            renderer: CanvasRenderer | WebGLRenderer;
-            autoPreventDefault: boolean;
-            interactionFrequency: number;
-            mouse: InteractionData;
-            eventData: {
-                stopped: boolean;
-                target: any;
-                type: any;
-                data: InteractionData;
-            };
-            interactiveDataPool: InteractionData[];
-            last: number;
-            currentCursorStyle: string;
-            resolution: number;
-            update(deltaTime: number): void;
-
-            mapPositionToPoint(point: Point, x: number, y: number): void;
-            processInteractive(point: Point, displayObject: DisplayObject, func: (displayObject: DisplayObject, hit: boolean) => void, hitTest: boolean, interactive: boolean): boolean;
-            destroy(): void;
-
-        }
-
-        export interface InteractiveTarget {
-
-            interactive: boolean;
-            buttonMode: boolean;
-            interactiveChildren: boolean;
-            defaultCursor: string;
-            hitArea: HitArea;
-
-        }
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////LOADER/////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-    // https://github.com/englercj/resource-loader/blob/master/src/Loader.js
-
-    export namespace loaders {
-        export interface LoaderOptions {
-
-            crossOrigin?: boolean;
-            loadType?: number;
-            xhrType?: string;
-
-        }
-        export interface ResourceDictionary {
-
-            [index: string]: PIXI.loaders.Resource;
-        }
-        export class Loader extends EventEmitter {
-
-            constructor(baseUrl?: string, concurrency?: number);
-
-            baseUrl: string;
-            progress: number;
-            loading: boolean;
-            resources: ResourceDictionary;
-
-            add(name: string, url: string, options?: LoaderOptions, cb?: () => void): Loader;
-            add(url: string, options?: LoaderOptions, cb?: () => void): Loader;
-            // todo I am not sure of object literal notional (or its options) so just allowing any but would love to improve this
-            add(obj: any, options?: LoaderOptions, cb?: () => void): Loader;
-
-            on(event: 'complete', fn: (loader: loaders.Loader, object: any) => void, context?: any): EventEmitter;
-            on(event: 'error', fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            on(event: 'load', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            on(event: 'progress', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            on(event: 'start', fn: (loader: loaders.Loader) => void, context?: any): EventEmitter;
-            on(event: string, fn: Function, context?: any): EventEmitter;
-
-            once(event: 'complete', fn: (loader: loaders.Loader, object: any) => void, context?: any): EventEmitter;
-            once(event: 'error', fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            once(event: 'load', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            once(event: 'progress', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            once(event: 'start', fn: (loader: loaders.Loader) => void, context?: any): EventEmitter;
-            once(event: string, fn: Function, context?: any): EventEmitter;
-
-            before(fn: Function): Loader;
-            pre(fn: Function): Loader;
-
-            after(fn: Function): Loader;
-            use(fn: Function): Loader;
-
-            reset(): void;
-
-            load(cb?: (loader: loaders.Loader, object: any) => void): Loader;
-
-        }
-        export class Resource extends EventEmitter {
-
-            static LOAD_TYPE: {
-                XHR: number;
-                IMAGE: number;
-                AUDIO: number;
-                VIDEO: number;
-            };
-
-            static XHR_READ_STATE: {
-                UNSENT: number;
-                OPENED: number;
-                HEADERS_RECIEVED: number;
-                LOADING: number;
-                DONE: number;
-            };
-
-            static XHR_RESPONSE_TYPE: {
-                DEFAULT: number;
-                BUFFER: number;
-                BLOB: number;
-                DOCUMENT: number;
-                JSON: number;
-                TEXT: number;
-            };
-
-            constructor(name?: string, url?: string | string[], options?: LoaderOptions);
-
-            name: string;
-            texture: Texture;
-			textures: Texture[];
-            url: string;
-            data: any;
-            crossOrigin: string;
-            loadType: number;
-            xhrType: string;
-            error: Error;
-            xhr: XMLHttpRequest;
-
-            complete(): void;
-            load(cb?: () => void): void;
-
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////MESH///////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-
-    export namespace mesh {
-
-        export class Mesh extends Container {
-
-            static DRAW_MODES: {
-                TRIANGLE_MESH: number;
-                TRIANGLES: number;
-            };
-
-            constructor(texture: Texture, vertices?: number[], uvs?: number[], indices?: number[], drawMode?: number);
-
-            texture: Texture;
-            uvs: number[];
-            vertices: number[];
-            indices: number[];
-            dirty: boolean;
-            blendMode: number;
-            canvasPadding: number;
-            drawMode: number;
-            shader: Shader | AbstractFilter;
-
-            getBounds(matrix?: Matrix): Rectangle;
-            containsPoint(point: Point): boolean;
-
-            protected _texture: Texture;
-
-            protected _renderCanvasTriangleMesh(context: CanvasRenderingContext2D): void;
-            protected _renderCanvasTriangles(context: CanvasRenderingContext2D): void;
-            protected _renderCanvasDrawTriangle(context: CanvasRenderingContext2D, vertices: number, uvs: number, index0: number, index1: number, index2: number): void;
-            protected renderMeshFlat(Mesh: Mesh): void;
-            protected _onTextureUpdate(): void;
-
-        }
-        export class Rope extends Mesh {
-
-            protected _ready: boolean;
-
-            protected getTextureUvs(): TextureUvs;
-
-            constructor(texture: Texture, points: Point[]);
-
-            points: Point[];
-            colors: number[];
-
-            refresh(): void;
-
-        }
-        export class Plane extends Mesh {
-
-            segmentsX: number;
-            segmentsY: number;
-
-            constructor(texture: Texture, segmentsX?: number, segmentsY?: number);
-
-        }
-
-
-        export class MeshRenderer extends ObjectRenderer {
-
-            protected _initWebGL(mesh: Mesh): void;
-
-            indices: number[];
-
-            constructor(renderer: WebGLRenderer);
-
-            render(mesh: Mesh): void;
-            flush(): void;
-            start(): void;
-            destroy(): void;
-
-        }
-
-        export interface MeshShader extends Shader { }
-
-    }
-
-    namespace ticker {
-
-        export var shared: Ticker;
-
-        export class Ticker {
-
-            protected _tick(time: number): void;
-            protected _emitter: EventEmitter;
-            protected _requestId: number;
-            protected _maxElapsedMS: number;
-
-            protected _requestIfNeeded(): void;
-            protected _cancelIfNeeded(): void;
-            protected _startIfPossible(): void;
-
-            autoStart: boolean;
-            deltaTime: number;
-            elapsedMS: number;
-            lastTime: number;
-            speed: number;
-            started: boolean;
-
-            FPS: number;
-            minFPS: number;
-
-            add(fn: (deltaTime: number) => void, context?: any): Ticker;
-            addOnce(fn: (deltaTime: number) => void, context?: any): Ticker;
-            remove(fn: (deltaTime: number) => void, context?: any): Ticker;
-            start(): void;
-            stop(): void;
-            update(): void;
-
-        }
-
-    }
-}
diff --git a/pixi.js/v3/pixi.js-tests.ts b/pixi.js/v3/pixi.js-tests.ts
deleted file mode 100644
index ec4c5329c0..0000000000
--- a/pixi.js/v3/pixi.js-tests.ts
+++ /dev/null
@@ -1,2739 +0,0 @@
-namespace basics {
-
-    export class Basics {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private bunny: PIXI.Sprite;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            // create a texture from an image path
-            var texture: PIXI.Texture = PIXI.Texture.fromImage("../../_assets/basics/bunny.png");
-
-            // create a new Sprite using the texture
-            this.bunny = new PIXI.Sprite(texture);
-
-            // center the sprite's anchor point
-            this.bunny.anchor.x = 0.5;
-            this.bunny.anchor.y = 0.5;
-
-            // move the sprite to the center of the screen
-            this.bunny.position.x = 200;
-            this.bunny.position.y = 150;
-
-            // add it to the stage
-            this.stage.addChild(this.bunny);
-
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.bunny.rotation += 0.1;
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-}
-
-namespace basics {
-
-    export class Click {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private sprite: PIXI.Sprite;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            this.sprite = PIXI.Sprite.fromImage('../../_assets/basics/bunny.png');
-            this.sprite.position.set(230, 264);
-            this.sprite.interactive = true;
-            this.sprite.on('mousedown', this.onDown, this);
-            this.sprite.on('touchstart', this.onDown, this);
-
-            // add it to the stage
-            this.stage.addChild(this.sprite);
-
-            // start animatng
-            this.animate();
-
-        }
-
-        private onDown = (eventData: PIXI.interaction.InteractionData): void => {
-
-            this.sprite.scale.x += 0.3;
-            this.sprite.scale.y += 0.3;
-
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-}
-
-namespace basics {
-
-    export class Container {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private container: PIXI.Container;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            this.container = new PIXI.Container();
-
-            this.stage.addChild(this.container);
-
-            for (var j = 0; j < 5; j++) {
-
-                for (var i = 0; i < 5; i++) {
-
-                    var bunny: PIXI.Sprite = PIXI.Sprite.fromImage('../../_assets/basics/bunny.png');
-                    bunny.x = 40 * i;
-                    bunny.y = 40 * j;
-                    this.container.addChild(bunny);
-
-                }
-
-            }
-
-            /*
-             * All the bunnies are added to the container with the addChild method
-             * when you do this, all the bunnies become children of the container, and when a container moves,
-             * so do all its children.
-             * This gives you a lot of flexibility and makes it easier to position elements on the screen
-             */
-            this.container.x = 100;
-            this.container.y = 60;
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-}
-
-namespace basics {
-
-    export class CustomFilter {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private background: PIXI.Sprite;
-
-        private filter: CustomizedFilter;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            this.background = PIXI.Sprite.fromImage('../../_assets/bkg-grass.jpg');
-            this.background.scale.set(1.3, 1);
-            this.stage.addChild(this.background);
-
-
-            PIXI.loader.add('shader', '../../_assets/basics/shader.frag');
-            PIXI.loader.once('complete', this.onLoaded, this);
-            PIXI.loader.load();
-
-        }
-
-        private onLoaded(loader: PIXI.loaders.Loader, res: any) {
-
-            var fragmentSrc = res.shader.data;
-
-            this.filter = new CustomizedFilter(fragmentSrc);
-            this.background.filters = [this.filter];
-
-            this.animate();
-
-
-        }
-
-        private animate = (): void => {
-
-            this.filter.uniforms.customUniform.value += 0.04;
-
-            this.renderer.render(this.stage);
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-    export class CustomizedFilter extends PIXI.AbstractFilter {
-
-        constructor(fragmentSource: string | string[]) {
-            super(null, fragmentSource, {
-                customUniform: {
-                    type: '1f',
-                    value: 0
-                }
-            });
-        }
-
-    }
-
-}
-
-namespace basics {
-
-    export class Graphics {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private graphics: PIXI.Graphics;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-            this.stage.interactive = true;
-
-            this.graphics = new PIXI.Graphics();
-
-            // draw a shape
-            this.graphics.moveTo(50, 50);
-            this.graphics.lineTo(250, 50);
-            this.graphics.lineTo(100, 100);
-            this.graphics.lineTo(50, 50);
-            this.graphics.endFill();
-
-            // set a fill and a line style again and draw a rectangle
-            this.graphics.lineStyle(2, 0x0000FF, 1);
-            this.graphics.beginFill(0xFF700B, 1);
-            this.graphics.drawRect(50, 250, 120, 120);
-
-            // draw a rounded rectangle
-            this.graphics.lineStyle(2, 0xFF00FF, 1);
-            this.graphics.beginFill(0xFF00BB, 0.25);
-            this.graphics.drawRoundedRect(150, 450, 300, 100, 15);
-            this.graphics.endFill();
-
-            // draw a circle, set the lineStyle to zero so the circle doesn't have an outline
-            this.graphics.lineStyle(0);
-            this.graphics.beginFill(0xFFFF0B, 0.5);
-            this.graphics.drawCircle(470, 90, 60);
-            this.graphics.endFill();
-
-            this.stage.addChild(this.graphics);
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-}
-
-namespace basics {
-
-    export class RenderTexture {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private container: PIXI.Container;
-
-        private renderTexture: PIXI.RenderTexture;
-
-        private sprite: PIXI.Sprite;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            this.container = new PIXI.Container();
-
-            this.stage.addChild(this.container);
-
-            for (var j = 0; j < 5; j++) {
-
-                for (var i = 0; i < 5; i++) {
-
-                    var bunny: PIXI.Sprite = PIXI.Sprite.fromImage('../../_assets/basics/bunny.png');
-                    bunny.x = 40 * i;
-                    bunny.y = 40 * j;
-                    bunny.rotation = Math.random() * (Math.PI * 2);
-                    this.container.addChild(bunny);
-
-                }
-
-            }
-
-            this.renderTexture = new PIXI.RenderTexture(this.renderer, 300, 200, PIXI.SCALE_MODES.LINEAR, 0.1);
-
-            this.sprite = new PIXI.Sprite(this.renderTexture);
-            this.sprite.x = 450;
-            this.sprite.y = 60;
-            this.stage.addChild(this.sprite);
-
-            this.container.x = 100;
-            this.container.y = 60;
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            this.renderTexture.render(this.container);
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-}
-
-namespace basics {
-
-    export class SpriteSheet {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private movie: PIXI.extras.MovieClip;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            PIXI.loader.add('../../_assets/basics/fighter.json').load((loader: PIXI.loaders.Loader, object: any): void => {
-
-                // create an array of textures from an image path
-                var frames: PIXI.Texture[] = [];
-
-                for (var i = 0; i < 30; i++) {
-
-                    var val = i < 10 ? '0' + i : i;
-
-                    // magically works since the spritesheet was loaded with the pixi loader
-                    frames.push(PIXI.Texture.fromFrame('rollSequence00' + val + '.png'));
-                }
-
-
-                // create a MovieClip (brings back memories from the days of Flash, right ?)
-                this.movie = new PIXI.extras.MovieClip(frames);
-
-                /*
-                 * A MovieClip inherits all the properties of a PIXI sprite
-                 * so you can change its position, its anchor, mask it, etc
-                 */
-                this.movie.position.set(300);
-                this.movie.anchor.set(0.5);
-                this.movie.animationSpeed = 0.5;
-                this.movie.play();
-
-                this.stage.addChild(this.movie);
-
-                this.animate();
-
-            });
-
-        }
-
-        private animate = (): void => {
-
-            this.movie.rotation += 0.01;
-
-            // render the stage container
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-}
-
-namespace basics {
-
-    export class Text {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private basicText: PIXI.Text;
-
-        private richText: PIXI.Text;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            this.basicText = new PIXI.Text('Basic Text in Pixi');
-            this.basicText.x = 30;
-            this.basicText.y = 90;
-
-            this.stage.addChild(this.basicText);
-
-            var style: PIXI.TextStyle = {
-                font: '36px Arial bold italic',
-                fill: PIXI.utils.hex2string(0xF7EDCA),
-                stroke: '#4a1850',
-                strokeThickness: 5,
-                dropShadow: true,
-                dropShadowColor: '#000000',
-                dropShadowAngle: Math.PI / 6,
-                dropShadowDistance: 6,
-                wordWrap: true,
-                wordWrapWidth: 440
-            };
-
-            this.richText = new PIXI.Text('Rich Text with a lot of options and across multiple lines', style);
-            this.richText.x = 30;
-            this.richText.y = 180;
-
-            this.stage.addChild(this.richText);
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-}
-
-namespace basics {
-
-    export class TexturedMesh {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private strip: PIXI.mesh.Rope;
-
-        private graphics: PIXI.Graphics;
-
-        private count: number;
-
-        private points: PIXI.Point[];
-
-        private ropeLength: number;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            this.count = 0;
-
-            this.ropeLength = 918 / 20;
-            this.ropeLength = 45;
-
-            this.points = [];
-
-            for (var i = 0; i < 25; i++) {
-                this.points.push(new PIXI.Point(i * this.ropeLength, 0));
-            }
-
-            this.strip = new PIXI.mesh.Rope(PIXI.Texture.fromImage('../../_assets/snake.png'), this.points);
-            this.strip.position.x = -40;
-            this.strip.position.y = 300;
-            this.stage.addChild(this.strip);
-
-            this.graphics = new PIXI.Graphics();
-            this.graphics.x = this.strip.x;
-            this.graphics.y = this.strip.y;
-            this.stage.addChild(this.graphics);
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            this.count += 0.1;
-
-            // make the snake
-            for (var i = 0; i < this.points.length; i++) {
-
-                this.points[i].y = Math.sin((i * 0.5) + this.count) * 30;
-
-                this.points[i].x = i * this.ropeLength + Math.cos((i * 0.3) + this.count) * 20;
-
-            }
-
-            // render the stage
-            this.renderer.render(this.stage);
-
-            this.renderPoints();
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-        private renderPoints(): void {
-
-            this.graphics.clear();
-
-            this.graphics.lineStyle(2, 0xffc2c2);
-            this.graphics.moveTo(this.points[0].x, this.points[0].y);
-
-            for (var i = 1; i < this.points.length; i++) {
-                this.graphics.lineTo(this.points[i].x, this.points[i].y);
-            }
-
-            for (var i = 1; i < this.points.length; i++) {
-                this.graphics.beginFill(0xff0022);
-                this.graphics.drawCircle(this.points[i].x, this.points[i].y, 10);
-                this.graphics.endFill();
-            }
-
-        }
-
-    }
-
-}
-
-namespace basics {
-
-    export class TilingSprite {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private texture: PIXI.Texture;
-
-        private tilingSprite: PIXI.extras.TilingSprite;
-
-        private count: number;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            // create a texture from an image path
-            this.texture = PIXI.Texture.fromImage('../../_assets/p2.jpeg');
-
-            /* create a tiling sprite ...
-             * requires a texture, a width and a height
-             * in WebGL the image size should preferably be a power of two
-             */
-            this.tilingSprite = new PIXI.extras.TilingSprite(this.texture, this.renderer.width, this.renderer.height);
-            this.stage.addChild(this.tilingSprite);
-
-            this.count = 0;
-
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            this.count += 0.005;
-
-            this.tilingSprite.tileScale.x = 2 + Math.sin(this.count);
-            this.tilingSprite.tileScale.y = 2 + Math.cos(this.count);
-
-            this.tilingSprite.tilePosition.x += 1;
-            this.tilingSprite.tilePosition.y += 1;
-
-            // render the root container
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-}
-
-namespace basics {
-
-    export class Video {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private texture: PIXI.Texture;
-
-        private videoSprite: PIXI.Sprite;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            // create a video texture from a path
-            this.texture = PIXI.Texture.fromVideo('../../_assets/testVideo.mp4');
-
-            // create a new sprite using the video texture (yes it's that easy)
-            this.videoSprite = new PIXI.Sprite(this.texture);
-            this.videoSprite.width = this.renderer.width;
-            this.videoSprite.height = this.renderer.height;
-            this.stage.addChild(this.videoSprite);
-
-            this.stage.addChild(this.videoSprite);
-
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            // render the stage
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class AlphaMask {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private background: PIXI.Container;
-
-        private cells: PIXI.Sprite;
-
-        private mask: PIXI.Sprite;
-
-        private target: PIXI.Point;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-            this.stage.interactive = true;
-
-            this.background = PIXI.Sprite.fromImage('../../_assets/bkg.jpg');
-            this.stage.addChild(this.background);
-
-            this.cells = PIXI.Sprite.fromImage('../../_assets/cells.png');
-            this.cells.scale.set(1.5, 1.5);
-
-            this.mask = PIXI.Sprite.fromImage('../../_assets/flowerTop.png');
-            this.mask.anchor.set(0.5);
-            this.mask.position.x = 310;
-            this.mask.position.y = 190;
-
-            this.cells.mask = this.mask;
-
-            this.stage.addChild(this.mask);
-
-            this.stage.addChild(this.cells);
-
-            this.target = new PIXI.Point();
-
-            this.reset();
-
-            this.animate();
-
-        }
-
-        private reset(): void {
-
-            this.target.x = Math.floor(Math.random() * 550);
-            this.target.y = Math.floor(Math.random() * 300);
-
-        }
-
-        private animate = (): void => {
-
-            this.mask.position.x += (this.target.x - this.mask.x) * 0.1;
-            this.mask.position.y += (this.target.y - this.mask.y) * 0.1;
-
-            if (Math.abs(this.mask.x - this.target.x) < 1) {
-                this.reset();
-            }
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class Batch {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private sprites: PIXI.ParticleContainer;
-
-        private maggots: BatchDude[];
-
-        private tick: number;
-
-        private dudeBounds: PIXI.Rectangle;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            this.sprites = new PIXI.ParticleContainer(10000, {
-
-                scale: true,
-                position: true,
-                rotation: true,
-                uvs: true,
-                alpha: true
-
-            });
-            this.stage.addChild(this.sprites);
-
-            // create an array to store all the sprites
-            this.maggots = [];
-
-            var totalSprites = this.renderer instanceof PIXI.WebGLRenderer ? 10000 : 100;
-
-            for (var i = 0; i < totalSprites; i++) {
-
-                // create a new Sprite
-                var dude = new BatchDude(PIXI.Texture.fromImage('../../_assets/tinyMaggot.png'));
-
-                dude.tint = Math.random() * 0xE8D4CD;
-
-                // set the anchor point so the texture is centerd on the sprite
-                dude.anchor.set(0.5);
-
-                // different maggots, different sizes
-                dude.scale.set(0.8 + Math.random() * 0.3);
-
-                // scatter them all
-                dude.x = Math.random() * this.renderer.width;
-                dude.y = Math.random() * this.renderer.height;
-
-                dude.tint = Math.random() * 0x808080;
-
-                // create a random direction in radians
-                dude.direction = Math.random() * Math.PI * 2;
-
-                // this number will be used to modify the direction of the sprite over time
-                dude.turningSpeed = Math.random() - 0.8;
-
-                // create a random speed between 0 - 2, and these maggots are slooww
-                dude.speed = (2 + Math.random() * 2) * 0.2;
-
-                dude.offset = Math.random() * 100;
-
-                // finally we push the dude into the maggots array so it it can be easily accessed later
-                this.maggots.push(dude);
-
-                this.sprites.addChild(dude);
-
-            }
-
-            // create a bounding box box for the little maggots
-            var dudeBoundsPadding = 100;
-            this.dudeBounds = new PIXI.Rectangle(-dudeBoundsPadding,
-                -dudeBoundsPadding,
-                this.renderer.width + dudeBoundsPadding * 2,
-                this.renderer.height + dudeBoundsPadding * 2);
-
-            this.tick = 0;
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            // iterate through the sprites and update their position
-            for (const dude of this.maggots) {
-                dude.scale.y = 0.95 + Math.sin(this.tick + dude.offset) * 0.05;
-                dude.direction += dude.turningSpeed * 0.01;
-                dude.position.x += Math.sin(dude.direction) * (dude.speed * dude.scale.y);
-                dude.position.y += Math.cos(dude.direction) * (dude.speed * dude.scale.y);
-                dude.rotation = -dude.direction + Math.PI;
-
-                // wrap the maggots
-                if (dude.position.x < this.dudeBounds.x) {
-                    dude.position.x += this.dudeBounds.width;
-                } else if (dude.position.x > this.dudeBounds.x + this.dudeBounds.width) {
-                    dude.position.x -= this.dudeBounds.width;
-                }
-
-                if (dude.position.y < this.dudeBounds.y) {
-                    dude.position.y += this.dudeBounds.height;
-                } else if (dude.position.y > this.dudeBounds.y + this.dudeBounds.height) {
-                    dude.position.y -= this.dudeBounds.height;
-                }
-            }
-
-            // increment the ticker
-            this.tick += 0.1;
-
-            // time to render the stage !
-            this.renderer.render(this.stage);
-
-            // request another animation frame...
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-    export class BatchDude extends PIXI.Sprite {
-
-        direction: number;
-        speed: number;
-        turningSpeed: number;
-        offset: number;
-
-        constructor(texture: PIXI.Texture) {
-
-            super(texture);
-
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class BlendModes {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private background: PIXI.Sprite;
-
-        private dudeArray: BlendModesDude[];
-
-        private totalDudes: number;
-
-        private dudeBounds: PIXI.Rectangle;
-
-        private tick: number;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            // create a new background sprite
-            this.background = PIXI.Sprite.fromImage('../../_assets/BGrotate.jpg');
-            this.stage.addChild(this.background);
-
-            // create an array to store a reference to the dudes
-            this.dudeArray = [];
-
-            this.totalDudes = 20;
-
-            for (var i = 0; i < this.totalDudes; i++) {
-
-                // create a new Sprite that uses the image name that we just generated as its source
-                var dude = new BlendModesDude(PIXI.Texture.fromImage('../../_assets/flowerTop.png'));
-
-                dude.anchor.set(0.5);
-
-                // set a random scale for the dude
-                dude.scale.set(0.8 + Math.random() * 0.3);
-
-                // finally let's set the dude to be at a random position...
-                dude.position.x = Math.floor(Math.random() * this.renderer.width);
-                dude.position.y = Math.floor(Math.random() * this.renderer.height);
-
-                // The important bit of this example, this is how you change the default blend mode of the sprite
-                dude.blendMode = PIXI.BLEND_MODES.ADD;
-
-                // create some extra properties that will control movement
-                dude.direction = Math.random() * Math.PI * 2;
-
-                // this number will be used to modify the direction of the dude over time
-                dude.turningSpeed = Math.random() - 0.8;
-
-                // create a random speed for the dude between 0 - 2
-                dude.speed = 2 + Math.random() * 2;
-
-                // finally we push the dude into the dudeArray so it it can be easily accessed later
-                this.dudeArray.push(dude);
-
-                this.stage.addChild(dude);
-
-            }
-
-            // create a bounding box box for the little maggots
-            var dudeBoundsPadding = 100;
-            this.dudeBounds = new PIXI.Rectangle(-dudeBoundsPadding,
-                -dudeBoundsPadding,
-                this.renderer.width + dudeBoundsPadding * 2,
-                this.renderer.height + dudeBoundsPadding * 2);
-
-            this.tick = 0;
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            // iterate through the dudes and update the positions
-            for (const dude of this.dudeArray) {
-                dude.direction += dude.turningSpeed * 0.01;
-                dude.position.x += Math.sin(dude.direction) * dude.speed;
-                dude.position.y += Math.cos(dude.direction) * dude.speed;
-                dude.rotation = -dude.direction - Math.PI / 2;
-
-                // wrap the dudes by testing their bounds...
-                if (dude.position.x < this.dudeBounds.x) {
-                    dude.position.x += this.dudeBounds.width;
-                } else if (dude.position.x > this.dudeBounds.x + this.dudeBounds.width) {
-                    dude.position.x -= this.dudeBounds.width;
-                }
-
-                if (dude.position.y < this.dudeBounds.y) {
-                    dude.position.y += this.dudeBounds.height;
-                } else if (dude.position.y > this.dudeBounds.y + this.dudeBounds.height) {
-                    dude.position.y -= this.dudeBounds.height;
-                }
-            }
-
-            // increment the ticker
-            this.tick += 0.1;
-
-            // time to render the stage !
-            this.renderer.render(this.stage);
-
-            // request another animation frame...
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-    export class BlendModesDude extends PIXI.Sprite {
-
-        direction: number;
-        speed: number;
-        turningSpeed: number;
-        offset: number;
-
-        constructor(texture: PIXI.Texture) {
-
-            super(texture);
-
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class CacheAsBitmap {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private aliens: PIXI.Sprite[];
-
-        private alienContainer: PIXI.Container;
-
-        private count: number;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            // load resources
-            PIXI.loader
-                .add('spritesheet', '../../_assets/monsters.json')
-                .load(this.onAssetsLoaded);
-
-            // holder to store aliens
-            this.aliens = [];
-
-            this.count = 0;
-
-            // create an empty container
-            this.alienContainer = new PIXI.Container();
-            this.alienContainer.position.x = 400;
-            this.alienContainer.position.y = 300;
-
-            // make the stage interactive
-            this.stage.interactive = true;
-
-            this.stage.addChild(this.alienContainer);
-
-            this.stage.on('click', this.onClick);
-            this.stage.on('tap', this.onClick);
-
-        }
-
-        private onClick = (event: PIXI.interaction.InteractionEvent): void => {
-
-            this.alienContainer.cacheAsBitmap = !this.alienContainer.cacheAsBitmap;
-
-            // feel free to play with what's below
-            // var sprite = new PIXI.Sprite(this.alienContainer.generateTexture());
-            // this.stage.addChild(sprite);
-            // sprite.position.x = Math.random() * 800;
-            // sprite.position.y = Math.random() * 600;
-
-        }
-
-        private onAssetsLoaded = (): void => {
-
-            // add a bunch of aliens with textures from image paths
-
-            var alienFrames = ['eggHead.png', 'flowerTop.png', 'helmlok.png', 'skully.png'];
-
-            for (var i = 0; i < 100; i++) {
-
-                var frameName = alienFrames[i % 4];
-
-                // create an alien using the frame name..
-                var alien = PIXI.Sprite.fromFrame(frameName);
-                alien.tint = Math.random() * 0xFFFFFF;
-
-                /*
-                 * fun fact for the day :)
-                 * another way of doing the above would be
-                 * var texture = PIXI.Texture.fromFrame(frameName);
-                 * var alien = new PIXI.Sprite(texture);
-                 */
-                alien.position.x = Math.random() * 800 - 400;
-                alien.position.y = Math.random() * 600 - 300;
-                alien.anchor.x = 0.5;
-                alien.anchor.y = 0.5;
-                this.aliens.push(alien);
-                this.alienContainer.addChild(alien);
-
-            }
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            // let's rotate the aliens a little bit
-            for (var i = 0; i < 100; i++) {
-                var alien = this.aliens[i];
-                alien.rotation += 0.1;
-            }
-
-            this.count += 0.01;
-
-            this.alienContainer.scale.x = Math.sin(this.count);
-            this.alienContainer.scale.y = Math.sin(this.count);
-
-            this.alienContainer.rotation += 0.01;
-
-            // render the stage
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class DraggableBunny extends PIXI.Sprite {
-
-        // todo I dont know what event.data is at this time
-        private data: any;
-
-        private dragging: boolean;
-
-        constructor(texture?: PIXI.Texture) {
-
-            super(texture);
-
-            // enable the bunny to be interactive... this will allow it to respond to mouse and touch events
-            this.interactive = true;
-
-            // this button mode will mean the hand cursor appears when you roll over the bunny with your mouse
-            this.buttonMode = true;
-
-            // center the bunny's anchor point
-            this.anchor.set(0.5);
-
-            // make it a bit bigger, so it's easier to grab
-            this.scale.set(3);
-
-            // setup events
-            this
-            // events for drag start
-                .on('mousedown', this.onDragStart)
-                .on('touchstart', this.onDragStart)
-            // events for drag end
-                .on('mouseup', this.onDragEnd)
-                .on('mouseupoutside', this.onDragEnd)
-                .on('touchend', this.onDragEnd)
-                .on('touchendoutside', this.onDragEnd)
-            // events for drag move
-                .on('mousemove', this.onDragMove)
-                .on('touchmove', this.onDragMove);
-
-        }
-
-        private onDragStart = (event: PIXI.interaction.InteractionEvent): void => {
-
-            // store a reference to the data
-            // the reason for this is because of multitouch
-            // we want to track the movement of this particular touch
-            this.data = event.data;
-            this.alpha = 0.5;
-            this.dragging = true;
-
-        }
-
-        private onDragEnd = (event: PIXI.interaction.InteractionEvent): void => {
-
-            // set interactiondata to null
-            this.data = null;
-            this.alpha = 1;
-            this.dragging = false;
-
-        }
-
-        private onDragMove = (event: PIXI.interaction.InteractionEvent): void => {
-
-            if (this.dragging) {
-                var newPosition = this.data.getLocalPosition(this.parent);
-                this.position.x = newPosition.x;
-                this.position.y = newPosition.y;
-            }
-
-        }
-
-    }
-
-    export class Dragging {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private texture: PIXI.Texture;
-
-        private data: PIXI.interaction.InteractionData;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            // create a texture from an image
-            this.texture = PIXI.Texture.fromImage('../../_assets/bunny.png');
-
-            for (var i = 0; i < 10; i++) {
-                this.createBunny(Math.floor(Math.random() * 800), Math.floor(Math.random() * 600));
-            }
-
-            // start animating
-            this.animate();
-
-        }
-
-        private createBunny(x: number, y: number): void {
-
-            // create our little bunny friend..
-            var bunny = new DraggableBunny(this.texture);
-
-            // move the sprite to its designated position
-            bunny.position.x = x;
-            bunny.position.y = y;
-
-            // add it to the stage
-            this.stage.addChild(bunny);
-
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class GraphicsDemo {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private thing: PIXI.Graphics;
-
-        private graphics: PIXI.Graphics;
-
-        private count: number;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-            this.stage.interactive = true;
-
-            this.graphics = new PIXI.Graphics();
-
-            // set a fill and line style
-            this.graphics.beginFill(0xFF3300);
-            this.graphics.lineStyle(10, 0xffd900, 1);
-
-            // draw a shape
-            this.graphics.moveTo(50, 50);
-            this.graphics.lineTo(250, 50);
-            this.graphics.lineTo(100, 100);
-            this.graphics.lineTo(250, 220);
-            this.graphics.lineTo(50, 220);
-            this.graphics.lineTo(50, 50);
-            this.graphics.endFill();
-
-            // set a fill and line style again
-            this.graphics.lineStyle(10, 0xFF0000, 0.8);
-            this.graphics.beginFill(0xFF700B, 1);
-
-            // draw a second shape
-            this.graphics.moveTo(210, 300);
-            this.graphics.lineTo(450, 320);
-            this.graphics.lineTo(570, 350);
-            this.graphics.quadraticCurveTo(600, 0, 480, 100);
-            this.graphics.lineTo(330, 120);
-            this.graphics.lineTo(410, 200);
-            this.graphics.lineTo(210, 300);
-            this.graphics.endFill();
-
-            // draw a rectangle
-            this.graphics.lineStyle(2, 0x0000FF, 1);
-            this.graphics.drawRect(50, 250, 100, 100);
-
-            // draw a circle
-            this.graphics.lineStyle(0);
-            this.graphics.beginFill(0xFFFF0B, 0.5);
-            this.graphics.drawCircle(470, 200, 100);
-            this.graphics.endFill();
-
-            this.graphics.lineStyle(20, 0x33FF00);
-            this.graphics.moveTo(30, 30);
-            this.graphics.lineTo(600, 300);
-
-            this.stage.addChild(this.graphics);
-
-            // let's create a moving shape
-            this.thing = new PIXI.Graphics();
-            this.stage.addChild(this.thing);
-            this.thing.position.x = 620 / 2;
-            this.thing.position.y = 380 / 2;
-
-            this.count = 0;
-
-            // Just click on the stage to draw random lines
-            this.stage.on('click', this.onClick);
-            this.stage.on('tap', this.onClick);
-
-            // start animating
-            this.animate();
-
-        }
-
-        private onClick = (event: PIXI.interaction.InteractionEvent): void => {
-
-            this.graphics.lineStyle(Math.random() * 30, Math.random() * 0xFFFFFF, 1);
-            this.graphics.moveTo(Math.random() * 620, Math.random() * 380);
-            this.graphics.bezierCurveTo(Math.random() * 620, Math.random() * 380,
-                Math.random() * 620, Math.random() * 380,
-                Math.random() * 620, Math.random() * 380);
-        }
-
-        private animate = (): void => {
-
-            this.thing.clear();
-
-            this.count += 0.1;
-
-            this.thing.clear();
-            this.thing.lineStyle(10, 0xff0000, 1);
-            this.thing.beginFill(0xffFF00, 0.5);
-
-            this.thing.moveTo(-120 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
-            this.thing.lineTo(120 + Math.cos(this.count) * 20, -100 + Math.sin(this.count) * 20);
-            this.thing.lineTo(120 + Math.sin(this.count) * 20, 100 + Math.cos(this.count) * 20);
-            this.thing.lineTo(-120 + Math.cos(this.count) * 20, 100 + Math.sin(this.count) * 20);
-            this.thing.lineTo(-120 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
-
-            this.thing.rotation = this.count * 0.1;
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class Interactivity {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private background: PIXI.Sprite;
-
-        private buttons: InteractivityButton[];
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            // create a background...
-            this.background = PIXI.Sprite.fromImage('../../_assets/button_test_BG.jpg');
-            this.background.width = this.renderer.width;
-            this.background.height = this.renderer.height;
-
-            // add background to stage...
-            this.stage.addChild(this.background);
-
-            this.buttons = [];
-
-            var buttonPositions = [
-                175, 75,
-                655, 75,
-                410, 325,
-                150, 465,
-                685, 445
-            ];
-
-            function noop(): void {
-                console.log('click');
-            }
-
-            // create some textures from an image path
-            var textureButton = PIXI.Texture.fromImage('../../_assets/button.png');
-            var textureButtonDown = PIXI.Texture.fromImage('../../_assets/buttonDown.png');
-            var textureButtonOver = PIXI.Texture.fromImage('../../_assets/buttonOver.png');
-
-            for (var i = 0; i < 5; i++) {
-
-                var button = new InteractivityButton(textureButton, textureButtonDown, textureButtonOver);
-
-                button.position.x = buttonPositions[i * 2];
-                button.position.y = buttonPositions[i * 2 + 1];
-
-                button.tap = noop;
-                button.click = noop;
-
-                // add it to the stage
-                this.stage.addChild(button);
-
-                // add button to array
-                this.buttons.push(button);
-
-            }
-
-            // set some silly values...
-            this.buttons[0].scale.set(1.2);
-
-            this.buttons[2].rotation = Math.PI / 10;
-
-            this.buttons[3].scale.set(0.8);
-
-            this.buttons[4].scale.set(0.8, 1.2);
-            this.buttons[4].rotation = Math.PI;
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-    export class InteractivityButton extends PIXI.Sprite {
-
-        private textureButton: PIXI.Texture;
-        private textureButtonDown: PIXI.Texture;
-        private textureButtonOver: PIXI.Texture;
-
-        tap: Function;
-        click: Function;
-
-        isdown: boolean;
-        isOver: boolean;
-
-        constructor(textureButton: PIXI.Texture, textureButtonDown: PIXI.Texture, textureButtonOver: PIXI.Texture) {
-
-            super(textureButton);
-
-            // create some textures from an image path
-            this.textureButton = textureButton;
-            this.textureButtonDown = textureButtonDown;
-            this.textureButtonOver = textureButtonOver;
-
-            this.buttonMode = true;
-            this.anchor.set(0.5);
-
-            // make the button interactive...
-            this.interactive = true;
-
-            this
-            // set the mousedown and touchstart callback...
-                .on('mousedown', this.onButtonDown)
-                .on('touchstart', this.onButtonDown)
-
-            // set the mouseup and touchend callback...
-                .on('mouseup', this.onButtonUp)
-                .on('touchend', this.onButtonUp)
-                .on('mouseupoutside', this.onButtonUp)
-                .on('touchendoutside', this.onButtonUp)
-
-            // set the mouseover callback...
-                .on('mouseover', this.onButtonOver)
-
-            // set the mouseout callback...
-                .on('mouseout', this.onButtonOut);
-
-            // you can also listen to click and tap events :
-            // .on('click', this.noop)
-
-        }
-
-        private onButtonDown = (event: PIXI.interaction.InteractionEvent): void => {
-
-            this.isdown = true;
-            this.texture = this.textureButtonDown;
-            this.alpha = 1;
-
-        }
-
-        private onButtonUp = (event: PIXI.interaction.InteractionEvent): void => {
-
-            this.isdown = false;
-
-            if (this.isOver) {
-                this.texture = this.textureButtonOver;
-            } else {
-                this.texture = this.textureButton;
-            }
-        }
-
-        private onButtonOver = (event: PIXI.interaction.InteractionEvent): void => {
-
-            this.isOver = true;
-
-            if (this.isdown) {
-                return;
-            }
-
-            this.texture = this.textureButtonOver;
-
-        }
-
-        private onButtonOut = (event: PIXI.interaction.InteractionEvent): void => {
-
-            this.isOver = false;
-
-            if (this.isdown) {
-                return;
-            }
-
-            this.texture = this.textureButton;
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class Masking {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private bg: PIXI.Sprite;
-
-        private container: PIXI.Container;
-
-        private bgFront: PIXI.Sprite;
-
-        private light1: PIXI.Sprite;
-
-        private light2: PIXI.Sprite;
-
-        private panda: PIXI.Sprite;
-
-        private thing: PIXI.Graphics;
-
-        private count: number;
-
-        private help: PIXI.Text;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb, antialias: true });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-            this.stage.interactive = true;
-
-            this.bg = PIXI.Sprite.fromImage('../../_assets/BGrotate.jpg');
-            this.bg.anchor.x = 0.5;
-            this.bg.anchor.y = 0.5;
-
-            this.bg.position.x = this.renderer.width / 2;
-            this.bg.position.y = this.renderer.height / 2;
-
-            this.stage.addChild(this.bg);
-
-            this.container = new PIXI.Container();
-            this.container.position.x = this.renderer.width / 2;
-            this.container.position.y = this.renderer.height / 2;
-
-            // add a bunch of sprites
-
-            this.bgFront = PIXI.Sprite.fromImage('../../_assets/SceneRotate.jpg');
-            this.bgFront.anchor.x = 0.5;
-            this.bgFront.anchor.y = 0.5;
-
-            this.container.addChild(this.bgFront);
-
-            this.light2 = PIXI.Sprite.fromImage('../../_assets/LightRotate2.png');
-            this.light2.anchor.x = 0.5;
-            this.light2.anchor.y = 0.5;
-            this.container.addChild(this.light2);
-
-            this.light1 = PIXI.Sprite.fromImage('../../_assets/LightRotate1.png');
-            this.light1.anchor.x = 0.5;
-            this.light1.anchor.y = 0.5;
-            this.container.addChild(this.light1);
-
-            this.panda = PIXI.Sprite.fromImage('../../_assets/panda.png');
-            this.panda.anchor.x = 0.5;
-            this.panda.anchor.y = 0.5;
-
-            this.container.addChild(this.panda);
-
-            this.stage.addChild(this.container);
-
-            // let's create a moving shape
-            this.thing = new PIXI.Graphics();
-            this.stage.addChild(this.thing);
-            this.thing.position.x = this.renderer.width / 2;
-            this.thing.position.y = this.renderer.height / 2;
-            this.thing.lineStyle(0);
-
-            this.container.mask = this.thing;
-
-            this.count = 0;
-
-            this.stage.on('click', this.onClick);
-            this.stage.on('tap', this.onClick);
-
-            this.help = new PIXI.Text('Click to turn masking on / off.', { font: 'bold 12pt Arial', fill: 'white' });
-            this.help.position.y = this.renderer.height - 26;
-            this.help.position.x = 10;
-            this.stage.addChild(this.help);
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            this.bg.rotation += 0.01;
-            this.bgFront.rotation -= 0.01;
-
-            this.light1.rotation += 0.02;
-            this.light2.rotation += 0.01;
-
-            this.panda.scale.x = 1 + Math.sin(this.count) * 0.04;
-            this.panda.scale.y = 1 + Math.cos(this.count) * 0.04;
-
-            this.count += 0.1;
-
-            this.thing.clear();
-
-            this.thing.beginFill(0x8bc5ff, 0.4);
-            this.thing.moveTo(-120 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
-            this.thing.lineTo(-320 + Math.cos(this.count) * 20, 100 + Math.sin(this.count) * 20);
-            this.thing.lineTo(120 + Math.cos(this.count) * 20, -100 + Math.sin(this.count) * 20);
-            this.thing.lineTo(120 + Math.sin(this.count) * 20, 100 + Math.cos(this.count) * 20);
-            this.thing.lineTo(-120 + Math.cos(this.count) * 20, 100 + Math.sin(this.count) * 20);
-            this.thing.lineTo(-120 + Math.sin(this.count) * 20, -300 + Math.cos(this.count) * 20);
-            this.thing.lineTo(-320 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
-            this.thing.rotation = this.count * 0.1;
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-        private onClick = (event: PIXI.interaction.InteractionEvent): void => {
-
-            if (!this.container.mask) {
-                this.container.mask = this.thing;
-            } else {
-                this.container.mask = null;
-            }
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class MovieClipDemo {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            PIXI.loader
-                .add('spritesheet', '../../_assets/mc.json')
-                .load(this.onAssetsLoaded);
-
-            // start animating
-            this.animate();
-
-        }
-
-        private onAssetsLoaded = (loader: PIXI.loaders.Loader): void => {
-
-            // create an array to store the textures
-            var explosionTextures: PIXI.Texture[] = [];
-            var i: number;
-
-            for (i = 0; i < 26; i++) {
-
-                var texture = PIXI.Texture.fromFrame('Explosion_Sequence_A ' + (i + 1) + '.png');
-                explosionTextures.push(texture);
-
-            }
-
-            for (i = 0; i < 50; i++) {
-
-                // create an explosion MovieClip
-                var explosion = new PIXI.extras.MovieClip(explosionTextures);
-
-                explosion.position.x = Math.random() * 800;
-                explosion.position.y = Math.random() * 600;
-                explosion.anchor.x = 0.5;
-                explosion.anchor.y = 0.5;
-
-                explosion.rotation = Math.random() * Math.PI;
-
-                explosion.scale.set(0.75 + Math.random() * 0.5);
-
-                explosion.gotoAndPlay(Math.random() * 27);
-
-                this.stage.addChild(explosion);
-
-            }
-
-            // start animating
-            this.animate();
-        }
-
-        private animate = (): void => {
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class RenderTextureDemo {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private renderTexture: PIXI.RenderTexture;
-        private renderTexture2: PIXI.RenderTexture;
-        private currentTexture: PIXI.RenderTexture;
-
-        private outputSprite: PIXI.Sprite;
-        private stuffContainer: PIXI.Container;
-        private items: PIXI.Sprite[];
-
-        private count: number;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            // create two render textures... these dynamic textures will be used to draw the scene into itself
-            this.renderTexture = new PIXI.RenderTexture(this.renderer, this.renderer.width, this.renderer.height);
-            this.renderTexture2 = new PIXI.RenderTexture(this.renderer, this.renderer.width, this.renderer.height);
-            this.currentTexture = this.renderTexture;
-
-            // create a new sprite that uses the render texture we created above
-            this.outputSprite = new PIXI.Sprite(this.currentTexture);
-
-            // align the sprite
-            this.outputSprite.position.x = 400;
-            this.outputSprite.position.y = 300;
-            this.outputSprite.anchor.set(0.5);
-
-            // add to stage
-            this.stage.addChild(this.outputSprite);
-
-            this.stuffContainer = new PIXI.Container();
-
-            this.stuffContainer.position.x = 400;
-            this.stuffContainer.position.y = 300;
-
-            this.stage.addChild(this.stuffContainer);
-
-            // create an array of image ids..
-            var fruits = [
-                '../../_assets/spinObj_01.png',
-                '../../_assets/spinObj_02.png',
-                '../../_assets/spinObj_03.png',
-                '../../_assets/spinObj_04.png',
-                '../../_assets/spinObj_05.png',
-                '../../_assets/spinObj_06.png',
-                '../../_assets/spinObj_07.png',
-                '../../_assets/spinObj_08.png'
-            ];
-
-            // create an array of items
-            this.items = [];
-
-            // now create some items and randomly position them in the stuff container
-            for (var i = 0; i < 20; i++) {
-
-                var item = PIXI.Sprite.fromImage(fruits[i % fruits.length]);
-                item.position.x = Math.random() * 400 - 200;
-                item.position.y = Math.random() * 400 - 200;
-
-                item.anchor.set(0.5);
-
-                this.stuffContainer.addChild(item);
-
-                this.items.push(item);
-
-            }
-
-            // used for spinning!
-            this.count = 0;
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            for (const item of this.items) {
-                // rotate each item
-                item.rotation += 0.1;
-            }
-
-            this.count += 0.01;
-
-            // swap the buffers ...
-            var temp = this.renderTexture;
-            this.renderTexture = this.renderTexture2;
-            this.renderTexture2 = temp;
-
-            // set the new texture
-            this.outputSprite.texture = this.renderTexture;
-
-            // twist this up!
-            this.stuffContainer.rotation -= 0.01;
-            this.outputSprite.scale.set(1 + Math.sin(this.count) * 0.2);
-
-            // render the stage to the texture
-            // the 'true' clears the texture before the content is rendered
-            this.renderTexture2.render(this.stage, null, false);
-
-            // and finally render the stage
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class StripDemo {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private count: number;
-
-        private points: PIXI.Point[];
-
-        private strip: PIXI.mesh.Rope;
-
-        private snakeContainer: PIXI.Container;
-
-        private ropeLength: number;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            this.count = 0;
-
-            // build a rope!
-            this.ropeLength = 918 / 20;
-
-            this.points = [];
-
-            for (var i = 0; i < 20; i++) {
-                this.points.push(new PIXI.Point(i * this.ropeLength, 0));
-            }
-
-            this.strip = new PIXI.mesh.Rope(PIXI.Texture.fromImage('../../_assets/snake.png'), this.points);
-            this.strip.x = -459;
-
-            this.snakeContainer = new PIXI.Container();
-            this.snakeContainer.position.x = 400;
-            this.snakeContainer.position.y = 300;
-
-            this.snakeContainer.scale.set(800 / 1100);
-            this.stage.addChild(this.snakeContainer);
-
-            this.snakeContainer.addChild(this.strip);
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            this.count += 0.1;
-
-            // make the snake
-            for (var i = 0; i < this.points.length; i++) {
-
-                this.points[i].y = Math.sin((i * 0.5) + this.count) * 30;
-
-                this.points[i].x = i * this.ropeLength + Math.cos((i * 0.3) + this.count) * 20;
-
-            }
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class TextDemo {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private bitmapFontText: PIXI.extras.BitmapText;
-
-        private background: PIXI.Sprite;
-
-        private textSample: PIXI.Text;
-
-        private spinningText: PIXI.Text;
-
-        private countingText: PIXI.Text;
-
-        private count: number;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            PIXI.loader
-                .add('desyrel', '../../_assets/desyrel.xml')
-                .load(this.onAssetsLoaded);
-
-            // start animating
-            this.animate();
-
-        }
-
-        private onAssetsLoaded = (): void  => {
-
-            this.bitmapFontText = new PIXI.extras.BitmapText('bitmap fonts are\n now supported!', { font: '35px Desyrel', align: 'right' });
-
-            this.bitmapFontText.position.x = 600 - this.bitmapFontText.textWidth;
-            this.bitmapFontText.position.y = 20;
-
-            this.stage.addChild(this.bitmapFontText);
-
-            // add a shiny background...
-            this.background = PIXI.Sprite.fromImage('../../_assets/textDemoBG.jpg');
-            this.stage.addChild(this.background);
-
-            // create some white text using the Snippet webfont
-            this.textSample = new PIXI.Text('Pixi.js can has\n multiline text!', { font: '35px Snippet', fill: 'white', align: 'left' });
-            this.textSample.position.set(20);
-
-            // create a text object with a nice stroke
-            this.spinningText = new PIXI.Text('I\'m fun!', { font: 'bold 60px Arial', fill: '#cc00ff', align: 'center', stroke: '#FFFFFF', strokeThickness: 6 });
-
-            // setting the anchor point to 0.5 will center align the text... great for spinning!
-            this.spinningText.anchor.set(0.5);
-            this.spinningText.position.x = 310;
-            this.spinningText.position.y = 200;
-
-            // create a text object that will be updated...
-            this.countingText = new PIXI.Text('COUNT 4EVAR: 0', { font: 'bold italic 60px Arvo', fill: '#3e1707', align: 'center', stroke: '#a4410e', strokeThickness: 7 });
-
-            this.countingText.position.x = 310;
-            this.countingText.position.y = 320;
-            this.countingText.anchor.x = 0.5;
-
-            this.stage.addChild(this.textSample);
-            this.stage.addChild(this.spinningText);
-            this.stage.addChild(this.countingText);
-
-            this.count = 0;
-
-        }
-
-        private animate = (): void => {
-
-
-            this.renderer.render(this.stage);
-
-            this.count += 0.05;
-
-            // update the text with a new string
-            this.countingText.text = 'COUNT 4EVAR: ' + Math.floor(this.count);
-
-            // let's spin the spinning text
-            this.spinningText.rotation += 0.03;
-
-            requestAnimationFrame(this.animate);
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class TextureSwap {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private bol: boolean;
-
-        private texture: PIXI.Texture;
-        private secondTexture: PIXI.Texture;
-
-        private dude: PIXI.Sprite;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            this.bol = false;
-
-            // an image path
-            this.texture = PIXI.Texture.fromImage('../../_assets/flowerTop.png');
-
-            // create a second texture
-            this.secondTexture = PIXI.Texture.fromImage('../../_assets/eggHead.png');
-
-            // create a new Sprite using the texture
-            this.dude = new PIXI.Sprite(this.texture);
-
-            // center the sprites anchor point
-            this.dude.anchor.set(0.5);
-
-            // move the sprite to the center of the screen
-            this.dude.position.x = this.renderer.width / 2;
-            this.dude.position.y = this.renderer.height / 2;
-
-            this.stage.addChild(this.dude);
-
-            // make the sprite interactive
-            this.dude.interactive = true;
-
-            this.dude.on('click', (): void => {
-                this.bol = !this.bol;
-
-                if (this.bol) {
-                    this.dude.texture = this.secondTexture;
-                } else {
-                    this.dude.texture = this.texture;
-                }
-            });
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            // just for fun, let's rotate mr rabbit a little
-            this.dude.rotation += 0.1;
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class Tinting {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private totalDudes: number = 10;
-        private aliens: TintingDude[];
-
-        private dudeBounds: PIXI.Rectangle;
-
-        private tick: number;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            // holder to store the aliens
-            this.aliens = [];
-
-            this.tick = 0;
-
-            for (var i = 0; i < this.totalDudes; i++) {
-
-                // create a new Sprite that uses the image name that we just generated as its source
-                var dude = new TintingDude();
-
-                // set the anchor point so the texture is centerd on the sprite
-                dude.anchor.set(0.5);
-
-                // set a random scale for the dude - no point them all being the same size!
-                dude.scale.set(0.8 + Math.random() * 0.3);
-
-                // finally lets set the dude to be at a random position..
-                dude.position.x = Math.random() * this.renderer.width;
-                dude.position.y = Math.random() * this.renderer.height;
-
-                dude.tint = Math.random() * 0xFFFFFF;
-
-                // create some extra properties that will control movement :
-                // create a random direction in radians. This is a number between 0 and PI*2 which is the equivalent of 0 - 360 degrees
-                dude.direction = Math.random() * Math.PI * 2;
-
-                // this number will be used to modify the direction of the dude over time
-                dude.turningSpeed = Math.random() - 0.8;
-
-                // create a random speed for the dude between 0 - 2
-                dude.speed = 2 + Math.random() * 2;
-
-                // finally we push the dude into the aliens array so it it can be easily accessed later
-                this.aliens.push(dude);
-
-                this.stage.addChild(dude);
-
-            }
-
-            // create a bounding box for the little dudes
-            var dudeBoundsPadding = 100;
-            this.dudeBounds = new PIXI.Rectangle(-dudeBoundsPadding,
-                -dudeBoundsPadding,
-                this.renderer.width + dudeBoundsPadding * 2,
-                this.renderer.height + dudeBoundsPadding * 2);
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            // iterate through the dudes and update their position
-            for (const dude of this.aliens) {
-                dude.direction += dude.turningSpeed * 0.01;
-                dude.position.x += Math.sin(dude.direction) * dude.speed;
-                dude.position.y += Math.cos(dude.direction) * dude.speed;
-                dude.rotation = -dude.direction - Math.PI / 2;
-
-                // wrap the dudes by testing their bounds...
-                if (dude.position.x < this.dudeBounds.x) {
-                    dude.position.x += this.dudeBounds.width;
-                } else if (dude.position.x > this.dudeBounds.x + this.dudeBounds.width) {
-                    dude.position.x -= this.dudeBounds.width;
-                }
-
-                if (dude.position.y < this.dudeBounds.y) {
-                    dude.position.y += this.dudeBounds.height;
-                } else if (dude.position.y > this.dudeBounds.y + this.dudeBounds.height) {
-                    dude.position.y -= this.dudeBounds.height;
-                }
-
-            }
-
-            // increment the ticker
-            this.tick += 0.1;
-
-            requestAnimationFrame(this.animate);
-
-            this.renderer.render(this.stage);
-
-        }
-
-    }
-
-    export class TintingDude extends PIXI.Sprite {
-
-        direction: number;
-        speed: number;
-        turningSpeed: number;
-
-        constructor() {
-            super(PIXI.Texture.fromImage('../../_assets/eggHead.png'));
-        }
-
-    }
-
-}
-
-namespace demos {
-
-    export class TransparentBackground {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private bunny: PIXI.Sprite;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb, transparent: true });
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            // create a new Sprite from an image path.
-            this.bunny = PIXI.Sprite.fromImage('../../_assets/bunny.png');
-
-            // center the sprite's anchor point
-            this.bunny.anchor.set(0.5);
-
-            // move the sprite to the center of the screen
-            this.bunny.position.x = 200;
-            this.bunny.position.y = 150;
-
-            this.stage.addChild(this.bunny);
-
-            // start animating
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            // just for fun, let's rotate mr rabbit a little
-            this.bunny.rotation += 0.1;
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-}
-
-namespace filters {
-
-    export class Blur {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private bg: PIXI.Sprite;
-
-        private littleDudes: PIXI.Sprite;
-        private littleRobot: PIXI.Sprite;
-
-        private blurFilter1: PIXI.filters.BlurFilter;
-        private blurFilter2: PIXI.filters.BlurFilter;
-
-        private count: number;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600);
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-
-            this.bg = PIXI.Sprite.fromImage('../../_assets/depth_blur_BG.jpg');
-            this.bg.width = this.renderer.width;
-            this.bg.height = this.renderer.height;
-            this.stage.addChild(this.bg);
-
-            this.littleDudes = PIXI.Sprite.fromImage('../../_assets/depth_blur_dudes.jpg');
-            this.littleDudes.position.x = (this.renderer.width / 2) - 315;
-            this.littleDudes.position.y = 200;
-            this.stage.addChild(this.littleDudes);
-
-            this.littleRobot = PIXI.Sprite.fromImage('../../_assets/depth_blur_moby.jpg');
-            this.littleRobot.position.x = (this.renderer.width / 2) - 200;
-            this.littleRobot.position.y = 100;
-            this.stage.addChild(this.littleRobot);
-
-            this.blurFilter1 = new PIXI.filters.BlurFilter();
-            this.blurFilter2 = new PIXI.filters.BlurFilter();
-
-            this.littleDudes.filters = [this.blurFilter1];
-            this.littleRobot.filters = [this.blurFilter2];
-
-            this.count = 0;
-
-            // nimate
-            this.animate();
-
-        }
-
-        private animate = (): void => {
-
-            this.count += 0.005;
-
-            var blurAmount = Math.cos(this.count);
-            var blurAmount2 = Math.sin(this.count);
-
-            this.blurFilter1.blur = 20 * (blurAmount);
-            this.blurFilter2.blur = 20 * (blurAmount2);
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-}
-
-namespace filters {
-
-    export class DisplacementMap {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private container: PIXI.Container;
-
-        private padding: number;
-
-        private bounds: PIXI.Rectangle;
-
-        private maggots: DisplacementMapDude[];
-
-        private displacementSprite: PIXI.Sprite;
-
-        private displacementFilter: PIXI.filters.DisplacementFilter;
-
-        private ring: PIXI.Sprite;
-
-        private bg: PIXI.Sprite;
-
-        private count: number;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600);
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-            this.stage.interactive = true;
-
-            this.container = new PIXI.Container();
-            this.stage.addChild(this.container);
-
-            this.padding = 100;
-
-            this.bounds = new PIXI.Rectangle(-this.padding, -this.padding, this.renderer.width + this.padding * 2, this.renderer.height + this.padding * 2);
-            this.maggots = [];
-
-            for (var i = 0; i < 20; i++) {
-
-                var maggot = new DisplacementMapDude();
-                maggot.anchor.set(0.5);
-                this.container.addChild(maggot);
-
-                maggot.direction = Math.random() * Math.PI * 2;
-                maggot.speed = 1;
-                maggot.turnSpeed = Math.random() - 0.8;
-
-                maggot.position.x = Math.random() * this.bounds.width;
-                maggot.position.y = Math.random() * this.bounds.height;
-
-                maggot.scale.set(1 + Math.random() * 0.3);
-                maggot.original = maggot.scale.clone();
-                this.maggots.push(maggot);
-
-            }
-
-            this.displacementSprite = PIXI.Sprite.fromImage('../../_assets/displace.png');
-            this.displacementFilter = new PIXI.filters.DisplacementFilter(this.displacementSprite);
-
-            this.stage.addChild(this.displacementSprite);
-
-            this.container.filters = [this.displacementFilter];
-
-            this.displacementFilter.scale.x = 110;
-            this.displacementFilter.scale.y = 110;
-
-            this.ring = PIXI.Sprite.fromImage('../../_assets/ring.png');
-
-            this.ring.anchor.set(0.5);
-
-            this.ring.visible = false;
-
-            this.stage.addChild(this.ring);
-
-            this.bg = PIXI.Sprite.fromImage('../../_assets/bkg-grass.jpg');
-            this.bg.width = this.renderer.width;
-            this.bg.height = this.renderer.height;
-
-            this.bg.alpha = 0.4;
-
-            this.container.addChild(this.bg);
-
-            this.stage
-                .on('mousemove', this.onPointerMove)
-                .on('touchmove', this.onPointerMove);
-
-            this.count = 0;
-
-            this.animate();
-
-        }
-
-        private onPointerMove = (eventData: PIXI.interaction.InteractionEvent): void => {
-
-            this.ring.visible = true;
-
-            this.displacementSprite.x = eventData.data.global.x - 100;
-            this.displacementSprite.y = eventData.data.global.y - this.displacementSprite.height / 2;
-
-            this.ring.position.x = eventData.data.global.x - 25;
-            this.ring.position.y = eventData.data.global.y;
-
-        }
-
-        private animate = (): void => {
-
-            this.count += 0.05;
-
-            for (const maggot of this.maggots) {
-                maggot.direction += maggot.turnSpeed * 0.01;
-                maggot.position.x += Math.sin(maggot.direction) * maggot.speed;
-                maggot.position.y += Math.cos(maggot.direction) * maggot.speed;
-
-                maggot.rotation = -maggot.direction - Math.PI / 2;
-
-                maggot.scale.x = maggot.original.x + Math.sin(this.count) * 0.2;
-
-                // wrap the maggots around as the crawl
-                if (maggot.position.x < this.bounds.x) {
-                    maggot.position.x += this.bounds.width;
-                } else if (maggot.position.x > this.bounds.x + this.bounds.width) {
-                    maggot.position.x -= this.bounds.width;
-                }
-
-                if (maggot.position.y < this.bounds.y) {
-                    maggot.position.y += this.bounds.height;
-                } else if (maggot.position.y > this.bounds.y + this.bounds.height) {
-                    maggot.position.y -= this.bounds.height;
-                }
-            }
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-    export class DisplacementMapDude extends PIXI.Sprite {
-
-        direction: number;
-        speed: number;
-        turnSpeed: number;
-        original: PIXI.Point;
-
-        constructor() {
-
-            super(PIXI.Texture.fromImage('../../_assets/maggot.png'));
-
-        }
-
-    }
-
-}
-
-namespace filters {
-
-    export class Filter {
-
-        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
-
-        private stage: PIXI.Container;
-
-        private background: PIXI.Sprite;
-
-        private filter: PIXI.filters.ColorMatrixFilter;
-
-        private container: PIXI.Container;
-
-        private bgFront: PIXI.Sprite;
-        private light2: PIXI.Sprite;
-        private light1: PIXI.Sprite;
-        private panda: PIXI.Sprite;
-
-        private count: number;
-        private switchy: boolean;
-
-        private help: PIXI.Text;
-
-        constructor() {
-
-            this.renderer = PIXI.autoDetectRenderer(800, 600);
-            document.body.appendChild(this.renderer.view);
-
-            // create the root of the scene graph
-            this.stage = new PIXI.Container();
-            this.stage.interactive = true;
-
-            // create a texture from an image path
-            var texture: PIXI.Texture = PIXI.Texture.fromImage("../../_assets/basics/bunny.png");
-
-            this.background = PIXI.Sprite.fromImage('_assets/BGrotate.jpg');
-            this.background.anchor.set(0.5);
-
-            this.background.position.x = this.renderer.width / 2;
-            this.background.position.y = this.renderer.height / 2;
-
-            this.filter = new PIXI.filters.ColorMatrixFilter();
-
-            this.container = new PIXI.Container();
-            this.container.position.x = this.renderer.width / 2;
-            this.container.position.y = this.renderer.height / 2;
-
-            this.bgFront = PIXI.Sprite.fromImage('../../_assets/SceneRotate.jpg');
-            this.bgFront.anchor.set(0.5);
-
-            this.container.addChild(this.bgFront);
-
-            this.light2 = PIXI.Sprite.fromImage('../../_assets/LightRotate2.png');
-            this.light2.anchor.set(0.5);
-            this.container.addChild(this.light2);
-
-            this.light1 = PIXI.Sprite.fromImage('../../_assets/LightRotate1.png');
-            this.light1.anchor.set(0.5);
-            this.container.addChild(this.light1);
-
-            this.panda = PIXI.Sprite.fromImage('../../_assets/panda.png');
-            this.panda.anchor.set(0.5);
-
-            this.container.addChild(this.panda);
-
-            this.stage.addChild(this.container);
-
-            this.stage.filters = [this.filter];
-
-            this.count = 0;
-            this.switchy = false;
-
-            this.stage.on('click', this.onClick);
-            this.stage.on('tap', this.onClick);
-
-
-            this.help = new PIXI.Text('Click to turn filters on / off.', { font: 'bold 12pt Arial', fill: 'white' });
-            this.help.position.y = this.renderer.height - 25;
-            this.help.position.x = 10;
-
-            this.stage.addChild(this.help);
-
-            // animate
-            this.animate();
-
-        }
-
-        private onClick = (): void => {
-
-            this.switchy = !this.switchy;
-
-            if (!this.switchy) {
-                this.stage.filters = [this.filter];
-            } else {
-                this.stage.filters = null;
-            }
-
-        }
-
-        private animate = (): void => {
-
-            this.background.rotation += 0.01;
-            this.bgFront.rotation -= 0.01;
-
-            this.light1.rotation += 0.02;
-            this.light2.rotation += 0.01;
-
-            this.panda.scale.x = 1 + Math.sin(this.count) * 0.04;
-            this.panda.scale.y = 1 + Math.cos(this.count) * 0.04;
-
-            this.count += 0.1;
-
-            var matrix = this.filter.matrix;
-
-            matrix[1] = Math.sin(this.count) * 3;
-            matrix[2] = Math.cos(this.count);
-            matrix[3] = Math.cos(this.count) * 1.5;
-            matrix[4] = Math.sin(this.count / 3) * 2;
-            matrix[5] = Math.sin(this.count / 2);
-            matrix[6] = Math.sin(this.count / 4);
-
-            this.renderer.render(this.stage);
-
-            requestAnimationFrame(this.animate);
-
-        }
-
-    }
-
-}
diff --git a/pixi.js/v3/tslint.json b/pixi.js/v3/tslint.json
deleted file mode 100644
index dca585dadc..0000000000
--- a/pixi.js/v3/tslint.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "extends": "../tslint.json",
-    "rules": {
-        "forbidden-types": false,
-        "no-empty-interface": false,
-        "unified-signatures": false
-    }
-}
diff --git a/pkcs11js/pkcs11js-tests.ts b/pkcs11js/pkcs11js-tests.ts
index 52ffd4e8f8..30501be11f 100644
--- a/pkcs11js/pkcs11js-tests.ts
+++ b/pkcs11js/pkcs11js-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="pkcs11js" />
-
 import * as pkcs11js from "pkcs11js";
 
 const libPath = "C:\\tmp\\rtpkcs11ecp.dll";
diff --git a/pouchdb-find/pouchdb-find-tests.ts b/pouchdb-find/pouchdb-find-tests.ts
index 8d677276fc..bebdc58cc1 100644
--- a/pouchdb-find/pouchdb-find-tests.ts
+++ b/pouchdb-find/pouchdb-find-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./index.d.ts" />
-
 namespace PouchDBFindTests {
 
     function testFind() {
diff --git a/pouchdb-replication/pouchdb-replication-tests.ts b/pouchdb-replication/pouchdb-replication-tests.ts
index 6ff426bd0c..3cb6d6bc17 100644
--- a/pouchdb-replication/pouchdb-replication-tests.ts
+++ b/pouchdb-replication/pouchdb-replication-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./index.d.ts" />
-
 namespace PouchDBReplicationTests {
 
     /** @todo make some real tests */
diff --git a/printf/index.d.ts b/printf/index.d.ts
new file mode 100644
index 0000000000..e136eed929
--- /dev/null
+++ b/printf/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for printf 0.2
+// Project: https://github.com/adaltas/node-printf
+// Definitions by: Aluísio Augusto Silva Gonçalves <https://github.com/AluisioASG>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export = printf;
+declare function printf(format: string, ...args: any[]): string;
+declare function printf(writeStream: NodeJS.WritableStream, format: string, ...args: any[]): void;
diff --git a/printf/printf-tests.ts b/printf/printf-tests.ts
new file mode 100644
index 0000000000..d116d45f76
--- /dev/null
+++ b/printf/printf-tests.ts
@@ -0,0 +1,9 @@
+import printf = require("printf");
+
+printf('%c', 0x7f).charCodeAt(0);
+printf('%2$s: %1$O', {hello: 'Node'}, 'Test');
+printf('%(temperature)s %(crevace)ss', {
+    temperature: 'Hot',
+    crevace: 'Pocket',
+});
+printf(process.stdout, '%2$s: %1$O', {hello: 'Node'}, 'Test');
diff --git a/printf/tsconfig.json b/printf/tsconfig.json
new file mode 100644
index 0000000000..e937977428
--- /dev/null
+++ b/printf/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "printf-tests.ts"
+    ]
+}
diff --git a/printf/tslint.json b/printf/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/printf/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/project-oxford/project-oxford-tests.ts b/project-oxford/project-oxford-tests.ts
index d04a77a762..ea2849d986 100644
--- a/project-oxford/project-oxford-tests.ts
+++ b/project-oxford/project-oxford-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="bluebird" />
-/// <reference types="node" />
 /// <reference types="mocha" />
 
 import oxford = require("project-oxford");
diff --git a/promise-pg/index.d.ts b/promise-pg/index.d.ts
index 5deba594a1..d93f13d8c0 100644
--- a/promise-pg/index.d.ts
+++ b/promise-pg/index.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
-/// <reference types="q" />
 
 import * as stream from 'stream';
 import * as pg from 'pg';
diff --git a/promise-pg/tsconfig.json b/promise-pg/tsconfig.json
index 0f74dbb52b..b28fb9baa9 100644
--- a/promise-pg/tsconfig.json
+++ b/promise-pg/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/promise-pool/index.d.ts b/promise-pool/index.d.ts
index 810b629ee2..51af449480 100644
--- a/promise-pool/index.d.ts
+++ b/promise-pool/index.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="q-retry" />
-/// <reference types="q" />
 
 import * as Q from "q";
 /**
diff --git a/promise-pool/tsconfig.json b/promise-pool/tsconfig.json
index b72557a58b..f7be6ce41d 100644
--- a/promise-pool/tsconfig.json
+++ b/promise-pool/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/promised-temp/promised-temp-tests.ts b/promised-temp/promised-temp-tests.ts
index 2b77184e25..ec14855d8b 100644
--- a/promised-temp/promised-temp-tests.ts
+++ b/promised-temp/promised-temp-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import * as fs from "fs";
 import temp from 'promised-temp';
 import { AffixOptions, OpenFile, Stats } from "promised-temp";
@@ -9,8 +6,7 @@ function testCleanup() {
     temp.cleanup().then((result: boolean | Stats) => {
         if (typeof result === "boolean") {
             const x = result === true;
-        }
-        else {
+        } else {
             const { files, dirs } = result;
             files.toPrecision(4);
         }
diff --git a/promises-a-plus/index.d.ts b/promises-a-plus/index.d.ts
deleted file mode 100644
index 806020d051..0000000000
--- a/promises-a-plus/index.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for promises-a-plus
-// Project: http://promisesaplus.com/
-// Definitions by: Igor Oleinikov <https://github.com/Igorbek>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace PromisesAPlus {
-	interface PromiseCtor {
-		<T>(resolver: (resolvePromise: (value: T) => void, rejectPromise: (reason: any) => void) => void): Thenable<T>;
-	}
-
-	interface PromiseImpl {
-		new <T>(resolver: (resolvePromise: (value: T) => void, rejectPromise: (reason: any) => void) => void): Thenable<T>;
-	}
-
-	interface Thenable<T> {
-		then<R>(onFulfill?: (value: T) => Thenable<R>|R, onReject?: (error: any) => Thenable<R>|R): Thenable<R>;
-	}
-}
diff --git a/promises-a-plus/promises-a-plus-tests.ts b/promises-a-plus/promises-a-plus-tests.ts
deleted file mode 100644
index 222cca14d8..0000000000
--- a/promises-a-plus/promises-a-plus-tests.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/// <reference types="rx"/>
-/// <reference types="q"/>
-/// <reference types="when"/>
-
-var thenNum: PromisesAPlus.Thenable<number>;
-var thenStr: PromisesAPlus.Thenable<string>;
-var thenBool: PromisesAPlus.Thenable<boolean>;
-
-var impl: PromisesAPlus.PromiseImpl;
-
-declare class PromiseImpl<R> {
-	constructor(resolver: (resolvePromise: (value: R) => void, rejectPromise: (reason: any) => void) => void);
-
-	then<U>(onFulfill: (value: R) => PromiseImpl<U>, onReject: (error: any) => PromiseImpl<U>): PromiseImpl<U>;
-	then<U>(onFulfill: (value: R) => PromiseImpl<U>, onReject?: (error: any) => U): PromiseImpl<U>;
-	then<U>(onFulfill: (value: R) => U, onReject: (error: any) => PromiseImpl<U>): PromiseImpl<U>;
-	then<U>(onFulfill?: (value: R) => U, onReject?: (error: any) => U): PromiseImpl<U>;
-}
-
-function testCompatibleWithPromiseImpl() {
-	var pNum: PromiseImpl<number> = thenNum;
-
-	thenNum = pNum;
-
-	impl = PromiseImpl;
-}
-
-function testCompatibleWithRxJS() {
-	// from spec to Rx
-	var rxThenNum: Rx.IPromise<number> = thenNum;
-	var rxThenStr: Rx.IPromise<string> = thenStr;
-
-	// from Rx to spec
-	thenNum = rxThenNum;
-	thenStr = rxThenStr;
-
-	var obsNum: Rx.Observable<number>;
-
-	// implementation usage
-	thenNum = obsNum.toPromise<PromisesAPlus.Thenable<number>>(impl);
-	thenNum = obsNum.toPromise(impl);
-	obsNum.toPromise(PromiseImpl);
-}
-
-function testCompatibleWithES6Promises() {
-	// define ES6 thenables
-	var es6ThenNum: PromiseLike<number>;
-	var es6ThenStr: PromiseLike<string>;
-
-	// from ES6 to spec
-	thenNum = es6ThenNum;
-	thenStr = es6ThenStr;
-
-	// implementation
-	impl = Promise;
-}
-
-function testCompatibleWithQ() {
-	// from spec to ES6
-	var qThenNum: Q.IPromise<number> = thenNum;
-	var qThenStr: Q.IPromise<string> = thenStr;
-
-	// from ES6 to spec
-	thenNum = qThenNum;
-	thenStr = qThenStr;
-
-	// there's no standart implementation with constructor behaviour
-}
-
-function testCompatibleWithWhen() {
-	var whenPromiseNum: When.Promise<number>;
-	var whenPromiseStr: When.Promise<string>;
-
-	// from ES6 to spec
-	thenNum = whenPromiseNum;
-	thenStr = whenPromiseStr;
-
-	// there's no standart implementation with constructor behaviour
-}
diff --git a/promptly/promptly-tests.ts b/promptly/promptly-tests.ts
index 05b8bf70ed..fbd1fd5bb7 100644
--- a/promptly/promptly-tests.ts
+++ b/promptly/promptly-tests.ts
@@ -1,5 +1,3 @@
-///<reference types="node"/>
-
 import promptly = require('promptly');
 
 process.stdin
diff --git a/protractor-browser-logs/protractor-browser-logs-tests.ts b/protractor-browser-logs/protractor-browser-logs-tests.ts
index 8e2e0ac015..75af9eb039 100644
--- a/protractor-browser-logs/protractor-browser-logs-tests.ts
+++ b/protractor-browser-logs/protractor-browser-logs-tests.ts
@@ -4,7 +4,7 @@ import * as webdriver from 'selenium-webdriver';
 import Entry = webdriver.logging.Entry;
 
 function colored(entries: Entry[]) {
-    let colors: any = { INFO: 35 /* magenta */, WARNING: 33 /* yellow */, SEVERE: 31 /* red */};
+    const colors: any = { INFO: 35 /* magenta */, WARNING: 33 /* yellow */, SEVERE: 31 /* red */};
     entries.forEach((entry: Entry) => {
         console.log('\u001b[' + (colors[entry.level.name] || 37) + 'm' + [entry.level.name, entry.message].join(': ') + '\u001b[39m');
     });
@@ -17,7 +17,7 @@ function testCreateFunction() {
 }
 
 function testLogLevels() {
-    let logs = browserLogs(browser);
+    const logs = browserLogs(browser);
 
     logs.ignore(logs.ERROR);
     logs.expect(logs.WARNING);
@@ -27,48 +27,48 @@ function testLogLevels() {
 }
 
 function testPredicateFunctions() {
-    let logs = browserLogs(browser);
+    const logs = browserLogs(browser);
 
     logs.ignore(logs.or(logs.ERROR, logs.WARNING));
     logs.expect(logs.and(logs.DEBUG, logs.INFO));
 }
 
 function testRegExp() {
-    let logs = browserLogs(browser);
+    const logs = browserLogs(browser);
 
     logs.ignore(/foo/i);
     logs.expect(new RegExp('/foo/i'));
 }
 
 function testString() {
-    let logs = browserLogs(browser);
+    const logs = browserLogs(browser);
 
     logs.ignore('foo');
     logs.expect('foo');
 }
 
 function testMatchFunction() {
-    let logs = browserLogs(browser);
-    let filter = (entry: Entry) => entry.message === "foo";
+    const logs = browserLogs(browser);
+    const filter = (entry: Entry) => entry.message === "foo";
 
     logs.ignore(filter);
     logs.expect(filter);
 }
 
 function testReset() {
-    let logs = browserLogs(browser);
+    const logs = browserLogs(browser);
 
     logs.reset();
 }
 
 function testLogs() {
-    let logs = browserLogs(browser);
+    const logs = browserLogs(browser);
 
-    let entries: Entry[] = logs.logs();
+    const entries: Entry[] = logs.logs();
 }
 
 function testVerify() {
-    let logs = browserLogs(browser);
+    const logs = browserLogs(browser);
 
     logs.verify();
 }
diff --git a/protractor-helpers/index.d.ts b/protractor-helpers/index.d.ts
index 9821f5ba0c..92215ce4eb 100644
--- a/protractor-helpers/index.d.ts
+++ b/protractor-helpers/index.d.ts
@@ -5,6 +5,7 @@
 // TypeScript Version: 2.1
 
 /// <reference types="selenium-webdriver" />
+/// <reference types="jasmine" />
 
 // ElementArrayFinder
 
diff --git a/protractor-helpers/package.json b/protractor-helpers/package.json
index 3e6da0a22e..2939ff6d12 100644
--- a/protractor-helpers/package.json
+++ b/protractor-helpers/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
     "@types/jasmine": "^2.2.34",
-    "@types/selenium-webdriver": "~2.44.28"
+    "@types/selenium-webdriver": "2.44.28"
   }
 }
diff --git a/protractor-helpers/protractor-helpers-tests.ts b/protractor-helpers/protractor-helpers-tests.ts
index 9b03e43005..543991392b 100644
--- a/protractor-helpers/protractor-helpers-tests.ts
+++ b/protractor-helpers/protractor-helpers-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jasmine" />
-
 import helpers = require('protractor-helpers');
 
 declare var $$: any, $: any, by: any, element: any; // ??
diff --git a/q-io/index.d.ts b/q-io/index.d.ts
index b69a9c72e0..783f70ddc4 100644
--- a/q-io/index.d.ts
+++ b/q-io/index.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
-/// <reference types="q" />
 
 //TODO add support for q-io/http-apps
 //TODO add verified support for q-io/fs-mock
@@ -15,94 +14,94 @@
 declare namespace QioFS {
 
 	//TODO how to define the multiple return types? use any for now?
-	export function open(path:string, options?:any):Q.Promise<any>;
+	export function open(path: string, options?: any): Q.Promise<any>;
 	//export function open(path:string, options?:any):Q.Promise<Qio.Reader>;
 	//export function open(path:string, options?:any):Q.Promise<Qio.Writer>;
 	//export function open(path:string, options?:any):Q.Promise<Buffer>;
 
 	//TODO how to define the multiple return types? use any for now?
-	export function read(path:string, options?:any):Q.Promise<any>;
+	export function read(path: string, options?: any): Q.Promise<any>;
 	//export function read(path:string, options?:any):Q.Promise<string>;
 	//export function read(path:string, options?:any):Q.Promise<Buffer>;
 
-	export function write(path:string, content:Buffer, options?:any):Q.Promise<void>;
-	export function write(path:string, content:string, options?:any):Q.Promise<void>;
+	export function write(path: string, content: Buffer, options?: any): Q.Promise<void>;
+	export function write(path: string, content: string, options?: any): Q.Promise<void>;
 
-	export function append(path:string, content:Buffer, options?:any):Q.Promise<void>;
-	export function append(path:string, content:string, options?:any):Q.Promise<void>;
+	export function append(path: string, content: Buffer, options?: any): Q.Promise<void>;
+	export function append(path: string, content: string, options?: any): Q.Promise<void>;
 
-	export function copy(source:string, target:string):Q.Promise<void>;
-	export function copyTree(source:string, target:string):Q.Promise<void>;
+	export function copy(source: string, target: string): Q.Promise<void>;
+	export function copyTree(source: string, target: string): Q.Promise<void>;
 
-	export function list(path:string):Q.Promise<string[]>;
-	export function listTree(path:string, guard?:(path:string, stat:any) => boolean):Q.Promise<string[]>;
-	export function listDirectoryTree(path:string):Q.Promise<string[]>;
+	export function list(path: string): Q.Promise<string[]>;
+	export function listTree(path: string, guard?: (path: string, stat: any) => boolean): Q.Promise<string[]>;
+	export function listDirectoryTree(path: string): Q.Promise<string[]>;
 
-	export function makeDirectory(path:string, mode?:string):Q.Promise<void>;
-	export function makeDirectory(path:string, mode?:number):Q.Promise<void>;
-	export function makeTree(path:string, mode?:string):Q.Promise<void>;
-	export function makeTree(path:string, mode?:number):Q.Promise<void>;
+	export function makeDirectory(path: string, mode?: string): Q.Promise<void>;
+	export function makeDirectory(path: string, mode?: number): Q.Promise<void>;
+	export function makeTree(path: string, mode?: string): Q.Promise<void>;
+	export function makeTree(path: string, mode?: number): Q.Promise<void>;
 
-	export function remove(path:string):Q.Promise<void>;
-	export function removeTree(path:string):Q.Promise<void>;
+	export function remove(path: string): Q.Promise<void>;
+	export function removeTree(path: string): Q.Promise<void>;
 
-	export function rename(source:string, target:string):Q.Promise<void>;
-	export function move(source:string, target:string):Q.Promise<void>;
+	export function rename(source: string, target: string): Q.Promise<void>;
+	export function move(source: string, target: string): Q.Promise<void>;
 
-	export function link(source:string, target:any):Q.Promise<void>;
+	export function link(source: string, target: any): Q.Promise<void>;
 
-	export function symbolicCopy(source:string, target:string, type:string):Q.Promise<void>;
-	export function symbolicLink(target:string, link:string, type:string):Q.Promise<void>;
+	export function symbolicCopy(source: string, target: string, type: string): Q.Promise<void>;
+	export function symbolicLink(target: string, link: string, type: string): Q.Promise<void>;
 
-	export function chown(path:string, uid:number, gid:number):Q.Promise<void>;
-	export function chmod(path:string, mode?:string):Q.Promise<void>;
-	export function chmod(path:string, mode?:number):Q.Promise<void>;
+	export function chown(path: string, uid: number, gid: number): Q.Promise<void>;
+	export function chmod(path: string, mode?: string): Q.Promise<void>;
+	export function chmod(path: string, mode?: number): Q.Promise<void>;
 
-	export function stat(path:string):Q.Promise<Stats>;
-	export function statLink(path:string):Q.Promise<Stats>;
-	export function statFd(fd:number):Q.Promise<Stats>;
+	export function stat(path: string): Q.Promise<Stats>;
+	export function statLink(path: string): Q.Promise<Stats>;
+	export function statFd(fd: number): Q.Promise<Stats>;
 
-	export function exists(path:string):Q.Promise<boolean>;
+	export function exists(path: string): Q.Promise<boolean>;
 
-	export function isFile(path:string):Q.Promise<boolean>;
-	export function isDirectory(path:string):Q.Promise<boolean>;
-	export function isSymbolicLink(path:string):Q.Promise<boolean>;
+	export function isFile(path: string): Q.Promise<boolean>;
+	export function isDirectory(path: string): Q.Promise<boolean>;
+	export function isSymbolicLink(path: string): Q.Promise<boolean>;
 
-	export function lastModified(path:string):Q.Promise<Date>;
-	export function lastAccessed(path:string):Q.Promise<Date>;
+	export function lastModified(path: string): Q.Promise<Date>;
+	export function lastAccessed(path: string): Q.Promise<Date>;
 
-	export function split(path:string):string[];
-	export function join(...paths:string[]):string;
-	export function join(paths:string[]):string;
-	export function resolve(...path:string[]):string;
-	export function resolve(paths:string[]):string;
-	export function normal(...path:string[]):string;
-	export function normal(paths:string[]):string;
-	export function absolute(path:string):string;
+	export function split(path: string): string[];
+	export function join(...paths: string[]): string;
+	export function join(paths: string[]): string;
+	export function resolve(...path: string[]): string;
+	export function resolve(paths: string[]): string;
+	export function normal(...path: string[]): string;
+	export function normal(paths: string[]): string;
+	export function absolute(path: string): string;
 
-	export function canonical(path:string):Q.Promise<string>;
-	export function readLink(path:string):Q.Promise<string>;
+	export function canonical(path: string): Q.Promise<string>;
+	export function readLink(path: string): Q.Promise<string>;
 
-	export function contains(parent:string, child:string):boolean;
+	export function contains(parent: string, child: string): boolean;
 
-	export function relative(source:string, target:string):Q.Promise<string>;
+	export function relative(source: string, target: string): Q.Promise<string>;
 
-	export function relativeFromFile(source:string, target:string):string;
-	export function relativeFromDirectory(source:string, target:string):string;
+	export function relativeFromFile(source: string, target: string): string;
+	export function relativeFromDirectory(source: string, target: string): string;
 
-	export function isAbsolute(path:string):boolean;
-	export function isRelative(path:string):boolean;
-	export function isRoot(path:string):boolean;
+	export function isAbsolute(path: string): boolean;
+	export function isRelative(path: string): boolean;
+	export function isRoot(path: string): boolean;
 
-	export function root(path:string):string;
-	export function directory(path:string):string;
-	export function base(path:string, extension:string):string;
-	export function extension(path:string):string;
+	export function root(path: string): string;
+	export function directory(path: string): string;
+	export function base(path: string, extension: string): string;
+	export function extension(path: string): string;
 
 	//this should return a q-io/fs-mock MockFS
-	export function reroot(path:string):typeof QioFS;
+	export function reroot(path: string): typeof QioFS;
 
-	export function toObject(path:string):{[path:string]:Buffer};
+	export function toObject(path: string): { [path: string]: Buffer };
 
 	//listed but not implemented by Q-io
 	//export function glob(pattern):Q.Promise<string[]>;
@@ -110,116 +109,116 @@ declare namespace QioFS {
 
 	//TODO link this to node.js FS module (no lazy clones)
 	interface Stats {
-		node:NodeStats;
-		size:number;
+		node: NodeStats;
+		size: number;
 	}
 	interface NodeStats {
-		isFile():boolean;
-		isDirectory():boolean;
-		isBlockDevice():boolean;
-		isCharacterDevice():boolean;
-		isSymbolicLink():boolean;
-		isFIFO():boolean;
-		isSocket():boolean;
-		node:NodeStats;
-		dev:number;
-		ino:number;
-		mode:number;
-		nlink:number;
-		uid:number;
-		gid:number;
-		rdev:number;
-		size:number;
-		blksize:number;
-		blocks:number;
-		atime:Date;
-		mtime:Date;
-		ctime:Date;
+		isFile(): boolean;
+		isDirectory(): boolean;
+		isBlockDevice(): boolean;
+		isCharacterDevice(): boolean;
+		isSymbolicLink(): boolean;
+		isFIFO(): boolean;
+		isSocket(): boolean;
+		node: NodeStats;
+		dev: number;
+		ino: number;
+		mode: number;
+		nlink: number;
+		uid: number;
+		gid: number;
+		rdev: number;
+		size: number;
+		blksize: number;
+		blocks: number;
+		atime: Date;
+		mtime: Date;
+		ctime: Date;
 	}
 }
 
 declare namespace QioHTTP {
-	export function request(request:Request):Q.Promise<Response>;
-	export function request(url:string):Q.Promise<Response>;
+	export function request(request: Request): Q.Promise<Response>;
+	export function request(url: string): Q.Promise<Response>;
 
-	export function read(request:Request):Q.Promise<string>;
-	export function read(url:string):Q.Promise<string >;
+	export function read(request: Request): Q.Promise<string>;
+	export function read(url: string): Q.Promise<string>;
 
-	export function normalizeRequest(request:Request):Request;
-	export function normalizeRequest(url:string):Request;
-	export function normalizeResponse(response:Response):Response;
+	export function normalizeRequest(request: Request): Request;
+	export function normalizeRequest(url: string): Request;
+	export function normalizeResponse(response: Response): Response;
 
 	interface Request {
-		url:string;
-		path:string;
-		scriptName:string;
-		pathInfo:string;
-		version:string[];
-		method:string;
-		scheme:string;
+		url: string;
+		path: string;
+		scriptName: string;
+		pathInfo: string;
+		version: string[];
+		method: string;
+		scheme: string;
 
-		host:string;
-		port:number;
-		remoteHost:string;
-		remotePort:number;
+		host: string;
+		port: number;
+		remoteHost: string;
+		remotePort: number;
 
-		headers:Headers;
-		agent:any;
-		body:any;
-		node:any;
+		headers: Headers;
+		agent: any;
+		body: any;
+		node: any;
 	}
 	interface Response {
-		status:number;
-		headers:Headers;
-		body:Qio.Reader
-		onclose:() => void;
-		node:any;
+		status: number;
+		headers: Headers;
+		body: Qio.Reader
+		onclose: () => void;
+		node: any;
 	}
 	interface Headers {
-		[name:string]:any;
+		[name: string]: any;
 		// [name:string]:any[];
 	}
 	interface Body extends Qio.Stream {
 
 	}
 	interface Application {
-		(req:Request):Q.Promise<any>;
+		(req: Request): Q.Promise<any>;
 	}
 }
 
 declare namespace Qio {
 	interface ForEachCallback {
-		(chunk:Buffer):Q.Promise<any>;
-		(chunk:string):Q.Promise<any>;
+		(chunk: Buffer): Q.Promise<any>;
+		(chunk: string): Q.Promise<any>;
 	}
 	interface ForEach {
-		forEach(callback:ForEachCallback):Q.Promise<void>;
+		forEach(callback: ForEachCallback): Q.Promise<void>;
 	}
 
 	interface Reader extends ForEach {
-		read(charset:string):Q.Promise<string>;
-		read():Q.Promise<Buffer>;
-		close():void;
+		read(charset: string): Q.Promise<string>;
+		read(): Q.Promise<Buffer>;
+		close(): void;
 		node: NodeJS.ReadableStream;
 	}
 	interface Writer {
-		write(content:string):void;
-		write(content:Buffer):void;
-		flush():Q.Promise<void>;
-		close():void;
-		destroy():void;
+		write(content: string): void;
+		write(content: Buffer): void;
+		flush(): Q.Promise<void>;
+		close(): void;
+		destroy(): void;
 		node: NodeJS.WritableStream;
 	}
 
 	interface Stream {
-        read(charset:string):Q.Promise<string>;
-        read():Q.Promise<Buffer>;
-        write(content:string):void;
-        write(content:Buffer):void;
-        flush():Q.Promise<void>;
-        close():void;
-        destroy():void;
-        node:any;
+		read(charset: string): Q.Promise<string>;
+		read(): Q.Promise<Buffer>;
+		write(content: string): void;
+		write(content: Buffer): void;
+		flush(): Q.Promise<void>;
+		close(): void;
+		destroy(): void;
+		node: any;
 	}
 
 	interface BufferReader extends QioBufferReader {
@@ -227,31 +226,32 @@ declare namespace Qio {
 	}
 }
 interface QioBufferReader {
-	new ():Qio.Reader;
-	read(stream:Qio.Reader, charset:string):string;
-	read(stream:Qio.Reader):Buffer;
-	join(buffers:Buffer[]):Buffer;
+	new (): Qio.Reader;
+	read(stream: Qio.Reader, charset: string): string;
+	read(stream: Qio.Reader): Buffer;
+	join(buffers: Buffer[]): Buffer;
 }
 interface QioBufferWriter {
-	(writer:Buffer):Qio.Writer;
-	Writer:Qio.Writer;
+	(writer: Buffer): Qio.Writer;
+	Writer: Qio.Writer;
 }
 interface QioBufferStream {
-	(buffer:Buffer, encoding:string):Qio.Stream
+	(buffer: Buffer, encoding: string): Qio.Stream
 }
 
 declare module "q-io/http" {
-export = QioHTTP;
+	import * as Q from "q";
+	export = QioHTTP;
 }
 declare module "q-io/fs" {
-export = QioFS;
+	export = QioFS;
 }
 declare module "q-io/reader" {
-export = QioBufferReader;
+	export = QioBufferReader;
 }
 declare module "q-io/writer" {
-export = QioBufferWriter;
+	export = QioBufferWriter;
 }
 declare module "q-io/buffer-stream" {
-export = QioBufferStream;
+	export = QioBufferStream;
 }
diff --git a/q-io/q-io-tests.ts b/q-io/q-io-tests.ts
index ae6d14d623..fb5e7e97c2 100644
--- a/q-io/q-io-tests.ts
+++ b/q-io/q-io-tests.ts
@@ -1,5 +1,3 @@
-import * as Q from 'q';
-
 var fs:typeof QioFS = require('q-io/fs');
 var http:typeof QioHTTP = require('q-io/http');
 
diff --git a/q-io/tsconfig.json b/q-io/tsconfig.json
index a0afa359c6..cccbe944b1 100644
--- a/q-io/tsconfig.json
+++ b/q-io/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/q-retry/index.d.ts b/q-retry/index.d.ts
index dbdf914b6c..2d06f97f2e 100644
--- a/q-retry/index.d.ts
+++ b/q-retry/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: VILIC VANE <https://github.com/vilic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="q" />
-
 import * as Q from 'q';
 
 export = Q;
diff --git a/q-retry/tsconfig.json b/q-retry/tsconfig.json
index 8b9a3250f4..19c7cb8412 100644
--- a/q-retry/tsconfig.json
+++ b/q-retry/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/q/index.d.ts b/q/index.d.ts
index c6f2a068a7..c4c1af5ec0 100644
--- a/q/index.d.ts
+++ b/q/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for Q
+// Type definitions for Q 1.0
 // Project: https://github.com/kriskowal/q
 // Definitions by: Barrie Nemetchek <https://github.com/bnemetchek>, Andrew Gaspar <https://github.com/AndrewGaspar/>, John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 export = Q;
 export as namespace Q;
@@ -21,12 +22,12 @@ declare function Q<T>(value: T): Q.Promise<T>;
 declare function Q(): Q.Promise<void>;
 
 declare namespace Q {
-    type IWhenable<T> = IPromise<T> | T;
-    interface IPromise<T> {
+    export type IWhenable<T> = IPromise<T> | T;
+    export interface IPromise<T> {
         then<U>(onFulfill?: (value: T) => IWhenable<U>, onReject?: (error: any) => IWhenable<U>): IPromise<U>;
     }
 
-    interface Deferred<T> {
+    export interface Deferred<T> {
         promise: Promise<T>;
         resolve(value?: IWhenable<T>): void;
         reject(reason: any): void;
@@ -34,7 +35,7 @@ declare namespace Q {
         makeNodeResolver(): (reason: any, value: T) => void;
     }
 
-    interface Promise<T> {
+    export interface Promise<T> {
         /**
          * Like a finally clause, allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful for collecting resources regardless of whether a job succeeded, like closing a database connection, shutting a server down, or deleting an unneeded key from an object.
 
@@ -167,11 +168,8 @@ declare namespace Q {
         inspect(): PromiseState<T>;
     }
 
-    interface PromiseState<T> {
-        /**
-         * "fulfilled", "rejected", "pending"
-         */
-        state: string;
+    export interface PromiseState<T> {
+        state: "fulfilled" | "rejected" | "pending";
         value?: T;
         reason?: any;
     }
@@ -185,11 +183,8 @@ declare namespace Q {
     // If a non-promise value is provided, it will not reject or progress
     export function when<T, U>(value: IWhenable<T>, onFulfilled: (val: T) => IWhenable<U>, onRejected?: (reason: any) => IWhenable<U>, onProgress?: (progress: any) => any): Promise<U>;
 
-    /**
-     * Currently "impossible" (and I use the term loosely) to implement due to TypeScript limitations as it is now.
-     * See: https://github.com/Microsoft/TypeScript/issues/1784 for discussion on it.
-     */
-    // export function try(method: Function, ...args: any[]): Promise<any>;
+    function _try(method: Function, ...args: any[]): Promise<any>;
+    export { _try as try };
 
     export function fbind<T>(method: (...args: any[]) => IWhenable<T>, ...args: any[]): (...args: any[]) => Promise<T>;
 
diff --git a/q/q-tests.ts b/q/q-tests.ts
index 7ebc35adb3..5f79d7f1e4 100644
--- a/q/q-tests.ts
+++ b/q/q-tests.ts
@@ -224,3 +224,14 @@ var p2: Q.Promise<[string, number]> = y1.then(val => Q.all(val));
 var p3: Q.Promise<[string, number]> = Q.all(y1);
 var p5: Q.Promise<[string, number]> = y2.then(val => Q.all(val));
 var p6: Q.Promise<[string, number]> = Q.all(y2);
+
+
+Q.try(function () {
+    if (Math.random() % 2) {
+        throw new Error("The cloud is down!");
+    }
+    return true;
+})
+.catch(function (error) {
+    console.error("Couldn't sync to the cloud", error);
+});
\ No newline at end of file
diff --git a/q/v0/index.d.ts b/q/v0/index.d.ts
new file mode 100644
index 0000000000..6b2deb3161
--- /dev/null
+++ b/q/v0/index.d.ts
@@ -0,0 +1,357 @@
+// Type definitions for Q
+// Project: https://github.com/kriskowal/q
+// Definitions by: Barrie Nemetchek <https://github.com/bnemetchek>, Andrew Gaspar <https://github.com/AndrewGaspar/>, John Reilly <https://github.com/johnnyreilly>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Q;
+export as namespace Q;
+
+/**
+ * If value is a Q promise, returns the promise.
+ * If value is a promise from another library it is coerced into a Q promise (where possible).
+ */
+declare function Q<T>(promise: Q.IPromise<T>): Q.Promise<T>;
+/**
+ * If value is not a promise, returns a promise that is fulfilled with value.
+ */
+declare function Q<T>(value: T): Q.Promise<T>;
+/**
+ * Calling with nothing at all creates a void promise
+ */
+declare function Q(): Q.Promise<void>;
+
+declare namespace Q {
+    type IWhenable<T> = IPromise<T> | T;
+    interface IPromise<T> {
+        then<U>(onFulfill?: (value: T) => IWhenable<U>, onReject?: (error: any) => IWhenable<U>): IPromise<U>;
+    }
+
+    interface Deferred<T> {
+        promise: Promise<T>;
+        resolve(value?: IWhenable<T>): void;
+        reject(reason: any): void;
+        notify(value: any): void;
+        makeNodeResolver(): (reason: any, value: T) => void;
+    }
+
+    interface Promise<T> {
+        /**
+         * Like a finally clause, allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful for collecting resources regardless of whether a job succeeded, like closing a database connection, shutting a server down, or deleting an unneeded key from an object.
+
+         * finally returns a promise, which will become resolved with the same fulfillment value or rejection reason as promise. However, if callback returns a promise, the resolution of the returned promise will be delayed until the promise returned from callback is finished.
+         */
+        fin(finallyCallback: () => any): Promise<T>;
+        /**
+         * Like a finally clause, allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful for collecting resources regardless of whether a job succeeded, like closing a database connection, shutting a server down, or deleting an unneeded key from an object.
+
+         * finally returns a promise, which will become resolved with the same fulfillment value or rejection reason as promise. However, if callback returns a promise, the resolution of the returned promise will be delayed until the promise returned from callback is finished.
+         */
+        finally(finallyCallback: () => any): Promise<T>;
+
+        /**
+         * The then method from the Promises/A+ specification, with an additional progress handler.
+         */
+        then<U>(onFulfill?: (value: T) => IWhenable<U>, onReject?: (error: any) => IWhenable<U>, onProgress?: Function): Promise<U>;
+
+        /**
+         * Like then, but "spreads" the array into a variadic fulfillment handler. If any of the promises in the array are rejected, instead calls onRejected with the first rejected promise's rejection reason.
+         *
+         * This is especially useful in conjunction with all
+         */
+        spread<U>(onFulfill: (...args: any[]) => IWhenable<U>, onReject?: (reason: any) => IWhenable<U>): Promise<U>;
+
+        fail<U>(onRejected: (reason: any) => IWhenable<U>): Promise<U>;
+
+        /**
+         * A sugar method, equivalent to promise.then(undefined, onRejected).
+         */
+        catch<U>(onRejected: (reason: any) => IWhenable<U>): Promise<U>;
+
+        /**
+         * A sugar method, equivalent to promise.then(undefined, undefined, onProgress).
+         */
+        progress(onProgress: (progress: any) => any): Promise<T>;
+
+        /**
+         * Much like then, but with different behavior around unhandled rejection. If there is an unhandled rejection, either because promise is rejected and no onRejected callback was provided, or because onFulfilled or onRejected threw an error or returned a rejected promise, the resulting rejection reason is thrown as an exception in a future turn of the event loop.
+         *
+         * This method should be used to terminate chains of promises that will not be passed elsewhere. Since exceptions thrown in then callbacks are consumed and transformed into rejections, exceptions at the end of the chain are easy to accidentally, silently ignore. By arranging for the exception to be thrown in a future turn of the event loop, so that it won't be caught, it causes an onerror event on the browser window, or an uncaughtException event on Node.js's process object.
+         *
+         * Exceptions thrown by done will have long stack traces, if Q.longStackSupport is set to true. If Q.onerror is set, exceptions will be delivered there instead of thrown in a future turn.
+         *
+         * The Golden Rule of done vs. then usage is: either return your promise to someone else, or if the chain ends with you, call done to terminate it.
+         */
+        done(onFulfilled?: (value: T) => any, onRejected?: (reason: any) => any, onProgress?: (progress: any) => any): void;
+
+        /**
+         * If callback is a function, assumes it's a Node.js-style callback, and calls it as either callback(rejectionReason) when/if promise becomes rejected, or as callback(null, fulfillmentValue) when/if promise becomes fulfilled. If callback is not a function, simply returns promise.
+         */
+        nodeify(callback: (reason: any, value: any) => void): Promise<T>;
+
+        /**
+         * Returns a promise to get the named property of an object. Essentially equivalent to
+         *
+         * promise.then(function (o) {
+         *     return o[propertyName];
+         * });
+         */
+        get<U>(propertyName: String): Promise<U>;
+        set<U>(propertyName: String, value: any): Promise<U>;
+        delete<U>(propertyName: String): Promise<U>;
+        /**
+         * Returns a promise for the result of calling the named method of an object with the given array of arguments. The object itself is this in the function, just like a synchronous method call. Essentially equivalent to
+         *
+         * promise.then(function (o) {
+         *     return o[methodName].apply(o, args);
+         * });
+         */
+        post<U>(methodName: String, args: any[]): Promise<U>;
+        /**
+         * Returns a promise for the result of calling the named method of an object with the given variadic arguments. The object itself is this in the function, just like a synchronous method call.
+         */
+        invoke<U>(methodName: String, ...args: any[]): Promise<U>;
+        fapply<U>(args: any[]): Promise<U>;
+        fcall<U>(...args: any[]): Promise<U>;
+
+        /**
+         * Returns a promise for an array of the property names of an object. Essentially equivalent to
+         *
+         * promise.then(function (o) {
+         *     return Object.keys(o);
+         * });
+         */
+        keys(): Promise<string[]>;
+
+        /**
+         * A sugar method, equivalent to promise.then(function () { return value; }).
+         */
+        thenResolve<U>(value: U): Promise<U>;
+        /**
+         * A sugar method, equivalent to promise.then(function () { throw reason; }).
+         */
+        thenReject(reason: any): Promise<T>;
+
+        /**
+         * Attaches a handler that will observe the value of the promise when it becomes fulfilled, returning a promise for that same value, perhaps deferred but not replaced by the promise returned by the onFulfilled handler.
+         */
+        tap(onFulfilled: (value: T) => any): Promise<T>;
+
+        timeout(ms: number, message?: string): Promise<T>;
+        /**
+         * Returns a promise that will have the same result as promise, but will only be fulfilled or rejected after at least ms milliseconds have passed.
+         */
+        delay(ms: number): Promise<T>;
+
+        /**
+         * Returns whether a given promise is in the fulfilled state. When the static version is used on non-promises, the result is always true.
+         */
+        isFulfilled(): boolean;
+        /**
+         * Returns whether a given promise is in the rejected state. When the static version is used on non-promises, the result is always false.
+         */
+        isRejected(): boolean;
+        /**
+         * Returns whether a given promise is in the pending state. When the static version is used on non-promises, the result is always false.
+         */
+        isPending(): boolean;
+
+        valueOf(): any;
+
+        /**
+         * Returns a "state snapshot" object, which will be in one of three forms:
+         *
+         * - { state: "pending" }
+         * - { state: "fulfilled", value: <fulfllment value> }
+         * - { state: "rejected", reason: <rejection reason> }
+         */
+        inspect(): PromiseState<T>;
+    }
+
+    interface PromiseState<T> {
+        state: "fulfilled" | "rejected" | "pending";
+        value?: T;
+        reason?: any;
+    }
+
+    // If no value provided, returned promise will be of void type
+    export function when(): Promise<void>;
+
+    // if no fulfill, reject, or progress provided, returned promise will be of same type
+    export function when<T>(value: IWhenable<T>): Promise<T>;
+
+    // If a non-promise value is provided, it will not reject or progress
+    export function when<T, U>(value: IWhenable<T>, onFulfilled: (val: T) => IWhenable<U>, onRejected?: (reason: any) => IWhenable<U>, onProgress?: (progress: any) => any): Promise<U>;
+
+    /**
+     * Currently "impossible" (and I use the term loosely) to implement due to TypeScript limitations as it is now.
+     * See: https://github.com/Microsoft/TypeScript/issues/1784 for discussion on it.
+     */
+    // export function try(method: Function, ...args: any[]): Promise<any>;
+
+    export function fbind<T>(method: (...args: any[]) => IWhenable<T>, ...args: any[]): (...args: any[]) => Promise<T>;
+
+    export function fcall<T>(method: (...args: any[]) => T, ...args: any[]): Promise<T>;
+
+    export function send<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
+    export function invoke<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
+    export function mcall<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
+
+    export function denodeify<T>(nodeFunction: Function, ...args: any[]): (...args: any[]) => Promise<T>;
+    export function nbind<T>(nodeFunction: Function, thisArg: any, ...args: any[]): (...args: any[]) => Promise<T>;
+    export function nfbind<T>(nodeFunction: Function, ...args: any[]): (...args: any[]) => Promise<T>;
+    export function nfcall<T>(nodeFunction: Function, ...args: any[]): Promise<T>;
+    export function nfapply<T>(nodeFunction: Function, args: any[]): Promise<T>;
+
+    export function ninvoke<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
+    export function npost<T>(nodeModule: any, functionName: string, args: any[]): Promise<T>;
+    export function nsend<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
+    export function nmcall<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
+
+    /**
+     * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
+     */
+    export function all<A, B, C, D, E, F>(promises: IWhenable<[IWhenable<A>, IWhenable<B>, IWhenable<C>, IWhenable<D>, IWhenable<E>, IWhenable<F>]>): Promise<[A, B, C, D, E, F]>;
+    /**
+     * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
+     */
+    export function all<A, B, C, D, E>(promises: IWhenable<[IWhenable<A>, IWhenable<B>, IWhenable<C>, IWhenable<D>, IWhenable<E>]>): Promise<[A, B, C, D, E]>;
+    /**
+     * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
+     */
+    export function all<A, B, C, D>(promises: IWhenable<[IWhenable<A>, IWhenable<B>, IWhenable<C>, IWhenable<D>]>): Promise<[A, B, C, D]>;
+    /**
+     * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
+     */
+    export function all<A, B, C>(promises: IWhenable<[IWhenable<A>, IWhenable<B>, IWhenable<C>]>): Promise<[A, B, C]>;
+    /**
+     * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
+     */
+    export function all<A, B>(promises: IWhenable<[IWhenable<A>, IWhenable<B>]>): Promise<[A, B]>;
+    /**
+     * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
+     */
+    export function all<T>(promises: IWhenable<IWhenable<T>[]>): Promise<T[]>;
+
+    /**
+    * Returns a promise for the first of an array of promises to become settled.
+    */
+    export function race<T>(promises: IWhenable<T>[]): Promise<T>;
+
+    /**
+     * Returns a promise that is fulfilled with an array of promise state snapshots, but only after all the original promises have settled, i.e. become either fulfilled or rejected.
+     */
+    export function allSettled<T>(promises: IWhenable<IWhenable<T>[]>): Promise<PromiseState<T>[]>;
+
+    export function allResolved<T>(promises: IWhenable<IWhenable<T>[]>): Promise<Promise<T>[]>;
+
+    /**
+     * Like then, but "spreads" the array into a variadic fulfillment handler. If any of the promises in the array are rejected, instead calls onRejected with the first rejected promise's rejection reason.
+     * This is especially useful in conjunction with all.
+     */
+    export function spread<T, U>(promises: IWhenable<T>[], onFulfilled: (...args: T[]) => IWhenable<U>, onRejected?: (reason: any) => IWhenable<U>): Promise<U>;
+
+    /**
+     * Returns a promise that will have the same result as promise, except that if promise is not fulfilled or rejected before ms milliseconds, the returned promise will be rejected with an Error with the given message. If message is not supplied, the message will be "Timed out after " + ms + " ms".
+     */
+    export function timeout<T>(promise: Promise<T>, ms: number, message?: string): Promise<T>;
+
+    /**
+     * Returns a promise that will have the same result as promise, but will only be fulfilled or rejected after at least ms milliseconds have passed.
+     */
+    export function delay<T>(promise: Promise<T>, ms: number): Promise<T>;
+    /**
+     * Returns a promise that will have the same result as promise, but will only be fulfilled or rejected after at least ms milliseconds have passed.
+     */
+    export function delay<T>(value: T, ms: number): Promise<T>;
+    /**
+     * Returns a promise that will be fulfilled with undefined after at least ms milliseconds have passed.
+     */
+    export function delay(ms: number): Promise <void>;
+    /**
+     * Returns whether a given promise is in the fulfilled state. When the static version is used on non-promises, the result is always true.
+     */
+    export function isFulfilled(promise: Promise<any>): boolean;
+    /**
+     * Returns whether a given promise is in the rejected state. When the static version is used on non-promises, the result is always false.
+     */
+    export function isRejected(promise: Promise<any>): boolean;
+    /**
+     * Returns whether a given promise is in the pending state. When the static version is used on non-promises, the result is always false.
+     */
+    export function isPending(promise: Promise<any>): boolean;
+
+    /**
+     * Returns a "deferred" object with a:
+     * promise property
+     * resolve(value) method
+     * reject(reason) method
+     * notify(value) method
+     * makeNodeResolver() method
+     */
+    export function defer<T>(): Deferred<T>;
+
+    /**
+     * Returns a promise that is rejected with reason.
+     */
+    export function reject<T>(reason?: any): Promise<T>;
+
+    export function Promise<T>(resolver: (resolve: (val: IWhenable<T>) => void , reject: (reason: any) => void , notify: (progress: any) => void ) => void ): Promise<T>;
+
+    /**
+     * Creates a new version of func that accepts any combination of promise and non-promise values, converting them to their fulfillment values before calling the original func. The returned version also always returns a promise: if func does a return or throw, then Q.promised(func) will return fulfilled or rejected promise, respectively.
+     *
+     * This can be useful for creating functions that accept either promises or non-promise values, and for ensuring that the function always returns a promise even in the face of unintentional thrown exceptions.
+     */
+    export function promised<T>(callback: (...args: any[]) => T): (...args: any[]) => Promise<T>;
+
+    /**
+     * Returns whether the given value is a Q promise.
+     */
+    export function isPromise(object: any): boolean;
+    /**
+     * Returns whether the given value is a promise (i.e. it's an object with a then function).
+     */
+    export function isPromiseAlike(object: any): boolean;
+    /**
+     * Returns whether a given promise is in the pending state. When the static version is used on non-promises, the result is always false.
+     */
+    export function isPending(object: any): boolean;
+    /**
+     * If an object is not a promise, it is as "near" as possible.
+     * If a promise is rejected, it is as "near" as possible too.
+     * If it’s a fulfilled promise, the fulfillment value is nearer.
+     * If it’s a deferred promise and the deferred has been resolved, the
+     * resolution is "nearer".
+     */
+    export function nearer<T>(promise: Promise<T>): T;
+
+    /**
+     * This is an experimental tool for converting a generator function into a deferred function. This has the potential of reducing nested callbacks in engines that support yield.
+     */
+    export function async<T>(generatorFunction: any): (...args: any[]) => Promise<T>;
+    export function nextTick(callback: Function): void;
+
+    /**
+     * A settable property that will intercept any uncaught errors that would otherwise be thrown in the next tick of the event loop, usually as a result of done. Can be useful for getting the full stack trace of an error in browsers, which is not usually possible with window.onerror.
+     */
+    export var onerror: (reason: any) => void;
+    /**
+     * A settable property that lets you turn on long stack trace support. If turned on, "stack jumps" will be tracked across asynchronous promise operations, so that if an uncaught error is thrown by done or a rejection reason's stack property is inspected in a rejection callback, a long stack trace is produced.
+     */
+    export var longStackSupport: boolean;
+
+    /**
+     * Calling resolve with a pending promise causes promise to wait on the passed promise, becoming fulfilled with its fulfillment value or rejected with its rejection reason (or staying pending forever, if the passed promise does).
+     * Calling resolve with a rejected promise causes promise to be rejected with the passed promise's rejection reason.
+     * Calling resolve with a fulfilled promise causes promise to be fulfilled with the passed promise's fulfillment value.
+     * Calling resolve with a non-promise value causes promise to be fulfilled with that value.
+     */
+    export function resolve<T>(object: IWhenable<T>): Promise<T>;
+
+	/**
+	 * Resets the global "Q" variable to the value it has before Q was loaded.
+	 * This will either be undefined if there was no version or the version of Q which was already loaded before.
+	 * @returns { The last version of Q. }
+	 */
+	export function noConflict(): typeof Q;
+}
diff --git a/q/v0/q-tests.ts b/q/v0/q-tests.ts
new file mode 100644
index 0000000000..7ebc35adb3
--- /dev/null
+++ b/q/v0/q-tests.ts
@@ -0,0 +1,226 @@
+/// <reference types="jquery" />
+
+
+import Q = require('q');
+
+Q(8).then(x => console.log(x.toExponential()));
+Q().then(() => console.log("nothing"));
+
+var delay = function (delay: number) {
+    var d = Q.defer<void>();
+    setTimeout(d.resolve, delay);
+    return d.promise;
+};
+
+Q.when(delay(1000), function (val: void) {
+    console.log('Hello, World!');
+    return;
+});
+
+// Note from Q documentation: a deferred can be resolved with a value or a promise.
+var otherPromise = Q.defer<string>().promise;
+Q.defer<string>().resolve(otherPromise);
+
+Q.timeout(Q(new Date()), 1000, "My dates never arrived. :(").then(d => d.toJSON());
+
+Q.delay(Q(8), 1000).then(x => x.toExponential());
+Q.delay(8, 1000).then(x => x.toExponential());
+Q.delay(Q("asdf"), 1000).then(x => x.length);
+Q.delay("asdf", 1000).then(x => x.length);
+
+var eventualAdd = Q.promised((a?: number, b?: number) => a + b);
+eventualAdd(Q(1), Q(2)).then(x => x.toExponential());
+
+function eventually<T>(eventually: T) {
+    return Q.delay(eventually, 1000);
+};
+
+var x = Q.all([1, 2, 3].map(eventually));
+Q.when(x, function (x) {
+    console.log(x);
+});
+
+Q.all([
+    eventually(10),
+    eventually(20)
+]).spread(function (x: number, y: number) {
+    console.log(x, y);
+});
+
+Q.all([
+    eventually(10),
+    eventually(20)
+]).then(function (results) {
+    let [x, y] = results;
+    console.log(x, y);
+});
+
+
+Q.fcall(function () { })
+    .then(function () { })
+    .then(function () { })
+    .then(function () { })
+    .then(function (value4) {
+        // Do something with value4
+    }, function (error) {
+        // Handle any error from step1 through step4
+    }).done();
+
+Q.allResolved([])
+.then(function (promises: Q.Promise<any>[]) {
+    promises.forEach(function (promise) {
+        if (promise.isFulfilled()) {
+            var value = promise.valueOf();
+        } else {
+            var exception = promise.valueOf().exception;
+        }
+    })
+});
+
+Q(42)
+    .tap(() => "hello")
+    .tap(x => {
+        console.log(x);
+    })
+    .then(x => {
+        console.log("42 == " + x);
+    });
+
+declare var arrayPromise: Q.IPromise<number[]>;
+declare var stringPromise: Q.IPromise<string>;
+declare function returnsNumPromise(text: string): Q.Promise<number>;
+declare function returnsNumPromise(text: string): JQueryPromise<number>;
+
+Q<number[]>(arrayPromise) // type specification required
+    .then(arr => arr.join(','))
+    .then<number>(returnsNumPromise) // requires specification
+    .then(num => num.toFixed());
+
+declare var jPromise: JQueryPromise<string>;
+
+// if jQuery promises definition supported generics, this could be more interesting example
+Q<string>(jPromise).then(str => str.split(','));
+jPromise.then<number>(returnsNumPromise);
+
+// watch the typing flow through from jQueryPromise to Q.Promise
+Q(jPromise).then(str => str.split(','));
+
+declare var promiseArray: Q.IPromise<number>[];
+var qPromiseArray = promiseArray.map(p => Q<number>(p));
+var myNums: any[] = [2, 3, Q(4), 5, Q(6), Q(7)];
+
+Q.all(promiseArray).then(nums => nums.map(num => num.toPrecision(2)).join(','));
+
+Q.all<number>(myNums).then(nums => nums.map(Math.round));
+
+Q.fbind((dateString?: string) => new Date(dateString), "11/11/1991")().then(d => d.toLocaleDateString());
+
+Q.when(8, num => num + "!");
+Q.when(Q(8), num => num + "!").then(str => str.split(','));
+var voidPromise: Q.Promise<void> = Q.when();
+
+declare function saveToDisk(): Q.Promise<any>;
+declare function saveToCloud(): Q.Promise<any>;
+Q.allSettled([saveToDisk(), saveToCloud()]).spread(function (disk: any, cloud: any) {
+    console.log("saved to disk:", disk.state === "fulfilled");
+    console.log("saved to cloud:", cloud.state === "fulfilled");
+
+    if (disk.state === "fulfilled") {
+        console.log("value was " + disk.value);
+    }
+    else if (disk.state === "rejected") {
+        console.log("rejected because " + disk.reason);
+    }
+}).done();
+
+var nodeStyle = (input: string, cb: Function) => {
+    cb(null, input);
+};
+
+Q.nfapply(nodeStyle, ["foo"]).done((result: string) => {});
+Q.nfcall(nodeStyle, "foo").done((result: string) => {});
+Q.denodeify(nodeStyle)('foo').done((result: string) => {});
+Q.nfbind(nodeStyle)('foo').done((result: string) => {});
+
+
+class Repo {
+    private items: any[] = [
+        { name: 'Max', cute: false },
+        { name: 'Annie', cute: true }
+    ];
+
+    find(options: any): Q.Promise<any[]> {
+        var result = this.items;
+
+        for (var key in options) {
+            result = result.filter(i => i[key] == options[key]);
+        }
+
+        return Q(result);
+    }
+}
+
+var kitty = new Repo();
+Q.nbind(kitty.find, kitty)({ cute: true }).done((kitties: any[]) => {});
+
+
+/*
+ * Test: Can "rethrow" rejected promises
+ */
+namespace TestCanRethrowRejectedPromises {
+
+    interface Foo {
+        a: number;
+    }
+
+    function nestedBar(): Q.Promise<Foo> {
+        var deferred = Q.defer<Foo>();
+
+        return deferred.promise;
+    }
+
+    function bar(): Q.Promise<Foo> {
+        return nestedBar()
+            .then((foo:Foo) => {
+                console.log("Lorem ipsum");
+            })
+            .fail((error) => {
+                console.log("Intermediate error handling");
+
+                /*
+                 * Cannot do this, because:
+                 *     error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<Foo>'
+                 */
+                //throw error;
+
+                return Q.reject<Foo>(error);
+            })
+        ;
+    }
+
+    bar()
+        .finally(() => {
+            console.log("Cleanup")
+        })
+        .done()
+    ;
+
+}
+
+// test Q.Promise.all
+var y1 = Q().then(() => {
+    var s = Q("hello");
+    var n = Q(1);
+    return <[typeof s, typeof n]>[s, n];
+});
+
+var y2 = Q().then(() => {
+    var s = "hello";
+    var n = Q(1);
+    return <[typeof s, typeof n]>[s, n];
+});
+
+var p2: Q.Promise<[string, number]> = y1.then(val => Q.all(val));
+var p3: Q.Promise<[string, number]> = Q.all(y1);
+var p5: Q.Promise<[string, number]> = y2.then(val => Q.all(val));
+var p6: Q.Promise<[string, number]> = Q.all(y2);
diff --git a/pixi.js/v3/tsconfig.json b/q/v0/tsconfig.json
similarity index 83%
rename from pixi.js/v3/tsconfig.json
rename to q/v0/tsconfig.json
index 3fd699ff88..c44ffeb935 100644
--- a/pixi.js/v3/tsconfig.json
+++ b/q/v0/tsconfig.json
@@ -12,17 +12,15 @@
         "typeRoots": [
             "../../"
         ],
-        "types": [],
         "paths": {
-            "pixi.js": [
-                "pixi.js/v3"
-            ]
+            "q": [ "q/v0" ]
         },
+        "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
     "files": [
         "index.d.ts",
-        "pixi.js-tests.ts"
+        "q-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/qajax/index.d.ts b/qajax/index.d.ts
deleted file mode 100644
index 3476cb280e..0000000000
--- a/qajax/index.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for Qajax
-// Project: https://github.com/gre/qajax
-// Definitions by: Boltmade <https://github.com/Boltmade>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="q" />
-
-import * as Q from "q";
-
-export = Qajax;
-export as namespace Qajax;
-
-declare function Qajax(url : string) : Q.Promise<XMLHttpRequest>;
-declare function Qajax(options : any) : Q.Promise<XMLHttpRequest>;
-declare function Qajax(url : string, options : any) : Q.Promise<XMLHttpRequest>;
-
-declare namespace Qajax {
-	export var defaults : any;
-	export function filterStatus(validStatus : number) : (xhr : XMLHttpRequest) => Q.Promise<XMLHttpRequest>;
-	export function filterStatus(validStatus : (status : number) => boolean) : (xhr : XMLHttpRequest) => Q.Promise<XMLHttpRequest>;
-	export function filterSuccess() : Q.Promise<XMLHttpRequest>;
-
-	export function toJSON(xhr : XMLHttpRequest) : Q.Promise<any>;
-
-	export function getJSON(url : string) : Q.Promise<any>;
-
-	export function serialize(paramsObj : any) : string;
-}
\ No newline at end of file
diff --git a/qajax/qajax-tests.ts b/qajax/qajax-tests.ts
deleted file mode 100644
index 6770270cf4..0000000000
--- a/qajax/qajax-tests.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import Qajax = require("qajax");
-import * as Q from 'q';
-
-// Based on https://github.com/gre/qajax/blob/master/test/qajax.js
-
-function resetDefaults () {
-    Qajax.defaults.logs = true;
-    Qajax.defaults.timeout = 1000;
-    Qajax.defaults.method = "GET";
-    Qajax.defaults.headers = {};
-    Qajax.defaults.base = "";
-}
-
-var sample01url = "/test/dataset/sample01.json";
-var sample01json = [
-  { "name": "Jerome", "age": 20 },
-  { "name": "Gerard", "age": 30 },
-  { "name": "Martine", "age": 43 }
-];
-
-var emptyUrl = "/test/dataset/empty";
-
-function urlWithOptions (url : string, options : any) {
-  return url+"?"+Qajax.serialize(options);
-}
-
-Qajax;
-Qajax.filterStatus;
-Qajax.filterSuccess;
-Qajax.getJSON;
-Qajax.serialize({ foo: 123, bar: "toto" });
-Qajax.getJSON(sample01url).then((res) => true, (err) => true);
-Qajax(sample01url).then(Qajax.filterSuccess).then(Qajax.toJSON);
-Qajax(emptyUrl, { params: { status: 404 } }).then(Qajax.filterSuccess).then(Qajax.toJSON);
-Qajax({method: "POST", url: "/ECHO", data: "1234567890\nazerty\nuiopqsdfghjklm\nwxcvbn\n"}).then(Qajax.filterSuccess);
-Qajax({method: "POST", url: "/ECHO", data: { foo: 123, bar: { value: 42 }, arr: [1, 2, 3] }}).then(Qajax.filterSuccess).then(Qajax.toJSON);
-Qajax({ url: emptyUrl, params: { status: 201 } }).then(Qajax.filterStatus(200));
-Qajax({method: "POST", url: emptyUrl, params: { status: 500 }}).then(Qajax.filterSuccess).then(Qajax.toJSON);
-
-var cancellationD = Q.defer();
-var cancellation = cancellationD.promise;
-Qajax({ cancellation: cancellation, url: urlWithOptions(emptyUrl, { latency: 400 }) }).then(Qajax.filterSuccess).then(Qajax.toJSON);
-
-Qajax.defaults.timeout = 200;
-Qajax({method: "DELETE", url: sample01url, params: { latency: 500 }});
-
-resetDefaults();
-Qajax({method: "POST", url: sample01url, params: { latency: 300 }, timeout: 2000});
-
-Qajax.defaults.timeout = 200;
-Qajax({method: "DELETE", url: sample01url, params: { latency: 500 }, timeout: 0});
-
-resetDefaults();
-Qajax({headers: { "X-Hello": "world" }, method: "GET", url: "/ECHO_HEADERS"}).then(Qajax.filterSuccess).then(Qajax.toJSON);
-Qajax({headers: { "X-Hi": "world" }, method: "GET", url: "/ECHO_HEADERS"}).then(Qajax.filterSuccess).then(Qajax.toJSON);
-Qajax.defaults.headers = {"X-Foo": "bar"};
-Qajax({method: "GET", url: "/ECHO_HEADERS"}).then(Qajax.filterSuccess).then(Qajax.toJSON);
-
-resetDefaults();
-Qajax("sample01.json", {base: "/test/dataset/"}).then(Qajax.filterSuccess).then(Qajax.toJSON);
-Qajax.defaults.base = "/test/dataset/";
-Qajax("empty").then(Qajax.filterSuccess);
-
-resetDefaults();
-Qajax.defaults.method = "POST";
-Qajax("/ECHO", { data: "1234567890\nazerty\nuiopqsdfghjklm\nwxcvbn\n", responseType: "text/plain" }).then(Qajax.filterSuccess);
-
-resetDefaults();
-Qajax.getJSON(urlWithOptions(sample01url, { latency: 50 })).then((res) => true, (err) => true, () => true);
diff --git a/qlik-visualizationextensions/index.d.ts b/qlik-visualizationextensions/index.d.ts
new file mode 100644
index 0000000000..e5d5850423
--- /dev/null
+++ b/qlik-visualizationextensions/index.d.ts
@@ -0,0 +1,2505 @@
+// Type definitions for qlik-visualizationextensions 3.2
+// Project: http://help.qlik.com/en-US/sense-developer/3.2/Subsystems/Extensions/Content/extensions-introduction.htm
+// Definitions by: Konrad Mattheis <https://github.com/konne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angular" />
+
+declare namespace BackendAPI {
+    type StateType = "L" | "S" | "O" | "D" | "A" | "X" | "XS" | "XL";
+    type SortIndicatorType = "N" | "A" | "D";
+    type DimensionType = "D" | "N" | "T";
+    type GroupingType = "N" | "H" | "C";
+    type FieldAttributesType = "U" | "A" | "I" | "R" | "F" | "M" | "D" | "T" | "TS" | "IV";
+    type PatchType = "Add" | "Remove" | "Replace";
+
+    interface ICharRange {
+        /**
+         * Position of the first search occurrence
+         * Integer
+         */
+        qCharPos: number;
+
+        /**
+         * Number of occurrences found
+         * Integer
+         */
+        qCharCount: number;
+    }
+
+    interface INxHighlightRanges {
+        /**
+         * Ranges of highlighted values
+         * Array of CharRange
+         */
+        qRanges: ICharRange[];
+    }
+
+    interface INxSimpleValue {
+        /**
+         * Text related to the attribute expression value.
+         * This property is optional. No text is returned if the attribute expression value is a numeric.
+         * String
+         */
+        qText: string;
+
+        /**
+         * Numeric value of the attribute expression.
+         * This property is set to NaN (Not a Number) if the attribute expression value is not a numeric.
+         * Numerical values are not returned as text.
+         * Double precision floating point
+         */
+        qNum: number;
+    }
+
+    interface INxAttributeExpressionValues {
+        /**
+         * List of attribute expressions values.
+         * Array of NxSimpleValue
+         */
+        qValues: INxSimpleValue[];
+    }
+
+    interface INxSimpleDimValue {
+        /**
+         * Text related to the attribute expression value.
+         * This property is optional. No text is returned if the attribute expression value is a numeric.
+         * String
+         */
+        qText: string;
+
+        /**
+         * Element number.
+         * Integer
+         */
+        qElemNo: number;
+    }
+
+    interface INxAttributeDimValues {
+        /**
+         * List of values.
+         * Array of NxSimpleDimValue
+         */
+        qValues: INxSimpleDimValue[];
+    }
+
+    interface INxCell {
+        /**
+         * Some text.
+         * This parameter is optional.
+         */
+        qText?: string;
+
+        /**
+         * A value.
+         * This parameter is optional.
+         */
+        qNum?: number;
+
+        /**
+         * Rank number of the value, starting from 0.
+         * If the element number is a negative number, it means that the returned value is not an element number.
+         * You can get the following negative values:
+         *       # -1: the cell is a Total cell. It shows a total.
+         *       # -2: the cell is collapsed. Applies to pivot tables.
+         *       # -3: the cell belongs to the group Others.
+         *       # -4: the cell is empty. Applies to pivot tables.
+         */
+        qElemNumber: number;
+
+        /**
+         * State of the value.
+         * The default state for a measure is L.
+         * L for Locked
+         * S for Selected
+         * O for Optional
+         * D for Deselected
+         * A for Alternative
+         * X for eXcluded
+         * XS for eXcluded Selected
+         * XL for eXcluded Locked
+         */
+        qState: StateType;
+
+        /**
+         * Is set to true, if qText and qNum are empty.
+         * This parameter is optional. The default value is false.
+         */
+        qIsEmpty: boolean;
+
+        /**
+         * Is set to true if a total is displayed in the cell.
+         * This parameter is optional. The default value is false.
+         * Not applicable to list objects.
+         */
+        qIsTotalCell: boolean;
+
+        /**
+         * Is set to true if the cell belongs to the group Others.
+         * Dimension values can be set as Others depending on what has been defined in OtherTotalSpecProp.
+         * This parameter is optional. The default value is false.
+         * Not applicable to list objects.
+         */
+        qIsOtherCell: boolean;
+
+        /**
+         * Frequency of the value.
+         * This parameter is optional.
+         */
+        qFrequency: string;
+
+        /**
+         * Search hits.
+         * The search hits are highlighted.
+         * This parameter is optional.
+         */
+        qHighlightRanges: INxHighlightRanges;
+
+        /**
+         * Attribute expression values.
+         */
+        qAttrExps: INxAttributeExpressionValues;
+
+        /**
+         * Is set to true if the value is Null.
+         */
+        qIsNull: boolean;
+
+        /**
+         * Attribute dimensions values.
+         */
+        qAttrDims: INxAttributeDimValues;
+    }
+
+    interface INxPage {
+        /**
+         * Position from the left.
+         * Corresponds to the first column.
+         */
+        qLeft: number;
+
+        /**
+         * Position from the top.
+         * Corresponds to the first row.
+         */
+        qTop: number;
+
+        /**
+         * Number of columns in the page. The indexing of the columns may vary depending on whether
+         * the cells are expanded or not (parameter qAlwaysFullyExpanded in HyperCubeDef).
+         */
+        qWidth: number;
+
+        /**
+         * Number of rows or elements in the page. The indexing of the rows may vary depending on
+         * whether the cells are expanded or not (parameter qAlwaysFullyExpanded in HyperCubeDef).
+         */
+        qHeight: number;
+    }
+
+    interface INxAttrDimInfo {
+        /**
+         * Cardinality of the attribute expression.
+         *     Integer
+         */
+        qCardinal: number;
+
+        /**
+         * Number of rows.
+         *     Size
+         */
+        qSize: number;
+
+        /**
+         * The title for the attribute dimension.
+         * String
+         */
+        qFallbackTitle: string;
+
+        /**
+         * The Locked value of the dimension.
+         * Boolean
+         */
+        qLocked: boolean;
+
+        /**
+         * Validation error.
+         * REF(NxValidationError)
+         */
+        //?Type = REF(NxValidationError)?
+        qError: INxValidationError;
+    }
+
+    interface INxDimensionInfo {
+        /**
+         * Corresponds to the label of the dimension that is selected.
+         * If the label is not defined then the field name is used.
+         * String
+         */
+        qFallbackTitle: string;
+
+        /**
+         * Length of the longest value in the field.
+         * Integer
+         */
+        qApprMaxGlyphCount: number;
+
+        /**
+         * Number of distinct field values.
+         * Integer
+         */
+        qCardinal: number;
+
+        /**
+         * Is set to true if the field is locked.
+         * Boolean
+         */
+        qLocked: boolean;
+
+        /**
+         * Sort indicator.
+         * This parameter is optional.
+         * The default value is no sorting.
+         * One of:
+         *       # N for no sorting
+         *       # A for sorting ascending
+         *       # D for sorting descending
+         */
+        qSortIndicator: SortIndicatorType;
+
+        /**
+         * Array of dimension labels.
+         * Contains the labels of all dimensions in a hierarchy group
+         * (for example the labels of all dimensions in a drill down group).
+         * Array of String
+         */
+        qGroupFallbackTitles: string[];
+
+        /**
+         * Index of the dimension that is currently in use.
+         * qGroupPos is set to 0 if there are no hierarchical groups (drill-down groups) or cycle groups.
+         * Integer
+         */
+        qGroupPos: number;
+
+        /**
+         * Number of values in a particular state.
+         * NxStateCounts
+         */
+        qStateCounts: INxStateCounts;
+
+        /**
+         * Gives information on a field. For example, it can return the type of the field.
+         * Examples: key, text, ASCII
+         * Array of String
+         */
+        qTags: string[];
+
+        /**
+         * This parameter is optional.
+         * Gives information on the error.
+         * Null or NxValidationError
+         */
+        qError: INxValidationError;
+
+        /**
+         * Binary format of the field.
+         * One of:
+         *       # D for discrete (String)
+         *       # N for numeric (Double)
+         *       # T for Time (Timestamp)
+         */
+        qDimensionType: DimensionType;
+
+        /**
+         * If set to true, it inverts the sort criteria in the field.
+         * Boolean
+         */
+        qReverseSort: boolean;
+
+        /**
+         * Defines the grouping.
+         * One of:
+         *       # N for no grouping
+         *       # H for drill-down
+         *       # C for cyclic
+         */
+        qGrouping: GroupingType;
+
+        /**
+         * If set to true, it means that the field is a semantic.
+         * Boolean
+         */
+        qIsSemantic: boolean;
+
+        /**
+         * Format of the field.
+         * This parameter is optional.
+         * FieldAttributes
+         */
+        qNumFormat: FieldAttributesType;
+
+        /**
+         * This parameter is set to true if qNumFormat is set to U (unknown).
+         * The engine guesses the type of the field based on the field's definition.
+         * Boolean
+         */
+        qIsAutoFormat: boolean;
+
+        /**
+         * Array of field names.
+         * Array of String
+         */
+        qGroupFieldDefs: string[];
+
+        /**
+         * Array of attribute expressions.
+         * Array of NxAttrExprInfo
+         */
+        qAttrExprInfo: INxAttrExprInfo;
+
+        /**
+         * Minimum value.
+         * Double
+         */
+        qMin: number;
+
+        /**
+         * Maximum value.
+         * Double
+         */
+        qMax: number;
+
+        /**
+         * Is continuous axis used.
+         * Boolean
+         */
+        qContinuousAxes: boolean;
+
+        /**
+         * Is a cyclic dimension used.
+         * Boolean
+         */
+        qIsCyclic: boolean;
+
+        /**
+         * Is derived field is used as a dimension.
+         * Boolean
+         */
+        qDerivedField: boolean;
+
+        /**
+         * Array of attribute dimensions.
+         * Array of NxAttrDimInfo
+         */
+        qAttrDimInfo: INxAttrDimInfo;
+    }
+
+    interface INxAttrExprInfo {
+        /**
+         * Minimum value.
+         */
+        qMin: number;
+
+        /**
+         * Maximum value.
+         */
+        qMax: number;
+
+        /**
+         * Is continuous axis used.
+         */
+        qContinuousAxes: boolean;
+
+        /**
+         * Is a cyclic dimension used.
+         */
+        qIsCyclic: boolean;
+
+        /**
+         * Corresponds to the label of the dimension that is selected.
+         */
+        qFallbackTitle: string;
+    }
+
+    interface INxStateCounts {
+        /**
+         * Number of values in locked state.
+         * Integer
+         */
+        qLocked: number;
+
+        /**
+         * Number of values in selected state.
+         * Integer
+         */
+        qSelected: number;
+
+        /**
+         * Number of values in optional state.
+         * Integer
+         */
+        qOption: number;
+
+        /**
+         * Number of values in deselected state.
+         * Integer
+         */
+        qDeselected: number;
+
+        /**
+         * Number of values in alternative state.
+         * Integer
+         */
+        qAlternative: number;
+
+        /**
+         * Number of values in excluded state
+         * Integer
+         */
+        qExcluded: number;
+
+        /**
+         * Number of values in selected excluded state.
+         * Integer
+         */
+        qSelectedExcluded: number;
+
+        /**
+         * Number of values in locked excluded state.
+         * Integer
+         */
+        qLockedExcluded: number;
+    }
+
+    interface INxValidationError {
+        /**
+         * Error code.
+         * This parameter is always displayed in case of error.
+         * Integer
+         */
+        qErrorCode: number;
+
+        /**
+         * Context related to the error, from the user app domain.
+         * It can be the identifier of an object, a field name, a table name.
+         * This parameter is optional.
+         * String
+         */
+        qContext: string;
+
+        /**
+         * Internal information from the server.
+         * This parameter is optional.
+         * String
+         */
+        qExtendedMessage: string;
+    }
+
+    interface IFieldAttributes {
+        /**
+         * Type of the field.
+         * Default is U.
+         * One of:
+         *       # U for UNKNOWN type.
+         *       # A for ASCII; Numeric fields values contain only standard ASCII characters.
+         *       # I for INTEGER; Numeric fields values are shown as integer numbers.
+         *       # R for REAL; Numeric fields values are shown as real numbers.
+         *       # F for FIX; Numeric fields values are shown as numbers with a fix number of decimals.
+         *       # M for MONEY; Numeric fields values are shown as in the money format.
+         *       # D for DATE; Numeric fields values are shown as dates.
+         *       # T for TIME; Numeric fields values are shown as times.
+         *       # TS TIMESTAMP; Numeric fields values are shown as time stamps.
+         *       # IV for INTERVAL; Numeric fields values are shown as intervals.
+         */
+        qType: FieldAttributesType;
+
+        /**
+         * Number of decimals.
+         * Default is 10.
+         * Integer between 0 and 15.
+         */
+        qnDec: number;
+
+        /**
+         * Defines whether or not a thousands separator must be used.
+         * Default is 0.
+         * One of: 0 for false | 1 for true
+         */
+        qUseThou: boolean;
+
+        /**
+         * Defines the format pattern that applies to qText.
+         * Is used in connection to the type of the field (parameter qType).
+         * For more information, see Struct FieldAttributes.
+         * Example: YYYY-MM-DD for a date
+         */
+        qFmt: string;
+
+        /**
+         * Defines the decimal separator.
+         * Example: .
+         */
+        qDec: string;
+
+        /**
+         * Defines the thousand separator (if any).
+         * Is used if qUseThou is set to 1.
+         * Example: ,
+         */
+        qThou: string;
+
+        /**
+         * Array
+         */
+        qSAFEARRAY: any[];
+    }
+
+    interface INxMeasureInfo {
+        /**
+         * Corresponds to the label of the measure. If the label is not defined then the measure name is used.
+         * String
+         */
+        qFallbackTitle: string;
+
+        /**
+         * Length of the longest value in the field.
+         * Integer
+         */
+        qApprMaxGlyphCount: number;
+
+        /**
+         * Number of distinct field values.
+         * Integer
+         */
+        qCardinal: number;
+
+        /**
+         * Sort indicator. This parameter is optional. The default value is no sorting.
+         */
+        qSortIndicator: SortIndicatorType;
+
+        /**
+         * Format of the field. This parameter is optional.
+         * One of: N for no sorting, A for sorting ascending, D for sorting descending
+         */
+        qNumFormat: IFieldAttributes;
+
+        /**
+         * This parameter is set to true if qNumFormat is set to U (unknown).
+         * The engine guesses the type of the field based on the field's expression.
+         */
+        qIsAutoFormat: boolean;
+
+        /**
+         * Lowest value in the range.
+         */
+        qMin: number;
+
+        /**
+         * Highest value in the range.
+         */
+        qMax: number;
+
+        /**
+         * This parameter is optional. Gives information on the error.
+         */
+        qError: INxValidationError;
+
+        /**
+         * If set to true, it inverts the sort criteria in the field.
+         */
+        qReverseSort: boolean;
+
+        /**
+         * List of attribute expressions.
+         */
+        qAttrExprInfo: INxAttrExprInfo[];
+
+        /**
+         * List of attribute dimensions.
+         */
+        qAttrDimInfo: INxMeasureInfo[];
+    }
+
+    interface IRange {
+        /**
+         * Lowest value in the range
+         * Double
+         */
+        qMin: number;
+
+        /**
+         * Highest value in the range
+         * Double
+         */
+        qMax: number;
+
+        /**
+         * If set to true, the range includes the lowest value in the range of
+         * selections (Equals to ). [bn(50500)]
+         * Example: The range is [1,10]. If qMinInclEq is set to true it means
+         * that 1 is included in the range of selections.
+         */
+        qMinInclEq: boolean;
+
+        /**
+         * If set to true, the range includes the highest value in the range of
+         * selections (Equals to ). [bn(50500)]
+         * Example: The range is [1,10]. If qMinInclEq is set to true it means
+         * that 10 is included in the range of selections.
+         */
+        qMaxInclEq: boolean;
+    }
+
+    interface INxPatch {
+        /**
+       * Operation to perform.
+       * One of:
+       *       # Add
+       *       # Remove
+       *       # Replace
+       */
+        qOp: PatchType;
+
+        /**
+         * Path to the property to add, remove or replace.
+         * String
+         */
+        qPath: string;
+
+        /**
+         * This parameter is not used in a remove operation. Corresponds to the value of the
+         * property to add or to the new value of the property to update.
+         * Examples: "false", "2", "\"New title\""
+         * String
+         */
+        qValue: string;
+    }
+
+    interface IBackend {
+        /**
+         * Aborts the result of a search in a list object. Clears the existing search and returns the
+         * object to the state it was in prior to the search started.
+         */
+        abortSearch(): void;
+
+        /**
+         * Accepts the result of a search in a list object and the search result is selected in the field.
+         * @param {boolean} toggleMode - If true, toggle state for selected values
+         */
+        acceptSearch(toggleMode: boolean): void;
+
+        /**
+         * Updates the properties for this object.
+         * @param {array} qPatches - Array of patches. Each path contains:
+         *        #qOp: Add/Remove/Replace
+         *        #qPath: Path to property
+         *        #qValue: The new value in string format. Strings need to be surrounded by \".
+         * @param {boolean} qSoftPatch - Set to True if properties should be soft, that is not persisted.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        applyPatches(qPatches: any[], qSoftPatch: boolean): ng.IPromise<any>;
+
+        /**
+         * Clears unconfirmed selections for this object.
+         */
+        clearSelections(): void;
+
+        /**
+         * Clears all soft patches that has previously been applied for this object using the
+         * applyPatches method.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        clearSoftPatches(): ng.IPromise<any>;
+
+        /**
+         * Collapse the left dimensions of a pivot table. Only works for hypercubes with
+         * qMode = P which are not always fully expanded.
+         * @param {number} qRow - Row index.
+         * @param {number} qCol - Column index.
+         * @param {boolean} [qAll] - Optional. If set to true, qRow and qCol are ignored and all cells are collapsed.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        collapseLeft(qRow: number, qCol: number, qAll?: boolean): ng.IPromise<any>;
+
+        /**
+         * Collapse the top dimensions of a pivot table. Only works for hypercubes with
+         * qMode = P which are not always fully expanded.
+         * @param {number} qRow - Row index.
+         * @param {number} qCol - Column index.
+         * @param {boolean} [qAll] - Optional. If set to true, qRow and qCol are ignored and all cells are collapsed.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        collapseTop(qRow: number, qCol: number, qAll?: boolean): ng.IPromise<any>;
+
+        /**
+         * Loops through data rows for this object. Only rows that are available client side will be used.
+         * @param {function} callback - Function to call for each row.
+         * Parameters are row number and row data as an array of NxCell objects.
+         * The loop is terminated if the function returns false.
+         * @return {NxCell[]} - An array of NxCell.
+         */
+        eachDataRow(callback: any): INxCell[];
+
+        /**
+         * Expands the left dimensions of a pivot table. Only works for hypercubes with
+         * qMode = P which are not always fully expanded.
+         * @param {number} qRow - Row index.
+         * @param {number} qCol - Column index.
+         * @param {boolean} [qAll] - Optional. If set to true, qRow and qCol are ignored and all cells are collapsed.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        expandLeft(qRow: number, qCol: number, qAll?: boolean): ng.IPromise<any>;
+
+        /**
+         * Expands the top dimensions of a pivot table. Only works for hypercubes with
+         * qMode = P which are not always fully expanded.
+         * @param {number} qRow - Row index.
+         * @param {number} qCol - Column index.
+         * @param {boolean} [qAll] - Optional. If set to true, qRow and qCol are ignored and all cells are collapsed.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        expandTop(qRow: number, qCol: number, qAll?: boolean): ng.IPromise<any>;
+
+        /**
+         * Geta data from Qlik engine for this object.
+         * @param {array} qPages - An array of NxPage objects.
+         * @return {Promise} - A promise of qDataPages.
+         */
+        getData(qPages: INxPage[]): ng.IPromise<any>;
+
+        /**
+         * Gets a data row for this object.
+         * @param {number} rownum - The row number.
+         * @return {NxCell} - A row of NxCell or null if the row is not available client side
+         *                    and need to be fetched with getData method.
+         */
+        getDataRow(rownum: number): INxCell;
+
+        /**
+         * Gets qDimensionInfo for this object.
+         * @return {NxDimensionInfo[]} - An array of qDimensionInfo objects.
+         */
+        getDimensionInfos(): INxDimensionInfo[];
+
+        /**
+         * Gets qMeasureInfo for this object.
+         * @return {NxMeasureInfo} - An array of qMeasureInfo objects.
+         */
+        getMeasureInfos(): INxMeasureInfo;
+
+        /**
+         * Gets pivot data from the Qlik engine for this object. Only works for hypercubes with qMode = P.
+         * @param {array} qPages - An array of request page objects.
+         * @return {Promise} - A promise of pivot data pages.
+         */
+        getPivotData(qPages: INxPage[]): ng.IPromise<INxPage[]>;
+
+        /**
+         * Get properties for this object.
+         * @return {Promise} - A promise of object properties.
+         */
+        getProperties(): ng.IPromise<any>;
+
+        /**
+         * Get reduced data from the Qlik engine for this object. This method is intended for preserving the
+         * shape of the data, not for viewing the actual data points.
+         * @param {array} qPages - An array of request page objects.
+         * @param {number} qZoomFactor - Zoom factor.
+         * If set to -1, the Qlik engine decides of the zoom factor.
+         * If qReductionMode is D1 or S, the zoom factor is 2n.
+         * If the zoom factor is 5, the data are reduced by a factor 32.
+         * If qReductionMode is C, the zoom factor defines the number of centroids.
+         * @param {string} qReductionMode - Reduction mode.Can be:
+         *        # N for no data reduction.
+         *        # D1 to reduce a bar chart or line chart.
+         *          The profile of the chart is reduced whatever the number of dimensions in the chart.
+         *        # S to reduce the resolution of a scatter plot.
+         *        # C to reduce the data of a scatter plot chart.
+         *        # ST to reduce the data of a stacked pivot table.
+         * @return {Promise} - A promise of reduced data pages.
+         */
+        getReducedData(qPages: INxPage[], qZoomFactor: number, qReductionMode: string): ng.IPromise<any>;
+
+        /**
+         * Get total number of data rows for this object.
+         * @return {Number} - A number.
+         */
+        getRowCount(): number;
+
+        /**
+         * Get stacked data from the Qlik engine for this object. Only works for hypercubes with qMode = S.
+         * @param {array} qPages - An array of request page objects.
+         * @param {number} qMaxNbrCells - Maximum number of cells at outer level.
+         * @return {Promise} - A promise of stack data pages.
+         */
+        getStackedData(qPages: INxPage[], qMaxNbrCells: number): ng.IPromise<any>;
+
+        /**
+         * Find out if there are unconfirmed selections for this object.
+         * @return {boolean} - True if there are unconfirmed selections.
+         */
+        hasSelections(): boolean;
+
+        /**
+         * Save this object.
+         * @return {Promise} - A promise. In case of success, it returns "undefined". In case of failure it returns the error.
+         */
+        save(): ng.IPromise<any>;
+
+        /**
+         * Search for a term in a list object. Results in an updated layout, containing only matching records.
+         * @param {string} term - Term to search for.
+         */
+        search(term: string): void;
+
+        /**
+         * Select values in this object using ranges.
+         * @param {array} qRanges - Array of ranges to select.
+         * @param {boolean} qOrMode - If true only one of the measures needs to be in range.
+         */
+        selectRange(qRanges: IRange[], qOrMode: boolean): void;
+
+        /**
+         * Select values in this object with a Qlik engine call which triggers a repaint of the object.
+         * @param {number} qDimNo - Dimension number. 0 = first dimension.
+         * @param {array} qValues - Array of values (qElemNumber in the matrix from the Qlik engine) to select or deselect.
+         * @param {boolean} qToggleMode - If true, values in the field are selected in addition to any previously selected items.
+         * If false, values in the field are selected while previously selected items are deselected.
+         */
+        selectValues(qDimNo: number, qValues: any[], qToggleMode: boolean): void;
+
+        /**
+         * Set properties for this object.
+         * @param {object} props - The properties to set.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        setProperties(props: any): ng.IPromise<any>;
+    }
+}
+
+declare namespace RootAPI {
+    interface IAppConfig {
+        /**
+         * Optional Qlik host.
+         */
+        host?: string;
+
+        /**
+         * Port number.
+         */
+        port: string | number;
+
+        /**
+         * Optional. Qlik virtual proxy. "/" if no proxy.
+         */
+        prefix?: string;
+
+        /**
+         * Optional. Use SSL.
+         */
+        isSecure?: boolean;
+
+        /**
+         * Optional. Open app without loading data. Introduced in version 1.1.
+         */
+        openWithoutData?: boolean;
+
+        /**
+         * Optional. Unique identity for the session. If omitted, the session will be shared.
+         */
+        identity?: string;
+    }
+
+    interface IGlobalConfig {
+        /**
+         * Qlik Sense host
+         */
+        host: string;
+
+        /**
+         * Port number
+         */
+        port: string;
+
+        /**
+         * Qlik Sense virtual proxy. / if no virtual proxy
+         */
+        prefix: string;
+
+        /**
+         * Use SSL
+         */
+        isSecure: boolean;
+
+        /**
+         * Unique identity for the session. If omitted, the session will be shared.
+         */
+        identity: string;
+    }
+
+    interface IRoot {
+        /**
+         * Calls the Qlik Sense repository.
+         * @param {string} path - Path to the Qlik Sense repository.
+         * Refer to Qlik Sense repository documentation for the available paths.
+         * @param {string} [method] - Optional. HTTP method. Default is GET.
+         * @param {string} [body] - Optional. Body of the post.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        callRepository(path: string, method?: string, body?: string): ng.IPromise<any>;
+
+        /** currApp
+         * Gets a reference to the current app. Use the currApp method in an extension to get a reference to the app currently displayed.
+         * @param {object} [reference] - Optional. Reference to extension object. Introduced in version 1.1.
+         * @return {IApp} - An App JavaScript object with app methods.
+         */
+        currApp(object?: any): AppAPI.IApp;
+
+        /**
+         * Gets a list of Qlik Sense apps that you potentially can connect to and registers a callback to receive the data.
+         * The getAppList method opens a WebSocket, gets the app list, and then closes the WebSocket.
+         * @param {function} callback - Callback method.
+         * @param {object} [config] - Optional. Additional configuration parameters:
+         * Name | Type | Descr | Name
+         * host | String | Optional. Qlik host. | host
+         * port | String or integer | Port number. | port
+         * prefix | String | Optional. Qlik virtual proxy. "/" if no proxy. | prefix
+         * isSecure | Boolean | Optional. Use SSL. | isSecure
+         * openWithoutData | Boolean | Optional. Open app without loading data. Introduced in version 1.1. | openWithoutData
+         * identity | String | Optional. Unique identity for the session. If omitted, the session will be shared. | identity
+         */
+        getAppList(callback: any, config?: any): void;
+
+        /**
+         * Gets a list of extensions installed for Qlik Sense. The reply contains all extensions,
+         * that is widget libraries, visualization extensions and mashups.
+         * @param {function} [callback] - Optional. Callback method.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        getExtensionList(callback?: any): ng.IPromise<any>;
+
+        /**
+         * Opens a WebSocekt connection to the Qlik engine for global methods.
+         * @param {object} [config] - Optional. Parameters:
+         * Name | Type | Description
+         * host | String | Qlik Sense host
+         * port | String | Port number
+         * prefix | String | Qlik Sense virtual proxy. / if no virtual proxy
+         * isSecure | Boolean | Use SSL
+         * identity | String | Unique identity for the session. If omitted, the session will be shared.
+         * @return {ANY} - A global JavaScript object with global methods.
+         */
+        getGlobal(config: any): any;
+
+        /** Opens a Qlik Sense app. You can open multiple apps.
+         *      Most other methods are defined on the app. Returns:  App JavaScript object with app methods.
+         * @param {string} appId The app id.
+         * @param {object} [config] Optional. Additional configuration parameters:
+         *     Name   |   Type   | Descr
+         *     host   |   String   |   Optional. Qlik host.
+         *     port   |   String or Integer   |   Port number.
+         *     prefix |   String   |   Optional. Qlik virtual proxy. "/" if no proxy.
+         *     isSecure   |   Boolean   |   Optional. Use SSL.
+         *     openWithoutData   |   Boolean   |   Optional. Open app without loading data. Introduced in version 1.1.
+         *     identity   |   String   |   Optional. Unique identity for the session. If omitted, the session will be shared.
+         *     Parameter updated in version 2.2.
+         * @return {any} - App JavaScript object with app methods.
+         */
+        openApp(appId: string, config?: any): any;
+
+        /**
+         * Registers an extension for use in this mashup. The extension is not installed on the
+         * Qlik Sense server and only available in the session where it is created.
+         * As long as a JavaScript module is created in the correct format, it can be sent to
+         * the registerExtension function.
+         * @param {string} id - Set the ID of the visualization extension.
+         * @param {object} impl - Set the extension implementation.
+         * @param {object} [metadata] - Optional. Extension meta-data, same format as the QEXT file. Default: {"type":"visualization"}
+         */
+        registerExtension(id: string, impl: any, metadata?: any): void;
+
+        /**
+         * Sends a resize event to all Qlik Sense objects.
+         * @param {string} [ID] - Object id. Optional: if no ID resize event will be sent to all objects.
+         */
+        resize(ID?: string): void;
+
+        /**
+         * Sets a specific language for the Qlik Sense session.
+         * Language should be defined before the app is opened meaning the setLanguage
+         * method should be called before the openApp method is called.
+         * @param {string} lang - Language code. Can be:
+         *       # German: short: de long: de-DE
+         *       # English: short: en long: en-US
+         *       # Spanish: short: es long: es-ES
+         *       # French: short: fr long: fr-FR
+         *       # Italian: short: it long: it-IT
+         *       # Japanese: short: ja long: ja-JP
+         *       # Korean: (introduced in version 3.0) short: ko long: ko-KR
+         *       # Dutch: short: nl long: nl-NL
+         *       # Polish: (introduced in version 3.0) short: pl long: pl-PL
+         *       # Brazilian Portuguese: short: pt long: pt-BR
+         *       # Russian: short: ru long: ru-RU
+         *       # Swedish: short: sv long: sv-SE
+         *       # Turkish: (introduced in version 3.0) short: tr long: tr-TR
+         *       # Simplified Chinese: short: Do not use! long: zh-CN
+         *       # Traditional Chinese: (introduced in version 3.0) short: Do not use! long: zh-TW
+         */
+        setLanguage(lang: string): void;
+
+        /**
+         * Registers a callback for error handling. Standard Qlik Sense error
+         * handling is used if this method is not called.
+         * @param {function} onError - Error handling function
+         * @param {function} [onWarning] - Optional. Warning handling function. Introduced in version 2.1.
+         */
+        setOnError(onError: any, onWarning?: any): void;
+
+        /**
+         * Create a QTable object that wraps data in your extension and provides an object oriented interface.
+         * @param {object} ext - Extension or angular scope for the extension.
+         * @param {string} [path] - Optional. Path to the hypercube. Default: qHyperCube
+         * @return {QTable} - A QTable object that holds data and options for the table.
+         */
+        table(ext: any, path?: string): TableAPI.IQTable;
+
+        navigation: NavigationAPI.INavigation;
+    }
+}
+
+declare namespace AppAPI {
+    interface IApp {
+        /**
+         * Adds an alternate state in the app. Multiple states within a Qlik Sense
+         * app can be created and applied to specific objects within the app.
+         * Objects in a given state are not affected by user selection in the other states.
+         * @param {string} qStateName - Mandatory. Alternate state name.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        addAlternateState(qStateName: string): ng.IPromise<any>;
+
+        /**
+         * Steps back in the list of selections.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        back(): ng.IPromise<any>;
+
+        /**
+         * Clears all selections in all fields of the current Qlik Sense app.
+         * @param {boolean} [lockedAlso] - Optional. Alternate state name. Default: false Introduced in version 2.1.
+         * @param {string} [state] - Optional. Alternate state name. Default: $ Introduced in version 2.1.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        clearAll(lockedAlso?: boolean, state?: string): ng.IPromise<any>;
+
+        /**
+         * Closes a Qlik Sense app. Also closes the WebSocket and clears out client side data.
+         */
+        close(): void;
+
+        /**
+         * Defines a hypercube and registers a callback to receive the data.
+         * @param {object} qHyperCubeDef - Cube definition.
+         * @param {function} [callback] - Optional. Callback method. Parameter will contain a qHyperCube.
+         * @return {Promise} - A promise of an object model.
+         */
+        createCube(qHyperCubeDef: any, callback?: any): ng.IPromise<any>;
+
+        /**
+         * Creates a generic object and registers a callback to receive the data. The generic object can contain the following:
+         *       # qHyperCubeDef
+         *       # qListObjectDef
+         *       # qStringExpression
+         *       # qValueExpression
+         * The callback method will be called whenever the selection state changes
+         * in a way that affects the generic object.
+         * The parameter will be the evaluated version of the definition.
+         * @param {object} [def] - Optional. Generic object definition
+         * @param {function} [callback] - Optional. Callback method.
+         * @return {Promise} - A promise of an object model.
+         */
+        createGenericObject(def?: any, callback?: any): ng.IPromise<any>;
+
+        /**
+         * Defines a list of field values and registers a callback to receive the data.
+         * @param {object} qListObjectDef - List definition.
+         * @param {function} [callback] - Optional. Callback method. Parameter will contain a qListObject.
+         * @return {Promise} - A promise of an object model.
+         */
+        createList(qListObjectDef: any, callback?: any): ng.IPromise<any>;
+
+        /**
+         * Defines a hypercube for a table and is the entry point to the Table API.
+         * It creates a table object that wraps the hypercube.
+         * @param {Array.<String|Object>} dimensions - Dimensions to use.
+         * Should, for each entry, be a field name or a NxDimension structure.
+         * @param {Array.<String|Object>} measures - Measures to use.
+         * Should, for each entry, be an expression or a NxMeasure structure.
+         * @param {object} [options] - Optional. Options to set.
+         * @return {QTable} - A table object of type QTable, which is initially
+         *                    empty but that eventually will contain data.
+         *                    The table object will be updated when selection state changes.
+         */
+        createTable(dimensions: string[] | any[], measures: string[] | any[], options?: any): TableAPI.IQTable;
+
+        /**
+         * Destroys a Qlik Sense session object created with the createGenericObject
+         * method or any of createCube, createList or getList methods.
+         * Calling this method removes the object from the Qlik engine,
+         * no more updates are sent to the client and all methods on the object are invalid.
+         * @param {string} id - Session object id.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        destroySessionObject(id: string): ng.IPromise<any>;
+
+        /**
+         * Reloads the data in a Qlik Sense app.
+         * @param {string} [qMode] - Optional. Error handling mode:
+         *       # 0 = default mode.
+         *       # 1 = attempt recovery on all errors.
+         *       # 2 = fail on all errors.
+         * @param {boolean} [qPartial] - Optional. Set to true for partial reload.
+         * @param {boolean} [qDebug] - Optional. Set to true if debug breakpoints are honored. Execution of the script will be in debug mode.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        doReload(qMode?: string, qPartial?: boolean, qDebug?: boolean): ng.IPromise<any>;
+
+        /**
+         * Saves a Qlik Sense app, including all objects and data in the data model.
+         * @param {string} [qFileName] - Optional. File name of the file to save.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        doSave(qFileName?: string): ng.IPromise<any>;
+
+        /**
+         * Gets a field reference with methods that can be used to manipulate the field.
+         * @param {string} [field] - Optional. Name of the field.
+         * @param {string} [state] - Optional. Alternate state name. Default is $.
+         * @return {QField} - A QField object with methods and properties that can be used to manipulate the field.
+         */
+        field(field?: string, state?: string): FieldAPI.IQField;
+
+        /**
+          * Step forward in list of selections.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        forward(): ng.IPromise<any>;
+
+        /**
+         * Gets a layout for this Qlik Sense app and registers a callback to receive the data.
+         * Returns the dynamic properties (if any) in addition to the fixed properties.
+         * @param {function} [callback] - Optional. Callback method.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        getAppLayout(callback?: any): ng.IPromise<any>;
+
+        /**
+         * Gets a list of sheets and visualizations and registers a callback to receive the data.
+         * @param {string} [field] - Optional. Type of object. One of:
+         *        # sheet
+         *        # masterobject
+         * Default is sheet.
+         * @param {function} [callback] - Optional. Callback method.
+         */
+        getAppObjectList(type?: string, callback?: any): void;
+
+        /**
+         * Gets properties for a generic object, the children of the generic object
+         * and the bookmarks and/or embedded snapshots of the generic object.
+         * @param {string} id - Object id.
+         * @return {Promise} - A promise of an object model.
+         */
+        getFullPropertyTree(id: string): ng.IPromise<any>;
+
+        /**
+         * Gets a list of internal Qlik Sense objects and registers a callback to receive the data.
+         * @param {string} type - Type of object:
+         *       # FieldList
+         *       # MeasureList
+         *       # DimensionList
+         *       # BookmarkList
+         *       # SelectionObject
+         *       # SnapshotList (Introduced in version 1.1)
+         *       # MediaList (Introduced in version 1.1)
+         *       # Sheet (Introduced in version 1.1)
+         *       # MasterObject (Introduced in version 1.1)
+         *       # VariableList (Introduced in version 2.0)
+         *       # story (Introduced in version 2.1)
+         * @param {function} [callback] - Optional. Registers a callback that is executed every time data is returned.
+         * @return {Promise} - A promise of an object model.
+         */
+        getList(type: string, callback?: any): ng.IPromise<any>;
+
+        /**
+         * Retrieves a Qlik Sense object from the Qlik Sense application and inserts
+         * it into a HTML element. The object fills the HTML object, so you can size
+         * and position the element to determine how large the Qlik Sense object will be.
+         * If you supply only one parameter, you get the model without displaying the object.
+         * @param {string} id - Object id or 'CurrentSelections' if used for Selections bar.
+         * @param {Element | string} [elem] - Optional. HTML element.
+         * Since version 1.1 it is also possible to define a string of the HTML element id.
+         * @param {object} [options] - Optional.
+         * Name | Type | Description
+         * noInteraction | Boolean | Set to true if you want to disable interaction,
+         *                           including selections, in the visualization.
+         *                           Introduced in version 1.1 and updated in version 3.0.
+         * noSelections  | Boolean | Set to true if you want to disable selections in the visualization.
+         *                           Introduced in version 3.0.
+         * @return {Promise} - A promise of an object model.
+         */
+        getObject(id: string, elem?: any | string, options?: any): ng.IPromise<any>;
+
+        /**
+         * Gets properties for a Qlik Sense object.
+         * @param {string} id - Object id.
+         * @return {Promise} - A promise of an object model.
+         */
+        getObjectProperties(id: string): ng.IPromise<any>;
+
+        /**
+         * Inserts a Qlik Sense snapshot into a HTML element. The snapshot fills
+         * the HTML object so you can size and position the element to determine
+         * how large the Qlik Sense object will be. If you only supply one parameter,
+         * you will just get the model without displaying the object.
+         * @param {string} id - Snapshot ID.
+         * @param {element | string} [elem] - Optional. HTML element or string with HTML element id.
+         * @return {Promise} - A promise of an object model.
+         */
+        getSnapshot(id: string, elem?: any | string): ng.IPromise<any>;
+
+        /**
+         * Locks all selections.
+         * @param {string} [state=$] - Optional. Alternate state name.
+         * Default: $
+         * Introduced in version 2.1.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        lockAll(state?: string): ng.IPromise<any>;
+
+        /**
+         * Removes an alternate state in the app.
+         * @param {string} qStateName - Alternate state name.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        removeAlternateState(qStateName: string): ng.IPromise<any>;
+
+        /**
+         * Searches for one or more terms in the values of a Qlik Sense app.
+         * @param {array} qTerms - Terms to search for.
+         * @param {object} qPage - Properties:
+         * Name | Type | Description
+         * qOffset | Number | Position from the top, starting from 0.
+         * qCount | Number | Number of search results to return.
+         * qMaxNbrFieldMatches | Number | Maximum number of matching values to return per search result.
+         * @param {object} qOptions - Properties
+         * Name | Type | Description
+         * qSearchFields | Array | List of search fields.
+         * qContext | | Search context. Can be one of:
+         *       # Cleared: In this mode, the first step is to clear any current selections in the app.
+         *                  The second step is to search for one or more terms in the values of the app.
+         *       # LockedFieldsOnly: In this mode, the search applies only to the values associated
+         *                           with the selections made in locked fields, ignoring selections
+         *                           in any unlocked field. If no locked fields, the behavior is
+         *                           identical to the Cleared context. You cannot make any new selections
+         *                           in a locked field. You can get search hits for the associated values
+         *                           of a locked field but you cannot get the search hits for the non associative values.
+         *       # CurrentSelections:In this mode, the current selections are kept (if any). Search
+         *                           for one or more terms in the values of the app. New selections
+         *                           are made on top of the current selections. If no selections were
+         *                           made before the search, this mode is identical to the Cleared context.
+         * | | Default value is LockedFieldsOnly.
+         * @param {function} [callback] - Optional. Callback method.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        searchAssociations(qTerms: any[], qPage: any, qOptions: any, callback?: any): ng.IPromise<any>;
+
+        /**
+         * Searches for one or more terms in the values of a Qlik Sense app.
+         * @param {array} qTerms - Terms to search for.
+         * @param {object} qPage - Properties:
+         * Name | Type | Description
+         * qOffset | Number | Position from the top, starting from 0.
+         * qCount | Number | Number of search results to return.
+         * qGroupOptions | Array | This parameter is optional. Options of the search groups. If this property is not set, all values are returned.
+         * qGroupItemOptions | Array | This parameter is optional. Options of the search group items. If this property is not set, all values are returned.
+         * qOptions | Object | Optional. Search options. Properties:
+         * Name | Type | Description
+         * qSearchFields | Array | List of search fields.
+         * qContext | | Search context. Can be one of:
+         *       # Cleared: In this mode, the first step is to clear any current selections in the app.
+         *                  The second step is to search for one or more terms in the values of the app.
+         *       # LockedFieldsOnly: In this mode, the search applies only to the values associated
+         *                           with the selections made in locked fields, ignoring selections
+         *                           in any unlocked field. If no locked fields, the behavior is
+         *                           identical to the Cleared context. You cannot make any new selections
+         *                           in a locked field. You can get search hits for the associated values
+         *                           of a locked field but you cannot get the search hits for the non associative values.
+         *       # CurrentSelections:In this mode, the current selections are kept (if any). Search
+         *                           for one or more terms in the values of the app. New selections
+         *                           are made on top of the current selections. If no selections were
+         *                           made before the search, this mode is identical to the Cleared context.
+         * | | Default value is LockedFieldsOnly.
+         * @param {function} [callback] - Optional. Callback method.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        searchResults(qTerms: any[], qPage: any, qOptions?: any, callback?: any): ng.IPromise<any>;
+
+        /**
+         * Returns suggestions of words from the values entered in the search. Acts as a helper for the searchAssociations method.
+         * @param {array} qTerms - Terms to search for.
+         * @param {object} [qOptions] - Optional. Search options. Properties:
+         * Name | Type | Description
+         * qSearchFields | Array | List of search fields.
+         * @param {function} [callback] - Optional. Callback method.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        searchSuggest(qTerms: any[], qOptions?: any, callback?: any): ng.IPromise<any>;
+
+        /**
+         * Makes a selection based on searchAssociation results.
+         * @param {number} qMatchIx - Index to search result.
+         * @param {array} qTerms - Values to select.
+         * @param {object} qOptions - Values to select.
+         * @param {array} [qTerms] - Optional. Parameter sent to the Qlik engine containing information about the search fields and the search context.
+         * @param {object} [qSoftLock] - Optional. This parameter was deprecated in version 2.0 and is ignored in newer versions. Use the qOtions.qContext parameter instead.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        selectAssociations(qMatchIx: number, qTerms: any[], qOptions?: any, qSoftLock?: any): ng.IPromise<any>;
+
+        /**
+         * Creates a QSelectionState object that encapsulates the selection state. Entry point to the Selection API.
+         * @param {string} [state] - Optional. Sets the state. Default is $.
+         */
+        selectionState(state?: string): SelectionStateAPI.IQSelectionState;
+
+        /**
+         * Unlocks all selections that has previously been locked.
+         * @param {string} [state] - Optional. Alternate state name. Default: $ Introduced in version 2.1.
+         */
+        unlockAll(state?: string): ng.IPromise<any>;
+    }
+}
+
+declare namespace BookmarkAPI {
+    interface IBookmark {
+        /**
+         * Applies a bookmark.
+         * @param {string} id - Bookmark id.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        apply(id: string): ng.IPromise<any>;
+
+        /**
+         * Creates a bookmark based on the current selection.
+         * @param {string} title - Bookmark title.
+         * @param {string} description - Bookmark description.
+         * @param {string} [sheetId] - Optional. Bookmark sheet id. Introduced in version 2.2.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        create(title: string, description: string, sheetId?: string): ng.IPromise<any>;
+
+        /**
+         * Removes a bookmark.
+         * @param {string} id - Bookmark id.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        remove(id: string): ng.IPromise<any>;
+    }
+}
+
+declare namespace FieldAPI {
+    interface IQField {
+        /**
+         * Clears a field selection.
+         * @return {Promise} - A promise.
+         */
+        clear(): ng.IPromise<any>;
+
+        /**
+         * Clears all fields except the selected one.
+         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
+         * @return {Promise} - A promise.
+         */
+        clearOther(softlock?: boolean): ng.IPromise<any>;
+
+        /**
+         * Gets field data. The values are available as QFieldValue in array
+         * field.rows and will updated when the selection state changes.
+         * Notification OnData will be triggered after each update.
+         * @param {boolean} [options] - Optional. Properties:
+         * Name | Type | Description
+         * rows | Number | Number of rows to fetch. Default: 200.
+         * frequencyMode | String | Can be one of:
+         *       # V=Absolute
+         *       # P=Percent
+         *       # R=Relative
+         *       # N=No frequency
+         *      |        | Default: V.
+         * @return {IQField} - The field object.
+         */
+        getData(options?: boolean): IQField;
+
+        /**
+         * Gets more data for your field. Notification OnData is triggered when complete.
+         * @return {IQField} - The field object.
+         */
+        getMoreData(): IQField;
+
+        /**
+         * Locks a field selection.
+         * @return {Promise} - A promise.
+         */
+        lock(): ng.IPromise<any>;
+
+        /**
+         * Selects field values using indexes.
+         * @param {number[]} Array - Array of index values to select
+         * @param {boolean} [toggle] - Optional. If true, toggle selected state.
+         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
+         * @return {Promise} - A promise.
+         */
+        select(Array: number[], toggle?: boolean, softlock?: boolean): ng.IPromise<any>;
+
+        /**
+         * Selects all values in a field.
+         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
+         * @return {Promise} - A promise.
+         */
+        selectAll(softlock?: boolean): ng.IPromise<any>;
+
+        /**
+         * Selects alternative values in a field.
+         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
+         * @return {Promise} - A promise.
+         */
+        selectAlternative(softlock?: boolean): ng.IPromise<any>;
+
+        /**
+         * Selects excluded values in a field.
+         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
+         * @return {Promise} - A promise.
+         */
+        selectExcluded(softlock?: boolean): ng.IPromise<any>;
+
+        /**
+         * Selects matching field values.
+         * @param {string} match - Match string.
+         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
+         * @return {Promise} - A promise.
+         */
+        selectMatch(match: string, softlock?: boolean): ng.IPromise<any>;
+
+        /**
+         * Selects possible values in a field.
+         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
+         * @return {Promise} - A promise.
+         */
+        selectPossible(softlock?: boolean): ng.IPromise<any>;
+
+        /**
+         * Selects specific values in a field.
+         * @param {array} array - Array of qFieldValues to select. A simplified syntax with
+         *                         strings or numbers also works since version 1.1.
+         * For a numeric field you need to provide the numeric value.
+         * @param {boolean} [toggle] - Optional. If true, toggle selected state.
+         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
+         * @return {Promise} - A promise.
+         */
+        selectValues(array: IQFieldValue[], toggle?: boolean, softlock?: boolean): ng.IPromise<any>;
+
+        /**
+         * Toggles a field selection.
+         * @param {string} match - Match string.
+         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
+         * @return {Promise} - A promise.
+         */
+        toggleSelect(match: string, softlock?: boolean): ng.IPromise<any>;
+
+        /**
+         * Unlocks field selections.
+         * @return {Promise} - A promise.
+         */
+        unlock(): ng.IPromise<any>;
+
+        /**
+         * Field values. You need to call getData() method to make this available. Introduced in 2.1.
+         */
+        rows: IQFieldValue[];
+
+        /**
+         * Optional. Number of different values. Only after getData() call. Introduced in 2.1.
+         */
+        rowCount: number;
+
+        /**
+         * Optional. Object with number of values in different states.
+         * Only after getData() call. Introduced in 2.1.
+         */
+        qStateCounts: any;
+    }
+
+    interface IQFieldValue {
+        /**
+         * Cell value formatted as set up in properties.
+         */
+        qText: string;
+
+        /**
+         * Cell value index.
+         */
+        qElemNumber: number;
+
+        /**
+         * Cell state.
+         */
+        qState: any;
+
+        /**
+         * Optional. Cell numeric value, if cell is numeric.
+         */
+        qNum?: number;
+
+        /**
+         * Optional. Frequency, if calculated by the Qlik engine.
+         */
+        qFrequency?: string;
+
+        /**
+         * Selects a field value.
+         * @param {boolean} [toggle] - Optional. If true, toggle selected state.
+         * @param {boolean} [softlock] - Optional. If true, locked selections can be overridden.
+         * @return {Promise} - A promise.
+         */
+        select(toggle?: boolean, softlock?: boolean): ng.IPromise<any>;
+    }
+}
+
+declare namespace GlobalAPI {
+    interface IGlobal {
+        /**
+         * Cancels an ongoing reload. The reload of the app is stopped.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        cancelReload(): ng.IPromise<any>;
+
+        /**
+         * Gets a list of Qlik Sense apps that you potentially can connect to and
+         * registers a callback to receive the data. Calling the getAppList method
+         * opens a WebSocket, gets the app list, and then keeps the WebSocket open
+         * for you to make other calls as well.
+         * @param {Function} callback - Callback method.
+         */
+        getAppList(callback: any): void;
+
+        /**
+         * Gets information (user directory and user id) about the authenticated user.
+         * @param {Function} [callback] - Optional. Callback method.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        getAuthenticatedUser(callback?: any): ng.IPromise<any>;
+
+        /**
+         * Gets information about progress of doReload and doSave calls.
+         * @param {Number} qRequestId - Request id from doReload call or 0.
+         * Complete information is returned if the identifier of the request is specified.
+         * If qRequestId = 0, less information is returned.
+         * @param {Function} [callback] - Optional. Callback method.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        getProgress(qRequestId: number, callback?: any): ng.IPromise<any>;
+
+        /**
+         * Gets the product version.
+         * @param {Function} [callback] - Optional. Callback method.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        getProductVersion(callback?: any): ng.IPromise<any>;
+
+        /**
+         * Gets the Qlik product name.
+         * @param {Function} [callback] - Optional. Callback method.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        getQTProduct(callback?: any): ng.IPromise<any>;
+
+        /**
+         * Gets the Qlik Sense version number.
+         * @param {Function} [callback] - Optional. Callback method.
+         * @return {Promise} - A promise.
+         */
+        getQvVersion(callback?: any): ng.IPromise<any>;
+
+        /**
+         * Gets information if the user is working in personal mode
+         * (returns true if Qlik Sense Desktop is used) or not
+         * (returns false if Qlik Sense Desktop is not used).
+         * @param {Function} [callback] - Optional. Callback method.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        isPersonalMode(callback?: any): ng.IPromise<any>;
+    }
+}
+
+declare namespace NavigationAPI {
+    type NavigationModeType = "ANALYSIS" | "EDIT";
+    type NavigationErrorType = "NOSUCHSHEET" | "NOCURRENTSHEET" | "NOSUCHSTORY";
+
+    /**
+     * The navigation result object.
+     */
+    interface NavigationResult {
+        /**
+         * Returns true if successful.
+         */
+        success: boolean;
+
+        /**
+         * The new sheet ID.
+         */
+        sheetId: string;
+
+        /**
+         * The new story ID.
+         */
+        storyId: string;
+
+        /**
+         * The new mode.
+         */
+        mode: string;
+
+        /**
+         * Error code. Can be: NOSUCHSHEET   |   NOCURRENTSHEET   |   NOSUCHSTORY
+         */
+        error: NavigationErrorType;
+
+        /**
+         * Error message, for example 'No current sheet'.
+         */
+        errorMsg: string;
+    }
+
+    /** Navigation API for Qlik Sense. The Navigation API allows you to navigate
+     * within a Qlik Sense app, and is meant to be used in visualization extensions
+     * and will not work in Mashup scenarios.
+     */
+    interface INavigation {
+        /**
+         * Used for analysis mode.
+         */
+        edit: "edit";
+
+        /**
+         * Used for edit mode.
+         */
+        analysis: "analysis";
+
+        /**
+         * Gets the current sheet ID.
+         * @return {NavigationResult} - A navigation result object.
+         */
+        getCurrentSheetId(): NavigationResult;
+
+        /**
+         * Gets the current mode.
+         * @return {string} - The current mode as a string.
+         */
+        getMode(): string;
+
+        /**
+         * Navigate to a given sheet in the current app.
+         * The method will return before the actual navigation takes place.
+         * @param {string} sheetId - Set the sheet ID to navigate to.
+         * @return {NavigationResult} - A navigation result object.
+         */
+        gotoSheet(sheetId: string): NavigationResult;
+
+        /**
+         * Navigate to a given story in the current app.
+         * The method will return before the actual navigation takes place.
+         * @param {string} storyId - Set the story ID to navigate to.
+         * @return {NavigationResult} - A navigation result object.
+         */
+        gotoStory(storyId: string): NavigationResult;
+
+        /**
+         * Checks if a given mode is allowed.
+         * @param {NavigationModeType} mode - Can be one of the strings: edit   |   analysis
+         * or one of the constants: qlik.navigation.EDIT   |   qlik.navigation.ANALYSIS
+         * @return {boolean} - A Boolean value (true or false).
+         */
+        isModeAllowed(mode: NavigationModeType): boolean;
+
+        /**
+         * Go to the next sheet in the current app.
+         * It will do nothing if you do not have sheets in the current context.
+         * The method will return before the actual navigation takes place.
+         * @return {NavigationResult} - A navigation result object.
+         */
+        nextSheet(): NavigationResult;
+
+        /**
+         * Jumps to the previous sheet in the current app.
+         * It will do nothing if you do not have sheets in the current context.
+         * The method will return before the actual navigation takes place
+         * @return {NavigationResult} - A navigation result object.
+         */
+        prevSheet(): NavigationResult;
+
+        /**
+         * Sets the current working mode of Qlik Sense.
+         * @param {string | constant} mode - Can be one of the strings: edit   |   analysis
+         * or one of the constants: qlik.navigation.EDIT   |   qlik.navigation.ANALYSIS
+         * @return {NavigationResult} - A navigation result object.
+         */
+        setMode(mode: string): NavigationResult;
+
+        /**
+         * Switches the working mode of Qlik Sense.
+         * @param {NavigationModeType} mode - Can be one of the strings: edit   |   analysis
+         * or one of the constants: qlik.navigation.EDIT   |   qlik.navigation.ANALYSIS
+         * @return {NavigationResult} - A navigation result object.
+         */
+        switchMode(mode: NavigationModeType): NavigationResult;
+    }
+}
+
+declare namespace SelectionStateAPI {
+    interface IQFieldSelections {
+        /**
+         * Selection state for a field.
+         */
+        fieldName: string;
+
+        /**
+         * Sort index. Starting from 0.
+         */
+        qSortIndex: number;
+
+        /**
+         * Reference to the field.
+         */
+        field: FieldAPI.IQField;
+
+        /**
+         * Defines if the field is locked.
+         */
+        locked: boolean;
+
+        /**
+         * Defines if the field is numeric.
+         */
+        isNumeric: boolean;
+
+        /**
+         * Total number of values in the field.
+         */
+        totalCount: number;
+
+        /**
+         * Number of selected values.
+         */
+        selectedCount: number;
+
+        /**
+         * Number of values that will be listed.
+         */
+        qSelectionThreshold: number;
+
+        /**
+         * Object with number of values in different states.
+         */
+        qStateCounts: any;
+
+        /**
+         * Concatenated string of selected values if number of values are less
+         * than the threshold, or if the string is of format "7 of 123".
+         */
+        qSelected: string;
+
+        /**
+         * Array with maximum of qSelectionThreshold values that are selected.
+         * For each value, the text plus the selection mode (NORMAL/AND/NOT)
+         */
+        selectedValues: number[];
+
+        /**
+         * Array with maximum of qSelectionThreshold values that are not selected.
+         * For each value, the text plus the selection mode (NORMAL/AND/NOT)
+         */
+        notSelectedValues: number[];
+    }
+
+    interface IQSelectionState {
+        /**
+         * State name. $ for default state.
+         */
+        stateName: string;
+
+        /**
+         * Selections
+         */
+        selections: IQFieldSelections;
+
+        /**
+         * Number of back steps available.
+         */
+        backCount: number;
+
+        /**
+         * Number of forward steps available. OnData notification will be triggered after each update.
+         */
+        forwardCount: number;
+
+        /**
+         * Cleara all selections in this state.
+         * @param {boolean} lockedAlso - Use to also clear locked fields.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        clearAll(lockedAlso: boolean): ng.IPromise<any>;
+
+        /**
+         * Locks all selections in this state.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        lockAll(): ng.IPromise<any>;
+
+        /**
+         * Unlocks all selections in this state.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        unlockAll(): ng.IPromise<any>;
+    }
+}
+
+declare namespace TableAPI {
+    interface IQTable {
+        /**
+         * Data rows.
+         */
+        rows: IQRow[];
+
+        /**
+         * Header information.
+         */
+        headers: IQHeader[];
+
+        /**
+         * Total information for measures.
+         */
+        totals: IQMeasureCell[];
+
+        /**
+         * Total number of rows for the qHyperCube, including rows not fetched from the server.
+         */
+        rowCount: number;
+
+        /**
+         * Total number of columns for the qHyperCube.
+         */
+        colCount: number;
+
+        /**
+         * Exports data of the underlying hypercube in OOXML or CSV format.
+         * @param {object} [options] - Optional. Properties:
+         * Name | Type | Description
+         * format | String | Data format. Can be one of:
+         *       # OOXML: open XML, default
+         *       # CSV_C: comma separated CSV
+         *       # CSV_T: tab separated CSV
+         * filename | String | Name of the exported file after download from browser.
+         *                     This parameter is optional and only used in desktop.
+         * state | String | Can be:
+         *       # A: all values
+         *       # P: possible values (default)
+         * download | Boolean | Automatically start download of file (with window.open).
+         * @param {Function} [callback] - Optional. Callback function returning the link to the exported file.
+         */
+        exportData(options?: any, callback?: any): void;
+
+        /**
+         * Gets the column number for a given field name.
+         * @param {string} fld - Field name.
+         * @return {number} - Column number, starting with zero. Undefined if no column with that name exists.
+         */
+        getColByName(fld: string): number;
+
+        /**
+         * Gets more data for your qHyperCube.
+         */
+        getMoreData(): any;
+    }
+
+    interface IQHeader {
+        /**
+         * Column title.
+         */
+        qFallbackTitle: string;
+
+        /**
+         * Can be:
+         *       # A: ascending
+         *       # D: descending
+         */
+        qSortIndicator: string;
+
+        /**
+         * True indicates if this is the first column for sorting.
+         */
+        isOrderedBy: boolean;
+
+        /**
+         * True indicates if the sort order is reversed for this column.
+         */
+        qReverseSort: boolean;
+
+        /**
+         * Column number.
+         */
+        col: number;
+
+        /**
+         * Optional. Number of different values. Only used for dimensions.
+         */
+        qCardinal?: number;
+
+        /**
+         * Optional. Object with number of values in different states.
+         * Only used for dimensions.
+         */
+        qStateCounts?: any;
+
+        /**
+         * Optional. Field object with methods to manipulate the underlying field.
+         * Only used for dimensions.
+         */
+        field?: any;
+
+        /**
+         * Optional. Minimum value. Only used for measures.
+         */
+        qMin?: number;
+
+        /**
+         * Optional. Maximum value. Only used for measures.
+         */
+        qMax?: number;
+
+        /**
+         * Optional. Error code for this column.
+         * Only if column has an error. Introduced in version 2.2.
+         */
+        errorCode?: number;
+
+        /**
+         * Error message for this column.
+         * Only if column has an error. Introduced in version 2.2.
+         */
+        errorMessage: number;
+
+        /**
+         * Sets this column to be the first in the sort order.
+         */
+        orderBy(): void;
+
+        /**
+         * Reverses the sort order for this column.
+         */
+        reverseOrder(): void;
+
+        /**
+         * Select a range in this measure.
+         * @param {number} min - Sets the minimum value of the range.
+         * @param {number} max - Sets the maximum value of the range.
+         * @param {boolean} [inclMin] - Optional. Set to true to include minimum value.
+         * @param {boolean} [inclMax] - Optional. Set to true to include maximum value.
+         * @return {Promise} - A promise.
+         */
+        selectRange(min: number, max: number, inclMin?: boolean, inclMax?: boolean): ng.IPromise<any>;
+    }
+
+    interface IQRow {
+        /**
+         * Dimension cells.
+         */
+        dimensions: IQDimensionCell[];
+
+        /**
+         * Measure cells.
+         */
+        measures: IQMeasureCell[];
+
+        /**
+         * All cells, in the order they are defined in the properties.
+         */
+        cells: any[];
+    }
+
+    interface IQDimensionCell extends IQMeasureCell {
+        /**
+         * Cell value index.
+         */
+        qElemNumber: number;
+
+        /**
+         * Cell state.
+         */
+        qState: string;
+
+        /**
+         * Selects the value in this cell.
+         */
+        select(): void;
+    }
+
+    interface IQMeasureCell {
+        /**
+         * Cell value formatted as set up in properties.
+         */
+        qText: string;
+
+        /**
+         * Optional. Cell numeric value, if cell is numeric.
+         */
+        qNum?: number;
+
+        /**
+         * Gets the value of this cell as a percentage of the total.
+         * Might be more than 100% if this is an average.
+         */
+        getPercent(): number;
+
+        /**
+         * Gets the value of this cell as a percentage of the maximum.
+         */
+        getPercentOfMax(): number;
+    }
+}
+
+declare namespace VariableAPI {
+    interface IVariable {
+        /**
+         * Creates a variable.
+         * @param {string | object} qProp - Variable name or properties. Properties:
+         * Name | Type | Description
+         * qInfo.qId | String | Optional. Variable id. If the selected ID is already in use, a new ID is automatically set by the engine.
+         * qName | String | Variable name. The name must be unique.
+         * qComment | String | Optional. Comment related to the variable.
+         * qDefinition | String | Optional. Variable definition.
+         * qNumberPresentation | Object | Optional. Defines the format of the value.
+         * qIncludeInBookmark | Boolean | Optional. Set to true to update the variable when applying a bookmark. The variable value will be persisted in the bookmark.
+         * @return {Promise} - Returns a promise of a variable model.
+         */
+        create(qProp: string | any): ng.IPromise<any>;
+
+        /**
+         * Creates a session variable, that is a temporary variable which is not
+         * persisted and needs to be recreated for each new session.
+         * @param {object} qProp - Variable properties:
+         * Name | Type | Description
+         * qInfo.qId | String | Optional. Variable id.
+         * qName | String | Variable name.
+         * qComment | String | Optional. Comment.
+         * qDefinition | String | Optional. Variable definition.
+         * qNumberPresentation | Object | Optional.
+         * qIncludeInBookmark | Boolean | Optional. Include in bookmark flag.
+         * @return {Promise} - A promise of a variable model.
+         */
+        createSessionVariable(qProp: any): ng.IPromise<any>;
+
+        /**
+         * Gets a variable by id.
+         * @param {string} qId - Variable id.
+         * @return {Promise} - A promise of a variable model.
+         */
+        get(qId: string): ng.IPromise<any>;
+
+        /**
+         * Gets a variable by name.
+         * @param {string} qName - Variable name.
+         * @return {Promise} - A promise of a variable model.
+         */
+        getByName(qName: string): ng.IPromise<any>;
+
+        /**
+         * Gets variable content.
+         * @param {string} name - Variable name.
+         * @param {Function} callback - Callback to receive the content.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        getContent(name: string, callback: any): ng.IPromise<any>;
+
+        /**
+         * Sets the content of a variable.
+         * @param {string} name - Variable name.
+         * @param {string} content - Variable content.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        setContent(name: string, content: string): ng.IPromise<any>;
+
+        /**
+         * Sets a numeric value as a variable.
+         * @param {string} qName - Variable name.
+         * @param {Number} qVal - Variable value.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        setNumValue(qName: string, qVal: number): ng.IPromise<any>;
+
+        /**
+         * Sets variable string value.
+         * @param {string} qName - Variable name.
+         * @param {string} qVal - Variable value.
+         * @return {Promise} - A promise of a Qlik engine reply.
+         */
+        setStringValue(qName: string, qVal: string): ng.IPromise<any>;
+    }
+}
+
+declare namespace VisualizationAPI {
+    type VisualizationType = "barchart" | "combochart" | "gauge" | "kpi" | "linechart" | "piechart" | "pivot-table" |
+        "scatterplot" | "table" | "treemap" | "extension";
+
+    interface IVisualization {
+        /**
+         * Create a new visualization on the fly based on a session object
+         * and will not be persisted in the app.
+         * @param {VisualizationType} type - Visualization type. Can be:
+         *       # barchart
+         *       # combochart
+         *       # gauge
+         *       # kpi
+         *       # linechart
+         *       # piechart
+         *       # pivot-table
+         *       # scatterplot
+         *       # table
+         *       # treemap
+         *       # extension
+         * @param {array} [cols] - Optional. Column definitions, dimensions and measures.
+                  Each entry can be of the following structures:
+         *       # String
+         *       # NxDimension
+         *       # NxMeasure
+         *       If the NxDimension or the NxMeasure refer to a library dimension
+         *       or a library measure, you also need to add qType : "measure" or "dimension".
+         * @param {object} [options] - Optional. Options to set.
+         * @return {Promise} - A promise of a QVisualization.
+         */
+        create(type: VisualizationType, cols?: any[], options?: any): ng.IPromise<any>;
+
+        /**
+         * Gets an existing visualization.
+         * @param {string} id - Id for an existing visualization.
+         * @return {Promise} - A promise of a QVisualization.
+         */
+        get(id: string): ng.IPromise<any>;
+    }
+
+    interface IQVisualization {
+        /**
+         * Table object for this visualization.
+         * Only for visualizations built on a hypercube.
+         */
+        table: TableAPI.IQTable;
+
+        /**
+         * Closes a visualization and releases the session object.
+         * @return {Promise} - A promise.
+         */
+        close(): ng.IPromise<any>;
+
+        /**
+         * Tells the visualization it has been resized and should re-paint.
+         */
+        resize(): void;
+
+        /**
+         * Sets options for a visualization.
+         * @param {object} options - Options to set (using applyPatches).
+         */
+        setOptions(options?: any): void;
+
+        /**
+         * Shows the visualization in an HTML element.
+         * @param {Element | string} [element] - Optional. HTML element or HTML element ID.
+         * @param {object} [options] - Optional.
+         * Name | Type | Description
+         * noInteraction | Boolean | Set to true if you want to disable all interaction, including selections, in the visualization.
+         * noSelections | Boolean | Set to true if you want to disable selections in the visualization.
+         * | | Parameter introduced in version 3.0.
+         */
+        show(element?: any | string, options?: any): void;
+    }
+}
+
+declare namespace ExtensionAPI {
+
+
+    interface IExtensionModel {
+
+    }
+
+    interface IExtensionComponent {
+        model: IExtensionModel;
+    }
+
+    interface IExtensionScope extends ng.IScope {
+        component: IExtensionComponent;
+    }
+
+
+    //ExtensionAPI
+    type SelectionModeType = "CONFIRM" | "QUICK";
+
+    interface IInitialProperties {
+        qHyperCubeDef?: any; //IHyperCubeDef;
+        qListObjectDef?: any; //IListObjectDef;
+        fixed?: boolean;
+        width?: number;
+        percent?: boolean;
+        selectionMode?: SelectionModeType;
+    }
+
+    interface ISupport {
+        snapshot?: boolean;
+        export?: boolean;
+        exportData?: boolean;
+    }
+
+    interface IExtension {
+        definition?: IDefinition;
+        paint?: ($element: HTMLElement, layout?: any) => void;
+        initialProperties?: IInitialProperties;
+        template?: string;
+        controller?: any;
+        support?: ISupport;
+    }
+
+    interface ISupport {
+        snapshot?: boolean; // | () => boolean;
+        export?: boolean; // | () => boolean;
+        canTakeSnapshot?: boolean;
+    }
+
+    interface IInitialProperties {
+        // qHyperCubeDef: IVisualizationHyperCubeDef;
+        // qListObjectDef: IVis
+
+        //[""]:
+    }
+
+    //#region IDefinition
+    type ExpressionType = "always" | "optional" | "";
+
+    type func<T> = () => T;
+    type valueOrfunc<T> = T | func<T>;
+
+    //#region Controls
+    interface ICustomControlOption {
+        value: string;
+        label: string;
+    }
+
+    interface ICustomControl {
+        type: string;
+        label: string;
+        ref: string;
+    }
+
+    interface ICustomString extends ICustomControl {
+        defaultValue: string;
+        expression: ExpressionType;
+        show: valueOrfunc<boolean>;
+        maxlength: number;
+    }
+
+    interface ICustomNumber extends ICustomControl {
+        defaultValue: number;
+        min: number;
+        max: number;
+    }
+
+    interface ICustomInteger extends ICustomNumber {
+    }
+
+    interface ICustomArray extends ICustomControl {
+        itemTitleRef: string;
+        addTranslation: string;
+        allowAdd: boolean;
+        allowMove: boolean;
+        allowRemove: boolean;
+    }
+
+    interface ICustomButton extends ICustomControl {
+        label: string;
+        component: "button";
+        action: valueOrfunc<void>;
+    }
+
+    interface ICustomButtonGroup extends ICustomControl {
+        component: "buttongroup";
+        defaultValue: string;
+        options: valueOrfunc<ICustomControlOption>;
+    }
+
+    interface ICustomCheckBox extends ICustomControl {
+        component: "checkbox";
+        defaultValue: boolean;
+    }
+
+    interface ICustomColorPicker extends ICustomControl {
+        component: "color-picker";
+        defaultValue: number;
+    }
+
+    interface ICustomDropDownList extends ICustomControl {
+        component: "dropdown";
+        defaultValue: string;
+        options: valueOrfunc<ICustomControlOption>;
+    }
+
+    interface ICustomLink {
+        type: string;
+        component: "link";
+        label: string;
+        url: string;
+    }
+
+    interface ICustomMedia extends ICustomControl {
+        component: "media";
+        layoutRef: string;
+    }
+
+    interface ICustomRadioButton extends ICustomControl {
+        component: "radiobuttons";
+        defaultValue: string;
+        options: valueOrfunc<ICustomControlOption>;
+    }
+
+    interface ICustomSlider extends ICustomControl {
+        component: "slider";
+        defaultValue: number;
+        min: number;
+        max: number;
+        step: number;
+    }
+
+    interface ICustomRangeSlider extends ICustomControl {
+        component: "slider";
+        defaultValue: number[];
+        min: number;
+        max: number;
+        step: number;
+    }
+
+    interface ICustomSwitch {
+        component: "switch";
+        defaultValue: boolean;
+        options: valueOrfunc<ICustomControlOption>;
+    }
+
+    interface ICustomText {
+        type: "text";
+        component: "text";
+        label: string;
+    }
+
+    interface ICustomTextArea extends ICustomControl {
+        component: "textarea";
+        rows: number;
+        maxlength: number;
+        defaultValue: string;
+        show: valueOrfunc<boolean>;
+    }
+    //#endregion
+
+    interface IDefinition {
+        type: "items";
+        component: "accordion";
+        items: IItems;
+    }
+
+    interface IItems {
+        dimentions?: IDimensions;
+        measures?: IMeasures;
+        appearance?: IAppearance;
+        sorting?: ISorting;
+        AddOns?: IAddOns;
+        [other: string]: any;
+    }
+
+    interface IAddOns {
+        uses: "addons";
+    }
+
+    interface ISorting {
+        uses: "sorting";
+    }
+
+    interface IDimensions {
+        uses: "dimensions";
+        min?: number;
+        max?: number;
+    }
+
+    interface IAppearance {
+        uses: "settings";
+        min?: number;
+        max?: number;
+        items: any;
+    }
+
+    //?Das selbe wie Appearance?
+    interface ISettings {
+        uses: "settings";
+        min?: number;
+        max?: number;
+    }
+
+    interface IMeasures {
+        uses: "measures";
+        min?: number;
+        max?: number;
+    }
+
+    //#endregion
+}
+
+declare module "qlik" {
+    var e: RootAPI.IRoot; export = e;
+}
+
+interface IQVAngular {
+    /**
+   * Register a new directive with the compiler.
+   *
+   * @param name Name of the directive in camel-case (i.e. ngBind which will match as ng-bind)
+   * @param directiveFactory An injectable directive factory function.
+   */
+    directive(name: string, directiveFactory: ng.Injectable<ng.IDirectiveFactory>): void;
+    directive(object: { [directiveName: string]: ng.Injectable<ng.IDirectiveFactory> }): void;
+
+    filter(name: string, filterFactoryFunction: ng.Injectable<Function>): void;
+    filter(object: { [name: string]: ng.Injectable<Function> }): void;
+
+    /**
+      * Register a service constructor, which will be invoked with new to create
+      * the service instance. This is short for registering a service where its
+      * provider's $get property is a factory function that returns an instance
+      * instantiated by the injector from the service constructor function.
+      * @param name The name of the instance.
+      * @param serviceConstructor An injectable class (constructor function) that will be instantiated.
+      * @return Returns the constructed singleton of the service class/function.
+      */
+    service<T>(name: string, serviceConstructor: ng.Injectable<Function>): T;
+    service<T>(object: { [name: string]: ng.Injectable<Function> }): T;
+
+    //provider(name: string, serviceProviderFactory: ng.IServiceProviderFactory): void;
+    //provider(name: string, serviceProviderConstructor: ng.IServiceProviderClass): void;
+}
+
+declare module "qvangular" {
+    var e: IQVAngular; export = e;
+}
\ No newline at end of file
diff --git a/qlik-visualizationextensions/qlik-visualizationextensions-tests.ts b/qlik-visualizationextensions/qlik-visualizationextensions-tests.ts
new file mode 100644
index 0000000000..76a71d22dc
--- /dev/null
+++ b/qlik-visualizationextensions/qlik-visualizationextensions-tests.ts
@@ -0,0 +1,3 @@
+import qlik = require("qlik");
+
+const t = qlik.currApp();
\ No newline at end of file
diff --git a/qlik-visualizationextensions/tsconfig.json b/qlik-visualizationextensions/tsconfig.json
new file mode 100644
index 0000000000..c71a5c597d
--- /dev/null
+++ b/qlik-visualizationextensions/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "qlik-visualizationextensions-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/qlik-visualizationextensions/tslint.json b/qlik-visualizationextensions/tslint.json
new file mode 100644
index 0000000000..cae1bdf2ad
--- /dev/null
+++ b/qlik-visualizationextensions/tslint.json
@@ -0,0 +1,8 @@
+{ 
+  "extends": "../tslint.json",
+  "rules": {
+        "forbidden-types": false,
+        "no-empty-interface": false,
+        "interface-name": false
+  }
+}
\ No newline at end of file
diff --git a/qrcode.react/index.d.ts b/qrcode.react/index.d.ts
new file mode 100644
index 0000000000..c7a6b85d72
--- /dev/null
+++ b/qrcode.react/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for qrcode.react 0.6
+// Project: https://github.com/zpao/qrcode.react
+// Definitions by: Mleko <https://github.com/mleko>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="react" />
+
+declare namespace qrcode {
+	export interface QRCodeProps {
+		value: string;
+		size?: number;
+		bgColor?: string;
+		fgColor?: string;
+		level?: "L"|"M"|"Q"|"H";
+	}
+
+	export type QRCode = React.ComponentClass<QRCodeProps>;
+}
+
+declare const qrcode: qrcode.QRCode;
+export = qrcode;
diff --git a/qrcode.react/qrcode.react-tests.tsx b/qrcode.react/qrcode.react-tests.tsx
new file mode 100644
index 0000000000..ffae551b01
--- /dev/null
+++ b/qrcode.react/qrcode.react-tests.tsx
@@ -0,0 +1,12 @@
+import * as QRCode from "qrcode.react";
+import * as React from "react";
+
+const qrcodes = [
+	<QRCode value="https://github.com/DefinitelyTyped/DefinitelyTyped"/>,
+	<QRCode value="https://github.com/DefinitelyTyped/DefinitelyTyped" size={64}/>,
+	<QRCode value="https://github.com/DefinitelyTyped/DefinitelyTyped" bgColor="#555555"/>,
+	<QRCode value="https://github.com/DefinitelyTyped/DefinitelyTyped" fgColor="#aaaaaa"/>,
+	<QRCode value="https://github.com/DefinitelyTyped/DefinitelyTyped" level="L"/>,
+	<QRCode value="https://github.com/DefinitelyTyped/DefinitelyTyped" level="H"/>,
+	<QRCode value="https://github.com/DefinitelyTyped/DefinitelyTyped" size={256} bgColor="pink" fgColor="red" level="Q"/>,
+];
diff --git a/qrcode.react/tsconfig.json b/qrcode.react/tsconfig.json
new file mode 100644
index 0000000000..c9938f0730
--- /dev/null
+++ b/qrcode.react/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "qrcode.react-tests.tsx"
+    ]
+}
diff --git a/qrcode.react/tslint.json b/qrcode.react/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/qrcode.react/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/query-string/index.d.ts b/query-string/index.d.ts
index 9cd6d8df1e..dcc9bfafb5 100644
--- a/query-string/index.d.ts
+++ b/query-string/index.d.ts
@@ -13,7 +13,7 @@ declare module "query-string" {
      * Leading ? or # are ignored, so you can pass location.search or location.hash directly.
      * @param str
      */
-    export function parse(str: string): { [key: string]: string | string[] };
+    export function parse(str: string): { [key: string]: string | string[] | null };
 
     /**
      * Stringify an object into a query string, sorting the keys.
diff --git a/query-string/query-string-tests.ts b/query-string/query-string-tests.ts
index c39c2f4982..c5ec7b624d 100644
--- a/query-string/query-string-tests.ts
+++ b/query-string/query-string-tests.ts
@@ -21,7 +21,7 @@ namespace stringify_tests {
 }
 
 namespace parse_tests {
-    let result: { [key: string]: string | string[] };
+    let result: { [key: string]: string | string[] | null };
     result = qs.parse('?foo=bar');
     result = qs.parse('#foo=bar');
     result = qs.parse('&foo=bar&foo=baz');
diff --git a/query-string/tsconfig.json b/query-string/tsconfig.json
index c0a4860fb8..3dd890dac3 100644
--- a/query-string/tsconfig.json
+++ b/query-string/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/radius/radius-tests.ts b/radius/radius-tests.ts
index c3b50db8ec..36e9ea618d 100644
--- a/radius/radius-tests.ts
+++ b/radius/radius-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import radius = require('radius');
 
 var radius_secret: string = "shhhh"
diff --git a/rangyinputs/rangyinputs-tests.ts b/rangyinputs/rangyinputs-tests.ts
index cb627d85b1..14f769a9fe 100644
--- a/rangyinputs/rangyinputs-tests.ts
+++ b/rangyinputs/rangyinputs-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery" />
-
 let $obj: JQuery = $('meh');
 
 let selection: RangyInputs.Selection = $obj.getSelection();
diff --git a/rappid/index.d.ts b/rappid/index.d.ts
index 5cbf07b995..d70023e055 100644
--- a/rappid/index.d.ts
+++ b/rappid/index.d.ts
@@ -5,33 +5,36 @@
 
 /// <reference types="jointjs" />
 
-declare namespace joint {
-    namespace ui {
-        interface Handle {
-            name: string;
-            position: string;
-            icon: string;
-        }
+import * as joint from 'jointjs';
+import * as Backbone from "backbone";
 
-        class SelectionView extends Backbone.Model {
+export as namespace joint;
+
+export namespace ui {
+    interface Handle {
+        name: string;
+        position: string;
+        icon: string;
+    }
+
+    class SelectionView extends Backbone.Model {
+        paper: joint.dia.Paper;
+        graph: joint.dia.Graph;
+        model: Backbone.Collection<joint.dia.Cell>;
+
+        constructor(opt: {
             paper: joint.dia.Paper;
             graph: joint.dia.Graph;
-            model: Backbone.Collection<joint.dia.Cell>;
+            model: Backbone.Collection<joint.dia.Cell>
+        });
 
-            constructor(opt: {
-                paper: joint.dia.Paper;
-                graph: joint.dia.Graph;
-                model: Backbone.Collection<joint.dia.Cell>
-            });
+        createSelectionBox(cellView: joint.dia.CellView): void;
+        destroySelectionBox(cellView: joint.dia.CellView): void;
+        startSelecting(evt: any): void;
+        cancelSelection(): void;
 
-            createSelectionBox(cellView: joint.dia.CellView): void;
-            destroySelectionBox(cellView: joint.dia.CellView): void;
-            startSelecting(evt: any): void;
-            cancelSelection(): void;
-
-            addHandle(handle: Handle): void;
-            removeHandle(name: string): void;
-            changeHandle(name: string, handle: Handle): void;
-        }
+        addHandle(handle: Handle): void;
+        removeHandle(name: string): void;
+        changeHandle(name: string, handle: Handle): void;
     }
 }
diff --git a/raty/raty-tests.ts b/raty/raty-tests.ts
index bb2f731038..51b510b0a3 100644
--- a/raty/raty-tests.ts
+++ b/raty/raty-tests.ts
@@ -1,7 +1,3 @@
-/// <reference types="jquery" />
-
-
-
 var $element: JQuery = $('<div></div>');
 
 $element.raty();
diff --git a/rc-select/rc-select-tests.ts b/rc-select/rc-select-tests.ts
index f2ec85ae09..976d789c2c 100644
--- a/rc-select/rc-select-tests.ts
+++ b/rc-select/rc-select-tests.ts
@@ -1,10 +1,7 @@
-
-/// <reference types="react" />
-
 import React = require('react');
 import RcSelect = require('rc-select');
 
-class Component extends React.Component<any, any> {    
+class Component extends React.Component<any, any> {
 
     private onChange(value: any) {
         console.log('selected', value);
@@ -54,7 +51,7 @@ class Component extends React.Component<any, any> {
         className: "option",
         disabled: true,
         key: "option-0",
-        value: "option-0"        
+        value: "option-0"
     };
 
     private createOptions(count: number) {
@@ -75,7 +72,7 @@ class Component extends React.Component<any, any> {
 
         let options = this.createOptions(10);
 
-        let optionGroup = React.createElement(RcSelect.OptGroup, this.defaultOptGroupProps, options);        
+        let optionGroup = React.createElement(RcSelect.OptGroup, this.defaultOptGroupProps, options);
 
         let select = React.createElement(RcSelect.default, this.defaultSelectProps, optionGroup);
 
diff --git a/rc-slider/README.md b/rc-slider/README.md
new file mode 100644
index 0000000000..7000e34358
--- /dev/null
+++ b/rc-slider/README.md
@@ -0,0 +1,13 @@
+# Installation
+> `npm install --save @types/rc-select`
+
+# Summary
+This package contains type definitions for rc-slider (https://github.com/react-component/slider).
+
+Additional Details
+ * Last updated: Tue, 24 Feb 2017
+ * Dependencies: react
+ * Global values: none
+
+# Credits
+These definitions were written by Marcinkus Mantas <https://github.com/mantasmarcinkus/>
diff --git a/rc-slider/index.d.ts b/rc-slider/index.d.ts
new file mode 100644
index 0000000000..704412eda6
--- /dev/null
+++ b/rc-slider/index.d.ts
@@ -0,0 +1,156 @@
+// Type definitions for rc-slider 6.1
+// Project: https://github.com/react-component/slider
+// Definitions by: Marcinkus Mantas <https://github.com/mantasmarcinkus/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+import * as React from 'react';
+
+declare namespace RcSliderClass {
+    export interface Marks {
+        [number: number]: JSX.Element | string | { style: any, label: string | JSX.Element };
+    }
+
+    export interface CommonApiProps {
+        /**
+         * Additional CSS class for the root DOM node
+         *  @default ''
+         */
+        className?: string;
+        /**
+         * The minimum value of the slider
+         *  @default 0
+         */
+        min?: number;
+        /**
+         * The maximum value of the slider
+         *  @default 100
+         */
+        max?: number;
+        /**
+        * Marks on the slider. The key determines the position, and the value determines what will show.
+        * If you want to set the style of a specific mark point, the value should be an object which contains style and label properties.
+        *  @default '{}' | {number: { style, label }}
+        */
+        marks?: Marks;
+        /**
+        * Value to be added or subtracted on each step the slider makes. Must be greater than zero, and max - min should be evenly divisible by the step value.
+        *  @default 1
+        */
+        step?: number;
+        /**
+         * If vertical is true, the slider will be vertical.
+         * @default false
+         */
+        vertical?: boolean;
+        /**
+         * A handle generator which could be used to customized handle.
+         */
+        handle?(props: any): React.ReactNode;
+        /**
+         * If the value is true, it means a continuous value interval, otherwise, it is a independent value.
+         *  @default true
+         */
+        included?: boolean;
+        /**
+         * If true, handles can't be moved.
+         *  @default false
+         */
+        disabled?: boolean;
+        /**
+         * When the step value is greater than 1, you can set the dots to true if you want to render the slider with dots.
+         *  @default false
+         */
+        dots?: boolean;
+        /**
+         * onBeforeChange will be triggered when ontouchstart or onmousedown is triggered.
+         */
+        onBeforeChange?: (value: any) => any | undefined;
+        /**
+         * onChange will be triggered while the value of Slider changing.
+         */
+        onChange?: (value: any) => any | undefined;
+        /**
+         * onAfterChange will be triggered when ontouchend or onmouseup is triggered.
+         */
+        onAfterChange?: (value: any) => any | undefined;
+
+        /**
+         * @deprecated in version ^6.0.0. Use rc-tooltip
+         * Tooltip transition class name
+         */
+        tipTransitionName?: string;
+
+        /**
+         * @deprecated in version ^6.0.0. Use rc-tooltip
+         * Tooltip formatter
+         */
+        tipFormatter?: ((value: any) => any | undefined) | null;
+    }
+
+    interface SliderProps extends CommonApiProps {
+        /**
+         * Set initial value of slider.
+         *  @default 0
+         */
+        defaultValue?: number;
+        /**
+         * Set current value of slider.
+         */
+        value?: number;
+    }
+
+
+    export interface RangeProps extends CommonApiProps {
+        /**
+         * Set initial positions of handles.
+         *  @default [0,0]
+         */
+        defaultValue?: number[];
+        /**
+         * Set current positions of handles.
+         */
+        value?: number[];
+        /**
+         * Determine how many ranges to render, and multiple handles will be rendered (number + 1).
+         *  @default 1
+         */
+        count?: number;
+        /**
+         * allowCross could be set as true to allow those handles to cross.
+         *  @default true
+         */
+        allowCross?: boolean;
+        /**
+         * pushable could be set as true to allow pushing of surrounding handles when moving an handle. When set to a number, the number will be the minimum ensured distance between handles.
+         *  @default true
+         */
+        pushable?: boolean;
+    }
+
+    export interface HandleProps extends CommonApiProps {
+        /**
+         * Class name
+         */
+        className: string;
+        /**
+         * Styling if true, then bottom: {offset} else left: {offset}
+         * @default False
+         */
+        vertical: boolean;
+        /**
+         * Styling option offset
+         */
+        offset: number;
+    }
+}
+
+declare class RcSliderClass extends React.Component<RcSliderClass.SliderProps, {}> { }
+
+declare namespace RcSliderClass {
+    class Range extends React.Component<RcSliderClass.RangeProps, {}> { }
+    class Handle extends React.Component<RcSliderClass.HandleProps, {}> { }
+}
+
+
+export = RcSliderClass;
diff --git a/rc-slider/rc-slider-tests.tsx b/rc-slider/rc-slider-tests.tsx
new file mode 100644
index 0000000000..f6e2442558
--- /dev/null
+++ b/rc-slider/rc-slider-tests.tsx
@@ -0,0 +1,48 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import * as Slider from 'rc-slider';
+import { Range, Handle } from 'rc-slider';
+
+ReactDOM.render(
+    <Slider defaultValue={1} max={2} step={0.01} min={0.01} />,
+    document.querySelector('.app')
+);
+
+ReactDOM.render(
+    <Handle
+        className="bottom"
+        vertical={true}
+        offset={10}
+    />,
+    document.querySelector('.another-app')
+);
+ReactDOM.render(
+    <Slider
+        className="bottomRight"
+        min={0.01}
+        max={1}
+        marks={{ 1: "1" }}
+        step={0.01}
+        vertical={true}
+        handle={() => { return <Slider /> }}
+        included={true}
+        disabled={false}
+        dots={true}
+        onBeforeChange={() => { }}
+        onChange={() => { }}
+        onAfterChange={() => { }}
+        defaultValue={0.1}
+        value={0.1}
+    />,
+    document.querySelector('.another-app')
+);
+
+ReactDOM.render(
+    <Range
+        defaultValue={[0, 1]}
+        value={[0, 1]}
+        count={3}
+        allowCross={false}
+        pushable={true} />,
+    document.querySelector('.app')
+);
\ No newline at end of file
diff --git a/service_worker_api/tsconfig.json b/rc-slider/tsconfig.json
similarity index 67%
rename from service_worker_api/tsconfig.json
rename to rc-slider/tsconfig.json
index 0c7c7ed734..d6a3a4e288 100644
--- a/service_worker_api/tsconfig.json
+++ b/rc-slider/tsconfig.json
@@ -1,4 +1,4 @@
-{
+ {
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
@@ -7,17 +7,18 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
     },
     "files": [
-        "index.d.ts",
-        "service_worker_api-tests.ts"
+       "index.d.ts",
+       "rc-slider-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/rc-slider/tslint.json b/rc-slider/tslint.json
new file mode 100644
index 0000000000..fdc7cdc370
--- /dev/null
+++ b/rc-slider/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../tslint.json"
+}
\ No newline at end of file
diff --git a/react-bootstrap-table/index.d.ts b/react-bootstrap-table/index.d.ts
index 566019ab94..9adfacf8c8 100644
--- a/react-bootstrap-table/index.d.ts
+++ b/react-bootstrap-table/index.d.ts
@@ -356,7 +356,7 @@ export interface Options {
 	/**
 	Background color on expanded rows.
 	*/
-	expandRowBgColor?: string;	
+	expandRowBgColor?: string;
 	/**
 	Assign a callback function which will be called when mouse enter into the table.
 	*/
@@ -475,6 +475,13 @@ export interface TableHeaderColumnProps extends Props<TableHeaderColumn> {
 	This function taking one arguments: order which present the sort order currently.
 	*/
     caretRender?: Function;
+        /**
+ 	Give an Object like following to able to customize your own editing component.
+ 	This Object should contain these two property:
+    	    getElement(REQUIRED): Accept a callback function and take two arguments: onUpdate and props.
+    	    customEditorParameters: Another extra data for custom cell edit component.
+	 */
+    customEditor?: {getElement: (onUpdate: any, props: any) => ReactElement<any>, customEditorParameters?: Object} ;	
 	/**
 	To customize the column. This callback function should return a String or a React Component.
 	In addition, this function taking two argument: cell and row.
@@ -568,6 +575,11 @@ export interface Editable {
     cols?: number;
     rows?: number;
 }
+export type SetFilterCallback = (targetValue: any) => boolean;
+export interface ApplyFilterParameter {
+	callback: SetFilterCallback;
+}
+
 export type FilterType = 'TextFilter' | 'RegexFilter' | 'SelectFilter' | 'NumberFilter' | 'DateFilter' | 'CustomFilter';
 export interface Filter {
 	/**
@@ -590,6 +602,26 @@ export interface Filter {
 	 * Only work on NumberFilter. Accept an array which conatin the filter condition, like: ['<','>','=']
 	 */
     numberComparators?: string[];
+
+    /**
+     * Options for the filter.
+     */
+    options?: any;
+
+    /**
+     * Comparison condition for the NumberFilter
+     */
+    condition?: string;
+
+    /**
+     * Get element which represent filter.
+     */
+    getElement?: (filterHandler: (parameters?: ApplyFilterParameter) => void, filterParameters: any) => JSX.Element;
+
+    /**
+     * Parameters for custom filter
+     */
+    customFilterParameters?: any;
 }
 
 export interface TableHeaderColumn extends ComponentClass<TableHeaderColumnProps> { }
diff --git a/react-bootstrap-table/react-bootstrap-table-tests.tsx b/react-bootstrap-table/react-bootstrap-table-tests.tsx
index 47682dd36a..2151f14c78 100644
--- a/react-bootstrap-table/react-bootstrap-table-tests.tsx
+++ b/react-bootstrap-table/react-bootstrap-table-tests.tsx
@@ -2,7 +2,7 @@
 
 import * as React from 'react';
 import { render } from 'react-dom';
-import { BootstrapTable, TableHeaderColumn } from 'react-bootstrap-table';
+import { BootstrapTable, TableHeaderColumn, ApplyFilterParameter } from 'react-bootstrap-table';
 
 var products = [{
   id: 1,
@@ -27,3 +27,56 @@ render(
     </BootstrapTable>,
   document.getElementById("app")
 );
+
+const qualityType = {
+  0: 'good',
+  1: 'bad',
+  2: 'unknown'
+};
+
+function enumFormatter(cell: any, row: any, enumObject: any) {
+  return enumObject[cell];
+}
+
+class SelectFilterWithDefaultValue extends React.Component<any, any> {
+  render() {
+    return (
+      <BootstrapTable data={ products }>
+          <TableHeaderColumn dataField='id' isKey>Product ID</TableHeaderColumn>
+          <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+          <TableHeaderColumn dataField='quality' filterFormatted dataFormat={ enumFormatter }
+            formatExtraData={ qualityType } filter={ { type: 'SelectFilter', options: qualityType, defaultValue: 1 } }>Product Quality</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+class TextFilterWithCondition extends React.Component<any, any> {
+  render() {
+    return (
+      <BootstrapTable data={ products }>
+        <TableHeaderColumn dataField='id' isKey>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name' filter={ { type: 'TextFilter', delay: 1000, condition: 'eq' } }>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+function getCustomFilter(filterHandler: (parameters?: ApplyFilterParameter) => void, customFilterParameters: any) {
+  return (
+    <div />
+  );
+}
+
+class CustomFilter extends React.Component<any, any> {
+  render() {
+    return (
+      <BootstrapTable data={ products }>
+        <TableHeaderColumn dataField='id' isKey>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='isInStock' filter={ { type: 'CustomFilter', getElement: getCustomFilter, customFilterParameters: { textOK: 'yes', textNOK: 'no' } } }>Product Is In Stock</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
diff --git a/react-bootstrap/react-bootstrap-tests.tsx b/react-bootstrap/react-bootstrap-tests.tsx
index 987203fbf8..432636559b 100644
--- a/react-bootstrap/react-bootstrap-tests.tsx
+++ b/react-bootstrap/react-bootstrap-tests.tsx
@@ -1,9 +1,3 @@
-// React-Bootstrap Test
-// ================================================================================
-///<reference types="react"/>
-
-// Imports
-// --------------------------------------------------------------------------------
 import * as React from 'react';
 import { Component, CSSProperties } from 'react';
 import {
diff --git a/react-datagrid/react-datagrid-tests.tsx b/react-datagrid/react-datagrid-tests.tsx
index 061be471f4..bdbca39f01 100644
--- a/react-datagrid/react-datagrid-tests.tsx
+++ b/react-datagrid/react-datagrid-tests.tsx
@@ -1,6 +1,3 @@
-
-/// <reference types="react" />
-
 import * as React from "react";
 import ReactDataGrid = require("react-datagrid");
 
diff --git a/react-datepicker/index.d.ts b/react-datepicker/index.d.ts
index ae33a5c24f..0cbe0ba202 100644
--- a/react-datepicker/index.d.ts
+++ b/react-datepicker/index.d.ts
@@ -29,6 +29,7 @@ declare module "react-datepicker" {
         name?: string;
         onBlur?(event: React.FocusEvent<HTMLInputElement>): void;
         onChange(date: moment.Moment | null, event: React.SyntheticEvent<any> | undefined): any;
+        onChangeRaw?(event: React.FocusEvent<HTMLInputElement>): void;
         onFocus?(event: React.FocusEvent<HTMLInputElement>): void;
         peekNextMonth?: boolean;
         placeholderText?: string;
diff --git a/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts b/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
index 83ee1bc9ba..68703d062d 100644
--- a/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
+++ b/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 // Test adapted from the ReactDnD chess game tutorial:
 // http://gaearon.github.io/react-dnd/docs-tutorial.html
 
diff --git a/react-dnd/UNUSED_FILES.txt b/react-dnd/UNUSED_FILES.txt
deleted file mode 100644
index ff694923a2..0000000000
--- a/react-dnd/UNUSED_FILES.txt
+++ /dev/null
@@ -1 +0,0 @@
-react-dnd-test-backend.d.ts
\ No newline at end of file
diff --git a/react-dnd/react-dnd-test-backend.d.ts b/react-dnd/react-dnd-test-backend.d.ts
deleted file mode 100644
index 095c890483..0000000000
--- a/react-dnd/react-dnd-test-backend.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for React DnD HTML 5 Backend v2.0.0
-// Project: https://github.com/gaearon/react-dnd
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare module "react-dnd-test-backend" {
-    class TestBackend {
-        setup(): void;
-        teardown(): void;
-        connectDragSource(): void;
-        connectDropTarget(): void;
-        simulateBeginDrag(sourceIds: __ReactDnd.Identifier[], options?: {}): void;
-        simulatePublishDragSource(): void;
-        simulateHover(targetIds: __ReactDnd.Identifier[], options?: {}): void;
-        simulateDrop(): void;
-        simulateEndDrag(): void;
-    }
-
-    export { TestBackend as default };
-}
diff --git a/react-dnd/react-dnd-tests.ts b/react-dnd/react-dnd-tests.ts
index fdef2b727c..0aabefd26e 100644
--- a/react-dnd/react-dnd-tests.ts
+++ b/react-dnd/react-dnd-tests.ts
@@ -1,6 +1,3 @@
-///<reference path="react-dnd-test-backend.d.ts" />
-"use strict";
-
 // Test adapted from the ReactDnD chess game tutorial:
 // http://gaearon.github.io/react-dnd/docs-tutorial.html
 
@@ -14,7 +11,17 @@ import DropTarget = ReactDnd.DropTarget;
 import DragLayer = ReactDnd.DragLayer;
 import DragDropContext = ReactDnd.DragDropContext;
 import HTML5Backend, { getEmptyImage, NativeTypes } from "react-dnd-html5-backend";
-import TestBackend from "react-dnd-test-backend";
+declare class TestBackend {
+	setup(): void;
+	teardown(): void;
+	connectDragSource(): void;
+	connectDropTarget(): void;
+	simulateBeginDrag(sourceIds: __ReactDnd.Identifier[], options?: {}): void;
+	simulatePublishDragSource(): void;
+	simulateHover(targetIds: __ReactDnd.Identifier[], options?: {}): void;
+	simulateDrop(): void;
+	simulateEndDrag(): void;
+}
 
 // Game Component
 // ----------------------------------------------------------------------
diff --git a/react-dropzone/react-dropzone-tests.tsx b/react-dropzone/react-dropzone-tests.tsx
index 322fd82e8c..ec6d5fa763 100644
--- a/react-dropzone/react-dropzone-tests.tsx
+++ b/react-dropzone/react-dropzone-tests.tsx
@@ -1,5 +1,3 @@
-///<reference types="react" />
-///<reference types="react-dropzone" />
 import * as React from 'react';
 import * as Dropzone from 'react-dropzone';
 
diff --git a/react-helmet/react-helmet-tests.tsx b/react-helmet/react-helmet-tests.tsx
index 3a4a3f09d7..e6b78955b3 100644
--- a/react-helmet/react-helmet-tests.tsx
+++ b/react-helmet/react-helmet-tests.tsx
@@ -1,6 +1,3 @@
-
-/// <reference types="react" />
-
 import * as React from 'react';
 import * as Helmet from 'react-helmet';
 
diff --git a/react-infinite/react-infinite-tests.tsx b/react-infinite/react-infinite-tests.tsx
index 807fc67498..ea68999afc 100644
--- a/react-infinite/react-infinite-tests.tsx
+++ b/react-infinite/react-infinite-tests.tsx
@@ -1,6 +1,3 @@
-///<reference types="react" />
-///<reference types="react-infinite" />
-
 import * as React from 'react';
 import Infinite = require('react-infinite');
 
diff --git a/react-input-calendar/react-input-calendar-tests.tsx b/react-input-calendar/react-input-calendar-tests.tsx
index aaab1dc398..4cd465d9c5 100644
--- a/react-input-calendar/react-input-calendar-tests.tsx
+++ b/react-input-calendar/react-input-calendar-tests.tsx
@@ -1,6 +1,3 @@
-/// <reference types="react"/>
-/// <reference types="react-dom"/>
-
 import * as ReactInputCalendar from 'react-input-calendar';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
diff --git a/react-intl/react-intl-tests.tsx b/react-intl/react-intl-tests.tsx
index 400879677f..d3477aaa11 100644
--- a/react-intl/react-intl-tests.tsx
+++ b/react-intl/react-intl-tests.tsx
@@ -3,8 +3,6 @@
  * Updated by Fedor Nezhivoi
  */
 
-///<reference types="react" />
-
 import * as React from "react"
 import * as reactMixin from "react-mixin"
 
diff --git a/react-intl/v1/react-intl-tests.tsx b/react-intl/v1/react-intl-tests.tsx
index 6abebe36cd..c7834b6583 100644
--- a/react-intl/v1/react-intl-tests.tsx
+++ b/react-intl/v1/react-intl-tests.tsx
@@ -2,8 +2,6 @@
  * Created by Bruno Grieder
  */
 
-///<reference types="react" />
-
 import * as React from 'react'
 
 import * as reactMixin from 'react-mixin'
diff --git a/react-leaflet/index.d.ts b/react-leaflet/index.d.ts
index 2399947c7d..eff286623a 100644
--- a/react-leaflet/index.d.ts
+++ b/react-leaflet/index.d.ts
@@ -111,7 +111,7 @@ interface LayerProps extends LeafletInteractionEvents {
 interface MarkerProps extends LayerProps, LeafletDraggingEvents {
     position: Leaflet.LatLngExpression;
     draggable?: boolean;
-    icon?: Leaflet.Icon;
+    icon?: Leaflet.BaseIcon;
     zIndexOffset?: number;
     opacity?: number;
 }
diff --git a/react-leaflet/react-leaflet-tests.tsx b/react-leaflet/react-leaflet-tests.tsx
index bb78ac7264..763e719de1 100644
--- a/react-leaflet/react-leaflet-tests.tsx
+++ b/react-leaflet/react-leaflet-tests.tsx
@@ -179,6 +179,18 @@ export class CustomComponent extends Component<any, any> {
     }
 }
 
+export class MarkerWithDivIconExample extends Component<any, any> {
+    render() {
+        return (
+            <Map>
+                <Marker position={[0, 0]} icon={
+                        new Leaflet.DivIcon({})
+                    }/>
+            </Map>
+        )
+    }
+}
+
 // draggable-marker.js
 export class DraggableExample extends Component<any, any> {
     state = {
diff --git a/react-mixin/react-mixin-tests.tsx b/react-mixin/react-mixin-tests.tsx
index 04f6f4b202..f275869a9e 100644
--- a/react-mixin/react-mixin-tests.tsx
+++ b/react-mixin/react-mixin-tests.tsx
@@ -1,6 +1,3 @@
-
-/// <reference types="react" />
-
 import reactMixin = require('react-mixin');
 import * as React from 'react';
 
diff --git a/react-modal/index.d.ts b/react-modal/index.d.ts
index 399f779567..afec7250e2 100644
--- a/react-modal/index.d.ts
+++ b/react-modal/index.d.ts
@@ -12,13 +12,11 @@ export = ReactModal;
 
 declare namespace ReactModal {
     export interface Styles {
-        style?: {
-            content?: {
-                [key: string]: any;
-            };
-            overlay?: {
-                [key: string]: any;
-            };
+        content?: {
+            [key: string]: any;
+        };
+        overlay?: {
+            [key: string]: any;
         };
     }
 
diff --git a/react-native/index.d.ts b/react-native/index.d.ts
index 0330d39a90..29dd9fa780 100644
--- a/react-native/index.d.ts
+++ b/react-native/index.d.ts
@@ -734,6 +734,7 @@ declare module "react" {
 
     export interface TextStyleAndroid extends ViewStyle {
         textAlignVertical?: "auto" | "top" | "bottom" | "center"
+        includeFontPadding?: boolean
     }
 
     // @see https://facebook.github.io/react-native/docs/text.html#style
@@ -1849,13 +1850,13 @@ declare module "react" {
         /**
          * The style of the content container(View) when behavior is 'position'.
          */
-        contentContainerStyle: ViewStyle
+        contentContainerStyle?: ViewStyle
 
         /**
          * This is the distance between the top of the user screen and the react native view,
          * may be non-zero in some use cases.
          */
-        keyboardVerticalOffset: number
+        keyboardVerticalOffset?: number
 
         ref?: Ref<KeyboardAvoidingViewStatic & ViewStatic>
     }
@@ -2500,9 +2501,9 @@ declare module "react" {
 
         /**
          * Specifies the side of the screen from which the drawer will slide in.
-         * enum(DrawerConsts.DrawerPosition.Left, DrawerConsts.DrawerPosition.Right)
+         * enum(DrawerLayoutAndroid.positions.Left, DrawerLayoutAndroid.positions.Right)
          */
-        drawerPosition?: any;
+        drawerPosition?: number;
 
         /**
          * Specifies the width of the drawer, more precisely the width of the
@@ -2563,8 +2564,18 @@ declare module "react" {
         ref?: Ref<DrawerLayoutAndroidStatic & ViewStatic>
     }
 
+    interface DrawerPosition {
+      Left: number
+      Right: number
+    }
+
     export interface DrawerLayoutAndroidStatic extends NativeMethodsMixin, React.ClassicComponentClass<DrawerLayoutAndroidProperties> {
 
+	/**
+         * drawer's positions.
+         */
+        positions: DrawerPosition
+
         /**
          * Opens the drawer.
          */
@@ -4917,7 +4928,7 @@ declare module "react" {
 
     interface PlatformStatic {
         OS: PlatformOSType
-        Version?: number
+        Version: number
 
         /**
          * @see https://facebook.github.io/react-native/docs/platform-specific-code.html#content
@@ -7644,7 +7655,7 @@ declare module "react" {
         onNavigateBack?(): void;
     }
 
-    type SubViewRenderer = (subViewProps: SubViewProps) => JSX.Element;
+    type SubViewRenderer = (subViewProps: SubViewProps) => JSX.Element | null;
 
     export interface NavigationHeaderProps extends NavigationSceneRendererProps {
         onNavigateBack?(): void,
@@ -7973,6 +7984,34 @@ declare module "react" {
          */
         cropImage( uri: string, cropData: ImageCropData, success: (uri: string) => void, failure: (error: Object) => void ): void
     }
+				  
+    export interface ARTShapeProps {
+        d: string,
+        strokeWidth: number,
+        strokeDash?: number[],
+        stroke: string
+    }
+
+    export interface ARTSurfaceProps {
+        style: ViewStyle,
+        width: number,
+        height: number
+    }
+
+    export interface ShapeStatic extends React.ComponentClass<ARTShapeProps> {
+    }
+
+    export interface SurfaceStatic extends React.ComponentClass<ARTSurfaceProps> {
+    }
+
+    export interface ARTStatic {
+	      Shape: ShapeStatic,
+	      Surface: SurfaceStatic	
+    }
+            
+    export interface KeyboardStatic extends NativeEventEmitter {
+        dismiss: ()=>void
+    }
 
     //////////////////////////////////////////////////////////////////////////
     //
@@ -7982,6 +8021,8 @@ declare module "react" {
 
     // TODO: The following components need to be added
     // - [ ] ART
+    export var ART: ARTStatic
+    export type ART = ARTStatic
 
     export var ActivityIndicator: ActivityIndicatorStatic
     export type ActivityIndicator = ActivityIndicatorStatic
@@ -8162,7 +8203,7 @@ declare module "react" {
     export var IntentAndroid: IntentAndroidStatic
     export type IntentAndroid = IntentAndroidStatic
 
-    export var Keyboard: NativeEventEmitter
+    export var Keyboard: KeyboardStatic
 
     export var KeyboardAvoidingView: KeyboardAvoidingViewStatic
     export type KeyboardAvoidingView = KeyboardAvoidingViewStatic
@@ -8323,11 +8364,11 @@ declare module "react" {
 declare global {
     const global: React.GlobalStatic;
     function require(name: string): any;
-}
 
-/**
- * This variable is set to true when react-native is running in Dev mode
- * Typical usage:
- * <code> if (__DEV__) console.log('Running in dev mode')</code>
- */
-declare var __DEV__: boolean
+    /**
+     * This variable is set to true when react-native is running in Dev mode
+     * Typical usage:
+     * <code> if (__DEV__) console.log('Running in dev mode')</code>
+     */
+    var __DEV__: boolean
+}
diff --git a/react-native/test/animated.tsx b/react-native/test/animated.tsx
index 632f2c0151..3b3457384c 100644
--- a/react-native/test/animated.tsx
+++ b/react-native/test/animated.tsx
@@ -1,5 +1,3 @@
-///<reference types="react-native" />
-
 import * as React from 'react-native'
 
 import {
diff --git a/react-native/test/index.tsx b/react-native/test/index.tsx
index 6e05cdeabe..32bcbe931b 100644
--- a/react-native/test/index.tsx
+++ b/react-native/test/index.tsx
@@ -1,8 +1,4 @@
-
 /*
-
-Note: This must be compiled with the target set to ES6
-
 The content of index.io.js could be something like
 
     'use strict';
@@ -12,13 +8,8 @@ The content of index.io.js could be something like
 
      AppRegistry.registerComponent('MopNative', () => Welcome);
 
-
 For a list of complete Typescript examples: check https://github.com/bgrieder/RNTSExplorer
-
- */
-
-///<reference types="react-native" />
-
+*/
 
 import * as React from 'react-native'
 import {
diff --git a/react-onclickoutside/react-onclickoutside-tests.tsx b/react-onclickoutside/react-onclickoutside-tests.tsx
index dabba332b1..fc782bb68c 100644
--- a/react-onclickoutside/react-onclickoutside-tests.tsx
+++ b/react-onclickoutside/react-onclickoutside-tests.tsx
@@ -1,8 +1,3 @@
-// React onClickOutside Test
-// ================================================================================
-
-// Imports
-// --------------------------------------------------------------------------------
 import * as React from "react"
 import { Component, StatelessComponent, MouseEvent } from "react"
 import { render } from "react-dom"
diff --git a/react-paginate/index.d.ts b/react-paginate/index.d.ts
index aaa3931b74..363aeb8ea1 100644
--- a/react-paginate/index.d.ts
+++ b/react-paginate/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for react-paginate 2.1.3
+// Type definitions for react-paginate v4.2.0
 // Project: https://github.com/AdeleD/react-paginate
-// Definitions by: Simon Hartcher <https://github.com/deevus>
+// Definitions by: Simon Hartcher <https://github.com/deevus>, Wouter Hardeman <https://github.com/wouterhardeman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -10,7 +10,7 @@ interface ReactPaginateProps {
     /**
      * The total number of pages.
      */
-    pageNum: number;
+    pageCount: number;
 
     /**
      * The range of pages displayed.
@@ -43,19 +43,24 @@ interface ReactPaginateProps {
     breakClassName?: string | JSX.Element;
 
     /**
-     * The method to call when a page is clicked.
+     * The method to call when a page is clicked. Exposes the current page object as an argument.
      */
-    clickCallback?: Function;
+    onPageChange?: Function;
 
     /**
      * The initial page selected.
      */
-    initialSelected?: number;
+    initialPage?: number;
 
     /**
      * To override selected page with parent prop.
      */
-    forceSelected?: number;
+    forcePage?: number;
+
+    /**
+     * Disable `onPageChange` callback with initial page. Default: `false`
+     */
+    disableInitialCallback?: boolean
 
     /**
      * The classname of the pagination container.
@@ -101,6 +106,11 @@ interface ReactPaginateProps {
      * The classname for disabled `previous` and `next` buttons.
      */
     disabledClassName?: string;
+
+    /**
+     * The method is called to generate the `href` attribute value on tag `a` of each page element.
+     */
+    hrefBuilder?: Function;
 }
 
 declare const ReactPaginate: React.ComponentClass<ReactPaginateProps>;
diff --git a/react-paginate/react-paginate-tests.tsx b/react-paginate/react-paginate-tests.tsx
index 2ae495eacf..42a7c49c30 100644
--- a/react-paginate/react-paginate-tests.tsx
+++ b/react-paginate/react-paginate-tests.tsx
@@ -5,7 +5,7 @@ class Test extends React.Component<{}, {}> {
     public render() {
         return (
             <ReactPaginate
-                pageNum={1}
+                pageCount={1}
                 pageRangeDisplayed={10}
                 marginPagesDisplayed={2}
             />
diff --git a/react-props-decorators/react-props-decorators-tests.ts b/react-props-decorators/react-props-decorators-tests.ts
index 562d4f3d12..654c2df98f 100644
--- a/react-props-decorators/react-props-decorators-tests.ts
+++ b/react-props-decorators/react-props-decorators-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="react" />
-
 import * as React from 'react';
 import { propTypes, defaultProps } from 'react-props-decorators';
 
diff --git a/react-relay/index.d.ts b/react-relay/index.d.ts
index 9c45ed9c7c..a693527e3e 100644
--- a/react-relay/index.d.ts
+++ b/react-relay/index.d.ts
@@ -7,13 +7,15 @@
 declare module "react-relay" {
     import * as React from "react";
 
+    type ClientMutationID = string;
+
     /** Fragments are a hash of functions */
     interface Fragments {
         [query: string]: ((variables?: RelayVariables) => string)
     }
 
     interface CreateContainerOpts {
-        initialVariables?: Object
+        initialVariables?: any
         fragments: Fragments
         prepareVariables?(prevVariables: RelayVariables): RelayVariables
     }
@@ -31,6 +33,24 @@ declare module "react-relay" {
         response: any
     }
 
+    type RelayMutationStatus =
+      'UNCOMMITTED' | // Transaction hasn't yet been sent to the server. Transaction can be committed or rolled back.
+      'COMMIT_QUEUED' | // Transaction was committed but another transaction with the same collision key is pending, so the transaction has been queued to send to the server.
+      'COLLISION_COMMIT_FAILED' | //Transaction was queued for commit but another transaction with the same collision key failed. All transactions in the collision queue, including this one, have been failed. Transaction can be recommitted or rolled back.
+      'COMMITTING' | // Transaction is waiting for the server to respond.
+      'COMMIT_FAILED';
+
+    class RelayMutationTransaction {
+      applyOptimistic(): RelayMutationTransaction;
+      commit(): RelayMutationTransaction | null;
+      recommit(): void;
+      rollback(): void;
+      getError(): Error;
+      getStatus(): RelayMutationStatus;
+      getHash(): string;
+      getID(): ClientMutationID;
+    }
+
     interface RelayMutationRequest {
         getQueryString(): string
         getVariables(): RelayVariables
@@ -104,7 +124,7 @@ declare module "react-relay" {
         renderFailure?(error: Error, retry: Function): JSX.Element
     }
 
-    type ReadyStateEvent = 
+    type ReadyStateEvent =
         'ABORT' |
         'CACHE_RESTORED_REQUIRED' |
         'CACHE_RESTORE_FAILED' |
@@ -128,7 +148,13 @@ declare module "react-relay" {
     }
 
     interface RelayProp {
-        variables: any
-        setVariables(variables: Object, onReadyStateChange?: OnReadyStateChange): void
+        readonly route: { name: string; }; // incomplete, also has params and queries
+        readonly variables: any;
+        readonly pendingVariables?: any | null;
+        setVariables(variables: any, onReadyStateChange?: OnReadyStateChange): void;
+        forceFetch(variables: any, onReadyStateChange?: OnReadyStateChange): void;
+        hasOptimisticUpdate(record: any): boolean;
+        getPendingTransactions(record: any): RelayMutationTransaction[];
+        commitUpdate: (mutation: Mutation<any,any>, callbacks?: StoreUpdateCallbacks<any>) => any;
     }
 }
diff --git a/react-relay/react-relay-tests.tsx b/react-relay/react-relay-tests.tsx
index 7160e60b0a..091909cabd 100644
--- a/react-relay/react-relay-tests.tsx
+++ b/react-relay/react-relay-tests.tsx
@@ -74,10 +74,17 @@ class StubbedArtwork extends React.Component<null, null> {
         const props = {
             artwork: { title: "CHAMPAGNE FORMICA FLAG" },
             relay: {
+                route: {
+                    name: "champagne"
+                },
                 variables: {
                     artworkID: "champagne-formica-flag",
                 },
                 setVariables: () => {},
+                forceFetch: () => {},
+                hasOptimisticUpdate: () => false,
+                getPendingTransactions: (): Relay.RelayMutationTransaction[] => undefined,
+                commitUpdate: () => {},
             }
         }
         return <ArtworkContainer {...props} />
diff --git a/react-router-bootstrap/react-router-bootstrap-tests.tsx b/react-router-bootstrap/react-router-bootstrap-tests.tsx
index d4f8733c03..7816933fe6 100644
--- a/react-router-bootstrap/react-router-bootstrap-tests.tsx
+++ b/react-router-bootstrap/react-router-bootstrap-tests.tsx
@@ -1,16 +1,8 @@
-// React-Router-Bootstrap Test
-// ================================================================================
-///<reference types="react"/>
-///<reference types="react-bootstrap"/>
-
-// Imports
-// --------------------------------------------------------------------------------
 import * as React from 'react';
 import { Component, CSSProperties } from 'react';
 import { Button } from 'react-bootstrap';
 import { LinkContainer, IndexLinkContainer } from 'react-router-bootstrap'
 
-
 export class ReactRouterBootstrapTest extends Component<any, any> {
     callback() {
         alert('Callback: ' + JSON.stringify(arguments));
@@ -20,7 +12,7 @@ export class ReactRouterBootstrapTest extends Component<any, any> {
         let style: CSSProperties = { padding: '50px' };
         return (
             <div style={style}>
-                
+
                 <div style={style}>
                     <LinkContainer to="/page"><Button>Link</Button></LinkContainer>
                     <IndexLinkContainer to="/index"><Button>Link</Button></IndexLinkContainer>
diff --git a/react-router-redux/index.d.ts b/react-router-redux/index.d.ts
index 0736359b21..9f8044a7c0 100644
--- a/react-router-redux/index.d.ts
+++ b/react-router-redux/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for react-router-redux 4.0
 // Project: https://github.com/rackt/react-router-redux
-// Definitions by: Isman Usoh <http://github.com/isman-usoh>, Noah Shipley <https://github.com/noah79>, Dimitri Rosenberg <https://github.com/rosendi>, Karol Janyst <https://github.com/LKay>
+// Definitions by: Isman Usoh <http://github.com/isman-usoh>, Noah Shipley <https://github.com/noah79>, Dimitri Rosenberg <https://github.com/rosendi>, Karol Janyst <https://github.com/LKay>, Dovydas Navickas <https://github.com/DovydasNavickas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -51,7 +51,7 @@ export interface SyncHistoryWithStoreOptions {
 }
 
 export interface HistoryUnsubscribe {
-    unsubscribe(): undefined;
+    unsubscribe(): void;
 }
 
 export function routerReducer(state?: RouterState, action?: Action): RouterState;
diff --git a/react-router-redux/v3/index.d.ts b/react-router-redux/v3/index.d.ts
index fdea00bbc6..be706bdcc8 100644
--- a/react-router-redux/v3/index.d.ts
+++ b/react-router-redux/v3/index.d.ts
@@ -34,8 +34,8 @@ export interface RouteActions {
 }
 
 export interface HistoryMiddleware extends Redux.Middleware {
-    listenForReplays(store: Redux.Store<any>, selectLocationState?: Function): undefined;
-    unsubscribe(): undefined;
+    listenForReplays(store: Redux.Store<any>, selectLocationState?: Function): void;
+    unsubscribe(): void;
 }
 
 export function routeReducer(state?: any, options?: any): Redux.Reducer<any>;
diff --git a/react-router/index.d.ts b/react-router/index.d.ts
index be48438489..05fe9b3371 100644
--- a/react-router/index.d.ts
+++ b/react-router/index.d.ts
@@ -8,6 +8,7 @@
 //                 Kostya Esmukov <https://github.com/KostyaEsmukov>
 //                 John Reilly <https://github.com/johnnyreilly>
 //                 Karol Janyst <https://github.com/LKay>
+//                 Dovydas Navickas <https://github.com/DovydasNavickas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
diff --git a/react-router/lib/IndexRoute.d.ts b/react-router/lib/IndexRoute.d.ts
index 84b70d7874..44b8c82919 100644
--- a/react-router/lib/IndexRoute.d.ts
+++ b/react-router/lib/IndexRoute.d.ts
@@ -15,8 +15,8 @@ type ComponentsCallback = (err: any, components: RouteComponents) => any;
 export interface IndexRouteProps {
     component?: RouteComponent;
     components?: RouteComponents;
-    getComponent?(nextState: RouterState, callback: ComponentCallback): undefined;
-    getComponents?(nextState: RouterState, callback: ComponentsCallback): undefined;
+    getComponent?: (nextState: RouterState, callback: ComponentCallback) => void;
+    getComponents?: (nextState: RouterState, callback: ComponentsCallback) => void;
     onEnter?: EnterHook;
     onChange?: ChangeHook;
     onLeave?: LeaveHook;
diff --git a/react-router/lib/Route.d.ts b/react-router/lib/Route.d.ts
index 1c0969da51..9063ac8b45 100644
--- a/react-router/lib/Route.d.ts
+++ b/react-router/lib/Route.d.ts
@@ -20,12 +20,12 @@ declare const Route: Route;
 
 export default Route;
 
-type RouteCallback = (err: any, route: PlainRoute) => any;
-type RoutesCallback = (err: any, routesArray: PlainRoute[]) => any;
+type RouteCallback = (err: any, route: PlainRoute) => void;
+type RoutesCallback = (err: any, routesArray: PlainRoute[]) => void;
 
 export interface PlainRoute extends RouteProps {
     childRoutes?: PlainRoute[];
-    getChildRoutes?(partialNextState: LocationState, callback: RoutesCallback): undefined;
+    getChildRoutes?: (partialNextState: LocationState, callback: RoutesCallback) => void;
     indexRoute?: PlainRoute;
-    getIndexRoute?(partialNextState: LocationState, callback: RouteCallback): undefined;
+    getIndexRoute?: (partialNextState: LocationState, callback: RouteCallback) => void;
 }
diff --git a/react-router/lib/Router.d.ts b/react-router/lib/Router.d.ts
index daae78411a..02550026b9 100644
--- a/react-router/lib/Router.d.ts
+++ b/react-router/lib/Router.d.ts
@@ -36,8 +36,8 @@ export type ChangeHook = (prevState: RouterState, nextState: RouterState, replac
 export type RouteHook = (nextLocation?: Location) => any;
 
 export interface RedirectFunction {
-    (location: LocationDescriptor): undefined;
-    (state: LocationState, pathname: Pathname | Path, query?: Query): undefined;
+    (location: LocationDescriptor): void;
+    (state: LocationState, pathname: Pathname | Path, query?: Query): void;
 }
 
 export interface RouterState {
@@ -47,11 +47,11 @@ export interface RouterState {
     components: RouteComponent[];
 }
 
-type LocationFunction = (location: LocationDescriptor) => any;
-type GoFunction = (n: number) => any;
-type NavigateFunction = () => any;
+type LocationFunction = (location: LocationDescriptor) => void;
+type GoFunction = (n: number) => void;
+type NavigateFunction = () => void;
 type ActiveFunction = (location: LocationDescriptor, indexOnly?: boolean) => boolean;
-type LeaveHookFunction = (route: any, callback: RouteHook) => any;
+type LeaveHookFunction = (route: any, callback: RouteHook) => void;
 type CreatePartFunction<Part> = (path: Path, query?: any) => Part;
 
 export interface InjectedRouter {
diff --git a/react-router/lib/match.d.ts b/react-router/lib/match.d.ts
index a99561e6ba..82c19e83f6 100644
--- a/react-router/lib/match.d.ts
+++ b/react-router/lib/match.d.ts
@@ -18,6 +18,6 @@ interface MatchHistoryArgs extends MatchArgs {
     history: History;
 }
 
-export type MatchCallback = (error: any, redirectLocation: Location, renderProps: any) => any;
+export type MatchCallback = (error: any, redirectLocation: Location, renderProps: any) => void;
 
-export default function match(args: MatchLocationArgs | MatchHistoryArgs, cb: MatchCallback): undefined;
+export default function match(args: MatchLocationArgs | MatchHistoryArgs, cb: MatchCallback): void;
diff --git a/react-router/lib/withRouter.d.ts b/react-router/lib/withRouter.d.ts
index 25f9d357c7..209c01f913 100644
--- a/react-router/lib/withRouter.d.ts
+++ b/react-router/lib/withRouter.d.ts
@@ -6,4 +6,7 @@ interface Options {
 
 type ComponentConstructor<P> = ComponentClass<P> | StatelessComponent<P>;
 
-export default function withRouter<P>(component: ComponentConstructor<P>, options?: Options): ComponentClass<P>;
+declare function withRouter<P, S>(component: ComponentConstructor<P> & S, options?: Options): ComponentClass<P> & S;
+declare function withRouter<P>(component: ComponentConstructor<P>, options?: Options): ComponentClass<P>;
+
+export default withRouter;
diff --git a/react-router/react-router-tests.tsx b/react-router/react-router-tests.tsx
index f8be6c3326..314c78c6ce 100644
--- a/react-router/react-router-tests.tsx
+++ b/react-router/react-router-tests.tsx
@@ -27,7 +27,7 @@ import { createHistory, History } from "history";
 const routerHistory = useRouterHistory(createHistory)({ basename: "/test" });
 
 interface CustomHistory {
-	test(): undefined;
+	test(): void;
 }
 
 type CombinedHistory = History & CustomHistory;
@@ -81,6 +81,7 @@ interface DashboardProps {
 }
 
 class Dashboard extends React.Component<DashboardProps, {}> {
+    static staticMethodToBeHoisted(): void {}
 
 	navigate() {
 		var router = this.props.router;
@@ -102,6 +103,8 @@ class Dashboard extends React.Component<DashboardProps, {}> {
 
 const DashboardWithRouter = withRouter(Dashboard);
 
+DashboardWithRouter.staticMethodToBeHoisted();
+
 class NotFound extends React.Component<{}, {}> {
 
 	render() {
diff --git a/react-scroll/react-scroll-tests.tsx b/react-scroll/react-scroll-tests.tsx
index b5d2fb2245..63db573722 100644
--- a/react-scroll/react-scroll-tests.tsx
+++ b/react-scroll/react-scroll-tests.tsx
@@ -1,5 +1,3 @@
-/// <reference types="react" />
-
 import * as React from 'react';
 import { Link, Element, scroller } from 'react-scroll';
 
diff --git a/react-select/index.d.ts b/react-select/index.d.ts
index c011b78e0e..789512661f 100644
--- a/react-select/index.d.ts
+++ b/react-select/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-select v1.0.0
+// Type definitions for react-select 1.0
 // Project: https://github.com/JedWatson/react-select
 // Definitions by: ESQUIBET Hugo <https://github.com/Hesquibet/>, Gilad Gray <https://github.com/giladgray/>, Izaak Baker <https://github.com/iebaker/>, Tadas Dailyda <https://github.com/skirsdeda/>, Mark Vujevits <https://github.com/vujevits/>, Mike Deverell <https://github.com/devrelm/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -23,7 +23,7 @@ declare namespace ReactSelectClass {
         /** Text for rendering */
         label?: string;
         /** Value for searching */
-        value?: string | number;
+        value?: string | number | boolean;
         /**
          * Allow this option to be cleared
          * @default true
@@ -238,7 +238,7 @@ declare namespace ReactSelectClass {
         /**
          * onChange handler: function (newValue) {}
          */
-        onChange?: (newValue: Option | Option[]) => void;
+        onChange?: (newValue: Option | Option[] | null) => void;
         /**
          * fires when the menu is closed
          */
diff --git a/react-spinkit/index.d.ts b/react-spinkit/index.d.ts
index 05955e3f53..24de75a032 100644
--- a/react-spinkit/index.d.ts
+++ b/react-spinkit/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for react-spinkit 1.1.4
 // Project: https://github.com/KyleAMathews/react-spinkit
-// Definitions by: Qubo <https://github.com/tkqubo>, Mleko <https://github.com/mleko>
+// Definitions by: Qubo <https://github.com/tkqubo>, Mleko <https://github.com/mleko>, Tom Crockett <https://github.com/pelotom>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -8,7 +8,22 @@
 
 declare namespace spinner {
 	export interface SpinnerProps {
-		spinnerName?: string;
+        /**
+         * Specify spinner to use.
+         */
+        spinnerName?: 'three-bounce' | 'double-bounce' | 'rotating-plane' | 'folding-cube' | 'wave' | 'wandering-cubes' | 'pulse' | 'chasing-dots' | 'circle' | 'cube-grid' | 'wordpress';
+        /**
+         * Disable the initial fade-in of the spinner.
+         */
+        noFadeIn?: boolean;
+        /**
+         * Change the default "spinner" className.
+         */
+        overrideSpinnerClassName?: string;
+        /**
+         * Component className.
+         */
+        className?: string;
 	}
 
 	export interface Spinner extends React.ComponentClass<SpinnerProps> {
diff --git a/react-spinkit/react-spinkit-tests.tsx b/react-spinkit/react-spinkit-tests.tsx
index a163400601..6742096ebe 100644
--- a/react-spinkit/react-spinkit-tests.tsx
+++ b/react-spinkit/react-spinkit-tests.tsx
@@ -1,7 +1,23 @@
-
-/// <reference types="react" />
-
 import * as Spinner from 'react-spinkit';
 import * as React from 'react';
 
-let spinner = <Spinner spinnerName='double-bounce' />;
+// Examples taken from http://kyleamathews.github.io/react-spinkit/
+const spinners = [
+    // Basic spinners
+    <Spinner spinnerName="three-bounce" />,
+    <Spinner spinnerName="double-bounce" />,
+    <Spinner spinnerName="rotating-plane" />,
+    <Spinner spinnerName="folding-cube" />,
+    <Spinner spinnerName="wave" />,
+    <Spinner spinnerName="wandering-cubes" />,
+    <Spinner spinnerName="pulse" />,
+    <Spinner spinnerName="chasing-dots" />,
+    <Spinner spinnerName="circle" />,
+    <Spinner spinnerName="cube-grid" />,
+    <Spinner spinnerName="wordpress" />,
+
+    // Spinner options
+    <Spinner spinnerName="wordpress" noFadeIn />,
+    <Spinner spinnerName="wordpress" overrideSpinnerClassName="my-class-to-override" />,
+    <Spinner spinnerName="wordpress" className="my-class" />,
+];
diff --git a/react-svg-pan-zoom/index.d.ts b/react-svg-pan-zoom/index.d.ts
new file mode 100644
index 0000000000..837890a507
--- /dev/null
+++ b/react-svg-pan-zoom/index.d.ts
@@ -0,0 +1,198 @@
+// Type definitions for react-svg-pan-zoom 2.5
+// Project: https://github.com/chrvadala/react-svg-pan-zoom#readme
+// Definitions by: Huy Nguyen <https://github.com/huy-nguyen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+import * as React from 'react';
+
+declare module 'react-svg-pan-zoom' {
+
+	// String constants:
+	const MODE_IDLE = 'idle';
+	const MODE_PANNING = 'panning';
+	const MODE_ZOOMING = 'zooming';
+
+	export const TOOL_AUTO = 'auto';
+	export const TOOL_NONE = 'none';
+	export const TOOL_PAN = 'pan';
+	export const TOOL_ZOOM_IN = 'zoom-in';
+	export const TOOL_ZOOM_OUT = 'zoom-out';
+
+	export const POSITION_NONE = 'none';
+	export const POSITION_TOP = 'top';
+	export const POSITION_RIGHT = 'right';
+	export const POSITION_BOTTOM = 'bottom';
+	export const POSITION_LEFT = 'left';
+
+	export type Mode = typeof MODE_IDLE | typeof MODE_PANNING | typeof MODE_ZOOMING;
+
+	export interface Value {
+		version: 2,
+		mode: Mode,
+		focus: boolean,
+		a: number,
+		b: number,
+		c: number,
+		d: number,
+		e: number,
+		f: number,
+		viewerWidth: number,
+		viewerHeight: number,
+		SVGWidth: number,
+		SVGHeight: number,
+		startX?: number | null,
+		startY?: number | null,
+		endX?: number | null,
+		endY?: number | null,
+
+	}
+
+	export type Tool = typeof TOOL_AUTO | typeof TOOL_NONE | typeof TOOL_PAN |
+											typeof TOOL_ZOOM_IN | typeof TOOL_ZOOM_OUT
+	export type ToolbarPosition = typeof POSITION_NONE | typeof POSITION_TOP | typeof POSITION_RIGHT |
+											typeof POSITION_BOTTOM | typeof POSITION_LEFT
+
+
+	export interface OptionalProps {
+		//background of the viewer
+		background: React.CSSProperties,
+
+		//background of the svg
+		SVGBackground: string,
+
+		//value of the viewer (current point of view)
+		value: Value | null,
+
+		//CSS style of the Viewer
+		style: object,
+
+		//className of the Viewer
+		className: string,
+
+		//detect zoom operation performed trough pinch gesture or mouse scroll
+		detectWheel: boolean,
+
+		//perform PAN if the mouse is on viewer border
+		detectAutoPan: boolean,
+
+		//toolbar position
+		toolbarPosition: ToolbarPosition,
+
+		//handler something changed
+		onChangeValue: (value: Value) => void,
+
+		//handler tool changed
+		onChangeTool: (tool: Tool) => void,
+
+		// Note: The `T` type parameter is the type of the `target` of the event:
+		//handler click
+		onClick: <T>(event: ViewerMouseEvent<T>) => void,
+
+		//handler double click
+		onDoubleClick: <T>(event: ViewerMouseEvent<T>) => void,
+
+		//handler mouseup
+		onMouseUp: <T>(event: ViewerMouseEvent<T>) => void,
+
+		//handler mousemove
+		onMouseMove: <T>(event: ViewerMouseEvent<T>) => void,
+
+		//handler mousedown
+		onMouseDown: <T>(event: ViewerMouseEvent<T>) => void,
+
+		//if disabled the user can move the image outside the viewer
+		preventPanOutside: boolean,
+
+		//how much scale in or out
+		scaleFactor: number,
+
+		//current active tool (TOOL_NONE, TOOL_PAN, TOOL_ZOOM_IN, TOOL_ZOOM_OUT)
+		tool: Tool,
+
+		//modifier keys //https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/getModifierState
+		modifierKeys: string[],
+
+		//override default toolbar component
+		// TODO: specify function type more clearly
+		customToolbar: React.Component<any, any> | React.StatelessComponent<any>,
+
+		// How about touch events? They are in README but not in `propTypes`.
+	}
+
+	export interface RequiredProps {
+		//width of the viewer displayed on screen
+		width: number,
+		//height of the viewer displayed on screen
+		height: number,
+
+		//accept only one node SVG
+		// TODO: Figure out how to constrain `children` or maybe just leave it commented out
+		// because `children` is already implicit props
+		// children: () => any
+	}
+
+	export type Props = RequiredProps & Partial<OptionalProps>
+
+	class ReactSVGPanZoom extends React.Component<Props, {}> {
+		pan(SVGDeltaX: number, SVGDeltaY: number): void
+		zoom(SVGPointX: number, SVGPointY: number, scaleFactor: number): void
+		fitSelection(selectionSVGPointX: number, selectionSVGPointY: number, selectionWidth: number, selectionHeight: number): void
+		fitToViewer(): void
+		setPointOnViewerCenter(SVGPointX: number, SVGPointY: number, zoomLevel: number): void
+		reset(): void
+		zoomOnViewerCenter(scaleFactor: number): void
+		getValue(): Value
+		setValue(value: Value): void
+		getTool(): Tool
+		setTool(tool: Tool): void
+	}
+
+
+	export interface Point {
+		x: number,
+		y: number,
+	}
+
+	export interface ViewerMouseEvent<T>{
+		originalEvent: React.MouseEvent<T>,
+		SVGViewer: SVGSVGElement,
+		point: Point,
+		x: number,
+		y: number,
+		scaleFactor: number,
+		translationX: number,
+		translationY: number,
+		preventDefault(): void
+		stopPropagation(): void
+	}
+
+	export interface ViewerTouchEvent<T> {
+		originalEvent: React.TouchEvent<T>,
+		SVGViewer: SVGSVGElement,
+		points: Point[],
+		changedPoints: Point[],
+		scaleFactor: number,
+		translationX: number,
+		translationY: number,
+		preventDefault(): void
+		stopPropagation(): void
+	}
+
+	// Utility functions exposed:
+	export function pan(value: Value, SVGDeltaX: number, SVGDeltaY: number, panLimit?: number): Value
+
+	export function zoom(value: Value, SVGPointX: number, SVGPointY: number, scaleFactor: number): Value
+
+	export function fitSelection(
+		value: Value, selectionSVGPointX: number, selectionSVGPointY: number, selectionWidth: number, selectionHeight: number): Value
+
+	export function fitToViewer(value: Value): Value
+
+	export function zoomOnViewerCenter(value: Value, scaleFactor: number): Value
+
+	export function setPointOnViewerCenter(value: Value, SVGPointX: number, SVGPointY: number, zoomLevel: number): Value
+
+	export function reset(value: Value): Value
+}
+
+
diff --git a/react-svg-pan-zoom/react-svg-pan-zoom-tests.tsx b/react-svg-pan-zoom/react-svg-pan-zoom-tests.tsx
new file mode 100644
index 0000000000..dbe8f0d55e
--- /dev/null
+++ b/react-svg-pan-zoom/react-svg-pan-zoom-tests.tsx
@@ -0,0 +1,57 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import {
+  ReactSVGPanZoom,
+  Props,
+  fitToViewer,
+  ViewerMouseEvent
+} from 'react-svg-pan-zoom';
+
+
+class Example1 extends React.Component<{}, {}> {
+  Viewer: ReactSVGPanZoom
+  constructor(props: Props) {
+    super(props);
+  }
+
+  componentDidMount() {
+    this.Viewer.fitToViewer();
+  }
+
+  render() {
+    return (
+      <div>
+        <button onClick={event => this.Viewer.zoomOnViewerCenter(1.1)}>Zoom in</button>
+        <button onClick={event => this.Viewer.fitSelection(40, 40, 200, 200)}>Zoom area 200x200</button>
+        <button onClick={event => this.Viewer.fitToViewer()}>Fit</button>
+
+        <hr/>
+
+        <ReactSVGPanZoom
+          style={{border: "1px solid black"}}
+          width={500} height={500} ref={Viewer => this.Viewer = Viewer}
+          onClick={(event: ViewerMouseEvent<any>)  => console.log('click', event.x, event.y, event.originalEvent)}
+          onMouseUp={(event: ViewerMouseEvent<any>) => console.log('up', event.x, event.y)}
+          onMouseMove={(event: ViewerMouseEvent<any>) => console.log('move', event.x, event.y)}
+          onMouseDown={(event: ViewerMouseEvent<any>) => console.log('down', event.x, event.y)}>
+
+          <svg width={617} height={316}>
+
+            <g fillOpacity=".5" strokeWidth="4">
+              <rect x="400" y="40" width="100" height="200" fill="#4286f4" stroke="#f4f142"/>
+              <circle cx="108" cy="108.5" r="100" fill="#0ff" stroke="#0ff"/>
+              <circle cx="180" cy="209.5" r="100" fill="#ff0" stroke="#ff0"/>
+              <circle cx="220" cy="109.5" r="100" fill="#f0f" stroke="#f0f"/>
+            </g>
+
+          </svg>
+        </ReactSVGPanZoom>
+      </div>
+    );
+  }
+}
+
+ReactDOM.render(
+  <Example1 />,
+  document.getElementById('app')
+);
diff --git a/react-svg-pan-zoom/tsconfig.json b/react-svg-pan-zoom/tsconfig.json
new file mode 100644
index 0000000000..c1b72dd378
--- /dev/null
+++ b/react-svg-pan-zoom/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "jsx": "react",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-svg-pan-zoom-tests.tsx"
+    ]
+}
diff --git a/react-svg-pan-zoom/tslint.json b/react-svg-pan-zoom/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/react-svg-pan-zoom/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/react-tabs/react-tabs-tests.ts b/react-tabs/react-tabs-tests.ts
index b067987518..9998bcafbd 100644
--- a/react-tabs/react-tabs-tests.ts
+++ b/react-tabs/react-tabs-tests.ts
@@ -1,7 +1,3 @@
-
-/// <reference types="react" />
-/// <reference types="react-dom" />
-
 import React = require("react");
 import ReactDOM = require("react-dom");
 import { Tabs, TabList, Tab, TabPanel } from "react-tabs";
diff --git a/react-tagcloud/react-tagcloud-tests.tsx b/react-tagcloud/react-tagcloud-tests.tsx
index d0594314bc..552cc20e2d 100644
--- a/react-tagcloud/react-tagcloud-tests.tsx
+++ b/react-tagcloud/react-tagcloud-tests.tsx
@@ -1,8 +1,3 @@
-/// <reference types="react" />
-/// <reference types="react-dom" />
-
-
-
 // simple cloud
 import * as React from "react";
 import * as ReactDOM from "react-dom";
diff --git a/react-tether/index.d.ts b/react-tether/index.d.ts
new file mode 100644
index 0000000000..14344c5476
--- /dev/null
+++ b/react-tether/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for react-tether 0.5
+// Project: https://github.com/souporserious/react-tether
+// Definitions by: Ryan Price <https://github.com/ryprice>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export default TetherComponent;
+export as namespace ReactTether;
+
+import * as React from 'react';
+import * as Tether from 'tether';
+
+declare class TetherComponent extends React.Component<ReactTether.TetherComponentProps, null> { }
+
+declare namespace ReactTether {
+    export interface TetherComponentProps extends React.Props<TetherComponent>, Tether.ITetherOptions {
+        renderElementTag?: string;
+        renderElementTo?: string | {appendChild: (element: HTMLElement) => void};
+        id?: string;
+        className?: string;
+        style?: React.CSSProperties;
+        onUpdate?: () => void;
+        onRepositioned?: () => void;
+    }
+}
diff --git a/react-tether/react-tether-tests.tsx b/react-tether/react-tether-tests.tsx
new file mode 100644
index 0000000000..666329621e
--- /dev/null
+++ b/react-tether/react-tether-tests.tsx
@@ -0,0 +1,16 @@
+import TetherComponent from "react-tether";
+import * as React from "react";
+
+const ReactTetherAllOptions: JSX.Element =
+    <TetherComponent
+        attachment="bottom middle"
+        id="id123"
+        className="react-tether"
+        onUpdate={() => {}}
+        onRepositioned={() => {}}
+        renderElementTag="div"
+        renderElementTo=".container"
+    />;
+
+const ReactTetherRequiredOptions: JSX.Element =
+    <TetherComponent attachment="bottom middle" />;
\ No newline at end of file
diff --git a/react-tether/tsconfig.json b/react-tether/tsconfig.json
new file mode 100644
index 0000000000..f2138b25c9
--- /dev/null
+++ b/react-tether/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "jsx": "react",
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-tether-tests.tsx"
+    ]
+}
+
diff --git a/react-tether/tslint.json b/react-tether/tslint.json
new file mode 100644
index 0000000000..ccdb64abf2
--- /dev/null
+++ b/react-tether/tslint.json
@@ -0,0 +1,2 @@
+{ "extends": "../tslint.json" }
+
diff --git a/react-widgets/react-widgets-tests.tsx b/react-widgets/react-widgets-tests.tsx
index a108d8e513..0f66458c36 100644
--- a/react-widgets/react-widgets-tests.tsx
+++ b/react-widgets/react-widgets-tests.tsx
@@ -1,8 +1,3 @@
-
-/// <reference types="react" />
-/// <reference types="react-dom" />
-
-
 import * as React from "react"
 import * as ReactDOM from "react-dom"
 
@@ -45,10 +40,10 @@ class Test extends React.Component<React.Props<{}>, {}> {
                     itemComponent={itemComponent}
                  />
                  <Combobox
-                    itemComponent={itemComponent} 
+                    itemComponent={itemComponent}
                  />
                  <DropdownList
-                    itemComponent={itemComponent} 
+                    itemComponent={itemComponent}
                  />
             </div>
         </div>
diff --git a/react/index.d.ts b/react/index.d.ts
index c8ddc717c7..cf3afd9661 100644
--- a/react/index.d.ts
+++ b/react/index.d.ts
@@ -437,7 +437,7 @@ declare namespace React {
     interface ChangeTargetHTMLProps<T extends HTMLElement> extends ChangeTargetHTMLAttributes<T>, ClassAttributes<T> {
     }
 
-    interface SVGProps extends SVGAttributes<SVGElement>, ClassAttributes<SVGElement> {
+    interface SVGProps<T> extends SVGAttributes<T>, ClassAttributes<T> {
     }
 
     interface DOMAttributes<T> {
@@ -942,6 +942,12 @@ declare namespace React {
          */
         boxFlexGroup?: CSSWideKeyword | number;
 
+        /**
+         * Cast a drop shadow from the frame of almost any element.
+         * MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow
+         */
+        boxShadow?: CSSWideKeyword | any;
+
         /**
          * The CSS break-after property allows you to force a break on multi-column layouts. More specifically, it allows you to force a break after an element. It allows you to determine if a break should occur, and what type of break it should be. The break-after CSS property describes how the page, column or region break behaves after the generated box. If there is no generated box, the property is ignored.
          */
@@ -2205,7 +2211,25 @@ declare namespace React {
     //   - "number | string"
     //   - "string"
     //   - union of string literals
-    interface SVGAttributes<T> extends HTMLAttributes<T> {
+    interface SVGAttributes<T> extends DOMAttributes<T> {
+        // Attributes which also defined in HTMLAttributes
+        // See comment in SVGDOMPropertyConfig.js
+        className?: string;
+        color?: string;
+        height?: number | string;
+        id?: string;
+        lang?: string;
+        max?: number | string;
+        media?: string;
+        method?: string;
+        min?: number | string;
+        name?: string;
+        style?: CSSProperties;
+        target?: string;
+        type?: string;
+        width?: number | string;
+
+        // SVG Specific attributes
         accentHeight?: number | string;
         accumulate?: "none" | "sum";
         additive?: "replace" | "sum";
@@ -2398,7 +2422,6 @@ declare namespace React {
         textRendering?: number | string;
         to?: number | string;
         transform?: string;
-        type?: string;
         u1?: number | string;
         u2?: number | string;
         underlinePosition?: number | string;
@@ -2796,61 +2819,61 @@ declare global {
             wbr: React.HTMLProps<HTMLElement>;
 
             // SVG
-            svg: React.SVGProps;
+            svg: React.SVGProps<SVGSVGElement>;
 
-            animate: React.SVGProps;
-            circle: React.SVGProps;
-            clipPath: React.SVGProps;
-            defs: React.SVGProps;
-            desc: React.SVGProps;
-            ellipse: React.SVGProps;
-            feBlend: React.SVGProps;
-            feColorMatrix: React.SVGProps;
-            feComponentTransfer: React.SVGProps;
-            feComposite: React.SVGProps;
-            feConvolveMatrix: React.SVGProps;
-            feDiffuseLighting: React.SVGProps;
-            feDisplacementMap: React.SVGProps;
-            feDistantLight: React.SVGProps;
-            feFlood: React.SVGProps;
-            feFuncA: React.SVGProps;
-            feFuncB: React.SVGProps;
-            feFuncG: React.SVGProps;
-            feFuncR: React.SVGProps;
-            feGaussianBlur: React.SVGProps;
-            feImage: React.SVGProps;
-            feMerge: React.SVGProps;
-            feMergeNode: React.SVGProps;
-            feMorphology: React.SVGProps;
-            feOffset: React.SVGProps;
-            fePointLight: React.SVGProps;
-            feSpecularLighting: React.SVGProps;
-            feSpotLight: React.SVGProps;
-            feTile: React.SVGProps;
-            feTurbulence: React.SVGProps;
-            filter: React.SVGProps;
-            foreignObject: React.SVGProps;
-            g: React.SVGProps;
-            image: React.SVGProps;
-            line: React.SVGProps;
-            linearGradient: React.SVGProps;
-            marker: React.SVGProps;
-            mask: React.SVGProps;
-            metadata: React.SVGProps;
-            path: React.SVGProps;
-            pattern: React.SVGProps;
-            polygon: React.SVGProps;
-            polyline: React.SVGProps;
-            radialGradient: React.SVGProps;
-            rect: React.SVGProps;
-            stop: React.SVGProps;
-            switch: React.SVGProps;
-            symbol: React.SVGProps;
-            text: React.SVGProps;
-            textPath: React.SVGProps;
-            tspan: React.SVGProps;
-            use: React.SVGProps;
-            view: React.SVGProps;
+            animate: React.SVGProps<SVGElement>; // TODO: It is SVGAnimateElement but is not in TypeScript's lib.dom.d.ts for now.
+            circle: React.SVGProps<SVGCircleElement>;
+            clipPath: React.SVGProps<SVGClipPathElement>;
+            defs: React.SVGProps<SVGDefsElement>;
+            desc: React.SVGProps<SVGDescElement>;
+            ellipse: React.SVGProps<SVGEllipseElement>;
+            feBlend: React.SVGProps<SVGFEBlendElement>;
+            feColorMatrix: React.SVGProps<SVGFEColorMatrixElement>;
+            feComponentTransfer: React.SVGProps<SVGFEComponentTransferElement>;
+            feComposite: React.SVGProps<SVGFECompositeElement>;
+            feConvolveMatrix: React.SVGProps<SVGFEConvolveMatrixElement>;
+            feDiffuseLighting: React.SVGProps<SVGFEDiffuseLightingElement>;
+            feDisplacementMap: React.SVGProps<SVGFEDisplacementMapElement>;
+            feDistantLight: React.SVGProps<SVGFEDistantLightElement>;
+            feFlood: React.SVGProps<SVGFEFloodElement>;
+            feFuncA: React.SVGProps<SVGFEFuncAElement>;
+            feFuncB: React.SVGProps<SVGFEFuncBElement>;
+            feFuncG: React.SVGProps<SVGFEFuncGElement>;
+            feFuncR: React.SVGProps<SVGFEFuncRElement>;
+            feGaussianBlur: React.SVGProps<SVGFEGaussianBlurElement>;
+            feImage: React.SVGProps<SVGFEImageElement>;
+            feMerge: React.SVGProps<SVGFEMergeElement>;
+            feMergeNode: React.SVGProps<SVGFEMergeNodeElement>;
+            feMorphology: React.SVGProps<SVGFEMorphologyElement>;
+            feOffset: React.SVGProps<SVGFEOffsetElement>;
+            fePointLight: React.SVGProps<SVGFEPointLightElement>;
+            feSpecularLighting: React.SVGProps<SVGFESpecularLightingElement>;
+            feSpotLight: React.SVGProps<SVGFESpotLightElement>;
+            feTile: React.SVGProps<SVGFETileElement>;
+            feTurbulence: React.SVGProps<SVGFETurbulenceElement>;
+            filter: React.SVGProps<SVGFilterElement>;
+            foreignObject: React.SVGProps<SVGForeignObjectElement>;
+            g: React.SVGProps<SVGGElement>;
+            image: React.SVGProps<SVGImageElement>;
+            line: React.SVGProps<SVGLineElement>;
+            linearGradient: React.SVGProps<SVGLinearGradientElement>;
+            marker: React.SVGProps<SVGMarkerElement>;
+            mask: React.SVGProps<SVGMaskElement>;
+            metadata: React.SVGProps<SVGMetadataElement>;
+            path: React.SVGProps<SVGPathElement>;
+            pattern: React.SVGProps<SVGPatternElement>;
+            polygon: React.SVGProps<SVGPolygonElement>;
+            polyline: React.SVGProps<SVGPolylineElement>;
+            radialGradient: React.SVGProps<SVGRadialGradientElement>;
+            rect: React.SVGProps<SVGRectElement>;
+            stop: React.SVGProps<SVGStopElement>;
+            switch: React.SVGProps<SVGSwitchElement>;
+            symbol: React.SVGProps<SVGSymbolElement>;
+            text: React.SVGProps<SVGTextElement>;
+            textPath: React.SVGProps<SVGTextPathElement>;
+            tspan: React.SVGProps<SVGTSpanElement>;
+            use: React.SVGProps<SVGUseElement>;
+            view: React.SVGProps<SVGViewElement>;
         }
     }
 }
diff --git a/react/test/cssProperties.tsx b/react/test/cssProperties.tsx
index 293f0b5374..1221a0effc 100644
--- a/react/test/cssProperties.tsx
+++ b/react/test/cssProperties.tsx
@@ -24,6 +24,8 @@ const fontWeightStyleTest = <div style={fontWeightStyle} />;
 const justifyContentStyle: React.CSSProperties = { justifyContent: 'space-evenly' };
 const justifyContentStyleTest = <div style={justifyContentStyle} />;
 
+const boxShadowStyle: React.CSSProperties = { boxShadow: '2px 2px 2px 1px rgba(0, 0, 0, 0.2)' };
+const boxShadowStyleTest = <div style={boxShadowStyle} />;
 
 // SVG specific style attribute declarations
 
diff --git a/react/test/index.ts b/react/test/index.ts
index 1bf6c8dcc2..f0fee7a00b 100644
--- a/react/test/index.ts
+++ b/react/test/index.ts
@@ -342,6 +342,9 @@ React.DOM.svg({
     xmlns: "http://www.w3.org/2000/svg"
 },
     React.DOM.rect({
+        className: 'foobar',
+        id: 'foo',
+        color: 'black',
         x: 22,
         y: 10,
         width: 4,
diff --git a/readdir-stream/readdir-stream-tests.ts b/readdir-stream/readdir-stream-tests.ts
index f0a2dba78b..d808bc5b6d 100644
--- a/readdir-stream/readdir-stream-tests.ts
+++ b/readdir-stream/readdir-stream-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import readdir = require('readdir-stream');
 
 var rs: NodeJS.ReadableStream;
diff --git a/reduce-reducers/index.d.ts b/reduce-reducers/index.d.ts
new file mode 100644
index 0000000000..2b630766fc
--- /dev/null
+++ b/reduce-reducers/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for reduce-reducers 0.1
+// Project: https://github.com/acdlite/reduce-reducers
+// Definitions by: Huy Nguyen <https://github.com/huy-nguyen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import {Reducer} from 'redux';
+export default function reduceReducer<S>(...reducers: Array<Reducer<S>>): Reducer<S>;
diff --git a/reduce-reducers/package.json b/reduce-reducers/package.json
new file mode 100644
index 0000000000..36ce503807
--- /dev/null
+++ b/reduce-reducers/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "redux": "^3.6.0"
+  }
+}
diff --git a/reduce-reducers/reduce-reducers-tests.ts b/reduce-reducers/reduce-reducers-tests.ts
new file mode 100644
index 0000000000..d5eeb02633
--- /dev/null
+++ b/reduce-reducers/reduce-reducers-tests.ts
@@ -0,0 +1,13 @@
+import {
+	Reducer,
+	Action,
+} from 'redux';
+import reduceReducers from 'reduce-reducers';
+
+interface TestStore {
+	a: number,
+	b: string
+}
+let firstReducer: (state: TestStore, action: Action) => TestStore = (a, b) => a;
+let secondReducer: (state: TestStore, action: Action) => TestStore = (a, b) => a
+let finalReducer: (state: TestStore, action: Action) => TestStore = reduceReducers(firstReducer, secondReducer);
diff --git a/reduce-reducers/tsconfig.json b/reduce-reducers/tsconfig.json
new file mode 100644
index 0000000000..d7ca486716
--- /dev/null
+++ b/reduce-reducers/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "reduce-reducers-tests.ts"
+    ]
+}
diff --git a/reduce-reducers/tslint.json b/reduce-reducers/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/reduce-reducers/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/redux-action/index.d.ts b/redux-action/index.d.ts
new file mode 100644
index 0000000000..eff19178e9
--- /dev/null
+++ b/redux-action/index.d.ts
@@ -0,0 +1,93 @@
+// Type definitions for redux-action 1.2
+// Project: https://github.com/coderhaoxin/redux-action
+// Definitions by: newraina <https://github.com/newraina>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * inspired by @types/redux-actions, thanks.
+ */
+
+import * as Redux from 'redux';
+
+export as namespace ReduxAction;
+
+interface BaseAction {
+  type: string;
+}
+
+interface Action<Payload> extends BaseAction {
+  payload: Payload;
+}
+
+interface MetaAction<Payload, Meta> extends Action<Payload> {
+  meta: Meta;
+}
+
+type ThunkAction<Payload> = (dispatch: Redux.Dispatch<any>, getState: () => any) => Promise<Action<Payload>>;
+type ThunkMetaAction<Payload, Meta> = (dispatch: Redux.Dispatch<any>, getState: () => any) => Promise<MetaAction<Payload, Meta>>;
+
+/** argument inferring borrowed from redux-actions definitions */
+type ActionFunction0<R> = () => R;
+type ActionFunction1<T1, R> = (t1: T1) => R;
+type ActionFunction2<T1, T2, R> = (t1: T1, t2: T2) => R;
+type ActionFunction3<T1, T2, T3, R>  = (t1: T1, t2: T2, t3: T3) => R;
+type ActionFunctionAny<R> = (...args: any[]) => R;
+
+type ReducerHandler<State> = <A extends BaseAction, S extends State>(payload: any, state?: State, action?: A) => S;
+
+interface ReducerHandlers<State> {
+  [type: string]: ReducerHandler<State>;
+}
+
+export function createAction<Payload>(
+  type: string,
+  payloadCreator: ActionFunctionAny<Promise<Payload> | Payload>,
+): ActionFunctionAny<ThunkAction<Payload>>;
+
+export function createAction<Payload>(
+  payloadCreator: ActionFunctionAny<Promise<Payload> | Payload>,
+): ActionFunctionAny<ThunkAction<Payload>>;
+
+export function createAction<Payload, Arg>(
+  payloadCreator: ActionFunction1<Arg, Promise<Payload> | Payload>,
+): ActionFunction1<Arg, ThunkAction<Payload>>;
+
+export function createAction<Payload, Arg1, Arg2>(
+  payloadCreator: ActionFunction2<Arg1, Arg2, Promise<Payload> | Payload>,
+): ActionFunction2<Arg1, Arg2, ThunkAction<Payload>>;
+
+export function createAction<Payload, Arg1, Arg2, Arg3>(
+  payloadCreator: ActionFunction3<Arg1, Arg2, Arg3, Promise<Payload> | Payload>,
+): ActionFunction3<Arg1, Arg2, Arg3, ThunkAction<Payload>>;
+
+export function createAction<Payload, Meta>(
+  type: string,
+  payloadCreator: ActionFunctionAny<Promise<Payload> | Payload>,
+  metaCreator: ActionFunctionAny<Meta>
+): ActionFunctionAny<ThunkMetaAction<Payload, Meta>>;
+
+export function createAction<Payload, Meta>(
+  payloadCreator: ActionFunctionAny<Promise<Payload> | Payload>,
+  metaCreator: ActionFunctionAny<Meta>
+): ActionFunctionAny<ThunkMetaAction<Payload, Meta>>;
+
+export function createAction<Payload>(
+  type?: string,
+): ActionFunction1<any, ThunkAction<Payload>>;
+
+export function createAction<Payload, Arg>(
+  type?: string,
+): ActionFunction1<Arg, ThunkAction<Payload>>;
+
+export function createSyncAction<Payload>(
+  type: string,
+  payloadCreator?: ActionFunctionAny<Payload>,
+): ActionFunctionAny<Action<Payload>>;
+
+export function createSyncAction<Payload, Meta>(
+  type: string,
+  payloadCreator: ActionFunctionAny<Payload>,
+  metaCreator: ActionFunctionAny<Meta>
+): ActionFunctionAny<MetaAction<Payload, Meta>>;
+
+export function createReducer<State>(defaultState: State, handlers: ReducerHandlers<State>): Redux.Reducer<State>;
diff --git a/redux-action/package.json b/redux-action/package.json
new file mode 100644
index 0000000000..973078f95d
--- /dev/null
+++ b/redux-action/package.json
@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "redux": "^3.6.0",
+    "redux-thunk": "^2.2.0"
+  }
+}
diff --git a/redux-action/redux-action-tests.ts b/redux-action/redux-action-tests.ts
new file mode 100644
index 0000000000..cad92bba34
--- /dev/null
+++ b/redux-action/redux-action-tests.ts
@@ -0,0 +1,84 @@
+
+import * as ReduxAction from 'redux-action';
+import * as ReduxThunk from 'redux-thunk';
+import * as Redux from 'redux';
+
+interface Payload {
+  name: string;
+  id: number;
+}
+
+const dispatch: Redux.Dispatch<any> = (...args: any[]): any => { };
+
+const actionCreator0 = ReduxAction.createAction<Payload>('get items');
+
+dispatch(actionCreator0(1))
+  .then(action => {
+    const type: string = action.type;
+    const payload: Payload = action.payload;
+  });
+
+const actionCreator1 = ReduxAction.createAction<Payload>();
+
+dispatch(actionCreator1(1))
+  .then(action => {
+    const type: string = action.type;
+    const payload: Payload = action.payload;
+  });
+
+const actionCreator2 = ReduxAction.createAction('get items', (name: string) => name);
+
+dispatch(actionCreator2(1))
+  .then(action => {
+    const type: string = action.type;
+    const payload: string = action.payload;
+  });
+
+const actionCreator3 = ReduxAction.createAction('get items', (name: string) => Promise.resolve(name));
+
+dispatch(actionCreator3(1))
+  .then(action => {
+    const type: string = action.type;
+    const payload: string = action.payload;
+  });
+
+const actionCreator4 = ReduxAction.createAction((name: string) => name);
+
+dispatch(actionCreator4(1))
+  .then(action => {
+    const type: string = action.type;
+    const payload: string = action.payload;
+  });
+
+const actionCreator5 = ReduxAction.createAction<number, string>((name: string) => 1);
+
+dispatch(actionCreator5('items'))
+  .then(action => {
+    const type: string = action.type;
+    const payload: number = action.payload;
+  });
+
+const actionCreator6 = ReduxAction.createAction<number, string, boolean>((name: string) => 1);
+
+dispatch(actionCreator6('items', false))
+  .then(action => {
+    const type: string = action.type;
+    const payload: number = action.payload;
+  });
+
+const syncActionCreator0 = ReduxAction.createSyncAction<Payload>('get items');
+const syncAction0: ReduxAction.Action<Payload> = dispatch(syncActionCreator0(1));
+
+const syncActionCreator1 = ReduxAction.createSyncAction<string>('get items', (name: string) => name);
+const syncAction1: ReduxAction.Action<string> = dispatch(syncActionCreator1(1));
+
+interface State {
+  name: string;
+}
+const reducer = ReduxAction.createReducer<State>({ name: 'name' }, {
+  'get items': () => {
+    return 'new name';
+  }
+});
+
+const combinedReducer: Redux.Reducer<State> = Redux.combineReducers<State>({ reducer });
diff --git a/redux-action/tsconfig.json b/redux-action/tsconfig.json
new file mode 100644
index 0000000000..0acc89b041
--- /dev/null
+++ b/redux-action/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-action-tests.ts"
+    ]
+}
diff --git a/redux-action/tslint.json b/redux-action/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/redux-action/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/redux-debounced/redux-debounced-tests.ts b/redux-debounced/redux-debounced-tests.ts
index f33050e394..ad83e40bc5 100644
--- a/redux-debounced/redux-debounced-tests.ts
+++ b/redux-debounced/redux-debounced-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="redux"/>
-
 import { applyMiddleware } from 'redux';
 import createDebounce from 'redux-debounced';
 
diff --git a/redux-devtools-dock-monitor/redux-devtools-dock-monitor-tests.tsx b/redux-devtools-dock-monitor/redux-devtools-dock-monitor-tests.tsx
index 5a99ba665a..7e33588a41 100644
--- a/redux-devtools-dock-monitor/redux-devtools-dock-monitor-tests.tsx
+++ b/redux-devtools-dock-monitor/redux-devtools-dock-monitor-tests.tsx
@@ -1,5 +1,3 @@
-/// <reference types="react" />
-
 import * as React from 'react'
 import DockMonitor from 'redux-devtools-dock-monitor'
 
diff --git a/redux-devtools-log-monitor/redux-devtools-log-monitor-tests.tsx b/redux-devtools-log-monitor/redux-devtools-log-monitor-tests.tsx
index 48a655bea2..477f4bbc55 100644
--- a/redux-devtools-log-monitor/redux-devtools-log-monitor-tests.tsx
+++ b/redux-devtools-log-monitor/redux-devtools-log-monitor-tests.tsx
@@ -1,5 +1,3 @@
-/// <reference types="react" />
-
 import * as React from 'react'
 import LogMonitor from 'redux-devtools-log-monitor'
 
diff --git a/redux-devtools/redux-devtools-tests.tsx b/redux-devtools/redux-devtools-tests.tsx
index 10e20b7e87..695fbe60ff 100644
--- a/redux-devtools/redux-devtools-tests.tsx
+++ b/redux-devtools/redux-devtools-tests.tsx
@@ -1,6 +1,3 @@
-/// <reference types="react" />
-/// <reference types="redux" />
-
 import * as React from 'react'
 import { compose, createStore, Reducer, Store, StoreEnhancerStoreCreator } from 'redux'
 import { Provider } from 'react-redux'
diff --git a/redux-form/lib/reduxForm.d.ts b/redux-form/lib/reduxForm.d.ts
index bcfafe2e3a..100a708032 100644
--- a/redux-form/lib/reduxForm.d.ts
+++ b/redux-form/lib/reduxForm.d.ts
@@ -30,7 +30,7 @@ export interface Config<FormData extends DataShape, P, S> {
      * the name of your form and the key to where your form's state will be
      * mounted under the redux-form reducer
      */
-    form: string;
+    form?: string;
 
     /**
      * An adapter function that will render a component based on a string component
diff --git a/redux-form/redux-form-tests.tsx b/redux-form/redux-form-tests.tsx
index f37e1e9815..396ca8df85 100644
--- a/redux-form/redux-form-tests.tsx
+++ b/redux-form/redux-form-tests.tsx
@@ -57,7 +57,8 @@ reduxForm({
     form: 'mySFCForm'
 })(MyStatelessFunctionalComponent);
 
-class MyReusableForm extends Component<void, undefined> {
+@reduxForm<FormData, any, any>({})
+class MyDynamicForm extends Component<void, undefined> {
     render() {
         return (
             <div>
diff --git a/resolve/resolve-tests.ts b/resolve/resolve-tests.ts
index 3cac830c58..1f9f50b5ee 100644
--- a/resolve/resolve-tests.ts
+++ b/resolve/resolve-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="resolve" />
-
 import * as fs from 'fs';
 import * as resolve from 'resolve';
 
diff --git a/revalidate/index.d.ts b/revalidate/index.d.ts
new file mode 100644
index 0000000000..a764e41e15
--- /dev/null
+++ b/revalidate/index.d.ts
@@ -0,0 +1,67 @@
+// Type definitions for revalidate 1.1
+// Project: https://github.com/jfairbank/revalidate
+// Definitions by: alex3165 <https://github.com/alex3165>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// This project is licensed under the MIT license.
+// Copyrights are respective of each contributor listed at the beginning of each definition file.
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+export interface CombineValidatorsOptions {
+    serializeValues?: (values: any) => any;
+}
+
+export interface Config {
+    field?: any;
+    message?: string;
+}
+
+interface Multiple {
+    multiple?: boolean;
+}
+
+export type ComposeConfig = Config & Multiple;
+
+export interface ParsedField {
+    isArray: boolean;
+    baseName: string;
+    fullName: string;
+}
+
+export type MessageCreator = ((field: any) => any) | string;
+export type ValidatorImpl = (message: any) => (value: any, allValues?: any) => any;
+export type Comparer = (a: any, b: any) => boolean;
+
+export type ConfiguredValidator = (value?: any, allValues?: any) => any;
+export type UnconfiguredValidator = (config?: string | Config, value?: any, allValues?: any) => any;
+export type ConfiguredCombinedValidator = (value?: any, allValues?: any) => any;
+
+export type CurryableValidator = (config?: string | Config) => ConfiguredValidator;
+export type ComposedCurryableValidator = (config?: string | ComposeConfig) => ConfiguredValidator;
+
+export type ConfigurableValidator = UnconfiguredValidator & CurryableValidator;
+
+export type Validator = ConfiguredValidator & UnconfiguredValidator;
+
+export function createValidator(curriedDefinition: ValidatorImpl, defaultMessageCreator?: MessageCreator): ConfigurableValidator;
+export function composeValidators(firstValidator: Validator | any, ...validators: Validator[]): ComposedCurryableValidator;
+export function combineValidators(validators: any, options?: CombineValidatorsOptions): ConfiguredCombinedValidator;
+
+export function hasLengthBetween(min: number, max: number): ConfigurableValidator;
+export function hasLengthGreaterThan(min: number): ConfigurableValidator;
+export function hasLengthLessThan(max: number): ConfigurableValidator;
+
+export function isAlphabetic(config?: string | Config, value?: any, allValues?: any): ConfiguredValidator | any;
+export function isAlphaNumeric(config?: string | Config, value?: any, allValues?: any): ConfiguredValidator | any;
+export function isNumeric(config?: string | Config, value?: any, allValues?: any): ConfiguredValidator | any;
+export function isOneOf(config?: string | Config, value?: any, allValues?: any): ConfiguredValidator | any;
+export function isRequired(config?: string | Config, value?: any, allValues?: any): ConfiguredValidator | any;
+export function isRequiredIf(config?: string | Config, value?: any, allValues?: any): ConfiguredValidator | any;
+
+export function matchesField(otherField: string, otherFieldLabel: string): ConfigurableValidator;
+export function matchesPattern(regex: RegExp): ConfigurableValidator;
diff --git a/revalidate/revalidate-tests.ts b/revalidate/revalidate-tests.ts
new file mode 100644
index 0000000000..798089d6a0
--- /dev/null
+++ b/revalidate/revalidate-tests.ts
@@ -0,0 +1,53 @@
+import r = require("revalidate");
+
+const isValidEmail = r.createValidator(
+  message => value => {
+    if (value && !/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i.test(value)) {
+      return message
+    }
+  },
+  'Invalid email address'
+);
+
+const isGreaterThan = (n: any) => r.createValidator(
+  message => value => {
+    if (value && Number(value) <= n) {
+      return message
+    }
+  },
+  field => `${field} must be greater than ${n}`
+);
+
+const customIsRequired = r.isRequired({ message: 'Required' });
+
+const lessThan = r.hasLengthLessThan(16)({ message: 'Must be 15 characters or less' });
+
+const username = r.composeValidators(
+  customIsRequired,
+  lessThan
+)();
+
+const email = r.composeValidators(
+  customIsRequired,
+  isValidEmail
+)();
+
+const isNumber = r.isNumeric({
+  message: 'Must be a number'
+});
+
+const isGreater = isGreaterThan(17)({
+  message: 'Sorry, you must be at least 18 years old'
+});
+
+const age = r.composeValidators(
+  customIsRequired,
+  isNumber,
+  isGreater
+)();
+
+const validate = r.combineValidators({
+  username,
+  email,
+  age
+});
diff --git a/revalidate/tsconfig.json b/revalidate/tsconfig.json
new file mode 100644
index 0000000000..3c031968d3
--- /dev/null
+++ b/revalidate/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "revalidate-tests.ts"
+    ]
+}
diff --git a/revalidate/tslint.json b/revalidate/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/revalidate/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/rheostat/index.d.ts b/rheostat/index.d.ts
new file mode 100644
index 0000000000..372e5c6f1b
--- /dev/null
+++ b/rheostat/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for rheostat 2.1
+// Project: https://github.com/airbnb/rheostat
+// Definitions by: Sasha Bayan <https://github.com/SashaBayan>, Wil Lee <https://github.com/kourge>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+import * as React from 'react';
+
+export type Orientation = 'horizontal' | 'vertical';
+
+export interface Algorithm {
+  getPosition(value: number, min: number, max: number): number;
+  getValue(pos: number, min: number, max: number): number;
+}
+
+export interface PublicState {
+  max: number;
+  min: number;
+  values: number[];
+}
+
+export interface Events {
+  onClick?: () => any;
+  onChange?: (publicState: PublicState) => any;
+  onKeyPress?: () => any;
+  onSliderDragEnd?: () => any;
+  onSliderDragMove?: () => any;
+  onSliderDragStart?: () => any;
+  onValuesUpdated?: (publicState: PublicState) => any;
+}
+
+export interface Props extends Events {
+  algorithm?: Algorithm;
+  className?: string;
+  disabled?: boolean;
+  handle?: React.ReactType;
+  max?: number;
+  min?: number;
+  orientation?: Orientation;
+  pitComponent?: React.ReactType;
+  pitPoints?: number[];
+  progressBar?: React.ReactType;
+  snap?: boolean;
+  snapPoints?: number[];
+  values?: number[];
+}
+
+export default class Rheostat extends React.Component<Props, never> {}
+
diff --git a/rheostat/rheostat-tests.tsx b/rheostat/rheostat-tests.tsx
new file mode 100644
index 0000000000..1116861943
--- /dev/null
+++ b/rheostat/rheostat-tests.tsx
@@ -0,0 +1,74 @@
+import * as React from 'react';
+import Rheostat, {Orientation, Algorithm, PublicState} from 'rheostat';
+
+type Element = React.ReactElement<any>;
+
+function Basic(props: {}): Element {
+  return <Rheostat />;
+}
+
+function MultiHandles(props: {}): Element {
+  return (
+    <Rheostat
+      min={1}
+      max={100}
+      values={[1, 100]}
+    />
+  );
+}
+
+function CustomAlgorithm(props: {}): Element {
+  const geometric: Algorithm = {
+    getPosition(x: number, min: number, max: number) {
+      return ((max / (max - min)) ** 0.5) * (((x - min) / max) ** 0.5) * 100;
+    },
+
+    getValue(x: number, min: number, max: number) {
+      return (Math.floor(((x / 100) ** 2) * (max - min)) + min);
+    }
+  };
+
+  return <Rheostat algorithm={geometric} />;
+}
+
+function ComponentOverrides(props: {}): Element {
+  function Bar(props: {}): Element { return <hr />; }
+  return (
+    <Rheostat
+      handle="button"
+      progressBar={Bar}
+    />
+  );
+}
+
+function Vertical(props: {}): Element {
+  return <Rheostat orientation="vertical" />;
+}
+
+function Pits(props: {}): Element {
+  function Pit(props: {}): Element { return <input type="radio" />; }
+  return (
+    <Rheostat
+      pitComponent={Pit}
+      pitPoints={[50]}
+    />
+  );
+}
+
+function CustomValues(props: {}): Element {
+  return (
+    <Rheostat
+      values={[1, 3, 5, 7, 9]}
+    />
+  );
+}
+
+function Handlers(props: {}): Element {
+  function handler(data: PublicState): void {}
+  return (
+    <Rheostat
+      onChange={handler}
+      onValuesUpdated={handler}
+    />
+  );
+}
diff --git a/xmpp-jid/tsconfig.json b/rheostat/tsconfig.json
similarity index 81%
rename from xmpp-jid/tsconfig.json
rename to rheostat/tsconfig.json
index f4d02187a2..384dce128d 100644
--- a/xmpp-jid/tsconfig.json
+++ b/rheostat/tsconfig.json
@@ -1,9 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "lib": [
-      "es6"
-    ],
+    "lib": ["es6", "dom"],
     "noImplicitAny": true,
     "noImplicitThis": true,
     "strictNullChecks": true,
@@ -12,11 +10,12 @@
       "../"
     ],
     "types": [],
+    "jsx": "react",
     "noEmit": true,
     "forceConsistentCasingInFileNames": true
   },
   "files": [
     "index.d.ts",
-    "xmpp-jid-tests.ts"
+    "rheostat-tests.tsx"
   ]
-}
\ No newline at end of file
+}
diff --git a/rheostat/tslint.json b/rheostat/tslint.json
new file mode 100644
index 0000000000..ec365f164b
--- /dev/null
+++ b/rheostat/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../tslint.json"
+}
diff --git a/riot/index.d.ts b/riot/index.d.ts
index 3abb3fa147..3c76a0b1d0 100644
--- a/riot/index.d.ts
+++ b/riot/index.d.ts
@@ -205,8 +205,9 @@ declare namespace riot {
      * Register a shared mixin, globally available to be used in any tag using `TagInstance.mixin(mixinName)`
      * @param mixinName Name of the mixin
      * @param mixinObject Mixin object
+     * @param isGlobal Is global mixin?
      */
-    function mixin(mixinName: string, mixinObject: TagMixin): void;
+    function mixin(mixinName: string, mixinObject: TagMixin, isGlobal?: boolean): void;
 
     /**
      * Create a new custom tag “manually” without the compiler. Returns name of the tag.
diff --git a/run-sequence/tsconfig.json b/run-sequence/tsconfig.json
index b03e01e277..2d7e6640db 100644
--- a/run-sequence/tsconfig.json
+++ b/run-sequence/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/rvo2/index.d.ts b/rvo2/index.d.ts
new file mode 100644
index 0000000000..88ee40cd96
--- /dev/null
+++ b/rvo2/index.d.ts
@@ -0,0 +1,581 @@
+// Type definitions for rvo2
+// Project: https://github.com/TNOCS/rvo2
+// Definitions by: Erik Vullings <https://github.com/erikvullings>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace rvo2 {
+
+	class Line {
+		/**
+		 * A point on the directed line.
+		 */
+		point: Vector2;
+
+		/**
+		 * The direction of the directed line.
+		 */
+		direction: Vector2;
+	}
+
+  /**
+   * The Agent class has no public members or methods.
+   *
+   * @class Agent
+   */
+	class Agent { }
+
+  /**
+   * The KdTree class has no public members or methods.
+   *
+   * @class KdTree
+   */
+	class KdTree { }
+
+  /**
+   * The Obstacle class has no public members or methods.
+   *
+   * @class Obstacle
+   */
+	class Obstacle { }
+
+  /**
+   * A simple two dimensional vector with an x and y position.
+   *
+   * @class Vector2
+   */
+	class Vector2 {
+    /**
+     * Creates an instance of Vector2.
+     *
+     * @param {number} x
+     * @param {number} y
+     *
+     * @memberOf Vector2
+     */
+		constructor(x: number, y: number);
+
+    /**
+     * Returns the x position.
+     *
+     * @returns {number}
+     *
+     * @memberOf Vector2
+     */
+		x(): number;
+    /**
+     * Returns the y position.
+     *
+     * @returns {number}
+     *
+     * @memberOf Vector2
+     */
+		y(): number;
+    /**
+     * Add two vectors.
+     *
+     * @param {Vector2} v
+     * @returns {Vector2}
+     *
+     * @memberOf Vector2
+     */
+		add(v: Vector2): Vector2;
+    /**
+     * Subtract two vectors.
+     *
+     * @param {Vector2} v
+     * @returns {Vector2}
+     *
+     * @memberOf Vector2
+     */
+		sub(v: Vector2): Vector2;
+    /**
+     * Multiplies the vector by a scalar.
+     *
+     * @param {number} s
+     * @returns {Vector2}
+     *
+     * @memberOf Vector2
+     */
+		mul(s: number): Vector2;
+	}
+
+  /**
+   * An array of Vector2 vectors.
+   *
+   * @class vectorvector
+   */
+	class vectorvector {
+		constructor(size?: number);
+
+		[index: number]: Vector2;
+	}
+
+  /**
+   * Simulation engine.
+   *
+   * @class sim
+   */
+	class RVOSimulator {
+		constructor();
+
+		/**
+		 * Constructs a simulator instance and sets the default
+		 * properties for any new agent that is added.
+     *
+		 * @param {number} timeStep    The time step of the simulation.
+		 *                             Must be positive.
+		 * @param {number} neighborDist    The default maximum distance (center point
+		 *                             to center point) to other agents a new agent
+		 *                             takes into account in the navigation. The
+		 *                             larger this number, the longer he running
+		 *                             time of the simulation. If the number is too
+		 *                             low, the simulation will not be safe. Must be
+		 *                             non-negative.
+		 * @param {number} maxNeighbors    The default maximum number of other agents a
+		 *                             new agent takes into account in the
+		 *                             navigation. The larger this number, the
+		 *                             longer the running time of the simulation.
+		 *                             If the number is too low, the simulation
+		 *                             will not be safe.
+		 * @param {number} timeHorizon The default minimal amount of time for which
+		 *                             a new agent's velocities that are computed
+		 *                             by the simulation are safe with respect to
+		 *                             other agents. The larger this number, the
+		 *                             sooner an agent will respond to the presence
+		 *                             of other agents, but the less freedom the
+		 *                             agent has in choosing its velocities.
+		 *                             Must be positive.
+		 * @param {number} timeHorizonObst The default minimal amount of time for which
+		 *                             a new agent's velocities that are computed
+		 *                             by the simulation are safe with respect to
+		 *                             obstacles. The larger this number, the
+		 *                             sooner an agent will respond to the presence
+		 *                             of obstacles, but the less freedom the agent
+		 *                             has in choosing its velocities.
+		 *                             Must be positive.
+		 * @param {number} radius      The default radius of a new agent.
+		 *                             Must be non-negative.
+		 * @param {number} maxSpeed    The default maximum speed of a new agent.
+		 *                             Must be non-negative.
+		 * @param {Vector2} velocity   The default initial two-dimensional linear
+		 *                             velocity of a new agent (optional).
+		 */
+		constructor(timeStep: number, neighborDist: number, maxNeighbors: number,
+			timeHorizon: number, timeHorizonObst: number, radius: number,
+			maxSpeed: number, velocity?: Vector2);
+
+    /**
+     * Sets the time step of the simulation.
+     *
+     * @param {number} timeStep    The time step of the simulation.
+		 *                             Must be positive.
+     *
+     * @memberOf sim
+     */
+		setTimeStep(timeStep: number): void;
+
+    /**
+     * Lets the simulator perform a simulation step and updates the
+		 * two-dimensional position and two-dimensional velocity of each agent.
+     *
+     * @memberOf RVOSimulator
+     */
+		doStep(): void;
+
+		/**
+		 * Sets the default properties for any new agent that is added.
+		 * @param {number} neighborDist   The default maximum distance (center point
+		 *                             to center point) to other agents a new agent
+		 *                             takes into account in the navigation. The
+		 *                             larger this number, the longer he running
+		 *                             time of the simulation. If the number is too
+		 *                             low, the simulation will not be safe.
+		 *                             Must be non-negative.
+		 * @param {number} maxNeighbors    The default maximum number of other agents a
+		 *                             new agent takes into account in the
+		 *                             navigation. The larger this number, the
+		 *                             longer the running time of the simulation.
+		 *                             If the number is too low, the simulation
+		 *                             will not be safe.
+		 * @param {number} timeHorizon     The default minimal amount of time for which
+		 *                             a new agent's velocities that are computed
+		 *                             by the simulation are safe with respect to
+		 *                             other agents. The larger this number, the
+		 *                             sooner an agent will respond to the presence
+		 *                             of other agents, but the less freedom the
+		 *                             agent has in choosing its velocities.
+		 *                             Must be positive.
+		 * @param {number} timeHorizonObst The default minimal amount of time for which
+		 *                             a new agent's velocities that are computed
+		 *                             by the simulation are safe with respect to
+		 *                             obstacles. The larger this number, the
+		 *                             sooner an agent will respond to the presence
+		 *                             of obstacles, but the less freedom the agent
+		 *                             has in choosing its velocities.
+		 *                             Must be positive.
+		 * @param {number} radius      The default radius of a new agent.
+		 *                             Must be non-negative.
+		 * @param {number} maxSpeed    The default maximum speed of a new agent.
+		 *                             Must be non-negative.
+		 * @param {Vector2} velocity   The default initial two-dimensional linear
+		 *                             velocity of a new agent (optional).
+		 */
+		setAgentDefaults(neighborDist: number, maxNeighbors: number, timeHorizon: number, timeHorizonObst: number, radius: number, maxSpeed: number, velocity?: Vector2): void;
+    /**
+     * Adds a new agent with default properties to the simulation.
+     *
+     * @param {Vector2} position  The two-dimensional starting position of this agent.
+
+     * @returns {number}     The number of the agent, or RVO::RVO_ERROR when the  *                            agent defaults have not been set.
+     *
+     * @membeim
+     */
+		addAgent(position: Vector2): number;
+
+		/**
+		 * Adds a new agent to the simulation.
+     *
+		 * @param {Vector2} position   The two-dimensional starting position of
+		 *                             this agent.
+		 * @param {number} neighborDist    The maximum distance (center point to
+		 *                             center point) to other agents this agent
+		 *                             takes into account in the navigation. The
+		 *                             larger this number, the longer the running
+		 *                             of the simulation. If the number is too
+		 *                             low, the simulation will not be safe.
+		 *                             Must be non-negative.
+		 * @param {number} maxNeighbors    The maximum number of other agents this
+		 *                             agent takes into account in the navigation.
+		 *                             The larger this number, the longer the
+		 *                             running time of the simulation. If the
+		 *                             number is too low, the simulation will not
+		 *                             safe.
+		 * @param {number} timeHorizon     The minimal amount of time for which this
+		 *                             agent's velocities that are computed by the
+		 *                             simulation are safe with respect to other
+		 *                             agents. The larger this number, the sooner
+		 *                             this agent will respond to the presence of
+		 *                             other agents, but the less freedom this
+		 *                             agent has in choosing its velocities.
+		 *                             be positive.
+		 * @param {number} timeHorizonObst The minimal amount of time for which this
+		 *                             agevelocities that are computed by the
+		 *                             simulation are safe with respect to
+		 *                             obst. The larger this number, the
+		 *                             sooner this agent will respond to the
+		 *                             presence of obstacles, but the less freedom
+		 *                             this agent has in choosing its velocities.
+		 *                             Must be positive.
+		 * @param {number} radius      The radius of this agent.
+		 *                             Must be non-negative.
+		 * @param {number} maxSpeed    The maximum speed of this agent.
+		 *                             Must be non-negative.
+		 * @param {number} velocity    The initial two-dimensional linear velocity
+		 *                             of this agent (optional).
+		 * @returns {number} The number of the agent.
+		 */
+		addAgent(position: Vector2, neighborDist: number, maxNeighbors: number,
+			timeHorizon: number, timeHorizonObst: number, radius: number,
+			maxSpeed: number, velocity: Vector2): number;
+
+		/**
+		 * Adds a new obstacle to the simulation.
+     *
+		 * To add a "negative" obstacle, e.g. a bounding polygon around
+		 * the environment, the vertices should be listed in clockwise order.
+     *
+		 * @param {vectorvector} vertices List of the vertices of the polygonal
+		 *             obstacle in counterclockwise order.
+		 * @returns {number} The number of the first vertex of the obstacle,
+		 *             or RVO::RVO_ERROR when the number of vertices is less than two.
+		 */
+		addObstacle(vertices: vectorvector): number;
+
+    /**
+     * Returns the position of agent at the specified index.
+     *
+     * @param {number} index      Index of the agent. Must be >= 0.
+     * @returns {Vector2}    Position of the agent.
+     *
+     * @memberOf sim
+     */
+		getAgentPosition(index: number): Vector2;
+
+		/**
+		 * Sets the two-dimensional preferred velocity of a specified agent.
+		 * @param {number} agentNo     The number of the agent whose two-dimensional
+     *                             preferred velocity is to be modified.
+		 * @param {Vector2} prefVelocity    The replacement of the two-dimensional
+		 *                             preferred velocity.
+		 */
+		setAgentPrefVelocity(agentNo: number, prefVelocity: Vector2): void;
+
+		/**
+		 * Returns the specified agent neighbor of the specified agent.
+     *
+		 * @param {number} agentNo     The number of the agent whose agent
+		 *                             neighbor is to be retrieved.
+		 * @param {number} neighborNo  The number of the agent neighbor to be
+		 *                             retrieved.
+		 * @returns The number of the neighboring agent.
+		 */
+		getAgentAgentNeighbor(agentNo: number, neighborNo: number): number;
+
+		/**
+		 * Returns the maximum neighbor count of a specified agent.
+     *
+		 * @param {number} agentNo The number of the agent whose maximum neighbor count is
+     *                         to be retrieved.
+		 * @return {number} The present maximum neighbor count of the agent.
+		 */
+		getAgentMaxNeighbors(agentNo: number): number;
+
+		/**
+		 * Returns the maximum speed of a specified agent.
+		 *
+     * @param {number} agentNo The number of the agent whose maximum speed is to be retrieved.
+		 * @return {number} The present maximum speed of the agent.
+		 */
+		getAgentMaxSpeed(agentNo: number): number;
+
+		/**
+		 * Returns the maximum neighbor distance of a specified agent.
+		 * @param {number} agentNo The number of the agent whose maximum
+		 *                         neighbor distance is to be retrieved.
+		 * @return The present maximum neighbor distance of the agent.
+		 */
+		getAgentNeighborDist(agentNo: number): number;
+
+		/**
+		 * Returns the count of agent neighbors taken into account to
+		 * compute the current velocity for the specified agent.
+     *
+		 * @param {number} agentNo The number of the agent whose count of agent
+		 *                         neighbors is to be retrieved.
+		 * @return {number} The count of agent neighbors taken into account to compute
+		 *             the current velocity for the specified agent.
+		 */
+		getAgentNumAgentNeighbors(agentNo: number): number;
+
+		/**
+		 * Returns the count of obstacle neighbors taken into account
+		 * to compute the current velocity for the specified agent.
+     *
+		 * @param {number} agentNo The number of the agent whose count of
+		 *                         obstacle neighbors is to be retrieved.
+		 * @return {number} The count of obstacle neighbors taken into account to
+		 *             compute the current velocity for the specified agent.
+		 */
+		getAgentNumObstacleNeighbors(agentNo: number): number;
+
+
+		/**
+		 * Returns the count of ORCAconstraints used to compute
+     *
+		 * the current velocity for the specified agent.
+     *
+		 * @param {number} agentNo The number of the agent whose count of ORCA
+		 *                        constraints is to be retrieved.
+     *
+		 * @return {number} The count of ORCAconstraints used to compute the current
+     *
+		 *             velocity for the specified agent.
+		 */
+		getAgentNumORCALines(agentNo: number): number;
+
+		/**
+		 * Returns the specified obstacle neighbor of the specified agent.
+     *
+		 * @param {number} agentNo The number of the agent whose obstacle
+		 *                         neighbor is to be retrieved.
+		 * @param {number} neighborNo The number of the obstacle neighbor to be
+		 *                            retrieved.
+		 * @return {number} The number of the first vertex of the neighboring obstacle edge.
+		 */
+		getAgentObstacleNeighbor(agentNo: number, neighborNo: number): number;
+
+		/**
+		 * Returns the specified ORCA constraint of the specified agent.
+     *
+		 * The halfplane to the left of the line is the region of
+		 * permissible velocities with respect to the specified
+		 * ORCAconstraint.
+     *
+		 * @param {number} agentNo The number of the agent whose ORCA constraint is to be retrieved.
+     *
+		 * @param {number} lineNo The number of the ORCAconstraint to be retrieved.
+		 * @return {number} A line representing the specified ORCAconstraint.
+     *
+     *
+		 */
+		getAgentORCALine(agentNo: number, lineNo: number): Line;
+
+		/**
+		 * Returns the two-dimensional position of a specified
+		 *             agent.
+		 * @param {number} agentNo The number of the agent whose two-dimensional position
+     *                         is to be retrieved.
+		 * @return {number} The present two-dimensional position of the (center of the) agent.
+		 */
+		getAgentPosition(agentNo: number): Vector2;
+
+		/**
+		 * Returns the two-dimensional preferred velocity of a
+		 *             specified agent.
+		 * @param {number} agentNo  The number of the agent whose two-dimensional
+     *             preferred velocity is to be retrieved.
+		 * @return {number} The present two-dimensional preferred velocity of the agent.
+		 */
+		getAgentPrefVelocity(agentNo: number): Vector2;
+
+		/**
+		 * Returns the radius of a specified agent.
+		 * @param {number} agentNo The number of the agent whose radius is to be retrieved.
+		 * @return {number} The present radius of the agent.
+		 */
+		getAgentRadius(agentNo: number): number;
+
+		/**
+		 * Returns the time horizon of a specified agent.
+		 * @param {number} agentNo The number of the agent whose time horizon is to be retrieved.
+		 * @return {number} The present time horizon of the agent.
+		 */
+		getAgentTimeHorizon(agentNo: number): number;
+
+		/**
+		 * Returns the time horizon with respect to obstacles of a specified agent.
+     *
+		 * @param {number} agentNo The number of the agent whose time horizon
+		 *                         with respect to obstacles is to be retrieved.
+		 * @return {number} The present time horizon with respect to obstacles of the
+		 *             agent.
+		 */
+		getAgentTimeHorizonObst(agentNo: number): number;
+
+		/**
+		 * Returns the two-dimensional linear velocity of a
+		 *             specified agent.
+		 * @param {number} agentNo The number of the agent whose two-dimensional linear
+     *                         velocity is to be retrieved.
+		 * @return {Vector2} The present two-dimensional linear velocity of the agent.
+		 */
+		getAgentVelocity(agentNo: number): Vector2;
+
+		/**
+		 * Returns the global time of the simulation.
+     *
+		 * @return {number} The present global time of the simulation (zero initially).
+		 */
+		getGlobalTime(): number;
+
+		/**
+		 * Returns the count of agents in the simulation.
+     *
+		 * @return {number} The count of agents in the simulation.
+		 */
+		getNumAgents(): number;
+
+		/**
+		 * Returns the count of obstacle vertices in the simulation.
+     *
+		 * @return {number} The count of obstacle vertices in the simulation.
+		 */
+		getNumObstacleVertices(): number;
+
+		/**
+		 * Returns the two-dimensional position of a specified obstacle vertex.
+		 * @param {number} vertexNo The number of the obstacle vertex to be retrieved.
+		 * @return {Vector2} The two-dimensional position of the specified obstacle vertex.
+		 */
+		getObstacleVertex(vertexNo: number): Vector2;
+
+		/**
+		 * Returns the number of the obstacle vertex succeeding the specified obstacle vertex in its polygon.
+     *
+		 * @param {number} vertexNo The number of the obstacle vertex whose
+		 *                          successor is to be retrieved.
+		 * @return {number} The number of the obstacle vertex succeeding the specified
+		 *             obstacle vertex in its polygon.
+		 */
+		getNextObstacleVertexNo(vertexNo: number): number;
+
+		/**
+		 * Returns the number of the obstacle vertex preceding the specified obstacle
+     * vertex in its polygon.
+     *
+		 * @param {number} vertexNo The number of the obstacle vertex whose
+		 *                          predecessor is to be retrieved.
+		 * @return {number} The number of the obstacle vertex preceding the specified
+		 *             obstacle vertex in its polygon.
+		 */
+		getPrevObstacleVertexNo(vertexNo: number): number;
+
+		/**
+		 * Returns the time step of the simulation.
+     *
+		 * @return {number} The present time step of the simulation.
+		 */
+		getTimeStep(): number;
+
+		/**
+		 * Processes the obstacles that have been added so that they are accounted for in
+     * the simulation.
+     *
+		 * Obstacles added to the simulation after this function has
+		 * been called are not accounted for in the simulation.
+		 */
+		processObstacles(): void;
+
+		/**
+		 * Performs a visibility query between the two specified points with respect to
+     * the obstacles
+     *
+		 * @param {number} point1 The first point of the query.
+		 * @param {number} point2 The second point of the query.
+		 * @param {number} radius The minimal distance between the line
+		 *                        connecting the two points and the obstacles
+		 *                        in order for the points to be mutually
+		 *                        visible (optional). Must be non-negative.
+		 * @return {number} A boolean specifying whether the two points are mutually
+		 * visible. Returns true when the obstacles have not been processed.
+		 */
+		queryVisibility(point1: Vector2, point2: Vector2, radius?: number): number;
+	}
+
+  /**
+   * Computes the length of a specified two-dimensional vector.
+   *
+   * @param {Vector2} v   The two-dimensional vector whose length is to be computed.
+   * @returns {number}    The length of the two-dimensional vector.
+   *
+   * @memberOf sim
+   */
+	function abs(v: Vector2): number;
+
+	/**
+	 * Computes the squared length of a specified two-dimensional vector.
+	 * @param {Vector2} v The two-dimensional vector whose squared length is to be computed.
+	 * @returns {number}  The squared length of the two-dimensional vector.
+	 */
+	function absSq(v: Vector2): number;
+
+	/**
+	 * Computes the determinant of a two-dimensional square matrix with
+	 * rows consisting of the specified two-dimensional vectors.
+	 * @param {Vector2} v1 The top row of the two-dimensional square matrix.
+	 * @param {Vector2} v2 The bottom row of the two-dimensional square matrix.
+	 * @returns {number} The determinant of the two-dimensional square matrix.
+	 */
+	function det(v1: Vector2, v2: Vector2): number;
+
+	/**
+ * Computes the normalization of the specified two-dimensional vector.
+ * @param {Vector2} vector  The two-dimensional vector whose normalization
+ *                          is to be computed.
+ * returns {Vector2}   The normalization of the two-dimensional vector.
+ */
+	function normalize(vector: Vector2): Vector2
+
+}
+
+export = rvo2;
\ No newline at end of file
diff --git a/rvo2/rvo2-tests.ts b/rvo2/rvo2-tests.ts
new file mode 100644
index 0000000000..80906011e9
--- /dev/null
+++ b/rvo2/rvo2-tests.ts
@@ -0,0 +1,137 @@
+import { Vector2, vectorvector, RVOSimulator, absSq, normalize } from './index';
+
+// Some examples of vector functions.
+const v1 = new Vector2(-1, 2);
+const v2 = new Vector2(1, 2);
+const v3 = v1.mul(3);  // -3, 6
+const v4 = v1.sub(v2); // -2, 0
+const v5 = v1.add(v2); //  0, 4
+
+function setupScenario(sim: RVOSimulator, goals: vectorvector) {
+  sim.setTimeStep(0.25);
+ 	/* Specify the default parameters for agents that are subsequently added. */
+  sim.setAgentDefaults(15, 10, 5, 5, 2, 2);
+
+	/*
+	 * Add agents, specifying their start position, and store their goals on the
+	 * opposite side of the environment.
+	 */
+	for (var i = 0; i < 5; ++i) {
+		for (var j = 0; j < 5; ++j) {
+			var index = sim.addAgent(new Vector2(55 + i * 10,  55 + j * 10));
+			goals[index] = new Vector2(-75, -75);
+
+			index = sim.addAgent(new Vector2(-55 - i * 10,  55 + j * 10));
+			goals[index] = new Vector2(75, -75);
+
+			index = sim.addAgent(new Vector2(55 + i * 10, -55 - j * 10));
+			goals[index] = new Vector2(-75, 75);
+
+			index = sim.addAgent(new Vector2(-55 - i * 10, -55 - j * 10));
+			goals[index] = new Vector2(75, 75);
+		}
+	}
+
+	/*
+	 * Add (polygonal) obstacles, specifying their vertices in counterclockwise
+	 * order.
+	 */
+	const obstacle1 = new vectorvector(4)
+    , obstacle2 = new vectorvector(4)
+    , obstacle3 = new vectorvector(4)
+    , obstacle4 = new vectorvector(4);
+
+	obstacle1[0] = new Vector2(-10, 40);
+	obstacle1[1] = new Vector2(-40, 40);
+	obstacle1[2] = new Vector2(-40, 10);
+	obstacle1[3] = new Vector2(-10, 10);
+
+	obstacle2[0] = new Vector2(10, 40);
+	obstacle2[1] = new Vector2(10, 10);
+	obstacle2[2] = new Vector2(40, 10);
+	obstacle2[3] = new Vector2(40, 40);
+
+	obstacle3[0] = new Vector2(10, -40);
+	obstacle3[1] = new Vector2(40, -40);
+	obstacle3[2] = new Vector2(40, -10);
+	obstacle3[3] = new Vector2(10, -10);
+
+	obstacle4[0] = new Vector2(-10, -40);
+	obstacle4[1] = new Vector2(-10, -10);
+	obstacle4[2] = new Vector2(-40, -10);
+	obstacle4[3] = new Vector2(-40, -40);
+
+	sim.addObstacle(obstacle1);
+	sim.addObstacle(obstacle2);
+	sim.addObstacle(obstacle3);
+	sim.addObstacle(obstacle4);
+
+	/* Process the obstacles so that they are accounted for in the simulation. */
+	sim.processObstacles();
+}
+
+function updateVisualization(sim: RVOSimulator)
+{
+	/* Output the current global time. */
+	const time = sim.getGlobalTime();
+  // console.log(`Time: ${time}`);
+	/* Output the current position of all the agents. */
+	for (let i = 0; i < sim.getNumAgents(); ++i) {
+    const p = sim.getAgentPosition(i);
+    // console.log(`#${i}) x: ${p.x()}, y: ${p.y()}`);
+  }
+}
+
+function setPreferredVelocity(sim: RVOSimulator, goals: vectorvector) {
+  for (var i = 0; i < sim.getNumAgents(); i++) {
+    const delta = goals[i].sub(sim.getAgentPosition(i));
+
+		/*
+		 * Perturb a little to avoid deadlocks due to perfect symmetry.
+		 */
+		const angle = Math.random() * 2.0 * Math.PI;
+		const dist = Math.random() * 0.0001;
+
+    var goalVector = new Vector2(delta.x() + dist * Math.cos(angle), delta.y() + dist * Math.sin(angle));
+
+    if (absSq(goalVector) > 1.0) {
+      goalVector = normalize(goalVector);
+    }
+
+    sim.setAgentPrefVelocity(i, goalVector);
+  }
+}
+
+function reachedGoal(sim: RVOSimulator, goals: vectorvector) {
+  /* Check if all agents have reached their goals. */
+  for (var i = 0; i < sim.getNumAgents(); ++i) {
+    const dist = sim.getAgentPosition(i).sub(goals[i]);
+    if (absSq(dist) > 400) { // 400 <= 20 x 20
+      return false;
+    }
+  }
+  return true;
+}
+
+function main(debug = false) {
+  const nbrAgents = 100;
+  const sim = new RVOSimulator();
+  const goals = new vectorvector(nbrAgents);
+
+  setupScenario(sim, goals);
+
+  // sim.addObstacle(vv);
+  var i = 0;
+  do {
+    if (++i % 10 === 0) {
+      // console.log('TIME: ' + i);
+    }
+    setPreferredVelocity(sim, goals);
+    if (debug) { updateVisualization(sim); }
+    sim.doStep();
+  } while (!reachedGoal(sim, goals));
+
+  // console.log('Done');
+}
+
+main();
diff --git a/numbro/tsconfig.json b/rvo2/tsconfig.json
similarity index 94%
rename from numbro/tsconfig.json
rename to rvo2/tsconfig.json
index 4a55ffe0ab..bf6778173d 100644
--- a/numbro/tsconfig.json
+++ b/rvo2/tsconfig.json
@@ -17,6 +17,6 @@
     },
     "files": [
         "index.d.ts",
-        "numbro-tests.ts"
+        "rvo2-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/rx.wamp/rx.wamp-tests.ts b/rx.wamp/rx.wamp-tests.ts
index 2b6d4c95bc..3bd6ddbffb 100644
--- a/rx.wamp/rx.wamp-tests.ts
+++ b/rx.wamp/rx.wamp-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="rx" />
-
 import * as autobahn from "autobahn";
 import {IWampEvent} from "rx.wamp";
 
diff --git a/s3-upload-stream/s3-upload-stream-tests.ts b/s3-upload-stream/s3-upload-stream-tests.ts
index ef03000ad2..0f02beb63f 100644
--- a/s3-upload-stream/s3-upload-stream-tests.ts
+++ b/s3-upload-stream/s3-upload-stream-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="aws-sdk" />
-
 import * as fs from 'fs';
 import * as S3Stream from 's3-upload-stream';
 import * as AWS from 'aws-sdk';
diff --git a/sax/sax-tests.ts b/sax/sax-tests.ts
index 4d9a90293d..5b11ab425e 100644
--- a/sax/sax-tests.ts
+++ b/sax/sax-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import sax = require("sax");
 import fs = require("fs");
 
diff --git a/scripts/not-needed.js b/scripts/not-needed.js
index f5b5cc8e6a..2462f3f2e2 100644
--- a/scripts/not-needed.js
+++ b/scripts/not-needed.js
@@ -16,6 +16,7 @@ if (process.argv.length !== 5 && process.argv.length !== 6) {
 rmdirRecursive(typingsPackageName);
 const notNeededPackages = JSON.parse(fs.readFileSync("notNeededPackages.json", "utf-8"));
 notNeededPackages.packages.push({ libraryName, typingsPackageName, sourceRepoURL, asOfVersion });
+notNeededPackages.packages.sort((x, y) => x.typingsPackageName < y.typingsPackageName ? -1 : 1);
 fs.writeFileSync("notNeededPackages.json", JSON.stringify(notNeededPackages, undefined, 4), "utf-8");
 
 function rmdirRecursive(dir) {
diff --git a/seamless/seamless-tests.ts b/seamless/seamless-tests.ts
index 4aa1ab3aba..40ba1868be 100644
--- a/seamless/seamless-tests.ts
+++ b/seamless/seamless-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery" />
-
 /* Create Parent Seamless IFrame */
 $('#myiframe').seamless();
 $('#myiframe').seamless({
diff --git a/select2/select2-tests.ts b/select2/select2-tests.ts
index ade378ee71..c10b482cab 100644
--- a/select2/select2-tests.ts
+++ b/select2/select2-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 $("#e9").select2();
 $("#e2").select2({
     placeholder: "Select a State",
diff --git a/selectize/selectize-tests.ts b/selectize/selectize-tests.ts
index b2ec9e0a29..10b12c91f2 100644
--- a/selectize/selectize-tests.ts
+++ b/selectize/selectize-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 var $input = $(".test-input").selectize();
 var testApi = $input[0].selectize;
 
diff --git a/semver/index.d.ts b/semver/index.d.ts
index a1ace1a134..60e7275f7a 100644
--- a/semver/index.d.ts
+++ b/semver/index.d.ts
@@ -1,186 +1,154 @@
-// Type definitions for semver v5.3.0
+// Type definitions for semver 5.3
 // Project: https://github.com/npm/node-semver
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/semver
 
-declare namespace SemVerModule {
-    /**
-     * Return the parsed version, or null if it's not valid.
-     */
-    function valid(v: string, loose?: boolean): string;
-    /**
-     * Returns cleaned (removed leading/trailing whitespace, remove '=v' prefix) and parsed version, or null if version is invalid.
-     */
-    function clean(version: string, loose?: boolean): string;
-    /**
-     * Return the version incremented by the release type (major, minor, patch, or prerelease), or null if it's not valid.
-     */
-    function inc(v: string, release: string, loose?: boolean): string;
-    /**
-     * Return the major version number.
-     */
-    function major(v: string, loose?: boolean): number;
-    /**
-     * Return the minor version number.
-     */
-    function minor(v: string, loose?: boolean): number;
-    /**
-     * Return the patch version number.
-     */
-    function patch(v: string, loose?: boolean): number;
-    /**
-     * Returns an array of prerelease components, or null if none exist.
-     */
-    function prerelease(v: string, loose?: boolean): string[];
+export const SEMVER_SPEC_VERSION: "2.0.0";
 
-    // Comparison
-    /**
-     * v1 > v2
-     */
-    function gt(v1: string, v2: string, loose?: boolean): boolean;
-    /**
-     * v1 >= v2
-     */
-    function gte(v1: string, v2: string, loose?: boolean): boolean;
-    /**
-     * v1 < v2
-     */
-    function lt(v1: string, v2: string, loose?: boolean): boolean;
-    /**
-     * v1 <= v2
-     */
-    function lte(v1: string, v2: string, loose?: boolean): boolean;
-    /**
-     * v1 == v2 This is true if they're logically equivalent, even if they're not the exact same string. You already know how to compare strings.
-     */
-    function eq(v1: string, v2: string, loose?: boolean): boolean;
-    /**
-     * v1 != v2 The opposite of eq.
-     */
-    function neq(v1: string, v2: string, loose?: boolean): boolean;
-    /**
-     * Pass in a comparison string, and it'll call the corresponding semver comparison function. "===" and "!==" do simple string comparison, but are included for completeness. Throws if an invalid comparison string is provided.
-     */
-    function cmp(v1: string, comparator: any, v2: string, loose?: boolean): boolean;
-    /**
-     * Return 0 if v1 == v2, or 1 if v1 is greater, or -1 if v2 is greater. Sorts in ascending order if passed to Array.sort().
-     */
-    function compare(v1: string, v2: string, loose?: boolean): number;
-    /**
-     * The reverse of compare. Sorts an array of versions in descending order when passed to Array.sort().
-     */
-    function rcompare(v1: string, v2: string, loose?: boolean): number;
-    /**
-     * Returns difference between two versions by the release type (major, premajor, minor, preminor, patch, prepatch, or prerelease), or null if the versions are the same.
-     */
-    function diff(v1: string, v2: string, loose?: boolean): string;
+/**
+ * Return the parsed version, or null if it's not valid.
+ */
+export function valid(v: string, loose?: boolean): string;
+/**
+ * Returns cleaned (removed leading/trailing whitespace, remove '=v' prefix) and parsed version, or null if version is invalid.
+ */
+export function clean(version: string, loose?: boolean): string;
+/**
+ * Return the version incremented by the release type (major, minor, patch, or prerelease), or null if it's not valid.
+ */
+export function inc(v: string, release: string, loose?: boolean): string;
+/**
+ * Return the major version number.
+ */
+export function major(v: string, loose?: boolean): number;
+/**
+ * Return the minor version number.
+ */
+export function minor(v: string, loose?: boolean): number;
+/**
+ * Return the patch version number.
+ */
+export function patch(v: string, loose?: boolean): number;
+/**
+ * Returns an array of prerelease components, or null if none exist.
+ */
+export function prerelease(v: string, loose?: boolean): string[];
 
-    // Ranges
-    /**
-     * Return the valid range or null if it's not valid
-     */
-    function validRange(range: string, loose?: boolean): string;
-    /**
-     * Return true if the version satisfies the range.
-     */
-    function satisfies(version: string, range: string, loose?: boolean): boolean;
-    /**
-     * Return the highest version in the list that satisfies the range, or null if none of them do.
-     */
-    function maxSatisfying(versions: string[], range: string, loose?: boolean): string;
-    /**
-     * Return the lowest version in the list that satisfies the range, or null if none of them do.
-     */
-    function minSatisfying(versions: string[], range: string, loose?: boolean): string;
-    /**
-     * Return true if version is greater than all the versions possible in the range.
-     */
-    function gtr(version: string, range: string, loose?: boolean): boolean;
-    /**
-     * Return true if version is less than all the versions possible in the range.
-     */
-    function ltr(version: string, range: string, loose?: boolean): boolean;
-    /**
-     * Return true if the version is outside the bounds of the range in either the high or low direction. The hilo argument must be either the string '>' or '<'. (This is the function called by gtr and ltr.)
-     */
-    function outside(version: string, range: string, hilo: string, loose?: boolean): boolean;
+// Comparison
+/**
+ * v1 > v2
+ */
+export function gt(v1: string, v2: string, loose?: boolean): boolean;
+/**
+ * v1 >= v2
+ */
+export function gte(v1: string, v2: string, loose?: boolean): boolean;
+/**
+ * v1 < v2
+ */
+export function lt(v1: string, v2: string, loose?: boolean): boolean;
+/**
+ * v1 <= v2
+ */
+export function lte(v1: string, v2: string, loose?: boolean): boolean;
+/**
+ * v1 == v2 This is true if they're logically equivalent, even if they're not the exact same string. You already know how to compare strings.
+ */
+export function eq(v1: string, v2: string, loose?: boolean): boolean;
+/**
+ * v1 != v2 The opposite of eq.
+ */
+export function neq(v1: string, v2: string, loose?: boolean): boolean;
+/**
+ * Pass in a comparison string, and it'll call the corresponding semver comparison function.
+ * "===" and "!==" do simple string comparison, but are included for completeness.
+ * Throws if an invalid comparison string is provided.
+ */
+export function cmp(v1: string, comparator: any, v2: string, loose?: boolean): boolean;
+/**
+ * Return 0 if v1 == v2, or 1 if v1 is greater, or -1 if v2 is greater. Sorts in ascending order if passed to Array.sort().
+ */
+export function compare(v1: string, v2: string, loose?: boolean): number;
+/**
+ * The reverse of compare. Sorts an array of versions in descending order when passed to Array.sort().
+ */
+export function rcompare(v1: string, v2: string, loose?: boolean): number;
+/**
+ * Returns difference between two versions by the release type (major, premajor, minor, preminor, patch, prepatch, or prerelease), or null if the versions are the same.
+ */
+export function diff(v1: string, v2: string, loose?: boolean): string;
 
-    class SemVerBase {
-        raw: string;
-        loose: boolean;
-        format(): string;
-        inspect(): string;
-        toString(): string;
-    }
+// Ranges
+/**
+ * Return the valid range or null if it's not valid
+ */
+export function validRange(range: string, loose?: boolean): string;
+/**
+ * Return true if the version satisfies the range.
+ */
+export function satisfies(version: string, range: string, loose?: boolean): boolean;
+/**
+ * Return the highest version in the list that satisfies the range, or null if none of them do.
+ */
+export function maxSatisfying(versions: string[], range: string, loose?: boolean): string;
+/**
+ * Return the lowest version in the list that satisfies the range, or null if none of them do.
+ */
+export function minSatisfying(versions: string[], range: string, loose?: boolean): string;
+/**
+ * Return true if version is greater than all the versions possible in the range.
+ */
+export function gtr(version: string, range: string, loose?: boolean): boolean;
+/**
+ * Return true if version is less than all the versions possible in the range.
+ */
+export function ltr(version: string, range: string, loose?: boolean): boolean;
+/**
+ * Return true if the version is outside the bounds of the range in either the high or low direction.
+ * The hilo argument must be either the string '>' or '<'. (This is the function called by gtr and ltr.)
+ */
+export function outside(version: string, range: string, hilo: string, loose?: boolean): boolean;
 
-    class SemVer extends SemVerBase {
-        constructor(version: string, loose?: boolean);
+export class SemVer {
+    constructor(version: string, loose?: boolean);
 
-        major: number;
-        minor: number;
-        patch: number;
-        version: string;
-        build: string[];
-        prerelease: string[];
+    raw: string;
+    loose: boolean;
+    format(): string;
+    inspect(): string;
 
-        compare(other:SemVer): number;
-        compareMain(other:SemVer): number;
-        comparePre(other:SemVer): number;
-        inc(release: string): SemVer;
-    }
+    major: number;
+    minor: number;
+    patch: number;
+    version: string;
+    build: string[];
+    prerelease: string[];
 
-    class Comparator extends SemVerBase {
-        constructor(comp: string, loose?: boolean);
-
-        semver: SemVer;
-        operator: string;
-        value: boolean;
-        parse(comp: string): void;
-        test(version:SemVer): boolean;
-    }
-
-    class Range extends SemVerBase {
-        constructor(range: string, loose?: boolean);
-
-        set: Comparator[][];
-        parseRange(range: string): Comparator[];
-        test(version: SemVer): boolean;
-    }
+    compare(other: SemVer): number;
+    compareMain(other: SemVer): number;
+    comparePre(other: SemVer): number;
+    inc(release: string): SemVer;
 }
 
-interface SemVerStatic {
-    SemVer(version: string, loose?: boolean): SemVerModule.SemVer;
-    Comparator(comp: string, loose?: boolean): SemVerModule.Comparator;
-    Range(range: string, loose?: boolean): SemVerModule.Range;
-    clean(version: string, loose?: boolean): string;
+export class Comparator {
+    constructor(comp: string, loose?: boolean);
 
-    SEMVER_SPEC_VERSION: string;
-
-    valid(v: string, loose?: boolean): string;
-    inc(v: string, release: string, loose?: boolean): string;
-    major(v: string, loose?: boolean): number;
-    minor(v: string, loose?: boolean): number;
-    patch(v: string, loose?: boolean): number;
-    gt(v1: string, v2: string, loose?: boolean): boolean;
-    gte(v1: string, v2: string, loose?: boolean): boolean;
-    lt(v1: string, v2: string, loose?: boolean): boolean;
-    lte(v1: string, v2: string, loose?: boolean): boolean;
-    eq(v1: string, v2: string, loose?: boolean): boolean;
-    neq(v1: string, v2: string, loose?: boolean): boolean;
-    cmp(v1: string, comparator: any, v2: string, loose?: boolean): boolean;
-    compare(v1: string, v2: string, loose?: boolean): number;
-    rcompare(v1: string, v2: string, loose?: boolean): number;
-    diff(v1: string, v2: string, loose?: boolean): string;
-    validRange(range: string, loose?: boolean): string;
-    satisfies(version: string, range: string, loose?: boolean): boolean;
-    maxSatisfying(versions: string[], range: string, loose?: boolean): string;
-    gtr(version: string, range: string, loose?: boolean): boolean;
-    ltr(version: string, range: string, loose?: boolean): boolean;
-    outside(version: string, range: string, hilo: string, loose?: boolean): boolean;
+    semver: SemVer;
+    operator: string;
+    value: boolean;
+    parse(comp: string): void;
+    test(version: SemVer): boolean;
 }
 
-declare var semver: SemVerStatic;
+export class Range {
+    constructor(range: string, loose?: boolean);
 
-declare module "semver" {
-    export = SemVerModule;
+    raw: string;
+    loose: boolean;
+    format(): string;
+    inspect(): string;
+
+    set: Comparator[][];
+    parseRange(range: string): Comparator[];
+    test(version: SemVer): boolean;
 }
diff --git a/semver/semver-tests.ts b/semver/semver-tests.ts
index 62511ef425..f1be6ca533 100644
--- a/semver/semver-tests.ts
+++ b/semver/semver-tests.ts
@@ -1,56 +1,54 @@
+import * as semver from "semver";
 
+var obj: {};
+var bool: boolean;
+var num: number;
+var str: string;
+var diff: string;
+var x: any = null;
+var arr: any[];
+var exp: RegExp;
+var strArr: string[];
+var numArr: string[];
 
-var obj:Object;
-var bool:boolean;
-var num:number;
-var str:string;
-var diff:string;
-var x:any = null;
-var arr:any[];
-var exp:RegExp;
-var strArr:string[];
-var numArr:string[];
+var v1: string, v2: string;
+var version: string;
+var versions: string[];
+var loose: boolean;
 
-var mod:typeof SemVerModule;
+str = semver.valid(str);
+str = semver.clean(str);
 
-var v1:string, v2:string;
-var version:string;
-var versions:string[];
-var loose:boolean;
-
-str = mod.valid(str);
-str = mod.clean(str);
-
-str = mod.valid(str, loose);
-str = mod.clean(str, loose);
-str = mod.inc(str, str, loose);
-num = mod.major(str, loose);
-num = mod.minor(str, loose);
-num = mod.patch(str, loose);
-strArr = mod.prerelease(str, loose);
+str = semver.valid(str, loose);
+str = semver.clean(str, loose);
+str = semver.inc(str, str, loose);
+num = semver.major(str, loose);
+num = semver.minor(str, loose);
+num = semver.patch(str, loose);
+strArr = semver.prerelease(str, loose);
 
 // Comparison
-bool = mod.gt(v1, v2, loose);
-bool = mod.gte(v1, v2, loose);
-bool = mod.lt(v1, v2, loose);
-bool = mod.lte(v1, v2, loose);
-bool = mod.eq(v1, v2, loose);
-bool = mod.neq(v1, v2, loose);
-bool = mod.cmp(v1, x, v2, loose);
-num = mod.compare(v1, v2, loose);
-num = mod.rcompare(v1, v2, loose);
-diff = mod.diff(v1, v2, loose);
+bool = semver.gt(v1, v2, loose);
+bool = semver.gte(v1, v2, loose);
+bool = semver.lt(v1, v2, loose);
+bool = semver.lte(v1, v2, loose);
+bool = semver.eq(v1, v2, loose);
+bool = semver.neq(v1, v2, loose);
+bool = semver.cmp(v1, x, v2, loose);
+num = semver.compare(v1, v2, loose);
+num = semver.rcompare(v1, v2, loose);
+diff = semver.diff(v1, v2, loose);
 
 // Ranges
-str = mod.validRange(str, loose);
-bool = mod.satisfies(version, str, loose);
-str = mod.maxSatisfying(versions, str, loose);
-str = mod.minSatisfying(versions, str, loose);
-bool = mod.gtr(version, str, loose);
-bool = mod.ltr(version, str, loose);
-bool = mod.outside(version, str, str, loose);
+str = semver.validRange(str, loose);
+bool = semver.satisfies(version, str, loose);
+str = semver.maxSatisfying(versions, str, loose);
+str = semver.minSatisfying(versions, str, loose);
+bool = semver.gtr(version, str, loose);
+bool = semver.ltr(version, str, loose);
+bool = semver.outside(version, str, str, loose);
 
-var ver = new mod.SemVer(str, bool);
+var ver = new semver.SemVer(str, bool);
 str = ver.raw;
 bool = ver.loose;
 str = ver.format();
@@ -70,11 +68,7 @@ num = ver.comparePre(ver);
 ver = ver.inc(str);
 
 
-var comp = new SemVerModule.Comparator(str, bool);
-str = comp.raw;
-bool = comp.loose;
-str = comp.format();
-str = comp.inspect();
+var comp = new semver.Comparator(str, bool);
 str = comp.toString();
 
 ver = comp.semver;
@@ -84,7 +78,7 @@ comp.parse(str);
 bool = comp.test(ver);
 
 
-var range = new SemVerModule.Range(str, bool);
+var range = new semver.Range(str, bool);
 str = range.raw;
 bool = range.loose;
 str = range.format();
@@ -93,65 +87,8 @@ str = range.toString();
 
 bool = range.test(ver);
 
-var sets:SemVerModule.Comparator[][];
+var sets: semver.Comparator[][];
 sets = range.set;
 
-var lims:SemVerModule.Comparator[];
+var lims: semver.Comparator[];
 lims = range.parseRange(str);
-
-/**
- * Test Static version
- */
-var semver: SemVerStatic = semver;
-var testString: string;
-var testNumber: number;
-var testBoolean: boolean;
-
-testString = semver.SEMVER_SPEC_VERSION;
-
-testString = semver.valid('v1.0.0');
-testString = semver.clean(' =v1.0.0 ');
-testString = semver.valid('v1.0.0', true);
-testString = semver.clean(' =v1.0.0 ', true);
-testString = semver.inc('v1.0.0', 'major');
-testString = semver.inc('v1.0.0', 'major', true);
-testNumber = semver.major('v1.0.0');
-testNumber = semver.major('v1.0.0', true);
-testNumber = semver.minor('v1.0.0');
-testNumber = semver.minor('v1.0.0', true);
-testNumber = semver.patch('v1.0.0');
-testNumber = semver.patch('v1.0.0', true);
-
-testBoolean = semver.gt('v1.0.0', 'v2.0.0');
-testBoolean = semver.gt('v1.0.0', 'v2.0.0', true);
-testBoolean = semver.gte('v1.0.0', 'v2.0.0');
-testBoolean = semver.gte('v1.0.0', 'v2.0.0', true);
-testBoolean = semver.lt('v1.0.0', 'v2.0.0');
-testBoolean = semver.lt('v1.0.0', 'v2.0.0', true);
-testBoolean = semver.lte('v1.0.0', 'v2.0.0');
-testBoolean = semver.lte('v1.0.0', 'v2.0.0', true);
-testBoolean = semver.eq('v1.0.0', 'v2.0.0');
-testBoolean = semver.eq('v1.0.0', 'v2.0.0', true);
-testBoolean = semver.neq('v1.0.0', 'v2.0.0');
-testBoolean = semver.neq('v1.0.0', 'v2.0.0', true);
-testBoolean = semver.cmp('v1.0.0', '===', 'v2.0.0');
-testBoolean = semver.cmp('v1.0.0', '!==', 'v2.0.0', true);
-testNumber = semver.compare('v1.0.0', 'v2.0.0');
-testNumber = semver.compare('v1.0.0', 'v2.0.0', true);
-testNumber = semver.rcompare('v1.0.0', 'v2.0.0');
-testNumber = semver.rcompare('v1.0.0', 'v2.0.0', true);
-testString = semver.diff('v1.0.0', 'v2.0.0');
-testString = semver.diff('v1.0.0', 'v2.0.0', true);
-
-testString = semver.validRange('^1.0.0');
-testString = semver.validRange('^1.0.0', true);
-testBoolean = semver.satisfies('v1.0.0', '^1.0.0');
-testBoolean = semver.satisfies('v1.0.0', '^1.0.0', true);
-testString = semver.maxSatisfying(['v1.0.0', 'v2.0.0'], '^1.0.0');
-testString = semver.maxSatisfying(['v1.0.0', 'v2.0.0'], '^1.0.0', true);
-testBoolean = semver.gtr('v1.0.0', '^1.0.0');
-testBoolean = semver.gtr('v1.0.0', '^1.0.0', true);
-testBoolean = semver.ltr('v1.0.0', '^1.0.0');
-testBoolean = semver.ltr('v1.0.0', '^1.0.0', true);
-testBoolean = semver.outside('v1.0.0', '^1.0.0', '<');
-testBoolean = semver.outside('v1.0.0', '^1.0.0', '>', true);
diff --git a/semver/tslint.json b/semver/tslint.json
new file mode 100644
index 0000000000..2221e40e4a
--- /dev/null
+++ b/semver/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
\ No newline at end of file
diff --git a/sequelize/index.d.ts b/sequelize/index.d.ts
index ec41863261..e21d8f6f88 100644
--- a/sequelize/index.d.ts
+++ b/sequelize/index.d.ts
@@ -3671,7 +3671,7 @@ declare namespace sequelize {
  * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
  *     model will clear the previous scope.
  */
-        scope(options?: string | string[] | ScopeOptions | WhereOptions): this;
+        scope(options?: string | ScopeOptions | WhereOptions | Array<string | ScopeOptions | WhereOptions>): this;
 
         /**
          * Search for multiple instances.
@@ -5221,6 +5221,12 @@ declare namespace sequelize {
          */
         transactionType?: string;
 
+        /**
+         * Print query execution time in milliseconds when logging SQL.
+         *
+         * Defaults to false
+         */
+        benchmark?: boolean;
     }
 
     /**
diff --git a/sequelize/sequelize-tests.ts b/sequelize/sequelize-tests.ts
index 71e6203a82..ceff709a6b 100644
--- a/sequelize/sequelize-tests.ts
+++ b/sequelize/sequelize-tests.ts
@@ -853,11 +853,14 @@ User.schema( 'special' ).create( { age : 3 }, { logging : function(  ) {} } );
 User.getTableName();
 
 User.addScope('lowAccess', { where : { parent_id : 2 } });
-User.addScope('lowAccess', function() { } );
 User.addScope('lowAccess', { where : { parent_id : 2 } }, { override: true });
+User.addScope('lowAccessWithParam', function(id: number) {
+  return { where : { parent_id : id } }
+} );
 
 User.scope( 'lowAccess' ).count();
 User.scope( { where : { parent_id : 2 } } );
+User.scope( [ 'lowAccess', { method: ['lowAccessWithParam', 2] }, { where : { parent_id : 2 } } ] )
 
 User.findAll();
 User.findAll( { where : { data : { employment : null } } } );
diff --git a/sequelize/v3/index.d.ts b/sequelize/v3/index.d.ts
index fb73cd94bf..f44fcbbd46 100644
--- a/sequelize/v3/index.d.ts
+++ b/sequelize/v3/index.d.ts
@@ -3648,7 +3648,7 @@ declare namespace sequelize {
  * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
  *     model will clear the previous scope.
  */
-        scope(options?: string | string[] | ScopeOptions | WhereOptions): this;
+        scope(options?: string | ScopeOptions | WhereOptions | Array<string | ScopeOptions | WhereOptions>): this;
 
         /**
          * Search for multiple instances.
@@ -5188,6 +5188,12 @@ declare namespace sequelize {
          */
         transactionType?: string;
 
+        /**
+         * Print query execution time in milliseconds when logging SQL.
+         *
+         * Defaults to false
+         */
+        benchmark?: boolean;
     }
 
     /**
diff --git a/sequelize/v3/sequelize-tests.ts b/sequelize/v3/sequelize-tests.ts
index ef90600e91..83c4536a71 100644
--- a/sequelize/v3/sequelize-tests.ts
+++ b/sequelize/v3/sequelize-tests.ts
@@ -840,11 +840,14 @@ User.schema( 'special' ).create( { age : 3 }, { logging : function(  ) {} } );
 User.getTableName();
 
 User.addScope('lowAccess', { where : { parent_id : 2 } });
-User.addScope('lowAccess', function() { } );
 User.addScope('lowAccess', { where : { parent_id : 2 } }, { override: true });
+User.addScope('lowAccessWithParam', function(id: number) {
+  return { where : { parent_id : id } }
+} );
 
 User.scope( 'lowAccess' ).count();
 User.scope( { where : { parent_id : 2 } } );
+User.scope( [ 'lowAccess', { method: ['lowAccessWithParam', 2] }, { where : { parent_id : 2 } } ] )
 
 User.findAll();
 User.findAll( { where : { data : { employment : null } } } );
diff --git a/service_worker_api/index.d.ts b/service_worker_api/index.d.ts
deleted file mode 100644
index 3f7e07acaa..0000000000
--- a/service_worker_api/index.d.ts
+++ /dev/null
@@ -1,831 +0,0 @@
-// Type definitions for service_worker_api 0.0
-// Project: https://developer.mozilla.org/fr/docs/Web/API/ServiceWorker_API
-// Definitions by: Tristan Caron <https://github.com/tristancaron>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-// TypeScript Version: 2.1
-
-/// <reference types="whatwg-fetch" />
-
-/**
- * An CacheOptions object allowing you to set specific control options for the
- * matching done in the match operation.
- *
- * @property [ignoreSearch] A Boolean that specifies whether the matching
- * process should ignore the query string in the url.  If set to true,
- * the ?value=bar part of http://foo.com/?value=bar would be ignored when
- * performing a match. It defaults to false.
- *
- * @property [ignoreMethod] A Boolean that, when set to true, prevents matching
- * operations from validating the Request http method (normally only GET
- * and HEAD are allowed.) It defaults to false.
- *
- * @property [ignoreVary] A Boolean that when set to true tells the matching
- * operation not to perform VARY header matching — i.e. if the URL matches you
- * will get a match regardless of the Response object having a VARY header or
- * not. It defaults to false.
- *
- * @property [cacheName] A DOMString that represents a specific cache to search
- * within. Note that this option is ignored by Cache.match().
- */
-interface CacheOptions {
-    ignoreSearch?: boolean;
-    ignoreMethod?: boolean;
-    ignoreVary?: boolean;
-    cacheName?: string;
-}
-
-/**
- * Represents the storage for Request / Response object pairs that are cached as
- * part of the ServiceWorker life cycle.
- */
-interface Cache {
-    /**
-     * Returns a Promise that resolves to the response associated with the first
-     * matching request in the Cache object.
-     *
-     * @param request The Request you are attempting to find in the Cache.
-     * @param [options] An object that sets options for the match operation.
-     */
-    match(request: Request | string, options?: CacheOptions): Promise<Response>;
-
-    /**
-     * Returns a Promise that resolves to an array of all matching responses in
-     * the Cache object.
-     *
-     * @param request The Request you are attempting to find in the Cache.
-     * @param [options] An object that sets options for the match operation.
-     */
-    matchAll(request: Request | string, options?: CacheOptions): Promise<Response[]>;
-
-    /**
-     * Returns a Promise that resolves to a new Cache entry whose key
-     * is the request.
-     *
-     * @param request The Request you want to add to the cache.
-     */
-    add(request: Request | string): Promise<void>;
-
-    /**
-     * Returns a Promise that resolves to a new array of Cache entries whose
-     * keys are the requests.
-     *
-     * @param request An array of Request objects you want to add to the cache.
-     */
-    addAll(requests: Array<Request | string>): Promise<void>;
-
-    /**
-     * Adds additional key/value pairs to the current Cache object.
-     *
-     * @param request The Request you want to add to the cache.
-     * @param response The response you want to match up to the request.
-     */
-    put(request: Request, response: Response): Promise<void>;
-
-    /**
-     * Finds the Cache entry whose key is the request, and if found, deletes the
-     * Cache entry and returns a Promise that resolves to true. If no Cache
-     * entry is found, it returns false.
-     *
-     * @param request The Request you are looking to delete.
-     * @param [options] An object that sets options for the match operation.
-     */
-    delete(request: Request | string, options?: CacheOptions): Promise<boolean>;
-
-    /**
-     * Returns a Promise that resolves to an array of Cache keys.
-     *
-     * @param request The Request want to return, if a specific key is desired.
-     * @param [options] An object that sets options for the match operation.
-     */
-    keys(request?: Request, options?: CacheOptions): Promise<Request[]>;
-}
-
-/**
- * Represents the storage for Cache objects. It provides a master directory of
- * all the named caches that a ServiceWorker can access and maintains a mapping
- * of string names to corresponding Cache objects.
- */
-interface CacheStorage {
-    /**
-     * Checks if a given Request is a key in any of the Cache objects that the
-     * CacheStorage object tracks and returns a Promise that resolves
-     * to that match.
-     *
-     * @param request The Request you are looking for a match for in the CacheStorage.
-     * @param [options] An object that sets options for the match operation.
-     */
-    match(request: Request | string, options?: CacheOptions): Promise<Response>;
-
-    /**
-     * Returns a Promise that resolves to true if a Cache object matching
-     * the cacheName exists.
-     *
-     * @param cacheName The Request you are looking for a match for in the
-     * CacheStorage.
-     */
-    has(cacheName: string): Promise<boolean>;
-
-    /**
-     * Returns a Promise that resolves to the Cache object matching
-     * the cacheName.
-     *
-     * @param cacheName The name of the cache you want to open.
-     */
-    open(cacheName: string): Promise<Cache>;
-
-    /**
-     * Finds the Cache object matching the cacheName, and if found, deletes the
-     * Cache object and returns a Promise that resolves to true. If no
-     * Cache object is found, it returns false.
-     *
-     * @param cacheName The name of the cache you want to delete.
-     */
-    delete(cacheName: string): Promise<boolean>;
-
-    /**
-     * Returns a Promise that will resolve with an array containing strings
-     * corresponding to all of the named Cache objects tracked by the
-     * CacheStorage. Use this method to iterate over a list of all the
-     * Cache objects.
-     */
-    keys(): Promise<string[]>;
-}
-
-/**
- * Represents the scope of a service worker client. A service worker client is
- * either a document in a browser context or a SharedWorker, which is controlled
- * by an active worker.
- */
-interface ServiceWorkerClient {
-    /**
-     * Allows a service worker client to send a message to a ServiceWorker.
-     *
-     * @param message The message to send to the service worker.
-     * @param [transfer] A transferable object such as, for example, a reference
-     * to a port.
-     */
-    postMessage(message: any, transfer?: any): void;
-
-    /**
-     * Indicates the type of browsing context of the current client.
-     * This value can be one of auxiliary, top-level, nested, or none.
-     */
-    readonly frameType: string;
-
-    /**
-     * Returns the id of the Client object.
-     */
-    readonly id: string;
-
-    /**
-     * The URL of the current service worker client.
-     */
-    readonly url: string;
-}
-
-interface WindowClient extends ServiceWorkerClient {
-    /**
-     * Gives user input focus to the current client.
-     */
-    focus(): Promise<WindowClient>;
-
-    /**
-     * A boolean that indicates whether the current client has focus.
-     */
-    readonly focused: boolean;
-
-    /**
-     * Indicates the visibility of the current client. This value can be one of
-     * hidden, visible, prerender, or unloaded.
-     */
-    readonly visibilityState: string;
-}
-
-interface ServiceWorkerClientsMatchOptions {
-    includeUncontrolled?: boolean;
-    type?: string;
-}
-
-/**
- * Represents a container for a list of Client objects; the main way to access
- * the active service worker clients at the current origin.
- */
-interface ServiceWorkerClients {
-    /**
-     * Gets a service worker client matching a given id and returns it in a Promise.
-     * @param clientId The ID of the client you want to get.
-     */
-    get(clientId: string): Promise<ServiceWorkerClient>;
-
-    /**
-     * Gets a list of service worker clients and returns them in a Promise.
-     * Include the options parameter to return all service worker clients whose
-     * origin is the same as the associated service worker's origin. If options
-     * are not included, the method returns only the service worker clients
-     * controlled by the service worker.
-     *
-     * @param [options] An options object allowing you to set options for the matching operation.
-     */
-    matchAll(options?: ServiceWorkerClientsMatchOptions): Promise<ServiceWorkerClient[]>;
-
-    /**
-     * Opens a service worker Client in a new browser window.
-     *
-     * @param url A string representing the URL of the client you want to open
-     * in the window.
-     */
-    openWindow(url: string): Promise<WindowClient>;
-
-    /**
-     * Allows an active Service Worker to set itself as the active worker for a
-     * client page when the worker and the page are in the same scope.
-     */
-    claim(): Promise<void>;
-}
-
-/**
- * Represents a service worker. Multiple browsing contexts (e.g. pages, workers,
- * etc.) can be associated with the same ServiceWorker object.
- */
-interface ServiceWorker extends Worker {
-    /**
-     * Returns the ServiceWorker serialized script URL defined as part of
-     * ServiceWorkerRegistration. The URL must be on the same origin as the
-     * document that registers the ServiceWorker.
-     */
-    readonly scriptURL: string;
-
-    /**
-     * Returns the state of the service worker. It returns one of the following
-     * values: installing, installed, activating, activated, or redundant.
-     */
-    readonly state: string;
-
-    /**
-     * An EventListener property called whenever an event of type statechange
-     * is fired; it is basically fired anytime the ServiceWorker.state changes.
-     */
-    onstatechange: (statechangeevent: Event) => void;
-}
-
-/**
- * The PushMessageData interface of the Push API provides
- * methods which let you retrieve the push data sent by a server in various formats.
- */
-interface PushMessageData {
-    /**
-     * Extracts the data as an ArrayBuffer object.
-     */
-    arrayBuffer(): ArrayBuffer;
-
-    /**
-     * Extracts the data as a Blob object.
-     */
-    blob(): Blob;
-
-    /**
-     * Extracts the data as a JSON object.
-     */
-    json(): any;
-    json<T>(): T;
-
-    /**
-     * Extracts the data as a plain text string.
-     */
-    text(): string;
-}
-
-/**
- * The PushSubscription interface provides a subcription's URL endpoint and
- * subscription ID.
- */
-interface PushSubscription {
-    /**
-     * The endpoint associated with the push subscription.
-     */
-    readonly endpoint: any;
-
-    /**
-     * The subscription ID associated with the push subscription.
-     */
-    readonly subscriptionId: any;
-}
-
-/**
- * Object containing optional subscribe parameters.
- */
-interface PushSubscriptionOptions {
-    /**
-     * A boolean indicating that the returned push subscription will only be used for
-     * messages whose effect is made visible to the user.
-     */
-    readonly userVisibleOnly: boolean;
-
-    /**
-     * A public key your push server will use to send messages to client apps via a push server.
-     * This value is part of a signing key pair generated by your application server and usable
-     * with elliptic curve digital signature (ECDSA) over the P-256 curve.
-     */
-    readonly applicationServerKey?: Uint8Array;
-}
-
-/**
- * The PushManager interface provides a way to receive notifications from
- * third-party servers as well as request URLs for push notifications.
- * This interface has replaced functionality offered by the obsolete
- * PushRegistrationManager.
- */
-interface PushManager {
-    /**
-     * Returns a promise that resolves to a PushSubscription with details of a
-     * new push subscription.
-     *
-     * @param [options] An object containing optional configuration parameters.
-     */
-    subscribe(options?: PushSubscriptionOptions): Promise<PushSubscription>;
-
-    /**
-     * Returns a promise that resolves to a PushSubscription details of
-     * the retrieved push subscription.
-     */
-    getSubscription(): Promise<PushSubscription>;
-
-    /**
-     * Returns a promise that resolves to the PushPermissionStatus of the
-     * requesting webapp, which will be one of granted, denied, or default.
-     */
-    hasPermission(): Promise<any>;
-}
-
-/////// Service Worker Events ///////
-
-/**
- * Extends the lifetime of the install and activate events dispatched on the
- * ServiceWorkerGlobalScope as part of the service worker lifecycle. This
- * ensures that any functional events (like FetchEvent) are not dispatched to
- * the ServiceWorker until it upgrades database schemas, deletes outdated cache
- * entries, etc.
- */
-interface ExtendableEvent extends Event {
-    /**
-     * Extends the lifetime of the event.
-     * It is intended to be called in the install EventHandler for the
-     * installing worker and on the active EventHandler for the active worker.
-     *
-     * @param promise
-     */
-    waitUntil(promise: Promise<any>): void;
-}
-
-/**
- * The parameter passed into the ServiceWorkerGlobalScope.onfetch handler,
- * FetchEvent represents a fetch action that is dispatched on the
- * ServiceWorkerGlobalScope of a ServiceWorker. It contains information about
- * the request and resulting response, and provides the FetchEvent.respondWith()
- * method, which allows us to provide an arbitrary response back to the
- * controlled page.
- */
-interface FetchEvent extends Event {
-    /**
-     * Returns a Boolean that is true if the event was dispatched with the
-     * user's intention for the page to reload, and false otherwise. Typically,
-     * pressing the refresh button in a browser is a reload, while clicking a
-     * link and pressing the back button is not.
-     */
-    readonly isReload: boolean;
-
-    /**
-     * Returns the Request that triggered the event handler.
-     */
-    readonly request: Request;
-
-    /**
-     * Returns the Client that the current service worker is controlling.
-     */
-    readonly client: ServiceWorkerClient;
-
-    /**
-     * Returns the id of the client that the current service worker is controlling.
-     */
-    readonly clientId: string;
-
-    /**
-     * Resolves by returning a Response or a network error to Fetch.
-     *
-     * @param all Any custom response-generating code.
-     */
-    respondWith(all: any): Response;
-}
-
-/**
- * The ExtendableMessageEvent interface of the ServiceWorker API represents
- * the event object of a message event fired on
- * a service worker (when a channel message is received on
- * the ServiceWorkerGlobalScope from another context)
- * — extends the lifetime of such events.
- */
-interface ExtendableMessageEvent extends ExtendableEvent {
-    /**
-     * Returns the event's data. It can be any data type.
-     */
-    readonly data: any;
-
-    /**
-     * Returns the origin of the ServiceWorkerClient that sent the message
-     */
-    readonly origin: string;
-
-    /**
-     * Represents, in server-sent events, the last event ID of the event source.
-     */
-    readonly lastEventId: string;
-
-    /**
-     * Returns a reference to the service worker that sent the message.
-     */
-    readonly source: ServiceWorkerClient;
-
-    /**
-     * Returns the array containing the MessagePort objects
-     * representing the ports of the associated message channel.
-     */
-    readonly ports: MessagePort[];
-}
-
-/**
- * The parameter passed into the oninstall handler, the InstallEvent interface
- * represents an install action that is dispatched on the
- * ServiceWorkerGlobalScope of a ServiceWorker. As a child of ExtendableEvent,
- * it ensures that functional events such as FetchEvent are not dispatched
- * during installation.
- */
-interface InstallEvent extends ExtendableEvent {
-    /**
-     * Returns the ServiceWorker that is currently actively controlling the page.
-     */
-    readonly activeWorker: ServiceWorker;
-}
-
-/**
- * The parameter passed into the onnotificationclick handler,
- * the NotificationEvent interface represents
- * a notification click event that is dispatched on
- * the ServiceWorkerGlobalScope of a ServiceWorker.
- */
-interface NotificationEvent extends ExtendableEvent {
-    /**
-     * Returns a Notification object representing
-     * the notification that was clicked to fire the event.
-     */
-    notification: any; // need to be replaced with `Notification` when possible
-
-    /**
-     * Returns the string ID of the notification button the user clicked.
-     * This value returns undefined if the user clicked
-     * the notification somewhere other than an action button,
-     * or the notification does not have a button.
-     */
-    action: string;
-}
-
-/**
- * The PushEvent interface of the Push API represents
- * a push message that has been received.
- * This event is sent to the global scope of a ServiceWorker.
- * It contains the information sent from an application server to a PushSubscription.
- */
-interface PushEvent extends ExtendableEvent {
-    /**
-     * Returns a reference to a PushMessageData object containing
-     * data sent to the PushSubscription.
-     */
-    readonly data: PushMessageData;
-}
-
-interface ServiceWorkerContainerEventMap {
-    "message": MessageEvent;
-    "error": ErrorEvent;
-    "controllerchange": Event;
-}
-
-interface ServiceWorkerEventMap {
-    "activate": ExtendableEvent;
-    "fetch": FetchEvent;
-    "install": InstallEvent;
-    // "message": ExtendableMessageEvent;
-    "message": MessageEvent;
-    "notificationclick": NotificationEvent;
-    "push": PushEvent;
-    "pushsubscriptionchang": PushEvent;
-}
-
-/**
- * Represents a service worker registration.
- */
-interface ServiceWorkerRegistration extends EventTarget {
-    /**
-     * Returns a unique identifier for a service worker registration.
-     * This must be on the same origin as the document that registers
-     * the ServiceWorker.
-     */
-    readonly scope: any;
-
-    /**
-     * Returns a service worker whose state is installing. This is initially
-     * set to null.
-     */
-    readonly installing: ServiceWorker;
-
-    /**
-     * Returns a service worker whose state is installed. This is initially
-     * set to null.
-     */
-    readonly waiting: ServiceWorker;
-
-    /**
-     * Returns a service worker whose state is either activating or activated.
-     * This is initially set to null. An active worker will control a
-     * ServiceWorkerClient if the client's URL falls within the scope of the
-     * registration (the scope option set when ServiceWorkerContainer.register
-     * is first called).
-     */
-    readonly active: ServiceWorker;
-
-    /**
-     * Returns an interface to for managing push subscriptions, including
-     * subcribing, getting an anctive subscription, and accessing push
-     * permission status.
-     */
-    readonly pushManager: PushManager;
-
-    /**
-     * An EventListener property called whenever an event of type updatefound
-     * is fired; it is fired any time the ServiceWorkerRegistration.installing
-     * property acquires a new service worker.
-     */
-    onupdatefound: () => void;
-
-    /**
-     * Allows you to update a service worker.
-     */
-    update(): void;
-
-    /**
-     * Unregisters the service worker registration and returns a promise
-     * (see Promise). The service worker will finish any ongoing operations
-     * before it is unregistered.
-     */
-    unregister(): Promise<boolean>;
-
-    /**
-     * Returns a Promise that resolves to an array of Notification objects.
-     * @param [options] An options object that can contain options to filter the notifications returned.
-     */
-    getNotifications(options?: ServiceWorkerGetNotificationOptions): Promise<any[]>; // need to be replaced with `Notification[]` when possible
-
-    /**
-     * Displays the notification with the requested title.
-     * @param [title] The title that must be shown within the notification
-     * @param [options] An object that allows to configure the notification.
-     */
-    showNotification(title: string, options?: ServiceWorkerNotificationOptions): Promise<NotificationEvent>;
-}
-
-/**
- * An options object to provide options upon a ServiceWorkerRegistration.
- * @param [scope] A USVString representing a URL that defines a service worker's registration scope; what range of
- * URLs a service worker can control. This is usually a relative URL, and it defaults to '/' when not specified.
- */
-interface ServiceWorkerRegisterOptions {
-    scope: string;
-}
-
-/**
- * Action to display in a notification.
- * @param [action] A DOMString identifying a user action to be displayed on the notification.
- * @param [title] A DOMString containing action text to be shown to the user.
- * @param [icon] A USVString containg the URL of an icon to display with the action.
- */
-interface NotificationAction { // TODO: Maybe need to moved if NotificationApi types are defined
-    action: string;
-    title: string;
-    icon?: string;
-}
-
-/**
- * Object that allows to configure a notification.
- * @param [actions] An array of actions to display in the notification.
- * Appropriate responses are built using event.action within the notificationclick event.
- * @param [badge] The URL of an image to represent the notification when there is not enough space to display the
- * notification itself such as, for example, the Android Notification Bar. On Android devices, the badge should
- * accommodate devices up to 4x resolution, about 96 by 96 px, and the image will be automatically masked.
- * @param [body] A string representing an extra content to display within the notification.
- * @param [dir] The direction of the notification; it can be auto, ltr, or rtl.
- * @param [icon] The URL of an image to be used as an icon by the notification.
- * @param [image] A USVSTring containing the URL of an image to be displayed in the notification.
- * @param [lang] Specify the lang used within the notification. This string must be a valid BCP 47 language tag.
- * @param [renotify] A boolean that indicates whether to supress vibrations and audible alerts when resusing a tag
- * value. The default is false.
- * @param [requireInteraction] Indicates that on devices with sufficiently large screens, a notification should remain
- * active until the user clicks or dismisses it. If this value is absent or false, the desktop version of Chrome
- * will auto-minimize notifications after approximately twenty seconds. The default value is false.
- * @param [tag] An ID for a given notification that allows you to find, replace, or remove the notification using
- * script if necessary.
- * @param [vibrate]  A vibration pattern to run with the display of the notification. A vibration pattern can be an
- * array with as few as one member. The values are times in milliseconds where the even indices (0, 2, 4, etc.) indicate
- * how long to vibrate and the odd indices indicate how long to pause. For example [300, 100, 400] would vibrate
- * 300ms, pause 100ms, then vibrate 400ms.
- * @param [data] Arbitrary data that you want associated with the notification. This can be of any data type.
- */
-interface ServiceWorkerNotificationOptions {
-    actions?: NotificationAction[];
-    badge?: string;
-    body?: string;
-    dir?: 'auto' | 'ltr' | 'rtl';
-    icon?: string;
-    lang?: string;
-    renotify?: boolean;
-    requireInteraction?: boolean;
-    tag?: string;
-    vibrate?: number[];
-    data?: any;
-}
-
-/**
- * An options object that can contain options to filter notifications.
- * @param [tag] A DOMString representing a notification tag. If specified, only notifications that have this tag
- * will be returned.
- */
-interface ServiceWorkerGetNotificationOptions {
-    tag: string;
-}
-
-/**
- * Provides an object representing the service worker as an overall unit in the
- * network ecosystem, including facilities to register, unregister and update
- * service workers, and access the state of service workers
- * and their registrations.
- */
-interface ServiceWorkerContainer extends EventTarget {
-    /**
-     * Returns a ServiceWorker object if its state is activated (the same object
-     * returned by ServiceWorkerRegistration.active). This property returns null
-     * if the request is a force refresh (Shift + refresh) or if there is no
-     * active worker.
-     */
-    readonly controller: ServiceWorker;
-
-    /**
-     * Defines whether a service worker is ready to control a page or not.
-     * It returns a Promise that will never reject, which resolves to a
-     * ServiceWorkerRegistration with an ServiceWorkerRegistration.active worker.
-     */
-    readonly ready: Promise<ServiceWorkerRegistration>;
-
-    /**
-     * An event handler fired whenever a controllerchange event occurs — when
-     * the document's associated ServiceWorkerRegistration acquires a new
-     * ServiceWorkerRegistration.active worker.
-     */
-    oncontrollerchange: (controllerchangeevent: Event) => void;
-
-    /**
-     * An event handler fired whenever an error event occurs in the associated
-     * service workers.
-     */
-    onerror: (errorevent: ErrorEvent) => void;
-
-    /**
-     * An event handler fired whenever a message event occurs — when incoming
-     * messages are received to the ServiceWorkerContainer object (e.g. via a
-     * MessagePort.postMessage() call.)
-     */
-    onmessage: (messageevent: MessageEvent) => void;
-
-    /**
-     * Creates or updates a ServiceWorkerRegistration for the given scriptURL.
-     *
-     * @param scriptURL The URL of the service worker script.
-     * @param [options] An options object to provide options upon registration.
-     */
-    register(scriptURL: string, options?: ServiceWorkerRegisterOptions): Promise<ServiceWorkerRegistration>;
-
-    /**
-     * Gets a ServiceWorkerRegistration object whose scope URL matches the
-     * provided document URL.  If the method can't return a
-     * ServiceWorkerRegistration, it returns a Promise.
-     *
-     * @param [scope] A unique identifier for a service worker registration — the
-     * scope URL of the registration object you want to return. This is usually
-     * a relative URL.
-     */
-    getRegistration(scope?: string): Promise<ServiceWorkerRegistration>;
-
-    /**
-     * Returns all ServiceWorkerRegistrations associated with a
-     * ServiceWorkerContainer in an array.  If the method can't return
-     * ServiceWorkerRegistrations, it returns a Promise.
-     */
-    getRegistrations(): Promise<ServiceWorkerRegistration[]>;
-
-    addEventListener<K extends keyof ServiceWorkerContainerEventMap>(
-        type: K,
-        listener: (event: ServiceWorkerContainerEventMap[K]) => any,
-        useCapture?: boolean
-    ): void;
-}
-
-interface ServiceWorkerGlobalScope extends EventTarget {
-    /**
-     * Contains the CacheStorage object associated with the service worker.
-     */
-    readonly caches: CacheStorage;
-    /**
-     * Contains the Clients object associated with the service worker.
-     */
-    readonly clients: ServiceWorkerClients;
-
-    /**
-     * Contains the ServiceWorkerRegistration object that represents the
-     * service worker's registration.
-     */
-    readonly registration: ServiceWorkerRegistration;
-
-    /**
-     * An event handler fired whenever an activate event occurs — when a
-     * ServiceWorkerRegistration acquires a new ServiceWorkerRegistration.active
-     * worker.
-     */
-    onactivate: (activateevent: ExtendableEvent) => void;
-
-    /**
-     * An event handler fired whenever a fetch event occurs — when a fetch()
-     * is called.
-     */
-    onfetch: (fetchevent: FetchEvent) => void;
-
-    /**
-     * An event handler fired whenever an install event occurs — when a
-     * ServiceWorkerRegistration acquires a new
-     * ServiceWorkerRegistration.installing worker.
-     */
-    oninstall: (installevent: InstallEvent) => void;
-
-    /**
-     * An event handler fired whenever a message event occurs — when incoming
-     * messages are received. Controlled pages can use the
-     * MessagePort.postMessage() method to send messages to service workers.
-     * The service worker can optionally send a response back via the
-     * MessagePort exposed in event.data.port, corresponding to the controlled
-     * page.
-     *
-     * `onmessage` is actually fired with `ExtendableMessageEvent`, but
-     * since we are merging the interface into `Window`, we should
-     * make sure it's compatible with `window.onmessage`
-     */
-    // onmessage: (messageevent: ExtendableMessageEvent) => void;
-    onmessage: (messageevent: MessageEvent) => void;
-
-    /**
-     * An event handler fired whenever a notificationclick event occurs — when
-     * a user clicks on a displayed notification.
-     */
-    onnotificationclick: (notificationclickevent: NotificationEvent) => void;
-
-    /**
-     * An event handler fired whenever a push event occurs — when a server
-     * push notification is received.
-     */
-    onpush: (onpushevent: PushEvent) => void;
-
-    /**
-     * An event handler fired whenever a pushsubscriptionchange event occurs —
-     * when a push subscription has been invalidated, or is about to be
-     * invalidated (e.g. when a push service sets an expiration time).
-     */
-    onpushsubscriptionchange: (pushsubscriptionchangeevent: PushEvent) => void;
-
-    /**
-     * Allows the current service worker registration to progress from waiting
-     * to active state while service worker clients are using it.
-     */
-    skipWaiting(): Promise<void>;
-
-    addEventListener<K extends keyof ServiceWorkerEventMap>(
-        type: K,
-        listener: (event: ServiceWorkerEventMap[K]) => any,
-        useCapture?: boolean
-    ): void;
-}
-
-interface Navigator {
-    /**
-     * Returns a ServiceWorkerContainer object, which provides access to
-     * registration, removal, upgrade, and communication with the ServiceWorker
-     * objects for the associated document.
-     */
-    serviceWorker: ServiceWorkerContainer;
-}
-
-// tslint:disable-next-line no-empty-interface
-interface Window extends ServiceWorkerGlobalScope {}
diff --git a/service_worker_api/service_worker_api-tests.ts b/service_worker_api/service_worker_api-tests.ts
deleted file mode 100644
index 27c2b85c20..0000000000
--- a/service_worker_api/service_worker_api-tests.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-var OFFLINE_CACHE = "cache_test";
-var OFFLINE_URL = "localhost";
-
-self.addEventListener('fetch', (event: FetchEvent) => {
-    if (event.request.method === 'GET' &&
-        event.request.headers.get('accept').indexOf('text/html') !== -1) {
-        console.log('Handling fetch event for', event.request.url);
-        event.respondWith(
-            self.fetch(event.request).catch(e => {
-                console.error('Fetch failed; returning offline page instead.', e);
-                return self.caches.open(OFFLINE_CACHE).then((cache: Cache) => {
-                    return cache.match(OFFLINE_URL);
-                });
-            })
-        );
-    }
-});
-
-self.caches.open('v1').then((cache: Cache) => {
-    cache.matchAll('/images/').then((response: Response[]) => {
-        response.forEach((element, index, array) => {
-            cache.delete(element.url);
-        });
-    });
-});
-
-self.addEventListener('install', (event: InstallEvent) => {
-    event.waitUntil(
-        self.caches.open('v1').then((cache: Cache) => {
-            return cache.add('/sw-test/index.html');
-        })
-    );
-});
-
-self.addEventListener('install', (event: InstallEvent) => {
-    event.waitUntil(
-        self.caches.open('v1').then(cache => {
-            return cache.addAll([
-                '/sw-test/',
-                '/sw-test/index.html',
-                '/sw-test/style.css',
-                '/sw-test/app.js',
-                '/sw-test/image-list.js',
-                '/sw-test/star-wars-logo.jpg',
-                '/sw-test/gallery/',
-                '/sw-test/gallery/bountyHunters.jpg',
-                '/sw-test/gallery/myLittleVader.jpg',
-                '/sw-test/gallery/snowTroopers.jpg'
-            ]);
-        })
-    );
-});
-
-self.addEventListener('fetch', (event: FetchEvent) => {
-    var cachedResponse = self.caches.match(event.request).then(response => {
-      if (response) {
-          return response;
-      }
-    }).catch(() => {
-        return self.fetch(event.request).then(response => {
-            return self.caches.open('v1').then(cache => {
-                cache.put(event.request, response.clone());
-                return response;
-            });
-        });
-    }).catch(() => {
-        return self.caches.match('/sw-test/gallery/myLittleVader.jpg');
-    });
-
-    event.respondWith(cachedResponse);
-});
-
-self.caches.open('v1').then(cache => {
-    cache.match('/images/image.png').then(response => {
-        cache.delete(response.url);
-    });
-});
-
-self.caches.open('v1').then(cache => {
-    cache.keys().then(response => {
-        response.forEach((element, index, array) => {
-            cache.delete(element);
-        });
-    });
-});
-
-self.caches.has('v1').then(() => {
-    self.caches.delete('v1').then(() => {
-        console.log('done');
-    });
-});
-
-self.addEventListener('activate', (event: ExtendableEvent) => {
-    var cacheWhitelist = ['v2'];
-
-    event.waitUntil(
-        self.caches.keys().then(keyList => {
-            for (var item of keyList) {
-                if (cacheWhitelist.indexOf(item) === -1) {
-                    return self.caches.delete(item);
-                }
-            }
-        })
-    );
-});
-
-function sendMessage(message: any) {
-    return new Promise((resolve, reject) => {
-        var messageChannel = new MessageChannel();
-        messageChannel.port1.onmessage = event => {
-            if (event.data.error) {
-                reject(event.data.error);
-            } else {
-                resolve(event.data);
-            }
-        };
-        navigator.serviceWorker.controller.postMessage(message, [messageChannel.port2]);
-    });
-}
-
-self.addEventListener('message', (evt: ExtendableMessageEvent) => {
-    evt.ports[0].postMessage(evt.source.id);
-});
-
-sendMessage('test').then((clientId: string) => {
-    console.log(clientId);
-});
-
-self.clients.matchAll({type: "test"}).then(clients => {
-    for (var cli of clients) {
-        if (cli.url === 'index.html') {
-            self.clients.openWindow(cli.url);
-            // or do something else involving the matching client
-        }
-    }
-});
-
-self.addEventListener('activate', (e: ExtendableEvent) => {
-    e.waitUntil(self.clients.claim());
-});
-
-navigator.serviceWorker.register('service-worker.js', {scope: './'}).then(registration => {
-    // At this point, registration has taken place.
-    // The service worker will not handle requests until this page and any
-    // other instances of this page (in other tabs, etc.) have been
-    // closed/reloaded.
-    var serviceWorker: ServiceWorker;
-    if (registration.installing) {
-        serviceWorker = registration.installing;
-    } else if (registration.waiting) {
-        serviceWorker = registration.waiting;
-    } else if (registration.active) {
-        serviceWorker = registration.active;
-    }
-    if (serviceWorker) {
-        console.log(serviceWorker.state);
-        serviceWorker.addEventListener('statechange', (e: any) => {
-            console.log(e.target.state);
-        });
-    }
-}).catch(error => {
-    // Something went wrong during registration. The service-worker.js file
-    // might be unavailable or contain a syntax error.
-
-});
-
-navigator.serviceWorker.getRegistration('/app').then((registration: ServiceWorkerRegistration) => {
-    console.log(registration);
-});
-
-navigator.serviceWorker.getRegistrations().then((registrations: ServiceWorkerRegistration[]) => {
-    console.log(registrations);
-});
-
-self.registration.unregister();
-
-self.addEventListener('install', (event: ExtendableEvent) => {
-    event.waitUntil(self.skipWaiting());
-});
-
-self.addEventListener('notificationclick', (event: NotificationEvent) => {
-    console.log('On notification click: ', event.notification.tag);
-    event.notification.close();
-
-    // This looks to see if the current is already open and
-    // focuses if it is
-    event.waitUntil(self.clients.matchAll({
-        type: "window"
-    }).then(clientList => {
-        if (self.clients.openWindow)
-            return self.clients.openWindow('/');
-    }));
-});
-
-navigator.serviceWorker.ready.then(function(registration) {
-    registration.showNotification('Notification Sample', {
-        body: 'This is a sample notification!',
-        icon: '/sw-test/star-wars-logo.jpg',
-        tag: 'notification-sample'
-    });
-});
-
-self.registration.getNotifications({tag: 'notification-sample'})
-    .then(function(notifications) {
-        console.log(notifications);
-    });
diff --git a/session-file-store/index.d.ts b/session-file-store/index.d.ts
new file mode 100644
index 0000000000..f8238cf109
--- /dev/null
+++ b/session-file-store/index.d.ts
@@ -0,0 +1,287 @@
+// Type definitions for express session-file-store 1.0
+// Project: https://github.com/valery-barysok/session-file-store
+// Definitions by: Gevik Babakhani <https://github.com/blendsdk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="express-session" />
+
+
+export = FileStore;
+
+declare namespace FileStore {
+
+    /**
+     * FileStore Options
+     *
+     * @interface Options
+     */
+    interface Options {
+
+        /**
+         * The directory where the session files will be stored. Defaults to `./sessions`
+         *
+         * @type {string}
+         * @memberOf Options
+         */
+        path?: string;
+
+        /**
+         * Session time to live in seconds. Defaults to `3600`
+         *
+         * @type {number}
+         * @memberOf Options
+         */
+        ttl?: number;
+
+        /**
+         * The number of retries to get session data from a session file. Defaults to `5`
+         *
+         * @type {number}
+         * @memberOf Options
+         */
+        retries?: number;
+
+        /**
+         * The exponential factor to use for retry. Defaults to `1`
+         *
+         * @type {number}
+         * @memberOf Options
+         */
+        factor?: number;
+
+        /**
+         * The number of milliseconds before starting the first retry. Defaults to `50`
+         *
+         * @type {number}
+         * @memberOf Options
+         */
+        minTimeout?: number;
+
+        /**
+         * The maximum number of milliseconds between two retries. Defaults to `100`
+         *
+         * @type {number}
+         * @memberOf Options
+         */
+        maxTimeout?: number;
+
+        /**
+         * [OUT] Contains intervalObject if reap was scheduled
+         *
+         * @type {*}
+         * @memberOf Options
+         */
+        reapIntervalObject?: any;
+
+        /**
+         * Interval to clear expired sessions in seconds or -1 if do not need. Defaults to `1 hour`
+         *
+         * @type {number}
+         * @memberOf Options
+         */
+        reapInterval?: number;
+
+        /**
+         * Undocumented
+         *
+         * @type {number}
+         * @memberOf Options
+         */
+        reapMaxConcurrent?: number;
+
+        /**
+         * Use distinct worker process for removing stale sessions. Defaults to `false`
+         *
+         * @type {boolean}
+         * @memberOf Options
+         */
+        reapAsync?: boolean;
+
+        /**
+         * Reap stale sessions synchronously if can not do it asynchronously. Default to `false`
+         *
+         * @type {boolean}
+         * @memberOf Options
+         */
+        reapSyncFallback?: boolean;
+
+        /**
+         * Log messages. Defaults to `console.log`
+         *
+         * @type {Function}
+         * @memberOf Options
+         */
+        logFn?: (...args: any[]) => void;
+
+        /**
+         * Returns fallback session object after all failed retries. No defaults
+         *
+         * @type {Function}
+         * @memberOf Options
+         */
+        fallbackSessionFn?: (...args: any[]) => void;
+
+        /**
+         * Object-to-text text encoding. Can be null. Defaults to `'utf8'`
+         *
+         * @type {string}
+         * @memberOf Options
+         */
+        encoding?: string;
+
+        /**
+         * Encoding function. Takes object, returns encoded data. Defaults to `JSON.stringify`
+         *
+         * @type {Function}
+         * @memberOf Options
+         */
+        encoder?: (...args: any[]) => void;
+
+        /**
+         * Decoding function. Takes encoded data, returns object. Defaults to `JSON.parse`
+         *
+         * @type {Function}
+         * @memberOf Options
+         */
+        decoder?: (...args: any[]) => void;
+
+        /**
+         * If secret string is specified then enables encryption of the session before
+         * writing the file and also decryption when reading it.
+         *
+         * @type {string}
+         * @memberOf Options
+         */
+        secret?: string;
+
+        /**
+         * Encryption output encoding. Defaults to `'hex'`
+         *
+         * @type {string}
+         * @memberOf Options
+         */
+        encryptEncoding?: string;
+
+        /**
+         * File extension of saved files. Defaults to `'.json'`
+         *
+         * @type {string}
+         * @memberOf Options
+         */
+        fileExtension?: string;
+
+        /**
+         * Undocumented
+         *
+         * @type {RegExp}
+         * @memberOf Options
+         */
+        filePattern?: RegExp;
+
+        /**
+         * Encryption key retrieval function. Takes secret andsession id, returns key.
+         * Defaults to `function(secret, sessionId){return secret + sessionId;}`
+         *
+         *
+         * @memberOf Options
+         */
+        keyFunction?: (secret: string, sessionId: string) => string;
+    }
+}
+
+/**
+ * Session file store is a provision for storing session data in
+ * the session file
+ *
+ * @class FileStore
+ */
+declare class FileStore {
+
+    /**
+     * Creates an instance of FileStore.
+     * @param {FileStore.Options} options
+     *
+     * @memberOf FileStore
+     */
+    constructor(options: FileStore.Options);
+
+    /**
+     * Attempts to fetch session from a session file by the given `sessionId`
+     *
+     * @param {string} sessionId
+     * @param {(err: any, session: Express.Session) => void} callback
+     *
+     * @memberOf FileStore
+     */
+    get(sessionId: string, callback: (err: any, session: Express.Session) => void): void;
+
+    /**
+     * Attempts to commit the given session associated with the given `sessionId` to a session file
+     *
+     * @param {string} sessionId
+     * @param {Express.Session} session
+     * @param {(err: any) => void} callback
+     *
+     * @memberOf FileStore
+     */
+    set(sessionId: string, session: Express.Session, callback: (err: any) => void): void;
+
+    /**
+     * Touch the given session object associated with the given `sessionId`
+     *
+     * @param {string} sessionId
+     * @param {Express.Session} session
+     * @param {(err: any) => void} callback
+     *
+     * @memberOf FileStore
+     */
+    touch(sessionId: string, session: Express.Session, callback: (err: any) => void): void;
+
+    /**
+     * Attempts to unlink a given session by its id
+     *
+     * @param {string} sessionId
+     * @param {(err: any) => void} callback
+     *
+     * @memberOf FileStore
+     */
+    destroy(sessionId: string, callback: (err: any) => void): void;
+
+    /**
+     * Attempts to fetch number of the session files
+     *
+     * @param {(err: any, length: number) => void} callback
+     *
+     * @memberOf FileStore
+     */
+    length(callback: (err: any, length: number) => void): void;
+
+    /**
+     * Attempts to clear out all of the existing session files
+     *
+     * @param {(err: any) => void} callback
+     *
+     * @memberOf FileStore
+     */
+    clear(callback: (err: any) => void): void;
+
+    /**
+     *
+     *
+     * @param {(err: any, files: Array<string>) => void} callback
+     *
+     * @memberOf FileStore
+     */
+    list(callback: (err: any, files: string[]) => void): void;
+
+    /**
+     * Attempts to detect whether a session file is already expired or not
+     *
+     * @param {string} sessionId
+     * @param {(errr: any, isExpired: boolean) => void} callback
+     *
+     * @memberOf FileStore
+     */
+    expired(sessionId: string, callback: (errr: any, isExpired: boolean) => void): void;
+
+}
diff --git a/session-file-store/session-file-store-tests.ts b/session-file-store/session-file-store-tests.ts
new file mode 100644
index 0000000000..ffe3c79bee
--- /dev/null
+++ b/session-file-store/session-file-store-tests.ts
@@ -0,0 +1,13 @@
+import FileStore = require("session-file-store");
+
+const options: FileStore.Options = {
+    path: "./tmp/sessions/",
+    logFn: (a: string) => {
+    }
+};
+
+const sessionStore = new FileStore(options);
+
+sessionStore.list((err: any, file: Array<string>) => {
+
+});
\ No newline at end of file
diff --git a/session-file-store/tsconfig.json b/session-file-store/tsconfig.json
new file mode 100644
index 0000000000..9fd97e3168
--- /dev/null
+++ b/session-file-store/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "session-file-store-tests.ts"
+    ]
+}
diff --git a/session-file-store/tslint.json b/session-file-store/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/session-file-store/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/shelljs/shelljs-tests.ts b/shelljs/shelljs-tests.ts
index 6c155e5aee..03f439af02 100644
--- a/shelljs/shelljs-tests.ts
+++ b/shelljs/shelljs-tests.ts
@@ -1,11 +1,5 @@
-// Tests for shelljs.d.ts
-// Project: http://shelljs.org
-// Definitions by: Niklas Mollenhauer <https://github.com/nikeee>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Tests taken from documentation samples.
 
-///<reference types="node" />
-
 import shell = require("shelljs");
 
 if (!shell.which("git"))
diff --git a/sinon-as-promised/index.d.ts b/sinon-as-promised/index.d.ts
index ab75217011..5efe4df979 100644
--- a/sinon-as-promised/index.d.ts
+++ b/sinon-as-promised/index.d.ts
@@ -6,17 +6,22 @@
 import * as s from "sinon";
 
 declare module "sinon" {
-  interface SinonStub {
-
-    /**
-     * When called, the stub will return a "thenable" object which will return a promise for the provided value. Any Promises/A+ compliant library will handle this object properly.
-     */
-    resolves(value:any):SinonStub;
-
-    /**
-     * When called, the stub will return a thenable which ill return a reject promise with the provided err. If err is a string, it will be set as the message on an Error object.
-     */
-    rejects(err:any):SinonStub;
-  }
+    interface SinonStub {
+        /**
+         * Causes the stub to resolve with the provided value.
+         * 
+         * @param value   Resolve value.
+         * @remarks Any Promises/A+ compliant library will handle this object properly.
+         */
+        resolves<T>(value: T): SinonStub;
 
+        /**
+         * Causes the stub to reject with the provided error.
+         * 
+         * @param error   Rejection error.
+         * @returns A thenable which will return a rejected promise with the provided error.
+         * @remarks If error is a string, it will be set as the message on an Error object.
+         */
+        rejects(error: any): SinonStub;
+    }
 }
diff --git a/sinon-as-promised/sinon-as-promised-tests.ts b/sinon-as-promised/sinon-as-promised-tests.ts
index 10602a3e8d..4663c1df12 100644
--- a/sinon-as-promised/sinon-as-promised-tests.ts
+++ b/sinon-as-promised/sinon-as-promised-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="sinon"/>
-
 function testResolve() {
     sinon.stub().resolves('test val');
 }
diff --git a/sinon-mongoose/sinon-mongoose-tests.ts b/sinon-mongoose/sinon-mongoose-tests.ts
index b58a4e5e58..c64030240e 100644
--- a/sinon-mongoose/sinon-mongoose-tests.ts
+++ b/sinon-mongoose/sinon-mongoose-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="sinon"/>
-
 function testChain() {
     sinon.stub().chain('exec');
 }
diff --git a/sinon/index.d.ts b/sinon/index.d.ts
index 7c44ab9d7a..e4ba1ad612 100644
--- a/sinon/index.d.ts
+++ b/sinon/index.d.ts
@@ -102,6 +102,7 @@ declare namespace Sinon {
         throws(type?: string): SinonStub;
         throws(obj: any): SinonStub;
         callsArg(index: number): SinonStub;
+        callThrough(): SinonStub;
         callsArgOn(index: number, context: any): SinonStub;
         callsArgWith(index: number, ...args: any[]): SinonStub;
         callsArgOnWith(index: number, context: any, ...args: any[]): SinonStub;
diff --git a/slick-carousel/slick-carousel-tests.ts b/slick-carousel/slick-carousel-tests.ts
index 5cb75a619d..3cf05a2e0c 100644
--- a/slick-carousel/slick-carousel-tests.ts
+++ b/slick-carousel/slick-carousel-tests.ts
@@ -1,7 +1,3 @@
-///<reference types="jquery" />
-///<reference types="slick-carousel" />
-
-
 // --------------------------------------------------------
 // ------------------- WEBSITE EXAMPLE --------------------
 // ---------- http://kenwheeler.github.io/slick/ ----------
diff --git a/slickgrid/test/index.ts b/slickgrid/test/index.ts
index e6570c2985..d87bc2240c 100644
--- a/slickgrid/test/index.ts
+++ b/slickgrid/test/index.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 interface MyData extends Slick.SlickData {
 	title: string;
 	duration: string;
diff --git a/socket.io-redis/socket.io-redis-tests.ts b/socket.io-redis/socket.io-redis-tests.ts
index 28b0f9873f..6ced0b31de 100644
--- a/socket.io-redis/socket.io-redis-tests.ts
+++ b/socket.io-redis/socket.io-redis-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="socket.io"/>
-
 import socketIO = require('socket.io');
 import ioRedis = require('socket.io-redis');
 import redis = require('redis');
diff --git a/socket.io.users/socket.io.users-tests.ts b/socket.io.users/socket.io.users-tests.ts
index 565f6a7d7b..24557ef6c5 100644
--- a/socket.io.users/socket.io.users-tests.ts
+++ b/socket.io.users/socket.io.users-tests.ts
@@ -1,7 +1,3 @@
-/// <reference types="socket.io"/>
-
-/// <reference types="node" />
-
 var express = require('express');
 var app = express();
 var httpServer = require('http').createServer(app);
diff --git a/source-list-map/source-list-map-tests.ts b/source-list-map/source-list-map-tests.ts
index 5fe932efc5..8c367d582c 100644
--- a/source-list-map/source-list-map-tests.ts
+++ b/source-list-map/source-list-map-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./index.d.ts" />
 import * as slm from 'source-list-map';
 
 const node = new slm.CodeNode('hello');
diff --git a/sparkpost/index.d.ts b/sparkpost/index.d.ts
index c88fab5d92..fc6e408949 100644
--- a/sparkpost/index.d.ts
+++ b/sparkpost/index.d.ts
@@ -1,9 +1,8 @@
-// Type definitions for sparkpost v1.3
+// Type definitions for sparkpost 2.1
 // Project: https://github.com/SparkPost/node-sparkpost
-// Definitions by: Joshua DeVinney <https://github.com/geoffreak>
+// Definitions by: Joshua DeVinney <https://github.com/geoffreak>, Bond <https://github.com/bondz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="request"/>
 /// <reference types="node"/>
 
 import * as Request from "request";
@@ -16,25 +15,48 @@ declare class SparkPost {
          * List all your inbound domains.
          * @param callback The request callback with Domain results array
          */
-        all(callback: SparkPost.ResultsCallback<SparkPost.Domain[]>): void;
+        list(callback: SparkPost.ResultsCallback<SparkPost.Domain[]>): void;
+        /**
+         * List all your inbound domains.
+         * @returns Promise The Domain results array
+         */
+        list(): SparkPost.ResultsPromise<SparkPost.Domain[]>;
         /**
          * Retrieve an inbound domain by specifying its domain name in the URI path.
          * @param domain Domain name
          * @param callback The request callback with Domain results
          */
-        find(domain: string, callback: SparkPost.ResultsCallback<SparkPost.Domain>): void;
+        get(domain: string, callback: SparkPost.ResultsCallback<SparkPost.Domain>): void;
+        /**
+         * Retrieve an inbound domain by specifying its domain name in the URI path.
+         * @param domain Domain name
+         * @returns Promise The Domain results
+         */
+        get(domain: string): SparkPost.ResultsPromise<SparkPost.Domain>;
         /**
          * Create an inbound domain by providing an inbound domains object as the POST request body.
-         * @param domain Domain name
+         * @param createOpts a hash of [inbound domain attributes]{@link https://developers.sparkpost.com/api/inbound-domains#header-inbound-domains-attributes}
          * @param callback The request callback
          */
-        create(domain: string, callback: SparkPost.Callback<void>): void;
+        create(createOpts: SparkPost.CreateOpts, callback: SparkPost.Callback<void>): void;
+        /**
+         * Create an inbound domain by providing an inbound domains object as the POST request body.
+         * @param createOpts a hash of [inbound domain attributes]{@link https://developers.sparkpost.com/api/inbound-domains#header-inbound-domains-attributes}
+         * @returns Promise void
+         */
+        create(createOpts: SparkPost.CreateOpts): Promise<void>;
         /**
          * Delete an inbound domain by specifying its domain name in the URI path.
          * @param domain Domain name
          * @param callback The request callback
          */
         delete(domain: string, callback: SparkPost.Callback<void>): void;
+        /**
+         * Delete an inbound domain by specifying its domain name in the URI path.
+         * @param domain Domain name
+         * @returns Promise void
+         */
+        delete(domain: string): Promise<void>;
     };
     /** The Message Events API provides the means to search the raw events generated by SparkPost. */
     messageEvents: {
@@ -44,29 +66,57 @@ declare class SparkPost {
          * @param callback The request callback with MessageEvent results array
          */
         search(parameters: SparkPost.MessageEventParameters, callback: SparkPost.ResultsCallback<SparkPost.MessageEvent[]>): void;
+        /**
+         * Retrieves list of message events according to given params
+         * @param parameters Query parameters
+         * @returns Promise The MessageEvent results array
+         */
+        search(parameters: SparkPost.MessageEventParameters): SparkPost.ResultsPromise<SparkPost.MessageEvent[]>;
     };
     /** A recipient list is a collection of recipients that can be used in a transmission. */
     recipientLists: {
         /**
          * List a summary of all recipient lists. The recipients for each list are not included in the results.
-         * To retrieve recipient details, use the RETRIEVE API for a specified recipient list.
+         * To retrieve recipient details, use the [Retrieve a Recipient List endpoint]{@link https://developers.sparkpost.com/api/recipient-lists.html#recipient-lists-retrieve-get},
+         * and specify the recipient list.
+         *
          * @param callback The request callback with RecipientList results array
          */
-        all(callback: SparkPost.ResultsCallback<SparkPost.RecipientList[]>): void;
+        list(callback: SparkPost.ResultsCallback<SparkPost.RecipientList[]>): void;
+        /**
+         * List a summary of all recipient lists. The recipients for each list are not included in the results.
+         * To retrieve recipient details, use the [Retrieve a Recipient List endpoint]{@link https://developers.sparkpost.com/api/recipient-lists.html#recipient-lists-retrieve-get},
+         * and specify the recipient list.
+         *
+         * @returns Promise The RecipientList results array
+         */
+        list(): SparkPost.ResultsPromise<SparkPost.RecipientList[]>;
         /**
          * Retrieve details about a specified recipient list by specifying its id in the URI path.
          * To retrieve the recipients contained in a list, the show_recipients parameter must be set to true.
-         * @param options The find options
-         * @param callback The request callback with RecipientList results
+         *
+         * @param {string} id
+         * @param {{ show_recipients?: boolean }} specifies whether to retrieve the recipients. Defaults to false
+         * @param {SparkPost.Callback<SparkPost.RecipientListWithRecipients>} callback
          */
-        find(options: { id: string, show_recipients?: false }, callback: SparkPost.Callback<SparkPost.RecipientList>): void;
+        get(id: string, options: { show_recipients?: boolean }, callback: SparkPost.Callback<SparkPost.RecipientListWithRecipients>): void;
         /**
          * Retrieve details about a specified recipient list by specifying its id in the URI path.
          * To retrieve the recipients contained in a list, the show_recipients parameter must be set to true.
-         * @param options The find options
-         * @param callback The request callback with RecipientList results (with recipients)
+         *
+         * @param {string} id
+         * @param {SparkPost.Callback<SparkPost.RecipientListWithRecipients>} callback
          */
-        find(options: { id: string, show_recipients: true }, callback: SparkPost.Callback<SparkPost.RecipientListWithRecipients>): void;
+        get(id: string, callback: SparkPost.Callback<SparkPost.RecipientListWithRecipients>): void;
+        /**
+         * Retrieve details about a specified recipient list by specifying its id in the URI path.
+         * To retrieve the recipients contained in a list, the show_recipients parameter must be set to true.
+         *
+         * @param {string} id
+         * @param {{ show_recipients?: boolean }} [options] specifies whether to retrieve the recipients. Defaults to false
+         * @returns {Promise<SparkPost.RecipientListWithRecipients>}
+         */
+        get(id: string, options?: { show_recipients?: boolean }): SparkPost.ResultsPromise<SparkPost.RecipientListWithRecipients>;
         /**
          * Create a recipient list by providing a recipient list object as the POST request body.
          * At a minimum, the “recipients” array is required, which must contain a valid “address”.
@@ -76,19 +126,47 @@ declare class SparkPost {
          * @param callback The request callback with metadata results
          */
         create(options: SparkPost.CreateRecipientList, callback: SparkPost.ResultsCallback<SparkPost.RecipientListMetadata>): void;
+        /**
+         * Create a recipient list by providing a recipient list object as the POST request body.
+         * At a minimum, the “recipients” array is required, which must contain a valid “address”.
+         * If the recipient list “id” is not provided in the POST request body, one will be generated and returned in the results body.
+         * Use the num_rcpt_errors parameter to limit the number of recipient errors returned.
+         * @param options The create options
+         * @returns Promise metadata results
+         */
+        create(options: SparkPost.CreateRecipientList): SparkPost.ResultsPromise<SparkPost.RecipientListMetadata>;
         /**
          * Update an existing recipient list by specifying its ID in the URI path and use a recipient list object as the PUT request body.
          * Use the num_rcpt_errors parameter to limit the number of recipient errors returned.
+         *
+         * @param {string} id Identifier of the recipient list
          * @param options The update options
          * @param callback The request callback with metadata results
          */
-        update(options: SparkPost.UpdateRecipientList, callback: SparkPost.ResultsCallback<SparkPost.RecipientListMetadata>): void;
+        update(id: string, options: SparkPost.UpdateRecipientList, callback: SparkPost.ResultsCallback<SparkPost.RecipientListMetadata>): void;
+        /**
+         * Update an existing recipient list by specifying its ID in the URI path and use a recipient list object as the PUT request body.
+         * Use the num_rcpt_errors parameter to limit the number of recipient errors returned.
+         *
+         * @param {string} id Identifier of the recipient list
+         * @param {SparkPost.UpdateRecipientList} options
+         * @returns {SparkPost.ResultsPromise<SparkPost.RecipientListMetadata>}
+         */
+        update(id: string, options: SparkPost.UpdateRecipientList): SparkPost.ResultsPromise<SparkPost.RecipientListMetadata>;
         /**
          * Permanently delete the specified recipient list.
+         *
          * @param id The list id
          * @param callback The request callback
          */
         delete(id: string, callback: SparkPost.Callback<void>): void;
+        /**
+         * Permanently delete the specified recipient list.
+         *
+         * @param id The list id
+         * @returns Promise void
+         */
+        delete(id: string): Promise<void>;
     };
     /** Relay Webhooks are a way to instruct SparkPost to accept inbound email on your behalf and forward it to you over HTTP for your own consumption. */
     relayWebhooks: {
@@ -96,68 +174,142 @@ declare class SparkPost {
          * List all your relay webhooks.
          * @param callback The request callback with RelayWebhook results array
          */
-        all(callback: SparkPost.ResultsCallback<SparkPost.RelayWebhook[]>): void;
+        list(callback: SparkPost.ResultsCallback<SparkPost.RelayWebhook[]>): void;
+        /**
+         * List all your relay webhooks.
+         * @returns Promise The RelayWebhook results array
+         */
+        list(): SparkPost.ResultsPromise<SparkPost.RelayWebhook[]>;
         /**
          * Delete a relay webhook by specifying the webhook ID in the URI path.
          * @param relayWebhookId The webhook id
          * @param callback The request callback with RelayWebhook results
          */
-        find(relayWebhookId: string, callback: SparkPost.ResultsCallback<SparkPost.RelayWebhook>): void;
+        get(relayWebhookId: string, callback: SparkPost.ResultsCallback<SparkPost.RelayWebhook>): void;
+        /**
+         * Delete a relay webhook by specifying the webhook ID in the URI path.
+         * @param relayWebhookId The webhook id
+         * @returns Promise The RelayWebhook results
+         */
+        get(relayWebhookId: string): SparkPost.ResultsPromise<SparkPost.RelayWebhook>;
         /**
          * Create a relay webhook by providing a relay webhooks object as the POST request body.
          * @param options The create options
          * @param callback The request callback with webhook id results
          */
         create(options: SparkPost.RelayWebhook, callback: SparkPost.ResultsCallback<{ id: string }>): void;
+        /**
+         * Create a relay webhook by providing a relay webhooks object as the POST request body.
+         * @param options The create options
+         * @returns Promise The webhook id results
+         */
+        create(options: SparkPost.RelayWebhook): SparkPost.ResultsPromise<{ id: string }>;
         /**
          * Update a relay webhook by specifying the webhook ID in the URI path.
          * @param options The update options
          * @param callback The request callback with webhook id results
          */
-        update(options: SparkPost.UpdateRelayWebhook & { relayWebhookId: string }, callback: SparkPost.ResultsCallback<{ id: string }>): void;
+        update(id: string, options: SparkPost.UpdateRelayWebhook, callback: SparkPost.ResultsCallback<{ id: string }>): void;
+        /**
+         * Update a relay webhook by specifying the webhook ID in the URI path.
+         * @param options The update options
+         * @returns Promise The webhook id results
+         */
+        update(id: string, options: SparkPost.UpdateRelayWebhook): SparkPost.ResultsPromise<{ id: string }>;
         /**
          * Delete a relay webhook by specifying the webhook ID in the URI path.
          * @param relayWebhookId The webhook id
          * @param callback The request callback
          */
         delete(relayWebhookId: string, callback: SparkPost.Callback<void>): void;
+        /**
+         * Delete a relay webhook by specifying the webhook ID in the URI path.
+         * @param relayWebhookId The webhook id
+         * @returns Promise void
+         */
+        delete(relayWebhookId: string): Promise<void>;
     };
     sendingDomains: {
         /**
          * List an overview of all sending domains in the system.
          * @param callback The request callback with SendingDomain results array
          */
-        all(callback: SparkPost.ResultsCallback<SparkPost.SendingDomain[]>): void;
+        list(callback: SparkPost.ResultsCallback<SparkPost.SendingDomain[]>): void;
+        /**
+         * List an overview of all sending domains in the system.
+         *
+         * @returns The SendingDomain results array
+         */
+        list(): SparkPost.ResultsPromise<SparkPost.SendingDomain[]>;
         /**
          * Retrieve a sending domain by specifying its domain name in the URI path. The response includes details about its DKIM key configuration.
          * @param domain The domain
          * @param callback The request callback with SendingDomain results
          */
-        find(domain: string, callback: SparkPost.ResultsCallback<SparkPost.SendingDomain>): void;
+        get(domain: string, callback: SparkPost.ResultsCallback<SparkPost.SendingDomain>): void;
+        /**
+         * Retrieve a sending domain by specifying its domain name in the URI path. The response includes details about its DKIM key configuration.
+         *
+         * @param domain The domain
+         * @returns Promise The SendingDomain results
+         */
+        get(domain: string): SparkPost.ResultsPromise<SparkPost.SendingDomain>;
         /**
          * Create a sending domain by providing a sending domain object as the POST request body.
          * @param options The create options
          * @param callback The request callback with basic info results
          */
         create(options: SparkPost.CreateSendingDomain, callback: SparkPost.ResultsCallback<{ message: string, domain: string }>): void;
+        /**
+         * Create a sending domain by providing a sending domain object as the POST request body.
+         *
+         * @param options The create options
+         * @returns Promise The basic info results
+         */
+        create(options: SparkPost.CreateSendingDomain): SparkPost.ResultsPromise<{ message: string, domain: string }>;
         /**
          * Update the attributes of an existing sending domain by specifying its domain name in the URI path and use a sending domain object as the PUT request body.
-         * @param options The update options
+         * @param domain The domain
+         * @param updateOpts The update options
          * @param callback The request callback with basic info results
          */
-        update(options: SparkPost.UpdateSendingDomain, callback: SparkPost.ResultsCallback<{ message: string, domain: string }>): void;
+        update(domain: string, updateOpts: SparkPost.UpdateSendingDomain, callback: SparkPost.ResultsCallback<{ message: string, domain: string }>): void;
+        /**
+         * Update the attributes of an existing sending domain by specifying its domain name in the URI path and use a sending domain object as the PUT request body.
+         *
+         * @param domain The domain
+         * @param updateOpts The update options
+         * @returns Promise The basic info results
+         */
+        update(domain: string, updateOpts: SparkPost.UpdateSendingDomain): SparkPost.ResultsPromise<{ message: string, domain: string }>;
         /**
          * Delete an existing sending domain.
          * @param domain The domain
          * @param callback The request callback
          */
         delete(domain: string, callback: SparkPost.Callback<void>): void;
+        /**
+         * Delete an existing sending domain.
+         *
+         * @param domain The domain
+         * @returns Promise void
+         */
+        delete(domain: string): Promise<void>;
         /**
          * Verify a Sending Domain
-         * @param options The verify options
+         * @param domain The domain
+         * @param options a hash of [verify attributes]{@link https://developers.sparkpost.com/api/sending-domains#header-verify-attributes}
          * @param callback The request callback with verify results
          */
-        verify(options: SparkPost.VerifyOptions, callback: SparkPost.ResultsCallback<SparkPost.VerifyResults>): void;
+        verify(domain: string, options: SparkPost.VerifyOptions, callback: SparkPost.ResultsCallback<SparkPost.VerifyResults>): void;
+        /**
+         * Verify a Sending Domain
+         *
+         * @param domain The domain
+         * @param options a hash of [verify attributes]{@link https://developers.sparkpost.com/api/sending-domains#header-verify-attributes}
+         * @returns Promise The verify results
+         */
+        verify(domain: string, options: SparkPost.VerifyOptions): SparkPost.ResultsPromise<SparkPost.VerifyResults>;
     };
     subaccounts: {
         /**
@@ -165,164 +317,412 @@ declare class SparkPost {
          * This endpoint only returns information about the subaccounts themselves, not the data associated with the subaccount.
          * @param callback The request callback with subaccount information results array
          */
-        all(callback: SparkPost.ResultsCallback<SparkPost.SubaccountInformation[]>): void;
+        list(callback: SparkPost.ResultsCallback<SparkPost.SubaccountInformation[]>): void;
         /**
-         * 
-         * @param subaccountId The webhook id
+         * Endpoint for retrieving a list of your subaccounts.
+         * This endpoint only returns information about the subaccounts themselves, not the data associated with the subaccount.
+         *
+         * @returns Promise The subaccount information results array
+         */
+        list(): SparkPost.ResultsPromise<SparkPost.SubaccountInformation[]>;
+        /**
+         * Get details about a specified subaccount by its id
+         *
+         * @param id the id of the subaccount you want to look up
          * @param callback The request callback with subaccount information results
          */
-        find(subaccountId: string | number, callback: SparkPost.ResultsCallback<SparkPost.SubaccountInformation>): void;
+        get(id: string | number, callback: SparkPost.ResultsCallback<SparkPost.SubaccountInformation>): void;
+        /**
+         * Get details about a specified subaccount by its id
+         *
+         * @param id the id of the subaccount you want to look up
+         * @returns Promise The subaccount information results
+         */
+        get(id: string | number): SparkPost.ResultsPromise<SparkPost.SubaccountInformation>;
         /**
          * Provisions a new subaccount and an initial subaccount API key.
-         * @param options The create options
+         * @param subaccount The create options
          * @param callback The request callback with basic subaccount information results
          */
-        create(options: SparkPost.CreateSubaccount, callback: SparkPost.ResultsCallback<SparkPost.CreateSubaccountResponse>): void;
+        create(subaccount: SparkPost.CreateSubaccount, callback: SparkPost.ResultsCallback<SparkPost.CreateSubaccountResponse>): void;
+        /**
+         * Provisions a new subaccount and an initial subaccount API key.
+         *
+         * @param subaccount The create options
+         * @returns Promise The basic subaccount information results
+         */
+        create(subaccount: SparkPost.CreateSubaccount): SparkPost.ResultsPromise<SparkPost.CreateSubaccountResponse>;
         /**
          * Update an existing subaccount’s information.
-         * @param options The create options
+         *
+         * @param id the id of the subaccount you want to update
+         * @param subaccount an object of [updatable subaccount attributes]{@link https://developers.sparkpost.com/api/subaccounts#header-request-body-attributes-1}
          * @param callback The request callback with webhook id results
          */
-        update(options: SparkPost.UpdateSubaccount, callback: SparkPost.ResultsCallback<{ message: string }>): void;
+        update(id: string, subaccount: SparkPost.UpdateSubaccount, callback: SparkPost.ResultsCallback<{ message: string }>): void;
+        /**
+         * Update an existing subaccount’s information.
+         *
+         * @param id the id of the subaccount you want to update
+         * @param subaccount an object of [updatable subaccount attributes]{@link https://developers.sparkpost.com/api/subaccounts#header-request-body-attributes-1}
+         * @returns Promise The webhook id results
+         */
+        update(id: string, subaccount: SparkPost.UpdateSubaccount): SparkPost.ResultsPromise<{ message: string }>;
     };
     suppressionList: {
         /**
-         * Perform a filtered search for entries in your suppression list.
-         * @param parameters Object of search parameters
-         * @param callback The request callback with RelayWebhook results
+         * List all entries in your suppression list, filtered by an optional set of search parameters.
+         *
+         * @param {SparkPost.ResultsCallback<SparkPost.SupressionListEntry[]>} callback The request callback with supression lists.
          */
-        search(parameters: SparkPost.SupressionSearch, callback: SparkPost.ResultsCallback<SparkPost.SupressionListEntry[]>): void;
+        list(callback: SparkPost.ResultsCallback<SparkPost.SupressionListEntry[]>): void;
         /**
-         * Retrieve the suppression status for a specific recipient by specifying the recipient’s email address in the URI path.
-         * @param email Email address to check
-         * @param callback The request callback with webhook id results
+         * List all entries in your suppression list, filtered by an optional set of search parameters.
+         *
+         * @param {SparkPost.SupressionSearchParameters} parameters an object of [search parameters]{@link https://developers.sparkpost.com/api/suppression-list#suppression-list-search-get}
+         * @param {SparkPost.ResultsCallback<SparkPost.SupressionListEntry[]>} callback The request callback with supression lists.
          */
-        checkStatus(email: string, callback: SparkPost.ResultsCallback<SparkPost.SupressionListEntry[]>): void;
+        list(parameters: SparkPost.SupressionSearchParameters, callback: SparkPost.ResultsCallback<SparkPost.SupressionListEntry[]>): void;
+        /**
+         * List all entries in your suppression list, filtered by an optional set of search parameters.
+         *
+         * @param {SparkPost.SupressionSearchParameters} [parameters] an object of [search parameters]{@link https://developers.sparkpost.com/api/suppression-list#suppression-list-search-get}
+         * @returns {Promise<SparkPost.SupressionListEntry[]>} Promise The supression lists
+         */
+        list(parameters?: SparkPost.SupressionSearchParameters): SparkPost.ResultsPromise<SparkPost.SupressionListEntry[]>;
+        /**
+         * Retrieve an entry by recipient email.
+         *
+         * @param {string} email address to check
+         * @returns void
+         */
+        get(email: string, callback: SparkPost.ResultsCallback<SparkPost.SupressionListEntry[]>): void;
+        /**
+         * Retrieve an entry by recipient email.
+         *
+         * @param {string} email address to check
+         * @returns void
+         */
+        get(email: string): SparkPost.ResultsPromise<SparkPost.SupressionListEntry[]>;
         /**
          * Delete a recipient from the list by specifying the recipient’s email address in the URI path.
-         * @param email Email address to check
-         * @param callback The request callback
+         *
+         * @param {string} email Recipient email address
+         * @param callback
          */
-        removeStatus(email: string, callback: SparkPost.Callback<void>): void;
+        delete(email: string, callback: SparkPost.Callback<void>): void;
         /**
-         * Bulk insert or update entries in the customer-specific exclusion list.
-         * @param parameters The suppression entry list
+         * Delete a recipient from the list by specifying the recipient’s email address in the URI path.
+         *
+         * @param {string} email Recipient email address
+         * @returns {Promise<void>} void
+         */
+        delete(email: string): Promise<void>;
+        /**
+         * Insert or update one or many entries.
+         *
+         * @param listEntries The suppression entry list
          * @param callback The request callback
          */
-        upsert(parameters: SparkPost.CreateSupressionListEntry | SparkPost.CreateSupressionListEntry[], callback: SparkPost.ResultsCallback<{ message: string }>): void;
+        upsert(listEntries: SparkPost.CreateSupressionListEntry | SparkPost.CreateSupressionListEntry[], callback: SparkPost.ResultsCallback<{ message: string }>): void;
+        /**
+         * Insert or update one or many entries.
+         *
+         * @param {(SparkPost.CreateSupressionListEntry | SparkPost.CreateSupressionListEntry[])} listEntries The suppression entry list
+         * @returns {Promise<{ message: string }>}
+         */
+        upsert(listEntries: SparkPost.CreateSupressionListEntry | SparkPost.CreateSupressionListEntry[]): SparkPost.ResultsPromise<{ message: string }>;
     };
     templates: {
         /**
          * List a summary of all templates.
          * @param callback The request callback with TemplateMeta results array
          */
-        all(callback: SparkPost.ResultsCallback<SparkPost.TemplateMeta[]>): void;
+        list(callback: SparkPost.ResultsCallback<SparkPost.TemplateMeta[]>): void;
+        /**
+         * List a summary of all templates.
+         *
+         * @returns {SparkPost.ResultsPromise<SparkPost.TemplateMeta[]>} The TemplateMeta results array
+         */
+        list(): SparkPost.ResultsPromise<SparkPost.TemplateMeta[]>;
         /**
          * Retrieve details about a specified template by its id
-         * @param options The id and draft status information
+         *
+         * @param id the id of the template you want to look up
+         * @param options specifies a draft or published template
          * @param callback The request callback with Template results
          */
-        find(options: { id: string, draft?: boolean }, callback: SparkPost.ResultsCallback<SparkPost.Template>): void;
+        get(id: string, options: { draft?: boolean }, callback: SparkPost.ResultsCallback<SparkPost.Template>): void;
+        /**
+         * Retrieve details about a specified template by its id
+         *
+         * @param {string} id the id of the template you want to look up
+         * @param {SparkPost.ResultsCallback<SparkPost.Template>} callback The request callback with Template results
+         */
+        get(id: string, callback: SparkPost.ResultsCallback<SparkPost.Template>): void;
+        /**
+         * Retrieve details about a specified template by its id
+         *
+         * @param {string} id the id of the template you want to look up
+         * @param {{ draft?: boolean }} [options] specifies a draft or published template
+         * @returns {SparkPost.ResultsPromise<SparkPost.Template>} The Template results
+         */
+        get(id: string, options?: { draft?: boolean }): SparkPost.ResultsPromise<SparkPost.Template>;
         /**
          * Create a new template
-         * @param options The create options
+         *
+         * @param template an object of [template attributes]{@link https://developers.sparkpost.com/api/templates#header-template-attributes}
          * @param callback The request callback with template id results
          */
-        create(options: { template: SparkPost.CreateTemplate }, callback: SparkPost.ResultsCallback<{ id: string }>): void;
+        create(template: SparkPost.CreateTemplate, callback: SparkPost.ResultsCallback<{ id: string }>): void;
+        /**
+         * Create a new template
+         *
+         * @param {SparkPost.CreateTemplate} template an object of [template attributes]{@link https://developers.sparkpost.com/api/templates#header-template-attributes}
+         * @returns {SparkPost.ResultsPromise<{ id: string }>} The template id results
+         */
+        create(template: SparkPost.CreateTemplate): SparkPost.ResultsPromise<{ id: string }>;
         /**
          * Update an existing template
-         * @param options The create options
+         *
+         * @param {string} id the id of the template you want to update
+         * @param template an object of [template attributes]{@link https://developers.sparkpost.com/api/templates#header-template-attributes}
+         * @param options The create options. If true, directly overwrite the existing published template. If false, create a new draft
          * @param callback The request callback with template id results
          */
-        update(options: {
-            id: string,
-            template: SparkPost.UpdateTemplate,
+        update(id: string, template: SparkPost.UpdateTemplate, options: {
             update_published?: boolean;
         }, callback: SparkPost.ResultsCallback<{ id: string }>): void;
+        /**
+         * Update an existing template
+         *
+         * @param {string} id the id of the template you want to update
+         * @param {SparkPost.UpdateTemplate} template an object of [template attributes]{@link https://developers.sparkpost.com/api/templates#header-template-attributes}
+         * @param {SparkPost.ResultsCallback<{ id: string }>} callback The request callback with template id results
+         */
+        update(id: string, template: SparkPost.UpdateTemplate,
+            callback: SparkPost.ResultsCallback<{ id: string }>): void;
+        /**
+         * Update an existing template
+         *
+         * @param {string} id the id of the template you want to update
+         * @param {SparkPost.UpdateTemplate} template an object of [template attributes]{@link https://developers.sparkpost.com/api/templates#header-template-attributes}
+         * @param {{
+         *             update_published?: boolean;
+         *         }} [options] If true, directly overwrite the existing published template. If false, create a new draft
+         * @returns {SparkPost.ResultsPromise<{ id: string }>} The template id results
+         */
+        update(id: string, template: SparkPost.UpdateTemplate, options?: {
+            update_published?: boolean;
+        }): SparkPost.ResultsPromise<{ id: string }>;
         /**
          * Delete an existing template
          * @param id The template id
          * @param callback The request callback
          */
         delete(id: string, callback: SparkPost.Callback<void>): void;
+        /**
+         * Delete an existing template
+         *
+         * @param id The template id
+         * @returns Promise void
+         */
+        delete(id: string): Promise<void>;
         /**
          * Preview the most recent version of an existing template by id
+         *
+         * @param {string} id the id of the template you want to look up
          * @param options The preview options
          * @param callback The request callback with webhook id results
          */
-        preview(options: { id: string, data: any, draft?: boolean }, callback: SparkPost.ResultsCallback<SparkPost.TemplateContent>): void;
+        preview(id: string, options: { substitution_data?: any, draft?: boolean }, callback: SparkPost.ResultsCallback<SparkPost.TemplateContent>): void;
+        /**
+         * Preview the most recent version of an existing template by id
+         *
+         * @param {string} id the id of the template you want to look up
+         * @param {SparkPost.ResultsCallback<SparkPost.TemplateContent>} callback The request callback with webhook id results
+         */
+        preview(id: string, callback: SparkPost.ResultsCallback<SparkPost.TemplateContent>): void;
+        /**
+         * Preview the most recent version of an existing template by id
+         *
+         * @param {string} id the id of the template you want to look up
+         * @param {{ substitution_data: any, draft?: boolean }} [options]
+         * @returns {SparkPost.ResultsPromise<SparkPost.TemplateContent>} The webhook id results
+         */
+        preview(id: string, options?: { substitution_data?: any, draft?: boolean }): SparkPost.ResultsPromise<SparkPost.TemplateContent>;
     };
     transmissions: {
         /**
          * List an overview of all transmissions in the account
+         *
          * @param callback The request callback with Transmission results array
          */
-        all(callback: SparkPost.ResultsCallback<SparkPost.TransmissionSummary[]>): void;
+        list(callback: SparkPost.ResultsCallback<SparkPost.TransmissionSummary[]>): void;
         /**
-         * List an overview of all transmissions in the account, with added filters
-         * @param options The search options { campaign_id?, template_id? }
-         * @param callback The request callback with Transmission results array
+         * List an overview of all transmissions in the account
+         *
+         * @param {{ campaign_id?: string, template_id: string }} options
+         * @param {SparkPost.ResultsCallback<SparkPost.TransmissionSummary[]>} callback The request callback with Transmission results array
          */
-        all(options: { campaign_id?: string, template_id?: string }, callback: SparkPost.ResultsCallback<SparkPost.TransmissionSummary[]>): void;
+        list(options: { campaign_id?: string, template_id?: string }, callback: SparkPost.ResultsCallback<SparkPost.TransmissionSummary[]>): void;
+        /**
+         * List an overview of all transmissions in the account
+         *
+         * @param {{ campaign_id?: string, template_id: string }} [options]
+         * @returns {SparkPost.ResultsPromise<SparkPost.TransmissionSummary[]>} The Transmission results array
+         */
+        list(options?: { campaign_id?: string, template_id?: string }): SparkPost.ResultsPromise<SparkPost.TransmissionSummary[]>;
         /**
          * Retrieve the details about a transmission by its ID
-         * @param transmissionID The transmission id
+         *
+         * @param id The id of the transmission you want to look up
          * @param callback The request callback with Transmission results
          */
-        find(transmissionID: string, callback: SparkPost.ResultsCallback<SparkPost.Transmission>): void;
+        get(transmissionID: string, callback: SparkPost.ResultsCallback<SparkPost.Transmission>): void;
+        /**
+         * Retrieve the details about a transmission by its ID
+         *
+         * @param {string} id The id of the transmission you want to look up
+         * @returns {SparkPost.ResultsPromise<SparkPost.Transmission>} The Transmission results
+         */
+        get(id: string): SparkPost.ResultsPromise<SparkPost.Transmission>;
         /**
          * Sends a message by creating a new transmission
-         * @param options The create options
+         *
+         * @param transmission an object of [transmission attributes]{@link https://developers.sparkpost.com/api/transmissions#header-transmission-attributes}
+         * @param options The create options. Specify maximum number of recipient errors returned
          * @param callback The request callback with metadata and id results
          */
-        send(options: { transmissionBody: SparkPost.CreateTransmission, num_rcpt_errors?: number }, callback: SparkPost.ResultsCallback<{
+        send(transmission: SparkPost.CreateTransmission, options: { num_rcpt_errors?: number }, callback: SparkPost.ResultsCallback<{
             total_rejected_recipients: number;
             total_accepted_recipients: number;
             id: string;
         }>): void;
+        /**
+         *
+         *
+         * @param {SparkPost.CreateTransmission} transmission an object of [transmission attributes]{@link https://developers.sparkpost.com/api/transmissions#header-transmission-attributes}
+         * @param {SparkPost.ResultsCallback<{
+         *             total_rejected_recipients: number;
+         *             total_accepted_recipients: number;
+         *             id: string;
+         *         }>} callback The request callback with metadata and id results
+         */
+        send(transmission: SparkPost.CreateTransmission, callback: SparkPost.ResultsCallback<{
+            total_rejected_recipients: number;
+            total_accepted_recipients: number;
+            id: string;
+        }>): void;
+        /**
+         * Sends a message by creating a new transmission
+         *
+         * @param {SparkPost.CreateTransmission} transmission an object of [transmission attributes]{@link https://developers.sparkpost.com/api/transmissions#header-transmission-attributes}
+         * @param {{ num_rcpt_errors?: number }} [options] specify maximum number of recipient errors returned
+         * @returns {SparkPost.ResultsPromise<{
+         *             total_rejected_recipients: number;
+         *             total_accepted_recipients: number;
+         *             id: string;
+         *         }>} The metadata and id results
+         */
+        send(transmission: SparkPost.CreateTransmission, options?: { num_rcpt_errors?: number }): SparkPost.ResultsPromise<{
+            total_rejected_recipients: number;
+            total_accepted_recipients: number;
+            id: string;
+        }>;
     };
     webhooks: {
         /**
          * List currently existing webhooks.
          * @param callback The request callback with RelayWebhook results array
          */
-        all(callback: SparkPost.ResultsCallback<Array<SparkPost.WebhookLinks & SparkPost.Webhook>>): void;
+        list(callback: SparkPost.ResultsCallback<Array<SparkPost.WebhookLinks & SparkPost.Webhook>>): void;
         /**
          * List currently existing webhooks.
          * @param options Object containing optional timezone
          * @param callback The request callback with RelayWebhook results array
          */
-        all(options: { timezone?: string }, callback: SparkPost.ResultsCallback<Array<SparkPost.WebhookLinks & SparkPost.Webhook>>): void;
+        list(options: { timezone?: string }, callback: SparkPost.ResultsCallback<Array<SparkPost.WebhookLinks & SparkPost.Webhook>>): void;
+        /**
+         * List currently existing webhooks.the timezone to use for the last_successful and last_failure properties | Default: UTC
+         *
+         * @param {{ timezone?: string }} [options]
+         * @returns {(SparkPost.ResultsPromise<Array<SparkPost.WebhookLinks & SparkPost.Webhook>>)}
+         */
+        list(options?: { timezone?: string }): SparkPost.ResultsPromise<Array<SparkPost.WebhookLinks & SparkPost.Webhook>>;
         /**
          * Retrieve details about a specified webhook by its id
+         *
+         * @param {string} id The id of the webhook to get
          * @param options Object containing id and optional timezone
          * @param callback The request callback with RelayWebhook results
          */
-        describe(options: { id: string, timezone?: string }, callback: SparkPost.ResultsCallback<SparkPost.WebhookLinks & SparkPost.Webhook>): void;
+        get(id: string, options: { timezone?: string }, callback: SparkPost.ResultsCallback<SparkPost.WebhookLinks & SparkPost.Webhook>): void;
+        /**
+         * Retrieve details about a specified webhook by its id
+         *
+         * @param {string} id The id of the webhook to get
+         * @param {(SparkPost.ResultsCallback<SparkPost.WebhookLinks & SparkPost.Webhook>)} callback The request callback with RelayWebhook results
+         */
+        get(id: string, callback: SparkPost.ResultsCallback<SparkPost.WebhookLinks & SparkPost.Webhook>): void;
+        /**
+         * Retrieve details about a specified webhook by its id
+         *
+         * @param {string} id The id of the webhook to get
+         * @param {{ timezone?: string }} [options] the timezone to use for the last_successful and last_failure properties
+         * @returns {(SparkPost.ResultsPromise<SparkPost.WebhookLinks & SparkPost.Webhook>)} The RelayWebhook results
+         */
+        get(id: string, options?: { timezone?: string }): SparkPost.ResultsPromise<SparkPost.WebhookLinks & SparkPost.Webhook>;
         /**
          * Create a new webhook
-         * @param options The create options
+         *
+         * @param options a hash of [webhook attributes]{@link https://developers.sparkpost.com/api/webhooks#header-webhooks-object-properties}
          * @param callback The request callback with webhook id results
          */
         create(options: SparkPost.Webhook, callback: SparkPost.ResultsCallback<SparkPost.WebhookLinks & { id: string }>): void;
+        /**
+         * Create a new webhook
+         *
+         * @param {SparkPost.Webhook} options a hash of [webhook attributes]{@link https://developers.sparkpost.com/api/webhooks#header-webhooks-object-properties}
+         * @returns {(SparkPost.ResultsPromise<SparkPost.WebhookLinks & { id: string }>)} The webhook id results
+         */
+        create(options: SparkPost.Webhook): SparkPost.ResultsPromise<SparkPost.WebhookLinks & { id: string }>;
         /**
          * Update an existing webhook
-         * @param options The update options
+         * @param {string} id the id of the webhook to update
+         * @param options A hash of [webhook attribues]{@link https://developers.sparkpost.com/api/webhooks#header-webhooks-object-properties}
          * @param callback The request callback with webhook id results
          */
-        update(options: SparkPost.UpdateWebhook, callback: SparkPost.ResultsCallback<SparkPost.WebhookLinks & { id: string }>): void;
+        update(id: string, options: SparkPost.UpdateWebhook, callback: SparkPost.ResultsCallback<SparkPost.WebhookLinks & { id: string }>): void;
+        /**
+         * Update an existing webhook
+         *
+         * @param {string} id
+         * @param {SparkPost.UpdateWebhook} options
+         * @returns {(SparkPost.ResultsPromise<SparkPost.WebhookLinks & { id: string }>)}
+         */
+        update(id: string, options: SparkPost.UpdateWebhook): SparkPost.ResultsPromise<SparkPost.WebhookLinks & { id: string }>;
         /**
          * Delete an existing webhook
          * @param id The webhook id
          * @param callback The request callback
          */
         delete(id: string, callback: SparkPost.Callback<void>): void;
+        /**
+         * Delete an existing webhook.
+         *
+         * @param {string} id The id of the webhook to delete
+         * @returns {Promise<void>}
+         */
+        delete(id: string): Promise<void>;
         /**
          * Sends an example message event batch from the Webhook API to the target URL
-         * @param options The webhook id and message
+         *
+         * @param {string} id The id of the webhook to validate
+         * @param options the message (payload) to send to the webhook consumer
          * @param callback The request callback with validation results
          */
-        validate(options: { id: string, message: any }, callback: SparkPost.ResultsCallback<{
+        validate(id: string, options: { message: any }, callback: SparkPost.ResultsCallback<{
             msg: string;
             response: {
                 status: number;
@@ -331,21 +731,86 @@ declare class SparkPost {
             }
         }>): void;
         /**
-         * Sends an example message event batch from the Webhook API to the target URL
-         * @param options The webhook id and optional limit
+         * Sends an example message event batch from the Webhook API to the target URL.
+         *
+         * @param {string} id The id of the webhook to validate
+         * @param {{ message: any }} options The message (payload) to send to the webhook consumer
+         * @returns {SparkPost.ResultsPromise<{
+         *             msg: string;
+         *             response: {
+         *                 status: number;
+         *                 headers: any;
+         *                 body: string;
+         *             }
+         *         }>} The validation results
+         */
+        validate(id: string, options: { message: any }): SparkPost.ResultsPromise<{
+            msg: string;
+            response: {
+                status: number;
+                headers: any;
+                body: string;
+            }
+        }>;
+        /**
+         * Gets recent status information about a webhook.
+         *
+         * @param {string} id The id of the webhook
+         * @param options  An optional limit that specifies the maximum number of results to return. Defaults to 1000
          * @param callback The request callback with status results
          */
-        getBatchStatus(options: { id: string, limit?: number }, callback: SparkPost.ResultsCallback<{
+        getBatchStatus(id: string, options: { limit?: number }, callback: SparkPost.ResultsCallback<{
             batch_id: string;
             ts: string;
             attempts: number;
             response_code: number;
         }[]>): void;
+        /**
+         * Gets recent status information about a webhook.
+         *
+         * @param {string} id The id of the webhook
+         * @param {SparkPost.ResultsCallback<{
+         *             batch_id: string;
+         *             ts: string;
+         *             attempts: number;
+         *             response_code: number;
+         *         }[]>} callback The request callback with status results
+         */
+        getBatchStatus(id: string, callback: SparkPost.ResultsCallback<{
+            batch_id: string;
+            ts: string;
+            attempts: number;
+            response_code: number;
+        }[]>): void;
+        /**
+         * Gets recent status information about a webhook.
+         *
+         * @param {string} id The id of the webhook
+         * @param {{ limit?: number }} Maximum number of results to return. Defaults to 1000
+         * @returns {SparkPost.ResultsPromise<{
+         *             batch_id: string;
+         *             ts: string;
+         *             attempts: number;
+         *             response_code: number;
+         *         }[]>} The status results
+         */
+        getBatchStatus(id: string, options: { limit?: number }): SparkPost.ResultsPromise<{
+            batch_id: string;
+            ts: string;
+            attempts: number;
+            response_code: number;
+        }[]>;
         /**
          * Lists descriptions of the events, event types, and event fields that could be included in a Webhooks post to your target URL.
-         * @param callback The request callback containing documentation results 
+         * @param callback The request callback containing documentation results
          */
         getDocumentation(callback: SparkPost.ResultsCallback<any>): void;
+        /**
+         * Lists descriptions of the events, event types, and event fields that could be included in a Webhooks post to your target URL.
+         *
+         * @returns {SparkPost.ResultsPromise<any>} The documentation results
+         */
+        getDocumentation(): SparkPost.ResultsPromise<any>;
         /**
          * List an example of the event data that will be posted by a Webhook for the specified events.
          * @param callback The request callback containing examples
@@ -357,6 +822,14 @@ declare class SparkPost {
          * @param callback The request callback containing examples
          */
         getSamples(options: { events?: string }, callback: SparkPost.Callback<any>): void;
+        /**
+         * List an example of the event data that will be posted by a Webhook for the specified events.
+         *
+         * @param {{ events?: string }} options [event types]{@link https://support.sparkpost.com/customer/portal/articles/1976204} for which to get a sample payload
+         * Default: all event types returned
+         * @returns {Promise<SparkPost.Response<any>>}
+         */
+        getSamples(options?: { events?: string }): Promise<SparkPost.Response<any>>;
     };
 
     /**
@@ -367,10 +840,15 @@ declare class SparkPost {
     constructor(apiKey?: string, options?: SparkPost.ConstructorOptions);
 
     request(options: Request.Options, callback: SparkPost.Callback<any>): void;
+    request(options: Request.Options): Promise<SparkPost.Response<any>>;
     get(options: Request.Options, callback: SparkPost.Callback<any>): void;
+    get(options: Request.Options): Promise<SparkPost.Response<any>>;
     post(options: Request.Options, callback: SparkPost.Callback<any>): void;
+    post(options: Request.Options): Promise<SparkPost.Response<any>>;
     put(options: Request.Options, callback: SparkPost.Callback<any>): void;
+    put(options: Request.Options): Promise<SparkPost.Response<any>>;
     delete(options: Request.Options, callback: SparkPost.Callback<any>): void;
+    delete(options: Request.Options): Promise<SparkPost.Response<any>>;
 }
 
 declare namespace SparkPost {
@@ -405,6 +883,7 @@ declare namespace SparkPost {
         (err: Error | SparkPostError | null, res: Response<T>): void;
     }
     export type ResultsCallback<T> = Callback<{ results: T }>;
+    export type ResultsPromise<T> = Promise<{ results: T }>;
 
     export interface Domain {
         domain: string;
@@ -543,10 +1022,8 @@ declare namespace SparkPost {
         description?: string;
         /** Recipient list attribute object */
         attributes?: any;
-        /** limit the number of recipient errors returned. */
-        num_rcpt_errors?: number;
         /** Array of recipient objects */
-        recipients?: Recipient[];
+        recipients: Recipient[];
     }
 
     export interface BaseRecipient {
@@ -564,9 +1041,21 @@ declare namespace SparkPost {
         address: Address | string;
     }
     export interface RecipientWithMultichannelAddresses {
-        /** Address information for a recipient. At a minimum, address or multichannel_addresses is required. If both address and multichannel_addresses are specified only multichannel_addresses will be used. */
+        /**
+         * Address information for a recipient. At a minimum, address or multichannel_addresses is required.
+         * If both address and multichannel_addresses are specified only multichannel_addresses will be used.
+         *
+         * @type {(Address | string)}
+         * @memberOf RecipientWithMultichannelAddresses
+         */
         address?: Address | string;
-        /** Array of Multichannel Address objects for a recipient. At a minimum, address or multichannel_addresses is required. If both address and multichannel_addresses are specified only multichannel_addresses will be used. */
+        /**
+         * Array of Multichannel Address objects for a recipient. At a minimum, address or multichannel_addresses is required.
+         * If both address and multichannel_addresses are specified only multichannel_addresses will be used.
+         *
+         * @type {MultichannelAddress[]}
+         * @memberOf RecipientWithMultichannelAddresses
+         */
         multichannel_addresses: MultichannelAddress[];
     }
     export type Recipient = (RecipientWithAddress | RecipientWithMultichannelAddresses) & BaseRecipient;
@@ -610,7 +1099,7 @@ declare namespace SparkPost {
         /** User-friendly name  no  example: Inbound Customer Replies */
         name?: string;
         /** URL of the target to which to POST relay batches */
-        target?: string;
+        target: string;
         /** Authentication token to present in the X-MessageSystems-Webhook-Token header of POST requests to target */
         auth_token?: string;
         /** Restrict which inbound messages will be relayed to the target */
@@ -661,8 +1150,6 @@ declare namespace SparkPost {
     }
 
     export interface UpdateSendingDomain {
-        /** Name of the sending domain. */
-        domain: string;
         /** Associated tracking domain. */
         tracking_domain?: string;
         /** JSON object in which DKIM key configuration is defined. */
@@ -704,9 +1191,49 @@ declare namespace SparkPost {
     }
 
     export interface VerifyOptions {
-        domain: string;
-        verifyDKIM?: boolean;
-        verifySPF?: boolean;
+        /**
+         * Request verification of DKIM record
+         *
+         * @type {boolean}
+         * @memberOf VerifyOptions
+         */
+        dkim_verify?: boolean;
+        /**
+         * Request verification of SPF record
+         *
+         * @type {boolean}
+         * @deprecated
+         * @memberOf VerifyOptions
+         */
+        spf_verify?: boolean;
+        /**
+         * Request an email with a verification link to be sent to the sending domain’s postmaster@ mailbox.
+         *
+         * @type {boolean}
+         * @memberOf VerifyOptions
+         */
+        postmaster_at_verify?: boolean;
+        /**
+         * Request an email with a verification link to be sent to the sending domain’s abuse@ mailbox.
+         *
+         * @type {boolean}
+         * @memberOf VerifyOptions
+         */
+        abuse_at_verify?: boolean;
+        /**
+         * A token retrieved from the verification link contained in the postmaster@ verification email.
+         *
+         * @type {string}
+         * @memberOf VerifyOptions
+         */
+        postmaster_at_token?: string;
+        /**
+         * A token retrieved from the verification link contained in the abuse@ verification email.
+         *
+         * @type {string}
+         * @memberOf VerifyOptions
+         */
+        abuse_at_token?: string;
     }
 
     export interface VerifyResults extends Status {
@@ -720,13 +1247,13 @@ declare namespace SparkPost {
         /** user-friendly name */
         name: string;
         /** user-friendly identifier for subaccount API key */
-        keyLabel: string;
+        key_label: string;
         /** list of grants to give the subaccount API key */
-        keyGrants: string[];
+        key_grants: string[];
         /** list of IPs the subaccount may be used from */
-        keyValidIps?: string[];
+        key_valid_ips?: string[];
         /** id of the default IP pool assigned to subaccount"s transmissions */
-        ipPool?: string;
+        ip_pool?: string;
     }
 
     export interface CreateSubaccountResponse {
@@ -737,14 +1264,12 @@ declare namespace SparkPost {
     }
 
     export interface UpdateSubaccount {
-        /** the id of the subaccount you want to update */
-        subaccountId: string | number;
         /** user-friendly name */
         name: string;
         /** status of the subaccount */
         status: string;
         /** id of the default IP pool assigned to subaccount"s transmissions */
-        ipPool?: string;
+        ip_pool?: string;
     }
 
     export interface SubaccountInformation {
@@ -760,41 +1285,149 @@ declare namespace SparkPost {
     }
 
     export interface CreateSupressionListEntry {
+        /**
+         * Email address to be suppressed
+         *
+         * @type {string}
+         * @memberOf CreateSupressionListEntry
+         */
         recipient: string;
-        /** Whether the recipient requested to not receive any transactional messages. At a minimum, transactional or non_transactional is required upon creation of the entry.   */
+        /**
+         * Type of suppression record
+         *
+         * @type {("transactional" | "non_transactional")}
+         * @memberOf CreateSupressionListEntry
+         */
+        type?: "transactional" | "non_transactional";
+        /**
+         * Whether the recipient requested to not receive any non-transactional messages
+         * Not required if a valid type is passed
+         *
+         * @deprecated Available, but deprecated in favor of type
+         * @type {boolean}
+         * @memberOf CreateSupressionListEntry
+         */
         transactional?: boolean;
-        /** Whether the recipient requested to not receive any non-transactional messages. At a minimum, transactional or non_transactional is required upon creation of the entry.   */
+        /**
+         * Whether the recipient requested to not receive any non-transactional messages
+         * Not required if a valid type is passed
+         *
+         * @deprecated Available, but deprecated in favor of type
+         * @type {boolean}
+         * @memberOf CreateSupressionListEntry
+         */
         non_transactional?: boolean;
+        /**
+         * Source responsible for inserting the list entry
+         * no - entries created by the user are marked as Manually Added
+         *
+         * @type {("Spam Complaint" | "List Unsubscribe" | "Bounce Rule" | "Unsubscribe Link" | "Manually Added" | "Compliance")}
+         * @memberOf CreateSupressionListEntry
+         */
+        readonly source?: "Spam Complaint" | "List Unsubscribe" | "Bounce Rule" | "Unsubscribe Link" | "Manually Added" | "Compliance";
         /** Short explanation of the suppression */
         description?: string;
     }
 
     export interface SupressionListEntry {
+        /**
+         * Email address to be suppressed
+         *
+         * @type {string}
+         * @memberOf SupressionListEntry
+         */
         recipient: string;
-        /** Whether the recipient requested to not receive any transactional messages. At a minimum, transactional or non_transactional is required upon creation of the entry.   */
+        /**
+         * Whether the recipient requested to not receive any transactional messages
+         * Not required if a valid type is passed
+         *
+         * @deprecated Available, but deprecated in favor of type
+         * @type {boolean}
+         * @memberOf SupressionListEntry
+         */
         transactional?: boolean;
-        /** Whether the recipient requested to not receive any non-transactional messages. At a minimum, transactional or non_transactional is required upon creation of the entry.   */
+        /**
+         * Whether the recipient requested to not receive any non-transactional messages
+         * Not required if a valid type is passed
+         *
+         * @deprecated Available, but deprecated in favor of type
+         * @type {boolean}
+         * @memberOf SupressionListEntry
+         */
         non_transactional?: boolean;
-        /** Coming soon */
+        /** Type of suppression record: transactional or non_transactional */
         type?: "transactional" | "non_transactional";
-        /** Source responsible for inserting the list entry. Valid values include: Spam Complaint, List Unsubscribe, Bounce Rule, Unsubscribe Link, Manually Added, Compliance. */
-        source?: string;
+        /**
+         * Source responsible for inserting the list entry
+         *
+         * no - entries created by the user are marked as Manually Added
+         *
+         * @type {("Spam Complaint" | "List Unsubscribe" | "Bounce Rule" | "Unsubscribe Link" | "Manually Added" | "Compliance")}
+         * @memberOf SupressionListEntry
+         */
+        source?: "Spam Complaint" | "List Unsubscribe" | "Bounce Rule" | "Unsubscribe Link" | "Manually Added" | "Compliance";
         /** Short explanation of the suppression */
         description?: string;
         created: string;
         updated: string;
     }
 
-    export interface SupressionSearch {
+    export interface SupressionSearchParameters {
         /** Datetime the entries were last updated, in the format of YYYY-MM-DDTHH:mm:ssZ */
         to?: string;
         /** Datetime the entries were last updated, in the format YYYY-MM-DDTHH:mm:ssZ */
         from?: string;
+        /**
+         * Domain of entries to include in the search. ( Note: SparkPost only)
+         *
+         * @type {string}
+         * @memberOf SupressionSearch
+         */
+        domain?: string;
+        /**
+         * The results cursor location to return, to start paging with cursor, use the value of ‘initial’.
+         * When cursor is provided the page parameter is ignored. (Note: SparkPost only)
+         *
+         * @type {string}
+         * @memberOf SupressionSearch
+         */
+        cursor?: string;
+        /**
+         * Maximum number of results to return per page. Must be between 1 and 10,000.
+         * ( Note: SparkPost only)
+         * @default 1000
+         * @type {string}
+         * @memberOf SupressionSearch
+         */
+        per_page?: string | number;
+        /**
+         * The results page number to return. Used with per_page for paging through results.
+         * The page parameter works up to 10,000 results.
+         * You must use the cursor parameter and start with cursor=initial to page result sets larger than 10,000
+         * ( Note: SparkPost only)
+         *
+         * @type {string}
+         * @memberOf SupressionSearch
+         */
+        page?: string | number;
         /** Types of entries to include in the search, i.e. entries with “transactional” and/or “non_transactional” keys set to true */
         types?: string;
         /** Sources of the entries to include in the search, i.e. entries that were added by this source */
         sources?: string;
-        /** Maximum number of results to return. Must be between 1 and 100000. Default value is 100000. */
+        /**
+         * Description of the entries to include in the search, i.e descriptions that include the text submitted.
+         * ( Note: SparkPost only)
+         *
+         * @type {string}
+         * @memberOf SupressionSearch
+         */
+        description?: string;
+        /**
+         * Maximum number of results to return per page. Must be between 1 and 10,000.
+         * @type {number}
+         * @deprecated use per_page instead
+         * @memberOf SupressionSearch
+         */
         limit?: number;
     }
 
@@ -805,7 +1438,13 @@ declare namespace SparkPost {
         text: string;
         /** Email subject line. */
         subject: string;
-        /** Address “from” : "deals@company.com" or JSON object composed of the “name” and “email” fields “from” : { “name” : “My Company”, “email” : "deals@company.com" } used to compose the email’s “From” header. */
+        /**
+         * Address "from" : "deals@company.com" or JSON object composed of the "name" and "email" fields.
+         * "from" : { "name" : "My Company", "email" : "deals@company.com" } used to compose the email’s "From" header.
+         *
+         * @type {(Address | string)}
+         * @memberOf TemplateContent
+         */
         from: Address | string;
         /** Email address used to compose the email’s “Reply-To” header. */
         reply_to?: string;
@@ -820,7 +1459,13 @@ declare namespace SparkPost {
         text?: string;
         /** Email subject line. */
         subject: string;
-        /** Address “from” : "deals@company.com" or JSON object composed of the “name” and “email” fields “from” : { “name” : “My Company”, “email” : "deals@company.com" } used to compose the email’s “From” header. */
+        /**
+         * Address "from" : "deals@company.com" or JSON object composed of the "name" and "email" fields.
+         * "from" : { "name" : "My Company", "email" : "deals@company.com" } used to compose the email’s "From" header.
+         *
+         * @type {(Address | string)}
+         * @memberOf TemplateContent
+         */
         from: Address | string;
         /** Email address used to compose the email’s “Reply-To” header. */
         reply_to?: string;
@@ -840,7 +1485,15 @@ declare namespace SparkPost {
     }
 
     export interface Template {
-        /** Short, unique, alphanumeric ID used to reference the template  At a minimum, id or name is required upon creation. It is auto generated if not provided.  After a template has been created, this property cannot be changed. Maximum length - 64 bytes */
+        /**
+         * Short, unique, alphanumeric ID used to reference the template.
+         * At a minimum, id or name is required upon creation.
+         * It is auto generated if not provided.
+         * After a template has been created, this property cannot be changed. Maximum length - 64 bytes
+         *
+         * @type {string}
+         * @memberOf Template
+         */
         id: string;
         /** Content that will be used to construct a message  yes  For a full description, see the Content Attributes. Maximum length - 20 MBs */
         content: TemplateContent | { email_rfc822: string };
@@ -859,7 +1512,15 @@ declare namespace SparkPost {
     }
 
     export interface CreateTemplate {
-        /** Short, unique, alphanumeric ID used to reference the template  At a minimum, id or name is required upon creation. It is auto generated if not provided.  After a template has been created, this property cannot be changed. Maximum length - 64 bytes */
+        /**
+         * Short, unique, alphanumeric ID used to reference the template.
+         * At a minimum, id or name is required upon creation.
+         * It is auto generated if not provided.
+         * After a template has been created, this property cannot be changed. Maximum length - 64 bytes
+         *
+         * @type {string}
+         * @memberOf CreateTemplate
+         */
         id?: string;
         /** Content that will be used to construct a message  yes  For a full description, see the Content Attributes. Maximum length - 20 MBs */
         content: CreateTemplateContent | { email_rfc822: string };
@@ -907,6 +1568,20 @@ declare namespace SparkPost {
     export interface CreateTransmission {
         /** JSON object in which transmission options are defined */
         options?: TransmissionOptions;
+        /**
+         * Recipients to receive a carbon copy of the transmission
+         *
+         * @type {Recipient[]}
+         * @memberOf CreateTransmission
+         */
+        cc?: Recipient[];
+        /**
+         * Recipients to discreetly receive a carbon copy of the transmission
+         *
+         * @type {Recipient[]}
+         * @memberOf CreateTransmission
+         */
+        bcc?: Recipient[];
         /** Inline recipient objects or object containing stored recipient list ID */
         recipients?: Recipient[] | { list_id: string };
         /** Name of the campaign */
@@ -1011,11 +1686,25 @@ declare namespace SparkPost {
     }
 
     export interface Attachment {
-        /** The MIME type of the attachment; e.g., “text/plain”, “image/jpeg”, “audio/mp3”, “video/mp4”, “application/msword”, “application/pdf”, etc., including the “charset” parameter (text/html; charset=“UTF-8”) if needed. The value will apply “as-is” to the “Content-Type” header of the generated MIME part for the attachment. */
+        /**
+         * The MIME type of the attachment; e.g., “text/plain”, “image/jpeg”, “audio/mp3”, “video/mp4”, “application/msword”, “application/pdf”, etc.,
+         * including the “charset” parameter (text/html; charset=“UTF-8”) if needed.
+         * The value will apply “as-is” to the “Content-Type” header of the generated MIME part for the attachment.
+         *
+         * @type {string}
+         * @memberOf Attachment
+         */
         type: string;
         /**   The filename of the attachment (for example, “document.pdf”). This is inserted into the filename parameter of the Content-Disposition header. */
         name: string;
-        /** The content of the attachment as a Base64 encoded string. The string should not contain \r\n line breaks. The SparkPost systems will add line breaks as necessary to ensure the Base64 encoded lines contain no more than 76 characters each. */
+        /**
+         * The content of the attachment as a Base64 encoded string.
+         * The string should not contain \r\n line breaks.
+         * The SparkPost systems will add line breaks as necessary to ensure the Base64 encoded lines contain no more than 76 characters each.
+         *
+         * @type {string}
+         * @memberOf Attachment
+         */
         data: string;
     }
 
@@ -1026,6 +1715,14 @@ declare namespace SparkPost {
         target: string;
         /** Array of event types this webhook will receive */
         events: string[];
+        /**
+         * Reserved for future use
+         *
+         * @default {true}
+         * @type {boolean}
+         * @memberOf Webhook
+         */
+        active?: boolean;
         /** Type of authentication to be used during POST requests to target */
         auth_type?: string;
         /** Object containing details needed to request authorization credentials, as necessary */
@@ -1037,13 +1734,13 @@ declare namespace SparkPost {
     }
 
     export interface UpdateWebhook {
-        id: string;
         /** User-friendly name for webhook */
         name?: string;
         /** URL of the target to which to POST event batches */
         target?: string;
         /** Array of event types this webhook will receive */
         events?: string[];
+        active?: boolean;
         /** Type of authentication to be used during POST requests to target */
         auth_type?: string;
         /** Object containing details needed to request authorization credentials, as necessary */
@@ -1061,6 +1758,16 @@ declare namespace SparkPost {
             method: string[];
         }[];
     }
+
+    export interface CreateOpts {
+        /**
+         * Domain (or subdomain) name for which SparkPost will receive inbound emails
+         *
+         * @type {string}
+         * @memberOf CreateOpts
+         */
+        domain: string;
+    }
 }
 
 export = SparkPost;
diff --git a/sparkpost/sparkpost-tests.ts b/sparkpost/sparkpost-tests.ts
index 9f7f47b44d..d3fef264f0 100644
--- a/sparkpost/sparkpost-tests.ts
+++ b/sparkpost/sparkpost-tests.ts
@@ -3,6 +3,7 @@ import * as SparkPost from "sparkpost";
 let key = "YOURAPIKEY";
 let client = new SparkPost(key);
 
+// Callback
 client.get({
   uri: "metrics/domains"
 }, function(err, data) {
@@ -14,7 +15,19 @@ client.get({
   console.log(data.body);
 });
 
-client.inboundDomains.create("example1.com", function(err, res) {
+// Promise
+client.get({
+  uri: 'metrics/domains'
+})
+  .then(data => {
+    console.log(data);
+  })
+  .catch(err => {
+    console.log(err);
+  });
+
+// Callback
+client.inboundDomains.create({ domain: 'example1.com' }, function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -23,6 +36,18 @@ client.inboundDomains.create("example1.com", function(err, res) {
   }
 });
 
+// Promise
+client.inboundDomains.create({ domain: 'example1.com' })
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
 client.inboundDomains.delete("example1.com", function(err, res) {
   if (err) {
     console.log(err);
@@ -32,7 +57,19 @@ client.inboundDomains.delete("example1.com", function(err, res) {
   }
 });
 
-client.inboundDomains.find("example1.com", function(err, res) {
+// Promise
+client.inboundDomains.delete('example1.com')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.inboundDomains.get("example1.com", function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -41,7 +78,19 @@ client.inboundDomains.find("example1.com", function(err, res) {
   }
 });
 
-client.inboundDomains.all(function(err, res) {
+// Promise
+client.inboundDomains.get('example1.com')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.inboundDomains.list(function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -50,6 +99,18 @@ client.inboundDomains.all(function(err, res) {
   }
 });
 
+// Promise
+client.inboundDomains.list()
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
 client.messageEvents.search({}, function(err, res) {
   if (err) {
     console.log(err);
@@ -59,6 +120,7 @@ client.messageEvents.search({}, function(err, res) {
   }
 });
 
+// Callback
 client.messageEvents.search({
   events: "click",
   campaign_ids: "monday_mailshot"
@@ -71,6 +133,7 @@ client.messageEvents.search({
   }
 });
 
+// Callback
 client.messageEvents.search({
   from: "2016-01-01T00:00",
   to: "2016-01-02T23:59",
@@ -87,6 +150,50 @@ client.messageEvents.search({
   }
 });
 
+// Promise
+client.messageEvents.search({
+    events: 'click',
+    campaign_ids: 'monday_mailshot'
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Promise
+client.messageEvents.search({})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Promise
+client.messageEvents.search({
+    from: '2016-01-01T00:00',
+    to: '2016-01-02T23:59',
+    page: 1,
+    per_page: 5,
+    events: ['bounce', 'out_of_band'],
+    bounce_classes: [10]
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
 client.recipientLists.create({
   id: "UNIQUE_TEST_ID",
   name: "Test Recipient List",
@@ -114,6 +221,36 @@ client.recipientLists.create({
   }
 });
 
+// Promise
+client.recipientLists.create({
+  id: "UNIQUE_TEST_ID",
+  name: "Test Recipient List",
+  recipients: [
+    {
+      address: {
+        email: "test1@test.com"
+      }
+    }, {
+      address: {
+        email: "test2@test.com"
+      }
+    }, {
+      address: {
+        email: "test3@test.com"
+      }
+    }
+  ]
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
 client.recipientLists.delete("UNIQUE_TEST_ID", function(err, res) {
   if (err) {
     console.log(err);
@@ -123,7 +260,19 @@ client.recipientLists.delete("UNIQUE_TEST_ID", function(err, res) {
   }
 });
 
-client.recipientLists.all(function(err, res) {
+// Promise
+client.recipientLists.delete('UNIQUE_TEST_ID')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.recipientLists.list(function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -132,9 +281,19 @@ client.recipientLists.all(function(err, res) {
   }
 });
 
-client.recipientLists.find({
-  id: "UNIQUE_TEST_ID"
-}, function(err, res) {
+// Promise
+client.recipientLists.list()
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.recipientLists.get('UNIQUE_TEST_ID', function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -143,8 +302,8 @@ client.recipientLists.find({
   }
 });
 
-client.recipientLists.find({
-  id: "UNIQUE_TEST_ID",
+// Callback
+client.recipientLists.get('UNIQUE_TEST_ID', {
   show_recipients: true
 }, function(err, res) {
   if (err) {
@@ -155,8 +314,32 @@ client.recipientLists.find({
   }
 });
 
-client.recipientLists.update({
-  id: "EXISTING_TEST_ID",
+// Promise
+client.recipientLists.get('UNIQUE_TEST_ID', {
+  show_recipients: true
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Promise
+client.recipientLists.get('UNIQUE_TEST_ID')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.recipientLists.update('EXISTING_TEST_ID', {
   name: "Test Recipient List",
   recipients: [
     {
@@ -182,6 +365,34 @@ client.recipientLists.update({
   }
 });
 
+// Promise
+client.recipientLists.update('EXISTING_TEST_ID', {
+  name: "Test Recipient List",
+  recipients: [
+    {
+      address: {
+        email: "test1@test.com"
+      }
+    }, {
+      address: {
+        email: "test2@test.com"
+      }
+    }, {
+      address: {
+        email: "test3@test.com"
+      }
+    }
+  ]
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log(err);
+  });
+
+// Callback
 client.relayWebhooks.create({
   name: "Test Relay Webhook",
   target: "http://client.test.com/test-webhook",
@@ -197,6 +408,24 @@ client.relayWebhooks.create({
   }
 });
 
+// Promise
+client.relayWebhooks.create({
+    name: 'Test Relay Webhook',
+    target: 'http://client.test.com/test-webhook',
+    match: {
+      domain: 'inbound.example.com'
+    }
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
 client.relayWebhooks.delete("123456789", function(err, res) {
   if (err) {
     console.log(err);
@@ -206,7 +435,19 @@ client.relayWebhooks.delete("123456789", function(err, res) {
   }
 });
 
-client.relayWebhooks.find("123456789", function(err, res) {
+// Promise
+client.relayWebhooks.delete('123456789')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.relayWebhooks.get('123456789', function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -215,7 +456,18 @@ client.relayWebhooks.find("123456789", function(err, res) {
   }
 });
 
-client.relayWebhooks.all(function(err, res) {
+// Promise
+client.relayWebhooks.get('123456789')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+client.relayWebhooks.list(function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -224,8 +476,19 @@ client.relayWebhooks.all(function(err, res) {
   }
 });
 
-client.relayWebhooks.update({
-  relayWebhookId: "123456789",
+// Promise
+client.relayWebhooks.list()
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.relayWebhooks.update('123456789', {
   target: "http://client.test.com/test-webhook"
 }, function(err, res) {
   if (err) {
@@ -236,11 +499,25 @@ client.relayWebhooks.update({
   }
 });
 
+// Promise
+client.relayWebhooks.update('123456789', {
+    target: 'http://client.test.com/test-webhook'
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
 client.sendingDomains.create({
   domain: "example1.com",
   dkim: {
-    "private": "MIICXgIBAAKBgQC+W6scd3XWwvC/hPRksfDYFi3ztgyS9OSqnnjtNQeDdTSD1DRx/xFar2wjmzxp2+SnJ5pspaF77VZveN3P/HVmXZVghr3asoV9WBx/uW1nDIUxU35L4juXiTwsMAbgMyh3NqIKTNKyMDy4P8vpEhtH1iv/BrwMdBjHDVCycB8WnwIDAQABAoGBAITb3BCRPBi5lGhHdn+1RgC7cjUQEbSb4eFHm+ULRwQ0UIPWHwiVWtptZ09usHq989fKp1g/PfcNzm8c78uTS6gCxfECweFCRK6EdO6cCCr1cfWvmBdSjzYhODUdQeyWZi2ozqd0FhGWoV4VHseh4iLj36DzleTLtOZj3FhAo1WJAkEA68T+KkGeDyWwvttYtuSiQCCTrXYAWTQnkIUxduCp7Ap6tVeIDn3TaXTj74UbEgaNgLhjG4bX//fdeDW6PaK9YwJBAM6xJmwHLPMgwNVjiz3u/6fhY3kaZTWcxtMkXCjh1QE82KzDwqyrCg7EFjTtFysSHCAZxXZMcivGl4TZLHnydJUCQQCx16+M+mAatuiCnvxlQUMuMiSTNK6Amzm45u9v53nlZeY3weYMYFdHdfe1pebMiwrT7MI9clKebz6svYJVmdtXAkApDAc8VuR3WB7TgdRKNWdyGJGfoD1PO1ZE4iinOcoKV+IT1UCY99Kkgg6C7j62n/8T5OpRBvd5eBPpHxP1F9BNAkEA5Nf2VO9lcTetksHdIeKK+F7sio6UZn0Rv7iUo3ALrN1D1cGfWIh2dj3ko1iSreyNVSwGW0ePP27qDmU+u6/Y1g==",
-    "public": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+W6scd3XWwvC/hPRksfDYFi3ztgyS9OSqnnjtNQeDdTSD1DRx/xFar2wjmzxp2+SnJ5pspaF77VZveN3P/HVmXZVghr3asoV9WBx/uW1nDIUxU35L4juXiTwsMAbgMyh3NqIKTNKyMDy4P8vpEhtH1iv/BrwMdBjHDVCycB8WnwIDAQAB",
+    "private": "MIICXgIBAAKBgQC+W6scd3XWwvC/hPRksfDYFi3ztgyS9OSqnnjtNQeDdTSD1DRx/==",
+    "public": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+W6scd3XWwvC/==",
     selector: "brisbane",
     headers: "from:to:subject:date"
   }
@@ -253,7 +530,26 @@ client.sendingDomains.create({
   }
 });
 
+// Promise
+client.sendingDomains.create({
+    domain: 'example1.com',
+    dkim: {
+      'private': 'MIICXgIBAAKBgQC+W6scd3XWwvC/hPRksfDYFi3ztgyS9OSqnnjtNQeDdTSD1DRx/==',
+      'public': 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+W6scd3XWwvC/==',
+      selector: 'brisbane',
+      headers: 'from:to:subject:date'
+    }
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
 
+// Callback
 client.sendingDomains.delete("example1.com", function(err, data) {
   if (err) {
     console.log(err);
@@ -263,7 +559,19 @@ client.sendingDomains.delete("example1.com", function(err, data) {
   }
 });
 
-client.sendingDomains.all(function(err, res) {
+// Promise
+client.sendingDomains.delete('example1.com')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.sendingDomains.list(function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -272,7 +580,19 @@ client.sendingDomains.all(function(err, res) {
   }
 });
 
-client.sendingDomains.find("example1.com", function(err, res) {
+// Promise
+client.sendingDomains.list()
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.sendingDomains.get('example1.com', function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -281,11 +601,22 @@ client.sendingDomains.find("example1.com", function(err, res) {
   }
 });
 
-client.sendingDomains.update({
-  domain: "example1.com",
+// Promise
+client.sendingDomains.get('example1.com')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.sendingDomains.update('example1.com', {
   dkim: {
-    "private": "MIICXgIBAAKBgQC+W6scd3XWwvC/hPRksfDYFi3ztgyS9OSqnnjtNQeDdTSD1DRx/xFar2wjmzxp2+SnJ5pspaF77VZveN3P/HVmXZVghr3asoV9WBx/uW1nDIUxU35L4juXiTwsMAbgMyh3NqIKTNKyMDy4P8vpEhtH1iv/BrwMdBjHDVCycB8WnwIDAQABAoGBAITb3BCRPBi5lGhHdn+1RgC7cjUQEbSb4eFHm+ULRwQ0UIPWHwiVWtptZ09usHq989fKp1g/PfcNzm8c78uTS6gCxfECweFCRK6EdO6cCCr1cfWvmBdSjzYhODUdQeyWZi2ozqd0FhGWoV4VHseh4iLj36DzleTLtOZj3FhAo1WJAkEA68T+KkGeDyWwvttYtuSiQCCTrXYAWTQnkIUxduCp7Ap6tVeIDn3TaXTj74UbEgaNgLhjG4bX//fdeDW6PaK9YwJBAM6xJmwHLPMgwNVjiz3u/6fhY3kaZTWcxtMkXCjh1QE82KzDwqyrCg7EFjTtFysSHCAZxXZMcivGl4TZLHnydJUCQQCx16+M+mAatuiCnvxlQUMuMiSTNK6Amzm45u9v53nlZeY3weYMYFdHdfe1pebMiwrT7MI9clKebz6svYJVmdtXAkApDAc8VuR3WB7TgdRKNWdyGJGfoD1PO1ZE4iinOcoKV+IT1UCY99Kkgg6C7j62n/8T5OpRBvd5eBPpHxP1F9BNAkEA5Nf2VO9lcTetksHdIeKK+F7sio6UZn0Rv7iUo3ALrN1D1cGfWIh2dj3ko1iSreyNVSwGW0ePP27qDmU+u6/Y1g==",
-    "public": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+W6scd3XWwvC/hPRksfDYFi3ztgyS9OSqnnjtNQeDdTSD1DRx/xFar2wjmzxp2+SnJ5pspaF77VZveN3P/HVmXZVghr3asoV9WBx/uW1nDIUxU35L4juXiTwsMAbgMyh3NqIKTNKyMDy4P8vpEhtH1iv/BrwMdBjHDVCycB8WnwIDAQAB",
+    "private": "MIICXgIBAAKBgQC+W6scd3XWwvC/hPRksfDYFi3ztgyS9OSqnnjtNQeDdTSD1DRx/Y1g==",
+    "public": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+W6scd3XWwvC/==",
     selector: "hello_selector",
     headers: "from:to:subject:date"
   }
@@ -298,8 +629,29 @@ client.sendingDomains.update({
   }
 });
 
-client.sendingDomains.verify({
-  domain: "example1.com"
+client.sendingDomains.update('example1.com', {
+	dkim: {
+      'private': 'MIICXgIBAAKBgQC+W6scd3XWwvC/hPRksfDYFi3ztgyS9OSqnnjtNQeDdTSD1DRx/Y1g==',
+      'public': 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+W6scd3XWwvC/==',
+      selector: 'hello_selector',
+      headers: 'from:to:subject:date'
+    }
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.sendingDomains.verify('example1.com', {
+	dkim_verify: true,
+	spf_verify: true,
+	abuse_at_verify: true,
+	postmaster_at_verify: true
 }, function(err, res) {
   if (err) {
     console.log(err);
@@ -309,9 +661,9 @@ client.sendingDomains.verify({
   }
 });
 
-client.sendingDomains.verify({
-  domain: "example1.com",
-  verifySPF: false
+// Callback
+client.sendingDomains.verify('example1.com', {
+	dkim_verify: false
 }, function(err, res) {
   if (err) {
     console.log(err);
@@ -321,22 +673,27 @@ client.sendingDomains.verify({
   }
 });
 
-client.sendingDomains.verify({
-  domain: "example1.com",
-  verifyDKIM: false
-}, function(err, res) {
-  if (err) {
+// Promise
+client.sendingDomains.verify('example1.com', {
+    dkim_verify: true,
+    spf_verify: true,
+    abuse_at_verify: true,
+    postmaster_at_verify: true
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
     console.log(err);
-  } else {
-    console.log(res.body);
-    console.log("Congrats you can use our SDK!");
-  }
 });
 
+// Callback
 client.subaccounts.create({
   name: "Test Subaccount",
-  keyLabel: "Test Subaccount key",
-  keyGrants: [
+  key_label: 'Test Subaccount key',
+  key_grants: [
     "smtp/inject",
     "transmissions/modify"
   ]
@@ -349,7 +706,26 @@ client.subaccounts.create({
   }
 });
 
-client.subaccounts.all(function(err, res) {
+// Promise
+client.subaccounts.create({
+    name: 'Test Subaccount',
+    key_label: 'Test Subaccount key',
+    key_grants: [
+      'smtp/inject',
+      'transmissions/modify'
+    ]
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.subaccounts.list(function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -358,7 +734,19 @@ client.subaccounts.all(function(err, res) {
   }
 });
 
-client.subaccounts.find(123, function(err, res) {
+// Promise
+client.subaccounts.list()
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.subaccounts.get(123, function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -367,8 +755,19 @@ client.subaccounts.find(123, function(err, res) {
   }
 });
 
-client.subaccounts.update({
-  subaccountId: 123,
+// Promise
+client.subaccounts.get('123')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.subaccounts.update('123', {
   name: "Test Subaccount",
   status: "suspended"
 }, function(err, res) {
@@ -380,67 +779,199 @@ client.subaccounts.update({
   }
 });
 
-client.suppressionList.checkStatus("test@test.com", function(err, res) {
+// Promise
+client.subaccounts.update('123', {
+    name: 'Test Subaccount',
+    status: 'suspended'
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.suppressionList.delete('test@test.com', function(err, data) {
   if (err) {
+    console.log('Whoops! Something went wrong');
     console.log(err);
   } else {
-    console.log(res.body);
-    console.log("Congrats you can use our client library!");
+    console.log('Congrats you can use our client library!');
+    console.log(data);
   }
 });
 
-client.suppressionList.removeStatus("test@test.com", function(err, res) {
+// Promise
+client.suppressionList.delete('test@test.com')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Promise
+client.suppressionList.get('test@test.com')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.suppressionList.get('test@test.com', function(err, data) {
   if (err) {
+    console.log('Whoops! Something went wrong');
     console.log(err);
   } else {
-    console.log(res.body);
-    console.log("Congrats you can use our client library!");
+    console.log('Congrats you can use our client library!');
+    console.log(data);
   }
 });
 
-client.suppressionList.search({
-  from: "2015-05-07T00:00:00+0000",
-  to: "2015-05-07T23:59:59+0000",
-  limit: 5
-}, function(err, res) {
+// Promise
+client.suppressionList.list({
+    from: '2015-05-07T00:00:00+0000',
+    to: '2015-05-07T23:59:59+0000',
+    limit: 5
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+  });
+
+// Callback
+client.suppressionList.list({
+    from: '2015-05-07T00:00:00+0000',
+    to: '2015-05-07T23:59:59+0000',
+    limit: 5
+}, function(err, data) {
   if (err) {
+    console.log('Whoops! Something went wrong');
     console.log(err);
   } else {
-    console.log(res.body);
-    console.log("Congrats you can use our client library!");
+    console.log('Congrats you can use our client library!');
+    console.log(data);
   }
 });
 
-client.suppressionList.upsert([
-  {
-    recipient: "test1@test.com",
+// Callback
+client.suppressionList.list(function(err, data) {
+  if (err) {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+  } else {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  }
+});
+
+// Promise
+client.suppressionList.upsert({
+    recipient: 'test1@test.com',
     transactional: false,
     non_transactional: true,
-    description: "Test description 1"
-  },
-  {
-    recipient: "test2@test.com",
-    transactional: true,
+    description: 'Test description 1'
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+  });
+
+// Callback
+client.suppressionList.upsert({
+    recipient: 'test1@test.com',
+    transactional: false,
     non_transactional: true,
-    description: "Test description 2"
-  },
-  {
-    recipient: "test3@test.com",
-    transactional: true,
-    non_transactional: false,
-    description: "Test description 3"
-  }
-], function(err, res) {
+    description: 'Test description 1'
+}, function(err, data) {
   if (err) {
+    console.log('Whoops! Something went wrong');
     console.log(err);
   } else {
-    console.log(res.body);
-    console.log("Congrats you can use our client library!");
+    console.log('Congrats you can use our client library!');
+    console.log(data);
   }
 });
 
+// Promise
+client.suppressionList.upsert([
+    {
+      recipient: 'test1@test.com',
+      transactional: false,
+      non_transactional: true,
+      description: 'Test description 1'
+    },
+    {
+      recipient: 'test2@test.com',
+      transactional: true,
+      non_transactional: true,
+      description: 'Test description 2'
+    },
+    {
+      recipient: 'test3@test.com',
+      transactional: true,
+      non_transactional: false,
+      description: 'Test description 3'
+    }
+])
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+  });
+
+// Callback
+client.suppressionList.upsert([
+    {
+      recipient: 'test1@test.com',
+      transactional: false,
+      non_transactional: true,
+      description: 'Test description 1'
+    },
+    {
+      recipient: 'test2@test.com',
+      transactional: true,
+      non_transactional: true,
+      description: 'Test description 2'
+    },
+    {
+      recipient: 'test3@test.com',
+      transactional: true,
+      non_transactional: false,
+      description: 'Test description 3'
+    }
+], function(err, data) {
+  if (err) {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+  } else {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  }
+});
+
+// Callback
 client.templates.create({
-  template: {
     id: "TEST_ID",
     name: "Test Template",
     content: {
@@ -448,7 +979,6 @@ client.templates.create({
       subject: "Test email template!",
       html: "<b>This is a test email template!</b>"
     }
-  }
 }, function(err, res) {
   if (err) {
     console.log(err);
@@ -458,6 +988,26 @@ client.templates.create({
   }
 });
 
+// Promise
+client.templates.create({
+    id: 'TEST_ID',
+    name: 'Test Template',
+    content: {
+      from: 'test@test.com',
+      subject: 'Test email template!',
+      html: '<b>This is a test email template!</b>'
+    }
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
 client.templates.delete("TEST_ID", function(err, res) {
   if (err) {
     console.log(err);
@@ -467,8 +1017,19 @@ client.templates.delete("TEST_ID", function(err, res) {
   }
 });
 
+// Promise
+client.templates.delete('TEST_ID')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
 
-client.templates.all(function(err, res) {
+// Callback
+client.templates.list(function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -477,8 +1038,19 @@ client.templates.all(function(err, res) {
   }
 });
 
-client.templates.find({
-  id: "TEST_ID",
+// Promise
+client.templates.list()
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.templates.get('TEST_ID', {
   draft: true
 }, function(err, res) {
   if (err) {
@@ -489,8 +1061,30 @@ client.templates.find({
   }
 });
 
-client.templates.find({
-  id: "TEST_ID"
+// Callback
+client.templates.get('TEST_ID', function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+// Promise
+client.templates.get('TEST_ID')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.templates.preview('TEST_ID', {
+  substitution_data: {}
 }, function(err, res) {
   if (err) {
     console.log(err);
@@ -500,29 +1094,33 @@ client.templates.find({
   }
 });
 
-client.templates.preview({
-  id: "TEST_ID",
-  data: {}
-}, function(err, res) {
-  if (err) {
+// Promise
+client.templates.preview('TEST_ID', {
+	substitution_data: {
+		name: 'Natalie',
+		age: 35,
+		member: true
+	},
+	draft: true
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
     console.log(err);
-  } else {
-    console.log(res.body);
-    console.log("Congrats you can use our SDK!");
-  }
 });
 
-client.templates.update({
-  id: "TEST_ID",
-  template: {
+// Callback
+client.templates.update('TEST_ID', {
     content: {
       from: "test@test.com",
       subject: "Updated Published Test email template!",
       html: "<b>This is a published test email template! Updated!</b>"
-    }
-  },
-  update_published: true
-}, function(err, res) {
+    },
+}, { update_published: true },
+function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -531,15 +1129,13 @@ client.templates.update({
   }
 });
 
-client.templates.update({
-  id: "TEST_ID",
-  template: {
+// Callback
+client.templates.update('TEST_ID', {
     content: {
       from: "test@test.com",
       subject: "Updated Test email template!",
       html: "<b>This is a test email template! Updated!</b>"
     }
-  }
 }, function(err, res) {
   if (err) {
     console.log(err);
@@ -549,7 +1145,25 @@ client.templates.update({
   }
 });
 
-client.transmissions.all(function(err, res) {
+// Promise
+client.templates.update('TEST_ID', {
+    content: {
+      from: 'test@test.com',
+      subject: 'Updated Test email template!',
+      html: '<b>This is a test email template! Updated!</b>'
+    }
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+  });
+
+// Callback
+client.transmissions.list(function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -558,16 +1172,17 @@ client.transmissions.all(function(err, res) {
   }
 });
 
-client.transmissions.find("YOUR-TRANSMISSION-KEY", function(err, res) {
-  if (err) {
+// Promise
+client.transmissions.list()
+  .then(data => {
+    console.log(data);
+    console.log('Congrats you can use our client library!');
+  })
+  .catch(err => {
     console.log(err);
-  } else {
-    console.log(res.body);
-    console.log("Congrats you can use our SDK!");
-  }
-});
+  });
 
-client.transmissions.all({
+client.transmissions.list({
   campaign_id: "my_campaign"
 }, function(err, res) {
   if (err) {
@@ -578,7 +1193,7 @@ client.transmissions.all({
   }
 });
 
-client.transmissions.all({
+client.transmissions.list({
   template_id: "my_template"
 }, function(err, res) {
   if (err) {
@@ -589,8 +1204,29 @@ client.transmissions.all({
   }
 });
 
+// Callback
+client.transmissions.get("YOUR-TRANSMISSION-KEY", function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+// Promise
+client.transmissions.get('YOUR-TRANSMISSION-KEY')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+  });
+
+// Callback
 client.transmissions.send({
-  transmissionBody: {
     recipients: [{ address: { email: "john.doe@example.com" } }],
     content: {
       from: "From Envelope <from@example.com>",
@@ -602,7 +1238,6 @@ client.transmissions.send({
       open_tracking: true,
       click_tracking: true
     }
-  }
 }, function(err, res) {
   if (err) {
     console.log(err);
@@ -612,13 +1247,12 @@ client.transmissions.send({
   }
 });
 
+// Callback
 client.transmissions.send({
-  transmissionBody: {
     recipients: [{address: {email: "john.doe@example.com"}}],
     content: {
       email_rfc822: "Content-Type: text/plain\nFrom: From Envelope <from@example.com>\nSubject: Example Email\n\nHello World"
     }
-  }
 }, function(err, res) {
   if (err) {
     console.log(err);
@@ -628,8 +1262,8 @@ client.transmissions.send({
   }
 });
 
+// Callback
 client.transmissions.send({
-  transmissionBody: {
     options: {
       open_tracking: true,
       click_tracking: true
@@ -674,9 +1308,8 @@ client.transmissions.send({
         "X-Customer-Campaign-ID": "christmas_campaign"
       },
       text: "Hi {{address.name}} \nSave big this Christmas in your area {{place}}! \nClick http://www.mysite.com and get huge discount\n Hurry, this offer is only to {{customer_type}}\n {{sender}}",
-      html: "<p>Hi {{address.name}} \nSave big this Christmas in your area {{place}}! \nClick http://www.mysite.com and get huge discount\n</p><p>Hurry, this offer is only to {{customer_type}}\n</p><p>{{sender}}</p>"
-    }
-  }
+      html: "<p>Hi {{address.name}} \nSave big this Christmas in your area {{place}}! \nClick http://www.mysite.com and get huge discount\n</p>"
+	}
 }, function(err, res) {
   if (err) {
     console.log(err);
@@ -686,8 +1319,8 @@ client.transmissions.send({
   }
 });
 
+// Callback
 client.transmissions.send({
-  transmissionBody: {
     recipients: [
       {
         address: {
@@ -717,7 +1350,6 @@ client.transmissions.send({
       text: "An example email using bcc with SparkPost to the {{recipient_type}} recipient.",
       html: "<p>An example email using bcc with SparkPost to the {{recipient_type}} recipient.</p>"
     }
-  }
 }, function(err, res) {
   if (err) {
     console.log(err);
@@ -727,8 +1359,8 @@ client.transmissions.send({
   }
 });
 
+// Callback
 client.transmissions.send({
-  transmissionBody: {
     recipients: [
       {
         address: {
@@ -762,7 +1394,6 @@ client.transmissions.send({
       text: "An example email using cc with SparkPost to the {{recipient_type}} recipient.",
       html: "<p>An example email using cc with SparkPost to the {{recipient_type}} recipient.</p>"
     }
-  }
 }, function(err, res) {
   if (err) {
     console.log(err);
@@ -772,8 +1403,8 @@ client.transmissions.send({
   }
 });
 
+// Callback
 client.transmissions.send({
-  transmissionBody: {
     recipients: {
       list_id: "example-list"
     },
@@ -783,7 +1414,6 @@ client.transmissions.send({
       html: "<html><body><p>Hello World</p></body></html>",
       text: "Hello World!"
     }
-  }
 }, function(err, res) {
   if (err) {
     console.log(err);
@@ -793,8 +1423,8 @@ client.transmissions.send({
   }
 });
 
+// Callback
 client.transmissions.send({
-  transmissionBody: {
     recipients: {
       list_id: "example-list"
     },
@@ -803,7 +1433,6 @@ client.transmissions.send({
       subject: "Example Email for Stored List and Template",
       template_id: "my-template"
     }
-  }
 }, function(err, res) {
   if (err) {
     console.log(err);
@@ -813,15 +1442,15 @@ client.transmissions.send({
   }
 });
 
+// Callback
 client.transmissions.send({
-  num_rcpt_errors: 3,
-  transmissionBody: {
     campaign_id: "ricks-campaign",
     content: {
       template_id: "ricks-template"
     },
     recipients: [{ address: { email: "rick.sanchez@rickandmorty100years.com", name: "Rick Sanchez" } }]
-  }
+}, {
+	num_rcpt_errors: 3
 }, function(err, res) {
   if (err) {
     console.log(err);
@@ -831,6 +1460,111 @@ client.transmissions.send({
   }
 });
 
+
+// Promise
+client.transmissions.send({
+    options: {
+      open_tracking: true,
+      click_tracking: true
+    },
+    campaign_id: 'christmas_campaign',
+    metadata: {
+      user_type: 'students'
+    },
+    substitution_data: {
+      sender: 'Big Store Team'
+    },
+	cc: [],
+	bcc: [],
+    recipients: [
+      {
+        address: {
+          email: 'wilma@flintstone.com',
+          name: 'Wilma Flintstone'
+        },
+        tags: [
+          'greeting',
+          'prehistoric',
+          'fred',
+          'flintstone'
+        ],
+        metadata: {
+          place: 'Bedrock'
+        },
+        substitution_data: {
+          customer_type: 'Platinum'
+        }
+      }
+    ],
+    content: {
+      from: {
+        name: 'Fred Flintstone',
+        email: 'fred@flintstone.com'
+      },
+      subject: 'Big Christmas savings!',
+      reply_to: 'Christmas Sales <sales@flintstone.com>',
+      headers: {
+        'X-Customer-Campaign-ID': 'christmas_campaign'
+      },
+      text: 'Hi {{address.name}} \nSave big this Christmas in your area {{place}}! \nClick http://www.mysite.com and get huge discount\n Hurry, this offer is only to {{customer_type}}\n {{sender}}',
+      html: '<p>Hi {{address.name}} \nSave big this Christmas in your area {{place}}! \nClick http://www.mysite.com and get huge discount\n</p>'
+    }
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Promise
+client.transmissions.send({
+    recipients: [
+      {
+        address: {
+          email: 'original.recipient@example.com',
+          name: 'Original Recipient'
+        },
+        substitution_data: {
+          recipient_type: 'Original'
+        }
+      },
+      {
+        address: {
+          email: 'cc.recipient@example.com',
+          name: 'Carbon Copy Recipient',
+          header_to: '"Original Recipient" <original.recipient@example.com>'
+        },
+        substitution_data: {
+          recipient_type: 'CC'
+        }
+      }
+    ],
+    content: {
+      from: {
+        name: 'Node CC Test',
+        email: 'from@example.com'
+      },
+      headers: {
+        'CC': '"Carbon Copy Recipient" <cc.recipient@example.com>'
+      },
+      subject: 'Example email using cc',
+      text: 'An example email using cc with SparkPost to the {{recipient_type}} recipient.',
+      html: '<p>An example email using cc with SparkPost to the {{recipient_type}} recipient.</p>'
+    }
+})
+  .then(data => {
+    console.log('Congrats! You sent an email with cc using SparkPost!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
 client.webhooks.create({
   name: "Test webhook",
   target: "http://client.test.com/test-webhook",
@@ -850,6 +1584,28 @@ client.webhooks.create({
   }
 });
 
+// Promise
+client.webhooks.create({
+    name: 'Test Webhook',
+    target: 'http://client.test.com/test-webhook',
+    auth_token: 'AUTH_TOKEN',
+    events: [
+      'delivery',
+      'injection',
+      'open',
+      'click'
+    ]
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
 client.webhooks.delete("TEST_WEBHOOK_UUID", function(err, res) {
   if (err) {
     console.log(err);
@@ -859,20 +1615,45 @@ client.webhooks.delete("TEST_WEBHOOK_UUID", function(err, res) {
   }
 });
 
-client.webhooks.describe({
-  id: "TEST_WEBHOOK_UUID",
-  timezone: "America/New_York"
-}, function(err, res) {
+// Promise
+client.webhooks.delete('TEST_WEBHOOK_UUID')
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+  });
+
+// Callback
+client.webhooks.get('TEST_WEBHOOK_UUID', {
+    timezone: 'America/New_York'
+}, function(err, data) {
   if (err) {
+    console.log('Whoops! Something went wrong');
     console.log(err);
   } else {
-    console.log(res.body);
-    console.log("Congrats you can use our SDK!");
+    console.log('Congrats you can use our client library!');
+    console.log(data);
   }
 });
 
-client.webhooks.getBatchStatus({
-  id: "TEST_WEBHOOK_UUID",
+// Promise
+client.webhooks.get('TEST_WEBHOOK_UUID', {
+    timezone: 'America/New_York'
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+  });
+
+// Callback
+client.webhooks.getBatchStatus('TEST_WEBHOOK_UUID', {
   limit: 1000
 }, function(err, res) {
   if (err) {
@@ -883,7 +1664,20 @@ client.webhooks.getBatchStatus({
   }
 });
 
+// Promise
+client.webhooks.getBatchStatus('TEST_WEBHOOK_UUID', {
+    limit: 1000
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+  });
 
+// Callback
 client.webhooks.getDocumentation(function(err, res) {
   if (err) {
     console.log(err);
@@ -893,6 +1687,18 @@ client.webhooks.getDocumentation(function(err, res) {
   }
 });
 
+// Promise
+client.webhooks.getDocumentation()
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
 client.webhooks.getSamples({
   events: "bounce"
 }, function(err, res) {
@@ -904,7 +1710,21 @@ client.webhooks.getSamples({
   }
 });
 
-client.webhooks.all(function(err, res) {
+// Promise
+client.webhooks.getSamples({
+    events: 'bounce'
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.webhooks.list(function(err, res) {
   if (err) {
     console.log(err);
   } else {
@@ -913,8 +1733,19 @@ client.webhooks.all(function(err, res) {
   }
 });
 
-client.webhooks.update({
-  id: "TEST_WEBHOOK_UUID",
+// Promise
+client.webhooks.list()
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.webhooks.update('TEST_WEBHOOK_UUID', {
   name: "Renamed Test webhook",
   events: [
     "policy_rejection",
@@ -929,8 +1760,25 @@ client.webhooks.update({
   }
 });
 
-client.webhooks.validate({
-  id: "TEST_WEBHOOK_UUID",
+// Promise
+client.webhooks.update('TEST_WEBHOOK_UUID', {
+    name: 'Renamed Test Webhook',
+    events: [
+      'policy_rejection',
+      'delay'
+    ]
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+});
+
+// Callback
+client.webhooks.validate('TEST_WEBHOOK_UUID', {
   message: {
     msys: {}
   }
@@ -942,3 +1790,18 @@ client.webhooks.validate({
     console.log("Congrats you can use our SDK!");
   }
 });
+
+// Promise
+client.webhooks.validate('TEST_WEBHOOK_UUID', {
+    message: {
+      msys: {}
+    }
+})
+  .then(data => {
+    console.log('Congrats you can use our client library!');
+    console.log(data);
+  })
+  .catch(err => {
+    console.log('Whoops! Something went wrong');
+    console.log(err);
+  });
diff --git a/sparkpost/tsconfig.json b/sparkpost/tsconfig.json
index 0ef33f26af..e40a56608b 100644
--- a/sparkpost/tsconfig.json
+++ b/sparkpost/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -19,4 +19,4 @@
         "index.d.ts",
         "sparkpost-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/sparkpost/tslint.json b/sparkpost/tslint.json
new file mode 100644
index 0000000000..e77aa7b0ee
--- /dev/null
+++ b/sparkpost/tslint.json
@@ -0,0 +1,8 @@
+{
+  "extends": "../tslint.json",
+  "rules": {
+    "only-arrow-functions-2": [
+      false
+    ]
+  }
+}
diff --git a/sparkpost/v1/index.d.ts b/sparkpost/v1/index.d.ts
new file mode 100644
index 0000000000..b12f3712ab
--- /dev/null
+++ b/sparkpost/v1/index.d.ts
@@ -0,0 +1,1119 @@
+// Type definitions for sparkpost v1.3
+// Project: https://github.com/SparkPost/node-sparkpost
+// Definitions by: Joshua DeVinney <https://github.com/geoffreak>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import * as Request from "request";
+import * as Http from "http";
+
+declare class SparkPost {
+    /** Specifying an inbound domain enables you to customize the address to which inbound messages are sent. */
+    inboundDomains: {
+        /**
+         * List all your inbound domains.
+         * @param callback The request callback with Domain results array
+         */
+        all(callback: SparkPost.ResultsCallback<SparkPost.Domain[]>): void;
+        /**
+         * Retrieve an inbound domain by specifying its domain name in the URI path.
+         * @param domain Domain name
+         * @param callback The request callback with Domain results
+         */
+        find(domain: string, callback: SparkPost.ResultsCallback<SparkPost.Domain>): void;
+        /**
+         * Create an inbound domain by providing an inbound domains object as the POST request body.
+         * @param domain Domain name
+         * @param callback The request callback
+         */
+        create(domain: string, callback: SparkPost.Callback<void>): void;
+        /**
+         * Delete an inbound domain by specifying its domain name in the URI path.
+         * @param domain Domain name
+         * @param callback The request callback
+         */
+        delete(domain: string, callback: SparkPost.Callback<void>): void;
+    };
+    /** The Message Events API provides the means to search the raw events generated by SparkPost. */
+    messageEvents: {
+        /**
+         * Retrieves list of message events according to given params
+         * @param parameters Query parameters
+         * @param callback The request callback with MessageEvent results array
+         */
+        search(parameters: SparkPost.MessageEventParameters, callback: SparkPost.ResultsCallback<SparkPost.MessageEvent[]>): void;
+    };
+    /** A recipient list is a collection of recipients that can be used in a transmission. */
+    recipientLists: {
+        /**
+         * List a summary of all recipient lists. The recipients for each list are not included in the results.
+         * To retrieve recipient details, use the RETRIEVE API for a specified recipient list.
+         * @param callback The request callback with RecipientList results array
+         */
+        all(callback: SparkPost.ResultsCallback<SparkPost.RecipientList[]>): void;
+        /**
+         * Retrieve details about a specified recipient list by specifying its id in the URI path.
+         * To retrieve the recipients contained in a list, the show_recipients parameter must be set to true.
+         * @param options The find options
+         * @param callback The request callback with RecipientList results
+         */
+        find(options: { id: string, show_recipients?: false }, callback: SparkPost.Callback<SparkPost.RecipientList>): void;
+        /**
+         * Retrieve details about a specified recipient list by specifying its id in the URI path.
+         * To retrieve the recipients contained in a list, the show_recipients parameter must be set to true.
+         * @param options The find options
+         * @param callback The request callback with RecipientList results (with recipients)
+         */
+        find(options: { id: string, show_recipients: true }, callback: SparkPost.Callback<SparkPost.RecipientListWithRecipients>): void;
+        /**
+         * Create a recipient list by providing a recipient list object as the POST request body.
+         * At a minimum, the “recipients” array is required, which must contain a valid “address”.
+         * If the recipient list “id” is not provided in the POST request body, one will be generated and returned in the results body.
+         * Use the num_rcpt_errors parameter to limit the number of recipient errors returned.
+         * @param options The create options
+         * @param callback The request callback with metadata results
+         */
+        create(options: SparkPost.CreateRecipientList, callback: SparkPost.ResultsCallback<SparkPost.RecipientListMetadata>): void;
+        /**
+         * Update an existing recipient list by specifying its ID in the URI path and use a recipient list object as the PUT request body.
+         * Use the num_rcpt_errors parameter to limit the number of recipient errors returned.
+         * @param options The update options
+         * @param callback The request callback with metadata results
+         */
+        update(options: SparkPost.UpdateRecipientList, callback: SparkPost.ResultsCallback<SparkPost.RecipientListMetadata>): void;
+        /**
+         * Permanently delete the specified recipient list.
+         * @param id The list id
+         * @param callback The request callback
+         */
+        delete(id: string, callback: SparkPost.Callback<void>): void;
+    };
+    /** Relay Webhooks are a way to instruct SparkPost to accept inbound email on your behalf and forward it to you over HTTP for your own consumption. */
+    relayWebhooks: {
+        /**
+         * List all your relay webhooks.
+         * @param callback The request callback with RelayWebhook results array
+         */
+        all(callback: SparkPost.ResultsCallback<SparkPost.RelayWebhook[]>): void;
+        /**
+         * Delete a relay webhook by specifying the webhook ID in the URI path.
+         * @param relayWebhookId The webhook id
+         * @param callback The request callback with RelayWebhook results
+         */
+        find(relayWebhookId: string, callback: SparkPost.ResultsCallback<SparkPost.RelayWebhook>): void;
+        /**
+         * Create a relay webhook by providing a relay webhooks object as the POST request body.
+         * @param options The create options
+         * @param callback The request callback with webhook id results
+         */
+        create(options: SparkPost.RelayWebhook, callback: SparkPost.ResultsCallback<{ id: string }>): void;
+        /**
+         * Update a relay webhook by specifying the webhook ID in the URI path.
+         * @param options The update options
+         * @param callback The request callback with webhook id results
+         */
+        update(options: SparkPost.UpdateRelayWebhook & { relayWebhookId: string }, callback: SparkPost.ResultsCallback<{ id: string }>): void;
+        /**
+         * Delete a relay webhook by specifying the webhook ID in the URI path.
+         * @param relayWebhookId The webhook id
+         * @param callback The request callback
+         */
+        delete(relayWebhookId: string, callback: SparkPost.Callback<void>): void;
+    };
+    sendingDomains: {
+        /**
+         * List an overview of all sending domains in the system.
+         * @param callback The request callback with SendingDomain results array
+         */
+        all(callback: SparkPost.ResultsCallback<SparkPost.SendingDomain[]>): void;
+        /**
+         * Retrieve a sending domain by specifying its domain name in the URI path. The response includes details about its DKIM key configuration.
+         * @param domain The domain
+         * @param callback The request callback with SendingDomain results
+         */
+        find(domain: string, callback: SparkPost.ResultsCallback<SparkPost.SendingDomain>): void;
+        /**
+         * Create a sending domain by providing a sending domain object as the POST request body.
+         * @param options The create options
+         * @param callback The request callback with basic info results
+         */
+        create(options: SparkPost.CreateSendingDomain, callback: SparkPost.ResultsCallback<{ message: string, domain: string }>): void;
+        /**
+         * Update the attributes of an existing sending domain by specifying its domain name in the URI path and use a sending domain object as the PUT request body.
+         * @param options The update options
+         * @param callback The request callback with basic info results
+         */
+        update(options: SparkPost.UpdateSendingDomain, callback: SparkPost.ResultsCallback<{ message: string, domain: string }>): void;
+        /**
+         * Delete an existing sending domain.
+         * @param domain The domain
+         * @param callback The request callback
+         */
+        delete(domain: string, callback: SparkPost.Callback<void>): void;
+        /**
+         * Verify a Sending Domain
+         * @param options The verify options
+         * @param callback The request callback with verify results
+         */
+        verify(options: SparkPost.VerifyOptions, callback: SparkPost.ResultsCallback<SparkPost.VerifyResults>): void;
+    };
+    subaccounts: {
+        /**
+         * Endpoint for retrieving a list of your subaccounts.
+         * This endpoint only returns information about the subaccounts themselves, not the data associated with the subaccount.
+         * @param callback The request callback with subaccount information results array
+         */
+        all(callback: SparkPost.ResultsCallback<SparkPost.SubaccountInformation[]>): void;
+        /**
+         *
+         * @param subaccountId The webhook id
+         * @param callback The request callback with subaccount information results
+         */
+        find(subaccountId: string | number, callback: SparkPost.ResultsCallback<SparkPost.SubaccountInformation>): void;
+        /**
+         * Provisions a new subaccount and an initial subaccount API key.
+         * @param options The create options
+         * @param callback The request callback with basic subaccount information results
+         */
+        create(options: SparkPost.CreateSubaccount, callback: SparkPost.ResultsCallback<SparkPost.CreateSubaccountResponse>): void;
+        /**
+         * Update an existing subaccount’s information.
+         * @param options The create options
+         * @param callback The request callback with webhook id results
+         */
+        update(options: SparkPost.UpdateSubaccount, callback: SparkPost.ResultsCallback<{ message: string }>): void;
+    };
+    suppressionList: {
+        /**
+         * Perform a filtered search for entries in your suppression list.
+         * @param parameters Object of search parameters
+         * @param callback The request callback with RelayWebhook results
+         */
+        search(parameters: SparkPost.SupressionSearch, callback: SparkPost.ResultsCallback<SparkPost.SupressionListEntry[]>): void;
+        /**
+         * Retrieve the suppression status for a specific recipient by specifying the recipient’s email address in the URI path.
+         * @param email Email address to check
+         * @param callback The request callback with webhook id results
+         */
+        checkStatus(email: string, callback: SparkPost.ResultsCallback<SparkPost.SupressionListEntry[]>): void;
+        /**
+         * Delete a recipient from the list by specifying the recipient’s email address in the URI path.
+         * @param email Email address to check
+         * @param callback The request callback
+         */
+        removeStatus(email: string, callback: SparkPost.Callback<void>): void;
+        /**
+         * Bulk insert or update entries in the customer-specific exclusion list.
+         * @param parameters The suppression entry list
+         * @param callback The request callback
+         */
+        upsert(parameters: SparkPost.CreateSupressionListEntry | SparkPost.CreateSupressionListEntry[], callback: SparkPost.ResultsCallback<{ message: string }>): void;
+    };
+    templates: {
+        /**
+         * List a summary of all templates.
+         * @param callback The request callback with TemplateMeta results array
+         */
+        all(callback: SparkPost.ResultsCallback<SparkPost.TemplateMeta[]>): void;
+        /**
+         * Retrieve details about a specified template by its id
+         * @param options The id and draft status information
+         * @param callback The request callback with Template results
+         */
+        find(options: { id: string, draft?: boolean }, callback: SparkPost.ResultsCallback<SparkPost.Template>): void;
+        /**
+         * Create a new template
+         * @param options The create options
+         * @param callback The request callback with template id results
+         */
+        create(options: { template: SparkPost.CreateTemplate }, callback: SparkPost.ResultsCallback<{ id: string }>): void;
+        /**
+         * Update an existing template
+         * @param options The create options
+         * @param callback The request callback with template id results
+         */
+        update(options: {
+            id: string,
+            template: SparkPost.UpdateTemplate,
+            update_published?: boolean;
+        }, callback: SparkPost.ResultsCallback<{ id: string }>): void;
+        /**
+         * Delete an existing template
+         * @param id The template id
+         * @param callback The request callback
+         */
+        delete(id: string, callback: SparkPost.Callback<void>): void;
+        /**
+         * Preview the most recent version of an existing template by id
+         * @param options The preview options
+         * @param callback The request callback with webhook id results
+         */
+        preview(options: { id: string, data: any, draft?: boolean }, callback: SparkPost.ResultsCallback<SparkPost.TemplateContent>): void;
+    };
+    transmissions: {
+        /**
+         * List an overview of all transmissions in the account
+         * @param callback The request callback with Transmission results array
+         */
+        all(callback: SparkPost.ResultsCallback<SparkPost.TransmissionSummary[]>): void;
+        /**
+         * List an overview of all transmissions in the account, with added filters
+         * @param options The search options { campaign_id?, template_id? }
+         * @param callback The request callback with Transmission results array
+         */
+        all(options: { campaign_id?: string, template_id?: string }, callback: SparkPost.ResultsCallback<SparkPost.TransmissionSummary[]>): void;
+        /**
+         * Retrieve the details about a transmission by its ID
+         * @param transmissionID The transmission id
+         * @param callback The request callback with Transmission results
+         */
+        find(transmissionID: string, callback: SparkPost.ResultsCallback<SparkPost.Transmission>): void;
+        /**
+         * Sends a message by creating a new transmission
+         * @param options The create options
+         * @param callback The request callback with metadata and id results
+         */
+        send(options: { transmissionBody: SparkPost.CreateTransmission, num_rcpt_errors?: number }, callback: SparkPost.ResultsCallback<{
+            total_rejected_recipients: number;
+            total_accepted_recipients: number;
+            id: string;
+        }>): void;
+    };
+    webhooks: {
+        /**
+         * List currently existing webhooks.
+         * @param callback The request callback with RelayWebhook results array
+         */
+        all(callback: SparkPost.ResultsCallback<Array<SparkPost.WebhookLinks & SparkPost.Webhook>>): void;
+        /**
+         * List currently existing webhooks.
+         * @param options Object containing optional timezone
+         * @param callback The request callback with RelayWebhook results array
+         */
+        all(options: { timezone?: string }, callback: SparkPost.ResultsCallback<Array<SparkPost.WebhookLinks & SparkPost.Webhook>>): void;
+        /**
+         * Retrieve details about a specified webhook by its id
+         * @param options Object containing id and optional timezone
+         * @param callback The request callback with RelayWebhook results
+         */
+        describe(options: { id: string, timezone?: string }, callback: SparkPost.ResultsCallback<SparkPost.WebhookLinks & SparkPost.Webhook>): void;
+        /**
+         * Create a new webhook
+         * @param options The create options
+         * @param callback The request callback with webhook id results
+         */
+        create(options: SparkPost.Webhook, callback: SparkPost.ResultsCallback<SparkPost.WebhookLinks & { id: string }>): void;
+        /**
+         * Update an existing webhook
+         * @param options The update options
+         * @param callback The request callback with webhook id results
+         */
+        update(options: SparkPost.UpdateWebhook, callback: SparkPost.ResultsCallback<SparkPost.WebhookLinks & { id: string }>): void;
+        /**
+         * Delete an existing webhook
+         * @param id The webhook id
+         * @param callback The request callback
+         */
+        delete(id: string, callback: SparkPost.Callback<void>): void;
+        /**
+         * Sends an example message event batch from the Webhook API to the target URL
+         * @param options The webhook id and message
+         * @param callback The request callback with validation results
+         */
+        validate(options: { id: string, message: any }, callback: SparkPost.ResultsCallback<{
+            msg: string;
+            response: {
+                status: number;
+                headers: any;
+                body: string;
+            }
+        }>): void;
+        /**
+         * Sends an example message event batch from the Webhook API to the target URL
+         * @param options The webhook id and optional limit
+         * @param callback The request callback with status results
+         */
+        getBatchStatus(options: { id: string, limit?: number }, callback: SparkPost.ResultsCallback<{
+            batch_id: string;
+            ts: string;
+            attempts: number;
+            response_code: number;
+        }[]>): void;
+        /**
+         * Lists descriptions of the events, event types, and event fields that could be included in a Webhooks post to your target URL.
+         * @param callback The request callback containing documentation results
+         */
+        getDocumentation(callback: SparkPost.ResultsCallback<any>): void;
+        /**
+         * List an example of the event data that will be posted by a Webhook for the specified events.
+         * @param callback The request callback containing examples
+         */
+        getSamples(callback: SparkPost.Callback<any>): void;
+        /**
+         * List an example of the event data that will be posted by a Webhook for the specified events.
+         * @param options The optional event name
+         * @param callback The request callback containing examples
+         */
+        getSamples(options: { events?: string }, callback: SparkPost.Callback<any>): void;
+    };
+
+    /**
+     * The official Node.js binding for your favorite SparkPost APIs!
+     * @param apiKey A passed in apiKey will take precedence over an environment variable
+     * @param options Additional options
+     */
+    constructor(apiKey?: string, options?: SparkPost.ConstructorOptions);
+
+    request(options: Request.Options, callback: SparkPost.Callback<any>): void;
+    get(options: Request.Options, callback: SparkPost.Callback<any>): void;
+    post(options: Request.Options, callback: SparkPost.Callback<any>): void;
+    put(options: Request.Options, callback: SparkPost.Callback<any>): void;
+    delete(options: Request.Options, callback: SparkPost.Callback<any>): void;
+}
+
+declare namespace SparkPost {
+
+    export interface ErrorWithDescription {
+        message: string;
+        code: string;
+        description: string;
+    }
+    export interface ErrorWithParam {
+        message: string;
+        param: string;
+        value: string | null;
+    }
+    export interface SparkPostError extends Error {
+        name: "SparkPostError";
+        errors: ErrorWithDescription[] | ErrorWithParam[];
+        statusCode: number;
+    }
+
+    export interface ConstructorOptions {
+        origin?: string;
+        endpoint?: string;
+        apiVersion?: string;
+        headers?: any;
+    }
+
+    export interface Response<T> extends Http.IncomingMessage {
+        body: T;
+    }
+    export interface Callback<T> {
+        (err: Error | SparkPostError | null, res: Response<T>): void;
+    }
+    export type ResultsCallback<T> = Callback<{ results: T }>;
+
+    export interface Domain {
+        domain: string;
+    }
+
+    export interface MessageEvent {
+        /** Type of event this record describes */
+        type: string;
+        /** Classification code for a given message (see [Bounce Classification Codes](https://support.sparkpost.com/customer/portal/articles/1929896)) */
+        bounce_class: string;
+        /** Campaign of which this message was a part */
+        campaign_id: string;
+        /** SparkPost-customer identifier through which this message was sent */
+        customer_id: string;
+        /** Protocol by which SparkPost delivered this message */
+        delv_method: string;
+        /** Token of the device / application targeted by this PUSH notification message. Applies only when delv_method is gcm or apn. */
+        device_token: string;
+        /** Error code by which the remote server described a failed delivery attempt */
+        error_code: string;
+        /** IP address of the host to which SparkPost delivered this message; in engagement events, the IP address of the host where the HTTP request originated */
+        ip_address: string;
+        /** SparkPost-cluster-wide unique identifier for this message */
+        message_id: string;
+        /** Sender address used on this message"s SMTP envelope */
+        msg_from: string;
+        /** Message"s size in bytes */
+        msg_size: string;
+        /** Number of failed attempts before this message was successfully delivered; when the first attempt succeeds, zero */
+        num_retries: string;
+        /** Metadata describing the message recipient */
+        rcpt_meta: any;
+        /** Tags applied to the message which generated this event */
+        rcpt_tags: string[];
+        /** Recipient address used on this message"s SMTP envelope */
+        rcpt_to: string;
+        /** Indicates that a recipient address appeared in the Cc or Bcc header or the archive JSON array */
+        rcpt_type: string;
+        /** Unmodified, exact response returned by the remote server due to a failed delivery attempt */
+        raw_reason: string;
+        /** Canonicalized text of the response returned by the remote server due to a failed delivery attempt */
+        reason: string;
+        /** Domain receiving this message */
+        routing_domain: string;
+        /** Subject line from the email header */
+        subject: string;
+        /** Slug of the template used to construct this message */
+        template_id: string;
+        /** Version of the template used to construct this message */
+        template_version: string;
+        /** Event date and time formatted as: YYYY-MM-DDTHH:MM:SS.SSS±hh:mm */
+        timestamp: string;
+        /** Transmission which originated this message */
+        transmission_id: string;
+    }
+
+    export interface MessageEventParameters {
+        /** delimited list of bounce classification codes to search. (See Bounce Classification Codes.) */
+        bounce_classes?: Array<string | number> | string | number;
+        /** delimited list of campaign ID’s to search (i.e. the campaign id used during creation of a transmission). */
+        campaign_ids?: string[] | string;
+        /** Specifies the delimiter for query parameter lists */
+        delimiter?: string;
+        /** delimited list of event types to search. Defaults to all event types. */
+        events?: string[] | string;
+        /** delimited list of friendly from emails to search. */
+        friendly_froms?: string[] | string;
+        /** Datetime in format of YYYY-MM-DDTHH:MM. */
+        from?: string;
+        /** delimited list of message ID’s to search. */
+        message_ids?: string[] | string;
+        /** The results page number to return. Used with per_page for paging through results. */
+        page?: number;
+        /** Number of results to return per page. Must be between 1 and 10,000 (inclusive). */
+        per_page?: number;
+        /** Bounce/failure/rejection reason that will be matched using a wildcard (e.g., %reason%). */
+        reason?: string[] | string;
+        /** delimited list of recipients to search. */
+        recipients?: string[] | string;
+        /** delimited list of subaccount ID’s to search. */
+        subaccounts?: number[] | number;
+        /** delimited list of template ID’s to search. */
+        template_ids?: string[] | string;
+        /** Standard timezone identification string. */
+        timezone?: string;
+        /** Datetime in format of YYYY-MM-DDTHH:MM. */
+        to?: string;
+        /** delimited list of transmission ID’s to search (i.e. id generated during creation of a transmission). */
+        transmission_ids?: string[] | string;
+    }
+
+    export interface RecipientListMetadata {
+        total_rejected_recipients: number;
+        total_accepted_recipients: number;
+        id: string;
+        name: string;
+    }
+
+    export interface RecipientList {
+        /** Short, unique, recipient list identifier */
+        id: string;
+        /** Short, pretty/readable recipient list display name, not required to be unique */
+        name: string;
+        /** Detailed description of the recipient list */
+        description: string;
+        /** Recipient list attribute object */
+        attributes: any;
+        /** Number of accepted recipients */
+        total_accepted_recipients: number;
+    }
+    export interface RecipientListWithRecipients extends RecipientList {
+        /** Array of recipient objects */
+        recipients: Recipient[];
+    }
+
+    export interface CreateRecipientList {
+        /** Short, unique, recipient list identifier */
+        id?: string;
+        /** Short, pretty/readable recipient list display name, not required to be unique */
+        name?: string;
+        /** Detailed description of the recipient list */
+        description?: string;
+        /** Recipient list attribute object */
+        attributes?: any;
+        /** limit the number of recipient errors returned. */
+        num_rcpt_errors?: number;
+        /** Array of recipient objects */
+        recipients: Recipient[];
+    }
+    export interface UpdateRecipientList {
+        /** Short, unique, recipient list identifier */
+        id?: string;
+        /** Short, pretty/readable recipient list display name, not required to be unique */
+        name?: string;
+        /** Detailed description of the recipient list */
+        description?: string;
+        /** Recipient list attribute object */
+        attributes?: any;
+        /** limit the number of recipient errors returned. */
+        num_rcpt_errors?: number;
+        /** Array of recipient objects */
+        recipients?: Recipient[];
+    }
+
+    export interface BaseRecipient {
+        /** SparkPost Enterprise API only. Email to use for envelope FROM. */
+        return_path?: string;
+        /** Array of text labels associated with a recipient. */
+        tags?: string[];
+        /** Key/value pairs associated with a recipient. */
+        metadata?: any;
+        /** Key/value pairs associated with a recipient that are provided to the substitution engine. */
+        substitution_data?: any;
+    }
+    export interface RecipientWithAddress {
+        /** Address information for a recipient  At a minimum, address or multichannel_addresses is required. */
+        address: Address | string;
+    }
+    export interface RecipientWithMultichannelAddresses {
+        /**
+         * Address information for a recipient.
+         * At a minimum, address or multichannel_addresses is required.
+         * If both address and multichannel_addresses are specified only multichannel_addresses will be used.
+         *
+         * @type {(Address | string)}
+         * @memberOf RecipientWithMultichannelAddresses
+         */
+        address?: Address | string;
+        /**
+         * Array of Multichannel Address objects for a recipient.
+         * At a minimum, address or multichannel_addresses is required.
+         * If both address and multichannel_addresses are specified only multichannel_addresses will be used.
+         *
+         * @type {MultichannelAddress[]}
+         * @memberOf RecipientWithMultichannelAddresses
+         */
+        multichannel_addresses: MultichannelAddress[];
+    }
+    export type Recipient = (RecipientWithAddress | RecipientWithMultichannelAddresses) & BaseRecipient;
+
+    export interface Address {
+        /** Valid email address */
+        email: string;
+        /** User-friendly name for the email address */
+        name?: string;
+        /** Email address to display in the “To” header instead of address.email (for CC and BCC) */
+        header_to?: string;
+    }
+
+    export interface MultichannelAddress {
+        /** The communication channel used to reach recipient. Valid values are “email”, “gcm”, “apns”. */
+        channel: string;
+        /** Valid email address. Required if channel is “email”. */
+        email: string;
+        /** User-friendly name for the email address. Used when channel is “email” */
+        name: string;
+        /** Email address to display in the “To” header instead of address.email (for BCC). Used when channel is “email” */
+        header_to: string;
+        /** SparkPost Enterprise API only. Required if channel is “gcm” or “apns” */
+        token: string;
+        /** SparkPost Enterprise API only. Required if channel is “gcm” or “apns” */
+        app_id: string;
+    }
+
+    export interface RelayWebhook {
+        /** User-friendly name  no  example: Inbound Customer Replies */
+        name?: string;
+        /** URL of the target to which to POST relay batches */
+        target: string;
+        /** Authentication token to present in the X-MessageSystems-Webhook-Token header of POST requests to target */
+        auth_token?: string;
+        /** Restrict which inbound messages will be relayed to the target */
+        match: Match;
+    }
+
+    export interface UpdateRelayWebhook {
+        /** User-friendly name  no  example: Inbound Customer Replies */
+        name?: string;
+        /** URL of the target to which to POST relay batches */
+        target?: string;
+        /** Authentication token to present in the X-MessageSystems-Webhook-Token header of POST requests to target */
+        auth_token?: string;
+        /** Restrict which inbound messages will be relayed to the target */
+        match?: Match;
+    }
+
+    export interface Match {
+        /** Inbound messaging protocol associated with this webhook. Defaults to “SMTP” */
+        protocol?: string;
+        /** Inbound domain associated with this webhook. Required when protocol is “SMTP”. */
+        domain?: string;
+        /** ESME address binding associated with this webhook  yes, when protocol is “SMPP”. SparkPost Enterprise API only. */
+        esme_address?: string;
+    }
+
+    export interface SendingDomain {
+        /** Name of the sending domain. */
+        domain: string;
+        /** Associated tracking domain. */
+        tracking_domain: string;
+        /** JSON object containing status details, including whether this domain’s ownership has been verified. */
+        status: Status;
+        /** JSON object in which DKIM key configuration is defined. */
+        dkim?: DKIM;
+        /** Whether to generate a DKIM keypair on creation. */
+        generate_dkim?: boolean;
+        /** Size, in bits, of the DKIM private key to be generated. This option only applies if generate_dkim is ‘true’. */
+        dkim_key_length?: number;
+        /** Setting to true allows this domain to be used by subaccounts. Defaults to false, only available to domains belonging to a master account. */
+        shared_with_subaccounts: boolean;
+    }
+
+    export interface CreateSendingDomain {
+        /** Name of the sending domain. */
+        domain: string;
+        /** Associated tracking domain. */
+        tracking_domain?: string;
+        /** JSON object containing status details, including whether this domain’s ownership has been verified. */
+        status?: Status;
+        /** JSON object in which DKIM key configuration is defined. */
+        dkim?: DKIM;
+        /** Whether to generate a DKIM keypair on creation. */
+        generate_dkim?: boolean;
+        /** Size, in bits, of the DKIM private key to be generated. This option only applies if generate_dkim is ‘true’. */
+        dkim_key_length?: number;
+        /** Setting to true allows this domain to be used by subaccounts. Defaults to false, only available to domains belonging to a master account. */
+        shared_with_subaccounts?: boolean;
+    }
+
+    export interface UpdateSendingDomain {
+        /** Name of the sending domain. */
+        domain: string;
+        /** Associated tracking domain. */
+        tracking_domain?: string;
+        /** JSON object in which DKIM key configuration is defined. */
+        dkim?: DKIM;
+        /** Whether to generate a DKIM keypair on creation. */
+        generate_dkim?: boolean;
+        /** Size, in bits, of the DKIM private key to be generated. This option only applies if generate_dkim is ‘true’. */
+        dkim_key_length?: number;
+        /** Setting to true allows this domain to be used by subaccounts. Defaults to false, only available to domains belonging to a master account. */
+        shared_with_subaccounts?: boolean;
+    }
+
+    export interface DKIM {
+        /** Signing Domain Identifier (SDID). SparkPost Enterprise API only. */
+        signing_domain?: string;
+        /** DKIM private key. */
+        private?: string;
+        /** DKIM public key. */
+        public: string;
+        /** DomainKey selector. */
+        selector: string;
+        /** Header fields to be included in the DKIM signature. This field is currently ignored. */
+        headers?: string;
+    }
+
+    export interface Status {
+        /** Whether domain ownership has been verified */
+        ownership_verified: boolean;
+        /** Verification status of SPF configuration */
+        spf_status: "valid" | "invalid" | "unverified" | "pending";
+        /** Compliance status */
+        compliance_status: "valid" | "pending" | "blocked";
+        /** Verification status of DKIM configuration */
+        dkim_status: "valid" | "invalid" | "unverified" | "pending";
+        /** Verification status of abuse@ mailbox */
+        abuse_at_status: "valid" | "invalid" | "unverified" | "pending";
+        /** Verification status of postmaster@ mailbox */
+        postmaster_at_status: "valid" | "invalid" | "unverified" | "pending";
+    }
+
+    export interface VerifyOptions {
+        domain: string;
+        verifyDKIM?: boolean;
+        verifySPF?: boolean;
+    }
+
+    export interface VerifyResults extends Status {
+        dns?: {
+            dkim_record: string;
+            spf_record: string;
+        };
+    }
+
+    export interface CreateSubaccount {
+        /** user-friendly name */
+        name: string;
+        /** user-friendly identifier for subaccount API key */
+        keyLabel: string;
+        /** list of grants to give the subaccount API key */
+        keyGrants: string[];
+        /** list of IPs the subaccount may be used from */
+        keyValidIps?: string[];
+        /** id of the default IP pool assigned to subaccount"s transmissions */
+        ipPool?: string;
+    }
+
+    export interface CreateSubaccountResponse {
+        subaccount_id: number;
+        key: string;
+        label: string;
+        short_key: string;
+    }
+
+    export interface UpdateSubaccount {
+        /** the id of the subaccount you want to update */
+        subaccountId: string | number;
+        /** user-friendly name */
+        name: string;
+        /** status of the subaccount */
+        status: string;
+        /** id of the default IP pool assigned to subaccount"s transmissions */
+        ipPool?: string;
+    }
+
+    export interface SubaccountInformation {
+        /** ID of subaccount */
+        id: number;
+        /** User friendly identifier for a specific subaccount */
+        name: string;
+        /** Status of the account */
+        status: "active" | "suspended" | "terminated";
+        /** The ID of the default IP Pool assigned to this subaccount’s transmissions */
+        ip_pool?: string;
+        compliance_status: string;
+    }
+
+    export interface CreateSupressionListEntry {
+        recipient: string;
+        /** Whether the recipient requested to not receive any transactional messages. At a minimum, transactional or non_transactional is required upon creation of the entry.   */
+        transactional?: boolean;
+        /** Whether the recipient requested to not receive any non-transactional messages. At a minimum, transactional or non_transactional is required upon creation of the entry.   */
+        non_transactional?: boolean;
+        /** Short explanation of the suppression */
+        description?: string;
+    }
+
+    export interface SupressionListEntry {
+        recipient: string;
+        /** Whether the recipient requested to not receive any transactional messages. At a minimum, transactional or non_transactional is required upon creation of the entry.   */
+        transactional?: boolean;
+        /** Whether the recipient requested to not receive any non-transactional messages. At a minimum, transactional or non_transactional is required upon creation of the entry.   */
+        non_transactional?: boolean;
+        /** Coming soon */
+        type?: "transactional" | "non_transactional";
+        /** Source responsible for inserting the list entry. Valid values include: Spam Complaint, List Unsubscribe, Bounce Rule, Unsubscribe Link, Manually Added, Compliance. */
+        source?: string;
+        /** Short explanation of the suppression */
+        description?: string;
+        created: string;
+        updated: string;
+    }
+
+    export interface SupressionSearch {
+        /** Datetime the entries were last updated, in the format of YYYY-MM-DDTHH:mm:ssZ */
+        to?: string;
+        /** Datetime the entries were last updated, in the format YYYY-MM-DDTHH:mm:ssZ */
+        from?: string;
+        /** Types of entries to include in the search, i.e. entries with “transactional” and/or “non_transactional” keys set to true */
+        types?: string;
+        /** Sources of the entries to include in the search, i.e. entries that were added by this source */
+        sources?: string;
+        /** Maximum number of results to return. Must be between 1 and 100000. Default value is 100000. */
+        limit?: number;
+    }
+
+    export interface TemplateContent {
+        /** HTML content for the email’s text/html MIME part */
+        html: string;
+        /** Text content for the email’s text/plain MIME part */
+        text: string;
+        /** Email subject line. */
+        subject: string;
+        /**
+         * Address “from” : "deals@company.com" or JSON object composed of the “name” and “email” fields
+         * “from” : { “name” : “My Company”, “email” : "deals@company.com" } used to compose the email’s “From” header.
+         *
+         * @type {(Address | string)}
+         * @memberOf CreateTemplateContent
+         */
+        from: Address | string;
+        /** Email address used to compose the email’s “Reply-To” header. */
+        reply_to?: string;
+        /**  JSON dictionary containing headers other than “Subject”, “From”, “To”, and “Reply-To”. */
+        headers?: any;
+    }
+
+    export interface CreateTemplateContent {
+        /** HTML content for the email’s text/html MIME part */
+        html?: string;
+        /** Text content for the email’s text/plain MIME part */
+        text?: string;
+        /** Email subject line. */
+        subject: string;
+        /**
+         * Address “from” : "deals@company.com" or JSON object composed of the “name” and “email” fields
+         * “from” : { “name” : “My Company”, “email” : "deals@company.com" } used to compose the email’s “From” header.
+         *
+         * @type {(Address | string)}
+         * @memberOf CreateTemplateContent
+         */
+        from: Address | string;
+        /** Email address used to compose the email’s “Reply-To” header. */
+        reply_to?: string;
+        /**  JSON dictionary containing headers other than “Subject”, “From”, “To”, and “Reply-To”. */
+        headers?: any;
+    }
+
+    export interface TemplateMeta {
+        /** Unique template ID */
+        id: string;
+        /** Template name */
+        name: string;
+        /** Published state of the template (true = published, false = draft) */
+        published: boolean;
+        /** Template description */
+        description: string;
+    }
+
+    export interface Template {
+        /**
+         * Short, unique, alphanumeric ID used to reference the template.
+         * At a minimum, id or name is required upon creation. It is auto generated if not provided.
+         * After a template has been created, this property cannot be changed. Maximum length - 64 bytes
+         *
+         * @type {string}
+         * @memberOf CreateTemplate
+         */
+        id: string;
+        /** Content that will be used to construct a message  yes  For a full description, see the Content Attributes. Maximum length - 20 MBs */
+        content: TemplateContent | { email_rfc822: string };
+        /** Whether the template is published or is a draft version  no - defaults to false  A template cannot be changed from published to draft. */
+        published: boolean;
+        /** Editable display name  At a minimum, id or name is required upon creation.  The name does not have to be unique. Maximum length - 1024 bytes */
+        name: string;
+        /** Detailed description of the template  no  Maximum length - 1024 bytes */
+        description: string;
+        /** JSON object in which template options are defined  no  For a full description, see the Options Attributes. */
+        options: TemplateOptions;
+        /** The “last_update_time” is the time the template was last updated, for both draft and published versions */
+        last_update_time: string;
+        /** The “last_use” time represents the last time any version of this template was used (draft or published). */
+        last_use?: string;
+    }
+
+    export interface CreateTemplate {
+        /**
+         * Short, unique, alphanumeric ID used to reference the template.
+         * At a minimum, id or name is required upon creation. It is auto generated if not provided.
+         * After a template has been created, this property cannot be changed. Maximum length - 64 bytes
+         *
+         * @type {string}
+         * @memberOf CreateTemplate
+         */
+        id?: string;
+        /** Content that will be used to construct a message  yes  For a full description, see the Content Attributes. Maximum length - 20 MBs */
+        content: CreateTemplateContent | { email_rfc822: string };
+        /** Whether the template is published or is a draft version  no - defaults to false  A template cannot be changed from published to draft. */
+        published?: boolean;
+        /** Editable display name  At a minimum, id or name is required upon creation.  The name does not have to be unique. Maximum length - 1024 bytes */
+        name?: string;
+        /** Detailed description of the template  no  Maximum length - 1024 bytes */
+        description?: string;
+        /** JSON object in which template options are defined  no  For a full description, see the Options Attributes. */
+        options?: CreateTemplateOptions;
+    }
+
+    export interface UpdateTemplate {
+        /** Content that will be used to construct a message  yes  For a full description, see the Content Attributes. Maximum length - 20 MBs */
+        content?: CreateTemplateContent | { email_rfc822: string };
+        /** Whether the template is published or is a draft version  no - defaults to false  A template cannot be changed from published to draft. */
+        published?: boolean;
+        /** Editable display name  At a minimum, id or name is required upon creation.  The name does not have to be unique. Maximum length - 1024 bytes */
+        name?: string;
+        /** Detailed description of the template  no  Maximum length - 1024 bytes */
+        description?: string;
+        /** JSON object in which template options are defined  no  For a full description, see the Options Attributes. */
+        options?: CreateTemplateOptions;
+    }
+
+    export interface TemplateOptions {
+        /** Enable or disable open tracking */
+        open_tracking: boolean;
+        /** Enable or disable click tracking */
+        click_tracking: boolean;
+        /** Distinguish between transactional and non-transactional messages for unsubscribe and suppression purposes */
+        transactional: boolean;
+    }
+
+    export interface CreateTemplateOptions {
+        /** Enable or disable open tracking */
+        open_tracking?: boolean;
+        /** Enable or disable click tracking */
+        click_tracking?: boolean;
+        /** Distinguish between transactional and non-transactional messages for unsubscribe and suppression purposes */
+        transactional?: boolean;
+    }
+
+    export interface CreateTransmission {
+        /** JSON object in which transmission options are defined */
+        options?: TransmissionOptions;
+        /** Inline recipient objects or object containing stored recipient list ID */
+        recipients?: Recipient[] | { list_id: string };
+        /** Name of the campaign */
+        campaign_id?: string;
+        /** Description of the transmission */
+        description?: string;
+        /** Transmission level metadata containing key/value pairs */
+        metadata?: any;
+        /** Key/value pairs that are provided to the substitution engine */
+        substitution_data?: any;
+        /** SparkPost Enterprise API only: email to use for envelope FROM */
+        return_path?: string;
+        /** Content that will be used to construct a message */
+        content: InlineContent | { template_id: string, use_draft_template?: boolean } | { email_rfc822: string };
+    }
+
+    export interface TransmissionSummary {
+        /** ID of the transmission */
+        id: string;
+        /** State of the transmission */
+        state: "submitted" | "Generating" | "Success" | "Canceled";
+        /** Description of the transmission */
+        description: string;
+        /** Name of the campaign */
+        campaign_id: string;
+        /** Content that will be used to construct a message */
+        content: { template_id: string };
+    }
+
+    export interface Transmission {
+        /** ID of the transmission */
+        id: string;
+        /** State of the transmission */
+        state: "submitted" | "Generating" | "Success" | "Canceled";
+        /** JSON object in which transmission options are defined */
+        options: TransmissionOptions;
+        /** Name of the campaign */
+        campaign_id: string;
+        /** Description of the transmission */
+        description: string;
+        /** Transmission level metadata containing key/value pairs */
+        metadata: any;
+        /** Key/value pairs that are provided to the substitution engine */
+        substitution_data: any;
+        /** Content that will be used to construct a message */
+        content: InlineContent | { template_id: string, use_draft_template?: boolean } | { email_rfc822: string };
+        /** Computed total number of messages generated */
+        num_generated: number;
+        /** Computed total number of failed messages */
+        num_failed_generation: number;
+        /** Number of recipients that failed input validation */
+        num_invalid_recipients: number;
+        rcpt_list_chunk_size: number;
+        rcpt_list_total_chunks: number;
+    }
+
+    export interface TransmissionOptions {
+        /** Delay generation of messages until this datetime. */
+        start_time?: string;
+        /** Whether open tracking is enabled for this transmission */
+        open_tracking?: boolean;
+        /** Whether click tracking is enabled for this transmission */
+        click_tracking?: boolean;
+        /** Whether message is transactional or non-transactional for unsubscribe and suppression purposes */
+        transactional?: boolean;
+        /** Whether or not to use the sandbox sending domain */
+        sandbox?: boolean;
+        /** SparkPost Enterprise API only: Whether or not to ignore customer suppression rules, for this transmission only. Only applicable if your configuration supports this parameter. */
+        skip_suppression?: boolean;
+        /** The ID of a dedicated IP pool associated with your account ( Note: SparkPost only ). */
+        ip_pool?: string;
+        /** Whether or not to perform CSS inlining in HTML content */
+        inline_css?: boolean;
+    }
+
+    export interface InlineContent {
+        /** HTML content for the email’s text/html MIME part  At a minimum, html, text, or push is required. */
+        html?: string;
+        /** Text content for the email’s text/plain MIME part  At a minimum, html, text, or push is required. */
+        text?: string;
+        /**  Content of push notifications  At a minimum, html, text, or push is required.  SparkPost Enterprise API only. */
+        push?: PushData;
+        /** Email subject line  required for email transmissions  Expected in the UTF-8 charset without RFC2047 encoding. Substitution syntax is supported. */
+        subject?: string;
+        /** "deals@company.com" or JSON object composed of the “name” and “email” fields “from” : { “name” : “My Company”, “email” : "deals@company.com" } used to compose the email’s “From” header */
+        from?: string | { email: string, name: string };
+        /** Email address used to compose the email’s “Reply-To” header */
+        reply_to?: string;
+        /** JSON dictionary containing headers other than “Subject”, “From”, “To”, and “Reply-To” */
+        headers?: any;
+        /** JSON array of attachments. */
+        attachments?: Attachment[];
+        /** JSON array of inline images. */
+        inline_images?: Attachment[];
+    }
+
+    export interface PushData {
+        /** payload for APNs messages */
+        apns?: any;
+        /** payload for GCM messages */
+        gcm?: any;
+    }
+
+    export interface Attachment {
+        /**
+         * The MIME type of the attachment; e.g., “text/plain”, “image/jpeg”, “audio/mp3”, “video/mp4”, “application/msword”, “application/pdf”, etc.,
+         * including the “charset” parameter (text/html; charset=“UTF-8”) if needed.
+         * The value will apply “as-is” to the “Content-Type” header of the generated MIME part for the attachment.
+         *
+         * @type {string}
+         * @memberOf Attachment
+         */
+        type: string;
+        /**   The filename of the attachment (for example, “document.pdf”). This is inserted into the filename parameter of the Content-Disposition header. */
+        name: string;
+        /**
+         * The content of the attachment as a Base64 encoded string.
+         * The string should not contain \r\n line breaks.
+         * The SparkPost systems will add line breaks as necessary to ensure the Base64 encoded lines contain no more than 76 characters each.
+         *
+         * @type {string}
+         * @memberOf Attachment
+         */
+        data: string;
+    }
+
+    export interface Webhook {
+        /** User-friendly name for webhook */
+        name: string;
+        /** URL of the target to which to POST event batches */
+        target: string;
+        /** Array of event types this webhook will receive */
+        events: string[];
+        /** Type of authentication to be used during POST requests to target */
+        auth_type?: string;
+        /** Object containing details needed to request authorization credentials, as necessary */
+        auth_request_details?: any;
+        /** Object containing credentials needed to make authorized POST requests to target */
+        auth_credentials?: any;
+        /** Authentication token to present in the X-MessageSystems-Webhook-Token header of POST requests to target */
+        auth_token?: string;
+    }
+
+    export interface UpdateWebhook {
+        id: string;
+        /** User-friendly name for webhook */
+        name?: string;
+        /** URL of the target to which to POST event batches */
+        target?: string;
+        /** Array of event types this webhook will receive */
+        events?: string[];
+        /** Type of authentication to be used during POST requests to target */
+        auth_type?: string;
+        /** Object containing details needed to request authorization credentials, as necessary */
+        auth_request_details?: any;
+        /** Object containing credentials needed to make authorized POST requests to target */
+        auth_credentials?: any;
+        /** Authentication token to present in the X-MessageSystems-Webhook-Token header of POST requests to target */
+        auth_token?: string;
+    }
+
+    export interface WebhookLinks {
+        links: {
+            href: string;
+            rel: string;
+            method: string[];
+        }[];
+    }
+}
+
+export = SparkPost;
diff --git a/sparkpost/v1/sparkpost-tests.ts b/sparkpost/v1/sparkpost-tests.ts
new file mode 100644
index 0000000000..0b8a41ab0a
--- /dev/null
+++ b/sparkpost/v1/sparkpost-tests.ts
@@ -0,0 +1,944 @@
+import * as SparkPost from "sparkpost";
+
+let key = "YOURAPIKEY";
+let client = new SparkPost(key);
+
+client.get({
+  uri: "metrics/domains"
+}, function(err, data) {
+  if (err) {
+    console.log(err);
+    return;
+  }
+
+  console.log(data.body);
+});
+
+client.inboundDomains.create("example1.com", function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.inboundDomains.delete("example1.com", function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.inboundDomains.find("example1.com", function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.inboundDomains.all(function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.messageEvents.search({}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.messageEvents.search({
+  events: "click",
+  campaign_ids: "monday_mailshot"
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.messageEvents.search({
+  from: "2016-01-01T00:00",
+  to: "2016-01-02T23:59",
+  page: 1,
+  per_page: 5,
+  events: ["bounce", "out_of_band"],
+  bounce_classes: [10]
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.recipientLists.create({
+  id: "UNIQUE_TEST_ID",
+  name: "Test Recipient List",
+  recipients: [
+    {
+      address: {
+        email: "test1@test.com"
+      }
+    }, {
+      address: {
+        email: "test2@test.com"
+      }
+    }, {
+      address: {
+        email: "test3@test.com"
+      }
+    }
+  ]
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.recipientLists.delete("UNIQUE_TEST_ID", function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.recipientLists.all(function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.recipientLists.find({
+  id: "UNIQUE_TEST_ID"
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.recipientLists.find({
+  id: "UNIQUE_TEST_ID",
+  show_recipients: true
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.recipientLists.update({
+  id: "EXISTING_TEST_ID",
+  name: "Test Recipient List",
+  recipients: [
+    {
+      address: {
+        email: "test1@test.com"
+      }
+    }, {
+      address: {
+        email: "test2@test.com"
+      }
+    }, {
+      address: {
+        email: "test3@test.com"
+      }
+    }
+  ]
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.relayWebhooks.create({
+  name: "Test Relay Webhook",
+  target: "http://client.test.com/test-webhook",
+  match: {
+    domain: "inbound.example.com"
+  }
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.relayWebhooks.delete("123456789", function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.relayWebhooks.find("123456789", function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.relayWebhooks.all(function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.relayWebhooks.update({
+  relayWebhookId: "123456789",
+  target: "http://client.test.com/test-webhook"
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.sendingDomains.create({
+  domain: "example1.com",
+  dkim: {
+    "private": "MIICXgIBAAKBgQC+W6scd3XWwvC//Y1g==",
+    "public": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+W6scd3XWwvC/==",
+    selector: "brisbane",
+    headers: "from:to:subject:date"
+  }
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+
+client.sendingDomains.delete("example1.com", function(err, data) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(data);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.sendingDomains.all(function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.sendingDomains.find("example1.com", function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.sendingDomains.update({
+  domain: "example1.com",
+  dkim: {
+    "private": "MIICXgIBAAKBgQC+W6scd3XWwvC/hPRksfDYFi3ztgyS9OSqnnjtNQeDdTSD1DRx//Y1g==",
+    "public": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+W6scd3XWwvC/==",
+    selector: "hello_selector",
+    headers: "from:to:subject:date"
+  }
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.sendingDomains.verify({
+  domain: "example1.com"
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.sendingDomains.verify({
+  domain: "example1.com",
+  verifySPF: false
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.sendingDomains.verify({
+  domain: "example1.com",
+  verifyDKIM: false
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.subaccounts.create({
+  name: "Test Subaccount",
+  keyLabel: "Test Subaccount key",
+  keyGrants: [
+    "smtp/inject",
+    "transmissions/modify"
+  ]
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.subaccounts.all(function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.subaccounts.find(123, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.subaccounts.update({
+  subaccountId: 123,
+  name: "Test Subaccount",
+  status: "suspended"
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.suppressionList.checkStatus("test@test.com", function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.suppressionList.removeStatus("test@test.com", function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.suppressionList.search({
+  from: "2015-05-07T00:00:00+0000",
+  to: "2015-05-07T23:59:59+0000",
+  limit: 5
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.suppressionList.upsert([
+  {
+    recipient: "test1@test.com",
+    transactional: false,
+    non_transactional: true,
+    description: "Test description 1"
+  },
+  {
+    recipient: "test2@test.com",
+    transactional: true,
+    non_transactional: true,
+    description: "Test description 2"
+  },
+  {
+    recipient: "test3@test.com",
+    transactional: true,
+    non_transactional: false,
+    description: "Test description 3"
+  }
+], function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our client library!");
+  }
+});
+
+client.templates.create({
+  template: {
+    id: "TEST_ID",
+    name: "Test Template",
+    content: {
+      from: "test@test.com",
+      subject: "Test email template!",
+      html: "<b>This is a test email template!</b>"
+    }
+  }
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.templates.delete("TEST_ID", function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+
+client.templates.all(function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.templates.find({
+  id: "TEST_ID",
+  draft: true
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.templates.find({
+  id: "TEST_ID"
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.templates.preview({
+  id: "TEST_ID",
+  data: {}
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.templates.update({
+  id: "TEST_ID",
+  template: {
+    content: {
+      from: "test@test.com",
+      subject: "Updated Published Test email template!",
+      html: "<b>This is a published test email template! Updated!</b>"
+    }
+  },
+  update_published: true
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.templates.update({
+  id: "TEST_ID",
+  template: {
+    content: {
+      from: "test@test.com",
+      subject: "Updated Test email template!",
+      html: "<b>This is a test email template! Updated!</b>"
+    }
+  }
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.transmissions.all(function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.transmissions.find("YOUR-TRANSMISSION-KEY", function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.transmissions.all({
+  campaign_id: "my_campaign"
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.transmissions.all({
+  template_id: "my_template"
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.transmissions.send({
+  transmissionBody: {
+    recipients: [{ address: { email: "john.doe@example.com" } }],
+    content: {
+      from: "From Envelope <from@example.com>",
+      subject: "Example Email for MIME Parts",
+      html: "<html><body><p>Hello World!</p></body></html>",
+      text: "Hello World!"
+    },
+    options: {
+      open_tracking: true,
+      click_tracking: true
+    }
+  }
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.transmissions.send({
+  transmissionBody: {
+    recipients: [{address: {email: "john.doe@example.com"}}],
+    content: {
+      email_rfc822: "Content-Type: text/plain\nFrom: From Envelope <from@example.com>\nSubject: Example Email\n\nHello World"
+    }
+  }
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.transmissions.send({
+  transmissionBody: {
+    options: {
+      open_tracking: true,
+      click_tracking: true
+    },
+    campaign_id: "christmas_campaign",
+    return_path: "bounces-christmas-campaign@flintstone.com",
+    metadata: {
+      user_type: "students"
+    },
+    substitution_data: {
+      sender: "Big Store Team"
+    },
+    recipients: [
+      {
+        return_path: "123@bounces.flintstone.com",
+        address: {
+          email: "wilma@flintstone.com",
+          name: "Wilma Flintstone"
+        },
+        tags: [
+          "greeting",
+          "prehistoric",
+          "fred",
+          "flintstone"
+        ],
+        metadata: {
+          place: "Bedrock"
+        },
+        substitution_data: {
+          customer_type: "Platinum"
+        }
+      }
+    ],
+    content: {
+      from: {
+        name: "Fred Flintstone",
+        email: "fred@flintstone.com"
+      },
+      subject: "Big Christmas savings!",
+      reply_to: "Christmas Sales <sales@flintstone.com>",
+      headers: {
+        "X-Customer-Campaign-ID": "christmas_campaign"
+      },
+      text: "Hi {{address.name}} \nSave big this Christmas in your area {{place}}! \nClick http://www.mysite.com and get huge discount\n Hurry, this offer is only to {{customer_type}}\n {{sender}}",
+      html: "<p>Hi {{address.name}} \nSave big this Christmas in your area {{place}}! \nClick http://www.mysite.com and get huge discount\n</p>"
+    }
+  }
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.transmissions.send({
+  transmissionBody: {
+    recipients: [
+      {
+        address: {
+          email: "original.recipient@example.com",
+          name: "Original Recipient"
+        },
+        substitution_data: {
+          recipient_type: "Original"
+        }
+      },
+      {
+        address: {
+          email: "bcc.recipient@example.com",
+          header_to: "\"Original Recipient\" <original.recipient@example.com>"
+        },
+        substitution_data: {
+          recipient_type: "BCC"
+        }
+      }
+    ],
+    content: {
+      from: {
+        name: "Node BCC Test",
+        email: "from@example.com"
+      },
+      subject: "Example email using bcc",
+      text: "An example email using bcc with SparkPost to the {{recipient_type}} recipient.",
+      html: "<p>An example email using bcc with SparkPost to the {{recipient_type}} recipient.</p>"
+    }
+  }
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats! You sent an email with bcc using SparkPost!");
+  }
+});
+
+client.transmissions.send({
+  transmissionBody: {
+    recipients: [
+      {
+        address: {
+          email: "original.recipient@example.com",
+          name: "Original Recipient"
+        },
+        substitution_data: {
+          recipient_type: "Original"
+        }
+      },
+      {
+        address: {
+          email: "cc.recipient@example.com",
+          name: "Carbon Copy Recipient",
+          header_to: "\"Original Recipient\" <original.recipient@example.com>"
+        },
+        substitution_data: {
+          recipient_type: "CC"
+        }
+      }
+    ],
+    content: {
+      from: {
+        name: "Node CC Test",
+        email: "from@example.com"
+      },
+      headers: {
+        "CC": "\"Carbon Copy Recipient\" <cc.recipient@example.com>"
+      },
+      subject: "Example email using cc",
+      text: "An example email using cc with SparkPost to the {{recipient_type}} recipient.",
+      html: "<p>An example email using cc with SparkPost to the {{recipient_type}} recipient.</p>"
+    }
+  }
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats! You sent an email with cc using SparkPost!");
+  }
+});
+
+client.transmissions.send({
+  transmissionBody: {
+    recipients: {
+      list_id: "example-list"
+    },
+    content: {
+      from: "From Envelope <from@example.com>",
+      subject: "Example Email for Stored List and Inline Content",
+      html: "<html><body><p>Hello World</p></body></html>",
+      text: "Hello World!"
+    }
+  }
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.transmissions.send({
+  transmissionBody: {
+    recipients: {
+      list_id: "example-list"
+    },
+    content: {
+      from: "From Envelope <from@example.com>",
+      subject: "Example Email for Stored List and Template",
+      template_id: "my-template"
+    }
+  }
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.transmissions.send({
+  num_rcpt_errors: 3,
+  transmissionBody: {
+    campaign_id: "ricks-campaign",
+    content: {
+      template_id: "ricks-template"
+    },
+    recipients: [{ address: { email: "rick.sanchez@rickandmorty100years.com", name: "Rick Sanchez" } }]
+  }
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("What up my glib globs! SparkPost!");
+  }
+});
+
+client.webhooks.create({
+  name: "Test webhook",
+  target: "http://client.test.com/test-webhook",
+  auth_token: "AUTH_TOKEN",
+  events: [
+    "delivery",
+    "injection",
+    "open",
+    "click"
+  ]
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.webhooks.delete("TEST_WEBHOOK_UUID", function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.webhooks.describe({
+  id: "TEST_WEBHOOK_UUID",
+  timezone: "America/New_York"
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.webhooks.getBatchStatus({
+  id: "TEST_WEBHOOK_UUID",
+  limit: 1000
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+
+client.webhooks.getDocumentation(function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.webhooks.getSamples({
+  events: "bounce"
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.webhooks.all(function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.webhooks.update({
+  id: "TEST_WEBHOOK_UUID",
+  name: "Renamed Test webhook",
+  events: [
+    "policy_rejection",
+    "delay"
+  ]
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
+
+client.webhooks.validate({
+  id: "TEST_WEBHOOK_UUID",
+  message: {
+    msys: {}
+  }
+}, function(err, res) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log(res.body);
+    console.log("Congrats you can use our SDK!");
+  }
+});
diff --git a/sparkpost/v1/tsconfig.json b/sparkpost/v1/tsconfig.json
new file mode 100644
index 0000000000..54f30b3435
--- /dev/null
+++ b/sparkpost/v1/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+          "sparkpost": ["sparkpost/v1"],
+          "sparkpost/*": ["sparkpost/v1/*"]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sparkpost-tests.ts"
+    ]
+}
diff --git a/speakeasy/index.d.ts b/speakeasy/index.d.ts
index 15ec90c09a..4e281f996f 100644
--- a/speakeasy/index.d.ts
+++ b/speakeasy/index.d.ts
@@ -49,6 +49,7 @@ interface TotpOptions {
     counter?: number;
     epoch?: number;
     secret?: string;
+    digits?: number;
     digest?: () => string;
     algorithm?: string;
 }
diff --git a/speakingurl/index.d.ts b/speakingurl/index.d.ts
index 289c1eb033..83e38fd7b8 100644
--- a/speakingurl/index.d.ts
+++ b/speakingurl/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for speakingurl 10.0
+// Type definitions for speakingurl 13.0
 // Project: http://pid.github.io/speakingurl/
 // Definitions by: Zlatko Andonovski <https://github.com/Goldsmith42/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -7,7 +7,7 @@ interface Dictionary<T> {
     [x: string]: T;
 }
 
-interface Options {
+interface SpeakingURLOptions {
     separator?: string;
     lang?: string|boolean;
     symbols?: boolean;
@@ -20,10 +20,10 @@ interface Options {
     custom?: string[]|Dictionary<string>;
 }
 
-declare function getSlug(input: string, options?: Options|string): string;
+declare function getSlug(input: string, options?: SpeakingURLOptions|string): string;
 
 declare namespace getSlug {
-    export function createSlug(options: Options): (input: string) => string;
+    export function createSlug(options: SpeakingURLOptions): (input: string) => string;
 }
 
-export = getSlug;
\ No newline at end of file
+export = getSlug;
diff --git a/spectrum/spectrum-tests.ts b/spectrum/spectrum-tests.ts
index e9bf388bbe..e52bd36ce9 100644
--- a/spectrum/spectrum-tests.ts
+++ b/spectrum/spectrum-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 $("#picker").spectrum();
 
 $("#picker").spectrum({
diff --git a/split/split-tests.ts b/split/split-tests.ts
index 204a044b68..98308fbc10 100644
--- a/split/split-tests.ts
+++ b/split/split-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import stream = require("stream");
 import split = require("split");
 
diff --git a/sql.js/sql.js-tests.ts b/sql.js/sql.js-tests.ts
index 0829f7692a..52f44c7438 100644
--- a/sql.js/sql.js-tests.ts
+++ b/sql.js/sql.js-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="node" />
-
-
 import fs = require("fs");
 import * as SQL from "sql.js";
 
diff --git a/ss-utils/ss-utils-tests.ts b/ss-utils/ss-utils-tests.ts
index 71934fed54..9bbd30da9a 100644
--- a/ss-utils/ss-utils-tests.ts
+++ b/ss-utils/ss-utils-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="jquery" />
-
-
 declare var EventSource : ssutils.IEventSourceStatic;
 
 function test_ssutils() {
@@ -13,7 +10,7 @@ function test_ssutils() {
             onHeartbeat: function(msg:ssutils.SSEHeartbeat, e:MessageEvent){},
             onJoin: function(msg:ssutils.SSEJoin) {},
             onLeave: function(msg:ssutils.SSELeave) {},
-            onUpdate: function(msg:ssutils.SSEUpdate) {}            
+            onUpdate: function(msg:ssutils.SSEUpdate) {}
         },
         receivers: {
             tv: {
@@ -26,7 +23,7 @@ function test_ssutils() {
         announce: function (msg:string) {}
     })
     .on('customEvent', function (e, msg, msgEvent) { });
-    
+
     $.ss.handlers["changeChannel"]("home");
 }
 
@@ -39,7 +36,7 @@ function test_jQuery_functions(){
         overrideMessages: true,
         messages: {"NotFound": "Not Found"},
         errorFilter: function(errorMsg, errorCode, type){}
-    });      
+    });
     $("form").applyValues({
         "Key": "Value"
     });
@@ -58,8 +55,8 @@ function test_ssutils_Static(){
     dateFmt = $.ss.dfmt(new Date(2001,1,1));
     dateFmt = $.ss.dfmthm(new Date(2001,1,1));
     dateFmt = $.ss.tfmt12(new Date(2001,1,1));
-    var parts:string[] = $.ss.splitOnFirst("A;B;C",";"); 
-    parts = $.ss.splitOnLast("A;B;C", ";"); 
+    var parts:string[] = $.ss.splitOnFirst("A;B;C",";");
+    parts = $.ss.splitOnLast("A;B;C", ";");
     var selectedText = $.ss.getSelection();
     var qs:{ [index: string]: string } = $.ss.queryString("http://google.com?a=b&c=d");
     var relativePath = $.ss.createUrl("/path/to/{File}", {File:"file.js"});
@@ -69,7 +66,7 @@ function test_ssutils_Static(){
     $.ss.normalize({"AA":1,"bB":2,"C":{"A":11,"B":22},"D":[1,2],"E":[{"A":111,"B":222}]}, true);
     $.ss.parseResponseStatus('{"message":"test"}');
     $.ss.postJSON("/path/to/url", {json:"data"}, function(r:any) {});
-    
+
     $.ss.listenOn = "click onmousedown";
     $.ss.eventReceivers = { "document": document };
     $.ss.handlers["changeChannel"]("home");
diff --git a/stamplay-js-sdk/index.d.ts b/stamplay-js-sdk/index.d.ts
index 53f57ad86c..81f20d8c95 100644
--- a/stamplay-js-sdk/index.d.ts
+++ b/stamplay-js-sdk/index.d.ts
@@ -1,35 +1,27 @@
-// Type definitions for stamplay-js-sdk 1.2.9
+// Type definitions for stamplay-js-sdk 1.2
 // Project: https://github.com/Stamplay/stamplay-js-sdk
 // Definitions by: Riderman de Sousa Barbosa <https://github.com/ridermansb/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="promises-a-plus" />
-
 declare namespace Stamplay {
+  export function init(appId: string): void;
+  export function User(): StamplayObject;
+  export function Cobject(object: string): StamplayObject;
 
-  export interface IStamplayModel {
-    signup({}) : PromisesAPlus.Thenable<any>
-    new() : IStamplayModel
-    get(property : string) : any
-    set(property : string, value: any) : void
-    unset(property : string) : void
-    fetch(id : any) : PromisesAPlus.Thenable<any>
-    destroy() : PromisesAPlus.Thenable<any>
-    save({}?) : PromisesAPlus.Thenable<any>
-    upVote() : PromisesAPlus.Thenable<any>
+  export interface Model {
+    signup({}): Promise<any>;
+    new(): Model; // This is suspicious, but tests show model instances being constructable...
+    get(property: string): any;
+    set(property: string, value: any): void;
+    unset(property: string) : void;
+    fetch(id: any) : Promise<any>;
+    destroy(): Promise<any>;
+    save({}?): Promise<any>;
+    upVote(): Promise<any>;
   }
 
-  export interface IStamplayObject  {
-      Model : IStamplayModel
-      Collection : any
-
-  }
-
-  export interface StamplayStatic {
-      init(appId : string) : void;
-      User() : IStamplayObject
-      Cobject(object : string) : IStamplayObject
+  export interface StamplayObject  {
+      Model: Model;
+      Collection : any;
   }
 }
-
-declare var Stamplay: Stamplay.StamplayStatic;
diff --git a/stamplay-js-sdk/stamplay-js-sdk-tests.ts b/stamplay-js-sdk/stamplay-js-sdk-tests.ts
index d9a4247e03..9dddc1b242 100644
--- a/stamplay-js-sdk/stamplay-js-sdk-tests.ts
+++ b/stamplay-js-sdk/stamplay-js-sdk-tests.ts
@@ -11,26 +11,24 @@ var registrationData = {
    password: 'mySecret'
  };
 
-user.signup(registrationData).then(function(){
-       user.set('phoneNumber', '020 123 4567' );
-       return user.save();
-     }).then(function(){
-       var number = user.get('phoneNumber');
-       console.log(number); // number value is 020 123 4567
-     });
+user.signup(registrationData).then(() => {
+  user.set('phoneNumber', '020 123 4567' );
+  return user.save();
+}).then(() => {
+  var number = user.get('phoneNumber');
+  console.log(number); // number value is 020 123 4567
+});
 
 
 // Action
 var colFoo = Stamplay.Cobject('foo');
 var fooMod = new colFoo.Model();
-fooMod.fetch(5).then(
-  function(){
-    return fooMod.upVote()
-  }
-).then(
-  function(){
+fooMod.fetch(5)
+  .then(() => fooMod.upVote())
+  .then(
+  () => {
     //success callback
-  }, function( err : any ){
+  }, (err: any) => {
     //error callback
   }
 )
diff --git a/stamplay-js-sdk/tslint.json b/stamplay-js-sdk/tslint.json
new file mode 100644
index 0000000000..2221e40e4a
--- /dev/null
+++ b/stamplay-js-sdk/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
\ No newline at end of file
diff --git a/static-eval/static-eval-tests.ts b/static-eval/static-eval-tests.ts
index d4307c50f4..bfe30f723f 100644
--- a/static-eval/static-eval-tests.ts
+++ b/static-eval/static-eval-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="esprima" />
-
 import evaluate = require('static-eval');
 import esprima = require('esprima');
 import * as ESTree from 'estree';
diff --git a/status-bar/tsconfig.json b/status-bar/tsconfig.json
index 874ffb81d1..9fe41d5d67 100644
--- a/status-bar/tsconfig.json
+++ b/status-bar/tsconfig.json
@@ -12,6 +12,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/stream-to-array/stream-to-array-tests.ts b/stream-to-array/stream-to-array-tests.ts
index c011f3e542..6b3ccc84fb 100644
--- a/stream-to-array/stream-to-array-tests.ts
+++ b/stream-to-array/stream-to-array-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import toArray = require('stream-to-array');
 
 var rs: NodeJS.ReadableStream;
diff --git a/stylelint/index.d.ts b/stylelint/index.d.ts
new file mode 100644
index 0000000000..2ec479d2e1
--- /dev/null
+++ b/stylelint/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for stylelint 7.9
+// Project: https://github.com/stylelint/stylelint
+// Definitions by: Alan Agius <https://github.com/alan-agius4/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface LinterOptions {
+    code?: string;
+    codeFilename?: string;
+    config?: JSON;
+    configBasedir?: string;
+    configFile?: string;
+    configOverrides?: JSON;
+    files?: string | string[];
+    formatter?: "json" | "string" | "verbose";
+    ignoreDisables?: boolean;
+    reportNeedlessDisables?: boolean;
+    ignorePath?: boolean;
+    syntax?: "scss" | "less" | "sugarss";
+    customSyntax?: string;
+}
+
+export interface LinterResult {
+    errored: boolean;
+    output: string;
+    postcssResults: any[];
+    results: LintResult[];
+}
+
+export interface LintResult {
+    source: string;
+    errored: boolean | undefined;
+    ignored: boolean | undefined;
+    warnings: string[];
+    deprecations: string[];
+    invalidOptionWarnings: any[];
+}
+
+export namespace formatters {
+    function json(results: LintResult[]): string;
+    function string(results: LintResult[]): string;
+    function verbose(results: LintResult[]): string;
+}
+
+export function lint(options?: LinterOptions): Promise<LinterResult>;
diff --git a/stylelint/stylelint-tests.ts b/stylelint/stylelint-tests.ts
new file mode 100644
index 0000000000..0eeb0bdec8
--- /dev/null
+++ b/stylelint/stylelint-tests.ts
@@ -0,0 +1,18 @@
+import { LinterOptions, lint, LintResult, LinterResult } from "stylelint";
+
+const options: LinterOptions = {
+    code: "div { color: red }",
+    files: ["**/**.scss"],
+    formatter: "json",
+    ignoreDisables: true,
+    reportNeedlessDisables: true,
+    ignorePath: true,
+    syntax: "scss"
+};
+
+lint(options).then((x: LinterResult) => {
+    const err: boolean = x.errored;
+    const output: string = x.output;
+    const postcssResults: any[] = x.postcssResults;
+    const results: LintResult[] = x.results;
+});
diff --git a/qajax/tsconfig.json b/stylelint/tsconfig.json
similarity index 86%
rename from qajax/tsconfig.json
rename to stylelint/tsconfig.json
index 8ba8578ef5..d57b85c2b3 100644
--- a/qajax/tsconfig.json
+++ b/stylelint/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "qajax-tests.ts"
+        "stylelint-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/stylus/stylus-tests.ts b/stylus/stylus-tests.ts
index 7c5a8b1e45..248b6a9a04 100644
--- a/stylus/stylus-tests.ts
+++ b/stylus/stylus-tests.ts
@@ -1,13 +1,9 @@
-/**  
- * Test suite created by Maxime LUCE <https://github.com/SomaticIT>  
- *   
+/**
+ * Test suite created by Maxime LUCE <https://github.com/SomaticIT>
+ *
  * Created by using code samples from https://github.com/LearnBoost/stylus/blob/master/docs/js.md.
  */
 
-/// <reference types="node" />
-
-
-
 import stylus = require("stylus");
 
 var str = "This is a stylus test";
diff --git a/superagent/superagent-tests.ts b/superagent/superagent-tests.ts
index 3252b01c96..3b8539ffe5 100644
--- a/superagent/superagent-tests.ts
+++ b/superagent/superagent-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 // via: http://visionmedia.github.io/superagent/
 
 import * as request from 'superagent';
diff --git a/supertest-as-promised/supertest-as-promised-tests.ts b/supertest-as-promised/supertest-as-promised-tests.ts
index 35cbc68388..23e47ee319 100644
--- a/supertest-as-promised/supertest-as-promised-tests.ts
+++ b/supertest-as-promised/supertest-as-promised-tests.ts
@@ -29,12 +29,8 @@ request(app)
     // ...
   });
 
-describe("GET /kittens", () => {
-  it("should work", () => {
-    return request(app).get("/kittens").expect(200);
-  });
-});
 
+request(app).get("/kittens").expect(200);
 
 // Agents
 var agent = request.agent(app);
diff --git a/systemjs/index.d.ts b/systemjs/index.d.ts
index 876e4fdb4d..cf37862975 100644
--- a/systemjs/index.d.ts
+++ b/systemjs/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for SystemJS 0.20.5
+// Type definitions for SystemJS 0.20
 // Project: https://github.com/systemjs/systemjs
 // Definitions by: Ludovic HENIN <https://github.com/ludohenin/>, Nathan Walker <https://github.com/NathanWalker/>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,9 +6,13 @@
 
 declare namespace SystemJSLoader {
 
-    type ModulesList = { [bundleName: string]: Array<string> };
+    interface ModulesList {
+        [bundleName: string]: string[];
+    }
 
-    type PackageList<T> = { [packageName: string]: T };
+    interface PackageList<T> {
+        [packageName: string]: T;
+    }
 
     /**
      * The following module formats are supported:
@@ -27,7 +31,7 @@ declare namespace SystemJSLoader {
      * Represents a module name for System.import that must resolve to either Traceur, Babel or TypeScript.
      * When set to traceur, babel or typescript, loading will be automatically configured as far as possible.
      */
-    type Transpiler = "plugin-traceur" | "plugin-babel" | "plugin-typescript" | "traceur" | "babel" | "typescript" | boolean;
+    type Transpiler = "plugin-traceur" | "plugin-babel" | "plugin-typescript" | "traceur" | "babel" | "typescript" | false;
 
     type ConfigMap = PackageList<string | PackageList<string>>;
 
@@ -49,7 +53,7 @@ declare namespace SystemJSLoader {
          * Dependencies to load before this module. Goes through regular paths and map normalization.
          * Only supported for the cjs, amd and global formats.
          */
-        deps?: Array<string>;
+        deps?: string[];
 
         /**
          * A map of global names to module names that should be defined only for the execution of this module.
@@ -225,13 +229,29 @@ declare namespace SystemJSLoader {
          * Sets the TypeScript transpiler options.
          */
         //TODO: Import Typescript.CompilerOptions
-        typescriptOptions?: any;
+        typescriptOptions?: {
+            /**
+             * A boolean flag which instructs the plugin to load configuration from "tsconfig.json".
+             * To override the location of the file set this option to the path of the configuration file,
+             * which will be resolved using normal SystemJS resolution.
+             * Note: This setting is specific to plugin-typescript.
+             */
+            tsconfig?: boolean | string,
+            /**
+             * A flag which controls whether the files are type-checked or simply transpiled.
+             * Set this option to "strict" to have the builds fail when compiler errors are encountered.
+             * Note: The strict option only affects builds and bundles via the SystemJS or JSPM Builder.
+             * Note: This setting is specific to plugin-typescript.
+             */
+            typeCheck?: boolean | "strict",
+            [key: string]: any
+        };
     }
 
     interface SystemJSSystemFields {
         env: string;
         loaderErrorStack: boolean;
-        packageConfigPaths: Array<string>;
+        packageConfigPaths: string[];
         pluginFirst: boolean;
         version: string;
         warnings: boolean;
@@ -241,12 +261,12 @@ declare namespace SystemJSLoader {
         /**
          * For backwards-compatibility with AMD environments, set window.define = System.amdDefine.
          */
-        amdDefine: Function;
+        amdDefine: (...args: any[]) => void;
 
         /**
          * For backwards-compatibility with AMD environments, set window.require = System.amdRequire.
          */
-        amdRequire: Function;
+        amdRequire: (deps: string[], callback: (...modules: any[]) => void) => void;
 
         /**
          * SystemJS configuration helper function.
@@ -257,7 +277,7 @@ declare namespace SystemJSLoader {
         /**
          * This represents the System base class, which can be extended or reinstantiated to create a custom System instance.
          */
-        constructor: new() => System;
+        constructor: new () => System;
 
         /**
          * Deletes a module from the registry by normalized name.
@@ -273,7 +293,7 @@ declare namespace SystemJSLoader {
         /**
          * Returns a clone of the internal SystemJS configuration in use.
          */
-        getConfig(): Config
+        getConfig(): Config;
 
         /**
          * Returns whether a given module exists in the registry by normalized module name.
@@ -303,15 +323,15 @@ declare namespace SystemJSLoader {
         /**
          * Declaration function for defining modules of the System.register polyfill module format.
          */
-        register(name: string, deps: Array<string>, declare: Function): void;
-        register(deps: Array<string>, declare: Function): void;
+        register(name: string, deps: string[], declare: (...modules: any[]) => any): void;
+        register(deps: string[], declare: (...modules: any[]) => any): void;
 
         /**
          * Companion module format to System.register for non-ES6 modules.
          * Provides a <script>-injection-compatible module format that any CommonJS or Global module can be converted into for CSP compatibility.
          */
-        registerDynamic(name: string, deps: Array<string>, executingRequire: boolean, declare: Function): void;
-        registerDynamic(deps: Array<string>, executingRequire: boolean, declare: Function): void;
+        registerDynamic(name: string, deps: string[], executingRequire: boolean, declare: (...modules: any[]) => any): void;
+        registerDynamic(deps: string[], executingRequire: boolean, declare: (...modules: any[]) => any): void;
 
         /**
          * Sets a module into the registry directly and synchronously.
@@ -335,7 +355,7 @@ declare namespace SystemJSLoader {
          * loaded to ensure the correct detection paths in loaded code.
          * The CommonJS require can be recovered within these modules from System._nodeRequire.
          */
-        _nodeRequire: Function;
+        _nodeRequire: (dep: string) => any;
 
         /**
          * Modules list available only with trace=true
@@ -351,10 +371,10 @@ declare var __moduleName: string;
 /**
  * @deprecated use SystemJS https://github.com/systemjs/systemjs/releases/tag/0.19.10
  */
-declare var System: SystemJSLoader.System;
+declare const System: SystemJSLoader.System;
 
 declare module "systemjs" {
     import systemJSLoader = SystemJSLoader;
-    let system: systemJSLoader.System;
+    const system: systemJSLoader.System;
     export = system;
 }
diff --git a/tapable/tapable-tests.ts b/tapable/tapable-tests.ts
index fce410defa..60e299b4a0 100644
--- a/tapable/tapable-tests.ts
+++ b/tapable/tapable-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts" />
-
 import Tapable = require('tapable');
 
 class DllPlugin {
diff --git a/tape/tape-tests.ts b/tape/tape-tests.ts
index cc51d27ba1..9884ece458 100644
--- a/tape/tape-tests.ts
+++ b/tape/tape-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import tape = require("tape");
 
 var name: string;
diff --git a/tar/tar-tests.ts b/tar/tar-tests.ts
index 08f304add9..d80e068ace 100644
--- a/tar/tar-tests.ts
+++ b/tar/tar-tests.ts
@@ -4,8 +4,6 @@
  * Created by using code samples from https://github.com/npm/node-tar.
  */
 
-/// <reference types="node" />
-
 import tar = require("tar");
 import fs = require("fs");
 
diff --git a/tether-drop/tether-drop-tests.ts b/tether-drop/tether-drop-tests.ts
index cdfdf030f4..91df27a484 100644
--- a/tether-drop/tether-drop-tests.ts
+++ b/tether-drop/tether-drop-tests.ts
@@ -1,4 +1,3 @@
-///<reference types="tether" />
 import Drop = require("tether-drop");
 
 var yellowBox = document.querySelector(".yellow");
@@ -10,7 +9,7 @@ var d = new Drop({
     constrainToWindow: true,
     constrainToScrollParent: true,
     classes: "",
-    tetherOptions: {},
+    tetherOptions: {attachment: "bottom left"},
     remove: true,
     target: yellowBox,
     beforeClose: () => true,
diff --git a/tether/index.d.ts b/tether/index.d.ts
index 302801f8aa..4a5b1cc2fd 100644
--- a/tether/index.d.ts
+++ b/tether/index.d.ts
@@ -21,7 +21,7 @@ declare class Tether {
 
 declare namespace Tether {
     interface ITetherOptions {
-        attachment?: string;
+        attachment: string;
         bodyElement?: HTMLElement;
         classes?: {[className: string]: boolean};
         classPrefix?: string;
diff --git a/text-buffer/index.d.ts b/text-buffer/index.d.ts
index 60207c7e80..a3d652bd28 100644
--- a/text-buffer/index.d.ts
+++ b/text-buffer/index.d.ts
@@ -5,7 +5,6 @@
 
 /// <reference types="atom" />
 /// <reference types="emissary" />
-/// <reference types="q" />
 
 declare namespace TextBuffer {
 
@@ -240,7 +239,7 @@ declare namespace TextBuffer {
 		positionForCharacterIndex(offset:number):IPoint;
 		getMaxCharacterIndex():number;
 		loadSync():ITextBuffer;
-		load():Q.IPromise<ITextBuffer>;
+		load():Promise<ITextBuffer>;
 		finishLoading():ITextBuffer;
 		handleTextChange(event:any):any;
 		destroy():any;
@@ -253,7 +252,7 @@ declare namespace TextBuffer {
 		hasMultipleEditors():boolean;
 		reload():any;
 		updateCachedDiskContentsSync():string;
-		updateCachedDiskContents():Q.IPromise<string>;
+		updateCachedDiskContents():Promise<string>;
 		getBaseName():string;
 		getPath():string;
 		getUri():string;
diff --git a/text-buffer/tsconfig.json b/text-buffer/tsconfig.json
index 860c31d7f7..ebee922349 100644
--- a/text-buffer/tsconfig.json
+++ b/text-buffer/tsconfig.json
@@ -12,6 +12,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/three/index.d.ts b/three/index.d.ts
index 46975498c3..ff962d17b7 100644
--- a/three/index.d.ts
+++ b/three/index.d.ts
@@ -4240,7 +4240,7 @@ declare namespace THREE {
         distanceToSquared(v: Vector3): number;
         distanceToManhattan(v: Vector3): number;
 
-        setFromSpherical(s: Spherical): Matrix3;
+        setFromSpherical(s: Spherical): Vector3;
         setFromMatrixPosition(m: Matrix4): Vector3;
         setFromMatrixScale(m: Matrix4): Vector3;
         setFromMatrixColumn(matrix: Matrix4, index: number): Vector3;
diff --git a/three/test/canvas/canvas_camera_orthographic.ts b/three/test/canvas/canvas_camera_orthographic.ts
index 78476a95b5..2beabf21f9 100644
--- a/three/test/canvas/canvas_camera_orthographic.ts
+++ b/three/test/canvas/canvas_camera_orthographic.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/canvas_camera_orthographic.html
 
 () => {
diff --git a/three/test/canvas/canvas_geometry_cube.ts b/three/test/canvas/canvas_geometry_cube.ts
index 46f26b10c5..767ece34b0 100644
--- a/three/test/canvas/canvas_geometry_cube.ts
+++ b/three/test/canvas/canvas_geometry_cube.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/canvas_geometry_cube.html
 
 () => {
diff --git a/three/test/canvas/canvas_interactive_cubes_tween.ts b/three/test/canvas/canvas_interactive_cubes_tween.ts
index 6d4cd3fce1..c7427cb07b 100644
--- a/three/test/canvas/canvas_interactive_cubes_tween.ts
+++ b/three/test/canvas/canvas_interactive_cubes_tween.ts
@@ -1,5 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
 /// <reference types="tween.js" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/canvas_interactive_cubes_tween.html
diff --git a/three/test/canvas/canvas_lights_pointlights.ts b/three/test/canvas/canvas_lights_pointlights.ts
index 6c028abcf8..55e91d27c8 100644
--- a/three/test/canvas/canvas_lights_pointlights.ts
+++ b/three/test/canvas/canvas_lights_pointlights.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/canvas_lights_pointlights.html
 
 () => {
diff --git a/three/test/canvas/canvas_materials.ts b/three/test/canvas/canvas_materials.ts
index 21ca2b3ee1..9af83aff5d 100644
--- a/three/test/canvas/canvas_materials.ts
+++ b/three/test/canvas/canvas_materials.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/canvas_materials.html
 
 () => {
diff --git a/three/test/canvas/canvas_particles_floor.ts b/three/test/canvas/canvas_particles_floor.ts
index 71e121e8d0..00d97b8e30 100644
--- a/three/test/canvas/canvas_particles_floor.ts
+++ b/three/test/canvas/canvas_particles_floor.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/canvas_particles_floor.html
 
 () => {
diff --git a/three/test/css3d/css3d_periodictable.ts b/three/test/css3d/css3d_periodictable.ts
index 342455ff48..2d68cd2f53 100644
--- a/three/test/css3d/css3d_periodictable.ts
+++ b/three/test/css3d/css3d_periodictable.ts
@@ -1,6 +1,4 @@
-/// <reference types="three" />
 /// <reference types="tween.js" />
-/// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/css3d_periodictable.html
 
diff --git a/three/test/css3d/css3d_sprites.ts b/three/test/css3d/css3d_sprites.ts
index 49177a9453..41cf22ad47 100644
--- a/three/test/css3d/css3d_sprites.ts
+++ b/three/test/css3d/css3d_sprites.ts
@@ -1,5 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
 /// <reference types="tween.js" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/css3d_sprites.html
diff --git a/three/test/examples/controls/vrcontrols.ts b/three/test/examples/controls/vrcontrols.ts
index 1d6e932a0e..2dbc5817da 100644
--- a/three/test/examples/controls/vrcontrols.ts
+++ b/three/test/examples/controls/vrcontrols.ts
@@ -1,5 +1,3 @@
-/// <reference types="three" />
-
 var _vrControls = new THREE.VRControls(new THREE.Camera());
 
 _vrControls.update();
diff --git a/three/test/examples/ctm/ctmloader.ts b/three/test/examples/ctm/ctmloader.ts
index e35cffb6a4..68e4e28fc0 100644
--- a/three/test/examples/ctm/ctmloader.ts
+++ b/three/test/examples/ctm/ctmloader.ts
@@ -1,5 +1,3 @@
-/// <reference types="three" />
-
 let _ctmloader = new THREE.CTMLoader();
 _ctmloader.load('https://github.com/mrdoob/three.js/blob/master/examples/models/ctm/ben.ctm', (geo: any) => {
     console.log(geo.position);
diff --git a/three/test/examples/detector.ts b/three/test/examples/detector.ts
index b0960c723c..6260f34300 100644
--- a/three/test/examples/detector.ts
+++ b/three/test/examples/detector.ts
@@ -1,7 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
-
 () => {
 	if ( !Detector.canvas || !Detector.webgl || !Detector.workers || !Detector.fileapi ){
 		var errorElement = Detector.getWebGLErrorMessage();
diff --git a/three/test/examples/effects/vreffect.ts b/three/test/examples/effects/vreffect.ts
index 67917a94ae..454d15fdf7 100644
--- a/three/test/examples/effects/vreffect.ts
+++ b/three/test/examples/effects/vreffect.ts
@@ -1,5 +1,3 @@
-/// <reference types="three" />
-
 var _vrEffect: THREE.VREffect;
 
 _vrEffect = new THREE.VREffect(new THREE.WebGLRenderer({antialias: true}), (error) => {
diff --git a/three/test/examples/octree.ts b/three/test/examples/octree.ts
index de7de86ac7..d37ef7ba75 100644
--- a/three/test/examples/octree.ts
+++ b/three/test/examples/octree.ts
@@ -1,5 +1,3 @@
-///<reference types="three"/>
-
 let _octree = new THREE.Octree({
     underferred: false,
     depthMax: Infinity,
diff --git a/three/test/math/test_unit_math.ts b/three/test/math/test_unit_math.ts
index c70868b3d8..4a8e0a8c14 100644
--- a/three/test/math/test_unit_math.ts
+++ b/three/test/math/test_unit_math.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 declare function test(desc: string, body: () => void): void;
 declare function ok(cond: any, desc?: string): void;
 declare function deepEqual<T>(a: T, b: T, desc?: string): void;
diff --git a/three/test/webgl/webgl_animation_cloth.ts b/three/test/webgl/webgl_animation_cloth.ts
index fff733c9c0..0c0ec76ace 100644
--- a/three/test/webgl/webgl_animation_cloth.ts
+++ b/three/test/webgl/webgl_animation_cloth.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_animation_cloth.html
 
 () => {
diff --git a/three/test/webgl/webgl_animation_skinning_morph.ts b/three/test/webgl/webgl_animation_skinning_morph.ts
index df085e9ac4..fcea4bba08 100644
--- a/three/test/webgl/webgl_animation_skinning_morph.ts
+++ b/three/test/webgl/webgl_animation_skinning_morph.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_sprites.html
 
 () => {
diff --git a/three/test/webgl/webgl_buffergeometry.ts b/three/test/webgl/webgl_buffergeometry.ts
index a747a17d50..0d4f1ee5dd 100644
--- a/three/test/webgl/webgl_buffergeometry.ts
+++ b/three/test/webgl/webgl_buffergeometry.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_buffergeometry.html
 
 () => {
diff --git a/three/test/webgl/webgl_camera.ts b/three/test/webgl/webgl_camera.ts
index 66b60a7826..804aba771f 100644
--- a/three/test/webgl/webgl_camera.ts
+++ b/three/test/webgl/webgl_camera.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_camera.html
 
 () => {
diff --git a/three/test/webgl/webgl_custom_attributes.ts b/three/test/webgl/webgl_custom_attributes.ts
index 89c25e62cf..c3a5bc6a36 100644
--- a/three/test/webgl/webgl_custom_attributes.ts
+++ b/three/test/webgl/webgl_custom_attributes.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_custom_attributes.html
 
 () => {
diff --git a/three/test/webgl/webgl_geometries.ts b/three/test/webgl/webgl_geometries.ts
index 9b23dcfa1f..89e0af480c 100644
--- a/three/test/webgl/webgl_geometries.ts
+++ b/three/test/webgl/webgl_geometries.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_geometries.html
 
 () => {
diff --git a/three/test/webgl/webgl_helpers.ts b/three/test/webgl/webgl_helpers.ts
index db8cba89a7..6b955968f4 100644
--- a/three/test/webgl/webgl_helpers.ts
+++ b/three/test/webgl/webgl_helpers.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_helpers.html
 
 () => {
diff --git a/three/test/webgl/webgl_interactive_cubes.ts b/three/test/webgl/webgl_interactive_cubes.ts
index 74493a5285..87a9796813 100644
--- a/three/test/webgl/webgl_interactive_cubes.ts
+++ b/three/test/webgl/webgl_interactive_cubes.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_interactive_cubes.html
 
 () => {
diff --git a/three/test/webgl/webgl_interactive_raycasting_points.ts b/three/test/webgl/webgl_interactive_raycasting_points.ts
index 6fdb24b6cc..ced8feb6c6 100644
--- a/three/test/webgl/webgl_interactive_raycasting_points.ts
+++ b/three/test/webgl/webgl_interactive_raycasting_points.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_sprites.html
 
 () => {
diff --git a/three/test/webgl/webgl_lensflares.ts b/three/test/webgl/webgl_lensflares.ts
index 1d100507a0..1d42762571 100644
--- a/three/test/webgl/webgl_lensflares.ts
+++ b/three/test/webgl/webgl_lensflares.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_lensflares.html
 
 () => {
diff --git a/three/test/webgl/webgl_lights_hemisphere.ts b/three/test/webgl/webgl_lights_hemisphere.ts
index 46dd9f7157..108419f4ad 100644
--- a/three/test/webgl/webgl_lights_hemisphere.ts
+++ b/three/test/webgl/webgl_lights_hemisphere.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_lights_hemisphere.html
 
 () => {
diff --git a/three/test/webgl/webgl_lines_colors.ts b/three/test/webgl/webgl_lines_colors.ts
index 6b359b2d65..c7d68849f2 100644
--- a/three/test/webgl/webgl_lines_colors.ts
+++ b/three/test/webgl/webgl_lines_colors.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_lines_colors.html
 
 () => {
diff --git a/three/test/webgl/webgl_loader_awd.ts b/three/test/webgl/webgl_loader_awd.ts
index 01f21a985e..d1752056fa 100644
--- a/three/test/webgl/webgl_loader_awd.ts
+++ b/three/test/webgl/webgl_loader_awd.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_loader_awd.html
 
 () => {
diff --git a/three/test/webgl/webgl_materials.ts b/three/test/webgl/webgl_materials.ts
index f60da797ce..94f91b2fef 100644
--- a/three/test/webgl/webgl_materials.ts
+++ b/three/test/webgl/webgl_materials.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_materials.html
 
 () => {
diff --git a/three/test/webgl/webgl_morphtargets.ts b/three/test/webgl/webgl_morphtargets.ts
index 5368dccb91..4dda732da7 100644
--- a/three/test/webgl/webgl_morphtargets.ts
+++ b/three/test/webgl/webgl_morphtargets.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_morphtargets.html
 
 () => {
diff --git a/three/test/webgl/webgl_points_billboards.ts b/three/test/webgl/webgl_points_billboards.ts
index 11aa04270b..06fefa6744 100644
--- a/three/test/webgl/webgl_points_billboards.ts
+++ b/three/test/webgl/webgl_points_billboards.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_particles_billboards.html
 
 () => {
diff --git a/three/test/webgl/webgl_postprocessing.ts b/three/test/webgl/webgl_postprocessing.ts
index 8c298d66a6..0c768eccea 100644
--- a/three/test/webgl/webgl_postprocessing.ts
+++ b/three/test/webgl/webgl_postprocessing.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_postprocessing.html
 
 () => {
diff --git a/three/test/webgl/webgl_shader.ts b/three/test/webgl/webgl_shader.ts
index 249851d534..4a954d36ac 100644
--- a/three/test/webgl/webgl_shader.ts
+++ b/three/test/webgl/webgl_shader.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_shader.html
 
 () => {
diff --git a/three/test/webgl/webgl_sprites.ts b/three/test/webgl/webgl_sprites.ts
index 8e71285fac..103d3065c3 100644
--- a/three/test/webgl/webgl_sprites.ts
+++ b/three/test/webgl/webgl_sprites.ts
@@ -1,6 +1,3 @@
-/// <reference types="three" />
-/// <reference path="../three-tests-setup.ts" />
-
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_sprites.html
 
 () => {
diff --git a/through2/through2-tests.ts b/through2/through2-tests.ts
index 0cc698d1d3..70a66e4b0e 100644
--- a/through2/through2-tests.ts
+++ b/through2/through2-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import stream = require('stream');
 import through2 = require('through2');
 
diff --git a/through2/v0/through2-tests.ts b/through2/v0/through2-tests.ts
index 9308908648..ae1c43a135 100644
--- a/through2/v0/through2-tests.ts
+++ b/through2/v0/through2-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import through2 = require('through2');
 
 var rws: NodeJS.ReadWriteStream;
diff --git a/tinymce/index.d.ts b/tinymce/index.d.ts
index f760671a8e..b82f90a46e 100644
--- a/tinymce/index.d.ts
+++ b/tinymce/index.d.ts
@@ -5,40 +5,1425 @@
 
 // Work In Progress
 
-declare namespace TinyMCE {
-  export interface Observable {
-    off: (name?: string, callback?: () => void) => any;
-    on: (name: string, callback: () => void) => any;
-    fire: (name: string, args?: any, bubble?: boolean) => Event;
+declare namespace TinyMce {
+
+  export interface Static extends TinyMce.EditorManager {
+
+    DOM: TinyMce.dom.DOMUtils;
+
+    PluginManager: TinyMce.AddOnManager;
+
+    ScriptLoader: TinyMce.dom.ScriptLoader;
+
+    ThemeManager: TinyMce.AddOnManager;
+
+    create(s: string, p: {}, root?: {}): void;
+
+    createNS(n: string, o: {}): {};
+
+    each(o: {}, cb: () => void, s?: {}): void;
+
+    explode(s: string, d: string): void;
+
+    grep(a: any[], f: () => void): any[];
+
+    inArray(item: any, arr: any[]): number;
+
+    is(obj: {}, type?: string): boolean;
+
+    isArray(obj: {}): boolean;
+
+    makeMap(items: any[], delim?: string, map?: {}): {};
+
+    map(array: any[], callback: () => void): any[];
+
+    resolve(n: string, o?: {}): {};
+
+    toArray(obj: {}): any[];
+
+    trim(s: string): string;
+
+    walk(o: {}, f: () => void, n?: string, s?: string): void;
   }
 
-  export interface Editor extends Observable {
-    destroy: (automatic: boolean) => void;
-    remove: () => void;
-    hide: () => void;
-    show: () => void;
-    getContent: (args?: any) => string;
-    setContent: (content: string, args?: any) => string;
-    focus: (skip_focus?: boolean) => void;
+  export interface Settings {
+
+    auto_focus?: string;
+
+    cache_suffix?: string;
+
+    content_security_policy?: string;
+
+    external_plugins?: {};
+
+    hidden_input?: boolean;
+
+    init_instance_callback?: (editor: TinyMce.Editor) => void;
+
+    plugins?: string | string[];
+
+    selector?: string;
+
+    setup?: (edtor: TinyMce.Editor) => void;
+
+    target?: Element;
+
+    color_picker_callback?: (callback: (hexColor: string) => void, value: string) => void;
+
+    elementpath?: boolean;
+
+    event_root?: boolean;
+
+    fixed_toolbar_container?: string;
+
+    height?: number;
+
+    inline?: boolean;
+
+    insert_button_items?: string;
+
+    insert_toolbar?: string;
+
+    max_height?: number;
+
+    max_width?: number;
+
+    menu?: settings.Menu;
+
+    menubar?: string | boolean;
+
+    min_height?: number;
+
+    min_width?: number;
+
+    preview_styles?: boolean | string;
+
+    removed_menuitems?: string;
+
+    resize?: boolean | string;
+
+    selection_toolbar?: string;
+
+    skin_url?: string;
+
+    skin?: string;
+
+    statusbar?: boolean;
+
+    theme_url?: string;
+
+    theme?: string;
+
+    toolbar?: boolean | string | string[];
+
+    width?: number;
+
+    body_class?: string;
+
+    body_id?: string;
+
+    content_css?: string;
+
+    content_style?: string;
+
+    visual_anchor_class?: string;
+
+    visual_table_class?: string;
+
+    visual?: boolean;
+
+    allow_conditional_comments?: boolean;
+
+    allow_html_in_named_anchor?: boolean;
+
+    allow_unsafe_link_target?: boolean;
+
+    convert_fonts_to_spans?: boolean;
+
+    custom_elements?: string;
+
+    doctype?: string;
+
+    element_format?: string;
+
+    encoding?: string;
+
+    entities?: string;
+
+    entity_encoding?: string;
+
+    extended_valid_elements?: string;
+
+    fix_list_elements?: boolean;
+
+    force_hex_style_colors?: boolean;
+
+    forced_root_block?: string;
+
+    forced_root_block_attrs?: {};
+
+    invalid_elements?: string;
+
+    invalid_styles?: string | {};
+
+    keep_styles?: boolean;
+
+    protect?: RegExp[];
+
+    remove_trailing_brs?: boolean;
+
+    schema?: string;
+
+    valid_children?: string;
+
+    valid_classes?: string | {};
+
+    valid_elements?: string;
+
+    valid_styles?: {};
+
+    block_formats?: string;
+
+    font_formats?: string;
+
+    fontsize_formats?: string;
+
+    formats?: {};
+
+    removeFormat?: Array<{}>;
+
+    indentation?: string;
+
+    style_formats?: Array<{}>;
+
+    style_formats_autohide?: boolean;
+
+    style_formats_merge?: boolean;
+
+    browser_spellcheck?: boolean;
+
+    gecko_spellcheck?: boolean;
+
+    automatic_uploads?: boolean;
+
+    file_browser_callback?: (field_name: string, url: string, type: string, win: Window) => void;
+
+    file_browser_callback_types?: string;
+
+    file_picker_callback?: (callback: (filename: string, metadata: {}) => void, valud: string, meta: {}) => void;
+
+    file_picker_types?: string;
+
+    images_dataimg_filter?: (img: any) => void;
+
+    images_reuse_filename?: boolean;
+
+    images_upload_base_path?: string;
+
+    images_upload_credentials?: boolean;
+
+    images_upload_handler?: (blobInfo: any, success: (msg: string) => void, failure: (msg: string) => void) => void;
+
+    images_upload_url?: string;
+
+    directionality?: string;
+
+    language?: string;
+
+    language_url?: string;
+
+    allow_script_urls?: boolean;
+
+    convert_urls?: boolean;
+
+    document_base_url?: string;
+
+    relative_urls?: boolean;
+
+    remove_script_host?: boolean;
+
+    urlconverter_callback?: (url: string, node: HTMLElement, on_save: boolean, name: string) => void;
+
+    anchor_bottom?: string;
+
+    anchor_top?: string;
+
+    br_in_pre?: boolean;
+
+    custom_undo_redo_levels?: number;
+
+    end_container_on_empty_block?: boolean;
+
+    nowrap?: boolean;
+
+    object_resizing?: boolean | string;
+
+    type_ahead_urls?: boolean;
+
+  }
+
+  export namespace settings {
+
+    export interface Menu {
+      file: MenuItem;
+      edit: MenuItem;
+      insert: MenuItem;
+      view: MenuItem;
+      format: MenuItem;
+      table: MenuItem;
+      tools: MenuItem;
+    }
+
+    export interface MenuItem {
+      title: string;
+      items: string;
+    }
+  }
+
+  export interface AddOnManager {
+
+    add(id: string, addOn: (editor: TinyMce.Editor, url: string) => void): Theme | Plugin;
+
+    addComponents(pluginName: string, scripts: string[]): void;
+
+    get(name: string): Theme | Plugin;
+
+    load(name: string, addOnUrl: string, success?: () => void, scope?: {}, failure?: () => void): void;
+
+    requireLangPack(name: string, languages?: string): void;
+  }
+
+  export interface Editor extends util.Observable {
+
+    $: dom.DomQuery;
+
+    baseURI: util.URI;
+
+    contentCSS: string[];
+
+    contentStyles: string[];
+
+    documentBaseURI: util.URI;
+
+    dom: dom.DOMUtils;
+
+    formatter: Formatter;
+
+    id: string;
+
+    initialized: boolean;
+
+    notificationManager: notificationManager;
+
+    parser: html.DomParser;
+
+    schema: html.Schema;
+
+    selection: dom.Selection;
+
+    serializer: dom.Serializer;
+
+    settings: Settings;
+
+    theme: Theme;
+
     undoManager: UndoManager;
-    settings: any;
-    getDoc: () => Document;
-    editorUpload: any;
+
+    WindowManager: WindowManager;
+
+    addButton(name: string, settings: {}): void;
+
+    addCommand(name: string, callback: (ui: boolean, value: {}) => boolean, scope?: {}): void;
+
+    addContextToolbar(predicate: () => void, items: string): void;
+
+    addMenuItem(name: string, settings: {}): void;
+
+    addQueryStateHandler(name: string, callback: () => boolean, scope?: {}): void;
+
+    addQueryValueHandler(name: string, callback: () => {}, scope?: {}): void;
+
+    addShortcut(pattern: string, desc: string, cmdFunc: string, sc?: {}): boolean;
+
+    addSidebar(name: string, settings: {}): void;
+
+    addVisual(elm?: Element): void;
+
+    convertURL(url: string, name: string, elm: string): string;
+
+    destroy(automatic?: boolean): void;
+
+    execCallback(name: string): {};
+
+    execCommand(cmd: string, ui: boolean, value?: any, args?: {}): void;
+
+    focus(skipFocus: boolean): void;
+
+    getBody(): HTMLBodyElement;
+
+    getContainer(): Element;
+
+    getContent(args?: {}): string;
+
+    getContentAreaContainer(): Element;
+
+    getDoc(): Document;
+
+    getElement(): Element;
+
+    getLang(name: string, defaultVal?: string): void;
+
+    getParam(name: string, defaultVal?: string, type?: string): string;
+
+    getWin(): Window;
+
+    hasEventListeners(name: string): boolean;
+
+    hide(): void;
+
+    init(): void;
+
+    insertContent(content: string, args?: {}): void;
+
+    isDirty(): boolean;
+
+    isHidden(): boolean;
+
+    load(args?: {}): string;
+
+    nodeChanged(args?: {}): void;
+
+    queryCommandState(cmd: string): boolean;
+
+    queryCommandSupported(cmd: string): boolean;
+
+    queryCommandValue(cmd: string): {};
+
+    remove(): void;
+
+    render(): void;
+
+    save(args: {}): string;
+
+    setContent(content: string, args?: {}): string;
+
+    setDirty(state: boolean): void;
+
+    setMode(mode: string): void;
+
+    setProgressState(state: boolean, time: number): boolean;
+
+    show(): void;
+
+    translate(text: string): string;
+
+    uploadImages(callback: () => void): Promise<any>;
+  }
+
+  export interface EditorCommands {
+
+    addCommands(command_list: {}, type?: string): void;
+
+    execCommand(command: string, ui?: boolean, value?: {}, args?: {}): boolean;
+
+    queryCommandState(command: string): boolean | number;
+
+    queryCommandSupported(command: string): boolean;
+
+    queryCommandValue(command: string): {};
+  }
+
+  export interface EditorManager extends util.Observable {
+
+    $: dom.DomQuery;
+
+    activeEditor: TinyMce.Editor;
+
+    baseURI: TinyMce.util.URI;
+
+    baseURL: string;
+
+    documentBaseURL: string;
+
+    editors: TinyMce.Editor[];
+
+    i18n: {};
+
+    majorVersion: string;
+
+    minorVersion: string;
+
+    releaseDate: string;
+
+    suffix: string;
+
+    add(editor: TinyMce.Editor): TinyMce.Editor;
+
+    addI18n(code: string, items: {}): void;
+
+    createEditor(id: string, settings: {}): TinyMce.Editor;
+
+    execCommand(cmd: string, ui?: boolean, value?: string): boolean;
+
+    get(id: string): TinyMce.Editor;
+
+    init(settings: Settings): Promise<Editor>;
+
+    overrideDefaults(defaultSettings: {}): void;
+
+    remove(selector: TinyMce.Editor): TinyMce.Editor;
+
+    setActive(editor: TinyMce.Editor): void;
+
+    translate(text: string): string;
+
+    triggerSave(): void;
+  }
+
+  export interface Env {
+
+    android: boolean;
+
+    ceFalse: boolean;
+
+    contentEditable: boolean;
+
+    documentMode: boolean;
+
+    fileApi: boolean;
+
+    gecko: boolean;
+
+    iOS: boolean;
+
+    ie: boolean;
+
+    mac: boolean;
+
+    noCaretAfter: boolean;
+
+    opera: boolean;
+
+    range: boolean;
+
+    transparentSrc: boolean;
+
+    webKit: boolean;
+  }
+
+  export namespace Events {
+
+    export interface Event {
+
+      type: string;
+
+      target: string;
+
+      isDefaultPrevented(): boolean;
+
+      isImmediatePropagationStopped(): boolean;
+
+      isPropagationStopped(): boolean;
+
+      preventDefault(): void;
+
+      stopImmediatePropagation(): void;
+
+      stopPropagation(): void;
+    }
+
+    export interface FocusBlurEvent extends Event {
+
+      blurredEditor: Editor;
+    }
+
+    export interface ContentEvent extends Event {
+
+      format: string;
+
+      set: boolean;
+
+      content: string;
+    }
+
+    export interface ProcessEvent extends Event {
+
+      content: string;
+
+      forced_root_block: string;
+
+      format: string;
+
+      get: boolean;
+
+      get_inner: boolean;
+
+      node: Node;
+
+      selection: true;
+    }
+
+    export interface NodeChangeEvent extends Event {
+
+      element: Node;
+
+      parents: Node[];
+
+      selectionChange: boolean;
+    }
+
+    export interface UndoRedoEvent extends Event {
+
+      level: {};
+    }
+
+    export interface ChangeEvent extends Event {
+
+      lastLevel: {};
+
+      level: {};
+    }
+
+    export interface CommandEvent extends Event {
+
+      command: string;
+
+      ui: boolean;
+
+      value: string;
+    }
+  }
+
+  export interface FocusManager {
+
+    isEditorUIElement(elm: Element): boolean;
+  }
+
+  export class FocusManager implements FocusManager {
+
+    constructor(editorManager: TinyMce.EditorManager);
+  }
+
+  export interface Formatter {
+
+    apply(name: string, vars?: {}, node?: html.Node): void;
+
+    canApply(name: string): boolean;
+
+    formatChanged(formats: string, callback: () => void, similar: boolean): void;
+
+    get(name?: string): any[] | {};
+
+    getCssText(format: string): string;
+
+    match(name: string, vars?: {}, node?: html.Node): boolean;
+
+    matchAll(names: any[], vars?: {}): any[];
+
+    matchNode(node: html.Node, name: string, vars: {}, similar: boolean): {};
+
+    register(name: {}, format?: {}): void;
+
+    remove(name: string, vars?: {}, node?: html.Node): void;
+
+    toggle(name: string, vars?: {}, node?: html.Node): void;
+
+    unregister(name: string): void;
+  }
+
+  export class Formatter implements Formatter {
+
+    constructor(ed: Editor);
+  }
+
+  export interface Shortcuts {
+
+    add(pattern: string, desc: string, cmdFunc: () => void | string, scope?: {}): boolean;
+
+    remove(pattern: string): boolean;
+  }
+
+  export interface Theme {
+
+    renderUI(obj: {}): {};
   }
 
   export interface UndoManager {
-    undo: () => any;
-    clear: () => void;
-    hasUndo: () => boolean;
+
+    add(level?: {}, event?: DocumentEvent): {};
+
+    beforeChange(): void;
+
+    clear(): void;
+
+    extra(callback1: () => void, callback2: () => void): void;
+
+    hasRedo(): boolean;
+
+    hasUndo(): boolean;
+
+    redo(): {};
+
+    transact(callback: () => void): {};
+
+    undo(): {};
   }
 
-  export interface Static extends Observable {
-    init: (settings: any) => void;
-    execCommand: (c: string, u: boolean, v: string) => boolean;
-    activeEditor: Editor;
-    get: (id: string) => Editor;
-    triggerSave: () => void;
+  export interface WindowManager {
+
+    alert(message: string, callback: () => void, scope?: {}): void;
+
+    close(): void;
+
+    confirm(message: string, callback: () => void, scope?: {}): void;
+
+    getParams(): {};
+
+    getWindows(): Window[];
+
+    open(args: {}, params: {}): void;
+
+    setParams(params: {}): void;
+  }
+
+  export interface notificationManager {
+
+    close(): void;
+
+    getNotifications(): Array<{}>;
+
+    open(args?: {}): void;
+  }
+
+  export namespace dom {
+
+    export interface BookmarkManager {
+
+      getBookmark(type?: number, normalized?: boolean): {};
+
+      isBookmarkNode(node: HTMLElement): boolean;
+
+      moveToBookmark(bookmark: {}): boolean;
+    }
+
+    export interface DOMUtils {
+
+      add<T>(parentElm: string, name: string, attrs?: {}, html?: string, create?: boolean): Element | T[];
+
+      addClass<T>(elm: string, cls: string): string | T[];
+
+      addStyle(cssText: string): void;
+
+      bind(target: Element, name: string, func: () => void, scope?: {}): () => void;
+
+      create(name: string, attrs?: {}, html?: string): Element;
+
+      createFragment(html: string): DocumentFragment;
+
+      createHTML(name: string, attrs?: {}, html?: string): string;
+
+      createRng(): Range;
+
+      decode(s: string): string;
+
+      destroy(): void;
+
+      encode(text: string): string;
+
+      findCommonAncestor(a: Element, b: Element): Element;
+
+      fire(target: Node, name: string, evt: {}): Event;
+
+      get(n: string): Element;
+
+      getAttrib(elm: string, name: string, defaultVal: string): string;
+
+      getAttribs(elm?: HTMLElement): NodeList;
+
+      getNext(node: Node, selector: string): Node;
+
+      getOuterHTML(elm: string): string;
+
+      getParent(node: Node, selector: () => void, root?: Node): Node;
+
+      getParents<T>(node: Node, selector: () => void, root?: Node): T[];
+
+      getPos(elm: Element, rootElm?: Element): {};
+
+      getPrev(node: Node, selector: string): Node;
+
+      getRect(elm: Element): {};
+
+      getRoot(): Element;
+
+      getSize(elm: Element): {};
+
+      getStyle(elm: string, name: string, computed: boolean): string;
+
+      getViewPort(win?: Window): {};
+
+      hasClass(elm: string, cls: string): boolean;
+
+      hide(elm: string): void;
+
+      insertAfter<T>(node: Element, referenceNode: Element): Element | T[];
+
+      is(elm: Node, selector: string): void;
+
+      isBlock(node: Node): boolean;
+
+      isEmpty(elements?: {}): boolean;
+
+      isHidden(elm: string): boolean;
+
+      loadCSS(url: string): void;
+
+      nodeIndex(node: Node, normalized?: boolean): number;
+
+      parseStyle(cssText: string): {};
+
+      remove<T>(node: string, keepChildren?: boolean): Element | T[];
+
+      removeAllAttribs(e: Element): void;
+
+      removeClass<T>(elm: string, cls: string): string | T[];
+
+      rename(elm: Element, name: string): Element;
+
+      replace(newElm: Element, oldElm: Element, keepChildren?: boolean): void;
+
+      run<T>(elm: string, func: () => void, scope?: {}): {} | T[];
+
+      select<T>(selector: string, scope?: {}): T[];
+
+      serializeStyle(styles: {}, name?: string): string;
+
+      setAttrib(elm: Element, name: string, value: string): void;
+
+      setAttribs(elm: Element, attrs: {}): void;
+
+      setHTML(elm: Element, html: string): void;
+
+      setOuterHTML(elm: Element, html: {}): void;
+
+      setStyle(elm: string, name: string, value: string): void;
+
+      setStyles(elm: Element, styles: {}): void;
+
+      show(elm: string): void;
+
+      split(parentElm: Element, splitElm: Element, replacementElm?: Element): Element;
+
+      toHex(rgbVal: string): string;
+
+      toggleClass(elm: Element, cls: string, state?: string): void;
+
+      unbind<T>(target: Element, name: string, func: () => void): boolean | T[];
+
+      uniqueId(prefix?: string): string;
+    }
+
+    export class DOMUtils implements DOMUtils {
+
+      constructor(doc: Document, settings?: {});
+    }
+
+    export interface DomQuery {
+
+      add<T>(items: T[], sort?: boolean): DomQuery;
+
+      addClass(className: string): DomQuery;
+
+      after(content: string): DomQuery;
+
+      append(content: string): DomQuery;
+
+      appendTo(val: string): DomQuery;
+
+      attr(name: string, value?: string): DomQuery | string;
+
+      before(content: string): DomQuery;
+
+      children(node: Element | string): DomQuery;
+
+      clone(): DomQuery;
+
+      closest(selector: string): DomQuery;
+
+      contents(node: Element | string): DomQuery;
+
+      css(name: string, value?: string): DomQuery | string;
+
+      each(callback: () => void): DomQuery;
+
+      each(obj: {}, callback: () => void): void;
+
+      empty(): DomQuery;
+
+      eq(index: number): DomQuery;
+
+      extend(target: {}, object: {}): {};
+
+      filter(selector: string): DomQuery;
+
+      find(selector: string): DomQuery;
+
+      first(): DomQuery;
+
+      grep<T>(array: T[], callback: () => void): T[];
+
+      hasClass(className: string): boolean;
+
+      hide(): DomQuery;
+
+      html(value?: string): DomQuery | string;
+
+      inArray<T>(item: {}, array: T[]): number;
+
+      is(selector: string): boolean;
+
+      isArray(array: {}): boolean;
+
+      last(): DomQuery;
+
+      makeArray<T>(object: {}): T[];
+
+      next(node: Element | string): DomQuery;
+
+      nextUntil(node: Element | string, until: string): DomQuery;
+
+      off(name?: string, callback?: () => void): DomQuery;
+
+      offset(offset?: {}): {} | DomQuery;
+
+      on(name: string, callback: () => void): DomQuery;
+
+      parent(node: Element | string): DomQuery;
+
+      parents(node: Element | string): DomQuery;
+
+      parentsUntil(node: Element | string, until: string): DomQuery;
+
+      prepend(content: string): DomQuery;
+
+      prependTo(val: string): DomQuery;
+
+      prev(node: Element | string): DomQuery;
+
+      prevUntil(node: Element | string, until: string): DomQuery;
+
+      remove(): DomQuery;
+
+      removeAttr(name: string): DomQuery | string;
+
+      removeClass(className: string): DomQuery;
+
+      replaceWith(content: string): DomQuery;
+
+      show(): DomQuery;
+
+      slice(start: number, end?: number): DomQuery;
+
+      text(value?: string): DomQuery | string;
+
+      toArray<T>(): T[];
+
+      toggleClass(className: string, state?: boolean): DomQuery;
+
+      trigger(name: string): DomQuery;
+
+      trim(str: string): string;
+
+      unwrap(): DomQuery;
+
+      wrap(content: string): DomQuery;
+
+      wrapAll(content: string): DomQuery;
+
+      wrapInner(content: string): DomQuery;
+    }
+
+    export class DomQuery implements DomQuery {
+
+      constructor(selector?: string, context?: Document);
+    }
+
+    export interface EventUtils {
+
+      bind(target: {}, names: string, callback: () => void, scope: {}): () => void;
+
+      clean(target: {}): EventUtils;
+
+      fire(target: {}, name: string, args?: {}): EventUtils;
+
+      unbind(target: {}, names?: string, callback?: () => void): EventUtils;
+    }
+
+    export interface RangeUtils {
+
+      compareRanges(rng1: Range, rng2: Range): boolean;
+
+      getCaretRangeFromPoint(clientX: number, clientY: number, doc: Document): Range;
+    }
+
+    export interface ScriptLoader {
+
+      add(url: string, success?: () => void, scope?: {}, failure?: () => void): void;
+
+      isDone(url: string): boolean;
+
+      load(url: string, callback1?: () => void, callback2?: () => void): void;
+
+      loadQueue(success?: () => void, failure?: () => void, scope?: {}): void;
+
+      loadScripts(scripts: string[], callback1?: () => void, scope?: {}, callback2?: () => void): void;
+
+      markDone(url: string): void;
+    }
+
+    export interface Selection {
+
+      collapse(toStart?: boolean): void;
+
+      getBookmark(type?: number, normalized?: boolean): {};
+
+      getContent(args?: {}): string;
+
+      getEnd(real?: boolean): Element;
+
+      getNode(): Element;
+
+      getRng(w3c: boolean): Range;
+
+      getSel(): Selection;
+
+      getStart(real?: boolean): Element;
+
+      isCollapsed(): boolean;
+
+      moveToBookmark(bookmark: {}): boolean;
+
+      select(node: Element, content?: boolean): Element;
+
+      selectorChanged(selector: string, callback: () => void): void;
+
+      setContent(content: string, args?: {}): void;
+
+      setCursorLocation(node?: html.Node, offset?: number): void;
+
+      setNode(elm: Element): Element;
+
+      setRng(rng: Range, forward?: boolean): void;
+    }
+
+    export class Selection implements Selection {
+
+      constructor(dom: DOMUtils, win: Window, editor: Editor, serializer: Serializer);
+    }
+
+    export interface Serializer {
+
+      addAttributeFilter(callback: () => void): void;
+
+      addNodeFilter(callback: () => void): void;
+
+      addRules(rules: string): void;
+
+      addTempAttr(name: string): void;
+
+      serialize(node: HTMLElement, args: {}): void;
+
+      setRules(rules: string): void;
+
+    }
+
+    export class Serializer implements Serializer {
+
+      constructor(settings: {}, editor?: Editor);
+    }
+
+    export interface TreeWalker {
+
+      current(): html.Node;
+
+      next(): html.Node;
+
+      prev(): html.Node;
+    }
+  }
+
+  export class TreeWalker implements TreeWalker {
+
+    constructor(startNode: html.Node, rootNode: html.Node);
+  }
+
+  export namespace geom {
+
+    export interface Rect {
+
+      clamp(rect: Rect, clampRect: Rect, fixedSize: boolean): Rect;
+
+      create(x: number, y: number, w: number, h: number): Rect;
+
+      findBestRelativePosition(rect: Rect, targetRect: Rect, constrainRect: Rect, rels: any[]): void;
+
+      fromClientRect(clientRect: ClientRect): Rect;
+
+      inflate(rect: Rect, w: number, h: number): Rect;
+
+      intersect(rect: Rect, cropRect: Rect): Rect;
+
+      relativePosition(rect: Rect, targetRect: Rect, rel: string): void;
+    }
+  }
+
+  export namespace html {
+
+    export interface DomParser {
+
+      addAttributeFilter(attributes: string, callback: () => void): void;
+
+      addNodeFilter(attributes: string, callback: () => void): void;
+
+      filterNode(node: TinyMce.html.Node): TinyMce.html.Node;
+
+      parse(html: string, args?: {}): TinyMce.html.Node;
+    }
+
+    export class DomParser implements DomParser {
+
+      constructor(settings: {}, schema: TinyMce.html.Schema);
+    }
+
+    export interface Entities {
+
+      decode(text: string): string;
+
+      encodeAllRaw(text: string): string;
+
+      encodeNamed(text: string, attr?: boolean, entities?: {}): string;
+
+      encodeNumeric(text: string, attr?: boolean): string;
+
+      encodeRaw(text: string, attr?: boolean): string;
+
+      getEncodeFunc(name: string, entities?: string): () => void;
+    }
+
+    export interface Node {
+
+      append(node: TinyMce.html.Node): TinyMce.html.Node;
+
+      attr(name: string, value?: string): string | TinyMce.html.Node;
+
+      clone(): TinyMce.html.Node;
+
+      create(name: string, attrs: {}): void;
+
+      empty(): TinyMce.html.Node;
+
+      getAll(name: string): TinyMce.html.Node[];
+
+      insert(node: TinyMce.html.Node, ref_node: TinyMce.html.Node, before?: boolean): TinyMce.html.Node;
+
+      isEmpty(elements: {}): boolean;
+
+      remove(): TinyMce.html.Node;
+
+      replace(node: TinyMce.html.Node): TinyMce.html.Node;
+
+      unwrap(): void;
+
+      walk(prev?: boolean): TinyMce.html.Node;
+
+      wrap(wrapperNode: TinyMce.html.Node): TinyMce.html.Node;
+    }
+
+    export class Node implements Node {
+
+      constructor(name: string, type: number);
+    }
+
+    export interface SaxParser {
+
+      parse(html: string): void;
+    }
+
+    export class SaxParser implements SaxParser {
+
+      constructor(settings: {}, schema: TinyMce.html.Schema);
+    }
+
+    export interface Schema {
+
+      addCustomElements(custom_elements: string): void;
+
+      addValidChildren(valid_children: string): void;
+
+      addValidElements(valid_elements: string): void;
+
+      getBlockElements(): {};
+
+      getBoolAttrs(): {};
+
+      getCustomElements(): {};
+
+      getElementRule(name: string): {};
+
+      getInvalidStyles(): void;
+
+      getMoveCaretBeforeOnEnterElements(): {};
+
+      getNonEmptyElements(): {};
+
+      getSelfClosingElements(): {};
+
+      getShortEndedElements(): {};
+
+      getSpecialElements(): {};
+
+      getTextBlockElements(): {};
+
+      getTextInlineElements(): {};
+
+      getValidClasses(): void;
+
+      getValidStyles(): void;
+
+      getWhiteSpaceElements(): {};
+
+      isValid(name: string, attr?: string): boolean;
+
+      isValidChild(name: string, child: string): boolean;
+
+      setValidElements(valid_elements: string): void;
+    }
+
+    export class Schema implements Schema {
+
+        constructor(settings: {});
+    }
+
+    export interface Serializer {
+
+      serialize(node: TinyMce.html.Node): string;
+    }
+
+    export class Serializer implements Serializer {
+
+      constructor(settings: {}, schema: TinyMce.html.Schema);
+    }
+
+    export interface Styles {
+
+      parse(css: string): {};
+
+      serialize(styles: {}, elementName: string): string;
+
+      toHex(color: string): string;
+    }
+
+    export interface Writer {
+
+      cdata(text: string): void;
+
+      doctype(text: string): void;
+
+      end(name: string): void;
+
+      getContent(): string;
+
+      pi(name: string, text: string): void;
+
+      reset(): void;
+
+      start(name: string, attrs?: any[], empty?: boolean): void;
+
+      text(text: string, raw: boolean): void;
+    }
+  }
+
+  export class Writer implements Writer {
+
+    constructor(settings: {});
+  }
+
+  export namespace util {
+
+    export interface Color {
+
+      parse(value: {}): TinyMce.util.Color;
+
+      toHex(): string;
+
+      toHsv(): {};
+
+      toRgb(): {};
+    }
+
+    export class Color implements Color {
+
+      constructor(value: string | {});
+    }
+
+    export interface Delay {
+
+      clearInterval(interval: number): void;
+
+      clearTimeout(timeout: number): void;
+
+      debounce(callback: () => void, time: number): () => void;
+
+      requestAnimationFrame(callback: () => void, element?: HTMLElement): void;
+
+      setEditorInterval(callback: () => void, time: number): number;
+
+      setEditorTimeout(editor: TinyMce.Editor, callback: () => void, time: number): number;
+
+      setInterval(callback: () => void, time: number): number;
+
+      setTimeout(callback: () => void, time: number): number;
+    }
+
+    export interface EventDispatcher {
+
+      fire(name: string, args?: {}): {};
+
+      has(name: string): boolean;
+
+      isNative(name: string): boolean;
+
+      off(name: string, callback?: () => void): {};
+
+      on(name: string, callback: () => void, first?: boolean): {};
+
+      once(name: string, callback: () => void, first: boolean): {};
+    }
+
+    export interface i18n {
+
+      rtl: boolean;
+
+      add(code: string, items: Array<{}>): void;
+
+      getCode(): string;
+
+      setCode(newCode: string): void;
+
+      translate(text: string): string;
+    }
+
+    export interface JSON {
+
+      parse(s: string): {};
+
+      serialize(obj: {}, quote?: string): string;
+    }
+
+    export interface JSONRequest {
+
+      send(args: {}): void;
+
+      sendRPC(o: {}): void;
+    }
+
+    export interface LocalStorage {
+
+      length: number;
+
+      clear(): void;
+
+      getItem(key: string): string;
+
+      key(index: number): string;
+
+      removeItem(key: string): void;
+
+      setItem(key: string, value: string): void;
+    }
+
+    export interface Observable {
+
+      fire(name: string, args?: {}, bubble?: boolean): {};
+
+      hasEventListeners(name: string): boolean;
+
+      off(name?: string, callback?: () => void): {};
+
+      on(name: string, callback: (event: any) => void, first?: boolean): {};
+
+      once(name: string, callback: (event: any) => void): {};
+    }
+
+    export interface Tools {
+
+      create(s: string, p: {}, root?: {}): void;
+
+      createNS(n: string, o?: {}): {};
+
+      each(o: {}, cb: () => void, s?: {}): void;
+
+      explode(s: string, d: string): void;
+
+      grep<T>(a: T[], f: () => void): T[];
+
+      inArray<T>(item: T, arr: T[]): number;
+
+      is(obj: {}, type: string): boolean;
+
+      isArray(obj: {}): boolean;
+
+      makeMap<T>(items: T[], delim?: string, map?: {}): {};
+
+      map<T, S>(array: T[], callback: (c: T) => S): S[];
+
+      resolve(n: string, o?: {}): {};
+
+      toArray<T>(obj: {}): T[];
+
+      trim(s: string): string;
+
+      walk(o: {}, f: () => void, n?: string, s?: string): void;
+    }
+
+    export interface URI {
+
+      getURI(noProtoHost: boolean): URI;
+
+      isSameOrigin(uri: TinyMce.util.URI): boolean;
+
+      setPath(path: string): void;
+
+      toAbsPath(base: string, path: string): void;
+
+      toAbsolute(uri: string, noHost: boolean): string;
+
+      toRelPath(base: string, path: string): void;
+
+      toRelative(uri: string): string;
+    }
+
+    export class URI implements URI {
+
+      constructor(url: string, settings?: {});
+    }
+
+    export interface XHR {
+
+      fire(name: string, args?: {}, bubble?: boolean): {};
+
+      hasEventListeners(name: string): boolean;
+
+      off(name?: string, callback?: () => void): {};
+
+      on(name: string, callback: () => void, first?: boolean): {};
+
+      once(name: string, callback: () => void): {};
+
+      send(settings: {}): void;
+    }
+
   }
 }
 
-declare var tinymce: TinyMCE.Static;
+declare var tinymce: TinyMce.Static;
diff --git a/tinymce/tinymce-tests.ts b/tinymce/tinymce-tests.ts
index 3b3f3386f1..18dd5cfbc7 100644
--- a/tinymce/tinymce-tests.ts
+++ b/tinymce/tinymce-tests.ts
@@ -1,12 +1,17 @@
 tinymce.init(
   {
-    selector: '.tinymce-editable',
-    height: 145,
+    selector: 'textarea',
+    height: 500,
+    menubar: false,
     plugins: [
-      'autolink table contextmenu paste code link textcolor colorpicker image imagetools'
+      'advlist autolink lists link image charmap print preview anchor',
+      'searchreplace visualblocks code fullscreen',
+      'insertdatetime media table contextmenu paste code'
     ],
-    menubar: 'edit insert table tools',
-    toolbar: 'undo redo | styleselect bold italic forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | link image',
-    content_css: 'page.css'
+    toolbar: 'undo redo | insert | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image',
+    content_css: '//www.tinymce.com/css/codepen.min.css'
   }
-);
\ No newline at end of file
+);
+
+
+let t = new TinyMce.util.Color('#FFFFFF');
diff --git a/transducers-js/package.json b/transducers-js/package.json
deleted file mode 100644
index 84d23a146b..0000000000
--- a/transducers-js/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "dependencies": {
-     "immutable": "^3.8.1"
-  }
-}
\ No newline at end of file
diff --git a/transducers-js/transducers-js-tests.ts b/transducers-js/transducers-js-tests.ts
index f40575fe72..d11825838f 100644
--- a/transducers-js/transducers-js-tests.ts
+++ b/transducers-js/transducers-js-tests.ts
@@ -1,7 +1,6 @@
 // tests taken from https://github.com/cognitect-labs/transducers-js
 
 import * as t from 'transducers-js';
-import * as _ from "lodash";
 
 var map    = t.map,
     filter = t.filter,
@@ -14,7 +13,7 @@ function inc(n: number) { return n + 1; };
 function isEven(n: number) { return n % 2 === 0; };
 var xf = comp(map(inc), filter(isEven));
 
-console.log(into([], xf, [0, 1, 2, 3, 4])); // [2, 4]
+into([], xf, [0, 1, 2, 3, 4]); // [2, 4]
 
 // integration
 
@@ -24,27 +23,6 @@ var arr   = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
     toFn  = t.toFn;
 
 arr.reduce(toFn(xf, apush), []); // native
-_(arr).reduce(toFn(xf, apush), []); // underscore or lodash
-
-// immutable-js
-
-import * as Immutable from 'immutable';
-
-function sum(a: number, b: number): number { return a + b; };
-var transduce = t.transduce;
-
-var largeVector = Immutable.List();
-
-for (var i = 0; i < 1000000; i++) {
-  largeVector = largeVector.push(i);
-}
-
-// built in Immutable-js functionality
-largeVector.map(inc).filter(isEven).reduce(sum);
-
-// faster with transducers
-var xf = comp(map(inc), filter(isEven));
-transduce(xf, sum, 0, largeVector);
 
 // source examples
 
diff --git a/transducers-js/tsconfig.json b/transducers-js/tsconfig.json
index 02a9f8b69d..3a49663656 100644
--- a/transducers-js/tsconfig.json
+++ b/transducers-js/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6",
-            "dom"
+            "es6"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/tslint.json b/tslint.json
index 6b04ae7f36..7847d36674 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1 +1 @@
-{ "extends": "./node_modules/types-publisher/tslint-definitions.json" }
\ No newline at end of file
+{ "extends": "./node_modules/types-publisher/tslint-definitions.json" }
diff --git a/twilio/index.d.ts b/twilio/index.d.ts
index b5b653f64a..358f45ca01 100644
--- a/twilio/index.d.ts
+++ b/twilio/index.d.ts
@@ -1,19 +1,20 @@
 // Type definitions for twilio
 // Project: https://github.com/twilio/twilio-node
-// Definitions by: nickiannone <https://github.com/nickiannone>
+// Definitions by: nickiannone <https://github.com/nickiannone>, Ashley Brener <https://github.com/ashleybrener>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="express" />
 /// <reference types="node" />
-/// <reference types="q" />
+
 import Express = require("express");
 import Http = require("http");
 import Q = require("q");
 
 declare interface twilio {
-  (sid?: string, tkn?: string, options?: twilio.ClientOptions): twilio.RestClient;
+  (sid?: string, tkn?: string, options?: twilio.ClientOptions): twilio.RestClient
 }
 
+declare function twilio(sid?: string, tkn?: string, options?: twilio.ClientOptions): twilio.RestClient;
+
 declare namespace twilio {
 
   // Composite Classes:
diff --git a/twilio/tsconfig.json b/twilio/tsconfig.json
index 997e9d8770..805d02ab2f 100644
--- a/twilio/tsconfig.json
+++ b/twilio/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/twilio/twilio-tests.ts b/twilio/twilio-tests.ts
index 44ade2e246..2a653af584 100644
--- a/twilio/twilio-tests.ts
+++ b/twilio/twilio-tests.ts
@@ -6,7 +6,7 @@ import * as Express from "express";
 var str: string;
 
 // Create a client:
-var client: twilio.RestClient = (require('twilio') as twilio)('ACCOUNT_SID', 'AUTH_TOKEN');
+var client: twilio.RestClient = twilio('ACCOUNT_SID', 'AUTH_TOKEN');
 
 //Get a list of calls made by this account
 // GET /2010-04-01/Accounts/ACCOUNT_SID/Calls
diff --git a/typeahead/index.d.ts b/typeahead/index.d.ts
index 95100bbbba..d6ed81a921 100644
--- a/typeahead/index.d.ts
+++ b/typeahead/index.d.ts
@@ -1015,7 +1015,7 @@ declare namespace Bloodhound {
          * @param response Prefetch response.
          * @returns Transform response.
          */
-        transform?: (response: T[]) => T[];
+        transform?: (response: T) => T;
     }
 
     /**
@@ -1069,7 +1069,13 @@ declare namespace Bloodhound {
          * @param response Prefetch response.
          * @returns Transform response.
          */
-        transform?: (response: T[]) => T[];
+        transform?: (response: T) => T;
+
+        /**
+         * DEPRECATED: transform the remote response before the Bloodhound instance operates on it.
+         * */
+        filter?: (response: T) => T;
+
     }
 
     /**
@@ -1200,6 +1206,11 @@ declare class Bloodhound<T> {
      * clearRemoteCache offers a way to programmatically clear said cache.
      */
     public clearRemoteCache(): Bloodhound<T>;
+
+    /*
+     * DEPRECATED: wraps the suggestion engine in an adapter that is compatible with the typeahead jQuery plugin
+     */
+    public ttAdapter(): any;
 }
 
 declare module "bloodhound" {
diff --git a/typeahead/typeahead-tests.ts b/typeahead/typeahead-tests.ts
index 4f50cb57e2..d298508e11 100644
--- a/typeahead/typeahead-tests.ts
+++ b/typeahead/typeahead-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery"/>
-
 function test_typeahead() {
     var options: Twitter.Typeahead.Options = {};
     var dataset: Twitter.Typeahead.Dataset<string> = { source: null };
@@ -376,7 +374,7 @@ function test_bloodhout() {
         }
 
         function test_bloodhout_prefetch_options_transform() {
-            var options: Bloodhound.PrefetchOptions<string> = {
+            var options: Bloodhound.PrefetchOptions<string[]> = {
                 url: 'url',
                 transform: (response: string[]) => { return new Array<string>(); }
             };
@@ -385,7 +383,7 @@ function test_bloodhout() {
         function test_bloodhout_prefetch_options_all() {
             var ajaxSettings: JQueryAjaxSettings = { url: 'url' };
 
-            var options: Bloodhound.PrefetchOptions<string> = {
+            var options: Bloodhound.PrefetchOptions<string[]> = {
                 url: 'url',
                 cache: true,
                 ttl: 86400000,
@@ -435,7 +433,7 @@ function test_bloodhout() {
         }
 
         function test_bloodhout_remote_options_transform() {
-            var options: Bloodhound.RemoteOptions<string> = {
+            var options: Bloodhound.RemoteOptions<string[]> = {
                 url: 'url',
                 transform: (response: string[]) => { return new Array<string>(); }
             };
@@ -444,7 +442,7 @@ function test_bloodhout() {
         function test_bloodhout_remote_options_all() {
             var ajaxSettings: JQueryAjaxSettings = { url: 'url' };
 
-            var options: Bloodhound.RemoteOptions<string> = {
+            var options: Bloodhound.RemoteOptions<string[]> = {
                 url: 'url',
                 prepare: (query: string, settings: JQueryAjaxSettings) => { return ajaxSettings; },
                 wildcard: '%QUERY',
diff --git a/ui-router-extras/index.d.ts b/ui-router-extras/index.d.ts
index 0758058c50..81ddddfc75 100644
--- a/ui-router-extras/index.d.ts
+++ b/ui-router-extras/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for UI-Router Extras (ct.ui.router.extras module) 0.0
+// Type definitions for ui-router-extras 0.1
 // Project: https://github.com/christopherthielen/ui-router-extras
-// Definitions by: Michael Putters <https://github.com/mputters/>, Marcel van de Kamp <https://github.com/marcel-k/>
+// Definitions by: Michael Putters <https://github.com/mputters/>, Marcel van de Kamp <https://github.com/marcel-k/>, Viktor Smirnov <https://github.com/LaserUnicorns/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="angular-ui-router" />
@@ -117,11 +117,11 @@ declare module 'angular' {
             /*
              * Function (injectable). Called when a sticky state is navigated away from (inactivated).
              */
-            onInactivate?: Function;
+            onInactivate?: (...args: any[]) => void;
             /*
              * Function (injectable). Called when an inactive sticky state is navigated to (reactivated).
              */
-            onReactivate?: Function;
+            onReactivate?: (...args: any[]) => void;
             /*
              * Note: named views are mandatory when using sticky states!
              */
@@ -149,5 +149,62 @@ declare module 'angular' {
             state(config: IStickyState): IStateProvider;
             state(name: string, config: IStickyState): IStateProvider;
         }
+
+
+        interface IFutureStateProvider {
+
+            /**
+             * Registers a `FutureState` object as a placeholder for a full UI-Router `state` or `state` tree.
+             */
+            futureState(state: IFutureState): void;
+
+            /**
+             * Registers a `StateFactory` function for `FutureState` of type `type`.
+             */
+            stateFactory(type: string, stateFactory: IFutureStateFactory): void;
+
+            /**
+             * Adds a resolve function. 
+             * `$futureStateProvider` won't reject any state transitions or routes until all resolveFunction promises have been resolved. 
+             * Resolves may be used to defer routing until the states have been loaded via $http, for instance.
+             */
+            addResolve(resolveFn: IResolveFunction): void;
+        }
+
+        interface IFutureStateService {
+
+        }
+
+        /**
+         * A `FutureState` object is a placeholder for full a UI-Router `state`
+         */
+        interface IFutureState {
+
+            /**
+             * The placeholder state name (fully qualified). 
+             * Attempted transitions to this state (or any substates) will trigger a lazy load of the full UI-Router `state` represented by this FutureState.
+             */
+            stateName: string;
+
+            /**
+             * The placeholder url path fragment (the fragment is the URL prefix which the state will be accessed on, not the URL of the state's source code). 
+             * Attempted navigations to a URL starting with this fragment will trigger a lazy load of the full UI-Router `state` represented by this FutureState. 
+             */
+            url: string;
+
+            /**
+             * The type of FutureState. This is a used to select a registered StateFactory which is then used to build the full UI-Router `state`
+             */
+            type: string;
+
+            [key: string]: any;
+        }
+
+        /**
+         * `StateFactory` factories convert `FutureState` into a full UI-Router `state`, or `state` tree
+         */
+        type IFutureStateFactory = angular.Injectable<(...args: any[]) => angular.IPromise<ui.IState | undefined>>;
+
+        type IResolveFunction = angular.Injectable<(...args: any[]) => angular.IPromise<any>>;
     }
 }
diff --git a/ui-router-extras/tslint.json b/ui-router-extras/tslint.json
new file mode 100644
index 0000000000..19dc9db271
--- /dev/null
+++ b/ui-router-extras/tslint.json
@@ -0,0 +1,8 @@
+{
+  "extends": "../tslint.json",
+  "rules": {
+    "interface-name": [
+        false
+    ]
+  }
+}
diff --git a/ui-router-extras/ui-router-extras-tests.ts b/ui-router-extras/ui-router-extras-tests.ts
index 3de40aef76..427c0ca498 100644
--- a/ui-router-extras/ui-router-extras-tests.ts
+++ b/ui-router-extras/ui-router-extras-tests.ts
@@ -3,30 +3,30 @@ var myApp = angular.module('testModule')
 
 myApp.config(($stateProvider: angular.ui.IStateProvider, $stickyStateProvider: angular.ui.IStickyStateProvider) => {
     var state: angular.ui.IStickyState = {
-		name: 'test',
+        name: 'test',
         sticky: true,
         dsr: {
             default: 'substate',
             params: ['param1', 'param2'],
-            fn: function ($dsr$) {
+            fn: ($dsr$) => {
 
                 return $dsr$.to;
             }
         },
-        onInactivate: function ($state: angular.ui.IState) {
+        onInactivate: ($state: angular.ui.IState) => {
             var iAmInjectedByInjector = $state;
         },
-        onReactivate: function ($state: angular.ui.IState) {
+        onReactivate: ($state: angular.ui.IState) => {
             var iAmInjectedByInjector = $state;
         },
         controller: ($previousState: angular.ui.IPreviousStateService, $deepstateRedirect: angular.ui.IDeepStateRedirectService) => {
-			$previousState.memo('test-memo1');
-			$previousState.memo('test-memo2', 'test-state-name2');
-			$previousState.memo('test-memo3', 'test-state-name3', {});
-			$previousState.forget('test-memo3');
-			$previousState.go('test-memo2', {
-				location: true,
-				notify: true
+            $previousState.memo('test-memo1');
+            $previousState.memo('test-memo2', 'test-state-name2');
+            $previousState.memo('test-memo3', 'test-state-name3', {});
+            $previousState.forget('test-memo3');
+            $previousState.go('test-memo2', {
+                location: true,
+                notify: true
             });
             $previousState.get();
             $previousState.get('test-memo1');
@@ -40,36 +40,36 @@ myApp.config(($stateProvider: angular.ui.IStateProvider, $stickyStateProvider: a
             //named views are mandatory
             'name1': {}
         }
-	};
+    };
+
+    $stickyStateProvider.enableDebug(true);
+    $stateProvider.state(state);
 
-	$stickyStateProvider.enableDebug(true);
-	$stateProvider.state(state);
-    
     $stateProvider.state({
-		name: 'test',
+        name: 'test',
         sticky: true,
         dsr: {
             default: 'substate',
             params: ['param1', 'param2'],
-            fn: function ($dsr$) {
+            fn: ($dsr$) => {
 
                 return $dsr$.to;
             }
         },
-        onInactivate: function ($state: angular.ui.IState) {
+        onInactivate: ($state: angular.ui.IState) => {
             var iAmInjectedByInjector = $state;
         },
-        onReactivate: function ($state: angular.ui.IState) {
+        onReactivate: ($state: angular.ui.IState) => {
             var iAmInjectedByInjector = $state;
         },
         controller: ($previousState: angular.ui.IPreviousStateService, $deepstateRedirect: angular.ui.IDeepStateRedirectService) => {
-			$previousState.memo('test-memo1');
-			$previousState.memo('test-memo2', 'test-state-name2');
-			$previousState.memo('test-memo3', 'test-state-name3', {});
-			$previousState.forget('test-memo3');
-			$previousState.go('test-memo2', {
-				location: true,
-				notify: true
+            $previousState.memo('test-memo1');
+            $previousState.memo('test-memo2', 'test-state-name2');
+            $previousState.memo('test-memo3', 'test-state-name3', {});
+            $previousState.forget('test-memo3');
+            $previousState.go('test-memo2', {
+                location: true,
+                notify: true
             });
             $previousState.get();
             $previousState.get('test-memo1');
@@ -83,33 +83,33 @@ myApp.config(($stateProvider: angular.ui.IStateProvider, $stickyStateProvider: a
             //named views are mandatory
             'name1': {}
         }
-	});
-    
+    });
+
     $stateProvider.state('name1', {
-		name: 'test',
+        name: 'test',
         sticky: true,
         dsr: {
             default: 'substate',
             params: ['param1', 'param2'],
-            fn: function ($dsr$) {
+            fn: ($dsr$) => {
 
                 return $dsr$.to;
             }
         },
-        onInactivate: function ($state: angular.ui.IState) {
+        onInactivate: ($state: angular.ui.IState) => {
             var iAmInjectedByInjector = $state;
         },
-        onReactivate: function ($state: angular.ui.IState) {
+        onReactivate: ($state: angular.ui.IState) => {
             var iAmInjectedByInjector = $state;
         },
         controller: ($previousState: angular.ui.IPreviousStateService, $deepstateRedirect: angular.ui.IDeepStateRedirectService) => {
-			$previousState.memo('test-memo1');
-			$previousState.memo('test-memo2', 'test-state-name2');
-			$previousState.memo('test-memo3', 'test-state-name3', {});
-			$previousState.forget('test-memo3');
-			$previousState.go('test-memo2', {
-				location: true,
-				notify: true
+            $previousState.memo('test-memo1');
+            $previousState.memo('test-memo2', 'test-state-name2');
+            $previousState.memo('test-memo3', 'test-state-name3', {});
+            $previousState.forget('test-memo3');
+            $previousState.go('test-memo2', {
+                location: true,
+                notify: true
             });
             $previousState.get();
             $previousState.get('test-memo1');
@@ -123,6 +123,41 @@ myApp.config(($stateProvider: angular.ui.IStateProvider, $stickyStateProvider: a
             //named views are mandatory
             'name1': {}
         }
-	});
-    
+    });
+
 });
+
+var templateLoadStateFactory: ng.ui.IFutureStateFactory = ($q: ng.IQService, $timeout: ng.ITimeoutService, futureState: ng.ui.IFutureState) => {
+    var d = $q.defer();
+    $timeout(() => {
+        var fullUiRouterState = {
+            name: futureState.stateName,
+            url: futureState.url,
+            template: '<h1>Template</h1>'
+        }
+        d.resolve(fullUiRouterState); // Async resolve of ui-router state promise
+    }, 1000);
+    return d.promise; // ui-router state promise returned
+}
+
+myApp.config(($futureStateProvider: ng.ui.IFutureStateProvider) => {
+    $futureStateProvider.addResolve(($q: ng.IQService, $timeout: ng.ITimeoutService) => {
+        var d = $q.defer();
+        $timeout(() => {
+            d.resolve("When this resolves, future state provider will re-sync the state/url");
+        }, 1000);
+        return d.promise;
+    });
+
+    var futureState = { type: 'ngload', stateName: 'foo', url: '/foo', src: 'foo.js' };
+    $futureStateProvider.futureState(futureState);
+
+    $futureStateProvider.stateFactory('ngload', templateLoadStateFactory);
+});
+
+var adminModuleFutureState: ng.ui.IFutureState = {
+    stateName: 'app.admin',
+    url: '/admin',
+    type: 'ngload',
+    src: 'js/modules/admin.js' // example custom attr
+}
diff --git a/underscore/index.d.ts b/underscore/index.d.ts
index 48452b9e2e..856bf8e0fa 100644
--- a/underscore/index.d.ts
+++ b/underscore/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Underscore 1.7.0
+// Type definitions for Underscore 1.8
 // Project: http://underscorejs.org/
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>, Josh Baldwin <https://github.com/jbaldwin/>, Christopher Currens <https://github.com/ccurrens/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -153,9 +153,19 @@ declare module _ {
         **/
         map<T, TResult>(
             list: _.List<T>,
-            iterator: _.ListIterator<T, TResult> | _.IterateePropertyShorthand | _.IterateeMatcherShorthand<any>,
+            iterator: _.ListIterator<T, TResult>,
             context?: any): TResult[];
 
+        map<T>(
+            list: _.List<T>,
+            iterator: _.IterateePropertyShorthand,
+            context?: any): T[];
+
+        map<T>(
+            list: _.List<T>,
+            iterator: _.IterateeMatcherShorthand<any>,
+            context?: any): boolean[];
+
         /**
         * @see _.map
         * @param object Maps the properties of this object.
@@ -171,18 +181,7 @@ declare module _ {
         /**
         * @see _.map
         **/
-        collect<T, TResult>(
-            list: _.List<T>,
-            iterator: _.ListIterator<T, TResult> | _.IterateePropertyShorthand | _.IterateeMatcherShorthand<any>,
-            context?: any): TResult[];
-
-        /**
-        * @see _.map
-        **/
-        collect<T, TResult>(
-            object: _.Dictionary<T>,
-            iterator: _.ObjectIterator<T, TResult>,
-            context?: any): TResult[];
+        collect: typeof _.map;
 
         /**
         * Also known as inject and foldl, reduce boils down a list of values into a single value.
@@ -196,7 +195,7 @@ declare module _ {
         * @return Reduced object result.
         **/
         reduce<T, TResult>(
-            list: _.Collection<T>,
+            list: _.List<T>,
             iterator: _.MemoIterator<T, TResult>,
             memo?: TResult,
             context?: any): TResult;
@@ -211,11 +210,17 @@ declare module _ {
         * @see _.reduce
         **/
         inject<T, TResult>(
-            list: _.Collection<T>,
+            list: _.List<T>,
             iterator: _.MemoIterator<T, TResult>,
             memo?: TResult,
             context?: any): TResult;
 
+        inject<T, TResult>(
+            list: _.Dictionary<T>,
+            iterator: _.MemoObjectIterator<T, TResult>,
+            memo?: TResult,
+            context?: any): TResult;
+
         /**
         * @see _.reduce
         **/
@@ -262,7 +267,7 @@ declare module _ {
         find<T>(
             list: _.List<T>,
             iterator: _.ListIterator<T, boolean>,
-            context?: any): T;
+            context?: any): T | undefined;
 
         /**
         * @see _.find
@@ -270,21 +275,21 @@ declare module _ {
         find<T>(
             object: _.Dictionary<T>,
             iterator: _.ObjectIterator<T, boolean>,
-            context?: any): T;
+            context?: any): T | undefined;
 
         /**
         * @see _.find
         **/
         find<T, U extends {}>(
             object: _.List<T> | _.Dictionary<T>,
-            iterator: U): T;
+            iterator: U): T | undefined;
 
         /**
         * @see _.find
         **/
         find<T>(
             object: _.List<T> | _.Dictionary<T>,
-            iterator: string): T;
+            iterator: string): T | undefined;
 
         /**
         * @see _.find
@@ -292,7 +297,7 @@ declare module _ {
         detect<T>(
             list: _.List<T>,
             iterator: _.ListIterator<T, boolean>,
-            context?: any): T;
+            context?: any): T | undefined;
 
         /**
         * @see _.find
@@ -300,21 +305,21 @@ declare module _ {
         detect<T>(
             object: _.Dictionary<T>,
             iterator: _.ObjectIterator<T, boolean>,
-            context?: any): T;
+            context?: any): T | undefined;
 
         /**
         * @see _.find
         **/
         detect<T, U extends {}>(
             object: _.List<T> | _.Dictionary<T>,
-            iterator: U): T;
+            iterator: U): T | undefined;
 
         /**
         * @see _.find
         **/
         detect<T>(
             object: _.List<T> | _.Dictionary<T>,
-            iterator: string): T;
+            iterator: string): T | undefined;
 
         /**
         * Looks through each value in the list, returning an array of all the values that pass a truth
@@ -372,7 +377,7 @@ declare module _ {
         **/
         findWhere<T, U extends {}>(
             list: _.List<T>,
-            properties: U): T;
+            properties: U): T | undefined;
 
         /**
         * Returns the values in list without the elements that the truth test (iterator) passes.
@@ -754,7 +759,7 @@ declare module _ {
         * @param array Retrieves the first element of this array.
         * @return Returns the first element of `array`.
         **/
-        first<T>(array: _.List<T>): T;
+        first<T>(array: _.List<T>): T | undefined;
 
         /**
         * @see _.first
@@ -767,7 +772,7 @@ declare module _ {
         /**
         * @see _.first
         **/
-        head<T>(array: _.List<T>): T;
+        head<T>(array: _.List<T>): T | undefined;
 
         /**
         * @see _.first
@@ -804,7 +809,7 @@ declare module _ {
         * @param array Retrieves the last element of this array.
         * @return Returns the last element of `array`.
         **/
-        last<T>(array: _.List<T>): T;
+        last<T>(array: _.List<T>): T | undefined;
 
         /**
         * @see _.last
@@ -3768,7 +3773,7 @@ declare module _ {
         * @param attrs Object with key values pair
         * @return Predicate function
         **/
-        matches<T, TResult>(attrs: T): _.ListIterator<T, TResult>;
+        matches<T>(attrs: T): _.ListIterator<T, boolean>;
 
         /**
         * Returns a predicate function that will tell you if a passed in object contains all of the key/value properties present in attrs.
@@ -3776,7 +3781,7 @@ declare module _ {
         * @param attrs Object with key values pair
         * @return Predicate function
         **/
-        matcher<T, TResult>(attrs: T): _.ListIterator<T, TResult>;
+        matcher<T>(attrs: T): _.ListIterator<T, boolean>;
 
         /**
         * Returns a function that will itself return the key property of any passed-in object.
@@ -4100,22 +4105,22 @@ declare module _ {
         * Wrapped type `any[]`.
         * @see _.each
         **/
-        each(iterator: _.ListIterator<T, void>, context?: any): T[];
+        each(iterator: _.ListIterator<T, void>, context?: any): _.List<T>;
 
         /**
         * @see _.each
         **/
-        each(iterator: _.ObjectIterator<T, void>, context?: any): T[];
+        each(iterator: _.ObjectIterator<T, void>, context?: any): _.List<T>;
 
         /**
         * @see _.each
         **/
-        forEach(iterator: _.ListIterator<T, void>, context?: any): T[];
+        forEach(iterator: _.ListIterator<T, void>, context?: any): _.List<T>;
 
         /**
         * @see _.each
         **/
-        forEach(iterator: _.ObjectIterator<T, void>, context?: any): T[];
+        forEach(iterator: _.ObjectIterator<T, void>, context?: any): _.List<T>;
 
         /**
         * Wrapped type `any[]`.
@@ -4170,32 +4175,32 @@ declare module _ {
         * Wrapped type `any[]`.
         * @see _.find
         **/
-        find<T>(iterator: _.ListIterator<T, boolean> | _.ObjectIterator<T, boolean>, context?: any): T;
+        find<T>(iterator: _.ListIterator<T, boolean> | _.ObjectIterator<T, boolean>, context?: any): T | undefined;
 
         /**
         * @see _.find
         **/
-        find<T, U extends {}>(interator: U): T;
+        find<T, U extends {}>(interator: U): T | undefined;
 
         /**
         * @see _.find
         **/
-        find<T>(interator: string): T;
+        find<T>(interator: string): T | undefined;
 
         /**
         * @see _.find
         **/
-        detect<T>(iterator: _.ListIterator<T, boolean> | _.ObjectIterator<T, boolean>, context?: any): T;
+        detect<T>(iterator: _.ListIterator<T, boolean> | _.ObjectIterator<T, boolean>, context?: any): T | undefined;
 
         /**
         * @see _.find
         **/
-        detect<T, U extends {}>(interator?: U): T;
+        detect<T, U extends {}>(interator?: U): T | undefined;
 
         /**
         * @see _.find
         **/
-        detect<T>(interator?: string): T;
+        detect<T>(interator?: string): T | undefined;
 
         /**
         * Wrapped type `any[]`.
@@ -4218,7 +4223,7 @@ declare module _ {
         * Wrapped type `any[]`.
         * @see _.findWhere
         **/
-        findWhere<U extends {}>(properties: U): T;
+        findWhere<U extends {}>(properties: U): T | undefined;
 
         /**
         * Wrapped type `any[]`.
@@ -4399,7 +4404,7 @@ declare module _ {
         * Wrapped type `any[]`.
         * @see _.first
         **/
-        first(): T;
+        first(): T | undefined;
 
         /**
         * Wrapped type `any[]`.
@@ -4410,7 +4415,7 @@ declare module _ {
         /**
         * @see _.first
         **/
-        head(): T;
+        head(): T | undefined;
 
         /**
         * @see _.first
@@ -4437,7 +4442,7 @@ declare module _ {
         * Wrapped type `any[]`.
         * @see _.last
         **/
-        last(): T;
+        last(): T | undefined;
 
         /**
         * Wrapped type `any[]`.
@@ -4690,7 +4695,7 @@ declare module _ {
         * Wrapped type `Function`.
         * @see _.negate
         **/
-        negate(): boolean;
+        negate(): (...args: any[]) => boolean;
 
         /**
         * Wrapped type `Function[]`.
@@ -4805,13 +4810,13 @@ declare module _ {
         * Wrapped type `any[]`.
         * @see _.matches
         **/
-        matches<TResult>(): _.ListIterator<T, TResult>;
+        matches(): _.ListIterator<T, boolean>;
 
         /**
          * Wrapped type `any[]`.
          * @see _.matcher
          **/
-        matcher<TResult>(): _.ListIterator<T, TResult>;
+        matcher(): _.ListIterator<T, boolean>;
 
         /**
         * Wrapped type `string`.
@@ -5130,32 +5135,32 @@ declare module _ {
         * Wrapped type `any[]`.
         * @see _.find
         **/
-        find<T>(iterator: _.ListIterator<T, boolean> | _.ObjectIterator<T, boolean>, context?: any): _ChainSingle<T>;
+        find<T>(iterator: _.ListIterator<T, boolean> | _.ObjectIterator<T, boolean>, context?: any): _ChainSingle<T | undefined>;
 
         /**
         * @see _.find
         **/
-        find<T, U extends {}>(interator: U): _ChainSingle<T>;
+        find<T, U extends {}>(interator: U): _ChainSingle<T | undefined>;
 
         /**
         * @see _.find
         **/
-        find<T>(interator: string): _ChainSingle<T>;
+        find<T>(interator: string): _ChainSingle<T | undefined>;
 
         /**
         * @see _.find
         **/
-        detect<T>(iterator: _.ListIterator<T, boolean> | _.ObjectIterator<T, boolean>, context?: any): _ChainSingle<T>;
+        detect<T>(iterator: _.ListIterator<T, boolean> | _.ObjectIterator<T, boolean>, context?: any): _ChainSingle<T | undefined>;
 
         /**
         * @see _.find
         **/
-        detect<T, U extends {}>(interator: U): _ChainSingle<T>;
+        detect<T, U extends {}>(interator: U): _ChainSingle<T | undefined>;
 
         /**
         * @see _.find
         **/
-        detect<T>(interator: string): _ChainSingle<T>;
+        detect<T>(interator: string): _ChainSingle<T | undefined>;
 
         /**
         * Wrapped type `any[]`.
@@ -5359,7 +5364,7 @@ declare module _ {
         * Wrapped type `any[]`.
         * @see _.first
         **/
-        first(): _ChainSingle<T>;
+        first(): _ChainSingle<T | undefined>;
 
         /**
         * Wrapped type `any[]`.
@@ -5765,13 +5770,13 @@ declare module _ {
         * Wrapped type `any[]`.
         * @see _.matches
         **/
-        matches<TResult>(): _Chain<T>;
+        matches(): _Chain<T>;
 
         /**
          * Wrapped type `any[]`.
          * @see _.matcher
          **/
-        matcher<TResult>(): _Chain<T>;
+        matcher(): _Chain<T>;
 
         /**
         * Wrapped type `string`.
diff --git a/underscore/tsconfig.json b/underscore/tsconfig.json
index efe53f654c..a73adc6c5d 100644
--- a/underscore/tsconfig.json
+++ b/underscore/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": false,
         "noImplicitThis": false,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,4 +20,4 @@
         "index.d.ts",
         "underscore-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/underscore/underscore-tests.ts b/underscore/underscore-tests.ts
index d3a5729022..9953540fa8 100644
--- a/underscore/underscore-tests.ts
+++ b/underscore/underscore-tests.ts
@@ -25,7 +25,7 @@ namespace TestFind {
 
 	{
 		let iterator = (value: {a: string}, index: number, list: _.List<{a: string}>) => value.a === 'b';
-		let result: {a: string};
+		let result: {a: string} | undefined;
 
 		result = _.find<{a: string}>(array, iterator);
 		result = _.find<{a: string}>(array, iterator, context);
@@ -90,7 +90,7 @@ namespace TestFind {
 
 	{
 		let iterator = (element: {a: string}, key: string, list: _.Dictionary<{a: string}>) => element.a === 'b';
-		let result: {a: string};
+		let result: {a: string} | undefined;
 
 		result = _.find<{a: string}>(dict, iterator);
 		result = _.find<{a: string}>(dict, iterator, context);
@@ -125,7 +125,7 @@ namespace TestFind {
 
 	{
 		let iterator = (value: string, index: number, list: _.List<string>) => value === 'b';
-		let result: string;
+		let result: string | undefined;
 
 		result = _.find<string>('abc', iterator);
 		result = _.find<string>('abc', iterator, context);
@@ -212,7 +212,7 @@ interface Family {
 	name: string;
 	relation: string;
 }
-var isUncleMoe = _.matches<Family, boolean>({ name: 'moe', relation: 'uncle' });
+var isUncleMoe = _.matches<Family>({ name: 'moe', relation: 'uncle' });
 _.filter([{ name: 'larry', relation: 'father' }, { name: 'moe', relation: 'uncle' }], isUncleMoe);
 
 
@@ -292,7 +292,7 @@ var initialize = _.once(createApplication);
 initialize("me");
 initialize("me");
 
-var notes: any[];
+var notes: any[] = [1,2,3];
 var render = () => alert("rendering...");
 var renderNotes = _.after(notes.length, render);
 _.each(notes, (note) => note.asyncSave({ success: renderNotes }));
@@ -390,7 +390,6 @@ _.isDate(new Date());
 _.isRegExp(/moe/);
 
 _.isNaN(NaN);
-isNaN(undefined);
 _.isNaN(undefined);
 
 _.isNull(null);
@@ -412,7 +411,7 @@ function useRegExp(arg: RegExp) {};
 function useArray<T>(arg: T[]) {};
 function useSymbol(arg: symbol) {};
 
-var guardedType: {};
+var guardedType: {} = {};
 if(_.isElement(guardedType)) useElement(guardedType);
 if(_.isArray(guardedType)) useArray(guardedType);
 if(_.isArray<String>(guardedType)) useArray(guardedType);
@@ -508,10 +507,14 @@ function chain_tests() {
 		.find(num => num % 2 == 0)
 		.value();
 
-	var firstVal: number = _.chain([1, 2, 3])
+	var firstVal: number | undefined = _.chain([1, 2, 3])
 		.first()
 		.value();
 
+	var firstVal2: number | undefined = _.chain([])
+        .first()
+        .value();
+
     let numberObjects = [{property: 'odd', value: 1}, {property: 'even', value: 2}, {property: 'even', value: 0}];
     let evenAndOddGroupedNumbers = _.chain(numberObjects)
         .groupBy('property')
diff --git a/uuid-1345/uuid-1345-tests.ts b/uuid-1345/uuid-1345-tests.ts
index e3eef2c939..da0876de89 100644
--- a/uuid-1345/uuid-1345-tests.ts
+++ b/uuid-1345/uuid-1345-tests.ts
@@ -1,6 +1,3 @@
-///<reference types="node" />
-
-'use strict';
 import * as UUID from 'uuid-1345';
 
 var uuid:string;
diff --git a/valerie/valerie-tests.ts b/valerie/valerie-tests.ts
index 227afc246b..b4f6efcdc9 100644
--- a/valerie/valerie-tests.ts
+++ b/valerie/valerie-tests.ts
@@ -1,15 +1,3 @@
-
-/// <reference types="knockout" />
-
-// Tests for valerie.d.ts
-// Project: https://github.com/davewatts/valerie
-// Definitions by: Howard Richards <https://github.com/conficient>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
-    Checks the .d.ts definition work. Not a fully comprehensive set of tests yet.
-*/
-
 /**
  * Simple enum for enum test
  */
diff --git a/validator/validator-tests.ts b/validator/validator-tests.ts
index c4cee64661..48621f1acd 100644
--- a/validator/validator-tests.ts
+++ b/validator/validator-tests.ts
@@ -1,8 +1,5 @@
-/// <reference types="validator" />
-
 import * as validator from 'validator';
 
-
 /************************************************
 *                                               *
 *                  IMPORT TESTS                 *
diff --git a/vex-js/vex-js-tests.ts b/vex-js/vex-js-tests.ts
index d4af6e9e6a..2f89745157 100644
--- a/vex-js/vex-js-tests.ts
+++ b/vex-js/vex-js-tests.ts
@@ -1,4 +1,3 @@
-///<reference types="jquery" />
 import vex = require("vex-js");
 
 var vexContent = vex.open({
diff --git a/victory/index.d.ts b/victory/index.d.ts
index 70d1ecb6f1..d1d241354d 100644
--- a/victory/index.d.ts
+++ b/victory/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Victory 0.9.0
 // Project: https://github.com/FormidableLabs/victory
-// Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
+// Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>, snerks <https://github.com/snerks>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -299,6 +299,11 @@ declare module "victory" {
             before?: (datum: any) => AnimationStyle;
             after?: (datum: any) => AnimationStyle;
         };
+        /**
+         * The easing prop specifies an easing function name to use for tweening.
+         * @default "quadInOut"
+         */
+        easing?: AnimationEasing;
     }
 
     /**
diff --git a/victory/victory-tests.tsx b/victory/victory-tests.tsx
index 7947f5f0ec..601780ffaf 100644
--- a/victory/victory-tests.tsx
+++ b/victory/victory-tests.tsx
@@ -601,4 +601,8 @@ test = (
            }
         }}
     />
-);
\ No newline at end of file
+);
+
+test = (
+    <VictoryChart animate={{ duration: 2000, easing: 'bounce' }} />
+);
diff --git a/vinyl-buffer/tsconfig.json b/vinyl-buffer/tsconfig.json
index 1208954da6..93296b534b 100644
--- a/vinyl-buffer/tsconfig.json
+++ b/vinyl-buffer/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/vinyl-paths/tsconfig.json b/vinyl-paths/tsconfig.json
index 4aa2ca1faa..126374df8c 100644
--- a/vinyl-paths/tsconfig.json
+++ b/vinyl-paths/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/vinyl-source-stream/tsconfig.json b/vinyl-source-stream/tsconfig.json
index 580c625e75..ef3c4de3b7 100644
--- a/vinyl-source-stream/tsconfig.json
+++ b/vinyl-source-stream/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/vinyl/vinyl-tests.ts b/vinyl/vinyl-tests.ts
index bb705b7b2b..f9e71dd532 100644
--- a/vinyl/vinyl-tests.ts
+++ b/vinyl/vinyl-tests.ts
@@ -1,8 +1,4 @@
 /// <reference types="mocha" />
-/// <reference types="should" />
-/// <reference types="node" />
-
-'use strict';
 
 import * as fs from 'fs';
 import * as path from 'path';
diff --git a/vis/index.d.ts b/vis/index.d.ts
index b4e4c61923..0d94a44354 100644
--- a/vis/index.d.ts
+++ b/vis/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for vis.js 4.17
 // Project: https://github.com/almende/vis
 // Definitions by: Michaël Bitard <https://github.com/MichaelBitard>
+//                 MacLeod Broad <https://github.com/macleodbroad-wf>
 //                 Adrian Caballero <https://github.com/adripanico>
 //                 Severin <https://github.com/seveves>
 //                 kaktus40 <https://github.com/kaktus40>
@@ -29,6 +30,27 @@ type TimelineEvents =
   'itemout' |
   'timechange' |
   'timechanged';
+type Graph2dStyleType = 'line' | 'bar' | 'points';
+type Graph2dBarChartAlign = 'left' | 'center' | 'right';
+type Graph2dDrawPointsStyle = 'square' | 'circle';
+type LegendPositionType = 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left';
+type ParametrizationInterpolationType = 'centripetal' | 'chordal' | 'uniform' | 'disabled';
+type TopBottomEnumType = 'top' | 'bottom';
+type RightLeftEnumType = 'right' | 'left';
+
+interface LegendPositionOptions {
+  visible?: boolean;
+  position?: LegendPositionType;
+}
+
+interface LegendOptions {
+  enabled?: boolean;
+  icons?: boolean;
+  iconSize?: number;
+  iconSpacing?: number;
+  left?: LegendPositionOptions;
+  right?: LegendPositionOptions;
+}
 
 interface DataItem {
   className?: string;
@@ -44,15 +66,35 @@ interface DataItem {
   editable?: boolean;
 }
 
+interface PointItem extends DataItem {
+  x: string;
+  y: number;
+}
+
+
 interface DataGroup {
   className?: string;
   content: string;
   id: IdType;
+  options?: DataGroupOptions;
   style?: string;
   subgroupOrder?: string | (() => void);
   title?: string;
 }
 
+interface DataGroupOptions {
+  drawPoints?: Graph2dDrawPointsOption | (() => void); // TODO
+  excludeFromLegend?: boolean;
+  interpolation?: boolean | InterpolationOptions;
+  shaded?: Graph2dShadedOption;
+  style?: string;
+  yAxisOrientation?: RightLeftEnumType;
+}
+
+interface InterpolationOptions {
+  parametrization: ParametrizationInterpolationType;
+}
+
 interface TimelineEditableOption {
   add?: boolean;
   remove?: boolean;
@@ -139,6 +181,7 @@ interface TimelineOptions {
   onRemoveGroup?: () => void; // TODO
   order?: () => void; // TODO
   orientation?: TimelineOptionsOrientationType;
+  rollingMode: boolean;
   selectable?: boolean;
   showCurrentTime?: boolean;
   showMajorLabels?: boolean;
@@ -526,6 +569,157 @@ export class DataView<T extends DataItem | DataGroup> {
 type DataItemCollectionType = DataItem[] | DataSet<DataItem> | DataView<DataItem>;
 type DataGroupCollectionType = DataGroup[] | DataSet<DataGroup> | DataView<DataGroup>;
 
+interface TitleOption {
+  text?: string;
+  style?: string;
+}
+
+interface RangeType {
+  min: IdType;
+  max: IdType;
+}
+
+interface DataAxisSideOption {
+  range?: RangeType;
+  format?: () => string;
+  title?: TitleOption;
+}
+
+interface Graph2dBarChartOption {
+  width?: number;
+  minWidth?: number;
+  sideBySide?: boolean;
+  align?: Graph2dBarChartAlign;
+}
+
+interface Graph2dDataAxisOption {
+  orientation?: TimelineOptionsOrientationType;
+  showMinorLabels?: boolean;
+  showMajorLabels?: boolean;
+  majorLinesOffset?: number;
+  minorLinesOffset?: number;
+  labelOffsetX?: number;
+  labelOffsetY?: number;
+  iconWidth?: number;
+  width?: string;
+  icons?: boolean;
+  visible?: boolean;
+  alignZeros?: boolean;
+  left?: DataAxisSideOption;
+  right?: DataAxisSideOption;
+}
+
+interface Graph2dDrawPointsOption {
+  enabled?: boolean;
+  onRender?: () => boolean; // TODO
+  size?: number;
+  style: Graph2dDrawPointsStyle;
+}
+
+interface Graph2dShadedOption {
+  orientation?: TopBottomEnumType;
+  groupid?: IdType;
+}
+
+type Graph2dOptionBarChart = number | Graph2dBarChartOption;
+type Graph2dOptionDataAxis = boolean | Graph2dDataAxisOption;
+type Graph2dOptionDrawPoints = boolean | Graph2dDrawPointsOption;
+type Graph2dLegendOption = boolean | LegendOptions;
+
+interface Graph2dOptions {
+  autoResize?: boolean;
+  barChart?: Graph2dOptionBarChart;
+  clickToUse?: boolean;
+  configure?: TimelineOptionsConfigureType;
+  dataAxis?: Graph2dOptionDataAxis;
+  defaultGroup?: string;
+  drawPoints?: Graph2dOptionDrawPoints;
+  end?: DateType;
+  format?: any; // TODO
+  graphHeight?: HeightWidthType;
+  height?: HeightWidthType;
+  hiddenDates?: any; // TODO
+  legend?: Graph2dLegendOption;
+  locale?: string;
+  locales?: any; // TODO
+  moment?: () => void; // TODO
+  max?: DateType;
+  maxHeight?: HeightWidthType;
+  maxMinorChars?: number;
+  min?: DateType;
+  minHeight?: HeightWidthType;
+  moveable?: boolean;
+  multiselect?: boolean;
+  orientation?: string;
+  sampling?: boolean;
+  showCurrentTime?: boolean;
+  showMajorLabels?: boolean;
+  showMinorLabels?: boolean;
+  sort?: boolean;
+  stack?: boolean;
+  start?: DateType;
+  style?: Graph2dStyleType;
+  throttleRedraw?: number;
+  timeAxis?: TimelineTimeAxisOption;
+  width?: HeightWidthType;
+  yAxisOrientation?: RightLeftEnumType;
+  zoomable?: boolean;
+  zoomKey?: string;
+  zoomMax?: number;
+  zoomMin?: number;
+  zIndex?: number;
+}
+
+export class Graph2d {
+  constructor(
+    container: HTMLElement,
+    items: DataItemCollectionType,
+    groups: DataGroupCollectionType,
+    options?: Graph2dOptions
+  );
+  constructor(
+    container: HTMLElement,
+    items: DataItemCollectionType,
+    options?: Graph2dOptions
+  );
+
+  addCustomTime(time: DateType, id?: IdType): IdType;
+  destroy(): void;
+  fit(options?: TimelineFitOptions): void;
+  focus(ids: IdType | IdType[], options?: TimelineFitOptions): void;
+  getCurrentTime(): Date;
+  getCustomTime(id?: IdType): Date;
+  getEventProperties(event: Event): TimelineEventPropertiesResult;
+  getItemRange(): any; // TODO
+  getSelection(): IdType[];
+  getVisibleItems(): IdType[];
+  getWindow(): { start: Date, end: Date };
+  moveTo(time: DateType, options?: TimelineFitOptions): void;
+  on(event: TimelineEvents, callback: () => void): void;
+  off(event: TimelineEvents, callback: () => void): void;
+  redraw(): void;
+  removeCustomTime(id: IdType): void;
+  setCurrentTime(time: DateType): void;
+  setCustomTime(time: DateType, id?: IdType): void;
+  setCustomTimeTitle(title: string, id?: IdType): void;
+  setData(data: { groups?: DataGroupCollectionType; items?: DataItemCollectionType }): void;
+  setGroups(groups?: DataGroupCollectionType): void;
+  setItems(items: DataItemCollectionType): void;
+  setOptions(options: TimelineOptions): void;
+  setSelection(ids: IdType | IdType[]): void;
+  setWindow(start: DateType, end: DateType, options?: TimelineFitOptions): void;
+}
+
+export interface Graph2d {
+  setGroups(groups?: TimelineGroup[]): void;
+  setItems(items?: TimelineItem[]): void;
+  getLegend(): TimelineWindow;
+  getWindow(): TimelineWindow;
+  setWindow(start: any, date: any): void;
+  focus(selection: any): void;
+  on(event?: string, callback?: (properties: any) => void): void;
+}
+
 export class Timeline {
   constructor(
     container: HTMLElement,
diff --git a/voronoi-diagram/voronoi-diagram-tests.ts b/voronoi-diagram/voronoi-diagram-tests.ts
index 31b261e1ce..97f04a37de 100644
--- a/voronoi-diagram/voronoi-diagram-tests.ts
+++ b/voronoi-diagram/voronoi-diagram-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="index.d.ts" />
-
 import voronoi = require("voronoi-diagram");
 
 const x: voronoi.Point = [1, 2];
diff --git a/vso-node-api/index.d.ts b/vso-node-api/index.d.ts
index 92b18209c1..51569f75a9 100644
--- a/vso-node-api/index.d.ts
+++ b/vso-node-api/index.d.ts
@@ -4,9 +4,9 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
-/// <reference types="q" />
 
 declare module 'vso-node-api/Serialization' {
+	import Q = require("q");
 	/**
 	* Metadata for deserializing an enum field on a contract/type
 	*/
diff --git a/vso-node-api/tsconfig.json b/vso-node-api/tsconfig.json
index 17db4a2513..feaeda0a61 100644
--- a/vso-node-api/tsconfig.json
+++ b/vso-node-api/tsconfig.json
@@ -12,6 +12,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/wake_on_lan/wake_on_lan-tests.ts b/wake_on_lan/wake_on_lan-tests.ts
index 3403d5c9fe..e8391a5765 100644
--- a/wake_on_lan/wake_on_lan-tests.ts
+++ b/wake_on_lan/wake_on_lan-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import wol = require('wake_on_lan');
 
 wol.wake("20:DE:20:DE:20:DE");
diff --git a/webappsec-credential-management/index.d.ts b/webappsec-credential-management/index.d.ts
index 0c1c2b5e2d..491efb3829 100644
--- a/webappsec-credential-management/index.d.ts
+++ b/webappsec-credential-management/index.d.ts
@@ -1,10 +1,150 @@
-// Type definitions for W3C (WebAppSec) Credential Management API, Level 1, 0.0
+// Type definitions for W3C (WebAppSec) Credential Management API Level 1, 0.1
 // Project: https://github.com/w3c/webappsec-credential-management
 // Definitions by: Iain McGinniss <https://github.com/iainmcgin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
 // Spec: http://www.w3.org/TR/2016/WD-credential-management-1-20160425/
 
-/// <reference types="whatwg-fetch" />
+/* ************************ FETCH API DEFINITIONS ******************************
+ * TS 2.2 introduced definitions for the fetch API in the dom library, but
+ * prior to that it was necessary to use the types defined in
+ * @types/whatwg-fetch. In order to support all versions of TS 2.x, the
+ * definitions for fetch from TS 2.2 dom are duplicated here. As long as these
+ * remain identical to the definitions in dom 2.2+, they cause no issues.
+ *
+ * One caveat to "identical" here is that type definitions cannot be duplicated,
+ * and so the "RequestInfo" type has been substituted for its expansion in
+ * the below definitions:
+ *
+ * type RequestInfo = Request|string;
+ * ************************************************************************** */
+
+interface Request extends Object, Body {
+    readonly cache: string;
+    readonly credentials: string;
+    readonly destination: string;
+    readonly headers: Headers;
+    readonly integrity: string;
+    readonly keepalive: boolean;
+    readonly method: string;
+    readonly mode: string;
+    readonly redirect: string;
+    readonly referrer: string;
+    readonly referrerPolicy: string;
+    readonly type: string;
+    readonly url: string;
+    clone(): Request;
+}
+
+declare var Request: {
+    prototype: Request;
+    new(input: Request | string, init?: RequestInit): Request;
+};
+
+interface Headers {
+    append(name: string, value: string): void;
+    delete(name: string): void;
+    forEach(callback: ForEachCallback): void;
+    get(name: string): string | null;
+    has(name: string): boolean;
+    set(name: string, value: string): void;
+}
+
+declare var Headers: {
+    prototype: Headers;
+    new(init?: any): Headers;
+};
+
+interface Response extends Object, Body {
+    readonly body: ReadableStream | null;
+    readonly headers: Headers;
+    readonly ok: boolean;
+    readonly status: number;
+    readonly statusText: string;
+    readonly type: string;
+    readonly url: string;
+    clone(): Response;
+}
+
+declare var Response: {
+    prototype: Response;
+    new(body?: any, init?: ResponseInit): Response;
+};
+
+interface ResponseInit {
+    status?: number;
+    statusText?: string;
+    headers?: any;
+}
+
+interface ReadableStream {
+    readonly locked: boolean;
+    cancel(): Promise<void>;
+    getReader(): ReadableStreamReader;
+}
+
+declare var ReadableStream: {
+    prototype: ReadableStream;
+    new(): ReadableStream;
+};
+
+interface ReadableStreamReader {
+    cancel(): Promise<void>;
+    read(): Promise<any>;
+    releaseLock(): void;
+}
+
+declare var ReadableStreamReader: {
+    prototype: ReadableStreamReader;
+    new(): ReadableStreamReader;
+};
+
+interface Body {
+    readonly bodyUsed: boolean;
+    arrayBuffer(): Promise<ArrayBuffer>;
+    blob(): Promise<Blob>;
+    json(): Promise<any>;
+    text(): Promise<string>;
+}
+
+interface URLSearchParams {
+    /**
+      * Appends a specified key/value pair as a new search parameter.
+      */
+    append(name: string, value: string): void;
+    /**
+      * Deletes the given search parameter, and its associated value, from the list of all search parameters.
+      */
+    delete(name: string): void;
+    /**
+      * Returns the first value associated to the given search parameter.
+      */
+    get(name: string): string | null;
+    /**
+      * Returns all the values association with a given search parameter.
+      */
+    getAll(name: string): string[];
+    /**
+      * Returns a Boolean indicating if such a search parameter exists.
+      */
+    has(name: string): boolean;
+    /**
+      * Sets the value associated to a given search parameter to the given value. If there were several values, delete the others.
+      */
+    set(name: string, value: string): void;
+}
+
+declare var URLSearchParams: {
+    prototype: URLSearchParams;
+    /**
+      * Constructor returning a URLSearchParams object.
+      */
+    new (init?: string | URLSearchParams): URLSearchParams;
+};
+
+interface GlobalFetch {
+    fetch(input: Request|string, init?: RequestInit): Promise<Response>;
+}
 
 /* ************************* FETCH MODIFICATIONS *******************************
  * The credential management spec modifies fetch(), by adding a new
@@ -16,78 +156,54 @@
  * See: https://www.w3.org/TR/credential-management-1/#monkey-patching
  * ************************************************************************** */
 
-interface Window {
-    fetch(url: CMRequestInfo, init?: CMRequestInit): Promise<Response>;
-}
+declare function fetch(
+    input: Request|string,
+    init?: RequestInit|CMRequestInit):
+    Promise<Response>;
 
-type CMRequestInfo = CMRequest|string;
+interface GlobalFetch {
+    // variant for navigator.credentials monkey patching
+    fetch(url: Request|string, init?: CMRequestInit): Promise<Response>;
+}
 
 /**
- * Variant of {@link Request} that permits a {@code 'password'} value in the
- * {@code credentials} property.
+ * Original definition from TS 2.2 dom.
  */
-interface CMRequest extends Body {
-    // the only modified property from RequestCredentials:
-    credentials: CMRequestCredentials;
-
-    method: string;
-    url: string;
-    headers: Headers;
-
-    type: RequestType;
-    destination: RequestDestination;
-    referrer: string;
-    referrerPolicy: ReferrerPolicy;
-    mode: RequestMode;
-
-    cache: RequestCache;
-    redirect: RequestRedirect;
-    integrity: string;
-
-    clone(): Request;
+interface RequestInit {
+    method?: string;
+    headers?: any;
+    body?: any;
+    referrer?: string;
+    referrerPolicy?: string;
+    mode?: string;
+    credentials?: string;
+    cache?: string;
+    redirect?: string;
+    integrity?: string;
+    keepalive?: boolean;
+    window?: any;
 }
 
-type CMRequestCredentials = RequestCredentials|'password';
-
 /**
  * Variant of {@link RequestInit} that permits a {@link PasswordCredential} to
  * be used in the {@code credentials} property. All other properties are
  * identical to {@link RequestInit}.
  */
 interface CMRequestInit {
-    credentials?: PasswordCredential|CMRequestCredentials;
-
     method?: string;
-    headers?: HeadersInit;
-    body?: BodyInit;
+    headers?: any;
+    body?: any;
     referrer?: string;
-    referrerPolicy?: ReferrerPolicy;
-    mode?: RequestMode;
-
-    cache?: RequestCache;
-    redirect?: RequestRedirect;
+    referrerPolicy?: string;
+    mode?: string;
+    credentials?: PasswordCredential|string;
+    cache?: string;
+    redirect?: string;
     integrity?: string;
+    keepalive?: boolean;
     window?: any;
 }
 
-/**
- * URLSearchParams is not yet included in the core lib.d.ts declarations, so we
- * include it here.
- * The official definition should be included in TypeScript 2.2, at which point
- * this can be removed.
- *
- * @see {@link https://github.com/Microsoft/TypeScript/issues/12517}
- */
-declare class URLSearchParams {
-    constructor(init?: string|URLSearchParams);
-    append(name: string, value: string): void;
-    delete(name: string): void;
-    get(name: string): string|null;
-    getAll(name: string): string[];
-    has(name: string): boolean;
-    set(name: string, value: string): void;
-}
-
 /* ***************** CREDENTIAL MANAGEMENT API DEFINITONS ******************* */
 
 /**
diff --git a/webdriverio/index.d.ts b/webdriverio/index.d.ts
index dff87053d7..e74b4712a5 100644
--- a/webdriverio/index.d.ts
+++ b/webdriverio/index.d.ts
@@ -1,244 +1,785 @@
-// Type definitions for webdriverio 4.5.0
+// Type definitions for webdriverio 4.6
 // Project: http://www.webdriver.io/
 // Definitions by: Nick Malaguti <https://github.com/nmalaguti/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
-/// <reference types="q"/>
 
 declare namespace WebdriverIO {
+    export type Method = 'POST' | 'GET' | 'DELETE';
+
+    export interface RawResult<T> {
+        sessionId: string;
+        value: T;
+        state: 'failure' | 'success';
+        selector?: string;
+        message?: string;
+        hCode?: number;
+        class?: string;
+        error?: string;
+    }
+
+    export type ElementId = string;
+
+    export interface Element {
+        ELEMENT: ElementId;
+    }
+
+    export interface CssProperty {
+        property: string;
+        value: string;
+        parsed: ParsedCssProperty;
+    }
+
+    export interface ParsedCssProperty {
+        type: string;
+        string: string;
+        quote: string;
+        unit: string;
+        value: string | number | string[] | number[];
+    }
+
+    export interface Size {
+        width: number;
+        height: number;
+    }
+
+    export interface Position {
+        x: number;
+        y: number;
+    }
+
+    export interface DOMRect {
+        width: number;
+        height: number;
+        x: number;
+        y: number;
+    }
+
+    export enum ApplicationCacheStatus {
+        UNCACHED = 0,
+        IDLE = 1,
+        CHECKING = 2,
+        DOWNLOADING = 3,
+        UPDATE_READY = 4,
+        OBSOLETE = 5
+    }
+
+    export enum Button {
+        left = 0,
+        middle = 1,
+        right = 2
+    }
+
+    export interface Status {
+        build?: {
+            version: string;
+            revision?: string;
+            time?: string;
+        };
+
+        os?: {
+            name: string;
+            arch?: string;
+            version?: string;
+        };
+
+        java?: {
+            version?: string;
+        };
+    }
+
+    export interface StorageItem {
+        key: string;
+        value: any;
+    }
+
+    export interface StorageItems {
+        [key: string]: any;
+    }
+
+    export interface GeoLocation {
+        latitude: number;
+        longitude: number;
+        altitude: number;
+    }
+
+    export interface CommandHistoryEntry {
+        command: string;
+        args: any[];
+    }
+
+    export type Axis = 'x' | 'y';
+
+    export type Timeouts = 'script' | 'pageLoad' | 'implicit';
+
+    export type PageLoadingStrategy = 'none' | 'eager' | 'normal';
+
+    export type LocatorStrategy = 'css selector'
+                                | 'link text'
+                                | 'partial link text'
+                                | 'tag name'
+                                | 'xpath';
+
+    export interface LogEntry {
+        timestamp: number;
+        level: string;
+        message: string;
+    }
+
+    export type LoggingPreferenceType =
+        'OFF'   | 'SEVERE' | 'WARNING' |
+        'INFO'  | 'CONFIG' | 'FINE' |
+        'FINER' | 'FINEST' | 'ALL';
+
+    export interface LoggingPreferences {
+        browser?: LoggingPreferenceType;
+        driver?: LoggingPreferenceType;
+        server?: LoggingPreferenceType;
+        client?: LoggingPreferenceType;
+    }
+
+    interface ProxyObject {
+        proxyType?: 'pac' | 'noproxy' | 'autodetect' | 'system' | 'manual';
+        proxyAutoconfigUrl?: string;
+        ftpProxy?: string;
+        ftpProxyPort?: number;
+        httpProxy?: string;
+        httpProxyPort?: number;
+        sslProxy?: string;
+        sslProxyPort?: number;
+        socksProxy?: string;
+        socksProxyPort?: number;
+        socksVersion?: string;
+        socksUsername?: string;
+        socksPassword?: string;
+    }
+
+    export interface Session {
+        id: string;
+        capabilities: DesiredCapabilities;
+    }
+
+    export interface Capabilities {
+        browserName: string;
+        acceptInsecureCerts?: boolean;
+        browserVersion?: string;
+        platformName?: string;
+        pageLoadStrategy?: PageLoadingStrategy;
+        proxy?: ProxyObject;
+        setWindowRect?: boolean;
+        timeouts?: Timeouts;
+        unhandledPromptBehavior?: string;
+    }
+
+    export interface DesiredCapabilities extends Capabilities {
+        // Read-only capabilities
+        cssSelectorsEnabled?: boolean;
+        handlesAlerts?: boolean;
+        version?: string;
+        platform?: string;
+
+        // Read-write capabilities
+        javascriptEnabled?: boolean;
+        databaseEnabled?: boolean;
+        locationContextEnabled?: boolean;
+        applicationCacheEnabled?: boolean;
+        browserConnectionEnabled?: boolean;
+        webStorageEnabled?: boolean;
+        acceptSslCerts?: boolean;
+        rotatable?: boolean;
+        nativeEvents?: boolean;
+        unexpectedAlertBehaviour?: string;
+        elementScrollBehavior?: number;
+
+        // Grid-specific
+        seleniumProtocol?: string;
+        maxInstances?: number;
+        environment?: string;
+
+        // Selenium RC (1.0) only
+        commandLineFlags?: string;
+        executablePath?: string;
+        timeoutInSeconds?: number;
+        onlyProxySeleniumTraffic?: boolean;
+        avoidProxy?: boolean;
+        proxyEverything?: boolean;
+        proxyRequired?: boolean;
+        browserSideLog?: boolean;
+        optionsSet?: boolean;
+        singleWindow?: boolean;
+        dontInjectRegex?: RegExp;
+        userJSInjection?: boolean;
+        userExtensions?: string;
+
+        // RemoteWebDriver specific
+        'webdriver.remote.sessionid'?: string;
+        'webdriver.remote.quietExceptions'?: boolean;
+
+        // Selenese-Backed-WebDriver specific
+        'selenium.server.url'?: string;
+
+        loggingPrefs?: {
+            browser?: LoggingPreferences;
+            driver?: LoggingPreferences;
+            server?: LoggingPreferences;
+            client?: LoggingPreferences;
+        };
+
+        // Firefox
+        firefox_binary?: string;
+        firefoxProfileTemplate?: string;
+        captureNetworkTraffic?: boolean;
+        addCustomRequestHeaders?: boolean;
+        trustAllSSLCertificates?: boolean;
+        changeMaxConnections?: boolean;
+        profile?: string;
+        pageLoadingStrategy?: string;
+
+        // IE specific
+        'ie.forceCreateProcessApi'?: boolean;
+        'ie.browserCommandLineSwitches'?: string;
+        'ie.usePerProcessProxy'?: boolean;
+        'ie.ensureCleanSession'?: boolean;
+        'ie.setProxyByServer'?: boolean;
+        ignoreProtectedModeSettings?: boolean;
+        ignoreZoomSetting?: boolean;
+        initialBrowserUrl?: string;
+        enablePersistentHover?: boolean;
+        enableElementCacheCleanup?: boolean;
+        requireWindowFocus?: boolean;
+        browserAttachTimeout?: number;
+        logFile?: string;
+        logLevel?: string;
+        host?: string;
+        extractPath?: string;
+        silent?: string;
+        killProcessesByName?: boolean;
+
+        // Safari specific
+        'safari.options'?: {
+            [name: string]: any;
+        };
+
+        cleanSession?: boolean;
+
+        // Chrome specific
+        chromeOptions?: {
+            args?: string[];
+            binary?: string;
+            extensions?: string[];
+
+            localState?: {
+                [name: string]: any;
+            };
+
+            detach?: boolean;
+            debuggerAddress?: string;
+            excludeSwitches?: string[];
+            minidumpPath?: string;
+
+            mobileEmulation?: {
+                [name: string]: any;
+            };
+
+            perfLoggingPrefs?: {
+                [name: string]: any;
+            };
+
+            windowTypes?: string[];
+        };
+
+        perfLoggingPrefs?: {
+            enableNetwork?: boolean;
+            enablePage?: boolean;
+            enableTimeline?: boolean;
+            tracingCategories?: boolean;
+            bufferUsageReportingInterval?: boolean;
+        };
+
+        // RC
+        honorSystemProxy?: boolean;
+        ensureCleanSession?: boolean;
+    }
+
+    export interface Cookie extends RawResult<string> {
+        name: string;
+        value: string;
+        path?: string;
+        httpOnly?: boolean;
+        expiry?: number;
+        secure: boolean;
+    }
+
+    export interface Suite {
+        file: string;
+        parent: string;
+        pending: boolean;
+        title: string;
+        type: string;
+    }
+
+    export interface Test extends Suite {
+        currentTest: string;
+        passed: boolean;
+        duration: any;
+    }
+
+    export interface Hooks {
+        onError<T>(error: Error): Promise<T> & undefined;
+
+        onPrepare<T>(
+            config: Options,
+            capabilities: DesiredCapabilities
+        ): Promise<T> & undefined;
+
+        onComplete<T>(exitCode: number): Promise<T> & undefined;
+
+        before<T>(
+            capabilities: DesiredCapabilities,
+            specs: string[]
+        ): Promise<T> & undefined;
+
+        beforeCommand<T>(
+            commandName: string,
+            args: any[]
+        ): Promise<T> & undefined;
+
+        beforeFeature<T>(feature: string): Promise<T> & undefined;
+        beforeHook<T>(): Promise<T> & undefined;
+        beforeScenario<T>(scenario: string): Promise<T> & undefined;
+
+        beforeSession<T>(
+            config: Options,
+            capabilities: DesiredCapabilities,
+            specs: string[]
+        ): Promise<T> & undefined;
+
+        beforeStep<T>(step: string): Promise<T> & undefined;
+        beforeSuite<T>(suite: Suite): Promise<T> & undefined;
+        beforeTest<T>(test: Test): Promise<T> & undefined;
+        afterHook<T>(): Promise<T> & undefined;
+
+        after<T>(
+            result: number,
+            capabilities: DesiredCapabilities,
+            specs: string[]
+        ): Promise<T> & undefined;
+
+        afterCommand<T>(
+            commandName: string,
+            args: any[],
+            result: any,
+            error?: Error
+        ): Promise<T> & undefined;
+
+        afterScenario<T>(scenario: any): Promise<T> & undefined;
+
+        afterSession<T>(
+            config: Options,
+            capabilities: DesiredCapabilities,
+            specs: string[]
+        ): Promise<T> & undefined;
+
+        afterStep<T>(stepResult: any): Promise<T> & undefined;
+        afterSuite<T>(suite: Suite): Promise<T> & undefined;
+        afterTest<T>(test: Test): Promise<T> & undefined;
+        afterFeature<T>(feature: string): Promise<T> & undefined;
+    }
+
+    export interface Options {
+        baseUrl?: string;
+        bail?: number;
+        coloredLogs?: boolean;
+        capabilities?: DesiredCapabilities[];
+        connectionRetryTimeout?: number;
+        connectionRetryCount?: number;
+        debug?: number;
+        execArgv?: string[] | null;
+        desiredCapabilities?: DesiredCapabilities;
+        exclude?: string[];
+        framework?: string;
+        hostname?: string;
+        isWDIO?: boolean;
+        protocol?: string;
+        port?: number;
+        path?: string;
+        plugins?: { [name: string]: any; };
+        reporters?: string | ((...args: any[]) => void);
+        reporterOptions?: { outputDir?: string; };
+        logLevel?: string;
+        maxInstances?: number;
+        maxInstancesPerCapability?: number;
+        maxSession?: number;
+        mochaOpts?: { [name: string]: any; };
+        jasmineNodeOpts?: { [name: string]: any; };
+        cucumberOpts?: { [name: string]: any; };
+        services?: string | ((...args: any[]) => void);
+        screenshotPath?: string;
+        specs?: string[];
+        seleniumLogs?: string;
+        suites?: { [name: string]: string[]; };
+        sync?: boolean;
+        waitforTimeout?: number;
+        waitforInterval?: number;
+        user?: string;
+        key?: string;
+    }
+
+   export interface UnknownOptions {
+     [name: string]: any;
+   }
+
+    export interface MultiRemoteOptions {
+        [name: string]: Options;
+    }
+
+    export interface Config extends Options, Hooks {}
+
+    export interface Client<T> {
+        desiredCapabilities: DesiredCapabilities;
+    }
+
+    export interface Client<T> {
+        sessionId: string;
+    }
+
+    // Options
+    export interface Client<T> {
+        options: Options;
+    }
+
+    export class Launcher {
+        constructor(file: string, data: Options);
+        run(): Promise<any>;
+    }
+
+    export class ErrorHandler {
+        constructor(type: string, msg: string | number);
+    }
+
+    export function multiremote(options: MultiRemoteOptions): Client<void>;
+    export function remote(options?: Options, modifier?: (...args: any[]) => any): Client<void>;
+
     // EventEmitter
     export interface Client<T> {
-        addListener(event: string, listener: Function): Client<T>;
-        on(event: string, listener: Function): Client<T>;
-        once(event: string, listener: Function): Client<T>;
-        removeListener(event: string, listener: Function): Client<T>;
+        addListener(
+            event: string,
+            listener: (...args: any[]) => void
+        ): Client<T>;
+
+        on(
+            event: string,
+           listener: (...args: any[]) => void
+        ): Client<T>;
+
+        once(
+            event: string,
+            listener: (...args: any[]) => void
+        ): Client<T>;
+
+        removeListener(
+            event: string,
+            listener: (...args: any[]) => void
+        ): Client<T>;
+
         removeAllListeners(event?: string): Client<T>;
         setMaxListeners(n: number): Client<T>;
         listeners(event: string): Client<T>;
-        emit(event: string, ...args: any[]): Client<T>;
+        emit(
+            event: string,
+             ...args: any[]
+        ): Client<T>;
     }
 
     // Promise
     export interface Client<T> {
-        call(callback: () => any): Client<void>;
-        finally(callback: () => any): Client<T>;
-        then<P>(onFulfilled?: (value: T) => P | Client<P>, onRejected?: (err: any) => P | Client<P>): Client<P>;
-        catch<P>(onRejected?: (err: any) => P | Client<P>): Client<P>;
-        inspect(): Q.PromiseState<T>;
+        finally(callback: (...args: any[]) => void): Client<T>;
+
+        then<P>(
+            onFulfilled?: (value: T) => P | Client<P>,
+            onRejected?: (error: any) => P | Client<P>
+        ): Client<P>;
+
+        catch<P>(
+            onRejected?: (error: any) => P | Client<P>
+        ): Client<P>;
+
+        inspect(): {
+            state: "fulfilled" | "rejected" | "pending";
+            value?: T;
+            reason?: any;
+        };
     }
 
-    // Action
     export interface Client<T> {
         addValue(
             selector: string,
             value: string | number
-        ): Client<void>;
-        addValue(value: string | number): Client<void>;
+        ): Client<RawResult<null>> & RawResult<null>;
+
+        addValue(value: string | number): Client<RawResult<null>> & RawResult<null>;
+
         addValue<P>(
             selector: string,
             value: string | number,
         ): Client<P>;
+
         addValue<P>(value: string | number): Client<P>;
 
-        clearElement(selector?: string): Client<void>;
+        clearElement(selector?: string): Client<RawResult<null>> & RawResult<null>;
         clearElement<P>(selector?: string): Client<P>;
 
-        click(selector?: string): Client<void>;
+        click(selector?: string): Client<RawResult<null>> & RawResult<null>;
         click<P>(selector?: string): Client<P>;
 
-        doubleClick(selector?: string): Client<void>;
+        doubleClick(selector?: string): Client<RawResult<null>> & RawResult<null>;
         doubleClick<P>(selector?: string): Client<P>;
 
         dragAndDrop(
             sourceElem: string,
             destinationElem: string
-        ): Client<void>;
-        dragAndDrop(destinationElem: string): Client<void>;
+        ): Client<RawResult<null>> & RawResult<null>;
+
         dragAndDrop<P>(
             sourceElem: string,
             destinationElem: string
         ): Client<P>;
+
+        dragAndDrop(destinationElem: string): Client<RawResult<null>> & RawResult<null>;
         dragAndDrop<P>(destinationElem: string): Client<P>;
 
-        leftClick(selector?: string): Client<void>;
+        leftClick(selector?: string): Client<RawResult<null>> & RawResult<null>;
+
+        leftClick(
+            selector: string,
+            xoffset?: number,
+            yoffset?: number
+        ): Client<RawResult<null>> & RawResult<null>;
+
+        leftClick(
+            xoffset?: number,
+            yoffset?: number
+        ): Client<void> & undefined;
+
         leftClick<P>(selector?: string): Client<P>;
 
-        middleClick(selector?: string): Client<void>;
+        leftClick<P>(
+            selector: string,
+            xoffset?: number,
+            yoffset?: number
+        ): Client<P>;
+
+        leftClick<P>(
+            xoffset?: number,
+            yoffset?: number
+        ): Client<P>;
+
+        middleClick(selector?: string): Client<RawResult<null>> & RawResult<null>;
+
+        middleClick(
+            selector: string,
+            xoffset?: number,
+            yoffset?: number
+        ): Client<RawResult<null>> & RawResult<null>;
+
+        middleClick(
+            xoffset?: number,
+            yoffset?: number
+        ): Client<RawResult<null>> & RawResult<null>;
+
         middleClick<P>(selector?: string): Client<P>;
 
-        moveToObject(selector?: string): Client<void>;
-        moveToObject(
+        middleClick<P>(
             selector: string,
-            xoffset: number,
-            yoffset: number
-        ): Client<void>;
-        moveToObject(
-            xoffset: number,
-            yoffset: number
-        ): Client<void>;
-        moveToObject<P>(selector?: string): Client<P>;
-        moveToObject<P>(
-            selector: string,
-            xoffset: number,
-            yoffset: number
-        ): Client<P>;
-        moveToObject<P>(
-            xoffset: number,
-            yoffset: number
+            xoffset?: number,
+            yoffset?: number
         ): Client<P>;
 
-        rightClick(selector?: string): Client<void>;
+        middleClick<P>(
+            xoffset?: number,
+            yoffset?: number
+        ): Client<P>;
+
+        moveToObject(selector?: string): Client<RawResult<null>> & RawResult<null>;
+
+        moveToObject(
+            selector: string,
+            xoffset?: number,
+            yoffset?: number
+        ): Client<RawResult<null>> & RawResult<null>;
+
+        moveToObject(
+            xoffset?: number,
+            yoffset?: number
+        ): Client<RawResult<null>> & RawResult<null>;
+
+        moveToObject<P>(selector?: string): Client<P>;
+
+        moveToObject<P>(
+            selector: string,
+            xoffset?: number,
+            yoffset?: number
+        ): Client<P>;
+
+        moveToObject<P>(
+            xoffset?: number,
+            yoffset?: number
+        ): Client<P>;
+
+        rightClick(selector?: string): Client<RawResult<null>> & RawResult<null>;
+
+        rightClick(
+            selector: string,
+            xoffset?: number,
+            yoffset?: number
+        ): Client<RawResult<null>> & RawResult<null>;
+
+        rightClick(
+            xoffset?: number,
+            yoffset?: number
+        ): Client<RawResult<null>> & RawResult<null>;
+
         rightClick<P>(selector?: string): Client<P>;
 
-        selectByAttribute(
+        rightClick<P>(
             selector: string,
-            attribute: string,
-            value: string
-        ): Client<void>;
-        selectByAttribute(
-            attribute: string,
-            value: string
-        ): Client<void>;
-        selectByAttribute<P>(
-            selector: string,
-            attribute: string,
-            value: string
+            xoffset?: number,
+            yoffset?: number
         ): Client<P>;
+
+        rightClick<P>(
+            xoffset?: number,
+            yoffset?: number
+        ): Client<P>;
+
+        selectByAttribute(
+            selector: string,
+            attribute: string,
+            value: string | number
+        ): Client<RawResult<null>> & RawResult<null>;
+
+        selectByAttribute(
+            attribute: string,
+            value: string | number
+        ): Client<RawResult<null>> & RawResult<null>;
+
+        selectByAttribute<P>(
+            selector: string,
+            attribute: string,
+            value: string | number
+        ): Client<P>;
+
         selectByAttribute<P>(
             attribute: string,
-            value: string
+            value: string | number
         ): Client<P>;
 
         selectByIndex(
             selectElem: string,
             index: number
-        ): Client<void>;
-        selectByIndex(index: number): Client<void>;
+        ): Client<RawResult<null>> & RawResult<null>;
+
+        selectByIndex(index: number): Client<RawResult<null>> & RawResult<null>;
+
         selectByIndex<P>(
             selectElem: string,
             index: number
         ): Client<P>;
+
         selectByIndex<P>(index: number): Client<P>;
 
         selectByValue(
             selectElem: string,
             value: string
-        ): Client<void>;
-        selectByValue(value: string): Client<void>;
+        ): Client<RawResult<null>> & RawResult<null>;
+
+        selectByValue(value: string): Client<RawResult<null>> & RawResult<null>;
+
         selectByValue<P>(
             selectElem: string,
             value: string
         ): Client<P>;
+
         selectByValue<P>(value: string): Client<P>;
 
         selectByVisibleText(
             selectElem: string,
             text: string
-        ): Client<void>;
-        selectByVisibleText(text: string): Client<void>;
+        ): Client<RawResult<null>> & RawResult<null>;
+
+        selectByVisibleText(text: string): Client<RawResult<null>> & RawResult<null>;
+
         selectByVisibleText<P>(
             selectElem: string,
             text: string
         ): Client<P>;
-        selectByVisibleText<P>(text: string): Client<P>;
+
+        selectByVisibleText<P>(text: string): Client<RawResult<null>> & RawResult<null>;
 
         selectorExecute<P>(
             selectors: string | string[],
             script: (elements: HTMLElement | HTMLElement[], ...args: any[]) => P,
             ...args: any[]
-        ): Client<P>;
+        ): Client<P> & any;
+
+        selectorExecute<P>(
+            selectors: string | string[],
+            script: (elements: HTMLElement | HTMLElement[], ...args: any[]) => P,
+            ...args: any[]
+        ): Client<P> & any;
 
         selectorExecuteAsync<P>(
             selectors: string | string[],
             script: (elements: HTMLElement | HTMLElement[], ...args: any[]) => P,
             ...args: any[]
-        ): Client<P>;
+        ): Client<P> & any;
 
         setValue(
             selector: string,
-            values: number | string | Array<string>
-        ): Client<void>;
+            values: number | string | string[]
+        ): Client<RawResult<null>> & RawResult<null>;
+
         setValue(
-            values: number | string | Array<string>
-        ): Client<void>;
+            values: number | string | string[]
+        ): Client<RawResult<null>> & RawResult<null>;
+
         setValue<P>(
             selector: string,
-            values: number | string | Array<string>
-        ): Client<void>;
-        setValue<P>(
-            values: number | string | Array<string>
-        ): Client<void>;
+            values: number | string | string[]
+        ): Client<void> & undefined;
 
-        submitForm(selector?: string): Client<void>;
+        setValue<P>(
+            values: number | string | string[]
+        ): Client<void> & undefined;
+
+        submitForm(selector?: string): Client<RawResult<null>> & RawResult<null>;
         submitForm<P>(selector?: string): Client<P>;
     }
 
-    // Appium
-    export interface Client<T> {
-        // backgroundApp
-        // closeApp
-        // context
-        // contexts
-        // deviceKeyEvent
-        // getAppStrings
-        // getCurrentDeviceActivity
-        // getNetworkConnection
-        // hideDeviceKeyboard
-        // installAppOnDevice
-        // isAppInstalledOnDevice
-        // launchApp
-        // lock
-        // openNotifications
-        // performMultiAction
-        // performTouchAction
-        // pullFileFromDevice
-        // pushFileToDevice
-        // removeAppFromDevice
-        // resetApp
-        // rotate
-        // setImmediateValueInApp
-        // setNetworkConnection
-        // shake
-        // toggleAirplaneModeOnDevice
-        // toggleDataOnDevice
-        // toggleLocationServicesOnDevice
-        // toggleWiFiOnDevice
-    }
-
-    export interface Cookie {
-        name: string;
-        value: string;
-    }
-
     // Cookie
     export interface Client<T> {
-        deleteCookie(name?: string): Client<void>;
+        deleteCookie(name?: string): Client<RawResult<null>> & RawResult<null>;
         deleteCookie<P>(name?: string): Client<P>;
 
-        getCookie(): Client<Cookie[]>;
-        getCookie(name: string): Client<Cookie>;
+        getCookie(): Client<Cookie[]> & Cookie[];
+        getCookie(name: string): Client<Cookie> & Cookie;
         getCookie<P>(name?: string): Client<P>;
 
-        setCookie(cookie: Cookie): Client<void>;
+        setCookie(cookie: Cookie): Client<RawResult<null>> & RawResult<null>;
         setCookie<P>(cookie: Cookie): Client<P>;
     }
 
+    // Grid
     export interface Client<T> {
-        session(
-            action?: string,
-            sessionId?: string
-        ): Client<RawResult<any>>;
-        session<P>(): Client<P>;
-
-        getGridNodeDetails(): Client<Object>;
+        getGridNodeDetails(): Client<UnknownOptions> & UnknownOptions;
         getGridNodeDetails<P>(): Client<P>;
 
-        gridProxyDetails(): Client<Object>;
-        gridProxyDetails<P>(): Client <P>;
+        gridProxyDetails(): Client<UnknownOptions> & UnknownOptions;
+        gridProxyDetails<P>(): Client<P>;
 
-        gridTestSession(): Client<Object>;
-        gridProxyDetails<P>(): Client <P>;
+        gridTestSession(): Client<UnknownOptions> & UnknownOptions;
+        gridTestSession<P>(): Client<P>;
     }
 
     // Mobile
@@ -274,16 +815,32 @@ declare namespace WebdriverIO {
         release(selector: string): Client<T>;
         removeApp(bundleId: string): Client<T>;
         reset(): Client<T>;
-        rotate(x: number, y: number, duration?: number, radius?: number, rotation?: number, touchCount?: number): Client<T>;
-        setGeoLocation(location: { latitude: number, longitude: number, altitude: number }): Client<T>;
-        setImmediateValue(id: string, value: string | Array<string>): Client<T>;
+
+        rotate(
+            x: number,
+            y: number,
+            duration?: number,
+            radius?: number,
+            rotation?: number,
+            touchCount?: number
+        ): Client<T>;
+
+        setGeoLocation(location: GeoLocation): Client<T>;
+        setImmediateValue(id: string, value: string | string[]): Client<T>;
         setNetworkConnection(flags: 0 | 1 | 2 | 4 | 6): Client<T>;
         setOrientation(setTo: 'landscape' | 'portrait'): Client<T>;
         settings(settings?: { [key: string]: string }): Client<T>;
         shake(): Client<T>;
         startActivity(appPackage: string, activity: string): Client<T>;
         strings(language: string): Client<T>;
-        swipe(selector?: string, xOffset?: number, yOffset?: number, speed?: number): Client<T>;
+
+        swipe(
+            selector?: string,
+            xOffset?: number,
+            yOffset?: number,
+            speed?: number
+        ): Client<T>;
+
         swipeDown(selector: string, speed?: number): Client<T>;
         swipeLeft(selector: string, speed?: number): Client<T>;
         swipeRight(selector: string, speed?: number): Client<T>;
@@ -300,304 +857,184 @@ declare namespace WebdriverIO {
         unlock(): Client<T>;
     }
 
-    export interface CssProperty {
-        property: string;
-        value: string;
-        parsed: ParsedCssProperty;
-    }
-
-    export interface ParsedCssProperty {
-        type: string;
-        string: string;
-        quote: string;
-        unit: string;
-        value: string | number | string[] | number[];
-    }
-
-    export interface Size {
-        width: number;
-        height: number;
-    }
-
-    export interface Location {
-        x: number;
-        y: number;
-    }
-
     // Property
     export interface Client<T> {
         getAttribute(
             selector: string,
             attributeName: string
-        ): Client<string> & string;
+        ): Client<string> & Client<null> & string & null;
+
         getAttribute(
             selector: string,
             attributeName: string
-        ): Client<string[]> & string[];
-        getAttribute(attributeName: string): Client<string> & string;
-        getAttribute(attributeName: string): Client<string[]> & string[];
+        ): Client<string[]> & Client<null[]> & string[] & null[];
+
+        getAttribute(attributeName: string): Client<string> & Client<null> & string & null;
+        getAttribute(attributeName: string): Client<string[]> & Client<null[]> & string[] & null[];
+
         getAttribute<P>(
             selector: string,
             attributeName: string
         ): Client<P>;
+
         getAttribute<P>(attributeName: string): Client<P>;
 
         getCssProperty(
             selector: string,
             cssProperty: string
-        ): CssProperty;
+        ): Client<CssProperty> & CssProperty;
+
         getCssProperty(
             selector: string,
             cssProperty: string
-        ): CssProperty[];
-        getCssProperty(cssProperty: string): CssProperty;
-        getCssProperty(cssProperty: string): CssProperty[];
+        ): Client<CssProperty[]> & CssProperty[];
+
+        getCssProperty(cssProperty: string): Client<CssProperty> & CssProperty;
+        getCssProperty(cssProperty: string): Client<CssProperty[]> & CssProperty[];
+
         getCssProperty<P>(
             selector: string,
             cssProperty: string
         ): Client<P>;
+
         getCssProperty<P>(cssProperty: string): Client<P>;
 
         getElementSize(selector: string): Client<Size> & Size;
+        getElementSize(): Client<Size> & Size;
+
         getElementSize(selector: string): Client<Size[]> & Size[];
-        getElementSize(): Client<Size|Size[]> & Size|Size[];
+        getElementSize(): Client<Size[]> & Size[];
+
         getElementSize(
             selector: string,
-            dimension: string
-        ): number;
+            dimension?: string
+        ): Client<number> & number;
+
         getElementSize(
             selector: string,
-            dimension: string
-        ): number[];
-        getElementSize(dimension: string): number ;
-        getElementSize(dimension: string): number[];
+            dimension?: string
+        ): Client<number[]> & number[];
+
+        getElementSize(dimension?: string): Client<number> & number;
+        getElementSize(dimension?: string): Client<number[]> & number[];
+
         getElementSize<P>(selector?: string): Client<P>;
+        getElementSize<P>(dimension?: string): Client<P>;
+
         getElementSize<P>(
             selector: string,
-            dimension: string
+            dimension?: string
         ): Client<P>;
-        getElementSize<P>(dimension: string): Client<P>;
 
         getHTML(
             selector: string,
             includeSelectorTag?: boolean
-        ): string;
+        ): Client<string> & string;
+
         getHTML(
             selector: string,
             includeSelectorTag?: boolean
-        ): string[];
-        getHTML(includeSelectorTag?: boolean): string;
-        getHTML(includeSelectorTag?: boolean): string[];
+        ): Client<string[]> & string[];
+
+        getHTML(includeSelectorTag?: boolean): Client<string> & string;
+        getHTML(includeSelectorTag?: boolean): Client<string[]> & string[];
         getHTML<P>(selector?: string): Client<P>;
+
         getHTML<P>(
             selector: string,
-            includeSelectorTag: boolean
+            includeSelectorTag?: boolean
         ): Client<P>;
-        getHTML<P>(includeSelectorTag: boolean): Client<P>;
 
-        getLocation(axis: Axis): number;
-        getLocation<P>(axis: Axis): Client<P>;
-        getLocation(selector?: string): Location;
+        getHTML<P>(includeSelectorTag?: boolean): Client<P>;
+
+        getLocation(axis?: Axis): Client<number> & number;
+        getLocation<P>(axis?: Axis): Client<P>;
+        getLocation(selector?: string): Client<Position> & Position;
         getLocation<P>(selector?: string): Client<P>;
-        getLocation(selector: string, axis: Axis): number;
-        getLocation<P>(selector: string, axis: Axis): Client<P>;
+        getLocation(selector: string, axis?: Axis): Client<number> & number;
+        getLocation<P>(selector: string, axis?: Axis): Client<P>;
 
-        getLocationInView(axis: Axis): number;
-        getLocationInView(axis: Axis): number[];
-        getLocationInView<P>(axis: Axis): Client<P>;
-        getLocationInView(selector?: string): Location;
-        getLocationInView(selector?: string): Location[];
+        getLocationInView(axis?: Axis): Client<number> & number;
+        getLocationInView(axis?: Axis): Client<number[]> & number[];
+        getLocationInView<P>(axis?: Axis): Client<P>;
+        getLocationInView(selector?: string): Client<Position> & Position;
+        getLocationInView(selector?: string): Client<Position[]> & Position[];
         getLocationInView<P>(selector?: string): Client<P>;
-        getLocationInView(selector: string, axis: Axis): number;
-        getLocationInView(selector: string, axis: Axis): number[];
-        getLocationInView<P>(selector: string, axis: Axis): Client<P>;
+        getLocationInView(selector: string, axis?: Axis): Client<number> & number;
+        getLocationInView(selector: string, axis?: Axis): Client<number[]> & number[];
+        getLocationInView<P>(selector: string, axis?: Axis): Client<P>;
 
-        getSource(): Client<string>;
+        getSource(): Client<string> & string;
         getSource<P>(): Client<P>;
 
-        getTagName(selector?: string): string | string[];
+        getTagName(selector?: string): Client<string> & string;
+        getTagName(selector?: string): Client<string[]> & string[];
         getTagName<P>(selector?: string): Client<P>;
 
-        getText(selector?: string): string | string[];
+        getText(selector?: string): Client<string> & string;
+        getText(selector?: string): Client<string[]> & string[];
         getText<P>(selector?: string): Client<P>;
 
-        getTitle(): Client<string>;
+        getTitle(): Client<string> & string;
         getTitle<P>(): Client<P>;
 
-        getUrl(): Client<string>;
+        getUrl(): Client<string> & string;
         getUrl<P>(): Client<P>;
 
-        getValue(selector?: string): string | string[];
+        getValue(selector?: string): Client<string> & string;
+        getValue(selector?: string): Client<string[]> & string[];
         getValue<P>(selector?: string): Client<P>;
     }
 
-    export interface LogEntry {
-        timestamp: number;
-        level: string;
-        message: string;
-    }
-
-    export enum ApplicationCacheStatus {
-        UNCACHED = 0,
-        IDLE = 1,
-        CHECKING = 2,
-        DOWNLOADING = 3,
-        UPDATE_READY = 4,
-        OBSOLETE = 5
-    }
-
-    export enum Button {
-        left = 0,
-        middle = 1,
-        right = 2
-    }
-
-    export interface StorageItem {
-        key: string;
-        value: any;
-    }
-
-    export interface GeoLocation {
-        latitude: number;
-        longitude: number;
-        altitude: number;
-    }
-
-    export interface Session {
-        id: string;
-        capabilities: any;
-    }
-
-    export interface RawResult<T> {
-        value: T;
-        error: string;
-    }
-
-    // Navigation
+    // Protocol
     export interface Client<T> {
-        back(): Client<void>;
-        back<P>(): Client<P>;
-
-        forward(): Client<void>;
-        forward<P>(): Client<P>;
-
-        refresh(): Client<void>;
-        refresh<P>(): Client<P>;
-
-        url(): Client<RawResult<string>> & RawResult<string>;
-        url(url: string): Client<void>;
-        url<P>(url?: string): Client<P>;
-    }
-
-    // Advanced input
-    export interface Client<T> {
-        // you probably want to use the click and drag and drop commands instead
-        buttonDown(button?: string | Button): Client<void>;
-        buttonDown<P>(button?: string | Button): Client<P>;
-
-        // you probably want to use the click and drag and drop commands instead
-        buttonPress(button?: string | Button): Client<void>;
-        buttonPress<P>(button?: string | Button): Client<P>;
-
-        // you probably want to use the click and drag and drop commands instead
-        buttonUp(button?: string | Button): Client<void>;
-        buttonUp<P>(button?: string | Button): Client<P>;
-
-        // you probably want to use the click and drag and drop commands instead
-        doDoubleClick(): Client<void>;
-        doDoubleClick<P>(): Client<P>;
-
-        // you probably want to use addValue and setValue instead
-        keys(value: string | string[]): Client<void>;
-        keys<P>(value: string | string[]): Client<P>;
-
-        // you probably want to use the moveToObject command instead
-        moveTo(
-            id: ElementId,
-            xoffset?: number,
-            yoffset?: number
-        ): Client<void>;
-        moveTo(
-            xoffset?: number,
-            yoffset?: number
-        ): Client<void>;
-        moveTo<P>(id: ElementId): Client<P>;
-        moveTo<P>(
-            id: ElementId,
-            xoffset: number,
-            yoffset?: number
-        ): Client<P>;
-
-        // touchClick
-        // touchDoubleClick
-        // touchDown
-        // touchFlick
-        // touchLongClick
-        // touchMove
-        // touchScroll
-        // touchUp
-    }
-
-    // Useful Protocol
-    export interface Client<T> {
-        alertAccept(): Client<void>;
+        alertAccept(): Client<RawResult<null>>;
         alertAccept<P>(): Client<P>;
 
-        alertDismiss(): Client<void>;
+        alertDismiss(): Client<RawResult<null>>;
         alertDismiss<P>(): Client<P>;
 
-        alertText(text?: string): Client<string>;
-        alertText<P>(): Client<P>;
-        alertText<P>(text: string): Client<P>;
+        alertText(): Client<string> | string;
+        alertText(text: string): Client<null> | null;
+        alertText<P>(text?: string): Client<P>;
 
-        frame(id: any): Client<void>;
-        frame<P>(id: any): Client<P>;
+        /** @deprecated */
+        applicationCacheStatus(): Client<RawResult<ApplicationCacheStatus>> & RawResult<ApplicationCacheStatus> & never;
 
-        frameParent(): Client<void>;
-        frameParent<P>(): Client<P>;
+        /** @deprecated */
+        applicationCacheStatus<P>(): Client<P>;
 
-        init(capabilities?: DesiredCapabilities): Client<void>;
-        init<P>(capabilities?: DesiredCapabilities): Client<P>;
+        back(): Client<RawResult<null>>;
+        back<P>(): Client<P>;
 
-        log(type: string): Client<RawResult<LogEntry[]>>;
-        log<P>(type: string): Client<P>;
+        /** @deprecated in favour of Actions.pointerDown */
+        buttonDown(button?: string | Button): Client<RawResult<null>> & RawResult<null> & never;
 
-        logTypes(): Client<RawResult<string[]>> & RawResult<string[]>;
-        logTypes<P>(): Client<P>;
+        /** @deprecated in favour of Actions.pointerDown */
+        buttonDown<P>(button?: string | Button): Client<P>;
 
-        session(
-            action?: string,
-            sessionId?: string
-        ): Client<RawResult<any>> & RawResult<any>;
-        session<P>(action?: string): Client<P>;
-        session<P>(
-            action: string,
-            sessionId: string
-        ): Client<P>;
+        /** @deprecated in favour of Actions.pointerDown */
+        buttonPress(button?: string | Button): Client<RawResult<null>> & RawResult<null> & never;
 
-        sessions(): Client<RawResult<Session[]>>;
-        sessions<P>(): Client<P>;
+        /** @deprecated in favour of Actions.pointerDown */
+        buttonPress<P>(button?: string | Button): Client<P>;
 
-        timeouts<P>(type: string, ms: number): Client<P>;
-        timeoutsAsyncScript<P>(ms: number): Client<P>;
-        timeoutsImplicitWait<P>(ms: number): Client<P>;
+        buttonUp(button?: string | Button): Client<RawResult<null>> & RawResult<null>;
+        buttonUp<P>(button?: string | Button): Client<P>;
 
-        // window
-        // windowHandle
-        // windowHandleMaximize
-        // windowHandlePosition
-        // windowHandleSize
-        // windowHandles
-    }
+        cookie(): Client<RawResult<Cookie[]>> & RawResult<Cookie[]>;
 
-    export type ElementId = string;
+        cookie(
+            method: Method,
+            key?: Cookie | string
+        ): Client<RawResult<Cookie[]>> & RawResult<Cookie[]>;
 
-    export interface Element {
-        ELEMENT: ElementId;
-    }
+        /** @deprecated in favour of Actions.pointerDown(0) + Actions.pointerMove */
+        doDoubleClick(): Client<RawResult<null>> & RawResult<null> & never;
+
+        /** @deprecated in favour of Actions.pointerDown(0) + Actions.pointerMove */
+        doDoubleClick<P>(): Client<P>;
 
-    // Element
-    export interface Client<T> {
         element(selector: string): Client<RawResult<Element>> & RawResult<Element>;
         element<P>(selector: string): Client<P>;
 
@@ -608,33 +1045,39 @@ declare namespace WebdriverIO {
             id: ElementId,
             attributeName: string
         ): Client<RawResult<string>> & RawResult<string>;
+
         elementIdAttribute<P>(
             id: ElementId,
             attributeName: string
         ): Client<P>;
 
-        elementIdClear(id: ElementId): Client<void>;
+        elementIdClear(id: ElementId): Client<RawResult<null>> & RawResult<null>;
         elementIdClear<P>(id: ElementId): Client<P>;
 
-        elementIdClick(id: ElementId): Client<void>;
+        elementIdClick(id: ElementId): Client<RawResult<null>> & RawResult<null>;
         elementIdClick<P>(id: ElementId): Client<P>;
 
         elementIdCssProperty(
             id: ElementId,
             propertyName: string
         ): Client<RawResult<string>> & RawResult<string>;
+
         elementIdCssProperty<P>(
             id: ElementId,
             propertyName: string
         ): Client<P>;
 
-        elementIdDisplayed(id: ElementId): Client<RawResult<boolean>> & RawResult<boolean>;
+        /** @deprecated */
+        elementIdDisplayed(id: ElementId): Client<RawResult<boolean>> & RawResult<boolean> & never;
+
+        /** @deprecated */
         elementIdDisplayed<P>(id: ElementId): Client<P>;
 
         elementIdElement(
             id: ElementId,
             selector: string
         ): Client<RawResult<Element>> & RawResult<Element>;
+
         elementIdElement<P>(
             id: ElementId,
             selector: string
@@ -644,6 +1087,7 @@ declare namespace WebdriverIO {
             id: ElementId,
             selector: string
         ): Client<RawResult<Element[]>> & RawResult<Element[]>;
+
         elementIdElements<P>(
             id: ElementId,
             selector: string
@@ -652,19 +1096,31 @@ declare namespace WebdriverIO {
         elementIdEnabled(id: ElementId): Client<RawResult<boolean>> & RawResult<boolean>;
         elementIdEnabled<P>(id: ElementId): Client<P>;
 
-        elementIdLocation(id: ElementId): Client<RawResult<Location>> & RawResult<Location>;
+        /** @deprecated in favour of elementIdRect */
+        elementIdLocation(id: ElementId): Client<RawResult<Position>> & RawResult<Position> & never;
+
+        /** @deprecated in favour of elementIdRect */
         elementIdLocation<P>(id: ElementId): Client<P>;
 
-        elementIdLocationInView(id: ElementId): Client<RawResult<Location>> & RawResult<Location>;
-        elementIdLocationInView<P>(id: ElementId): Client<P>;
+        /** @deprecated in favour of elementIdRect */
+        elementIdLocationInView(id: ElementId): Client<RawResult<Position>> & RawResult<Position> & never;
 
-        elementIdName(id: ElementId): RawResult<string>;
+         /** @deprecated in favour of elementIdRect */
+       elementIdLocationInView<P>(id: ElementId): Client<P>;
+
+        elementIdName(id: ElementId): Client<RawResult<string>> & RawResult<string>;
         elementIdName<P>(id: ElementId): Client<P>;
 
+        elementIdRect(id: ElementId): Client<RawResult<DOMRect>> & RawResult<DOMRect>;
+        elementIdRect<P>(id: ElementId): Client<P>;
+
         elementIdSelected(id: ElementId): Client<RawResult<boolean>> & RawResult<boolean>;
         elementIdSelected<P>(id: ElementId): Client<P>;
 
-        elementIdSize(id: ElementId): Client<RawResult<Size>> & RawResult<Size>;
+         /** @deprecated in favour of elementIdRect */
+        elementIdSize(id: ElementId): Client<RawResult<Size>> & RawResult<Size> & never;
+
+         /** @deprecated in favour of elementIdRect */
         elementIdSize<P>(id: ElementId): Client<P>;
 
         elementIdText(id: ElementId): Client<RawResult<string>> & RawResult<string>;
@@ -673,7 +1129,8 @@ declare namespace WebdriverIO {
         elementIdValue(
             id: ElementId,
             values: string | string[]
-        ): Client<RawResult<void>>;
+        ): Client<RawResult<null>> & RawResult<null>;
+
         elementIdValue<P>(
             id: ElementId,
             values: string | string[]
@@ -681,87 +1138,447 @@ declare namespace WebdriverIO {
 
         elements(selector: string): Client<RawResult<Element[]>> & RawResult<Element[]>;
         elements<P>(selector: string): Client<P>;
-    }
 
-    // Unuseful Protocol
-    export interface Client<T> {
-        // applicationCacheStatus
-        // cookie
+        execute(
+            script: string | ((...args: any[]) => void),
+            ...args: any[]
+        ): Client<RawResult<any>> & RawResult<any>;
 
-        // use selectorExecute instead
-        execute(script: string | Function, ...args: any[]): Client<RawResult<any>> & RawResult<any>;
+        executeAsync(
+            script: string | ((...args: any[]) => void),
+            ...args: any[]
+        ): Client<RawResult<any>> & RawResult<any>;
 
-        // use selectorExecuteAsync instead
-        executeAsync(script: string | Function, ...args: any[]): Client<RawResult<any>> & RawResult<any>;
+         /** @deprecated */
+        file(date: string): Client<RawResult<null>> & never;
 
-        // file
-        // imeActivate
-        // imeActivated
-        // imeActiveEngine
-        // imeAvailableEngines
-        // imeDeactivated
-        // localStorage
-        // localStorageSize
-        // location
-        // orientation
-        // screenshot
-        // sessionStorage
-        // sessionStorageSize
-        // source
-        // status
+         /** @deprecated */
+        file<P>(date: string): Client<P> & never;
 
-        // use submitForm instead
-        submit(id: ElementId): Client<void>;
+        forward(): Client<RawResult<null>> & RawResult<null>;
+        forward<P>(): Client<P>;
+
+        frame(id: any): Client<RawResult<null>> & RawResult<null>;
+        frame<P>(id: any): Client<P>;
+
+        frameParent(): Client<RawResult<null>> & RawResult<null>;
+        frameParent<P>(): Client<P>;
+
+         /** @deprecated */
+        imeActivate(engine: string): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated */
+        imeActivate<P>(engine: string): Client<P> & never;
+
+         /** @deprecated */
+        imeActivated(): Client<RawResult<boolean>> & RawResult<boolean> & never;
+
+         /** @deprecated */
+        imeActivated<P>(): Client<P>;
+
+         /** @deprecated */
+        imeActiveEngine(): Client<RawResult<string>> & string & never;
+
+         /** @deprecated */
+        imeActiveEngine<P>(): Client<P>;
+
+         /** @deprecated */
+        imeAvailableEngines(): Client<RawResult<string[]>> & RawResult<string[]> & never;
+
+         /** @deprecated */
+        imeAvailableEngines<P>(): Client<P>;
+
+         /** @deprecated */
+        imeDeactivated(): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated */
+        imeDeactivated<P>(): Client<P>;
+
+        init(capabilities?: DesiredCapabilities): Client<RawResult<null>> & RawResult<null>;
+        init<P>(capabilities?: DesiredCapabilities): Client<P>;
+
+         /** @deprecated in favour of Actions.keyDown */
+        keys(value: string | string[]): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated in favour of Actions.keyDown */
+        keys<P>(value: string | string[]): Client<P>;
+
+         /** @deprecated */
+        localStorage(): Client<RawResult<StorageItems[]>> & RawResult<StorageItems[]>;
+
+         /** @deprecated */
+        localStorage<P>(): Client<P>;
+
+         /** @deprecated */
+        localStorage(
+            method: Method,
+            key?: string
+        ): Client<RawResult<StorageItems[]>> & RawResult<StorageItems[]> & never;
+
+         /** @deprecated */
+        localStorage(
+            method: Method,
+            key?: string
+        ): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated */
+        localStorage<P>(
+            method: Method,
+            key?: string | StorageItems
+        ): Client<P>;
+
+         /** @deprecated */
+        localStorageSize(): Client<RawResult<number>> & RawResult<number> & never;
+
+         /** @deprecated */
+        localStorageSize<P>(): Client<P>;
+
+         /** @deprecated in favour of elementIdRect */
+        location(type: GeoLocation): Client<RawResult<number>> & RawResult<number> & never;
+
+         /** @deprecated in favour of elementIdRect */
+        location<P>(type: GeoLocation): Client<P>;
+
+         /** @deprecated */
+        log(type: LoggingPreferences): Client<RawResult<LogEntry[]>> & never;
+
+         /** @deprecated */
+        log<P>(type: LoggingPreferences): Client<P>;
+
+         /** @deprecated */
+        logTypes(): Client<RawResult<LoggingPreferences[]>> & RawResult<LoggingPreferences[]> & never;
+
+         /** @deprecated */
+        logTypes<P>(): Client<P>;
+
+         /** @deprecated in favour of Actions.pointerMove */
+        moveTo(
+            id: ElementId,
+            xoffset: number,
+            yoffset: number
+        ): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated in favour of Actions.pointerMove */
+        moveTo(
+            xoffset: number,
+            yoffset: number
+        ): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated in favour of Actions.pointerMove */
+        moveTo<P>(id: ElementId): Client<P>;
+
+         /** @deprecated in favour of Actions.pointerMove */
+        moveTo<P>(
+            id: ElementId,
+            xoffset: number,
+            yoffset: number
+        ): Client<P>;
+
+        refresh(): Client<RawResult<null>> & RawResult<null>;
+        refresh<P>(): Client<P>;
+
+        screenshot(): Client<RawResult<string>> & RawResult<string>;
+
+        session<P>(): Client<P>;
+
+        session(
+            action?: Method,
+            sessionId?: string
+        ): Client<RawResult<DesiredCapabilities>> & RawResult<DesiredCapabilities>;
+
+        session<P>(action?: Method): Client<P>;
+
+        session<P>(
+            action?: Method,
+            sessionId?: string
+        ): Client<P> & null;
+
+         /** @deprecated */
+        sessions(): Client<RawResult<Session[]>> & RawResult<Session[]> & never;
+
+         /** @deprecated */
+        sessions<P>(): Client<P>;
+
+         /** @deprecated */
+        sessionStorage(): Client<RawResult<StorageItems>> & RawResult<StorageItems> & never;
+
+         /** @deprecated */
+        sessionStorage<P>(): Client<P>;
+
+         /** @deprecated */
+        sessionStorage(method: Method): Client<RawResult<string[]>> & RawResult<string[]> & never;
+
+         /** @deprecated */
+        sessionStorage(method: Method): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated */
+        sessionStorage<P>(method: Method): Client<P>;
+
+         /** @deprecated */
+        sessionStorage(
+            method: Method,
+            key: string
+        ): Client<RawResult<string[]>> & RawResult<string[]> & never;
+
+         /** @deprecated */
+        sessionStorage(
+            method: Method,
+            key: string
+        ): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated */
+        sessionStorage<P>(
+            method: Method,
+            key: string
+        ): Client<P>;
+
+         /** @deprecated */
+        sessionStorage(
+            method: Method,
+            key: StorageItems
+        ): Client<RawResult<null>> & RawResult<null>;
+
+         /** @deprecated */
+        sessionStorage<P>(
+            method: Method,
+            key: StorageItems
+        ): Client<P>;
+
+         /** @deprecated */
+        sessionStorageSize(): Client<RawResult<number>> & RawResult<number> & never;
+
+         /** @deprecated */
+        sessionStorageSize<P>(): Client<P>;
+
+        source(): Client<RawResult<string>> & RawResult<string>;
+        source<P>(): Client<P>;
+
+        status(): Client<RawResult<Status>> & RawResult<Status>;
+        status(): Client<string>;
+
+         /** @deprecated */
+        submit(id: ElementId): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated */
         submit<P>(id: ElementId): Client<P>;
 
-        // title
+        timeouts<P>(type: Timeouts, ms: number): Client<RawResult<null>> & RawResult<null>;
+
+         /** @deprecated in favour of timeouts */
+        timeoutsAsyncScript(ms: number): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated in favour of timeouts */
+        timeoutsAsyncScript<P>(ms: number): Client<P>;
+
+         /** @deprecated in favour of timeouts */
+        timeoutsImplicitWait(ms: number): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated in favour of timeouts */
+        timeoutsImplicitWait<P>(ms: number): Client<P>;
+
+        url(): Client<RawResult<string>> & RawResult<string>;
+        url(url: string): Client<RawResult<null>> & RawResult<null>;
+        url<P>(url?: string): Client<P>;
+
+        title(): Client<RawResult<string>> & RawResult<string>;
+        title<P>(): Client<P>;
+
+         /** @deprecated in favour of Actions.pointerDown */
+        touchClick(id: ElementId): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated in favour of Actions.pointerDown */
+        touchClick<P>(id: ElementId): Client<P>;
+
+         /** @deprecated in favour of Actions.pointerDown */
+        touchDown(
+            xoffset: number,
+            yoffset: number
+        ): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated in favour of Actions.pointerDown */
+        touchDown<P>(
+            xoffset: number,
+            yoffset: number
+        ): Client<P>;
+
+         /** @deprecated in favour of Actions.perform */
+        touchFlick(
+            id: ElementId,
+            xoffset: number,
+            yoffset: number,
+            speed: number
+        ): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated in favour of Actions.perform */
+        touchFlick<P>(
+            id: ElementId,
+            xoffset: number,
+            yoffset: number,
+            speed: number
+        ): Client<P>;
+
+         /** @deprecated in favour of Actions.perform */
+        touchLongClick(id: ElementId): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated in favour of Actions.perform */
+        touchLongClick<P>(id: ElementId): Client<P>;
+
+         /** @deprecated in favour of Actions.pointerMove */
+        touchMove(
+            xoffset: number,
+            yoffset: number
+        ): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated in favour of Actions.pointerMove */
+        touchMove<P>(
+            xoffset: number,
+            yoffset: number
+        ): Client<P>;
+
+         /** @deprecated in favour of Actions.perform */
+        touchScroll(
+            id: ElementId,
+            xoffset: number,
+            yoffset: number,
+        ): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated in favour of Actions.perform */
+        touchScroll<P>(
+            id: ElementId,
+            xoffset: number,
+            yoffset: number,
+        ): Client<P>;
+
+         /** @deprecated in favour of Actions.pointerUp */
+        touchUp(
+            xoffset: number,
+            yoffset: number,
+        ): Client<RawResult<null>> & RawResult<null> & never;
+
+         /** @deprecated in favour of Actions.pointerUp */
+        touchUp<P>(
+            xoffset: number,
+            yoffset: number,
+        ): Client<P>;
+
+        window(windowHandle?: string): Client<RawResult<null>> & RawResult<null>;
+        window<P>(windowHandle?: string): Client<P>;
+
+        windowHandle(): Client<RawResult<string>> & RawResult<string>;
+        windowHandle<P>(): Client<P>;
+
+        windowHandleFullscreen(): Client<RawResult<null>> & RawResult<null>;
+        windowHandleFullscreen<P>(): Client<P>;
+
+        windowHandleMaximize(): Client<RawResult<string>> & RawResult<string>;
+        windowHandleMaximize<P>(): Client<P>;
+
+         /** @deprecated in favour of /session/{session id}/window/rect */
+        windowHandlePosition(
+            windowHandle?: string,
+            position?: Position
+        ): Client<RawResult<Position>> & RawResult<Position> & never;
+
+         /** @deprecated in favour of /session/{session id}/window/rect */
+        windowHandlePosition(
+            position: Position
+        ): Client<RawResult<Position>> & RawResult<Position> & never;
+
+         /** @deprecated in favour of /session/{session id}/window/rect */
+        windowHandlePosition<P>(
+            windowHandle?: string,
+            position?: Position
+        ): Client<P>;
+
+         /** @deprecated in favour of /session/{session id}/window/rect */
+        windowHandlePosition<P>(
+            position: Position
+        ): Client<P>;
+
+         /** @deprecated in favour of /session/{session id}/window/rect */
+        windowHandleSize(
+            windowHandle?: string,
+            dimension?: Size
+        ): Client<RawResult<Size>> & RawResult<Size> & never;
+
+         /** @deprecated in favour of /session/{session id}/window/rect */
+        windowHandleSize(
+            dimension: Size
+        ): Client<RawResult<Size>> & RawResult<Size> & never;
+
+         /** @deprecated in favour of /session/{session id}/window/rect */
+        windowHandleSize<P>(
+            windowHandle?: string,
+            dimension?: Size
+        ): Client<P>;
+
+         /** @deprecated in favour of /session/{session id}/window/rect */
+        windowHandleSize<P>(
+            dimension?: Size
+        ): Client<P>;
+
+         /** @deprecated */
+        windowHandles(): Client<RawResult<string[]>> & RawResult<string[]> & never;
+
+         /** @deprecated */
+        windowHandles<P>(): Client<P> & never;
     }
 
     // State
     export interface Client<T> {
-        isEnabled(selector?: string): Client<boolean>;
+        hasFocus(selector?: string): Client<boolean> & boolean;
+        hasFocus<P>(selector?: string): Client<P>;
+
+        isEnabled(selector?: string): Client<boolean> & boolean;
         isEnabled<P>(selector?: string): Client<P>;
 
-        isExisting(selector?: string): Client<boolean>;
+        isExisting(selector?: string): Client<boolean> & boolean;
         isExisting<P>(selector?: string): Client<P>;
 
-        isSelected(selector?: string): Client<boolean>;
+        isSelected(selector?: string): Client<boolean> & boolean;
         isSelected<P>(selector?: string): Client<P>;
 
-        isVisible(selector?: string): Client<boolean>;
+        isVisible(selector?: string): Client<boolean> & boolean;
         isVisible<P>(selector?: string): Client<P>;
 
-        isVisibleWithinViewport(selector?: string): Client<boolean>;
+        isVisibleWithinViewport(selector?: string): Client<boolean> & boolean;
         isVisibleWithinViewport<P>(selector?: string): Client<P>;
     }
 
-    export interface CommandHistoryEntry {
-        command: string;
-        args: any[];
-    }
-
     // Utility
     export interface Client<T> {
+        $(selector: string): Client<RawResult<Element>> & RawResult<Element>;
+        $<P>(selector: string): Client<P>;
+
+        $$(selector: string): Client<RawResult<Element[]>> & RawResult<Element[]>;
+        $$<P>(selector: string): Client<P>;
+
         addCommand(
             commandName: string,
-            customMethod: Function,
+            customMethod: (...args: any[]) => void,
             overwrite?: boolean
-        ): Client<void>;
+        ): Client<void> & undefined;
+
         addCommand<P>(
             commandName: string,
-            customMethod: Function,
+            customMethod: (...args: any[]) => void,
             overwrite?: boolean
         ): Client<P>;
 
+        call<P>(callback: () => void): Client<P> & any;
+
         chooseFile(
             selector: string,
             localPath: string
-        ): Client<void>;
+        ): Client<void> & undefined;
+
         chooseFile(localPath: string): Client<void>;
+
         chooseFile<P>(
             selector: string,
             localPath: string
         ): Client<P>;
+
         chooseFile<P>(localPath: string): Client<P>;
 
         debug(): Client<void>;
@@ -773,199 +1590,242 @@ declare namespace WebdriverIO {
         endAll(): Client<void>;
         endAll<P>(): Client<P>;
 
-        getCommandHistory(): Client<CommandHistoryEntry[]>;
+        getCommandHistory(): Client<CommandHistoryEntry[]> & CommandHistoryEntry[];
         getCommandHistory<P>(): Client<P>;
 
         pause(milliseconds: number): Client<void>;
         pause<P>(milliseconds: number): Client<P>;
 
-        saveScreenshot(filename?: string): Client<Buffer>;
+        reload(): Client<string[]> & string[];
+        reload<P>(): Client<P>;
+
+        saveScreenshot(filename?: string): Client<Buffer> & Buffer;
         saveScreenshot<P>(filename?: string): Client<P>;
 
-        scroll(selector?: string): Client<void>;
+        scroll(selector?: string): Client<RawResult<null>> & RawResult<null>;
+
         scroll(
             selector: string,
             xoffset: number,
             yoffset: number
-        ): Client<void>;
+        ): Client<RawResult<null>> & RawResult<null>;
+
         scroll(
             xoffset: number,
             yoffset: number
-        ): Client<void>;
+        ): Client<RawResult<null>> & RawResult<null>;
+
         scroll<P>(selector?: string): Client<P>;
+
         scroll<P>(
             selector: string,
             xoffset: number,
             yoffset: number
         ): Client<P>;
+
         scroll<P>(
             xoffset: number,
             yoffset: number
         ): Client<P>;
 
-        uploadFile(localPath: string): Client<void>;
+        uploadFile(localPath: string): Client<RawResult<string>> & RawResult<string>;
         uploadFile<P>(localPath: string): Client<P>;
 
         waitForEnabled(
             selector: string,
             milliseconds?: number,
             reverse?: boolean
-        ): Client<boolean>;
+        ): Client<boolean> & boolean;
+
         waitForEnabled(
             milliseconds?: number,
             reverse?: boolean
-        ): Client<boolean>;
+        ): Client<boolean> & boolean;
+
         waitForEnabled<P>(selector?: string): Client<P>;
+
         waitForEnabled<P>(
             selector: string,
-            milliseconds: number,
+            milliseconds?: number,
         ): Client<P>;
-        waitForEnabled<P>(milliseconds: number): Client<P>;
+
+        waitForEnabled<P>(milliseconds?: number): Client<P>;
+
         waitForEnabled<P>(
             selector: string,
-            milliseconds: number,
-            reverse: boolean
+            milliseconds?: number,
+            reverse?: boolean
         ): Client<P>;
+
         waitForEnabled<P>(
-            milliseconds: number,
-            reverse: boolean
+            milliseconds?: number,
+            reverse?: boolean
         ): Client<P>;
 
         waitForExist(
             selector: string,
             milliseconds?: number,
             reverse?: boolean
-        ): Client<boolean>;
+        ): Client<boolean> & boolean;
+
         waitForExist(
             milliseconds?: number,
             reverse?: boolean
-        ): Client<boolean>;
+        ): Client<boolean> & boolean;
+
         waitForExist<P>(selector?: string): Client<P>;
+
         waitForExist<P>(
             selector: string,
-            milliseconds: number
+            milliseconds?: number
         ): Client<P>;
+
         waitForExist<P>(milliseconds: number): Client<P>;
+
         waitForExist<P>(
             selector: string,
-            milliseconds: number,
-            reverse: boolean
+            milliseconds?: number,
+            reverse?: boolean
         ): Client<P>;
+
         waitForExist<P>(
             milliseconds: number,
-            reverse: boolean
+            reverse?: boolean
         ): Client<P>;
 
         waitForSelected(
             selector: string,
             milliseconds?: number,
             reverse?: boolean
-        ): Client<boolean>;
+        ): Client<boolean> & boolean;
+
         waitForSelected(
             milliseconds?: number,
             reverse?: boolean
-        ): Client<boolean>;
+        ): Client<boolean> & boolean;
+
         waitForSelected<P>(selector?: string): Client<P>;
+
         waitForSelected<P>(
             selector: string,
-            milliseconds: number
+            milliseconds?: number
         ): Client<P>;
+
         waitForSelected<P>(milliseconds: number): Client<P>;
+
         waitForSelected<P>(
             selector: string,
-            milliseconds: number,
-            reverse: boolean
+            milliseconds?: number,
+            reverse?: boolean
         ): Client<P>;
+
         waitForSelected<P>(
-            milliseconds: number,
-            reverse: boolean
+            milliseconds?: number,
+            reverse?: boolean
         ): Client<P>;
 
         waitForText(
             selector: string,
             milliseconds?: number,
             reverse?: boolean
-        ): Client<boolean>;
+        ): Client<boolean> & boolean;
+
         waitForText(
             milliseconds?: number,
             reverse?: boolean
-        ): Client<boolean>;
+        ): Client<boolean> & boolean;
+
         waitForText<P>(selector?: string): Client<P>;
+
         waitForText<P>(
             selector: string,
-            milliseconds: number
+            milliseconds?: number
         ): Client<P>;
-        waitForText<P>(milliseconds: number): Client<P>;
+
+        waitForText<P>(milliseconds?: number): Client<P>;
+
         waitForText<P>(
             selector: string,
-            milliseconds: number,
-            reverse: boolean
+            milliseconds?: number,
+            reverse?: boolean
         ): Client<P>;
+
         waitForText<P>(
-            milliseconds: number,
-            reverse: boolean
+            milliseconds?: number,
+            reverse?: boolean
         ): Client<P>;
 
         waitForValue(
             selector: string,
             milliseconds?: number,
             reverse?: boolean
-        ): Client<boolean>;
+        ): Client<boolean> & boolean;
+
         waitForValue(
             milliseconds?: number,
             reverse?: boolean
-        ): Client<boolean>;
+        ): Client<boolean> & boolean;
+
         waitForValue<P>(selector?: string): Client<P>;
+
         waitForValue<P>(
             selector: string,
-            milliseconds: number
+            milliseconds?: number
         ): Client<P>;
-        waitForValue<P>(milliseconds: number): Client<P>;
+
+        waitForValue<P>(milliseconds?: number): Client<P>;
+
         waitForValue<P>(
             selector: string,
-            milliseconds: number,
-            reverse: boolean,
-
+            milliseconds?: number,
+            reverse?: boolean,
         ): Client<P>;
-        waitForValue<P>(
-            milliseconds: number,
-            reverse: boolean,
 
+        waitForValue<P>(
+            milliseconds?: number,
+            reverse?: boolean,
         ): Client<P>;
 
         waitForVisible(
             selector: string,
             milliseconds?: number,
             reverse?: boolean
-        ): Client<boolean>;
+        ): Client<boolean> & boolean;
+
         waitForVisible(
             milliseconds?: number,
             reverse?: boolean
-        ): Client<boolean>;
+        ): Client<boolean> & boolean;
+
         waitForVisible<P>(selector?: string): Client<P>;
+
         waitForVisible<P>(
             selector: string,
-            milliseconds: number
+            milliseconds?: number
         ): Client<P>;
-        waitForVisible<P>(milliseconds: number): Client<P>;
+
+        waitForVisible<P>(milliseconds?: number): Client<P>;
+
         waitForVisible<P>(
             selector: string,
-            milliseconds: number,
-            reverse: boolean
+            milliseconds?: number,
+            reverse?: boolean
         ): Client<P>;
+
         waitForVisible<P>(
-            milliseconds: number,
-            reverse: boolean
+            milliseconds?: number,
+            reverse?: boolean
         ): Client<P>;
 
         waitUntil(
-            condition: () => boolean | Q.IPromise<boolean>,
+            condition: () => boolean | Promise<boolean> | Client<RawResult<any>> & RawResult<any>,
             timeout?: number,
             timeoutMsg?: string,
             interval?: number
-        ): Client<boolean>;
+        ): Client<boolean> & any;
+
         waitUntil<P>(
-            condition: () => boolean | Q.IPromise<boolean>,
+            condition: () => boolean | Promise<boolean> | Client<RawResult<any>> & RawResult<any>,
             timeout?: number,
             timeoutMsg?: string,
             interval?: number
@@ -974,26 +1834,25 @@ declare namespace WebdriverIO {
 
     // Window
     export interface Client<T> {
-
-
-        close(windowHandle?: string): Client<void>;
+        close(windowHandle?: string): Client<RawResult<null>> & RawResult<null>;
         close<P>(windowHandle?: string): Client<P>;
 
-        getCurrentTabId(): Client<string>;
+        getCurrentTabId(): Client<string> & string;
         getCurrentTabId<P>(): Client<P>;
 
-        getTabIds(): Client<string[]>;
+        getTabIds(): Client<string[]> & string[];
         getTabIds<P>(): Client<P>;
 
         getViewportSize(): Client<Size> & Size;
-        getViewportSize(dimension: string): Client<number>;
+        getViewportSize(dimension: string): Client<number> & number;
         getViewportSize<P>(dimension?: string): Client<P>;
 
         newWindow(
             url: string,
             windowName: string,
             windowFeatures: string
-        ): Client<string>;
+        ): Client<RawResult<null>> & RawResult<null>;
+
         newWindow<P>(
             url: string,
             windowName: string,
@@ -1002,53 +1861,19 @@ declare namespace WebdriverIO {
 
         setViewportSize(
             size: Size,
-            type: boolean
-        ): Client<void>;
+            type?: boolean
+        ): Client<void> & undefined;
+
         setViewportSize<P>(
             size: Size,
-            type: boolean
+            type?: boolean
         ): Client<P>;
 
-        switchTab(windowHandle?: string): Client<void>;
+        switchTab(windowHandle?: string): Client<RawResult<null>> & RawResult<null>;
         switchTab<P>(windowHandle?: string): Client<P>;
     }
 
-    export type Axis = "x" | "y";
-
-    export interface Options {
-        protocol: string;
-        waitforTimeout: number;
-        coloredLogs: boolean;
-        logLevel: string;
-        baseUrl: string;
-        desiredCapabilities: DesiredCapabilities;
-        screenshotPath: string;
-    }
-
-    // Options
-    export interface Client<T> {
-        options: Options;
-    }
-
-    export type DesiredCapabilities = any;
-
-    export interface RemoteOptions {
-        protocol?: string;
-        waitforTimeout?: number;
-        waitforInterval?: number;
-        coloredLogs?: boolean;
-        logLevel?: string;
-        baseUrl?: string;
-        desiredCapabilities?: DesiredCapabilities;
-    }
-
-    export interface MultiremoteOptions {
-        [key: string]: RemoteOptions;
-    }
-
-    export function remote(options?: RemoteOptions | string): Client<void>;
-
-    export function multiremote(options?: MultiremoteOptions): Client<void>;
+    export var VERSION: string;
 }
 
 declare var browser: WebdriverIO.Client<void>;
@@ -1056,4 +1881,3 @@ declare var browser: WebdriverIO.Client<void>;
 declare module "webdriverio" {
     export = WebdriverIO;
 }
-
diff --git a/webdriverio/webdriverio-tests.ts b/webdriverio/webdriverio-tests.ts
index dc204b2052..826e2f1811 100644
--- a/webdriverio/webdriverio-tests.ts
+++ b/webdriverio/webdriverio-tests.ts
@@ -1,6 +1,5 @@
 
 /// <reference types="mocha" />
-/// <reference types="chai" />
 
 import {assert} from "chai";
 
@@ -34,12 +33,12 @@ describe("my webdriverio tests", function(){
     this.timeout(99999999);
     var client: webdriverio.Client<void>;
 
-    before(function(done){
-        client = webdriverio.remote({ desiredCapabilities: {browserName: "phantomjs"} });
-        client.init(done);
+    before(function() {
+        client = webdriverio.remote({ desiredCapabilities: { browserName: "phantomjs" } });
+        client.init();
     });
 
-    it("Github test",function() {
+    it("Github test", function() {
         client.url("https://github.com/");
 
         var elementSize = client.getElementSize(".header-logo-wordmark");
@@ -111,7 +110,7 @@ webdriverio
     .selectorExecute("//div", function(inputs: HTMLElement[], message: string) {
         return inputs.length + " " + message;
     }, "divs on the page")
-    .then(function(res){
+    .then(function(res: string) {
         console.log(res);
     })
     .end();
diff --git a/webgme/webgme-tests.ts b/webgme/webgme-tests.ts
index d009e936e4..e6f315a3ef 100644
--- a/webgme/webgme-tests.ts
+++ b/webgme/webgme-tests.ts
@@ -1,13 +1,9 @@
-
-/// <reference types="node" />
-/// <reference types="bluebird" />
-
 /**
  * In actual usage the MetaDataStr would most likely
  * be initialized with an import...
- * 
+ *
   import MetaDataStr = require("text!metadata.json");
- * 
+ *
  * Which would require a declaration, like...
  * `text.d.ts`
  *
@@ -26,7 +22,7 @@ import * as fs from "fs";
 import * as stream from "stream";
 import * as Common from "webgme/common";
 
-/** 
+/**
  * The following items are not created directly by the
  * plugin driver.
  *
@@ -41,14 +37,14 @@ let destinationNode = new Common.Node();
 /**
  * These tests are derived from...
  * https://github.com/webgme/webgme/wiki/GME-Core-API
- * 
- * Nearly all core functions takes a CoreNode as its first argument. 
- * When using the Core API externally each CoreNode corresponds 
- * to one node/model in the project tree. 
- * To access data from the node the Core API should be used 
- * and the properties on the CoreNode itself should 
+ *
+ * Nearly all core functions takes a CoreNode as its first argument.
+ * When using the Core API externally each CoreNode corresponds
+ * to one node/model in the project tree.
+ * To access data from the node the Core API should be used
+ * and the properties on the CoreNode itself should
  * not be accessed or modified directly.
- * 
+ *
  * Below follows a handpicked selection of basic core functions.
  */
 
@@ -111,7 +107,7 @@ function test_core_containment_traversal() {
     });
 }
 
-/** 
+/**
  * https://github.com/webgme/webgme/wiki/GME-Core-API#containment-methods
  */
 function test_core_containment_methods() {
@@ -158,7 +154,7 @@ function test_core_containment_methods() {
         // Here we have access to the node.
     });
 
-    // Loading an entire sub-tree of nodes 
+    // Loading an entire sub-tree of nodes
     // N.B. this requires all nodes to be loaded at the same time.
     // For larger models core.traverse is preferred.
     self.core.loadSubTree(node, (err, nodes) => {
@@ -176,7 +172,7 @@ function test_core_containment_methods() {
 
 function test_core_pointers_connections() {
 
-    // 
+    //
     let isConn = self.core.isConnection(connNode);
 
     // Get the path of the node that is pointed to, via 'src', from connNode.
@@ -215,16 +211,16 @@ function test_core_pointers_connections() {
 
 /**
  * https://github.com/webgme/webgme/wiki/GME-Blob-Storage-API
- * 
- * File-like objects/artifacts 
- * (which are neither a meta archetype model, nor an instance model) 
- * are stored separately from the WebGME meta-models and models. 
- * An example of such an artifact would be a resource 
- * file that is associated with a model 
+ *
+ * File-like objects/artifacts
+ * (which are neither a meta archetype model, nor an instance model)
+ * are stored separately from the WebGME meta-models and models.
+ * An example of such an artifact would be a resource
+ * file that is associated with a model
  * (e.g., data for an instance model, or a generated artifact from analyzing a model).
- * 
- * One reason for treating these objects differently is that they do not conform to the data model, 
- * and they might not be well-suited for storage in a database 
+ *
+ * One reason for treating these objects differently is that they do not conform to the data model,
+ * and they might not be well-suited for storage in a database
  * (the Blob is suited to handle binary objects of any size and structure).
  */
 
@@ -242,22 +238,22 @@ function test_client_creating_an_instance() {
 
 /**
  * https://github.com/webgme/webgme/wiki/GME-Blob-Storage-API
- * 
- * File-like objects/artifacts 
- * (which are neither a meta archetype model, nor an instance model) 
- * are stored separately from the WebGME meta-models and models. 
- * An example of such an artifact would be a resource 
- * file that is associated with a model 
+ *
+ * File-like objects/artifacts
+ * (which are neither a meta archetype model, nor an instance model)
+ * are stored separately from the WebGME meta-models and models.
+ * An example of such an artifact would be a resource
+ * file that is associated with a model
  * (e.g., data for an instance model, or a generated artifact from analyzing a model).
- * 
- * One reason for treating these objects differently is that they do not conform to the data model, 
- * and they might not be well-suited for storage in a database 
+ *
+ * One reason for treating these objects differently is that they do not conform to the data model,
+ * and they might not be well-suited for storage in a database
  * (the Blob is suited to handle binary objects of any size and structure).
  */
 
 
 
-/** 
+/**
  * The following items are not created directly by the
  * plugin driver.
  *
@@ -338,7 +334,7 @@ type DictionaryAny = { [key: string]: any };
 /**
 * Visit the node and perform the function.
 * Related example using traverse.
-* https://github.com/webgme/xmi-tools/blob/master/src/plugins/XMIExporter/XMIExporter.js#L430    
+* https://github.com/webgme/xmi-tools/blob/master/src/plugins/XMIExporter/XMIExporter.js#L430
 */
 function test_core_containment_traversal_complete() {
     const BLANK = "";
@@ -382,7 +378,7 @@ function test_core_containment_traversal_complete() {
 
         /**
          * A filter mechanism to effectively eliminate containment branches.
-         * Any path included in the prune-list will be the root of a 
+         * Any path included in the prune-list will be the root of a
          * pruned subtree.
          */
         let pruneList: string[] = [];
diff --git a/webpack-sources/webpack-sources-tests.ts b/webpack-sources/webpack-sources-tests.ts
index 622f12cb8e..16c915516b 100644
--- a/webpack-sources/webpack-sources-tests.ts
+++ b/webpack-sources/webpack-sources-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="index.d.ts" />
-
 import {
     CachedSource,
     ConcatSource,
diff --git a/webpack/index.d.ts b/webpack/index.d.ts
index 0eb787a9b0..28d1b33b40 100644
--- a/webpack/index.d.ts
+++ b/webpack/index.d.ts
@@ -747,6 +747,10 @@ declare namespace webpack {
         constructor(request: any);
     }
 
+    class ProgressPlugin extends Plugin {
+        constructor(options?: (percentage: number, msg: string) => void);
+    }
+
     class ProvidePlugin extends Plugin {
         constructor(definitions: {[key: string]: any});
     }
diff --git a/webpack/webpack-tests.ts b/webpack/webpack-tests.ts
index 483e175f38..ce9d42d71b 100644
--- a/webpack/webpack-tests.ts
+++ b/webpack/webpack-tests.ts
@@ -400,6 +400,7 @@ plugin = new webpack.WatchIgnorePlugin(paths);
 plugin = new webpack.LoaderOptionsPlugin({
     debug: true
 });
+plugin = new webpack.ProgressPlugin((percent: number, message: string) => {});
 
 //
 // http://webpack.github.io/docs/node.js-api.html
diff --git a/week/index.d.ts b/week/index.d.ts
new file mode 100644
index 0000000000..365fbf8d96
--- /dev/null
+++ b/week/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for week 0.2
+// Project: https://github.com/datetime/week
+// Definitions by: Sindre Moen <https://github.com/sindrenm>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function week(date?: Date): string;
+
+export = week;
diff --git a/week/tsconfig.json b/week/tsconfig.json
new file mode 100644
index 0000000000..2a969bd826
--- /dev/null
+++ b/week/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "week-tests.ts"
+    ]
+}
diff --git a/week/tslint.json b/week/tslint.json
new file mode 100644
index 0000000000..ec365f164b
--- /dev/null
+++ b/week/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../tslint.json"
+}
diff --git a/week/week-tests.ts b/week/week-tests.ts
new file mode 100644
index 0000000000..8f0949d09f
--- /dev/null
+++ b/week/week-tests.ts
@@ -0,0 +1,6 @@
+import week = require('week');
+
+let weekNumber: string;
+
+weekNumber = week(new Date());
+weekNumber = week();
diff --git a/whatwg-fetch/index.d.ts b/whatwg-fetch/index.d.ts
deleted file mode 100644
index 67bde53016..0000000000
--- a/whatwg-fetch/index.d.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-// Type definitions for Fetch API
-// Project: https://github.com/github/fetch
-// Definitions by: Ryan Graham <https://github.com/ryan-codingintrigue>, Kagami Sascha Rosylight <https://github.com/saschanaz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="whatwg-streams" />
-
-interface Window {
-    fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
-}
-declare let fetch: typeof window.fetch;
-
-declare type HeadersInit = Headers | string[][] | { [key: string]: string };
-declare class Headers {
-    constructor(init?: HeadersInit);
-
-    append(name: string, value: string): void;
-    delete(name: string): void;
-    get(name: string): string | null;
-    has(name: string): boolean;
-    set(name: string, value: string): void;
-
-    // WebIDL pair iterator: iterable<ByteString, ByteString>
-    entries(): IterableIterator<[string, string]>;
-    forEach(callback: (value: string, index: number, headers: Headers) => void, thisArg?: any): void;
-    keys(): IterableIterator<string>;
-    values(): IterableIterator<string>;
-    [Symbol.iterator](): IterableIterator<[string, string]>;
-}
-
-declare type BodyInit = Blob | ArrayBufferView | ArrayBuffer | FormData /* | URLSearchParams */ | string;
-declare type ResponseBodyInit = BodyInit | ReadableStream;
-interface Body {
-    readonly bodyUsed: boolean;
-    arrayBuffer(): Promise<ArrayBuffer>;
-    blob(): Promise<Blob>;
-    formData(): Promise<FormData>;
-    json(): Promise<any>;
-    json<T>(): Promise<T>;
-    text(): Promise<string>;
-}
-
-declare type RequestInfo = Request | string;
-declare class Request {
-    constructor(input: RequestInfo, init?: RequestInit);
-
-    readonly method: string;
-    readonly url: string;
-    readonly headers: Headers;
-
-    readonly type: RequestType
-    readonly destination: RequestDestination;
-    readonly referrer: string;
-    readonly referrerPolicy: ReferrerPolicy;
-    readonly mode: RequestMode;
-    readonly credentials: RequestCredentials;
-    readonly cache: RequestCache;
-    readonly redirect: RequestRedirect;
-    readonly integrity: string;
-    readonly keepalive: boolean;
-
-    clone(): Request;
-}
-interface Request extends Body {}
-interface RequestInit {
-    method?: string;
-    headers?: HeadersInit;
-    body?: BodyInit;
-    referrer?: string;
-    referrerPolicy?: ReferrerPolicy;
-    mode?: RequestMode;
-    credentials?: RequestCredentials;
-    cache?: RequestCache;
-    redirect?: RequestRedirect;
-    integrity?: string;
-    window?: null; // can only be set to null
-}
-
-type RequestType = "" | "audio" | "font" | "image" | "script" | "style" | "track" | "video";
-type RequestDestination = "" | "document" | "embed" | "font" | "image" | "manifest" | "media" | "object" | "report" | "script" | "serviceworker" | "sharedworker" | "style" | "worker" | "xslt";
-type RequestMode = "navigate" | "same-origin" | "no-cors" | "cors";
-type RequestCredentials = "omit" | "same-origin" | "include";
-type RequestCache = "default" | "no-store" | "reload" | "no-cache" | "force-cache" | "only-if-cached";
-type RequestRedirect = "follow" | "error" | "manual";
-
-type ReferrerPolicy = "" | "no-referrer" | "no-referrer-when-downgrade" | "same-origin" | "origin" | "strict-origin" | "origin-when-cross-origin" | "strict-origin-when-cross-origin" | "unsafe-url";
-
-declare class Response {
-    constructor(body?: ResponseBodyInit, init?: ResponseInit);
-
-    static error(): Response;
-    static redirect(url: string, status?: number): Response;
-
-    readonly type: ResponseType;
-
-    readonly url: string;
-    readonly redirected: boolean;
-    readonly status: number;
-    readonly ok: boolean;
-    readonly statusText: string;
-    readonly headers: Headers;
-    readonly body: ReadableStream | null;
-    readonly trailer: Promise<Headers>;
-
-    clone(): Response;
-}
-interface Response extends Body {}
-
-interface ResponseInit {
-    status?: number;
-    statusText?: string;
-    headers?: HeadersInit;
-}
-
-type ResponseType = "basic" | "cors" | "default" | "error" | "opaque" | "opaqueredirect";
diff --git a/whatwg-fetch/whatwg-fetch-tests.ts b/whatwg-fetch/whatwg-fetch-tests.ts
deleted file mode 100644
index 6c5e509749..0000000000
--- a/whatwg-fetch/whatwg-fetch-tests.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-function test_HeadersCopiedFromHeaders() {
-	var source = new Headers();
-	source.append('Content-Type', 'application/json');
-	return new Headers(source);
-}
-
-function test_HeadersCopiedFromHash() {
-	var source: DOMStringMap = {
-		'Content-Type': 'application/json'
-	};
-	return new Headers(source);
-}
-
-function test_fetchUrlWithOptions() {
-	var headers = new Headers();
-	headers.append("Content-Type", "application/json");
-	var requestOptions: RequestInit = {
-		method: "POST",
-		headers: headers,
-		mode: 'same-origin',
-		credentials: 'omit',
-		cache: 'default',
-		redirect: 'manual'
-	};
-	handlePromise(window.fetch("http://www.andlabs.net/html5/uCOR.php", requestOptions));
-}
-
-function test_fetchUrlWithHeadersObject() {
-	var requestOptions: RequestInit = {
-		method: "POST",
-		headers: {
-			'Content-Type': 'application/json'
-		}
-	};
-	handlePromise(window.fetch("http://www.andlabs.net/html5/uCOR.php", requestOptions));
-}
-
-function test_fetchUrl() {
-	handlePromise(window.fetch("http://www.andlabs.net/html5/uCOR.php"));
-}
-
-function test_fetchUrlWithRequestObject() {
-	var requestOptions: RequestInit = {
-		method: "POST",
-		headers: {
-			'Content-Type': 'application/json'
-		}
-	};
-	var request: Request = new Request("http://www.andlabs.net/html5/uCOR.php", requestOptions);
-	handlePromise(window.fetch(request));
-}
-
-function test_globalFetchVar() {
-	fetch('http://test.com', {})
-		.then(response => {
-			// for test only
-		});
-}
-
-function handlePromise(promise: Promise<Response>) {
-	promise.then((response) => {
-		if (response.type === 'basic') {
-			// for test only
-		}
-		return response.text();
-	}).then((text) => {
-		console.log(text);
-	});
-}
-
-function test_Body_json() {
-	interface FooBar {
-		foo: string;
-		bar: string;
-	}
-
-	fetch('http://test.com')
-		.then(response => response.json<FooBar>())
-		.then(fooBar => {
-			console.log(fooBar.foo);
-			console.log(fooBar.bar);
-		});
-
-	fetch('http://test.com')
-		.then(response => <Promise<FooBar>> response.json())
-		.then(fooBar => {
-			console.log(fooBar.foo);
-			console.log(fooBar.bar);
-		});
-
-	fetch('http://test.com')
-		.then(response => response.json() as Promise<FooBar>)
-		.then(fooBar => {
-			console.log(fooBar.foo);
-			console.log(fooBar.bar);
-		});
-
-	fetch('http://test.com')
-		.then(response => response.json())
-		.then(fooBar => {
-			// fooBar is of type any, not of type FooBar
-
-			// FIXME Was behaving properly with TypeScript 2.0.10, not anymore with 2.1.4
-			// See Wrong type with Promise chaining and 2.1.4 https://github.com/Microsoft/TypeScript/issues/12409
-			//console.log(fooBar.foo);
-			//console.log(fooBar.bar);
-		});
-}
diff --git a/wiredep/tsconfig.json b/wiredep/tsconfig.json
index 3794e2a3b2..69ee121ef9 100644
--- a/wiredep/tsconfig.json
+++ b/wiredep/tsconfig.json
@@ -11,6 +11,9 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/wonder-commonlib/index.d.ts b/wonder-commonlib/index.d.ts
index 1cad038d52..267d86538d 100644
--- a/wonder-commonlib/index.d.ts
+++ b/wonder-commonlib/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for wonder-commonlib 0.1.1
+// Type definitions for wonder-commonlib 0.2.0
 // Project: https://github.com/yyc-git/Wonder-CommonLib
 // Definitions by: YYC <https://github.com/yyc-git>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,96 +6,31 @@
 
 /// <reference types="node" />
 
-declare module wdCb {
-    class JudgeUtils {
-        static isArray(arr: any): boolean;
-        static isArrayExactly(arr: any): boolean;
-        static isNumber(num: any): boolean;
-        static isNumberExactly(num: any): boolean;
-        static isString(str: any): boolean;
-        static isStringExactly(str: any): boolean;
-        static isBoolean(bool: any): boolean;
-        static isDom(obj: any): boolean;
-        static isObject(obj: any): boolean;
-        static isDirectObject(obj: any): boolean;
-        static isHostMethod(object: any, property: any): boolean;
-        static isNodeJs(): boolean;
-        static isFunction(func: any): boolean;
-    }
+// Generated by dts-bundle v0.7.2
+
+declare module 'wonder-commonlib/dist/es2015' {
+    export { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    export { $BREAK, $REMOVE } from "wonder-commonlib/dist/es2015/global/Const";
+    export { root } from "wonder-commonlib/dist/es2015/global/Variable";
+    export { Hash } from "wonder-commonlib/dist/es2015/Hash";
+    export { List } from "wonder-commonlib/dist/es2015/List";
+    export { Log } from "wonder-commonlib/dist/es2015/Log";
+    export { Queue } from "wonder-commonlib/dist/es2015/Queue";
+    export { Stack } from "wonder-commonlib/dist/es2015/Stack";
+    export { AjaxUtils } from "wonder-commonlib/dist/es2015/utils/AjaxUtils";
+    export { ArrayUtils } from "wonder-commonlib/dist/es2015/utils/ArrayUtils";
+    export { ConvertUtils } from "wonder-commonlib/dist/es2015/utils/ConvertUtils";
+    export { DomQuery } from "wonder-commonlib/dist/es2015/utils/DomQuery";
+    export { EventUtils } from "wonder-commonlib/dist/es2015/utils/EventUtils";
+    export { ExtendUtils } from "wonder-commonlib/dist/es2015/utils/ExtendUtils";
+    export { FunctionUtils } from "wonder-commonlib/dist/es2015/utils/FunctionUtils";
+    export { JudgeUtils } from "wonder-commonlib/dist/es2015/utils/JudgeUtils";
+    export { PathUtils } from "wonder-commonlib/dist/es2015/utils/PathUtils";
 }
 
-declare var global:NodeJS.Global,window:Window;
-
-declare module wdCb {
-    var root: any;
-}
-
-declare module wdCb {
-}
-
-declare module wdCb {
-    const $BREAK: {
-        break: boolean;
-    };
-    const $REMOVE: any;
-}
-
-declare module wdCb {
-    class Log {
-        static info: {
-            INVALID_PARAM: string;
-            helperFunc: (...args: any[]) => string;
-            assertion: (...args: any[]) => any;
-            FUNC_INVALID: (...args: any[]) => any;
-            FUNC_MUST: (...args: any[]) => any;
-            FUNC_MUST_BE: (...args: any[]) => any;
-            FUNC_MUST_NOT_BE: (...args: any[]) => any;
-            FUNC_SHOULD: (...args: any[]) => any;
-            FUNC_SHOULD_NOT: (...args: any[]) => any;
-            FUNC_SUPPORT: (...args: any[]) => any;
-            FUNC_NOT_SUPPORT: (...args: any[]) => any;
-            FUNC_MUST_DEFINE: (...args: any[]) => any;
-            FUNC_MUST_NOT_DEFINE: (...args: any[]) => any;
-            FUNC_UNKNOW: (...args: any[]) => any;
-            FUNC_EXPECT: (...args: any[]) => any;
-            FUNC_UNEXPECT: (...args: any[]) => any;
-            FUNC_EXIST: (...args: any[]) => any;
-            FUNC_NOT_EXIST: (...args: any[]) => any;
-            FUNC_ONLY: (...args: any[]) => any;
-            FUNC_CAN_NOT: (...args: any[]) => any;
-        };
-        static log(...messages: any[]): void;
-        static assert(cond: any, ...messages: any[]): void;
-        static error(cond: any, ...message: any[]): any;
-        static warn(...message: any[]): void;
-        private static _exec(consoleMethod, args, sliceBegin?);
-    }
-}
-
-declare module wdCb {
-    class List<T> {
-        protected children: Array<T>;
-        getCount(): number;
-        hasChild(child: any): boolean;
-        hasChildWithFunc(func: Function): boolean;
-        getChildren(): T[];
-        getChild(index: number): T;
-        addChild(child: T): this;
-        addChildren(arg: Array<T> | List<T> | any): this;
-        setChildren(children: Array<T>): this;
-        unShiftChild(child: T): void;
-        removeAllChildren(): this;
-        forEach(func: Function, context?: any): this;
-        toArray(): T[];
-        protected copyChildren(): T[];
-        protected removeChildHelper(arg: any): Array<T>;
-        private _forEach(arr, func, context?);
-        private _removeChild(arr, func);
-    }
-}
-
-declare module wdCb {
-    class Collection<T> extends List<T> {
+declare module 'wonder-commonlib/dist/es2015/Collection' {
+    import { List } from "wonder-commonlib/dist/es2015/List";
+    export class Collection<T> extends List<T> {
         static create<T>(children?: any[]): Collection<T>;
         constructor(children?: Array<T>);
         clone(): any;
@@ -109,17 +44,28 @@ declare module wdCb {
         sort(func: (a: T, b: T) => any, isSortSelf?: boolean): Collection<T>;
         map(func: (value: T, index: number) => any): Collection<any>;
         removeRepeatItems(): Collection<T>;
-        hasRepeatItems(): false;
+        hasRepeatItems(): boolean;
     }
 }
 
-declare module wdCb {
-    class Hash<T> {
+declare module 'wonder-commonlib/dist/es2015/global/Const' {
+    export const $BREAK: {
+        break: boolean;
+    };
+    export const $REMOVE: any;
+}
+
+declare module 'wonder-commonlib/dist/es2015/global/Variable' {
+    export var root: any;
+}
+
+declare module 'wonder-commonlib/dist/es2015/Hash' {
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    export class Hash<T> {
         static create<T>(children?: {}): Hash<T>;
         constructor(children?: {
             [s: string]: T;
         });
-        private _children;
         getChildren(): {
             [s: string]: T;
         };
@@ -151,8 +97,60 @@ declare module wdCb {
     }
 }
 
-declare module wdCb {
-    class Queue<T> extends List<T> {
+declare module 'wonder-commonlib/dist/es2015/List' {
+    export class List<T> {
+        protected children: Array<T>;
+        getCount(): number;
+        hasChild(child: any): boolean;
+        hasChildWithFunc(func: Function): boolean;
+        getChildren(): T[];
+        getChild(index: number): T;
+        addChild(child: T): this;
+        addChildren(arg: Array<T> | List<T> | any): this;
+        setChildren(children: Array<T>): this;
+        unShiftChild(child: T): void;
+        removeAllChildren(): this;
+        forEach(func: Function, context?: any): this;
+        toArray(): T[];
+        protected copyChildren(): T[];
+        protected removeChildHelper(arg: any): Array<T>;
+    }
+}
+
+declare module 'wonder-commonlib/dist/es2015/Log' {
+    export class Log {
+        static info: {
+            INVALID_PARAM: string;
+            helperFunc: (...args: any[]) => string;
+            assertion: (...args: any[]) => any;
+            FUNC_INVALID: (...args: any[]) => any;
+            FUNC_MUST: (...args: any[]) => any;
+            FUNC_MUST_BE: (...args: any[]) => any;
+            FUNC_MUST_NOT_BE: (...args: any[]) => any;
+            FUNC_SHOULD: (...args: any[]) => any;
+            FUNC_SHOULD_NOT: (...args: any[]) => any;
+            FUNC_SUPPORT: (...args: any[]) => any;
+            FUNC_NOT_SUPPORT: (...args: any[]) => any;
+            FUNC_MUST_DEFINE: (...args: any[]) => any;
+            FUNC_MUST_NOT_DEFINE: (...args: any[]) => any;
+            FUNC_UNKNOW: (...args: any[]) => any;
+            FUNC_EXPECT: (...args: any[]) => any;
+            FUNC_UNEXPECT: (...args: any[]) => any;
+            FUNC_EXIST: (...args: any[]) => any;
+            FUNC_NOT_EXIST: (...args: any[]) => any;
+            FUNC_ONLY: (...args: any[]) => any;
+            FUNC_CAN_NOT: (...args: any[]) => any;
+        };
+        static log(...messages: any[]): void;
+        static assert(cond: any, ...messages: any[]): void;
+        static error(cond: any, ...message: any[]): any;
+        static warn(...message: any[]): void;
+    }
+}
+
+declare module 'wonder-commonlib/dist/es2015/Queue' {
+    import { List } from "wonder-commonlib/dist/es2015/List";
+    export class Queue<T> extends List<T> {
         static create<T>(children?: any[]): Queue<T>;
         constructor(children?: Array<T>);
         readonly front: T;
@@ -163,8 +161,10 @@ declare module wdCb {
     }
 }
 
-declare module wdCb {
-    class Stack<T> extends List<T> {
+declare module 'wonder-commonlib/dist/es2015/Stack' {
+    import { List } from "wonder-commonlib/dist/es2015/List";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    export class Stack<T> extends List<T> {
         static create<T>(children?: any[]): Stack<T>;
         constructor(children?: Array<T>);
         readonly top: T;
@@ -182,71 +182,33 @@ declare module wdCb {
         sort(func: (a: T, b: T) => any, isSortSelf?: boolean): Collection<T>;
         map(func: (value: T, index: number) => any): Collection<any>;
         removeRepeatItems(): Collection<T>;
-        hasRepeatItems(): false;
+        hasRepeatItems(): boolean;
     }
 }
 
-declare module wdCb {
-    class AjaxUtils {
+declare module 'wonder-commonlib/dist/es2015/utils/AjaxUtils' {
+    export class AjaxUtils {
         static ajax(conf: any): void;
-        private static _createAjax(error);
-        private static _isLocalFile(status);
-        private static _isSoundFile(dataType);
     }
 }
 
-declare module wdCb {
-    class ArrayUtils {
+declare module 'wonder-commonlib/dist/es2015/utils/ArrayUtils' {
+    export class ArrayUtils {
         static removeRepeatItems(arr: Array<any>, isEqual?: (a: any, b: any) => boolean): any[];
         static contain(arr: Array<any>, ele: any): boolean;
     }
 }
 
-declare module wdCb {
-    class ConvertUtils {
+declare module 'wonder-commonlib/dist/es2015/utils/ConvertUtils' {
+    export class ConvertUtils {
         static toString(obj: any): string;
-        private static _convertCodeToString(fn);
     }
 }
 
-declare module wdCb {
-    class EventUtils {
-        static bindEvent(context: any, func: any): (event: any) => any;
-        static addEvent(dom: any, eventName: any, handler: any): void;
-        static removeEvent(dom: any, eventName: any, handler: any): void;
-    }
-}
-
-declare module wdCb {
-    class ExtendUtils {
-        static extendDeep(parent: any, child?: any, filter?: (val: any, i: any) => boolean): any;
-        static extend(destination: any, source: any): any;
-        static copyPublicAttri(source: any): {};
-    }
-}
-
-declare module wdCb {
-    class PathUtils {
-        static basename(path: string, ext?: string): string;
-        static changeExtname(pathStr: string, extname: string): string;
-        static changeBasename(pathStr: string, basename: string, isSameExt?: boolean): string;
-        static extname(path: string): string;
-        static dirname(path: string): string;
-        private static _splitPath(fileName);
-    }
-}
-
-declare module wdCb {
-    class FunctionUtils {
-        static bind(object: any, func: Function): () => any;
-    }
-}
-
-declare module wdCb {
-    class DomQuery {
+declare module 'wonder-commonlib/dist/es2015/utils/DomQuery' {
+    export class DomQuery {
         static create(eleStr: string): any;
         static create(dom: HTMLElement): any;
-        private _doms;
         constructor(eleStr: string);
         constructor(dom: HTMLElement);
         get(index: any): HTMLElement;
@@ -258,14 +220,56 @@ declare module wdCb {
         attr(name: string): any;
         attr(name: string, value: string): any;
         text(str?: string): string;
-        private _isDomEleStr(eleStr);
-        private _buildDom(eleStr);
-        private _buildDom(dom);
-        private _createElement(eleStr);
     }
 }
 
-declare module "wonder-commonlib" {
-    export = wdCb;
+declare module 'wonder-commonlib/dist/es2015/utils/EventUtils' {
+    export class EventUtils {
+        static bindEvent(context: any, func: any): (event: any) => any;
+        static addEvent(dom: any, eventName: any, handler: any): void;
+        static removeEvent(dom: any, eventName: any, handler: any): void;
+    }
+}
+
+declare module 'wonder-commonlib/dist/es2015/utils/ExtendUtils' {
+    export class ExtendUtils {
+        static extendDeep(parent: any, child?: any, filter?: (val: any, i: any) => boolean): any;
+        static extend(destination: any, source: any): any;
+        static copyPublicAttri(source: any): {};
+    }
+}
+
+declare module 'wonder-commonlib/dist/es2015/utils/FunctionUtils' {
+    export class FunctionUtils {
+        static bind(object: any, func: Function): () => any;
+    }
+}
+
+declare module 'wonder-commonlib/dist/es2015/utils/JudgeUtils' {
+    export class JudgeUtils {
+        static isArray(arr: any): boolean;
+        static isArrayExactly(arr: any): boolean;
+        static isNumber(num: any): boolean;
+        static isNumberExactly(num: any): boolean;
+        static isString(str: any): boolean;
+        static isStringExactly(str: any): boolean;
+        static isBoolean(bool: any): boolean;
+        static isDom(obj: any): boolean;
+        static isObject(obj: any): boolean;
+        static isDirectObject(obj: any): boolean;
+        static isHostMethod(object: any, property: any): boolean;
+        static isNodeJs(): boolean;
+        static isFunction(func: any): boolean;
+    }
+}
+
+declare module 'wonder-commonlib/dist/es2015/utils/PathUtils' {
+    export class PathUtils {
+        static basename(path: string, ext?: string): string;
+        static changeExtname(pathStr: string, extname: string): string;
+        static changeBasename(pathStr: string, basename: string, isSameExt?: boolean): string;
+        static extname(path: string): string;
+        static dirname(path: string): string;
+    }
 }
 
diff --git a/wonder-commonlib/wonder-commonlib-tests.ts b/wonder-commonlib/wonder-commonlib-tests.ts
index c22d61c11d..852f768f01 100644
--- a/wonder-commonlib/wonder-commonlib-tests.ts
+++ b/wonder-commonlib/wonder-commonlib-tests.ts
@@ -1,6 +1,6 @@
-import wdCb = require("wonder-commonlib");
+import {Collection} from "wonder-commonlib/dist/es2015/Collection";
 
-var list = wdCb.Collection.create();
+var list = Collection.create();
 
 list.addChild(1);
 
diff --git a/wonder-frp/index.d.ts b/wonder-frp/index.d.ts
index 00910bc80d..e68e019ead 100644
--- a/wonder-frp/index.d.ts
+++ b/wonder-frp/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for wonder-frp 0.1.1
+// Type definitions for wonder-frp 0.2.0
 // Project: https://github.com/yyc-git/Wonder-FRP
 // Definitions by: YYC <https://github.com/yyc-git>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,173 +6,119 @@
 /// <reference types="wonder-commonlib" />
 /// <reference types="node" />
 
-declare module wdFrp {
-    class JudgeUtils extends wdCb.JudgeUtils {
+// Generated by dts-bundle v0.7.2
+// Dependencies for this module:
+//   ../../wonder-commonlib/dist/es2015/utils/JudgeUtils
+//   ../../wonder-commonlib/dist/es2015/Collection
+
+declare module 'wonder-frp/dist/es2015' {
+    export { JudgeUtils } from "wonder-frp/dist/es2015/JudgeUtils";
+    export { fromNodeCallback, fromStream, fromReadableStream, fromWritableStream, fromTransformStream } from "wonder-frp/dist/es2015/binding/nodejs/NodeOperator";
+    export { Entity } from "wonder-frp/dist/es2015/core/Entity";
+    export { Main } from "wonder-frp/dist/es2015/core/Main";
+    export { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    export { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
+    export { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    export { assert, requireCheck, ensure, requireGetter, requireSetter, ensureGetter, ensureSetter, invariant } from "wonder-frp/dist/es2015/definition/typescript/decorator/contract";
+    export { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
+    export { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    export { InnerSubscription } from "wonder-frp/dist/es2015/Disposable/InnerSubscription";
+    export { InnerSubscriptionGroup } from "wonder-frp/dist/es2015/Disposable/InnerSubscriptionGroup";
+    export { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
+    export { FilterState } from "wonder-frp/dist/es2015/enum/FilterState";
+    export { createStream, fromArray, fromPromise, fromEventPattern, interval, intervalRequest, timeout, empty, callFunc, judge, defer, just } from "wonder-frp/dist/es2015/global/Operator";
+    export { root } from "wonder-frp/dist/es2015/global/Variable";
+    export { AnonymousObserver } from "wonder-frp/dist/es2015/observer/AnonymousObserver";
+    export { AutoDetachObserver } from "wonder-frp/dist/es2015/observer/AutoDetachObserver";
+    export { ConcatObserver } from "wonder-frp/dist/es2015/observer/ConcatObserver";
+    export { DoObserver } from "wonder-frp/dist/es2015/observer/DoObserver";
+    export { FilterObserver } from "wonder-frp/dist/es2015/observer/FilterObserver";
+    export { FilterWithStateObserver } from "wonder-frp/dist/es2015/observer/FilterWithStateObserver";
+    export { IgnoreElementsObserver } from "wonder-frp/dist/es2015/observer/IgnoreElementsObserver";
+    export { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    export { ISubjectObserver } from "wonder-frp/dist/es2015/observer/ISubjectObserver";
+    export { MapObserver } from "wonder-frp/dist/es2015/observer/MapObserver";
+    export { MergeAllObserver } from "wonder-frp/dist/es2015/observer/MergeAllObserver";
+    export { MergeObserver } from "wonder-frp/dist/es2015/observer/MergeObserver";
+    export { SkipUntilOtherObserver } from "wonder-frp/dist/es2015/observer/SkipUntilOtherObserver";
+    export { SkipUntilSourceObserver } from "wonder-frp/dist/es2015/observer/SkipUntilSourceObserver";
+    export { SubjectObserver } from "wonder-frp/dist/es2015/observer/SubjectObserver";
+    export { TakeUntilObserver } from "wonder-frp/dist/es2015/observer/TakeUntilObserver";
+    export { AnonymousStream } from "wonder-frp/dist/es2015/stream/AnonymousStream";
+    export { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    export { ConcatStream } from "wonder-frp/dist/es2015/stream/ConcatStream";
+    export { DeferStream } from "wonder-frp/dist/es2015/stream/DeferStream";
+    export { DoStream } from "wonder-frp/dist/es2015/stream/DoStream";
+    export { FilterStream } from "wonder-frp/dist/es2015/stream/FilterStream";
+    export { FilterWithStateStream } from "wonder-frp/dist/es2015/stream/FilterWithStateStream";
+    export { FromArrayStream } from "wonder-frp/dist/es2015/stream/FromArrayStream";
+    export { FromEventPatternStream } from "wonder-frp/dist/es2015/stream/FromEventPatternStream";
+    export { FromPromiseStream } from "wonder-frp/dist/es2015/stream/FromPromiseStream";
+    export { IgnoreElementsStream } from "wonder-frp/dist/es2015/stream/IgnoreElementsStream";
+    export { IntervalRequestStream } from "wonder-frp/dist/es2015/stream/IntervalRequestStream";
+    export { IntervalStream } from "wonder-frp/dist/es2015/stream/IntervalStream";
+    export { MapStream } from "wonder-frp/dist/es2015/stream/MapStream";
+    export { MergeAllStream } from "wonder-frp/dist/es2015/stream/MergeAllStream";
+    export { MergeStream } from "wonder-frp/dist/es2015/stream/MergeStream";
+    export { RepeatStream } from "wonder-frp/dist/es2015/stream/RepeatStream";
+    export { SkipUntilStream } from "wonder-frp/dist/es2015/stream/SkipUntilStream";
+    export { TakeUntilStream } from "wonder-frp/dist/es2015/stream/TakeUntilStream";
+    export { TimeoutStream } from "wonder-frp/dist/es2015/stream/TimeoutStream";
+    export { GeneratorSubject } from "wonder-frp/dist/es2015/subject/GeneratorSubject";
+    export { Subject } from "wonder-frp/dist/es2015/subject/Subject";
+    export { ActionType } from "wonder-frp/dist/es2015/testing/ActionType";
+    export { MockObserver } from "wonder-frp/dist/es2015/testing/MockObserver";
+    export { MockPromise } from "wonder-frp/dist/es2015/testing/MockPromise";
+    export { Record } from "wonder-frp/dist/es2015/testing/Record";
+    export { TestScheduler } from "wonder-frp/dist/es2015/testing/TestScheduler";
+    export { TestStream } from "wonder-frp/dist/es2015/testing/TestStream";
+    //import "./extend/root";
+    //import "./global/init";
+}
+
+declare module 'wonder-frp/dist/es2015/JudgeUtils' {
+    import { JudgeUtils as JudgeUtils$ } from "wonder-commonlib/dist/es2015/utils/JudgeUtils";
+    import { Entity } from "wonder-frp/dist/es2015/core/Entity";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    export class JudgeUtils extends JudgeUtils$ {
         static isPromise(obj: any): boolean;
         static isEqual(ob1: Entity, ob2: Entity): boolean;
         static isIObserver(i: IObserver): () => any;
     }
 }
 
-declare module wdFrp {
-    var fromNodeCallback: (func: Function, context?: any) => (...funcArgs: any[]) => AnonymousStream;
-    var fromStream: (stream: any, finishEventName?: string) => AnonymousStream;
-    var fromReadableStream: (stream: any) => AnonymousStream;
-    var fromWritableStream: (stream: any) => AnonymousStream;
-    var fromTransformStream: (stream: any) => AnonymousStream;
+declare module 'wonder-frp/dist/es2015/binding/nodejs/NodeOperator' {
+    import { AnonymousStream } from "wonder-frp/dist/es2015/stream/AnonymousStream";
+    export var fromNodeCallback: (func: Function, context?: any) => (...funcArgs: any[]) => AnonymousStream;
+    export var fromStream: (stream: any, finishEventName?: string) => AnonymousStream;
+    export var fromReadableStream: (stream: any) => AnonymousStream;
+    export var fromWritableStream: (stream: any) => AnonymousStream;
+    export var fromTransformStream: (stream: any) => AnonymousStream;
 }
 
-declare module wdFrp {
-    abstract class Entity {
+declare module 'wonder-frp/dist/es2015/core/Entity' {
+    export abstract class Entity {
         static UID: number;
-        private _uid;
         uid: string;
         constructor(uidPre: string);
     }
 }
 
-declare module wdFrp {
-    class Main {
+declare module 'wonder-frp/dist/es2015/core/Main' {
+    export class Main {
         static isTest: boolean;
     }
 }
 
-declare module wdFrp {
-    function assert(cond: boolean, message?: string): void;
-    function require(InFunc: any): (target: any, name: any, descriptor: any) => any;
-    function ensure(OutFunc: any): (target: any, name: any, descriptor: any) => any;
-    function requireGetter(InFunc: any): (target: any, name: any, descriptor: any) => any;
-    function requireSetter(InFunc: any): (target: any, name: any, descriptor: any) => any;
-    function ensureGetter(OutFunc: any): (target: any, name: any, descriptor: any) => any;
-    function ensureSetter(OutFunc: any): (target: any, name: any, descriptor: any) => any;
-    function invariant(func: any): (target: any) => void;
-}
-
-declare module wdFrp {
-    interface IDisposable {
-        dispose(): void;
-    }
-}
-
-declare module wdFrp {
-    class SingleDisposable extends Entity implements IDisposable {
-        static create(disposeHandler?: Function): SingleDisposable;
-        private _disposeHandler;
-        private _isDisposed;
-        constructor(disposeHandler: Function);
-        setDisposeHandler(handler: Function): void;
-        dispose(): void;
-    }
-}
-
-declare module wdFrp {
-    class GroupDisposable extends Entity implements IDisposable {
-        static create(disposable?: IDisposable): GroupDisposable;
-        private _group;
-        private _isDisposed;
-        constructor(disposable?: IDisposable);
-        add(disposable: IDisposable): this;
-        remove(disposable: IDisposable): this;
-        dispose(): void;
-    }
-}
-
-declare module wdFrp {
-    interface IObserver extends IDisposable {
-        next(value: any): any;
-        error(error: any): any;
-        completed(): any;
-    }
-}
-
-declare module wdFrp {
-    class InnerSubscription implements IDisposable {
-        static create(subject: Subject | GeneratorSubject, observer: Observer): InnerSubscription;
-        private _subject;
-        private _observer;
-        constructor(subject: Subject | GeneratorSubject, observer: Observer);
-        dispose(): void;
-    }
-}
-
-declare module wdFrp {
-    class InnerSubscriptionGroup implements IDisposable {
-        static create(): InnerSubscriptionGroup;
-        private _container;
-        addChild(child: IDisposable): void;
-        dispose(): void;
-    }
-}
-
-declare var global:NodeJS.Global,window:Window;
-declare module wdFrp {
-    var root: any;
-}
-
-declare module wdFrp {
-}
-
-declare module wdFrp {
-}
-
-declare module wdFrp {
-}
-
-declare module wdFrp {
-    abstract class Stream extends Entity {
-        scheduler: Scheduler;
-        subscribeFunc: (observer: IObserver) => Function | void;
-        constructor(subscribeFunc: any);
-        abstract subscribe(arg1: Function | Observer | Subject, onError?: Function, onCompleted?: Function): IDisposable;
-        buildStream(observer: IObserver): IDisposable;
-        do(onNext?: Function, onError?: Function, onCompleted?: Function): DoStream;
-        map(selector: Function): MapStream;
-        flatMap(selector: Function): MergeAllStream;
-        concatMap(selector: Function): any;
-        mergeAll(): MergeAllStream;
-        concatAll(): any;
-        skipUntil(otherStream: Stream): SkipUntilStream;
-        takeUntil(otherStream: Stream): TakeUntilStream;
-        take(count?: number): AnonymousStream;
-        takeLast(count?: number): AnonymousStream;
-        takeWhile(predicate: (value: any, index: number, source: Stream) => boolean, thisArg?: this): AnonymousStream;
-        lastOrDefault(defaultValue?: any): AnonymousStream;
-        filter(predicate: (value: any) => boolean, thisArg?: this): any;
-        filterWithState(predicate: (value: any) => boolean, thisArg?: this): any;
-        concat(streamArr: Array<Stream>): any;
-        concat(...otherStream: any[]): any;
-        merge(maxConcurrent: number): any;
-        merge(streamArr: Array<Stream>): any;
-        merge(...otherStreams: any[]): any;
-        repeat(count?: number): RepeatStream;
-        ignoreElements(): IgnoreElementsStream;
-        protected handleSubject(subject: any): boolean;
-        private _isSubject(subject);
-        private _setSubject(subject);
-    }
-}
-
-declare module wdFrp {
-    class Scheduler {
-        static create(...args: any[]): Scheduler;
-        private _requestLoopId;
-        requestLoopId: any;
-        publishRecursive(observer: IObserver, initial: any, action: Function): void;
-        publishInterval(observer: IObserver, initial: any, interval: number, action: Function): number;
-        publishIntervalRequest(observer: IObserver, action: Function): void;
-        publishTimeout(observer: IObserver, time: number, action: Function): number;
-    }
-}
-
-declare module wdFrp {
-    abstract class Observer extends Entity implements IObserver {
-        private _isDisposed;
+declare module 'wonder-frp/dist/es2015/core/Observer' {
+    import { Entity } from "wonder-frp/dist/es2015/core/Entity";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    export abstract class Observer extends Entity implements IObserver {
         isDisposed: boolean;
         protected onUserNext: Function;
         protected onUserError: Function;
         protected onUserCompleted: Function;
-        private _isStop;
-        private _disposable;
         constructor(observer: IObserver);
         constructor(onNext: Function, onError: Function, onCompleted: Function);
         next(value: any): any;
@@ -186,26 +132,627 @@ declare module wdFrp {
     }
 }
 
-declare module wdFrp {
-    class Subject implements IObserver {
-        static create(): Subject;
-        private _source;
-        source: Stream;
-        private _observer;
-        subscribe(arg1?: Function | Observer, onError?: Function, onCompleted?: Function): IDisposable;
-        next(value: any): void;
-        error(error: any): void;
-        completed(): void;
-        start(): void;
-        remove(observer: Observer): void;
+declare module 'wonder-frp/dist/es2015/core/Scheduler' {
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    export class Scheduler {
+        static create(...args: any[]): Scheduler;
+        requestLoopId: any;
+        publishRecursive(observer: IObserver, initial: any, action: Function): void;
+        publishInterval(observer: IObserver, initial: any, interval: number, action: Function): number;
+        publishIntervalRequest(observer: IObserver, action: Function): void;
+        publishTimeout(observer: IObserver, time: number, action: Function): number;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/core/Stream' {
+    import { Entity } from "wonder-frp/dist/es2015/core/Entity";
+    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { Subject } from "wonder-frp/dist/es2015/subject/Subject";
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    export abstract class Stream extends Entity {
+        scheduler: Scheduler;
+        subscribeFunc: (observer: IObserver) => Function | void;
+        constructor(subscribeFunc: any);
+        abstract subscribe(arg1: Function | Observer | Subject, onError?: Function, onCompleted?: Function): IDisposable;
+        buildStream(observer: IObserver): IDisposable;
+        do(onNext?: Function, onError?: Function, onCompleted?: Function): any;
+        map(selector: Function): any;
+        flatMap(selector: Function): any;
+        concatMap(selector: Function): any;
+        mergeAll(): any;
+        concatAll(): any;
+        skipUntil(otherStream: Stream): any;
+        takeUntil(otherStream: Stream): any;
+        take(count?: number): any;
+        takeLast(count?: number): any;
+        takeWhile(predicate: (value: any, index: number, source: Stream) => boolean, thisArg?: this): any;
+        lastOrDefault(defaultValue?: any): any;
+        filter(predicate: (value: any) => boolean, thisArg?: this): any;
+        filterWithState(predicate: (value: any) => boolean, thisArg?: this): any;
+        concat(streamArr: Array<Stream>): any;
+        concat(...otherStream: any[]): any;
+        merge(maxConcurrent: number): any;
+        merge(streamArr: Array<Stream>): any;
+        merge(...otherStreams: any[]): any;
+        repeat(count?: number): any;
+        ignoreElements(): any;
+        protected handleSubject(subject: any): boolean;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/definition/typescript/decorator/contract' {
+    export function assert(cond: boolean, message?: string): void;
+    export function requireCheck(InFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function ensure(OutFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function requireGetter(InFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function requireSetter(InFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function ensureGetter(OutFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function ensureSetter(OutFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function invariant(func: any): (target: any) => void;
+}
+
+declare module 'wonder-frp/dist/es2015/Disposable/GroupDisposable' {
+    import { Entity } from "wonder-frp/dist/es2015/core/Entity";
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    export class GroupDisposable extends Entity implements IDisposable {
+        static create(disposable?: IDisposable): GroupDisposable;
+        constructor(disposable?: IDisposable);
+        add(disposable: IDisposable): this;
+        remove(disposable: IDisposable): this;
         dispose(): void;
     }
 }
 
-declare module wdFrp {
-    class GeneratorSubject extends Entity implements IObserver {
+declare module 'wonder-frp/dist/es2015/Disposable/IDisposable' {
+    export interface IDisposable {
+        dispose(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/Disposable/InnerSubscription' {
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    import { Subject } from "wonder-frp/dist/es2015/subject/Subject";
+    import { GeneratorSubject } from "wonder-frp/dist/es2015/subject/GeneratorSubject";
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    export class InnerSubscription implements IDisposable {
+        static create(subject: Subject | GeneratorSubject, observer: Observer): InnerSubscription;
+        constructor(subject: Subject | GeneratorSubject, observer: Observer);
+        dispose(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/Disposable/InnerSubscriptionGroup' {
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    export class InnerSubscriptionGroup implements IDisposable {
+        static create(): InnerSubscriptionGroup;
+        addChild(child: IDisposable): void;
+        dispose(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/Disposable/SingleDisposable' {
+    import { Entity } from "wonder-frp/dist/es2015/core/Entity";
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    export class SingleDisposable extends Entity implements IDisposable {
+        static create(disposeHandler?: Function): SingleDisposable;
+        constructor(disposeHandler: Function);
+        setDisposeHandler(handler: Function): void;
+        dispose(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/enum/FilterState' {
+    export enum FilterState {
+        TRIGGER = 0,
+        ENTER = 1,
+        LEAVE = 2,
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/global/Operator' {
+    import { AnonymousStream } from "wonder-frp/dist/es2015/stream/AnonymousStream";
+    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
+    import { FromArrayStream } from "wonder-frp/dist/es2015/stream/FromArrayStream";
+    import { FromPromiseStream } from "wonder-frp/dist/es2015/stream/FromPromiseStream";
+    import { FromEventPatternStream } from "wonder-frp/dist/es2015/stream/FromEventPatternStream";
+    import { IntervalStream } from "wonder-frp/dist/es2015/stream/IntervalStream";
+    import { IntervalRequestStream } from "wonder-frp/dist/es2015/stream/IntervalRequestStream";
+    import { TimeoutStream } from "wonder-frp/dist/es2015/stream/TimeoutStream";
+    import { DeferStream } from "wonder-frp/dist/es2015/stream/DeferStream";
+    export class Operator {
+        static empty(): AnonymousStream;
+        static createStream(subscribeFunc: any): AnonymousStream;
+        static fromArray(array: Array<any>, scheduler?: Scheduler): FromArrayStream;
+    }
+    export var createStream: typeof Operator.createStream;
+    export var empty: typeof Operator.empty;
+    export var fromArray: typeof Operator.fromArray;
+    export var fromPromise: (promise: any, scheduler?: Scheduler) => FromPromiseStream;
+    export var fromEventPattern: (addHandler: Function, removeHandler: Function) => FromEventPatternStream;
+    export var interval: (interval: any, scheduler?: Scheduler) => IntervalStream;
+    export var intervalRequest: (scheduler?: Scheduler) => IntervalRequestStream;
+    export var timeout: (time: any, scheduler?: Scheduler) => TimeoutStream;
+    export var callFunc: (func: Function, context?: any) => AnonymousStream;
+    export var judge: (condition: Function, thenSource: Function, elseSource: Function) => any;
+    export var defer: (buildStreamFunc: Function) => DeferStream;
+    export var just: (returnValue: any) => AnonymousStream;
+}
+
+declare module 'wonder-frp/dist/es2015/global/Variable' {
+    export var root: any;
+}
+
+declare module 'wonder-frp/dist/es2015/observer/AnonymousObserver' {
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    export class AnonymousObserver extends Observer {
+        static create(onNext: Function, onError: Function, onCompleted: Function): AnonymousObserver;
+        protected onNext(value: any): void;
+        protected onError(error: any): void;
+        protected onCompleted(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/AutoDetachObserver' {
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    export class AutoDetachObserver extends Observer {
+        static create(observer: IObserver): any;
+        static create(onNext: Function, onError: Function, onCompleted: Function): any;
+        dispose(): void;
+        protected onNext(value: any): void;
+        protected onError(error: any): void;
+        protected onCompleted(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/ConcatObserver' {
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    export class ConcatObserver extends Observer {
+        static create(currentObserver: IObserver, startNextStream: Function): ConcatObserver;
+        protected currentObserver: any;
+        constructor(currentObserver: IObserver, startNextStream: Function);
+        protected onNext(value: any): void;
+        protected onError(error: any): void;
+        protected onCompleted(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/DoObserver' {
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    export class DoObserver extends Observer {
+        static create(currentObserver: IObserver, prevObserver: IObserver): DoObserver;
+        constructor(currentObserver: IObserver, prevObserver: IObserver);
+        protected onNext(value: any): void;
+        protected onError(error: any): void;
+        protected onCompleted(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/FilterObserver' {
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    export class FilterObserver extends Observer {
+        static create(prevObserver: IObserver, predicate: (value: any, index?: number, source?: Stream) => boolean, source: Stream): FilterObserver;
+        constructor(prevObserver: IObserver, predicate: (value: any) => boolean, source: Stream);
+        protected prevObserver: IObserver;
+        protected source: Stream;
+        protected i: number;
+        protected predicate: (value: any, index?: number, source?: Stream) => boolean;
+        protected onNext(value: any): void;
+        protected onError(error: any): void;
+        protected onCompleted(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/FilterWithStateObserver' {
+    import { FilterObserver } from "wonder-frp/dist/es2015/observer/FilterObserver";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    export class FilterWithStateObserver extends FilterObserver {
+        static create(prevObserver: IObserver, predicate: (value: any, index?: number, source?: Stream) => boolean, source: Stream): FilterWithStateObserver;
+        protected onNext(value: any): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/IgnoreElementsObserver' {
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    export class IgnoreElementsObserver extends Observer {
+        static create(currentObserver: IObserver): IgnoreElementsObserver;
+        constructor(currentObserver: IObserver);
+        protected onNext(value: any): void;
+        protected onError(error: any): void;
+        protected onCompleted(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/IObserver' {
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    export interface IObserver extends IDisposable {
+        next(value: any): any;
+        error(error: any): any;
+        completed(): any;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/ISubjectObserver' {
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    export interface ISubjectObserver {
+        addChild(observer: Observer): any;
+        removeChild(observer: Observer): any;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/MapObserver' {
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    export class MapObserver extends Observer {
+        static create(currentObserver: IObserver, selector: Function): MapObserver;
+        constructor(currentObserver: IObserver, selector: Function);
+        protected onNext(value: any): void;
+        protected onError(error: any): void;
+        protected onCompleted(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/MergeAllObserver' {
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
+    export class MergeAllObserver extends Observer {
+        static create(currentObserver: IObserver, streamGroup: Collection<Stream>, groupDisposable: GroupDisposable): MergeAllObserver;
+        constructor(currentObserver: IObserver, streamGroup: Collection<Stream>, groupDisposable: GroupDisposable);
+        done: boolean;
+        currentObserver: IObserver;
+        protected onNext(innerSource: any): void;
+        protected onError(error: any): void;
+        protected onCompleted(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/MergeObserver' {
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
+    export class MergeObserver extends Observer {
+        static create(currentObserver: IObserver, maxConcurrent: number, streamGroup: Collection<Stream>, groupDisposable: GroupDisposable): MergeObserver;
+        constructor(currentObserver: IObserver, maxConcurrent: number, streamGroup: Collection<Stream>, groupDisposable: GroupDisposable);
+        done: boolean;
+        currentObserver: IObserver;
+        activeCount: number;
+        q: Array<Stream>;
+        handleSubscribe(innerSource: any): void;
+        protected onNext(innerSource: any): void;
+        protected onError(error: any): void;
+        protected onCompleted(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/SkipUntilOtherObserver' {
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { SkipUntilStream } from "wonder-frp/dist/es2015/stream/SkipUntilStream";
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    export class SkipUntilOtherObserver extends Observer {
+        static create(prevObserver: IObserver, skipUntilStream: SkipUntilStream): SkipUntilOtherObserver;
+        otherDisposable: IDisposable;
+        constructor(prevObserver: IObserver, skipUntilStream: SkipUntilStream);
+        protected onNext(value: any): void;
+        protected onError(error: any): void;
+        protected onCompleted(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/SkipUntilSourceObserver' {
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { SkipUntilStream } from "wonder-frp/dist/es2015/stream/SkipUntilStream";
+    export class SkipUntilSourceObserver extends Observer {
+        static create(prevObserver: IObserver, skipUntilStream: SkipUntilStream): SkipUntilSourceObserver;
+        constructor(prevObserver: IObserver, skipUntilStream: SkipUntilStream);
+        protected onNext(value: any): void;
+        protected onError(error: any): void;
+        protected onCompleted(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/SubjectObserver' {
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    export class SubjectObserver implements IObserver {
+        observers: Collection<IObserver>;
+        isEmpty(): boolean;
+        next(value: any): void;
+        error(error: any): void;
+        completed(): void;
+        addChild(observer: Observer): void;
+        removeChild(observer: Observer): void;
+        dispose(): void;
+        setDisposable(disposable: IDisposable): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/observer/TakeUntilObserver' {
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    export class TakeUntilObserver extends Observer {
+        static create(prevObserver: IObserver): TakeUntilObserver;
+        constructor(prevObserver: IObserver);
+        protected onNext(value: any): void;
+        protected onError(error: any): void;
+        protected onCompleted(): void;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/AnonymousStream' {
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { Subject } from "wonder-frp/dist/es2015/subject/Subject";
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    export class AnonymousStream extends Stream {
+        static create(subscribeFunc: Function): AnonymousStream;
+        constructor(subscribeFunc: Function);
+        buildStream(observer: IObserver): IDisposable;
+        subscribe(subject: Subject): IDisposable;
+        subscribe(observer: IObserver): IDisposable;
+        subscribe(onNext: (value: any) => void): IDisposable;
+        subscribe(onNext: (value: any) => void, onError: (e: any) => void): IDisposable;
+        subscribe(onNext: (value: any) => void, onError: (e: any) => void, onComplete: () => void): IDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/BaseStream' {
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { Subject } from "wonder-frp/dist/es2015/subject/Subject";
+    export abstract class BaseStream extends Stream {
+        abstract subscribeCore(observer: IObserver): IDisposable;
+        subscribe(arg1: Function | Observer | Subject, onError?: any, onCompleted?: any): IDisposable;
+        buildStream(observer: IObserver): IDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/ConcatStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
+    export class ConcatStream extends BaseStream {
+        static create(sources: Array<Stream>): ConcatStream;
+        constructor(sources: Array<Stream>);
+        subscribeCore(observer: IObserver): GroupDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/DeferStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
+    export class DeferStream extends BaseStream {
+        static create(buildStreamFunc: Function): DeferStream;
+        constructor(buildStreamFunc: Function);
+        subscribeCore(observer: IObserver): GroupDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/DoStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    export class DoStream extends BaseStream {
+        static create(source: Stream, onNext?: Function, onError?: Function, onCompleted?: Function): DoStream;
+        constructor(source: Stream, onNext: Function, onError: Function, onCompleted: Function);
+        subscribeCore(observer: IObserver): IDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/FilterStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    export class FilterStream extends BaseStream {
+        static create(source: Stream, predicate: (value: any, index?: number, source?: Stream) => boolean, thisArg: any): FilterStream;
+        constructor(source: Stream, predicate: (value: any, index?: number, source?: Stream) => boolean, thisArg: any);
+        predicate: (value: any, index?: number, source?: Stream) => boolean;
+        subscribeCore(observer: IObserver): IDisposable;
+        internalFilter(predicate: (value: any, index?: number, source?: Stream) => boolean, thisArg: any): Stream;
+        protected createObserver(observer: IObserver): Observer;
+        protected createStreamForInternalFilter(source: Stream, innerPredicate: any, thisArg: any): Stream;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/FilterWithStateStream' {
+    import { FilterStream } from "wonder-frp/dist/es2015/stream/FilterStream";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { FilterWithStateObserver } from "wonder-frp/dist/es2015/observer/FilterWithStateObserver";
+    export class FilterWithStateStream extends FilterStream {
+        static create(source: Stream, predicate: (value: any, index?: number, source?: Stream) => boolean, thisArg: any): FilterWithStateStream;
+        protected createObserver(observer: IObserver): FilterWithStateObserver;
+        protected createStreamForInternalFilter(source: Stream, innerPredicate: any, thisArg: any): Stream;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/FromArrayStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
+    export class FromArrayStream extends BaseStream {
+        static create(array: Array<any>, scheduler: Scheduler): FromArrayStream;
+        constructor(array: Array<any>, scheduler: Scheduler);
+        subscribeCore(observer: IObserver): SingleDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/FromEventPatternStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
+    export class FromEventPatternStream extends BaseStream {
+        static create(addHandler: Function, removeHandler: Function): FromEventPatternStream;
+        constructor(addHandler: Function, removeHandler: Function);
+        subscribeCore(observer: IObserver): SingleDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/FromPromiseStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
+    export class FromPromiseStream extends BaseStream {
+        static create(promise: any, scheduler: Scheduler): FromPromiseStream;
+        constructor(promise: any, scheduler: Scheduler);
+        subscribeCore(observer: IObserver): SingleDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/IgnoreElementsStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    export class IgnoreElementsStream extends BaseStream {
+        static create(source: Stream): IgnoreElementsStream;
+        constructor(source: Stream);
+        subscribeCore(observer: IObserver): IDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/IntervalRequestStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
+    export class IntervalRequestStream extends BaseStream {
+        static create(scheduler: Scheduler): IntervalRequestStream;
+        constructor(scheduler: Scheduler);
+        subscribeCore(observer: IObserver): SingleDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/IntervalStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
+    export class IntervalStream extends BaseStream {
+        static create(interval: number, scheduler: Scheduler): IntervalStream;
+        constructor(interval: number, scheduler: Scheduler);
+        initWhenCreate(): void;
+        subscribeCore(observer: IObserver): SingleDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/MapStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    export class MapStream extends BaseStream {
+        static create(source: Stream, selector: Function): MapStream;
+        constructor(source: Stream, selector: Function);
+        subscribeCore(observer: IObserver): IDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/MergeAllStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
+    export class MergeAllStream extends BaseStream {
+        static create(source: Stream): MergeAllStream;
+        constructor(source: Stream);
+        subscribeCore(observer: IObserver): GroupDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/MergeStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
+    export class MergeStream extends BaseStream {
+        static create(source: Stream, maxConcurrent: number): MergeStream;
+        constructor(source: Stream, maxConcurrent: number);
+        subscribeCore(observer: IObserver): GroupDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/RepeatStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
+    export class RepeatStream extends BaseStream {
+        static create(source: Stream, count: number): RepeatStream;
+        constructor(source: Stream, count: number);
+        subscribeCore(observer: IObserver): GroupDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/SkipUntilStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
+    export class SkipUntilStream extends BaseStream {
+        static create(source: Stream, otherSteam: Stream): SkipUntilStream;
+        isOpen: boolean;
+        constructor(source: Stream, otherStream: Stream);
+        subscribeCore(observer: IObserver): GroupDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/TakeUntilStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { GroupDisposable } from "wonder-frp/dist/es2015/Disposable/GroupDisposable";
+    export class TakeUntilStream extends BaseStream {
+        static create(source: Stream, otherSteam: Stream): TakeUntilStream;
+        constructor(source: Stream, otherStream: Stream);
+        subscribeCore(observer: IObserver): GroupDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/stream/TimeoutStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
+    export class TimeoutStream extends BaseStream {
+        static create(time: number, scheduler: Scheduler): TimeoutStream;
+        constructor(time: number, scheduler: Scheduler);
+        subscribeCore(observer: IObserver): SingleDisposable;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/subject/GeneratorSubject' {
+    import { Entity } from "wonder-frp/dist/es2015/core/Entity";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    export class GeneratorSubject extends Entity implements IObserver {
         static create(): GeneratorSubject;
-        private _isStart;
         isStart: boolean;
         constructor();
         observer: any;
@@ -228,426 +775,39 @@ declare module wdFrp {
     }
 }
 
-declare module wdFrp {
-    class AnonymousObserver extends Observer {
-        static create(onNext: Function, onError: Function, onCompleted: Function): AnonymousObserver;
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module wdFrp {
-    class AutoDetachObserver extends Observer {
-        static create(observer: IObserver): any;
-        static create(onNext: Function, onError: Function, onCompleted: Function): any;
-        dispose(): void;
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module wdFrp {
-    class MapObserver extends Observer {
-        static create(currentObserver: IObserver, selector: Function): MapObserver;
-        private _currentObserver;
-        private _selector;
-        constructor(currentObserver: IObserver, selector: Function);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module wdFrp {
-    class DoObserver extends Observer {
-        static create(currentObserver: IObserver, prevObserver: IObserver): DoObserver;
-        private _currentObserver;
-        private _prevObserver;
-        constructor(currentObserver: IObserver, prevObserver: IObserver);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module wdFrp {
-    class MergeAllObserver extends Observer {
-        static create(currentObserver: IObserver, streamGroup: wdCb.Collection<Stream>, groupDisposable: GroupDisposable): MergeAllObserver;
-        constructor(currentObserver: IObserver, streamGroup: wdCb.Collection<Stream>, groupDisposable: GroupDisposable);
-        done: boolean;
-        currentObserver: IObserver;
-        private _streamGroup;
-        private _groupDisposable;
-        protected onNext(innerSource: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module wdFrp {
-    class MergeObserver extends Observer {
-        static create(currentObserver: IObserver, maxConcurrent: number, streamGroup: wdCb.Collection<Stream>, groupDisposable: GroupDisposable): MergeObserver;
-        constructor(currentObserver: IObserver, maxConcurrent: number, streamGroup: wdCb.Collection<Stream>, groupDisposable: GroupDisposable);
-        done: boolean;
-        currentObserver: IObserver;
-        activeCount: number;
-        q: Array<Stream>;
-        private _maxConcurrent;
-        private _groupDisposable;
-        private _streamGroup;
-        handleSubscribe(innerSource: any): void;
-        protected onNext(innerSource: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-        private _isReachMaxConcurrent();
-    }
-}
-
-declare module wdFrp {
-    class TakeUntilObserver extends Observer {
-        static create(prevObserver: IObserver): TakeUntilObserver;
-        private _prevObserver;
-        constructor(prevObserver: IObserver);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module wdFrp {
-    class SkipUntilSourceObserver extends Observer {
-        static create(prevObserver: IObserver, skipUntilStream: SkipUntilStream): SkipUntilSourceObserver;
-        private _prevObserver;
-        private _skipUntilStream;
-        constructor(prevObserver: IObserver, skipUntilStream: SkipUntilStream);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module wdFrp {
-    class SkipUntilOtherObserver extends Observer {
-        static create(prevObserver: IObserver, skipUntilStream: SkipUntilStream): SkipUntilOtherObserver;
-        otherDisposable: IDisposable;
-        private _prevObserver;
-        private _skipUntilStream;
-        constructor(prevObserver: IObserver, skipUntilStream: SkipUntilStream);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module wdFrp {
-    class ConcatObserver extends Observer {
-        static create(currentObserver: IObserver, startNextStream: Function): ConcatObserver;
-        protected currentObserver: any;
-        private _startNextStream;
-        constructor(currentObserver: IObserver, startNextStream: Function);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module wdFrp {
-    interface ISubjectObserver {
-        addChild(observer: Observer): any;
-        removeChild(observer: Observer): any;
-    }
-}
-
-declare module wdFrp {
-    class SubjectObserver implements IObserver {
-        observers: wdCb.Collection<IObserver>;
-        private _disposable;
-        isEmpty(): boolean;
+declare module 'wonder-frp/dist/es2015/subject/Subject' {
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { Stream } from "wonder-frp/dist/es2015/core/Stream";
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { IDisposable } from "wonder-frp/dist/es2015/Disposable/IDisposable";
+    export class Subject implements IObserver {
+        static create(): Subject;
+        source: Stream;
+        subscribe(arg1?: Function | Observer, onError?: Function, onCompleted?: Function): IDisposable;
         next(value: any): void;
         error(error: any): void;
         completed(): void;
-        addChild(observer: Observer): void;
-        removeChild(observer: Observer): void;
+        start(): void;
+        remove(observer: Observer): void;
         dispose(): void;
-        setDisposable(disposable: IDisposable): void;
     }
 }
 
-declare module wdFrp {
-    class IgnoreElementsObserver extends Observer {
-        static create(currentObserver: IObserver): IgnoreElementsObserver;
-        private _currentObserver;
-        constructor(currentObserver: IObserver);
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
+declare module 'wonder-frp/dist/es2015/testing/ActionType' {
+    export enum ActionType {
+        NEXT = 0,
+        ERROR = 1,
+        COMPLETED = 2,
     }
 }
 
-declare module wdFrp {
-    class FilterObserver extends Observer {
-        static create(prevObserver: IObserver, predicate: (value: any, index?: number, source?: Stream) => boolean, source: Stream): FilterObserver;
-        constructor(prevObserver: IObserver, predicate: (value: any) => boolean, source: Stream);
-        protected prevObserver: IObserver;
-        protected source: Stream;
-        protected i: number;
-        protected predicate: (value: any, index?: number, source?: Stream) => boolean;
-        protected onNext(value: any): void;
-        protected onError(error: any): void;
-        protected onCompleted(): void;
-    }
-}
-
-declare module wdFrp {
-    class FilterWithStateObserver extends FilterObserver {
-        static create(prevObserver: IObserver, predicate: (value: any, index?: number, source?: Stream) => boolean, source: Stream): FilterWithStateObserver;
-        private _isTrigger;
-        protected onNext(value: any): void;
-    }
-}
-
-declare module wdFrp {
-    abstract class BaseStream extends Stream {
-        abstract subscribeCore(observer: IObserver): IDisposable;
-        subscribe(arg1: Function | Observer | Subject, onError?: any, onCompleted?: any): IDisposable;
-        buildStream(observer: IObserver): IDisposable;
-    }
-}
-
-declare module wdFrp {
-    class DoStream extends BaseStream {
-        static create(source: Stream, onNext?: Function, onError?: Function, onCompleted?: Function): DoStream;
-        private _source;
-        private _observer;
-        constructor(source: Stream, onNext: Function, onError: Function, onCompleted: Function);
-        subscribeCore(observer: IObserver): IDisposable;
-    }
-}
-
-declare module wdFrp {
-    class MapStream extends BaseStream {
-        static create(source: Stream, selector: Function): MapStream;
-        private _source;
-        private _selector;
-        constructor(source: Stream, selector: Function);
-        subscribeCore(observer: IObserver): IDisposable;
-    }
-}
-
-declare module wdFrp {
-    class FromArrayStream extends BaseStream {
-        static create(array: Array<any>, scheduler: Scheduler): FromArrayStream;
-        private _array;
-        constructor(array: Array<any>, scheduler: Scheduler);
-        subscribeCore(observer: IObserver): SingleDisposable;
-    }
-}
-
-declare module wdFrp {
-    class FromPromiseStream extends BaseStream {
-        static create(promise: any, scheduler: Scheduler): FromPromiseStream;
-        private _promise;
-        constructor(promise: any, scheduler: Scheduler);
-        subscribeCore(observer: IObserver): SingleDisposable;
-    }
-}
-
-declare module wdFrp {
-    class FromEventPatternStream extends BaseStream {
-        static create(addHandler: Function, removeHandler: Function): FromEventPatternStream;
-        private _addHandler;
-        private _removeHandler;
-        constructor(addHandler: Function, removeHandler: Function);
-        subscribeCore(observer: IObserver): SingleDisposable;
-    }
-}
-
-declare module wdFrp {
-    class AnonymousStream extends Stream {
-        static create(subscribeFunc: Function): AnonymousStream;
-        constructor(subscribeFunc: Function);
-        subscribe(subject: Subject): IDisposable;
-        subscribe(observer: IObserver): IDisposable;
-        subscribe(onNext: (value: any) => void): IDisposable;
-        subscribe(onNext: (value: any) => void, onError: (e: any) => void): IDisposable;
-        subscribe(onNext: (value: any) => void, onError: (e: any) => void, onComplete: () => void): IDisposable;
-    }
-}
-
-declare module wdFrp {
-    class IntervalStream extends BaseStream {
-        static create(interval: number, scheduler: Scheduler): IntervalStream;
-        private _interval;
-        constructor(interval: number, scheduler: Scheduler);
-        initWhenCreate(): void;
-        subscribeCore(observer: IObserver): SingleDisposable;
-    }
-}
-
-declare module wdFrp {
-    class IntervalRequestStream extends BaseStream {
-        static create(scheduler: Scheduler): IntervalRequestStream;
-        private _isEnd;
-        constructor(scheduler: Scheduler);
-        subscribeCore(observer: IObserver): SingleDisposable;
-    }
-}
-
-declare module wdFrp {
-    class TimeoutStream extends BaseStream {
-        static create(time: number, scheduler: Scheduler): TimeoutStream;
-        private _time;
-        constructor(time: number, scheduler: Scheduler);
-        subscribeCore(observer: IObserver): SingleDisposable;
-    }
-}
-
-declare module wdFrp {
-    class MergeAllStream extends BaseStream {
-        static create(source: Stream): MergeAllStream;
-        constructor(source: Stream);
-        private _source;
-        private _observer;
-        subscribeCore(observer: IObserver): GroupDisposable;
-    }
-}
-
-declare module wdFrp {
-    class MergeStream extends BaseStream {
-        static create(source: Stream, maxConcurrent: number): MergeStream;
-        constructor(source: Stream, maxConcurrent: number);
-        private _source;
-        private _maxConcurrent;
-        subscribeCore(observer: IObserver): GroupDisposable;
-    }
-}
-
-declare module wdFrp {
-    class TakeUntilStream extends BaseStream {
-        static create(source: Stream, otherSteam: Stream): TakeUntilStream;
-        private _source;
-        private _otherStream;
-        constructor(source: Stream, otherStream: Stream);
-        subscribeCore(observer: IObserver): GroupDisposable;
-    }
-}
-
-declare module wdFrp {
-    class SkipUntilStream extends BaseStream {
-        static create(source: Stream, otherSteam: Stream): SkipUntilStream;
-        isOpen: boolean;
-        private _source;
-        private _otherStream;
-        constructor(source: Stream, otherStream: Stream);
-        subscribeCore(observer: IObserver): GroupDisposable;
-    }
-}
-
-declare module wdFrp {
-    class ConcatStream extends BaseStream {
-        static create(sources: Array<Stream>): ConcatStream;
-        private _sources;
-        constructor(sources: Array<Stream>);
-        subscribeCore(observer: IObserver): GroupDisposable;
-    }
-}
-
-declare module wdFrp {
-    class RepeatStream extends BaseStream {
-        static create(source: Stream, count: number): RepeatStream;
-        private _source;
-        private _count;
-        constructor(source: Stream, count: number);
-        subscribeCore(observer: IObserver): GroupDisposable;
-    }
-}
-
-declare module wdFrp {
-    class IgnoreElementsStream extends BaseStream {
-        static create(source: Stream): IgnoreElementsStream;
-        private _source;
-        constructor(source: Stream);
-        subscribeCore(observer: IObserver): IDisposable;
-    }
-}
-
-declare module wdFrp {
-    class DeferStream extends BaseStream {
-        static create(buildStreamFunc: Function): DeferStream;
-        private _buildStreamFunc;
-        constructor(buildStreamFunc: Function);
-        subscribeCore(observer: IObserver): GroupDisposable;
-    }
-}
-
-declare module wdFrp {
-    class FilterStream extends BaseStream {
-        static create(source: Stream, predicate: (value: any, index?: number, source?: Stream) => boolean, thisArg: any): FilterStream;
-        constructor(source: Stream, predicate: (value: any, index?: number, source?: Stream) => boolean, thisArg: any);
-        predicate: (value: any, index?: number, source?: Stream) => boolean;
-        private _source;
-        subscribeCore(observer: IObserver): IDisposable;
-        internalFilter(predicate: (value: any, index?: number, source?: Stream) => boolean, thisArg: any): Stream;
-        protected createObserver(observer: IObserver): Observer;
-        protected createStreamForInternalFilter(source: Stream, innerPredicate: any, thisArg: any): Stream;
-        private _innerPredicate(predicate, self);
-    }
-}
-
-declare module wdFrp {
-    class FilterWithStateStream extends FilterStream {
-        static create(source: Stream, predicate: (value: any, index?: number, source?: Stream) => boolean, thisArg: any): FilterWithStateStream;
-        protected createObserver(observer: IObserver): FilterWithStateObserver;
-        protected createStreamForInternalFilter(source: Stream, innerPredicate: any, thisArg: any): Stream;
-    }
-}
-
-declare module wdFrp {
-    var createStream: (subscribeFunc: any) => AnonymousStream;
-    var fromArray: (array: any[], scheduler?: Scheduler) => FromArrayStream;
-    var fromPromise: (promise: any, scheduler?: Scheduler) => FromPromiseStream;
-    var fromEventPattern: (addHandler: Function, removeHandler: Function) => FromEventPatternStream;
-    var interval: (interval: any, scheduler?: Scheduler) => IntervalStream;
-    var intervalRequest: (scheduler?: Scheduler) => IntervalRequestStream;
-    var timeout: (time: any, scheduler?: Scheduler) => TimeoutStream;
-    var empty: () => AnonymousStream;
-    var callFunc: (func: Function, context?: any) => AnonymousStream;
-    var judge: (condition: Function, thenSource: Function, elseSource: Function) => any;
-    var defer: (buildStreamFunc: Function) => DeferStream;
-    var just: (returnValue: any) => AnonymousStream;
-}
-
-declare module wdFrp {
-    enum FilterState {
-        TRIGGER = 0,
-        ENTER = 1,
-        LEAVE = 2,
-    }
-}
-
-declare module wdFrp {
-    class Record {
-        static create(time: number, value: any, actionType?: ActionType, comparer?: Function): Record;
-        private _time;
-        time: number;
-        private _value;
-        value: number;
-        private _actionType;
-        actionType: ActionType;
-        private _comparer;
-        constructor(time: any, value: any, actionType: ActionType, comparer: Function);
-        equals(other: any): any;
-    }
-}
-
-declare module wdFrp {
-    class MockObserver extends Observer {
+declare module 'wonder-frp/dist/es2015/testing/MockObserver' {
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { TestScheduler } from "wonder-frp/dist/es2015/testing/TestScheduler";
+    import { Record } from "wonder-frp/dist/es2015/testing/Record";
+    export class MockObserver extends Observer {
         static create(scheduler: TestScheduler): MockObserver;
-        private _messages;
         messages: [Record];
-        private _scheduler;
         constructor(scheduler: TestScheduler);
         protected onNext(value: any): void;
         protected onError(error: any): void;
@@ -657,39 +817,50 @@ declare module wdFrp {
     }
 }
 
-declare module wdFrp {
-    class MockPromise {
+declare module 'wonder-frp/dist/es2015/testing/MockPromise' {
+    import { TestScheduler } from "wonder-frp/dist/es2015/testing/TestScheduler";
+    import { Record } from "wonder-frp/dist/es2015/testing/Record";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    export class MockPromise {
         static create(scheduler: TestScheduler, messages: [Record]): MockPromise;
-        private _messages;
-        private _scheduler;
         constructor(scheduler: TestScheduler, messages: [Record]);
         then(successCb: Function, errorCb: Function, observer: IObserver): void;
     }
 }
 
-declare module wdFrp {
-    class TestScheduler extends Scheduler {
+declare module 'wonder-frp/dist/es2015/testing/Record' {
+    import { ActionType } from "wonder-frp/dist/es2015/testing/ActionType";
+    export class Record {
+        static create(time: number, value: any, actionType?: ActionType, comparer?: Function): Record;
+        time: number;
+        value: number;
+        actionType: ActionType;
+        constructor(time: any, value: any, actionType: ActionType, comparer: Function);
+        equals(other: any): any;
+    }
+}
+
+declare module 'wonder-frp/dist/es2015/testing/TestScheduler' {
+    import { Scheduler } from "wonder-frp/dist/es2015/core/Scheduler";
+    import { Record } from "wonder-frp/dist/es2015/testing/Record";
+    import { MockObserver } from "wonder-frp/dist/es2015/testing/MockObserver";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { Observer } from "wonder-frp/dist/es2015/core/Observer";
+    import { TestStream } from "wonder-frp/dist/es2015/testing/TestStream";
+    import { MockPromise } from "wonder-frp/dist/es2015/testing/MockPromise";
+    export class TestScheduler extends Scheduler {
         static next(tick: any, value: any): Record;
         static error(tick: any, error: any): Record;
         static completed(tick: any): Record;
         static create(isReset?: boolean): TestScheduler;
         constructor(isReset: boolean);
-        private _clock;
         clock: number;
-        private _isReset;
-        private _isDisposed;
-        private _timerMap;
-        private _streamMap;
-        private _subscribedTime;
-        private _disposedTime;
-        private _observer;
         setStreamMap(observer: IObserver, messages: [Record]): void;
         remove(observer: Observer): void;
         publishRecursive(observer: MockObserver, initial: any, recursiveFunc: Function): void;
         publishInterval(observer: IObserver, initial: any, interval: number, action: Function): number;
         publishIntervalRequest(observer: IObserver, action: Function): number;
         publishTimeout(observer: IObserver, time: number, action: Function): number;
-        private _setClock();
         startWithTime(create: Function, subscribedTime: number, disposedTime: number): MockObserver;
         startWithSubscribe(create: any, subscribedTime?: number): MockObserver;
         startWithDispose(create: any, disposedTime?: number): MockObserver;
@@ -699,33 +870,20 @@ declare module wdFrp {
         createObserver(): MockObserver;
         createResolvedPromise(time: number, value: any): MockPromise;
         createRejectPromise(time: number, error: any): MockPromise;
-        private _getMinAndMaxTime();
-        private _exec(time, map);
-        private _runStream(time);
-        private _runAt(time, callback);
-        private _tick(time);
     }
 }
 
-declare module wdFrp {
-    enum ActionType {
-        NEXT = 0,
-        ERROR = 1,
-        COMPLETED = 2,
-    }
-}
-
-declare module wdFrp {
-    class TestStream extends BaseStream {
+declare module 'wonder-frp/dist/es2015/testing/TestStream' {
+    import { BaseStream } from "wonder-frp/dist/es2015/stream/BaseStream";
+    import { Record } from "wonder-frp/dist/es2015/testing/Record";
+    import { TestScheduler } from "wonder-frp/dist/es2015/testing/TestScheduler";
+    import { IObserver } from "wonder-frp/dist/es2015/observer/IObserver";
+    import { SingleDisposable } from "wonder-frp/dist/es2015/Disposable/SingleDisposable";
+    export class TestStream extends BaseStream {
         static create(messages: [Record], scheduler: TestScheduler): TestStream;
         scheduler: TestScheduler;
-        private _messages;
         constructor(messages: [Record], scheduler: TestScheduler);
         subscribeCore(observer: IObserver): SingleDisposable;
     }
 }
 
-declare module "wonder-frp" {
-    export = wdFrp;
-}
-
diff --git a/wonder-frp/wonder-frp-tests.ts b/wonder-frp/wonder-frp-tests.ts
index 3efceed43f..ef7ea2672b 100644
--- a/wonder-frp/wonder-frp-tests.ts
+++ b/wonder-frp/wonder-frp-tests.ts
@@ -1,5 +1,5 @@
-import wdFrp = require("wonder-frp");
+import {fromArray} from "wonder-frp/dist/es2015/global/Operator";
 
-wdFrp.fromArray([1,2,3])
+fromArray([1,2,3])
     .subscribe(function(){
     });
diff --git a/wonder.js/index.d.ts b/wonder.js/index.d.ts
new file mode 100644
index 0000000000..839fc0fb8c
--- /dev/null
+++ b/wonder.js/index.d.ts
@@ -0,0 +1,2955 @@
+// Type definitions for wonder.js 0.1.0
+// Project: https://github.com/yyc-git/Wonder.js
+// Definitions by: YYC <https://github.com/yyc-git>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="wonder-commonlib" />
+/// <reference types="wonder-frp" />
+
+
+// Generated by dts-bundle v0.7.2
+// Dependencies for this module:
+//   ../../wonder-commonlib/dist/es2015/Hash
+//   ../../wonder-commonlib/dist/es2015/Collection
+//   ../../wonder-frp/dist/es2015/stream/FromEventPatternStream
+//   ../../wonder-commonlib/dist/es2015/utils/ArrayUtils
+//   ../../wonder-commonlib/dist/es2015/utils/JudgeUtils
+//   ../../wonder-commonlib/dist/es2015/Log
+
+declare module 'wonder.js/dist/es2015' {
+    export { Camera } from "wonder.js/dist/es2015/component/camera/Camera";
+    export { BasicCameraController } from "wonder.js/dist/es2015/component/camera/controller/basic/BasicCameraController";
+    export { CameraController } from "wonder.js/dist/es2015/component/camera/controller/CameraController";
+    export { PerspectiveCamera } from "wonder.js/dist/es2015/component/camera/PerspectiveCamera";
+    export { ComponentInitOrderTable } from "wonder.js/dist/es2015/component/data/ComponentInitOrderTable";
+    export { BoxGeometry } from "wonder.js/dist/es2015/component/geometry/BoxGeometry";
+    export { BasicBufferContainer } from "wonder.js/dist/es2015/component/geometry/data/BasicBufferContainer";
+    export { BasicGeometryData } from "wonder.js/dist/es2015/component/geometry/data/BasicGeometryData";
+    export { BufferContainer } from "wonder.js/dist/es2015/component/geometry/data/BufferContainer";
+    export { CommonBufferContainer } from "wonder.js/dist/es2015/component/geometry/data/CommonBufferContainer";
+    export { GeometryData } from "wonder.js/dist/es2015/component/geometry/data/GeometryData";
+    export { Geometry } from "wonder.js/dist/es2015/component/geometry/Geometry";
+    export { GeometryUtils } from "wonder.js/dist/es2015/component/geometry/GeometryUtils";
+    export { MeshRenderer } from "wonder.js/dist/es2015/component/renderer/MeshRenderer";
+    export { RendererComponent } from "wonder.js/dist/es2015/component/renderer/RendererComponent";
+    export { ETransformState } from "wonder.js/dist/es2015/component/transform/ETransformState";
+    export { ThreeDTransform } from "wonder.js/dist/es2015/component/transform/ThreeDTransform";
+    export { Transform } from "wonder.js/dist/es2015/component/transform/Transform";
+    export { DebugConfig } from "wonder.js/dist/es2015/config/DebugConfig";
+    export { Component } from "wonder.js/dist/es2015/core/Component";
+    export { Director } from "wonder.js/dist/es2015/core/Director";
+    export { Entity } from "wonder.js/dist/es2015/core/Entity";
+    export { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    export { GameObject } from "wonder.js/dist/es2015/core/entityObject/gameObject/GameObject";
+    export { ComponentManager } from "wonder.js/dist/es2015/core/entityObject/manager/ComponentManager";
+    export { EntityObjectManager } from "wonder.js/dist/es2015/core/entityObject/manager/EntityObjectManager";
+    export { BufferTable, BufferTableKey } from "wonder.js/dist/es2015/core/entityObject/scene/cache/BufferTable";
+    export { ProgramTable } from "wonder.js/dist/es2015/core/entityObject/scene/cache/ProgramTable";
+    export { GameObjectScene } from "wonder.js/dist/es2015/core/entityObject/scene/gameObjectScene/GameObjectScene";
+    export { Scene } from "wonder.js/dist/es2015/core/entityObject/scene/Scene";
+    export { SceneDispatcher } from "wonder.js/dist/es2015/core/entityObject/scene/SceneDispatcher";
+    export { Main } from "wonder.js/dist/es2015/core/Main";
+    export { MainData } from "wonder.js/dist/es2015/core/data/MainData";
+    export { cacheGetter, cache, cacheBufferForBufferContainer, cacheBufferForBufferContainerWithFuncParam } from "wonder.js/dist/es2015/definition/typescript/decorator/cache";
+    export { cloneAttributeAsBasicType, cloneAttributeAsCloneable, cloneAttributeAsCustomType, CloneUtils, CloneType } from "wonder.js/dist/es2015/definition/typescript/decorator/clone";
+    export { assert, describe, it, requireCheck, ensure, requireGetterAndSetter, requireGetter, requireSetter, ensureGetterAndSetter, ensureGetter, ensureSetter, invariant } from "wonder.js/dist/es2015/definition/typescript/decorator/contract";
+    export { execOnlyOnce } from "wonder.js/dist/es2015/definition/typescript/decorator/control";
+    export { registerClass } from "wonder.js/dist/es2015/definition/typescript/decorator/registerClass";
+    export { singleton } from "wonder.js/dist/es2015/definition/typescript/decorator/singleton";
+    export { virtual } from "wonder.js/dist/es2015/definition/typescript/decorator/virtual";
+    export { root } from "wonder.js/dist/es2015/definition/Variable";
+    export { DeviceManager, EDepthFunction, ESide, EPolygonOffsetMode, EBlendFunc, EBlendEquation, EBlendType, ECanvasType } from "wonder.js/dist/es2015/device/DeviceManager";
+    export { EScreenSize } from "wonder.js/dist/es2015/device/EScreenSize";
+    export { GPUDetector, EGPUPrecision } from "wonder.js/dist/es2015/device/GPUDetector";
+    export { CustomEventBinder } from "wonder.js/dist/es2015/event/binder/CustomEventBinder";
+    export { CustomEventRegister } from "wonder.js/dist/es2015/event/binder/CustomEventRegister";
+    export { DomEventBinder } from "wonder.js/dist/es2015/event/binder/DomEventBinder";
+    export { DomEventRegister } from "wonder.js/dist/es2015/event/binder/DomEventRegister";
+    export { EventBinder } from "wonder.js/dist/es2015/event/binder/EventBinder";
+    export { EventRegister } from "wonder.js/dist/es2015/event/binder/EventRegister";
+    export { CustomEventDispatcher } from "wonder.js/dist/es2015/event/dispatcher/CustomEventDispatcher";
+    export { DomEventDispatcher } from "wonder.js/dist/es2015/event/dispatcher/DomEventDispatcher";
+    export { EventDispatcher } from "wonder.js/dist/es2015/event/dispatcher/EventDispatcher";
+    export { EEngineEvent } from "wonder.js/dist/es2015/event/EEngineEvent";
+    export { EventManager } from "wonder.js/dist/es2015/event/EventManager";
+    export { EventBinderFactory } from "wonder.js/dist/es2015/event/factory/EventBinderFactory";
+    export { EventDispatcherFactory } from "wonder.js/dist/es2015/event/factory/EventDispatcherFactory";
+    export { EventHandlerFactory } from "wonder.js/dist/es2015/event/factory/EventHandlerFactory";
+    export { CustomEventHandler } from "wonder.js/dist/es2015/event/handler/CustomEventHandler";
+    export { DomEventHandler } from "wonder.js/dist/es2015/event/handler/DomEventHandler";
+    export { EventHandler } from "wonder.js/dist/es2015/event/handler/EventHandler";
+    export { KeyboardEventHandler } from "wonder.js/dist/es2015/event/handler/KeyboardEventHandler";
+    export { MouseEventHandler } from "wonder.js/dist/es2015/event/handler/MouseEventHandler";
+    export { PointEventHandler } from "wonder.js/dist/es2015/event/handler/PointEventHandler";
+    export { TouchEventHandler } from "wonder.js/dist/es2015/event/handler/TouchEventHandler";
+    export { CustomEvent } from "wonder.js/dist/es2015/event/object/CustomEvent";
+    export { DomEvent } from "wonder.js/dist/es2015/event/object/DomEvent";
+    export { EEventPhase } from "wonder.js/dist/es2015/event/object/EEventPhase";
+    export { EEventType } from "wonder.js/dist/es2015/event/object/EEventType";
+    export { EMouseButton } from "wonder.js/dist/es2015/event/object/EMouseButton";
+    export { Event } from "wonder.js/dist/es2015/event/object/Event";
+    export { EEventName, EventNameHandler } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    export { EventTable } from "wonder.js/dist/es2015/event/object/EventTable";
+    export { KeyboardEvent } from "wonder.js/dist/es2015/event/object/KeyboardEvent";
+    export { MouseEvent } from "wonder.js/dist/es2015/event/object/MouseEvent";
+    export { MousePointEvent } from "wonder.js/dist/es2015/event/object/MousePointEvent";
+    export { PointEvent } from "wonder.js/dist/es2015/event/object/PointEvent";
+    export { TouchEvent } from "wonder.js/dist/es2015/event/object/TouchEvent";
+    export { TouchPointEvent } from "wonder.js/dist/es2015/event/object/TouchPointEvent";
+    export { CustomEventListenerMap } from "wonder.js/dist/es2015/event/structure/CustomEventListenerMap";
+    export { DomEventListenerMap } from "wonder.js/dist/es2015/event/structure/DomEventListenerMap";
+    export { EventListenerMap } from "wonder.js/dist/es2015/event/structure/EventListenerMap";
+    export { EventUtils } from "wonder.js/dist/es2015/event/utils/EventUtils";
+    export { BasicMaterial } from "wonder.js/dist/es2015/material/BasicMaterial";
+    export { EngineMaterial } from "wonder.js/dist/es2015/material/EngineMaterial";
+    export { Material } from "wonder.js/dist/es2015/material/Material";
+    export { ShaderManager } from "wonder.js/dist/es2015/material/ShaderManager";
+    export { StandardBasicMaterial } from "wonder.js/dist/es2015/material/StandardBasicMaterial";
+    export { DEG_TO_RAD, RAD_TO_DEG } from "wonder.js/dist/es2015/math/Global";
+    export { Matrix3 } from "wonder.js/dist/es2015/math/Matrix3";
+    export { Matrix4 } from "wonder.js/dist/es2015/math/Matrix4";
+    export { Quaternion } from "wonder.js/dist/es2015/math/Quaternion";
+    export { Vector2 } from "wonder.js/dist/es2015/math/Vector2";
+    export { Vector3 } from "wonder.js/dist/es2015/math/Vector3";
+    export { Vector4 } from "wonder.js/dist/es2015/math/Vector4";
+    export { ArrayBuffer } from "wonder.js/dist/es2015/renderer/buffer/ArrayBuffer";
+    export { Buffer } from "wonder.js/dist/es2015/renderer/buffer/Buffer";
+    export { BufferDataTable } from "wonder.js/dist/es2015/renderer/buffer/BufferDataTable";
+    export { CommonBuffer } from "wonder.js/dist/es2015/renderer/buffer/CommonBuffer";
+    export { EBufferDataType } from "wonder.js/dist/es2015/renderer/buffer/EBufferDataType";
+    export { EBufferType } from "wonder.js/dist/es2015/renderer/buffer/EBufferType";
+    export { EBufferUsage } from "wonder.js/dist/es2015/renderer/buffer/EBufferUsage";
+    export { ElementBuffer } from "wonder.js/dist/es2015/renderer/buffer/ElementBuffer";
+    export { QuadCommand } from "wonder.js/dist/es2015/renderer/command/QuadCommand";
+    export { RenderCommand } from "wonder.js/dist/es2015/renderer/command/RenderCommand";
+    export { SingleDrawCommand } from "wonder.js/dist/es2015/renderer/command/SingleDrawCommand";
+    export { EDrawMode } from "wonder.js/dist/es2015/renderer/EDrawMode";
+    export { GlUtils } from "wonder.js/dist/es2015/renderer/GlUtils";
+    export { GLSLDataSender } from "wonder.js/dist/es2015/renderer/program/GLSLDataSender";
+    export { Program } from "wonder.js/dist/es2015/renderer/program/Program";
+    export { Renderer } from "wonder.js/dist/es2015/renderer/renderer/Renderer";
+    export { WebGLRenderer } from "wonder.js/dist/es2015/renderer/renderer/WebGLRenderer";
+    export { BasicMaterialColorShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/basic/BasicMaterialColorShaderLib";
+    export { BasicShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/basic/BasicShaderLib";
+    export { EndBasicShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/basic/EndBasicShaderLib";
+    export { CommonShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/common/CommonShaderLib";
+    export { EndShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/common/EndShaderLib";
+    export { VerticeCommonShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/common/VerticeCommonShaderLib";
+    export { EngineShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/EngineShaderLib";
+    export { ShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/ShaderLib";
+    export { CommonShader } from "wonder.js/dist/es2015/renderer/shader/shader/CommonShader";
+    export { EngineShader } from "wonder.js/dist/es2015/renderer/shader/shader/EngineShader";
+    export { Shader } from "wonder.js/dist/es2015/renderer/shader/shader/Shader";
+    export { EngineShaderSourceBuilder } from "wonder.js/dist/es2015/renderer/shader/sourceBuilder/EngineShaderSourceBuilder";
+    export { ShaderSourceBuilder } from "wonder.js/dist/es2015/renderer/shader/sourceBuilder/ShaderSourceBuilder";
+    export { EVariableCategory } from "wonder.js/dist/es2015/renderer/shader/variable/EVariableCategory";
+    export { EVariableSemantic } from "wonder.js/dist/es2015/renderer/shader/variable/EVariableSemantic";
+    export { EVariableType } from "wonder.js/dist/es2015/renderer/shader/variable/EVariableType";
+    export { VariableLib } from "wonder.js/dist/es2015/renderer/shader/variable/VariableLib";
+    export { VariableNameTable } from "wonder.js/dist/es2015/renderer/shader/variable/VariableNameTable";
+    export { VariableTypeTable } from "wonder.js/dist/es2015/renderer/shader/variable/VariableTypeTable";
+    export { BasicState } from "wonder.js/dist/es2015/renderer/state/BasicState";
+    export { WebGLState } from "wonder.js/dist/es2015/renderer/state/WebGLState";
+    export { Color } from "wonder.js/dist/es2015/structure/Color";
+    export { Face3 } from "wonder.js/dist/es2015/structure/Face3";
+    export { Point } from "wonder.js/dist/es2015/structure/Point";
+    export { RectRegion } from "wonder.js/dist/es2015/structure/RectRegion";
+    export { ViewWebGL } from "wonder.js/dist/es2015/structure/View";
+    export { ArrayUtils } from "wonder.js/dist/es2015/utils/ArrayUtils";
+    export { BufferUtils } from "wonder.js/dist/es2015/utils/BufferUtils";
+    export { ClassUtils } from "wonder.js/dist/es2015/utils/ClassUtils";
+    export { JudgeUtils } from "wonder.js/dist/es2015/utils/JudgeUtils";
+    export { Log } from "wonder.js/dist/es2015/utils/Log";
+    export { MathUtils } from "wonder.js/dist/es2015/utils/MathUtils";
+    export { RenderUtils } from "wonder.js/dist/es2015/utils/RenderUtils";
+    export { ShaderLibUtils } from "wonder.js/dist/es2015/utils/ShaderLibUtils";
+    export { SortUtils } from "wonder.js/dist/es2015/utils/SortUtils";
+    export { CommonTimeController } from "wonder.js/dist/es2015/utils/time/CommonTimeController";
+    export { DirectorTimeController } from "wonder.js/dist/es2015/utils/time/DirectorTimeController";
+    export { TimeController } from "wonder.js/dist/es2015/utils/time/TimeController";
+    export { CompileConfig } from "wonder.js/dist/es2015/config/CompileConfig";
+}
+
+declare module 'wonder.js/dist/es2015/component/camera/Camera' {
+    import { Matrix4 } from "wonder.js/dist/es2015/math/Matrix4";
+    import { GameObject } from "wonder.js/dist/es2015/core/entityObject/gameObject/GameObject";
+    export abstract class Camera {
+        readonly cameraToWorldMatrix: Matrix4;
+        worldToCameraMatrix: Matrix4;
+        near: number;
+        far: number;
+        pMatrix: Matrix4;
+        entityObject: GameObject;
+        protected pMatrixDirty: boolean;
+        init(): void;
+        dispose(): void;
+        clone(): this;
+        update(elapsed: number): void;
+        protected abstract updateProjectionMatrix(): any;
+        protected getInvViewProjMat(): Matrix4;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/camera/controller/basic/BasicCameraController' {
+    import { CameraController } from "wonder.js/dist/es2015/component/camera/controller/CameraController";
+    import { Camera } from "wonder.js/dist/es2015/component/camera/Camera";
+    export class BasicCameraController extends CameraController {
+        static create(cameraComponent: Camera): BasicCameraController;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/camera/controller/CameraController' {
+    import "wonder-frp/dist/es2015/stream/MergeAllStream";
+    import { Component } from "wonder.js/dist/es2015/core/Component";
+    import { Camera } from "wonder.js/dist/es2015/component/camera/Camera";
+    import { Matrix4 } from "wonder.js/dist/es2015/math/Matrix4";
+    import { GameObject } from "wonder.js/dist/es2015/core/entityObject/gameObject/GameObject";
+    export abstract class CameraController extends Component {
+        constructor(cameraComponent: Camera);
+        readonly cameraToWorldMatrix: Matrix4;
+        readonly worldToCameraMatrix: Matrix4;
+        pMatrix: Matrix4;
+        entityObject: GameObject;
+        camera: Camera;
+        init(): void;
+        update(elapsed: number): void;
+        dispose(): void;
+        clone(): this;
+        protected bindClearCacheEvent(): void;
+        protected disposeClearCacheEvent(): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/camera/PerspectiveCamera' {
+    import { Camera } from "wonder.js/dist/es2015/component/camera/Camera";
+    export class PerspectiveCamera extends Camera {
+        static create(): PerspectiveCamera;
+        fovy: number;
+        aspect: number;
+        zoomIn(speed: number, min?: number): void;
+        zoomOut(speed: number, max?: number): void;
+        protected updateProjectionMatrix(): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/data/ComponentInitOrderTable' {
+    import { Component } from "wonder.js/dist/es2015/core/Component";
+    export class ComponentInitOrderTable {
+        static getOrder(component: Component): 4 | 5;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/geometry/BoxGeometry' {
+    import { Geometry } from "wonder.js/dist/es2015/component/geometry/Geometry";
+    import { Face3 } from "wonder.js/dist/es2015/structure/Face3";
+    export class BoxGeometry extends Geometry {
+        static create(): BoxGeometry;
+        width: number;
+        height: number;
+        depth: number;
+        widthSegments: number;
+        heightSegments: number;
+        depthSegments: number;
+        computeData(): {
+            vertices: any[];
+            faces: Face3[];
+        };
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/geometry/data/BasicBufferContainer' {
+    import { CommonBufferContainer } from "wonder.js/dist/es2015/component/geometry/data/CommonBufferContainer";
+    import { GameObject } from "wonder.js/dist/es2015/core/entityObject/gameObject/GameObject";
+    export class BasicBufferContainer extends CommonBufferContainer {
+        static create(entityObject: GameObject): BasicBufferContainer;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/geometry/data/BasicGeometryData' {
+    import { GeometryData } from "wonder.js/dist/es2015/component/geometry/data/GeometryData";
+    import { Geometry } from "wonder.js/dist/es2015/component/geometry/Geometry";
+    export class BasicGeometryData extends GeometryData {
+        static create(geometry: Geometry): BasicGeometryData;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/geometry/data/BufferContainer' {
+    import { GameObject } from "wonder.js/dist/es2015/core/entityObject/gameObject/GameObject";
+    import { GeometryData } from "wonder.js/dist/es2015/component/geometry/data/GeometryData";
+    import { Hash } from "wonder-commonlib/dist/es2015/Hash";
+    import { Buffer } from "wonder.js/dist/es2015/renderer/buffer/Buffer";
+    import { EBufferDataType } from "wonder.js/dist/es2015/renderer/buffer/EBufferDataType";
+    import { EBufferType } from "wonder.js/dist/es2015/renderer/buffer/EBufferType";
+    import { EBufferUsage } from "wonder.js/dist/es2015/renderer/buffer/EBufferUsage";
+    export abstract class BufferContainer {
+        constructor(entityObject: GameObject);
+        geometryData: GeometryData;
+        protected entityObject: GameObject;
+        protected container: Hash<Buffer>;
+        createBuffersFromGeometryData(): void;
+        removeCache(type: EBufferDataType): any;
+        removeCache(name: string): any;
+        getChild(type: EBufferDataType): any;
+        getChild(type: EBufferDataType, dataName: string): any;
+        init(): void;
+        dispose(): void;
+        protected abstract getVertice(type: EBufferDataType): any;
+        protected createOnlyOnceAndUpdateArrayBuffer(bufferAttriName: string, data: Array<number>, size: number, type?: EBufferType, offset?: number, usage?: EBufferUsage): void;
+        protected createOnlyOnceAndUpdateElememntBuffer(bufferAttriName: string, data: Array<number>, type?: EBufferType, offset?: number, usage?: EBufferUsage): void;
+        protected hasData(data: Array<number> | null): boolean;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/geometry/data/CommonBufferContainer' {
+    import { BufferContainer } from "wonder.js/dist/es2015/component/geometry/data/BufferContainer";
+    import { BasicGeometryData } from "wonder.js/dist/es2015/component/geometry/data/BasicGeometryData";
+    import { ArrayBuffer } from "wonder.js/dist/es2015/renderer/buffer/ArrayBuffer";
+    import { EBufferDataType } from "wonder.js/dist/es2015/renderer/buffer/EBufferDataType";
+    export abstract class CommonBufferContainer extends BufferContainer {
+        geometryData: BasicGeometryData;
+        protected getVertice(type: EBufferDataType): ArrayBuffer;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/geometry/data/GeometryData' {
+    import { Geometry } from "wonder.js/dist/es2015/component/geometry/Geometry";
+    import { Face3 } from "wonder.js/dist/es2015/structure/Face3";
+    export abstract class GeometryData {
+        constructor(geometry: Geometry);
+        vertices: Array<number>;
+        readonly indices: Array<number>;
+        faces: Array<Face3>;
+        protected geometry: Geometry;
+        dispose(): void;
+        protected onChangeFace(): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/geometry/Geometry' {
+    import { Component } from "wonder.js/dist/es2015/core/Component";
+    import { Material } from "wonder.js/dist/es2015/material/Material";
+    import { GameObject } from "wonder.js/dist/es2015/core/entityObject/gameObject/GameObject";
+    import { BufferContainer } from "wonder.js/dist/es2015/component/geometry/data/BufferContainer";
+    import { EDrawMode } from "wonder.js/dist/es2015/renderer/EDrawMode";
+    import { GeometryData } from "wonder.js/dist/es2015/component/geometry/data/GeometryData";
+    import { BasicGeometryData } from "wonder.js/dist/es2015/component/geometry/data/BasicGeometryData";
+    import { Face3 } from "wonder.js/dist/es2015/structure/Face3";
+    export abstract class Geometry extends Component {
+        material: Material;
+        readonly geometryData: GeometryData;
+        entityObject: GameObject;
+        buffers: BufferContainer;
+        drawMode: EDrawMode;
+        abstract computeData(): GeometryDataType;
+        init(): void;
+        dispose(): void;
+        createBuffersFromGeometryData(): void;
+        protected createBufferContainer(): BufferContainer;
+        protected createGeometryData(computedData: GeometryDataType): GeometryData;
+        protected createBasicGeometryData(computedData: GeometryDataType): BasicGeometryData;
+    }
+    export type GeometryDataType = {
+        vertices: Array<number>;
+        faces?: Array<Face3>;
+    };
+}
+
+declare module 'wonder.js/dist/es2015/component/geometry/GeometryUtils' {
+    import { Face3 } from "wonder.js/dist/es2015/structure/Face3";
+    import { Vector3 } from "wonder.js/dist/es2015/math/Vector3";
+    export class GeometryUtils {
+        static convertToFaces(indices: Array<number>, normals?: Array<number>): Array<Face3>;
+        static hasData(data: any): boolean;
+        static getThreeComponent(sourceData: Array<number>, index: number): Vector3;
+        static iterateThreeComponent(dataArr: Array<number>, iterator: (v: Vector3) => void): void;
+        static setThreeComponent(targetData: Array<number>, sourceData: Vector3, index: number): any;
+        static setThreeComponent(targetData: Array<number>, sourceData: Array<number>, index: number): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/renderer/MeshRenderer' {
+    import { RendererComponent } from "wonder.js/dist/es2015/component/renderer/RendererComponent";
+    import { GameObject } from "wonder.js/dist/es2015/core/entityObject/gameObject/GameObject";
+    import { Renderer } from "wonder.js/dist/es2015/renderer/renderer/Renderer";
+    import { Geometry } from "wonder.js/dist/es2015/component/geometry/Geometry";
+    import { QuadCommand } from "wonder.js/dist/es2015/renderer/command/QuadCommand";
+    export class MeshRenderer extends RendererComponent {
+        static create(): MeshRenderer;
+        entityObject: GameObject;
+        render(renderer: Renderer, target: GameObject, camera: GameObject): void;
+        protected createDrawCommand(target: GameObject, geometry: Geometry, camera: GameObject): QuadCommand;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/renderer/RendererComponent' {
+    import { Component } from "wonder.js/dist/es2015/core/Component";
+    import { Renderer } from "wonder.js/dist/es2015/renderer/renderer/Renderer";
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    import { GameObject } from "wonder.js/dist/es2015/core/entityObject/gameObject/GameObject";
+    export abstract class RendererComponent extends Component {
+        abstract render(renderer: Renderer, target: EntityObject, camera: GameObject): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/transform/ETransformState' {
+    export enum ETransformState {
+        ISTRANSLATE,
+        ISROTATE,
+        ISSCALE,
+        ISLOCALTRANSLATE,
+        ISLOCALROTATE,
+        ISLOCALSCALE,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/transform/ThreeDTransform' {
+    import { Transform } from "wonder.js/dist/es2015/component/transform/Transform";
+    import { Matrix4 } from "wonder.js/dist/es2015/math/Matrix4";
+    import { Vector3 } from "wonder.js/dist/es2015/math/Vector3";
+    import { Quaternion } from "wonder.js/dist/es2015/math/Quaternion";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { Matrix3 } from "wonder.js/dist/es2015/math/Matrix3";
+    import { ETransformState } from "wonder.js/dist/es2015/component/transform/ETransformState";
+    export class ThreeDTransform extends Transform {
+        static create(): ThreeDTransform;
+        localToWorldMatrix: Matrix4;
+        readonly normalMatrix: Matrix3;
+        position: Vector3;
+        rotation: Quaternion;
+        scale: Vector3;
+        eulerAngles: Vector3;
+        localPosition: Vector3;
+        localRotation: Quaternion;
+        localEulerAngles: Vector3;
+        localScale: Vector3;
+        readonly up: Vector3;
+        readonly right: Vector3;
+        readonly forward: any;
+        dirtyWorld: boolean;
+        protected p_parent: ThreeDTransform;
+        protected children: Collection<ThreeDTransform>;
+        sync(): void;
+        translateLocal(translation: Vector3): any;
+        translateLocal(x: number, y: number, z: number): any;
+        translate(translation: Vector3): any;
+        translate(x: number, y: number, z: number): any;
+        rotate(eulerAngles: Vector3): any;
+        rotate(x: number, y: number, z: number): any;
+        rotateLocal(eulerAngles: Vector3): any;
+        rotateLocal(x: number, y: number, z: number): any;
+        rotateAround(angle: number, center: Vector3, axis: Vector3): any;
+        rotateAround(angle: number, centerX: number, centerY: number, centerZ: number, axisX: number, axisY: number, axisZ: number): any;
+        lookAt(target: Vector3): any;
+        lookAt(targetX: number, targetY: number, targetZ: number): any;
+        lookAt(target: Vector3, up: Vector3): any;
+        lookAt(targetX: number, targetY: number, targetZ: number, upX: number, upY: number, upZ: number): any;
+        protected clearCache(): void;
+        protected handleWhenSetTransformState(transformState?: ETransformState): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/component/transform/Transform' {
+    import { Component } from "wonder.js/dist/es2015/core/Component";
+    import { ETransformState } from "wonder.js/dist/es2015/component/transform/ETransformState";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    export abstract class Transform extends Component {
+        protected p_parent: Transform;
+        parent: Transform;
+        isTransform: boolean;
+        isTranslate: boolean;
+        isRotate: boolean;
+        isScale: boolean;
+        isLocalTranslate: boolean;
+        isLocalRotate: boolean;
+        isLocalScale: boolean;
+        dirtyLocal: boolean;
+        protected children: Collection<Transform>;
+        init(): void;
+        dispose(): void;
+        addChild(child: Transform): void;
+        removeChild(child: Transform): void;
+        setChildrenTransformState(state: boolean): any;
+        setChildrenTransformState(transformState: ETransformState, state: boolean): any;
+        protected abstract clearCache(): void;
+        protected handleWhenSetTransformState(transformState?: ETransformState): void;
+        protected setParent(parent: Transform): void;
+        protected getMatrix<T>(syncMethod: string, matrixAttriName: string): T;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/config/DebugConfig' {
+    export var DebugConfig: {
+        isTest: boolean;
+        debugCollision: boolean;
+        showDebugPanel: boolean;
+    };
+}
+
+declare module 'wonder.js/dist/es2015/core/Component' {
+    import { Entity } from "wonder.js/dist/es2015/core/Entity";
+    import { Transform } from "wonder.js/dist/es2015/component/transform/Transform";
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    export abstract class Component extends Entity {
+        readonly transform: Transform;
+        entityObject: EntityObject;
+        init(): void;
+        dispose(): void;
+        clone(): any;
+        addToObject(entityObject: EntityObject, isShareComponent?: boolean): void;
+        addToComponentContainer(): void;
+        removeFromObject(entityObject: EntityObject): void;
+        removeFromComponentContainer(): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/core/Director' {
+    import "wonder-frp/dist/es2015/stream/ConcatStream";
+    import "wonder-frp/dist/es2015/stream/IgnoreElementsStream";
+    import "wonder-frp/dist/es2015/extend/root";
+    import { SceneDispatcher } from "wonder.js/dist/es2015/core/entityObject/scene/SceneDispatcher";
+    import { Renderer } from "wonder.js/dist/es2015/renderer/renderer/Renderer";
+    export class Director {
+        static getInstance(): any;
+        readonly gameTime: number;
+        readonly fps: number;
+        readonly isNormal: boolean;
+        readonly isStop: boolean;
+        readonly isPause: boolean;
+        readonly isTimeChange: boolean;
+        readonly elapsed: number;
+        readonly view: any;
+        scene: SceneDispatcher;
+        renderer: Renderer;
+        initWhenCreate(): void;
+        start(): void;
+        stop(): void;
+        pause(): void;
+        resume(): void;
+        getDeltaTime(): number;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/core/Entity' {
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    export abstract class Entity {
+        constructor();
+        uid: number;
+        data: any;
+        addTag(tag: string): void;
+        removeTag(tag: string): void;
+        getTagList(): Collection<string>;
+        hasTag(tag: string): boolean;
+        containTag(tag: string): boolean;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/core/entityObject/EntityObject' {
+    import { Entity } from "wonder.js/dist/es2015/core/Entity";
+    import { Hash } from "wonder-commonlib/dist/es2015/Hash";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { CustomEventRegisterData } from "wonder.js/dist/es2015/event/binder/CustomEventRegister";
+    import { ComponentManager } from "wonder.js/dist/es2015/core/entityObject/manager/ComponentManager";
+    import { Component } from "wonder.js/dist/es2015/core/Component";
+    import { Geometry } from "wonder.js/dist/es2015/component/geometry/Geometry";
+    import { Renderer } from "wonder.js/dist/es2015/renderer/renderer/Renderer";
+    import { GameObject } from "wonder.js/dist/es2015/core/entityObject/gameObject/GameObject";
+    import { Transform } from "wonder.js/dist/es2015/component/transform/Transform";
+    export abstract class EntityObject extends Entity {
+        bubbleParent: EntityObject;
+        componentDirty: boolean;
+        readonly transform: Transform;
+        name: string;
+        parent: EntityObject;
+        customEventMap: Hash<Collection<CustomEventRegisterData>>;
+        protected componentManager: ComponentManager;
+        initWhenCreate(): void;
+        clone(config?: CloneEntityObjectConfigData): any;
+        init(): this;
+        dispose(): void;
+        hasChild(child: EntityObject): boolean;
+        addChild(child: EntityObject): EntityObject;
+        getChildren(): Collection<any>;
+        removeChild(child: EntityObject): EntityObject;
+        forEach(func: (entityObject: EntityObject, index: number) => void): this;
+        getComponent<T>(_class: any): T;
+        hasComponent(component: Component): boolean;
+        hasComponent(_class: Function): boolean;
+        addComponent(component: Component, isShareComponent?: boolean): this;
+        removeComponent(component: Component): any;
+        removeComponent(_class: Function): any;
+        forEachComponent(func: (component: Component) => void): this;
+        render(renderer: Renderer, camera: GameObject): void;
+        update(elapsed: number): void;
+        clearCache(): void;
+        getGeometry(): Geometry;
+        protected abstract createTransform(): Transform;
+        protected afterInitChildren(): void;
+        protected getRenderList(): Collection<any>;
+    }
+    export type CloneEntityObjectConfigData = {
+        cloneChildren?: boolean;
+        shareGeometry?: boolean;
+        cloneGeometry?: boolean;
+    };
+}
+
+declare module 'wonder.js/dist/es2015/core/entityObject/gameObject/GameObject' {
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    import { ThreeDTransform } from "wonder.js/dist/es2015/component/transform/ThreeDTransform";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    export class GameObject extends EntityObject {
+        static create(): GameObject;
+        transform: ThreeDTransform;
+        parent: GameObject;
+        renderGroup: number;
+        renderPriority: number;
+        isVisible: boolean;
+        protected children: Collection<GameObject>;
+        initWhenCreate(): void;
+        protected createTransform(): ThreeDTransform;
+        protected getRenderList(): Collection<GameObject>;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/core/entityObject/manager/ComponentManager' {
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    import { Transform } from "wonder.js/dist/es2015/component/transform/Transform";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { RendererComponent } from "wonder.js/dist/es2015/component/renderer/RendererComponent";
+    import { Geometry } from "wonder.js/dist/es2015/component/geometry/Geometry";
+    import { Component } from "wonder.js/dist/es2015/core/Component";
+    export class ComponentManager {
+        static create(entityObject: EntityObject): ComponentManager;
+        constructor(entityObject: EntityObject);
+        transform: Transform;
+        init(): void;
+        dispose(): void;
+        removeAllComponent(): Collection<Component>;
+        getComponent<T>(_class: any): T;
+        getComponents(): Collection<any>;
+        findComponentByUid(uid: number): any;
+        forEachComponent(func: (component: Component) => void): this;
+        hasComponent(component: Component): boolean;
+        hasComponent(_class: Function): boolean;
+        addComponent(component: Component, isShareComponent?: boolean): this;
+        removeComponent(component: Component): any;
+        removeComponent(_class: Function): any;
+        getComponentCount(_class: Function): number;
+        getGeometry(): Geometry;
+        getRendererComponent(): RendererComponent;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/core/entityObject/manager/EntityObjectManager' {
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    export class EntityObjectManager {
+        static create(entityObject: EntityObject): EntityObjectManager;
+        constructor(entityObject: EntityObject);
+        init(): void;
+        dispose(): void;
+        hasChild(child: EntityObject): boolean;
+        addChild(child: EntityObject): this;
+        addChildren(children: EntityObject): any;
+        addChildren(children: Array<EntityObject>): any;
+        addChildren(children: Collection<EntityObject>): any;
+        forEach(func: (entityObject: EntityObject, index: number) => void): this;
+        filter(func: (entityObject: EntityObject) => boolean): Collection<any>;
+        sort(func: (a: EntityObject, b: EntityObject) => any, isSortSelf?: boolean): Collection<any>;
+        getChildren(): Collection<any>;
+        getAllChildren(): Collection<EntityObject>;
+        getChild(index: number): any;
+        findChildByUid(uid: number): any;
+        findChildByTag(tag: string): any;
+        findChildByName(name: string): any;
+        findChildrenByName(name: string): Collection<EntityObject>;
+        removeChild(child: EntityObject): this;
+        removeAllChildren(): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/core/entityObject/scene/cache/BufferTable' {
+    import { ElementBuffer } from "wonder.js/dist/es2015/renderer/buffer/ElementBuffer";
+    import { Buffer } from "wonder.js/dist/es2015/renderer/buffer/Buffer";
+    export class BufferTable {
+        static lastBindedArrayBufferListUidStr: string;
+        static lastBindedElementBuffer: ElementBuffer;
+        static bindIndexBuffer(indexBuffer: ElementBuffer): void;
+        static hasBuffer(key: string): boolean;
+        static addBuffer(key: string, buffer: Buffer): void;
+        static getBuffer<T>(key: string): T;
+        static dispose(): void;
+        static clearAll(): void;
+        static resetBindedArrayBuffer(): void;
+        static resetBindedElementBuffer(): void;
+    }
+    export enum BufferTableKey {
+        PROCEDURAL_VERTEX,
+        PROCEDURAL_INDEX,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/core/entityObject/scene/cache/ProgramTable' {
+    import { Program } from "wonder.js/dist/es2015/renderer/program/Program";
+    export class ProgramTable {
+        static lastUsedProgram: Program;
+        static hasProgram(key: string): boolean;
+        static addProgram(key: string, program: Program): void;
+        static getProgram(key: string): Program;
+        static dispose(): void;
+        static clearAll(): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/core/entityObject/scene/gameObjectScene/GameObjectScene' {
+    import { Scene } from "wonder.js/dist/es2015/core/entityObject/scene/Scene";
+    import { GameObject } from "wonder.js/dist/es2015/core/entityObject/gameObject/GameObject";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { Renderer } from "wonder.js/dist/es2015/renderer/renderer/Renderer";
+    export class GameObjectScene extends Scene {
+        static create(): GameObjectScene;
+        currentCamera: any;
+        addChild(child: GameObject): GameObject;
+        update(elapsed: number): void;
+        render(renderer: Renderer): void;
+        protected getRenderList(): Collection<GameObject>;
+        protected createTransform(): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/core/entityObject/scene/Scene' {
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    export abstract class Scene extends EntityObject {
+    }
+}
+
+declare module 'wonder.js/dist/es2015/core/entityObject/scene/SceneDispatcher' {
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    import { GameObject } from "wonder.js/dist/es2015/core/entityObject/gameObject/GameObject";
+    import { GameObjectScene } from "wonder.js/dist/es2015/core/entityObject/scene/gameObjectScene/GameObjectScene";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    export class SceneDispatcher extends EntityObject {
+        static create(): SceneDispatcher;
+        currentCamera: GameObject;
+        name: string;
+        gameObjectScene: GameObjectScene;
+        addChild(child: EntityObject): EntityObject;
+        dispose(): void;
+        hasChild(child: EntityObject): boolean;
+        addChildren(children: EntityObject): any;
+        addChildren(children: Array<EntityObject>): any;
+        addChildren(children: Collection<EntityObject>): any;
+        getChildren(): Collection<any>;
+        protected createTransform(): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/core/Main' {
+    import { EScreenSize } from "wonder.js/dist/es2015/device/EScreenSize";
+    export class Main {
+        static setConfig({canvasId, isTest, screenSize, useDevicePixelRatio, contextConfig}: {
+            canvasId?: null;
+            isTest?: boolean;
+            screenSize?: EScreenSize;
+            useDevicePixelRatio?: boolean;
+            contextConfig?: {
+                options: {
+                    alpha: boolean;
+                    depth: boolean;
+                    stencil: boolean;
+                    antialias: boolean;
+                    premultipliedAlpha: boolean;
+                    preserveDrawingBuffer: boolean;
+                };
+            };
+        }): typeof Main;
+        static init(): typeof Main;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/core/data/MainData' {
+    import { EScreenSize } from "wonder.js/dist/es2015/device/EScreenSize";
+    import { RectRegion } from "wonder.js/dist/es2015/structure/RectRegion";
+    export class MainData {
+        static isTest: boolean;
+        static screenSize: EScreenSize & RectRegion;
+    }
+    export type ContextConfigData = {
+        options: {
+            alpha: boolean;
+            depth: boolean;
+            stencil: boolean;
+            antialias: boolean;
+            premultipliedAlpha: boolean;
+            preserveDrawingBuffer: boolean;
+        };
+    };
+}
+
+declare module 'wonder.js/dist/es2015/definition/typescript/decorator/cache' {
+    export function cacheGetter(judgeFunc: () => boolean, returnCacheValueFunc: () => any, setCacheFunc: (returnVal: any) => void): (target: any, name: any, descriptor: any) => any;
+    export function cache(judgeFunc: any, returnCacheValueFunc: any, setCacheFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function cacheBufferForBufferContainer(): (target: any, name: any, descriptor: any) => any;
+    export function cacheBufferForBufferContainerWithFuncParam(setDataNameFuncName: string): (target: any, name: any, descriptor: any) => any;
+}
+
+declare module 'wonder.js/dist/es2015/definition/typescript/decorator/clone' {
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    export function cloneAttributeAsBasicType(configData?: CloneAttributeAsBasicTypeConfigData): (target: any, memberName: string | symbol) => void;
+    export function cloneAttributeAsCloneable(configData?: CloneAttributeAsCloneableConfigData): (target: any, memberName: string | symbol) => void;
+    export function cloneAttributeAsCustomType(cloneFunc: (source: any, target: any, memberName: string, cloneData: any) => void, configData?: CloneAttributeAsCustomTypeConfigData): (target: any, memberName: string | symbol) => void;
+    export class CloneUtils {
+        static clone<T>(sourceInstance: T, cloneData?: any, createDataArr?: Array<any>, target?: any): T;
+        static cloneArray(arr: Array<any> | null, isDeep?: boolean): any;
+        static markNotClone(entityObject: EntityObject): void;
+        static isNotClone(entityObject: EntityObject): boolean;
+    }
+    export type CloneAttributeAsBasicTypeConfigData = {
+        order?: number;
+    };
+    export type CloneAttributeAsCloneableConfigData = {
+        order?: number;
+    };
+    export type CloneAttributeAsCustomTypeConfigData = {
+        order?: number;
+    };
+    export enum CloneType {
+        CLONEABLE = 0,
+        BASIC = 1,
+        CUSTOM = 2,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/definition/typescript/decorator/contract' {
+    export function assert(cond: boolean, message?: string): void;
+    export function describe(message: string, func: Function, preCondition?: Function, context?: any): void;
+    export function it(message: string, func: Function, context?: any): void;
+    export function requireCheck(inFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function ensure(outFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function requireGetterAndSetter(inGetterFunc: any, inSetterFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function requireGetter(inFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function requireSetter(inFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function ensureGetterAndSetter(outGetterFunc: any, outSetterFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function ensureGetter(outFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function ensureSetter(outFunc: any): (target: any, name: any, descriptor: any) => any;
+    export function invariant(func: any): (target: any) => void;
+}
+
+declare module 'wonder.js/dist/es2015/definition/typescript/decorator/control' {
+    export function execOnlyOnce(flagName: string): (target: any, name: any, descriptor: any) => any;
+}
+
+declare module 'wonder.js/dist/es2015/definition/typescript/decorator/registerClass' {
+    export function registerClass(className: string): (_class: any) => void;
+}
+
+declare module 'wonder.js/dist/es2015/definition/typescript/decorator/singleton' {
+    export function singleton(isInitWhenCreate?: boolean): (target: any) => void;
+}
+
+declare module 'wonder.js/dist/es2015/definition/typescript/decorator/virtual' {
+    export function virtual(target: any, name: any, descriptor: any): any;
+}
+
+declare module 'wonder.js/dist/es2015/definition/Variable' {
+    export var root: any;
+}
+
+declare module 'wonder.js/dist/es2015/device/DeviceManager' {
+    import { Vector2 } from "wonder.js/dist/es2015/math/Vector2";
+    import { IView } from "wonder.js/dist/es2015/structure/View";
+    import { ContextConfigData } from "wonder.js/dist/es2015/core/data/MainData";
+    import { RectRegion } from "wonder.js/dist/es2015/structure/RectRegion";
+    export class DeviceManager {
+        static getInstance(): any;
+        scissorTest: boolean;
+        setScissor(x: number, y: number, width: number, height: number): void;
+        setViewport(x: number, y: number, width: number, height: number): void;
+        getViewport(): RectRegion;
+        depthTest: boolean;
+        depthFunc: EDepthFunction;
+        side: ESide;
+        polygonOffset: Vector2;
+        polygonOffsetMode: EPolygonOffsetMode;
+        depthWrite: boolean;
+        blend: boolean;
+        alphaToCoverage: boolean;
+        view: IView;
+        gl: WebGLRenderingContext;
+        contextConfig: ContextConfigData;
+        setBlendFunc(blendSrc: EBlendFunc, blendDst: EBlendFunc): void;
+        setBlendEquation(blendEquation: EBlendEquation): void;
+        setBlendFuncSeparate(blendFuncSeparate: Array<EBlendFunc>): void;
+        setBlendEquationSeparate(blendEquationSeparate: Array<EBlendEquation>): void;
+        setColorWrite(writeRed: any, writeGreen: any, writeBlue: any, writeAlpha: any): void;
+        clear(options: any): void;
+        createGL(canvasId: string, contextConfig: ContextConfigData, useDevicePixelRatio: boolean): void;
+        setScreen(): void;
+        setHardwareScaling(level: number): void;
+        setPixelRatio(pixelRatio: number): void;
+        getPixelRatio(): number;
+    }
+    export enum EDepthFunction {
+        NEVER,
+        ALWAYS,
+        LESS,
+        LEQUAL,
+        EQUAL,
+        GEQUAL,
+        GREATER,
+        NOTEQUAL,
+    }
+    export enum ESide {
+        NONE = 0,
+        BOTH = 1,
+        BACK = 2,
+        FRONT = 3,
+    }
+    export enum EPolygonOffsetMode {
+        NONE = 0,
+        IN = 1,
+        OUT = 2,
+        CUSTOM = 3,
+    }
+    export enum EBlendFunc {
+        ZERO,
+        ONE,
+        SRC_COLOR,
+        ONE_MINUS_SRC_COLOR,
+        DST_COLOR,
+        ONE_MINUS_DST_COLOR,
+        SRC_ALPHA,
+        SRC_ALPHA_SATURATE,
+        ONE_MINUS_SRC_ALPHA,
+        DST_ALPHA,
+        ONE_MINUS_DST_ALPH,
+    }
+    export enum EBlendEquation {
+        ADD,
+        SUBTRACT,
+        REVERSE_SUBTRAC,
+    }
+    export enum EBlendType {
+        NONE = 0,
+        NORMAL = 1,
+        ADDITIVE = 2,
+        ADDITIVEALPHA = 3,
+        MULTIPLICATIVE = 4,
+        PREMULTIPLIED = 5,
+    }
+    export enum ECanvasType {
+        TwoDUI,
+    }
+    export type CanvasMapData = {
+        canvas: HTMLCanvasElement;
+        context: CanvasRenderingContext2D;
+    };
+}
+
+declare module 'wonder.js/dist/es2015/device/EScreenSize' {
+    export enum EScreenSize {
+        FULL = 0,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/device/GPUDetector' {
+    export class GPUDetector {
+        static getInstance(): any;
+        readonly gl: any;
+        maxTextureUnit: number;
+        maxTextureSize: number;
+        maxCubemapTextureSize: number;
+        maxAnisotropy: number;
+        maxBoneCount: number;
+        extensionCompressedTextureS3TC: any;
+        extensionTextureFilterAnisotropic: any;
+        extensionInstancedArrays: any;
+        extensionUintIndices: boolean;
+        extensionDepthTexture: boolean;
+        extensionVAO: any;
+        extensionStandardDerivatives: boolean;
+        precision: number;
+        detect(): void;
+    }
+    export enum EGPUPrecision {
+        HIGHP = 0,
+        MEDIUMP = 1,
+        LOWP = 2,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/binder/CustomEventBinder' {
+    import { EventBinder } from "wonder.js/dist/es2015/event/binder/EventBinder";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    export class CustomEventBinder extends EventBinder {
+        static getInstance(): any;
+        on(eventName: EEventName | string, handler: Function): void;
+        on(eventName: EEventName | string, handler: Function, priority: number): void;
+        on(target: EntityObject, eventName: EEventName | string, handler: Function): void;
+        on(target: EntityObject, eventName: EEventName | string, handler: Function, priority: number): void;
+        off(): void;
+        off(eventName: EEventName | string): void;
+        off(target: EntityObject): void;
+        off(eventName: EEventName | string, handler: Function): void;
+        off(target: EntityObject, eventName: EEventName | string): void;
+        off(target: EntityObject, eventName: EEventName | string, handler: Function): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/binder/CustomEventRegister' {
+    import { EventRegister } from "wonder.js/dist/es2015/event/binder/EventRegister";
+    import { CustomEventListenerMap } from "wonder.js/dist/es2015/event/structure/CustomEventListenerMap";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    export class CustomEventRegister extends EventRegister {
+        static getInstance(): any;
+        protected listenerMap: CustomEventListenerMap;
+        register(eventName: EEventName, handler: Function, originHandler: Function, domHandler: Function, priority: number): any;
+        register(target: EntityObject, eventName: EEventName, handler: Function, originHandler: Function, domHandler: Function, priority: number): any;
+        remove(eventName: EEventName): any;
+        remove(target: EntityObject): any;
+        remove(eventName: EEventName, handler: Function): any;
+        remove(uid: number, eventName: EEventName): any;
+        remove(target: EntityObject, eventName: EEventName): any;
+        remove(target: EntityObject, eventName: EEventName, handler: Function): any;
+        setBubbleParent(target: EntityObject, parent: EntityObject): void;
+    }
+    export type CustomEventRegisterData = {
+        target: EntityObject;
+        originHandler: Function;
+        handler: Function;
+        domHandler: Function;
+        priority: number;
+    };
+}
+
+declare module 'wonder.js/dist/es2015/event/binder/DomEventBinder' {
+    import { EventBinder } from "wonder.js/dist/es2015/event/binder/EventBinder";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    export class DomEventBinder extends EventBinder {
+        static getInstance(): any;
+        on(eventName: EEventName | string, handler: Function): void;
+        on(eventName: EEventName | string, handler: Function, priority: number): void;
+        on(dom: HTMLElement, eventName: EEventName | string, handler: Function): void;
+        on(dom: HTMLElement, eventName: EEventName | string, handler: Function, priority: number): void;
+        off(): void;
+        off(eventName: EEventName | string): void;
+        off(dom: HTMLElement): void;
+        off(eventName: EEventName | string, handler: Function): void;
+        off(dom: HTMLElement, eventName: EEventName): void;
+        off(dom: HTMLElement, eventName: EEventName, handler: Function): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/binder/DomEventRegister' {
+    import { EventRegister } from "wonder.js/dist/es2015/event/binder/EventRegister";
+    import { DomEventListenerMap } from "wonder.js/dist/es2015/event/structure/DomEventListenerMap";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { Hash } from "wonder-commonlib/dist/es2015/Hash";
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    export class DomEventRegister extends EventRegister {
+        static getInstance(): any;
+        protected listenerMap: DomEventListenerMap;
+        register(dom: HTMLElement, eventName: EEventName, eventData: Hash<any>, handler: Function, originHandler: Function, domHandler: Function, priority: number): void;
+        remove(eventName: EEventName): any;
+        remove(eventName: EEventName, handler: Function): any;
+        remove(dom: HTMLElement, eventName: EEventName): any;
+        remove(dom: HTMLElement, eventName: EEventName, handler: Function): any;
+        isBinded(dom: HTMLElement, eventName: EEventName): boolean;
+        getDomHandler(dom: HTMLElement, eventName: EEventName): Function;
+    }
+    export type DomEventRegisterData = {
+        dom?: HTMLElement;
+        target?: EntityObject;
+        eventData: Hash<any>;
+        originHandler: Function;
+        handler: Function;
+        domHandler: Function;
+        priority: number;
+    };
+}
+
+declare module 'wonder.js/dist/es2015/event/binder/EventBinder' {
+    export abstract class EventBinder {
+        abstract on(...args: any[]): void;
+        abstract off(...args: any[]): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/binder/EventRegister' {
+    import { EventListenerMap } from "wonder.js/dist/es2015/event/structure/EventListenerMap";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    export abstract class EventRegister {
+        protected abstract listenerMap: EventListenerMap;
+        abstract register(...args: any[]): void;
+        abstract remove(...args: any[]): any;
+        getEventRegisterDataList(eventName: EEventName): any;
+        getEventRegisterDataList(currentTarget: EntityObject, eventName: EEventName): any;
+        getEventRegisterDataList(dom: HTMLElement, eventName: EEventName): any;
+        forEachAll(func: (list: Collection<any>, eventName: EEventName) => void): void;
+        forEachEventName(func: (list: Collection<EventRegisterData>, eventName: EEventName) => void): void;
+        clear(): void;
+        getChild(target: EntityObject): any;
+        getChild(dom: HTMLElement): any;
+        getChild(target: EntityObject, eventName: EEventName): any;
+        getChild(dom: HTMLElement, eventName: EEventName): any;
+    }
+    export type EventRegisterData = {
+        originHandler: Function;
+        handler: Function;
+        domHandler: Function;
+        priority: number;
+    };
+}
+
+declare module 'wonder.js/dist/es2015/event/dispatcher/CustomEventDispatcher' {
+    import { EventDispatcher } from "wonder.js/dist/es2015/event/dispatcher/EventDispatcher";
+    import { Event } from "wonder.js/dist/es2015/event/object/Event";
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    export class CustomEventDispatcher extends EventDispatcher {
+        static getInstance(): any;
+        trigger(event: Event): boolean;
+        trigger(event: Event, userData: any): boolean;
+        trigger(target: EntityObject, event: Event): boolean;
+        trigger(target: EntityObject, event: Event, notSetTarget: boolean): boolean;
+        trigger(target: EntityObject, event: Event, userData: any): boolean;
+        trigger(target: EntityObject, event: Event, userData: any, notSetTarget: boolean): boolean;
+        emit(target: EntityObject, eventObject: Event, userData?: any): void;
+        broadcast(target: EntityObject, eventObject: Event, userData?: any): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/dispatcher/DomEventDispatcher' {
+    import { EventDispatcher } from "wonder.js/dist/es2015/event/dispatcher/EventDispatcher";
+    import { Event } from "wonder.js/dist/es2015/event/object/Event";
+    export class DomEventDispatcher extends EventDispatcher {
+        static getInstance(): any;
+        trigger(event: Event): void;
+        trigger(dom: HTMLElement, event: Event): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/dispatcher/EventDispatcher' {
+    export abstract class EventDispatcher {
+        abstract trigger(...args: any[]): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/EEngineEvent' {
+    export enum EEngineEvent {
+        STARTLOOP,
+        ENDLOOP,
+        POINT_TAP,
+        POINT_DOWN,
+        POINT_UP,
+        POINT_MOVE,
+        POINT_OVER,
+        POINT_OUT,
+        POINT_SCALE,
+        POINT_DRAG,
+        TRANSFORM_TRANSLATE,
+        TRANSFORM_ROTATE,
+        TRANSFORM_SCALE,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/EventManager' {
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { EEngineEvent } from "wonder.js/dist/es2015/event/EEngineEvent";
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    import { Event } from "wonder.js/dist/es2015/event/object/Event";
+    import { FromEventPatternStream } from "wonder-frp/dist/es2015/stream/FromEventPatternStream";
+    export class EventManager {
+        static on(eventName: EEventName | EEngineEvent | string, handler: Function): void;
+        static on(eventName: EEventName | EEngineEvent | string, handler: Function, priority: number): void;
+        static on(target: EntityObject, eventName: EEventName | EEngineEvent | string, handler: Function): void;
+        static on(dom: HTMLElement, eventName: EEventName | EEngineEvent | string, handler: Function): void;
+        static on(target: EntityObject, eventName: EEventName | EEngineEvent | string, handler: Function, priority: number): void;
+        static on(dom: HTMLElement, eventName: EEventName | EEngineEvent | string, handler: Function, priority: number): void;
+        static off(): void;
+        static off(eventName: EEventName | EEngineEvent | string): void;
+        static off(target: EntityObject): void;
+        static off(dom: HTMLElement): void;
+        static off(eventName: EEventName | EEngineEvent | string, handler: Function): void;
+        static off(target: EntityObject, eventName: EEventName | EEngineEvent | string): void;
+        static off(dom: HTMLElement, eventName: EEventName): void;
+        static off(target: EntityObject, eventName: EEventName | EEngineEvent | string, handler: Function): void;
+        static off(dom: HTMLElement, eventName: EEventName, handler: Function): void;
+        static trigger(event: Event): void;
+        static trigger(event: Event, userData: any): void;
+        static trigger(target: EntityObject, event: Event): void;
+        static trigger(dom: HTMLElement, event: Event): void;
+        static trigger(target: EntityObject, event: Event, userData: any): void;
+        static trigger(target: EntityObject, event: Event, userData: any, notSetTarget: boolean): void;
+        static broadcast(target: EntityObject, event: Event): any;
+        static broadcast(target: EntityObject, event: Event, userData: any): any;
+        static emit(target: EntityObject, event: Event): any;
+        static emit(target: EntityObject, event: Event, userData: any): any;
+        static fromEvent(eventName: EEventName | EEngineEvent | string): FromEventPatternStream;
+        static fromEvent(eventName: EEventName | EEngineEvent | string, priority: number): FromEventPatternStream;
+        static fromEvent(target: EntityObject, eventName: EEventName | EEngineEvent | string): FromEventPatternStream;
+        static fromEvent(dom: HTMLElement, eventName: EEventName | EEngineEvent | string): FromEventPatternStream;
+        static fromEvent(target: EntityObject, eventName: EEventName | EEngineEvent | string, priority: number): FromEventPatternStream;
+        static fromEvent(dom: HTMLElement, eventName: EEventName | EEngineEvent | string, priority: number): FromEventPatternStream;
+        static setBubbleParent(target: EntityObject, parent: any): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/factory/EventBinderFactory' {
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    export class EventBinderFactory {
+        static createEventBinder(eventName: EEventName): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/factory/EventDispatcherFactory' {
+    import { Event } from "wonder.js/dist/es2015/event/object/Event";
+    export class EventDispatcherFactory {
+        static createEventDispatcher(event: Event): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/factory/EventHandlerFactory' {
+    import { EEventType } from "wonder.js/dist/es2015/event/object/EEventType";
+    export class EventHandlerFactory {
+        static createEventHandler(eventType: EEventType): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/handler/CustomEventHandler' {
+    import { EventHandler } from "wonder.js/dist/es2015/event/handler/EventHandler";
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    import { Event } from "wonder.js/dist/es2015/event/object/Event";
+    export class CustomEventHandler extends EventHandler {
+        static getInstance(): any;
+        on(eventName: string, handler: Function, priority: number): void;
+        on(target: EntityObject, eventName: string, handler: Function, priority: number): void;
+        off(eventName: string): void;
+        off(uid: number, eventName: string): void;
+        off(eventName: string, handler: Function): void;
+        off(target: EntityObject, eventName: string, handler: Function): void;
+        trigger(event: Event): boolean;
+        trigger(event: Event, userData: any): boolean;
+        trigger(target: EntityObject, event: Event, notSetTarget: boolean): boolean;
+        trigger(target: EntityObject, event: Event, userData: any, notSetTarget: boolean): boolean;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/handler/DomEventHandler' {
+    import { EventHandler } from "wonder.js/dist/es2015/event/handler/EventHandler";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { Event } from "wonder.js/dist/es2015/event/object/Event";
+    import { IEventData } from "wonder.js/dist/es2015/event/interface/IEventData";
+    import { Hash } from "wonder-commonlib/dist/es2015/Hash";
+    export abstract class DomEventHandler extends EventHandler {
+        off(): void;
+        off(eventName: EEventName): void;
+        off(eventName: EEventName, handler: Function): void;
+        off(dom: HTMLElement, eventName: EEventName): void;
+        off(dom: HTMLElement, eventName: EEventName, handler: Function): void;
+        trigger(event: Event): void;
+        trigger(dom: HTMLElement, event: Event): void;
+        protected abstract triggerDomEvent(dom: HTMLElement, event: IEventData, eventName: EEventName): any;
+        protected abstract addEngineHandler(eventName: EEventName, handler: Function): any;
+        protected abstract getDefaultDom(): HTMLElement;
+        protected abstract createEventData(): Hash<any>;
+        protected clearHandler(): void;
+        protected buildDomHandler(dom: HTMLElement, eventName: EEventName): (event: any) => any;
+        protected handler(dom: HTMLElement, eventName: EEventName, handler: Function, priority: number): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/handler/EventHandler' {
+    export abstract class EventHandler {
+        abstract on(...args: any[]): any;
+        abstract off(...args: any[]): any;
+        abstract trigger(...args: any[]): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/handler/KeyboardEventHandler' {
+    import { DomEventHandler } from "wonder.js/dist/es2015/event/handler/DomEventHandler";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { KeyboardEvent } from "wonder.js/dist/es2015/event/object/KeyboardEvent";
+    import { IKeyboardEventData } from "wonder.js/dist/es2015/event/interface/IEventData";
+    import { Hash } from "wonder-commonlib/dist/es2015/Hash";
+    export class KeyboardEventHandler extends DomEventHandler {
+        static getInstance(): any;
+        on(eventName: EEventName, handler: (event: KeyboardEvent) => void, priority: number): any;
+        on(dom: HTMLElement, eventName: EEventName, handler: (event: KeyboardEvent) => void, priority: number): any;
+        protected triggerDomEvent(dom: HTMLElement, event: IKeyboardEventData, eventName: EEventName): void;
+        protected getDefaultDom(): HTMLElement;
+        protected addEngineHandler(eventName: EEventName, handler: (event: KeyboardEvent) => void): any;
+        protected createEventData(): Hash<any>;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/handler/MouseEventHandler' {
+    import { PointEventHandler } from "wonder.js/dist/es2015/event/handler/PointEventHandler";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { MouseEvent } from "wonder.js/dist/es2015/event/object/MouseEvent";
+    import { IMouseEventData } from "wonder.js/dist/es2015/event/interface/IEventData";
+    export class MouseEventHandler extends PointEventHandler {
+        static getInstance(): any;
+        protected addEngineHandler(eventName: EEventName, handler: (event: MouseEvent) => void): any;
+        protected createEventObject(dom: HTMLElement, event: IMouseEventData, eventName: EEventName): MouseEvent;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/handler/PointEventHandler' {
+    import { DomEventHandler } from "wonder.js/dist/es2015/event/handler/DomEventHandler";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { DomEvent } from "wonder.js/dist/es2015/event/object/DomEvent";
+    import { IEventData } from "wonder.js/dist/es2015/event/interface/IEventData";
+    import { Hash } from "wonder-commonlib/dist/es2015/Hash";
+    import { MouseEvent } from "wonder.js/dist/es2015/event/object/MouseEvent";
+    import { TouchEvent } from "wonder.js/dist/es2015/event/object/TouchEvent";
+    export abstract class PointEventHandler extends DomEventHandler {
+        on(eventName: EEventName, handler: (event: DomEvent) => void, priority: number): any;
+        on(dom: HTMLElement, eventName: EEventName, handler: (event: DomEvent) => void, priority: number): any;
+        protected abstract createEventObject(dom: HTMLElement, event: IEventData, eventName: EEventName): DomEvent;
+        protected getDefaultDom(): HTMLElement;
+        protected triggerDomEvent(dom: HTMLElement, event: IEventData, eventName: EEventName): void;
+        protected createEventData(): Hash<any>;
+        protected handleMove(handler: (event: MouseEvent | TouchEvent) => void): (event: MouseEvent | TouchEvent, eventData: Hash<any>) => void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/handler/TouchEventHandler' {
+    import { PointEventHandler } from "wonder.js/dist/es2015/event/handler/PointEventHandler";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { TouchEvent } from "wonder.js/dist/es2015/event/object/TouchEvent";
+    import { ITouchEventData } from "wonder.js/dist/es2015/event/interface/IEventData";
+    export class TouchEventHandler extends PointEventHandler {
+        static getInstance(): any;
+        protected addEngineHandler(eventName: EEventName, handler: (event: TouchEvent) => void): any;
+        protected createEventObject(dom: HTMLElement, event: ITouchEventData, eventName: EEventName): TouchEvent;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/object/CustomEvent' {
+    import { Event } from "wonder.js/dist/es2015/event/object/Event";
+    import { EEventType } from "wonder.js/dist/es2015/event/object/EEventType";
+    import { DomEvent } from "wonder.js/dist/es2015/event/object/DomEvent";
+    export class CustomEvent extends Event {
+        static create(eventName: string): any;
+        static create(eventName: string, userData: any): any;
+        constructor(eventName: string);
+        constructor(eventName: string, userData: any);
+        readonly type: EEventType;
+        userData: any;
+        copyPublicAttri(destination: any, source: any): any;
+        clone(): CustomEvent;
+        getDataFromDomEvent(event: DomEvent): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/object/DomEvent' {
+    import { Event } from "wonder.js/dist/es2015/event/object/Event";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { CustomEvent } from "wonder.js/dist/es2015/event/object/CustomEvent";
+    export abstract class DomEvent extends Event {
+        constructor(event: any, eventName: EEventName);
+        event: any;
+        preventDefault(): void;
+        getDataFromCustomEvent(event: CustomEvent): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/object/EEventPhase' {
+    export enum EEventPhase {
+        BROADCAST = 0,
+        EMIT = 1,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/object/EEventType' {
+    export enum EEventType {
+        MOUSE = 0,
+        TOUCH = 1,
+        POINT = 2,
+        KEYBOARD = 3,
+        CUSTOM = 4,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/object/EMouseButton' {
+    export enum EMouseButton {
+        LEFT = 0,
+        RIGHT = 1,
+        CENTER = 2,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/object/Event' {
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { EEventType } from "wonder.js/dist/es2015/event/object/EEventType";
+    import { EEngineEvent } from "wonder.js/dist/es2015/event/EEngineEvent";
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    import { EEventPhase } from "wonder.js/dist/es2015/event/object/EEventPhase";
+    export abstract class Event {
+        protected constructor(eventName: EEventName);
+        readonly abstract type: EEventType;
+        name: string | EEventName | EEngineEvent;
+        target: HTMLElement | EntityObject;
+        currentTarget: HTMLElement | EntityObject;
+        isStopPropagation: boolean;
+        phase: EEventPhase;
+        abstract clone(): any;
+        stopPropagation(): void;
+        protected copyMember(destination: Event, source: Event, memberArr: [any]): Event;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/object/EventNameHandler' {
+    export enum EEventName {
+        CLICK,
+        MOUSEOVER,
+        MOUSEUP,
+        MOUSEOUT,
+        MOUSEMOVE,
+        MOUSEDOWN,
+        MOUSEWHEEL,
+        MOUSEDRAG,
+        TOUCHUP,
+        TOUCHMOVE,
+        TOUCHDOWN,
+        KEYDOWN,
+        KEYUP,
+        KEYPRESS,
+    }
+    export class EventNameHandler {
+        static handleEventName(domEventName: EEventName): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/object/EventTable' {
+    import { EEventType } from "wonder.js/dist/es2015/event/object/EEventType";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    export class EventTable {
+        static getEventType(eventName: EEventName): EEventType;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/object/KeyboardEvent' {
+    import { DomEvent } from "wonder.js/dist/es2015/event/object/DomEvent";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { IKeyboardEventData } from "wonder.js/dist/es2015/event/interface/IEventData";
+    import { EEventType } from "wonder.js/dist/es2015/event/object/EEventType";
+    export class KeyboardEvent extends DomEvent {
+        static create(event: any, eventName: EEventName): KeyboardEvent;
+        event: IKeyboardEventData;
+        readonly ctrlKey: number;
+        readonly altKey: number;
+        readonly shiftKey: number;
+        readonly metaKey: number;
+        readonly keyCode: number;
+        readonly key: any;
+        readonly type: EEventType;
+        keyState: any;
+        clone(): KeyboardEvent;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/object/MouseEvent' {
+    import { DomEvent } from "wonder.js/dist/es2015/event/object/DomEvent";
+    import { IMouseEventData } from "wonder.js/dist/es2015/event/interface/IEventData";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { Point } from "wonder.js/dist/es2015/structure/Point";
+    import { EEventType } from "wonder.js/dist/es2015/event/object/EEventType";
+    export class MouseEvent extends DomEvent {
+        static create(event: IMouseEventData, eventName: EEventName): MouseEvent;
+        event: IMouseEventData;
+        location: Point;
+        locationInView: Point;
+        button: number;
+        readonly wheel: number;
+        readonly movementDelta: {
+            x: any;
+            y: any;
+        };
+        readonly type: EEventType;
+        lastX: number;
+        lastY: number;
+        clone(): MouseEvent;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/object/MousePointEvent' {
+    import { PointEvent } from "wonder.js/dist/es2015/event/object/PointEvent";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { MouseEvent } from "wonder.js/dist/es2015/event/object/MouseEvent";
+    import { Point } from "wonder.js/dist/es2015/structure/Point";
+    export class MousePointEvent extends PointEvent {
+        static create(eventName: EEventName): MousePointEvent;
+        eventObj: MouseEvent;
+        location: Point;
+        locationInView: Point;
+        button: number;
+        readonly wheel: number;
+        readonly movementDelta: {
+            x: any;
+            y: any;
+        };
+        getDataFromEventObj(e: MouseEvent): void;
+        clone(): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/object/PointEvent' {
+    import { DomEvent } from "wonder.js/dist/es2015/event/object/DomEvent";
+    import { IPointEventData } from "wonder.js/dist/es2015/event/interface/IEventData";
+    import { Point } from "wonder.js/dist/es2015/structure/Point";
+    import { EEventType } from "wonder.js/dist/es2015/event/object/EEventType";
+    import { MouseEvent } from "wonder.js/dist/es2015/event/object/MouseEvent";
+    import { TouchEvent } from "wonder.js/dist/es2015/event/object/TouchEvent";
+    export abstract class PointEvent extends DomEvent {
+        event: IPointEventData;
+        abstract location: Point;
+        abstract locationInView: Point;
+        abstract button: number | null;
+        readonly abstract wheel: number | null;
+        readonly abstract movementDelta: Point;
+        lastX: number;
+        lastY: number;
+        readonly type: EEventType;
+        eventObj: MouseEvent | TouchEvent;
+        abstract getDataFromEventObj(eventObj: TouchEvent | MouseEvent): void;
+        protected cloneHelper(eventObj: PointEvent): PointEvent;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/object/TouchEvent' {
+    import { DomEvent } from "wonder.js/dist/es2015/event/object/DomEvent";
+    import { ITouchEventData, ITouchData } from "wonder.js/dist/es2015/event/interface/IEventData";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { Point } from "wonder.js/dist/es2015/structure/Point";
+    import { EEventType } from "wonder.js/dist/es2015/event/object/EEventType";
+    export class TouchEvent extends DomEvent {
+        static create(event: ITouchEventData, eventName: EEventName): TouchEvent;
+        event: ITouchEventData;
+        location: Point;
+        readonly touchData: ITouchData;
+        locationInView: Point;
+        readonly movementDelta: {
+            x: any;
+            y: any;
+        };
+        readonly type: EEventType;
+        lastX: number;
+        lastY: number;
+        clone(): TouchEvent;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/object/TouchPointEvent' {
+    import { PointEvent } from "wonder.js/dist/es2015/event/object/PointEvent";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { TouchEvent } from "wonder.js/dist/es2015/event/object/TouchEvent";
+    import { Point } from "wonder.js/dist/es2015/structure/Point";
+    export class TouchPointEvent extends PointEvent {
+        static create(eventName: EEventName): TouchPointEvent;
+        eventObj: TouchEvent;
+        location: Point;
+        locationInView: Point;
+        readonly wheel: any;
+        readonly movementDelta: {
+            x: any;
+            y: any;
+        };
+        button: number;
+        getDataFromEventObj(e: TouchEvent): void;
+        clone(): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/structure/CustomEventListenerMap' {
+    import { EventListenerMap } from "wonder.js/dist/es2015/event/structure/EventListenerMap";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { CustomEventRegisterData } from "wonder.js/dist/es2015/event/binder/CustomEventRegister";
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    export class CustomEventListenerMap extends EventListenerMap {
+        static create(): CustomEventListenerMap;
+        hasChild(target: EntityObject): boolean;
+        appendChild(eventName: EEventName, data: any): any;
+        appendChild(target: EntityObject, eventName: EEventName, data: any): any;
+        forEachAll(func: (list: Collection<CustomEventRegisterData>, eventName: EEventName) => void): void;
+        forEachEventName(func: (list: Collection<CustomEventRegisterData>, eventName: EEventName) => void): void;
+        clear(): void;
+        getChild(eventName: EEventName): Collection<CustomEventRegisterData>;
+        getChild(target: EntityObject): Collection<CustomEventRegisterData>;
+        getChild(target: EntityObject, eventName: EEventName): Collection<CustomEventRegisterData>;
+        removeChild(eventName: EEventName): void;
+        removeChild(target: EntityObject): void;
+        removeChild(eventName: EEventName, handler: Function): void;
+        removeChild(uid: number, eventName: EEventName): void;
+        removeChild(target: EntityObject, eventName: EEventName): void;
+        removeChild(target: EntityObject, eventName: EEventName, handler: Function): void;
+        protected buildFirstLevelKey(target: EntityObject): any;
+        protected buildFirstLevelKey(uid: number): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/structure/DomEventListenerMap' {
+    import { EventListenerMap } from "wonder.js/dist/es2015/event/structure/EventListenerMap";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { DomEventRegisterData } from "wonder.js/dist/es2015/event/binder/DomEventRegister";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    export class DomEventListenerMap extends EventListenerMap {
+        static create(): DomEventListenerMap;
+        hasChild(dom: HTMLElement, eventName: EEventName): boolean;
+        appendChild(dom: HTMLElement, eventName: EEventName, data: any): void;
+        forEachAll(func: (list: Collection<DomEventRegisterData>, eventName: EEventName) => void): void;
+        forEachEventName(func: (list: Collection<DomEventRegisterData>, eventName: EEventName) => void): void;
+        clear(): void;
+        getChild(dom: HTMLElement): Collection<DomEventRegisterData>;
+        getChild(dom: HTMLElement, eventName: EEventName): Collection<DomEventRegisterData>;
+        removeChild(eventName: EEventName): Collection<DomEventOffData>;
+        removeChild(eventName: EEventName, handler: Function): Collection<DomEventOffData>;
+        removeChild(dom: HTMLElement, eventName: EEventName): Collection<DomEventOffData>;
+        removeChild(dom: HTMLElement, eventName: EEventName, handler: Function): Collection<DomEventOffData>;
+        protected buildFirstLevelKey(dom: HTMLElement): string;
+    }
+    export type DomEventOffData = {
+        dom: HTMLElement;
+        eventName: EEventName;
+        domHandler: Function;
+    };
+}
+
+declare module 'wonder.js/dist/es2015/event/structure/EventListenerMap' {
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { EEventName } from "wonder.js/dist/es2015/event/object/EventNameHandler";
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    export abstract class EventListenerMap {
+        abstract getChild(...args: any[]): Collection<any>;
+        abstract removeChild(...args: any[]): any;
+        abstract hasChild(...args: any[]): boolean;
+        abstract appendChild(...args: any[]): void;
+        abstract forEachAll(func: (list: Collection<any>, eventName: EEventName) => void): void;
+        abstract forEachEventName(func: (list: Collection<any>, eventName: EEventName) => void): void;
+        abstract clear(): void;
+        protected abstract buildFirstLevelKey(target: EntityObject | HTMLElement): string;
+        protected buildSecondLevelKey(eventName: EEventName): string;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/event/utils/EventUtils' {
+    import { EntityObject } from "wonder.js/dist/es2015/core/entityObject/EntityObject";
+    export class EventUtils {
+        static isEvent(arg: any): boolean;
+        static isEntityObject(arg: EntityObject): boolean;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/material/BasicMaterial' {
+    import { StandardBasicMaterial } from "wonder.js/dist/es2015/material/StandardBasicMaterial";
+    export class BasicMaterial extends StandardBasicMaterial {
+        static create(): BasicMaterial;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/material/EngineMaterial' {
+    import { Material } from "wonder.js/dist/es2015/material/Material";
+    import { Shader } from "wonder.js/dist/es2015/renderer/shader/shader/Shader";
+    export abstract class EngineMaterial extends Material {
+        init(): void;
+        protected addShaderLib(): void;
+        protected createShader(): Shader;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/material/Material' {
+    import { Color } from "wonder.js/dist/es2015/structure/Color";
+    import { Geometry } from "wonder.js/dist/es2015/component/geometry/Geometry";
+    import { QuadCommand } from "wonder.js/dist/es2015/renderer/command/QuadCommand";
+    import { Shader } from "wonder.js/dist/es2015/renderer/shader/shader/Shader";
+    import { Program } from "wonder.js/dist/es2015/renderer/program/Program";
+    export abstract class Material {
+        readonly program: Program;
+        color: Color;
+        readonly shader: Shader;
+        geometry: Geometry;
+        clone(): this;
+        initWhenCreate(): void;
+        init(): void;
+        dispose(): void;
+        updateShader(quadCmd: QuadCommand): void;
+        protected abstract createShader(): Shader;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/material/ShaderManager' {
+    import { Material } from "wonder.js/dist/es2015/material/Material";
+    import { Shader } from "wonder.js/dist/es2015/renderer/shader/shader/Shader";
+    import { QuadCommand } from "wonder.js/dist/es2015/renderer/command/QuadCommand";
+    export class ShaderManager {
+        static create(material: Material): ShaderManager;
+        constructor(material: Material);
+        readonly shader: Shader;
+        setShader(shader: Shader): void;
+        init(): void;
+        dispose(): void;
+        update(quadCmd: QuadCommand): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/material/StandardBasicMaterial' {
+    import { EngineMaterial } from "wonder.js/dist/es2015/material/EngineMaterial";
+    export abstract class StandardBasicMaterial extends EngineMaterial {
+        opacity: number;
+        alphaTest: number;
+        protected addExtendShaderLib(): void;
+        protected addShaderLib(): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/math/Global' {
+    export const DEG_TO_RAD: number;
+    export const RAD_TO_DEG: number;
+}
+
+declare module 'wonder.js/dist/es2015/math/Matrix3' {
+    import { Vector2 } from "wonder.js/dist/es2015/math/Vector2";
+    export class Matrix3 {
+        static create(mat: Float32Array): Matrix3;
+        static create(): Matrix3;
+        constructor(mat: Float32Array);
+        constructor();
+        a: number;
+        c: number;
+        b: number;
+        d: number;
+        tx: number;
+        ty: number;
+        values: Float32Array;
+        setIdentity(): Matrix3;
+        invert(): Matrix3;
+        multiplyScalar(s: number): this;
+        multiplyVector2(vector: Vector2): Vector2;
+        multiplyPoint(vector: Vector2): Vector2;
+        multiply(matrix: Matrix3): this;
+        transpose(): Matrix3;
+        clone(): Matrix3;
+        cloneToArray(array: Float32Array, offset?: number): Matrix3;
+        set(matrix: Matrix3): this;
+        setTS(t: Vector2, s: Vector2): void;
+        rotate(angle: number): this;
+        setRotation(angle: number): this;
+        translate(x: number, y: number): void;
+        setPosition(x: number, y: number): void;
+        scale(x: number, y: number): this;
+        setScale(x: number, y: number): this;
+        getTranslation(): Vector2;
+        getScale(): Vector2;
+        getRotation(): number;
+        getSkew(): Vector2;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/math/Matrix4' {
+    import { Matrix3 } from "wonder.js/dist/es2015/math/Matrix3";
+    import { Vector3 } from "wonder.js/dist/es2015/math/Vector3";
+    import { Vector4 } from "wonder.js/dist/es2015/math/Vector4";
+    import { Quaternion } from "wonder.js/dist/es2015/math/Quaternion";
+    export class Matrix4 {
+        static create(mat: Float32Array): Matrix4;
+        static create(): Matrix4;
+        constructor(mat: Float32Array);
+        constructor();
+        values: Float32Array;
+        push(): void;
+        pop(): void;
+        set(initialM11: number, initialM12: number, initialM13: number, initialM14: number, initialM21: number, initialM22: number, initialM23: number, initialM24: number, initialM31: number, initialM32: number, initialM33: number, initialM34: number, initialM41: number, initialM42: number, initialM43: number, initialM44: number): any;
+        set(matrix: Matrix4): any;
+        setIdentity(): Matrix4;
+        invert(): Matrix4;
+        invertTo3x3(): Matrix3;
+        transpose(): Matrix4;
+        setTranslate(x: any, y: any, z: any): Matrix4;
+        translate(x: any, y: any, z: any): Matrix4;
+        setRotate(angle: number, x: number, y: number, z: number): Matrix4;
+        rotate(angle: any, vector3: Vector3): Matrix4;
+        rotate(angle: any, x: any, y: any, z: any): Matrix4;
+        setScale(x: any, y: any, z: any): Matrix4;
+        scale(x: any, y: any, z: any): Matrix4;
+        setLookAt(eye: Vector3, center: Vector3, up: Vector3): Matrix4;
+        setLookAt(eyeX: number, eyeY: number, eyeZ: number, centerX: number, centerY: number, centerZ: number, upX: number, upY: number, upZ: number): Matrix4;
+        lookAt(eye: Vector3, center: Vector3, up: Vector3): Matrix4;
+        lookAt(eyeX: number, eyeY: number, eyeZ: number, centerX: number, centerY: number, centerZ: number, upX: number, upY: number, upZ: number): Matrix4;
+        setOrtho(left: number, right: number, bottom: number, top: number, near: number, far: number): Matrix4;
+        ortho(left: number, right: number, bottom: number, top: number, near: number, far: number): Matrix4;
+        setPerspective(fovy: number, aspect: number, near: number, far: number): Matrix4;
+        perspective(fovy: number, aspect: number, near: number, far: number): Matrix4;
+        applyMatrix(other: Matrix4, notChangeSelf?: boolean): Matrix4;
+        multiply(matrix: Matrix4): Matrix4;
+        multiply(matrix1: Matrix4, matrix2: Matrix4): Matrix4;
+        multiplyVector4(vector: Vector4): Vector4;
+        multiplyVector3(vector: Vector3): Vector3;
+        multiplyPoint(vector: Vector3): Vector3;
+        clone(): Matrix4;
+        cloneToArray(array: Float32Array, offset?: number): Matrix4;
+        getX(): Vector3;
+        getY(): Vector3;
+        getZ(): Vector3;
+        getTranslation(): Vector3;
+        getScale(): Vector3;
+        getRotation(): Quaternion;
+        getEulerAngles(): any;
+        setTRS(t: Vector3, r: Quaternion, s: Vector3): this;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/math/Quaternion' {
+    import { Vector3 } from "wonder.js/dist/es2015/math/Vector3";
+    import { Matrix4 } from "wonder.js/dist/es2015/math/Matrix4";
+    export class Quaternion {
+        static create(x?: number, y?: number, z?: number, w?: number): Quaternion;
+        constructor(x?: number, y?: number, z?: number, w?: number);
+        x: number;
+        y: number;
+        z: number;
+        w: number;
+        setFromEulerAngles(eulerAngles: Vector3): this;
+        multiply(rhs: Quaternion): any;
+        multiply(rhs1: Quaternion, rhs2: Quaternion): any;
+        setFromMatrix(matrix: Matrix4): this;
+        setFromAxisAngle(angle: number, axis: Vector3): this;
+        invert(): this;
+        conjugate(): this;
+        clone(): Quaternion;
+        normalize(): this;
+        length(): any;
+        multiplyVector3(vector: Vector3): Vector3;
+        set(x: number, y: number, z: number, w: number): void;
+        sub(quat: Quaternion): this;
+        getEulerAngles(): any;
+        slerp(left: Quaternion, right: Quaternion, amount: number): Quaternion;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/math/Vector2' {
+    export class Vector2 {
+        static create(x: any, y: any): Vector2;
+        static create(): Vector2;
+        constructor(x: any, y: any);
+        constructor();
+        x: number;
+        y: number;
+        values: Float32Array;
+        set(x: number, y: number): void;
+        add(v: Vector2): this;
+        mul(v: Vector2): this;
+        isEqual(v: Vector2): boolean;
+        clone(): Vector2;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/math/Vector3' {
+    import { Vector4 } from "wonder.js/dist/es2015/math/Vector4";
+    import { Matrix3 } from "wonder.js/dist/es2015/math/Matrix3";
+    import { Matrix4 } from "wonder.js/dist/es2015/math/Matrix4";
+    export class Vector3 {
+        static up: any;
+        static forward: any;
+        static right: any;
+        static create(x: number, y: number, z: number): Vector3;
+        static create(): Vector3;
+        constructor(x: number, y: number, z: number);
+        constructor();
+        x: number;
+        y: number;
+        z: number;
+        values: Float32Array;
+        normalize(): Vector3;
+        isZero(): boolean;
+        scale(scalar: number): any;
+        scale(x: number, y: number, z: number): any;
+        set(v: Vector3): any;
+        set(x: number, y: number, z: number): any;
+        sub(v: Vector3): Vector3;
+        sub2(v1: Vector3, v2: Vector3): this;
+        add(v: Vector3): this;
+        add2(v1: Vector3, v2: Vector3): this;
+        mul(v: Vector3): this;
+        mul2(v1: Vector3, v2: Vector3): this;
+        reverse(): Vector3;
+        clone(): Vector3;
+        toVector4(): Vector4;
+        length(): any;
+        cross(lhs: Vector3, rhs: Vector3): this;
+        lerp(lhs: Vector3, rhs: Vector3, alpha: number): this;
+        dot(rhs: any): number;
+        calAngleCos(v1: Vector3): number;
+        min(v: Vector3): this;
+        max(v: Vector3): this;
+        isEqual(v: Vector3): boolean;
+        toArray(): number[];
+        applyMatrix3(m: Matrix3): this;
+        applyMatrix4(m: Matrix4): this;
+        distanceTo(v: Vector3): any;
+        distanceToSquared(v: Vector3): number;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/math/Vector4' {
+    import { Vector3 } from "wonder.js/dist/es2015/math/Vector3";
+    export class Vector4 {
+        static create(x: any, y: any, z: any, w: any): any;
+        static create(): any;
+        constructor(x: any, y: any, z: any, w: any);
+        constructor();
+        x: number;
+        y: number;
+        z: number;
+        w: number;
+        values: Float32Array;
+        normalize(): Vector4;
+        isEqual(v: Vector4): boolean;
+        clone(): Vector4;
+        toVector3(): Vector3;
+        lengthManhattan(): any;
+        multiplyScalar(scalar: number): this;
+        dot(v: Vector4): number;
+        set(x: number, y: number, z: number, w: number): void;
+        protected copyHelper(vector4: Vector4): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/buffer/ArrayBuffer' {
+    import { CommonBuffer } from "wonder.js/dist/es2015/renderer/buffer/CommonBuffer";
+    import { EBufferType } from "wonder.js/dist/es2015/renderer/buffer/EBufferType";
+    import { EBufferUsage } from "wonder.js/dist/es2015/renderer/buffer/EBufferUsage";
+    export class ArrayBuffer extends CommonBuffer {
+        static create(data: Array<number>, size: number, type?: EBufferType, usage?: EBufferUsage): ArrayBuffer;
+        size: number;
+        data: Float32Array;
+        initWhenCreate(data: Array<number>, size: number, type: EBufferType, usage: EBufferUsage): any;
+        resetData(data: Array<number>, size?: number, type?: EBufferType, offset?: number): this;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/buffer/Buffer' {
+    import { Entity } from "wonder.js/dist/es2015/core/Entity";
+    export abstract class Buffer extends Entity {
+        buffer: any;
+        abstract resetData(data: any, ...args: any[]): void;
+        dispose(): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/buffer/BufferDataTable' {
+    import { EBufferDataType } from "wonder.js/dist/es2015/renderer/buffer/EBufferDataType";
+    export class BufferDataTable {
+        static getGeometryDataName(type: EBufferDataType): string;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/buffer/CommonBuffer' {
+    import { Buffer } from "wonder.js/dist/es2015/renderer/buffer/Buffer";
+    import { EBufferType } from "wonder.js/dist/es2015/renderer/buffer/EBufferType";
+    import { EBufferUsage } from "wonder.js/dist/es2015/renderer/buffer/EBufferUsage";
+    export abstract class CommonBuffer extends Buffer {
+        type: EBufferType;
+        count: number;
+        usage: EBufferUsage;
+        protected resetBufferData(glBufferTargetStr: string, typedData: any, offset?: number): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/buffer/EBufferDataType' {
+    export enum EBufferDataType {
+        VERTICE,
+        INDICE,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/buffer/EBufferType' {
+    export enum EBufferType {
+        BYTE,
+        UNSIGNED_BYTE,
+        SHORT,
+        UNSIGNED_SHORT,
+        INT,
+        UNSIGNED_INT,
+        FLOAT,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/buffer/EBufferUsage' {
+    export enum EBufferUsage {
+        STREAM_DRAW,
+        STATIC_DRAW,
+        DYNAMIC_DRAW,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/buffer/ElementBuffer' {
+    import { CommonBuffer } from "wonder.js/dist/es2015/renderer/buffer/CommonBuffer";
+    import { EBufferType } from "wonder.js/dist/es2015/renderer/buffer/EBufferType";
+    import { EBufferUsage } from "wonder.js/dist/es2015/renderer/buffer/EBufferUsage";
+    export class ElementBuffer extends CommonBuffer {
+        static create(data: Array<number>, type?: EBufferType, usage?: EBufferUsage): ElementBuffer;
+        readonly typeSize: number;
+        data: Uint16Array | Uint32Array;
+        initWhenCreate(data: Array<number>, type: EBufferType, usage: EBufferUsage): any;
+        resetData(data: Array<number>, type?: EBufferType, offset?: number): this;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/command/QuadCommand' {
+    import { RenderCommand } from "wonder.js/dist/es2015/renderer/command/RenderCommand";
+    import { Matrix4 } from "wonder.js/dist/es2015/math/Matrix4";
+    import { BufferContainer } from "wonder.js/dist/es2015/component/geometry/data/BufferContainer";
+    import { Material } from "wonder.js/dist/es2015/material/Material";
+    import { GameObject } from "wonder.js/dist/es2015/core/entityObject/gameObject/GameObject";
+    import { Program } from "wonder.js/dist/es2015/renderer/program/Program";
+    export abstract class QuadCommand extends RenderCommand {
+        readonly program: Program;
+        readonly mvpMatrix: Matrix4;
+        readonly vpMatrix: Matrix4;
+        mMatrix: Matrix4;
+        vMatrix: Matrix4;
+        pMatrix: Matrix4;
+        buffers: BufferContainer;
+        material: Material;
+        target: GameObject;
+        sortId: number;
+        execute(): void;
+        protected abstract draw(material: Material): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/command/RenderCommand' {
+    import { WebGLState } from "wonder.js/dist/es2015/renderer/state/WebGLState";
+    import { EDrawMode } from "wonder.js/dist/es2015/renderer/EDrawMode";
+    import { ElementBuffer } from "wonder.js/dist/es2015/renderer/buffer/ElementBuffer";
+    import { ArrayBuffer } from "wonder.js/dist/es2015/renderer/buffer/ArrayBuffer";
+    export abstract class RenderCommand {
+        webglState: WebGLState;
+        drawMode: EDrawMode;
+        abstract execute(): void;
+        init(): void;
+        dispose(): void;
+        protected drawElements(indexBuffer: ElementBuffer): void;
+        protected drawArray(vertexBuffer: ArrayBuffer): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/command/SingleDrawCommand' {
+    import { QuadCommand } from "wonder.js/dist/es2015/renderer/command/QuadCommand";
+    import { Matrix3 } from "wonder.js/dist/es2015/math/Matrix3";
+    import { Material } from "wonder.js/dist/es2015/material/Material";
+    export class SingleDrawCommand extends QuadCommand {
+        static create(): SingleDrawCommand;
+        normalMatrix: Matrix3;
+        protected draw(material: Material): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/EDrawMode' {
+    export enum EDrawMode {
+        POINTS,
+        LINES,
+        LINE_LOOP,
+        LINE_STRIP,
+        TRIANGLES,
+        TRIANGLE_STRIP,
+        TRANGLE_FAN,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/GlUtils' {
+    export class GlUtils {
+        static drawElements(mode: any, count: number, type: any, offset: number): void;
+        static drawArrays(mode: any, first: number, count: number): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/program/GLSLDataSender' {
+    import { Program } from "wonder.js/dist/es2015/renderer/program/Program";
+    import { ArrayBuffer } from "wonder.js/dist/es2015/renderer/buffer/ArrayBuffer";
+    import { Color } from "wonder.js/dist/es2015/structure/Color";
+    import { Matrix3 } from "wonder.js/dist/es2015/math/Matrix3";
+    import { Matrix4 } from "wonder.js/dist/es2015/math/Matrix4";
+    export class GLSLDataSender {
+        static create(program: Program): GLSLDataSender;
+        constructor(program: Program);
+        sendFloat1(name: string, data: any): void;
+        sendFloat2(name: string, data: any): void;
+        sendFloat3(name: string, data: any): void;
+        sendFloat4(name: string, data: any): void;
+        sendVector2(name: string, data: any): void;
+        sendVector3(name: string, data: any): void;
+        sendVector4(name: string, data: any): void;
+        sendColor3(name: string, data: Color): void;
+        sendNum1(name: string, data: number): void;
+        sendMatrix3(name: string, data: Matrix3): void;
+        sendMatrix4(name: string, data: Matrix4): void;
+        sendMatrix4Array(name: string, data: Array<number> | Float32Array): void;
+        sendSampleArray(name: string, data: Array<number>): void;
+        getUniformLocation(name: string): any;
+        addBufferToToSendList(pos: number, buffer: ArrayBuffer): void;
+        sendAllBufferData(): void;
+        clearBufferList(): void;
+        sendBuffer(pos: number, buffer: ArrayBuffer): void;
+        disableVertexAttribArray(): void;
+        clearAllCache(): void;
+        dispose(): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/program/Program' {
+    import { Entity } from "wonder.js/dist/es2015/core/Entity";
+    import { EVariableType } from "wonder.js/dist/es2015/renderer/shader/variable/EVariableType";
+    import { ArrayBuffer } from "wonder.js/dist/es2015/renderer/buffer/ArrayBuffer";
+    import { Shader } from "wonder.js/dist/es2015/renderer/shader/shader/Shader";
+    export class Program extends Entity {
+        static create(): Program;
+        glProgram: any;
+        use(): void;
+        getAttribLocation(name: string): any;
+        getUniformLocation(name: string): any;
+        sendUniformData(name: string, type: EVariableType, data: any): void;
+        sendAttributeBuffer(name: string, type: EVariableType, buffer: ArrayBuffer): void;
+        sendStructureData(name: string, type: EVariableType, data: any): void;
+        sendFloat1(name: string, data: any): void;
+        sendFloat2(name: string, data: any): void;
+        sendFloat3(name: string, data: any): void;
+        sendFloat4(name: string, data: any): void;
+        sendVector2(name: string, data: any): void;
+        sendVector3(name: string, data: any): void;
+        sendVector4(name: string, data: any): void;
+        sendColor3(name: string, data: any): void;
+        sendNum1(name: string, data: any): void;
+        sendMatrix3(name: string, data: any): void;
+        sendMatrix4(name: string, data: any): void;
+        sendMatrix4Array(name: string, data: Float32Array): void;
+        sendSampleArray(name: string, data: any): void;
+        sendAllBufferData(): void;
+        initWithShader(shader: Shader): this;
+        dispose(): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/renderer/Renderer' {
+    import { WebGLState } from "wonder.js/dist/es2015/renderer/state/WebGLState";
+    import { RenderCommand } from "wonder.js/dist/es2015/renderer/command/RenderCommand";
+    export abstract class Renderer {
+        webglState: WebGLState;
+        abstract addCommand(command: RenderCommand): void;
+        abstract hasCommand(): boolean;
+        abstract render(): void;
+        abstract clear(): void;
+        init(): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/renderer/WebGLRenderer' {
+    import { Renderer } from "wonder.js/dist/es2015/renderer/renderer/Renderer";
+    import { RenderCommand } from "wonder.js/dist/es2015/renderer/command/RenderCommand";
+    import { Color } from "wonder.js/dist/es2015/structure/Color";
+    export class WebGLRenderer extends Renderer {
+        static create(): WebGLRenderer;
+        addCommand(command: RenderCommand): void;
+        hasCommand(): boolean;
+        clear(): void;
+        render(): void;
+        init(): void;
+        setClearColor(color: Color): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/lib/basic/BasicMaterialColorShaderLib' {
+    import { EngineShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/EngineShaderLib";
+    import { Program } from "wonder.js/dist/es2015/renderer/program/Program";
+    import { QuadCommand } from "wonder.js/dist/es2015/renderer/command/QuadCommand";
+    import { BasicMaterial } from "wonder.js/dist/es2015/material/BasicMaterial";
+    import { GLSLChunk } from "wonder.js/dist/es2015/renderer/shader/chunk/ShaderChunk";
+    export class BasicMaterialColorShaderLib extends EngineShaderLib {
+        static create(): BasicMaterialColorShaderLib;
+        vsChunk: GLSLChunk;
+        fsChunk: GLSLChunk;
+        sendShaderVariables(program: Program, cmd: QuadCommand, material: BasicMaterial): void;
+        setShaderDefinition(cmd: QuadCommand, material: BasicMaterial): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/lib/basic/BasicShaderLib' {
+    import { EngineShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/EngineShaderLib";
+    import { Program } from "wonder.js/dist/es2015/renderer/program/Program";
+    import { QuadCommand } from "wonder.js/dist/es2015/renderer/command/QuadCommand";
+    import { BasicMaterial } from "wonder.js/dist/es2015/material/BasicMaterial";
+    import { GLSLChunk } from "wonder.js/dist/es2015/renderer/shader/chunk/ShaderChunk";
+    export class BasicShaderLib extends EngineShaderLib {
+        static create(): BasicShaderLib;
+        vsChunk: GLSLChunk;
+        fsChunk: GLSLChunk;
+        sendShaderVariables(program: Program, cmd: QuadCommand, material: BasicMaterial): void;
+        setShaderDefinition(cmd: QuadCommand, material: BasicMaterial): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/lib/basic/EndBasicShaderLib' {
+    import { EngineShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/EngineShaderLib";
+    import { QuadCommand } from "wonder.js/dist/es2015/renderer/command/QuadCommand";
+    import { StandardBasicMaterial } from "wonder.js/dist/es2015/material/StandardBasicMaterial";
+    import { GLSLChunk } from "wonder.js/dist/es2015/renderer/shader/chunk/ShaderChunk";
+    export class EndBasicShaderLib extends EngineShaderLib {
+        static create(): EndBasicShaderLib;
+        vsChunk: GLSLChunk;
+        fsChunk: GLSLChunk;
+        setShaderDefinition(cmd: QuadCommand, material: StandardBasicMaterial): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/lib/common/CommonShaderLib' {
+    import { EngineShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/EngineShaderLib";
+    import { Program } from "wonder.js/dist/es2015/renderer/program/Program";
+    import { QuadCommand } from "wonder.js/dist/es2015/renderer/command/QuadCommand";
+    import { EngineMaterial } from "wonder.js/dist/es2015/material/EngineMaterial";
+    import { GLSLChunk } from "wonder.js/dist/es2015/renderer/shader/chunk/ShaderChunk";
+    export class CommonShaderLib extends EngineShaderLib {
+        static create(): CommonShaderLib;
+        vsChunk: GLSLChunk;
+        fsChunk: GLSLChunk;
+        sendShaderVariables(program: Program, cmd: QuadCommand, material: EngineMaterial): void;
+        setShaderDefinition(cmd: QuadCommand, material: EngineMaterial): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/lib/common/EndShaderLib' {
+    import { EngineShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/EngineShaderLib";
+    import { Program } from "wonder.js/dist/es2015/renderer/program/Program";
+    import { QuadCommand } from "wonder.js/dist/es2015/renderer/command/QuadCommand";
+    import { EngineMaterial } from "wonder.js/dist/es2015/material/EngineMaterial";
+    import { GLSLChunk } from "wonder.js/dist/es2015/renderer/shader/chunk/ShaderChunk";
+    export class EndShaderLib extends EngineShaderLib {
+        static create(): EndShaderLib;
+        vsChunk: GLSLChunk;
+        fsChunk: GLSLChunk;
+        sendShaderVariables(program: Program, cmd: QuadCommand, material: EngineMaterial): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/lib/common/VerticeCommonShaderLib' {
+    import { EngineShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/EngineShaderLib";
+    import { Program } from "wonder.js/dist/es2015/renderer/program/Program";
+    import { QuadCommand } from "wonder.js/dist/es2015/renderer/command/QuadCommand";
+    import { EngineMaterial } from "wonder.js/dist/es2015/material/EngineMaterial";
+    import { GLSLChunk } from "wonder.js/dist/es2015/renderer/shader/chunk/ShaderChunk";
+    export class VerticeCommonShaderLib extends EngineShaderLib {
+        static create(): VerticeCommonShaderLib;
+        vsChunk: GLSLChunk;
+        fsChunk: GLSLChunk;
+        sendShaderVariables(program: Program, cmd: QuadCommand, material: EngineMaterial): void;
+        setShaderDefinition(cmd: QuadCommand, material: EngineMaterial): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/lib/EngineShaderLib' {
+    import { ShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/ShaderLib";
+    import { EngineShader } from "wonder.js/dist/es2015/renderer/shader/shader/EngineShader";
+    import { Hash } from "wonder-commonlib/dist/es2015/Hash";
+    import { ShaderVariable } from "wonder.js/dist/es2015/renderer/shader/variable/VariableLib";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { RenderCommand } from "wonder.js/dist/es2015/renderer/command/RenderCommand";
+    import { Material } from "wonder.js/dist/es2015/material/Material";
+    import { Program } from "wonder.js/dist/es2015/renderer/program/Program";
+    import { GLSLChunk } from "wonder.js/dist/es2015/renderer/shader/chunk/ShaderChunk";
+    export abstract class EngineShaderLib extends ShaderLib {
+        shader: EngineShader;
+        abstract vsChunk: GLSLChunk;
+        abstract fsChunk: GLSLChunk;
+        attributes: Hash<ShaderVariable>;
+        uniforms: Hash<ShaderVariable>;
+        vsSourceTop: string;
+        vsSourceDefine: string;
+        vsSourceVarDeclare: string;
+        vsSourceFuncDeclare: string;
+        vsSourceFuncDefine: string;
+        vsSourceBody: string;
+        vsSource: string;
+        fsSourceTop: string;
+        fsSourceDefine: string;
+        fsSourceVarDeclare: string;
+        fsSourceFuncDeclare: string;
+        fsSourceFuncDefine: string;
+        fsSourceBody: string;
+        fsSource: string;
+        vsSourceDefineList: Collection<any>;
+        fsSourceDefineList: Collection<any>;
+        vsSourceExtensionList: Collection<string>;
+        fsSourceExtensionList: Collection<string>;
+        setShaderDefinition(cmd: RenderCommand, material: Material): void;
+        protected sendAttributeBuffer(program: Program, name: string, data: any): void;
+        protected sendUniformData(program: Program, name: string, data: any): void;
+        protected getVsChunk(): any;
+        protected getVsChunk(chunk: GLSLChunk): any;
+        protected getFsChunk(): any;
+        protected getFsChunk(chunk: GLSLChunk): any;
+        protected setVsSource(vs: GLSLChunk | string, operator?: string): void;
+        protected setFsSource(fs: GLSLChunk | string, operator?: string): void;
+        protected addAttributeVariable(variableArr: Array<string>): void;
+        protected addUniformVariable(variableArr: Array<string>): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/lib/ShaderLib' {
+    import { Shader } from "wonder.js/dist/es2015/renderer/shader/shader/Shader";
+    import { Program } from "wonder.js/dist/es2015/renderer/program/Program";
+    import { RenderCommand } from "wonder.js/dist/es2015/renderer/command/RenderCommand";
+    import { Material } from "wonder.js/dist/es2015/material/Material";
+    export abstract class ShaderLib {
+        shader: Shader;
+        sendShaderVariables(program: Program, cmd: RenderCommand, material: Material): void;
+        init(): void;
+        dispose(): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/shader/CommonShader' {
+    import { EngineShader } from "wonder.js/dist/es2015/renderer/shader/shader/EngineShader";
+    import { QuadCommand } from "wonder.js/dist/es2015/renderer/command/QuadCommand";
+    import { Material } from "wonder.js/dist/es2015/material/Material";
+    export class CommonShader extends EngineShader {
+        static create(): CommonShader;
+        update(cmd: QuadCommand, material: Material): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/shader/EngineShader' {
+    import { Shader } from "wonder.js/dist/es2015/renderer/shader/shader/Shader";
+    import { EngineShaderSourceBuilder } from "wonder.js/dist/es2015/renderer/shader/sourceBuilder/EngineShaderSourceBuilder";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { EngineShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/EngineShaderLib";
+    import { RenderCommand } from "wonder.js/dist/es2015/renderer/command/RenderCommand";
+    import { Material } from "wonder.js/dist/es2015/material/Material";
+    import { ShaderSourceBuilder } from "wonder.js/dist/es2015/renderer/shader/sourceBuilder/ShaderSourceBuilder";
+    export abstract class EngineShader extends Shader {
+        protected sourceBuilder: EngineShaderSourceBuilder;
+        protected libs: Collection<EngineShaderLib>;
+        protected buildDefinitionData(cmd: RenderCommand, material: Material): void;
+        protected createShaderSourceBuilder(): ShaderSourceBuilder;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/shader/Shader' {
+    import { Hash } from "wonder-commonlib/dist/es2015/Hash";
+    import { Program } from "wonder.js/dist/es2015/renderer/program/Program";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { ShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/ShaderLib";
+    import { ShaderSourceBuilder } from "wonder.js/dist/es2015/renderer/shader/sourceBuilder/ShaderSourceBuilder";
+    import { RenderCommand } from "wonder.js/dist/es2015/renderer/command/RenderCommand";
+    import { Material } from "wonder.js/dist/es2015/material/Material";
+    import { EVariableType } from "wonder.js/dist/es2015/renderer/shader/variable/EVariableType";
+    export abstract class Shader {
+        attributes: Hash<ShaderData>;
+        uniforms: Hash<ShaderData>;
+        vsSource: string;
+        fsSource: string;
+        readonly dirty: boolean;
+        readonly program: Program;
+        libDirty: boolean;
+        definitionDataDirty: boolean;
+        protected libs: Collection<ShaderLib>;
+        protected sourceBuilder: ShaderSourceBuilder;
+        abstract update(cmd: RenderCommand, material: Material): any;
+        createVsShader(): any;
+        createFsShader(): any;
+        init(material: Material): void;
+        dispose(): void;
+        hasLib(lib: ShaderLib): any;
+        hasLib(_class: Function): any;
+        addLib(lib: ShaderLib): void;
+        addShaderLibToTop(lib: ShaderLib): void;
+        getLib(libClass: Function): ShaderLib;
+        getLibs(): Collection<ShaderLib>;
+        removeLib(lib: ShaderLib): any;
+        removeLib(func: Function): any;
+        removeAllLibs(): void;
+        sortLib(func: (a: ShaderLib, b: ShaderLib) => any): void;
+        protected abstract createShaderSourceBuilder(): ShaderSourceBuilder;
+        protected abstract buildDefinitionData(cmd: RenderCommand, material: Material): void;
+        protected judgeRefreshShader(cmd: RenderCommand, material: Material): void;
+    }
+    export type ShaderData = {
+        type: EVariableType;
+        value?: any;
+        textureId?: string;
+    };
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/sourceBuilder/EngineShaderSourceBuilder' {
+    import { ShaderSourceBuilder, SourceDefine } from "wonder.js/dist/es2015/renderer/shader/sourceBuilder/ShaderSourceBuilder";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { EngineShaderLib } from "wonder.js/dist/es2015/renderer/shader/lib/EngineShaderLib";
+    export class EngineShaderSourceBuilder extends ShaderSourceBuilder {
+        static create(): EngineShaderSourceBuilder;
+        vsSourceTop: string;
+        vsSourceDefine: string;
+        vsSourceVarDeclare: string;
+        vsSourceFuncDeclare: string;
+        vsSourceFuncDefine: string;
+        vsSourceBody: string;
+        fsSourceTop: string;
+        fsSourceDefine: string;
+        fsSourceVarDeclare: string;
+        fsSourceFuncDeclare: string;
+        fsSourceFuncDefine: string;
+        fsSourceBody: string;
+        vsSourceDefineList: Collection<SourceDefine>;
+        fsSourceDefineList: Collection<SourceDefine>;
+        vsSourceExtensionList: Collection<string>;
+        fsSourceExtensionList: Collection<string>;
+        build(libs: Collection<EngineShaderLib>): void;
+        clearShaderDefinition(): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/sourceBuilder/ShaderSourceBuilder' {
+    import { Hash } from "wonder-commonlib/dist/es2015/Hash";
+    import { ShaderData } from "wonder.js/dist/es2015/renderer/shader/shader/Shader";
+    export abstract class ShaderSourceBuilder {
+        attributes: Hash<ShaderData>;
+        uniforms: Hash<ShaderData>;
+        vsSource: string;
+        fsSource: string;
+        abstract build(...args: any[]): void;
+        abstract clearShaderDefinition(): void;
+        dispose(): void;
+        protected convertAttributesData(): void;
+    }
+    export type SourceDefine = {
+        name: string;
+        value: any;
+    };
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/variable/EVariableCategory' {
+    export enum EVariableCategory {
+        ENGINE,
+        CUSTOM,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/variable/EVariableSemantic' {
+    export enum EVariableSemantic {
+        POSITION,
+        NORMAL,
+        TEXCOORD,
+        TANGENT,
+        COLOR,
+        MODEL,
+        VIEW,
+        PROJECTION,
+        MODEL_VIEW,
+        MODEL_VIEW_PROJECTION,
+        MODEL_INVERSE,
+        VIEW_INVERSE,
+        PROJECTION_INVERSE,
+        MODEL_VIEW_INVERSE,
+        MODEL_VIEW_PROJECTION_INVERSE,
+        MODEL_INVERSE_TRANSPOSE,
+        MODEL_VIEW_INVERSE_TRANSPOSE,
+        VIEWPORT,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/variable/EVariableType' {
+    export enum EVariableType {
+        FLOAT_1,
+        FLOAT_2,
+        FLOAT_3,
+        FLOAT_4,
+        VECTOR_2,
+        VECTOR_3,
+        VECTOR_4,
+        COLOR_3,
+        FLOAT_MAT3,
+        FLOAT_MAT4,
+        BUFFER,
+        SAMPLER_CUBE,
+        SAMPLER_2D,
+        NUMBER_1,
+        STRUCTURE,
+        STRUCTURES,
+        SAMPLER_ARRAY,
+        FLOAT_MAT4_ARRAY,
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/variable/VariableLib' {
+    import { EVariableType } from "wonder.js/dist/es2015/renderer/shader/variable/EVariableType";
+    export class VariableLib {
+        static a_position: ShaderVariable;
+        static a_positionVec2: ShaderVariable;
+        static a_currentFramePosition: ShaderVariable;
+        static a_nextFramePosition: ShaderVariable;
+        static a_normal: ShaderVariable;
+        static a_currentFrameNormal: ShaderVariable;
+        static a_nextFrameNormal: ShaderVariable;
+        static a_color: ShaderVariable;
+        static a_texCoord: ShaderVariable;
+        static a_tangent: ShaderVariable;
+        static u_color: ShaderVariable;
+        static u_mMatrix: ShaderVariable;
+        static u_vMatrix: ShaderVariable;
+        static u_pMatrix: ShaderVariable;
+        static u_mvpMatrix: ShaderVariable;
+        static u_vpMatrix: ShaderVariable;
+        static u_normalMatrix: ShaderVariable;
+        static u_samplerCube0: ShaderVariable;
+        static u_sampler2D0: ShaderVariable;
+        static u_sampler2D1: ShaderVariable;
+        static u_lightMapSampler: ShaderVariable;
+        static u_diffuseMapSampler: ShaderVariable;
+        static u_diffuseMap1Sampler: ShaderVariable;
+        static u_diffuseMap2Sampler: ShaderVariable;
+        static u_diffuseMap3Sampler: ShaderVariable;
+        static u_specularMapSampler: ShaderVariable;
+        static u_emissionMapSampler: ShaderVariable;
+        static u_normalMapSampler: ShaderVariable;
+        static u_reflectionMapSampler: ShaderVariable;
+        static u_refractionMapSampler: ShaderVariable;
+        static u_cameraPos: ShaderVariable;
+        static u_refractionRatio: ShaderVariable;
+        static u_reflectivity: ShaderVariable;
+        static u_map0SourceRegion: ShaderVariable;
+        static u_map1SourceRegion: ShaderVariable;
+        static u_diffuseMapSourceRegion: ShaderVariable;
+        static u_map0RepeatRegion: ShaderVariable;
+        static u_map1RepeatRegion: ShaderVariable;
+        static u_diffuseMapRepeatRegion: ShaderVariable;
+        static u_combineMode: ShaderVariable;
+        static u_mixRatio: ShaderVariable;
+        static u_lightMapIntensity: ShaderVariable;
+        static u_diffuse: ShaderVariable;
+        static u_specular: ShaderVariable;
+        static u_emission: ShaderVariable;
+        static u_shininess: ShaderVariable;
+        static u_lightModel: ShaderVariable;
+        static u_isBothSide: ShaderVariable;
+        static u_opacity: ShaderVariable;
+        static u_ambient: ShaderVariable;
+        static u_directionLights: ShaderVariable;
+        static u_pointLights: ShaderVariable;
+        static u_vpMatrixFromLight: ShaderVariable;
+        static u_lightPos: ShaderVariable;
+        static u_farPlane: ShaderVariable;
+        static u_interpolation: ShaderVariable;
+        static u_tilesHeightNumber: ShaderVariable;
+        static u_tilesWidthNumber: ShaderVariable;
+        static u_amplitude: ShaderVariable;
+        static u_jointColor: ShaderVariable;
+        static u_time: ShaderVariable;
+        static u_speed: ShaderVariable;
+        static u_shift: ShaderVariable;
+        static u_alphaThreshold: ShaderVariable;
+        static u_fireColor: ShaderVariable;
+        static u_layerHeightDatas: ShaderVariable;
+        static u_layerSampler2Ds: ShaderVariable;
+        static u_herb1Color: ShaderVariable;
+        static u_herb2Color: ShaderVariable;
+        static u_herb3Color: ShaderVariable;
+        static u_groundColor: ShaderVariable;
+        static u_ampScale: ShaderVariable;
+        static u_woodColor: ShaderVariable;
+        static u_roadColor: ShaderVariable;
+        static u_skyColor: ShaderVariable;
+        static u_cloudColor: ShaderVariable;
+        static u_brickColor: ShaderVariable;
+        static u_waveData: ShaderVariable;
+        static u_windMatrix: ShaderVariable;
+        static u_bumpMapSampler: ShaderVariable;
+        static u_bumpMap1Sampler: ShaderVariable;
+        static u_bumpMap2Sampler: ShaderVariable;
+        static u_bumpMap3Sampler: ShaderVariable;
+        static u_levelData: ShaderVariable;
+        static a_mVec4_0: ShaderVariable;
+        static a_mVec4_1: ShaderVariable;
+        static a_mVec4_2: ShaderVariable;
+        static a_mVec4_3: ShaderVariable;
+        static a_normalVec4_0: ShaderVariable;
+        static a_normalVec4_1: ShaderVariable;
+        static a_normalVec4_2: ShaderVariable;
+        static u_isRenderListEmpty: ShaderVariable;
+        static u_isReflectionRenderListEmpty: ShaderVariable;
+        static u_isRefractionRenderListEmpty: ShaderVariable;
+        static u_bitmapSampler: ShaderVariable;
+        static a_page: ShaderVariable;
+        static u_pageSampler2Ds: ShaderVariable;
+        static u_mixMapSampler: ShaderVariable;
+        static u_diffuseMap1RepeatRegion: ShaderVariable;
+        static u_diffuseMap2RepeatRegion: ShaderVariable;
+        static u_diffuseMap3RepeatRegion: ShaderVariable;
+        static u_grassMapDatas: ShaderVariable;
+        static a_quadIndex: ShaderVariable;
+        static u_grassMapSampler: ShaderVariable;
+        static u_windData: ShaderVariable;
+        static a_vertexIndex: ShaderVariable;
+        static u_grassRangeWidth: ShaderVariable;
+        static u_grassRangeHeight: ShaderVariable;
+        static u_terrainRangeWidth: ShaderVariable;
+        static u_terrainRangeHeight: ShaderVariable;
+        static u_terrainMinHeight: ShaderVariable;
+        static u_terrainMaxHeight: ShaderVariable;
+        static u_terrainSubdivisions: ShaderVariable;
+        static u_terrainScaleY: ShaderVariable;
+        static u_terrainPositionY: ShaderVariable;
+        static u_heightMapSampler: ShaderVariable;
+        static u_lightColor: ShaderVariable;
+        static a_jointIndice: ShaderVariable;
+        static a_jointWeight: ShaderVariable;
+        static u_jointMatrices: ShaderVariable;
+    }
+    export type ShaderVariable = {
+        type: EVariableType;
+        value: any;
+    };
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/variable/VariableNameTable' {
+    export class VariableNameTable {
+        static getVariableName(name: string): string;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/variable/VariableTypeTable' {
+    import { EVariableType } from "wonder.js/dist/es2015/renderer/shader/variable/EVariableType";
+    export class VariableTypeTable {
+        static getVariableType(type: EVariableType): string;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/state/BasicState' {
+    import { WebGLState } from "wonder.js/dist/es2015/renderer/state/WebGLState";
+    import { Material } from "wonder.js/dist/es2015/material/Material";
+    export class BasicState extends WebGLState {
+        static create(): BasicState;
+        setState(material: Material): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/state/WebGLState' {
+    import { Material } from "wonder.js/dist/es2015/material/Material";
+    export abstract class WebGLState {
+        abstract setState(material: Material): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/structure/Color' {
+    import { Vector3 } from "wonder.js/dist/es2015/math/Vector3";
+    export class Color {
+        static create(colorVal?: string): Color;
+        dirty: boolean;
+        r: number;
+        g: number;
+        b: number;
+        a: number;
+        initWhenCreate(colorVal?: string): void;
+        toVector3(): Vector3;
+        toVector4(): any;
+        toString(): string;
+        clone(): Color;
+        isEqual(color: Color): boolean;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/structure/Face3' {
+    import { Vector3 } from "wonder.js/dist/es2015/math/Vector3";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    export class Face3 {
+        static create(aIndex: number, bIndex: number, cIndex: number, faceNormal?: Vector3, vertexNormals?: Collection<Vector3>): Face3;
+        constructor(aIndex: number, bIndex: number, cIndex: number, faceNormal: Vector3, vertexNormals: Collection<Vector3>);
+        faceNormal: Vector3;
+        aIndex: number;
+        bIndex: number;
+        cIndex: number;
+        vertexNormals: Collection<Vector3>;
+        clone(): this;
+        hasFaceNormal(): boolean;
+        hasVertexNormal(): boolean;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/structure/Point' {
+    export class Point {
+        x: number;
+        y: number;
+        constructor(x?: number, y?: number);
+        static create(x?: number, y?: number): Point;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/structure/RectRegion' {
+    import { Vector4 } from "wonder.js/dist/es2015/math/Vector4";
+    export class RectRegion extends Vector4 {
+        width: number;
+        height: number;
+        clone(): RectRegion;
+        isNotEmpty(): boolean;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/structure/View' {
+    import { ContextConfigData } from "wonder.js/dist/es2015/core/data/MainData";
+    export class ViewWebGL implements IView {
+        static create(view: any): ViewWebGL;
+        constructor(dom: any);
+        readonly offset: {
+            x: any;
+            y: any;
+        };
+        readonly dom: any;
+        width: number;
+        height: number;
+        styleWidth: string;
+        styleHeight: string;
+        x: number;
+        y: number;
+        initCanvas(): void;
+        getContext(contextConfig: ContextConfigData): WebGLRenderingContext;
+    }
+    export interface IView {
+        offset: {
+            x: number;
+            y: number;
+        };
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        styleWidth: string;
+        styleHeight: string;
+        dom: any;
+        getContext(contextConfig: ContextConfigData): WebGLRenderingContext;
+        initCanvas(): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/utils/ArrayUtils' {
+    import { ArrayUtils as ArrayUtils$ } from "wonder-commonlib/dist/es2015/utils/ArrayUtils";
+    export class ArrayUtils extends ArrayUtils$ {
+        static hasRepeatItems(arr: Array<any>): boolean;
+        static contain(arr: Array<any>, item: any): boolean;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/utils/BufferUtils' {
+    import { EVariableType } from "wonder.js/dist/es2015/renderer/shader/variable/EVariableType";
+    import { ArrayBuffer } from "wonder.js/dist/es2015/renderer/buffer/ArrayBuffer";
+    export class BufferUtils {
+        static convertArrayToArrayBuffer(type: EVariableType, value: Array<any>): ArrayBuffer;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/utils/ClassUtils' {
+    export class ClassUtils {
+        static getClassNameByInstance(obj: any): any;
+        static addClass(className: string, _class: any): void;
+        static addClassNameAttributeToClass(className: string, _class: any): void;
+        static getClass(className: string): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/utils/JudgeUtils' {
+    import { JudgeUtils as JudgeUtils$ } from "wonder-commonlib/dist/es2015/utils/JudgeUtils";
+    import { Entity } from "wonder.js/dist/es2015/core/Entity";
+    import { Component } from "wonder.js/dist/es2015/core/Component";
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    export class JudgeUtils extends JudgeUtils$ {
+        static isView(obj: any): boolean;
+        static isEqual(target1: any, target2: any): boolean;
+        static isPowerOfTwo(value: number): boolean;
+        static isFloatArray(data: any): boolean;
+        static isInterface(target: any, memberOfInterface: string): boolean;
+        static isSelf(self: Entity, entityObject: Entity): boolean;
+        static isComponenet(component: Component): boolean;
+        static isDom(obj: any): boolean;
+        static isCollection(list: Collection<any>): boolean;
+        static isClass(objInstance: any, className: string): boolean;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/utils/Log' {
+    import { Log as Log$ } from "wonder-commonlib/dist/es2015/Log";
+    export class Log extends Log$ {
+    }
+}
+
+declare module 'wonder.js/dist/es2015/utils/MathUtils' {
+    export class MathUtils {
+        static clamp(num: number, below: number, up: number): number;
+        static bigThan(num: number, below: number): number;
+        static generateZeroToOne(): number;
+        static generateMinToMax(min: number, max: number): number;
+        static generateInteger(min: number, max: number): number;
+        static mod(a: number, b: number): number;
+        static maxFloorIntegralMultiple(a: number, b: number): number;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/utils/RenderUtils' {
+    import { Collection } from "wonder-commonlib/dist/es2015/Collection";
+    import { GameObject } from "wonder.js/dist/es2015/core/entityObject/gameObject/GameObject";
+    export class RenderUtils {
+        static getGameObjectRenderList(sourceList: Collection<GameObject>): Collection<GameObject>;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/utils/ShaderLibUtils' {
+    import { Geometry } from "wonder.js/dist/es2015/component/geometry/Geometry";
+    import { Shader } from "wonder.js/dist/es2015/renderer/shader/shader/Shader";
+    export class ShaderLibUtils {
+        static addVerticeShaderLib(geometry: Geometry, shader: Shader): void;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/utils/SortUtils' {
+    export class SortUtils {
+        static insertSort(targetArr: Array<any>, compareFunc: (a: any, b: any) => boolean, isChangeSelf?: boolean): Array<any>;
+        static quickSort(targetArr: Array<any>, compareFunc: (a: any, b: any) => boolean, isChangeSelf?: boolean): Array<any>;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/utils/time/CommonTimeController' {
+    import { TimeController } from "wonder.js/dist/es2015/utils/time/TimeController";
+    export class CommonTimeController extends TimeController {
+        static create(): CommonTimeController;
+        protected getNow(): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/utils/time/DirectorTimeController' {
+    import { TimeController } from "wonder.js/dist/es2015/utils/time/TimeController";
+    export class DirectorTimeController extends TimeController {
+        static create(): DirectorTimeController;
+        gameTime: number;
+        fps: number;
+        isTimeChange: boolean;
+        deltaTime: number;
+        tick(time: number): void;
+        start(): void;
+        resume(): void;
+        protected getNow(): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/utils/time/TimeController' {
+    export abstract class TimeController {
+        elapsed: number;
+        pauseElapsed: number;
+        pauseTime: number;
+        startTime: number;
+        start(): void;
+        stop(): void;
+        pause(): void;
+        resume(): void;
+        computeElapseTime(time: number): number;
+        protected abstract getNow(): any;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/config/CompileConfig' {
+    export var CompileConfig: {
+        isCompileTest: boolean;
+        closeContractTest: boolean;
+    };
+}
+
+declare module 'wonder.js/dist/es2015/event/interface/IEventData' {
+    export interface IEventData {
+        returnValue: boolean;
+        preventDefault: () => void;
+    }
+    export interface IKeyboardEventData extends IEventData {
+        ctrlKey: number;
+        altKey: number;
+        shiftKey: number;
+        metaKey: number;
+        keyCode: number;
+    }
+    export interface IMouseEventData extends IEventData {
+        clientX: number;
+        clientY: number;
+        pageX: number;
+        pageY: number;
+        button: number;
+        detail?: number;
+        wheelDelta?: number;
+        movementX?: number;
+        webkitMovementX?: number;
+        mozMovementX?: number;
+        movementY?: number;
+        webkitMovementY?: number;
+        mozMovementY?: number;
+        target: HTMLElement;
+        currentTarget: HTMLElement;
+    }
+    export interface ITouchEventData extends IEventData {
+        touches: Array<ITouchData>;
+        changedTouches: Array<ITouchData>;
+        targetTouches: Array<ITouchData>;
+        target: HTMLElement;
+        currentTarget: HTMLElement | null;
+    }
+    export interface ITouchData {
+        clientX: number;
+        clientY: number;
+        identifier: number;
+        pageX: number;
+        pageY: number;
+        screenX: number;
+        screenY: number;
+        radiusX: number;
+        radiusY: number;
+        rotationAngle: number;
+        force: number;
+        target: HTMLElement;
+    }
+    export interface IPointEventData extends IEventData {
+        clientX: number;
+        clientY: number;
+        pageX: number;
+        pageY: number;
+        button?: number;
+        detail?: number;
+        wheelDelta?: number;
+        movementX?: number;
+        webkitMovementX?: number;
+        mozMovementX?: number;
+        movementY?: number;
+        webkitMovementY?: number;
+        mozMovementY?: number;
+        target: HTMLElement;
+        currentTarget: HTMLElement | null;
+    }
+}
+
+declare module 'wonder.js/dist/es2015/renderer/shader/chunk/ShaderChunk' {
+    export const empty: GLSLChunk;
+    export const NULL: number;
+    export const basic_materialColor_fragment: GLSLChunk;
+    export const end_basic_fragment: GLSLChunk;
+    export const common_define: GLSLChunk;
+    export const common_fragment: GLSLChunk;
+    export const common_function: GLSLChunk;
+    export const common_vertex: GLSLChunk;
+    export const highp_fragment: GLSLChunk;
+    export const lowp_fragment: GLSLChunk;
+    export const mediump_fragment: GLSLChunk;
+    export type GLSLChunk = {
+        top?: string;
+        define?: string;
+        varDeclare?: string;
+        funcDeclare?: string;
+        funcDefine?: string;
+        body?: string;
+    };
+}
+
diff --git a/whatwg-fetch/tsconfig.json b/wonder.js/tsconfig.json
similarity index 93%
rename from whatwg-fetch/tsconfig.json
rename to wonder.js/tsconfig.json
index 1855761487..0fdebb2ebc 100644
--- a/whatwg-fetch/tsconfig.json
+++ b/wonder.js/tsconfig.json
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "whatwg-fetch-tests.ts"
+        "wonder.js-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/wonder.js/wonder.js-tests.ts b/wonder.js/wonder.js-tests.ts
new file mode 100644
index 0000000000..eb486e6a48
--- /dev/null
+++ b/wonder.js/wonder.js-tests.ts
@@ -0,0 +1,4 @@
+import {Director} from "wonder.js/dist/es2015/core/Director";
+
+console.log(Director.getInstance());
+
diff --git a/x-editable/x-editable-tests.ts b/x-editable/x-editable-tests.ts
index c4c03a46be..3c121b8528 100644
--- a/x-editable/x-editable-tests.ts
+++ b/x-editable/x-editable-tests.ts
@@ -1,10 +1,3 @@
-// Type definitions for X-Editable v1.5.1
-// Project: http://vitalets.github.io/x-editable/index.html
-// Definitions by: Chris Kirby <https://github.com/sirkirby/>
-// Definitions: https://github.com/sirkirby/DefinitelyTyped
-
-/// <reference types="jquery"/>
-
 // server post and response
 $('#username').editable({
     success: function(response : any, newValue : any) {
diff --git a/xml2js/index.d.ts b/xml2js/index.d.ts
index 6dd10acce4..12d2488cbe 100644
--- a/xml2js/index.d.ts
+++ b/xml2js/index.d.ts
@@ -1,12 +1,14 @@
 // Type definitions for node-xml2js
 // Project: https://github.com/Leonidas-from-XIV/node-xml2js
-// Definitions by: Michel Salib <https://github.com/michelsalib>, Jason McNeil <https://github.com/jasonrm>, Christopher Currens <https://github.com/ccurrens>
+// Definitions by: Michel Salib <https://github.com/michelsalib>, Jason McNeil <https://github.com/jasonrm>, Christopher Currens <https://github.com/ccurrens>, Edward Hinkle <https://github.com/edwardhinkle>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="./processors.d.ts" />
 
 export = xml2js;
 
+import * as events from 'events'
+
 declare namespace xml2js {
     function parseString(xml: convertableToString, callback: (err: any, result: any) => void): void;
     function parseString(xml: convertableToString, options: OptionsV2, callback: (err: any, result: any) => void): void;
@@ -21,7 +23,7 @@ declare namespace xml2js {
         buildObject(rootObj: any): string;
     }
 
-    class Parser {
+    class Parser extends events.EventEmitter {
         constructor(options?: OptionsV2);
         parseString(str: convertableToString, cb?: Function): void;
         reset(): void;
diff --git a/xml2js/xml2js-tests.ts b/xml2js/xml2js-tests.ts
index 62324b6908..8ee7b7ce25 100644
--- a/xml2js/xml2js-tests.ts
+++ b/xml2js/xml2js-tests.ts
@@ -69,6 +69,11 @@ var outString = builder.buildObject({
 
 var parser = new xml2js.Parser();
 
+parser.on('end', (result: any) => {
+    console.log("Parser Finished");
+    return;
+});
+
 var v1Defaults = xml2js.defaults['0.1'];
 v1Defaults.async = true;
 
diff --git a/xmldom/index.d.ts b/xmldom/index.d.ts
old mode 100644
new mode 100755
index dfbe34599c..8c252389cc
--- a/xmldom/index.d.ts
+++ b/xmldom/index.d.ts
@@ -7,6 +7,11 @@
 declare namespace xmldom {
     var DOMParser: DOMParserStatic;
     var XMLSerializer: XMLSerializerStatic;
+    var DOMImplementation: DOMImplementationStatic;
+
+    interface DOMImplementationStatic {
+        new(): DOMImplementation;
+    }
 
     interface DOMParserStatic {
         new (): DOMParser;
diff --git a/xmlpoke/xmlpoke-tests.ts b/xmlpoke/xmlpoke-tests.ts
index 3c82b846a6..aba04c0962 100644
--- a/xmlpoke/xmlpoke-tests.ts
+++ b/xmlpoke/xmlpoke-tests.ts
@@ -1,7 +1,3 @@
-/// <reference types="node" />
-
-// tsc xmlpoke-tests.ts && node xmlpoke-tests.js
-
 import * as xmlpoke from 'xmlpoke';
 import * as assert from 'assert';
 
diff --git a/xmpp-jid/index.d.ts b/xmpp-jid/index.d.ts
deleted file mode 100644
index 678e306abc..0000000000
--- a/xmpp-jid/index.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for @xmpp/jid 0.0
-// Project: github.com/node-xmpp/node-xmpp/
-// Definitions by: PJakcson <https://github.com/PJakcson>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
-import {JID} from './lib/JID';
-
-export declare function createJID(local: string, domain: string, resource: string): JID;
-
-export {JID} from './lib/JID';
-
-export declare function equal(a: JID, b: JID): boolean;
-export declare function is(a: any): boolean;
diff --git a/xmpp-jid/lib/JID.d.ts b/xmpp-jid/lib/JID.d.ts
deleted file mode 100644
index a1d2558b30..0000000000
--- a/xmpp-jid/lib/JID.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Created by marcneumann on 17.02.17.
- */
-
-export declare class JID {
-    local: string;
-    domain: string;
-    resource: string;
-
-    constructor(local: string, domain?: string, resource?: string);
-
-    parseJID(jid: string): void;
-
-    toString(unescape?: any): string;
-
-    /**
-     * Convenience method to distinguish users
-     **/
-    bare(): JID;
-
-    /**
-     * Comparison function
-     **/
-    equals(other: JID): boolean;
-
-    /**
-     * http://xmpp.org/rfcs/rfc6122.html#addressing-localpart
-     **/
-    setLocal(local: string, escape?: any): void;
-
-    getLocal(unescape?: any): string;
-
-    /**
-     * http://xmpp.org/rfcs/rfc6122.html#addressing-domain
-     */
-    setDomain(value: string): void;
-
-    getDomain(): string;
-
-    /**
-     * http://xmpp.org/rfcs/rfc6122.html#addressing-resourcepart
-     */
-    setResource(value: string): void;
-
-    getResource(): string;
-}
diff --git a/xmpp-jid/xmpp-jid-tests.ts b/xmpp-jid/xmpp-jid-tests.ts
deleted file mode 100644
index 6b33b2c349..0000000000
--- a/xmpp-jid/xmpp-jid-tests.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import {JID} from './index';
-
-/*
- * All return an instance of JID.JID, the new operator is optional.
- */
-let addr = new JID('alice@wonderland.net/rabbithole');          // OK
-addr = new JID('alice', 'wonderland.net', 'rabbithole');    // BEST; see section on escaping below
-
-/*
- * local
- */
-addr.local = 'alice';
-addr.local;      // alice
-// same as
-addr.setLocal('alice');
-addr.getLocal(); // alice
-
-/*
- * domain
- */
-addr.domain = 'wonderland.net';
-addr.domain;      // wonderland.net
-// same as
-addr.setDomain('wonderland.net');
-addr.getDomain(); // wonderland.net
-
-/*
- * resource
- */
-addr.resource = 'rabbithole';
-addr.resource;      // rabbithole
-// same as
-addr.setResource('rabbithole');
-addr.getResource(); // rabbithole
-
-addr.toString(); // alice@wonderland.net/rabbithole
-addr.bare();     // returns a JID without resource
-
-let some_jid = new JID('is', 'a', 'test');
-addr.equals(some_jid); // returns true if the two JIDs are equal, false otherwise
diff --git a/xrm/index.d.ts b/xrm/index.d.ts
index 02bce0468e..67c5a8e778 100644
--- a/xrm/index.d.ts
+++ b/xrm/index.d.ts
@@ -1188,6 +1188,19 @@ declare namespace Xrm
             getVisible(): boolean;
         }
 
+        /**
+         * Interface for UI elements which can have the visibility value updated.
+         */
+        export interface UiCanSetVisibleElement
+        {
+            /**
+             * Sets the visibility state.
+             *
+             * @param   {boolean}   visible true to show, false to hide.
+             */
+            setVisible( visible: boolean ): void;
+        }
+
         /**
          * Base interface for standard UI elements.
          */
@@ -2522,7 +2535,7 @@ declare namespace Xrm
          *
          * @sa  FramedControl
          */
-        export interface IframeControl extends FramedControl
+        export interface IframeControl extends FramedControl, UiCanSetVisibleElement
         {
             /**
              * Gets initial URL defined for the Iframe.
diff --git a/xrm/v7/xrm-tests.ts b/xrm/v7/xrm-tests.ts
index 1b82805648..1c8288fae4 100644
--- a/xrm/v7/xrm-tests.ts
+++ b/xrm/v7/xrm-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="parature.d.ts" />
-
 /// Demonstrate usage in the browser's window object
 
 window.Xrm.Utility.alertDialog( "message", () => {} );
diff --git a/youtube/index.d.ts b/youtube/index.d.ts
index ca5d99550a..a45ec6a8c8 100644
--- a/youtube/index.d.ts
+++ b/youtube/index.d.ts
@@ -1,166 +1,935 @@
 // Type definitions for YouTube
 // Project: https://developers.google.com/youtube/
-// Definitions by: Daz Wilkin <https://github.com/DazWilkin/>, Ian Obermiller <http://ianobermiller.com>
+// Definitions by: Daz Wilkin <https://github.com/DazWilkin/>,
+//                 Ian Obermiller <http://ianobermiller.com>,
+//                 Josh Goldberg <https://gitub.com/JoshuaKGoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
-declare namespace YT {
-    interface EventArgs {
-        target: Player;
-        data: any;
-    }
-
-    interface EventHandler {
-        (event: EventArgs): void;
-    }
-
-    export interface Events {
-        onReady?: EventHandler;
-        onPlayback?: EventHandler;
-        onStateChange?: EventHandler;
-        onError?: EventHandler;
-    }
-
-	export enum ListType {
-		search,
-		user_uploads,
-		playlist,
+/**
+ * @see https://developers.google.com/youtube/iframe_api_reference
+ * @see https://developers.google.com/YouTube/player_parameters
+ */
+declare namespace YT
+{
+	/**
+	 * State of a video player.
+	 */
+	export enum PlayerState
+	{
+		UNSTARTED = -1,
+		ENDED = 0,
+		PLAYING = 1,
+		PAUSED = 2,
+		BUFFERING = 3,
+		CUED = 5
 	}
 
-    export interface PlayerVars {
-        autohide?: number;
-        autoplay?: number;
-        cc_load_policy?: any;
-        color?: string;
-		controls?: number;
-		disablekb?: number;
-		enablejsapi?: number;
+	/**
+	 * Known causes for player errors.
+	 */
+	export const enum PlayerError
+	{
+		/**
+		 * The request contained an invalid parameter value.
+		 */
+		InvalidParam = 2,
+
+		/**
+		 * The requested content cannot be played in an HTML5 player.
+		 */
+		Html5Error = 5,
+
+		/**
+		 * The video requested was not found.
+		 */
+		VideoNotFound = 100,
+
+		/**
+		 * The owner of the requested video does not allow it to be played in embedded players.
+		 */
+		EmbeddingNotAllowed = 101,
+
+		/**
+		 * This error is the same as 101. It's just a 101 error in disguise!
+		 */
+		EmbeddingNotAllowed2 = 150
+	}
+
+	/**
+	 * Whether to auto-hide video controls.
+	 */
+	export const enum AutoHide
+	{
+		/**
+		 * Controls are visible throughout the video
+		 */
+		AlwaysVisible = 0,
+
+		/**
+		 * Progress bar and player controls slide out of view after a couple of seconds.
+		 */
+		HideAllControls = 1,
+
+		/**
+		 * Progress bar fades out while the player controls remain visible.
+		 */
+		HideProgressBar = 2
+	}
+
+	/**
+	 * Whether to autoplay the video.
+	 */
+	export const enum AutoPlay
+	{
+		/**
+		 * Video does not autoplay.
+		 */
+		NoAutoPlay = 0,
+
+		/**
+		 * Video will autoplay when loaded.
+		 */
+		AutoPlay = 1
+	}
+
+	/**
+	 * Whether to use user-preferred or forced caption loading.
+	 */
+	export const enum ClosedCaptionsLoadPolicy
+	{
+		/**
+		 * Defaults to the user's preferences.
+		 */
+		UserDefault = 0,
+
+		/**
+		 * For closed captions to be shown.
+		 */
+		ForceOn = 1
+	}
+
+	/**
+	 * Allowed progress bar colors.
+	 */
+	export type ProgressBarColor = "red" | "white";
+
+	/**
+	 * How video controls are shown.
+	 */
+	export const enum Controls
+	{
+		/**
+		 * Player controls do not display.
+		 */
+		Hide = 0,
+
+		/**
+		 * Player controls display.
+		 */
+		ShowLoadPlayer = 1,
+
+		/**
+		 * Player controls display after a delay.
+		 */
+		ShowDelayLoadPlayer = 2
+	}
+
+	/**
+	 * Whether to allow keyboard controls.
+	 */
+	export const enum KeyboardControls
+	{
+		/**
+		 * Keyboard controls are enabled.
+		 */
+		Enable = 0,
+
+		/**
+		 * Keyboard controls are disabled.
+		 */
+		Disable = 1
+	}
+
+	/**
+	 * Whether the JavaScript API should be enabled.
+	 */
+	export const enum JsApi
+	{
+		/**
+		 * JavaScript API will be disabled.
+		 */
+		Disable = 0,
+
+		/**
+		 * JavaScript API will be enabled.
+		 */
+		Enable = 1
+	}
+
+	/**
+	 * Whether to display the full-screen button.
+	 */
+	export const enum FullscreenButton
+	{
+		/**
+		 * The full screen button is hidden.
+		 */
+		Hide = 0,
+
+		/**
+		 * The full screen button is visible.
+		 */
+		Show = 1
+	}
+
+	/**
+	 * Whether to show video annotations.
+	 */
+	export const enum IvLoadPolicy
+	{
+		/**
+		 * Video annotations will be shown.
+		 */
+		Show = 1,
+
+		/**
+		 * Video annotations will not be shown.
+		 */
+		Hide = 3
+	}
+
+	/**
+	 * Which type of content loads in the player.
+	 */
+	export type ListType = ListTypePlayer | ListTypeSearch | ListTypeUserUploads;
+
+	/**
+	 * The requested video should be shown in the player.
+	 */
+	export type ListTypePlayer = "player";
+
+	/**
+	 * A search area should be shown in the player.
+	 */
+	export type ListTypeSearch = "search";
+
+	/**
+	 * The user's uploads should load in the player.
+	 */
+	export type ListTypeUserUploads = "user_uploads";
+
+	/**
+	 * Whether a single video should be looped.
+	 */
+	export const enum Loop
+	{
+		/**
+		 * Video or playlist will be played only once.
+		 */
+		SinglePlay = 0,
+
+		/**
+		 * Video or playlist will be played over and over again.
+		 */
+		Loop = 1
+	}
+
+	/**
+	 * Comma separated list of video IDs to play after the URL path's video.
+	 */
+	export const enum ModestBranding
+	{
+		/**
+		 * Player will contain full YouTube branding.
+		 */
+		Full = 0,
+
+		/**
+		 * YouTube logo will not display in the control bar.
+		 */
+		Modest = 1
+	}
+
+	/**
+	 * Whether to show related videos after the video finishes.
+	 */
+	export const enum RelatedVideos
+	{
+		/**
+		 * Hide related videos after playback is complete.
+		 */
+		Hide = 0,
+
+		/**
+		 * Show related videos after playback is complete.
+		 */
+		Show = 1
+	}
+
+	/**
+	 * Whether to show video information before playing.
+	 */
+	export const enum ShowInfo
+	{
+		/**
+		 * Hide video title and uploader before video starts playing.
+		 */
+		Hide = 0,
+
+		/**
+		 * Show video title and uploader before video starts playing.
+		 */
+		Show = 1
+	}
+
+	/**
+	 * Base interface for events triggered by a player.
+	 */
+	export interface PlayerEvent
+	{
+		/**
+		 * Video player corresponding to the event.
+		 */
+		target: Player;
+	}
+
+	/**
+	 * Event for player state change.
+	 */
+	export interface OnStateChangeEvent extends PlayerEvent
+	{
+		/**
+		 * New player state.
+		 */
+		data: PlayerState;
+	}
+
+	/**
+	 * Event for playback quality change.
+	 */
+	export interface OnPlaybackQualityChangeEvent extends PlayerEvent
+	{
+		/**
+		 * New playback quality.
+		 */
+		data: string;
+	}
+
+	/**
+	 * Event for playback rate change.
+	 */
+	export interface OnPlaybackRateChangeEvent extends PlayerEvent
+	{
+		/**
+		 * New playback rate.
+		 */
+		data: number;
+	}
+
+	/**
+	 * Event for a player error.
+	 */
+	export interface OnErrorEvent extends PlayerEvent
+	{
+		/**
+		 * Which type of error occurred.
+		 */
+		data: PlayerError;
+	}
+
+	/**
+	 * Handles a player event.
+	 *
+	 * @param event   The triggering event.
+	 */
+	export interface PlayerEventHandler<TEvent extends PlayerEvent>
+	{
+		(event: TEvent): void;
+	}
+
+	/**
+	 * YouTube player options.
+	 */
+	export interface PlayerOptions
+	{
+		/**
+		 * Player width.
+		 */
+		width?: number;
+
+		/**
+		 * Player height
+		 */
+		height?: number;
+
+		/**
+		 * ID of the video to load.
+		 */
+		videoId: string;
+
+		/**
+		 * Player parameters.
+		 */
+		playerVars?: PlayerVars;
+
+		/**
+		 * Handlers for events fired by the player.
+		 */
+		events?: Events;
+	}
+
+	/**
+	 * Allowed suggested player video qualities.
+	 */
+	export type SuggestedVideoQuality = (
+		VideoQualityDefault
+		| VideoQualitySmall
+		| VideoQualityMedium
+		| VideoQualityLarge
+		| VideoQualityHD720
+		| VideoQualityHD1080
+		| VideoQualityHighRes);
+
+	/**
+	 * Default video quality chosen by YouTube.
+	 */
+	export type VideoQualityDefault = "default";
+
+	/**
+	 * Player height is 240px, and player dimensions are at least 320px by 240px for 4:3 aspect ratio.
+	 */
+	export type VideoQualitySmall = "small";
+
+	/**
+	 * Player height is 360px, and player dimensions are 640px by 360px (for 16:9 aspect ratio) or 480px by 360px (for 4:3 aspect ratio).
+	 */
+	 export type VideoQualityMedium = "medium";
+
+	/**
+	 * Player height is 480px, and player dimensions are 853px by 480px (for 16:9 aspect ratio) or 640px by 480px (for 4:3 aspect ratio).
+	 */
+	 export type VideoQualityLarge = "large";
+
+	/**
+	 * Player height is 720px, and player dimensions are 1280px by 720px (for 16:9 aspect ratio) or 960px by 720px (for 4:3 aspect ratio).
+	 */
+	 export type VideoQualityHD720 = "hd720";
+
+	/**
+	 * Player height is 1080px, and player dimensions are 1920px by 1080px (for 16:9 aspect ratio) or 1440px by 1080px (for 4:3 aspect ratio).
+	 */
+	 export type VideoQualityHD1080 = "hd1080";
+
+	/**
+	 * Player height is greater than 1080px, which means that the player's aspect ratio is greater than 1920px by 1080px.
+	 */
+	 export type VideoQualityHighRes = "highres";
+
+	/**
+	 * Player parameters.
+	 */
+	export interface PlayerVars
+	{
+		/**
+		 * Whether to autohide video controls (by default, HideProgressBar).
+		 */
+		autohide?: AutoHide;
+
+		/**
+		 * Whether to autoplay the video (by default, NoAutoPlay).
+		 */
+		autoplay?: AutoPlay;
+
+		/**
+		 * Whether to use user-preferred or forced caption loading (by default, UserDefault).
+		 */
+		cc_load_policy?: ClosedCaptionsLoadPolicy;
+
+		/**
+		 * Player progress bar color
+		 */
+		color?: ProgressBarColor;
+
+		/**
+		 * How video controls are shown (by default, ShowLoadPlayer).
+		 */
+		controls?: Controls;
+
+		/**
+		 * Whether to allow keyboard controls (by default, Enable).
+		 */
+		disablekb?: KeyboardControls;
+
+		/**
+		 * Whether the JavaScript API should be enabled (by default, Disable).
+		 */
+		enablejsapi?: JsApi;
+
+		/**
+		 * Time, in seconds from the beginning of the video, when to stop playing.
+		 */
 		end?: number;
-		fs?: number;
-		iv_load_policy?: number;
+
+		/**
+		 * Whether to display the full-screen button (by default, Show).
+		 */
+		fs?: FullscreenButton;
+
+		/**
+		 * Player language as an ISO 639-1 two-letter language code or fully-specified locale.
+		 */
+		hl?: string;
+
+		/**
+		 * Whether to show video annotations (by default, Show).
+		 */
+		iv_load_policy?: IvLoadPolicy;
+
+		/**
+		 * Identifies content that will load.
+		 * If listType is search, this is the search query.
+		 * If listType is user_uploads, this is the YouTube user.
+		 * If listType is playlist, this is the playlist ID, prepended by 'PL'.
+		 */
 		list?: string;
+
+		/**
+		 * Which type of content loads in the player.
+		 */
 		listType?: ListType;
-		loop?: number;
-		modestbranding?: number;
+
+		/**
+		 * Whether a single video should be looped (by default, SinglePlay).
+		 */
+		loop?: Loop;
+
+		/**
+		 * Whether to hide some YouTube branding (by default, Full).
+		 */
+		modestbranding?: ModestBranding;
+
+		/**
+		 * Origin domain for additional security if using the JavaScript API.
+		 */
 		origin?: string;
-        playerpiid?: string;
-		playlist?: string[];
-        playsinline?: number;
-		rel?: number;
-        showinfo?: number;
+
+		/**
+		 * Comma separated list of video IDs to play after the URL path's video.
+		 */
+		playlist?: string;
+
+		/**
+		 * Whether to show related videos after the video finishes (by default, Show).
+		 */
+		rel?: RelatedVideos;
+
+		/**
+		 * Whether to show video information before playing (by default, Show).
+		 */
+		showinfo?: ShowInfo;
+
+		/**
+		 * Time, in seconds from the beginning of the video, when to start playing.
+		 */
 		start?: number;
-        theme?: string;
-    }
+	}
 
-    export interface PlayerOptions {
-        width?: string | number;
-        height?: string | number;
-        videoId?: string;
-        playerVars?: PlayerVars;
-        events?: Events;
-    }
+	/**
+	 * Handlers for events fired by the player.
+	 */
+	export interface Events
+	{
+		/**
+		 * Event fired when a player has finished loading and is ready to begin receiving API calls.
+		 */
+		onReady?: PlayerEventHandler<PlayerEvent>;
 
-    interface VideoByIdParams {
-        videoId: string;
-        startSeconds?: number;
-        endSeconds?: number;
-        suggestedQuality?: string;
-    }
+		/**
+		 * Event fired when the player's state changes.
+		 */
+		onStateChange?: PlayerEventHandler<OnStateChangeEvent>;
 
-    interface VideoByUrlParams {
-        mediaContentUrl: string;
-        startSeconds?: number;
-        endSeconds?: number;
-        suggestedQuality?: string;
-    }
+		/**
+		 * Event fired when the playback quality of the player changes.
+		 */
+		onPlaybackQualityChange?: PlayerEventHandler<OnPlaybackQualityChangeEvent>;
 
-    export interface VideoData
-    {
-        video_id: string;
-        author: string;
-        title: string;
-    }
+		/**
+		 * Event fired when the playback rate of the player changes.
+		 */
+		onPlaybackRateChange?: PlayerEventHandler<OnPlaybackRateChangeEvent>;
 
-    export class Player {
-        // Constructor
-        constructor(id: string, playerOptions: PlayerOptions);
-        constructor(element: HTMLElement, playerOptions: PlayerOptions);
+		/**
+		 * Event fired when an error in the player occurs
+		 */
+		onError?: PlayerEventHandler<OnErrorEvent>;
 
-        // Queueing functions
-        loadVideoById(videoId: string, startSeconds?: number, suggestedQuality?: string): void;
-        loadVideoById(VideoByIdParams: Object): void;
-        cueVideoById(videoId: string, startSeconds?: number, suggestedQuality?: string): void;
-        cueVideoById(VideoByIdParams: Object): void;
+		/**
+		 * Event fired to indicate thath the player has loaded, or unloaded, a module
+		 * with exposed API methods. This currently only occurs for closed captioning.
+		 */
+		onApiChange?: PlayerEventHandler<PlayerEvent>;
+	}
 
-        loadVideoByUrl(mediaContentUrl: string, startSeconds?: number, suggestedQuality?: string): void;
-        loadVideoByUrl(VideoByUrlParams: Object): void;
-        cueVideoByUrl(mediaContentUrl: string, startSeconds?: number, suggestedQuality?: string): void;
-        cueVideoByUrl(VideoByUrlParams: Object): void;
+	/**
+	 * Settings to load, play, or queue a video or playlist.
+	 */
+	export interface VideoOrPlaylistSettings {
+		/**
+		 * Time, in seconds from the beginning of the (first) video, when to start playing.
+		 */
+		startSeconds?: number;
 
-        // Properties
-        size: any;
+		/**
+		 * Time, in seconds from the end of the (first) video, when to end playing.
+		 */
+		endSeconds?: number;
 
-        // Playing
-        playVideo(): void;
-        pauseVideo(): void;
-        stopVideo(): void;
-        seekTo(seconds:number, allowSeekAhead:boolean): void;
-        clearVideo(): void;
+		/**
+		 * Suggested video player quality.
+		 */
+		suggestedQuality?: SuggestedVideoQuality
+	}
 
-        // Playlist
-        nextVideo(): void;
-        previousVideo(): void;
-        playVideoAt(index: number): void;
+	/**
+	 * Settings to play or queue a video by ID.
+	 */
+	export interface VideoByIdSettings extends VideoOrPlaylistSettings {
+		/**
+		 * Video ID.
+		 */
+		videoId: string;
+	}
 
-        // Volume
-        mute(): void;
-        unMute(): void;
-        isMuted(): boolean;
-        setVolume(volume: number): void;
-        getVolume(): number;
+	/**
+	 * Settings to play or queue a video by media content URL.
+	 */
+	export interface VideoByMediaContentUrlSettings extends VideoOrPlaylistSettings {
+		/**
+		 * Fully qualified player URL.
+		 */
+		mediaContentUrl: string;
+	}
 
-        // Sizing
-        setSize(width: number, height: number): any;
+	/**
+	 * Settings to load or queue a playlist.
+	 */
+	export interface IPlaylistSettings extends VideoOrPlaylistSettings {
+		/**
+		 * Identifier for the listType videos list.
+		 */
+		list: string;
 
-        // Playback
-        getPlaybackRate(): number;
-        setPlaybackRate(suggestedRate:number): void;
-        getAvailablePlaybackRates(): number[];
+		/**
+		 * Which type of content loads in the player.
+		 */
+		listType?: ListType;
 
-        // Behavior
-        setLoop(loopPlaylists: boolean): void;
-        setShuffle(shufflePlaylist: boolean): void;
+		/**
+		 * Start index of the playlist, if not 0.
+		 */
+		index?: number;
+	}
 
-        // Status
-        getVideoLoadedFraction(): number;
-        getPlayerState(): number;
-        getCurrentTime(): number;
-        getVideoStartBytes(): number;
-        getVideoBytesLoaded(): number;
-        getVideoBytesTotal(): number;
+	/**
+	 * Creates and controls a YouTube player in an <iframe>.
+	 */
+	export class Player
+	{
+		/**
+		 * Initializes a new instance of the Player class.
+		 *
+		 * @param container   DOM element to insert the player's <iframe>.
+		 * @param options   Player options.
+		 */
+		constructor(elt: HTMLElement, options: PlayerOptions);
 
-        // Information
-        getDuration(): number;
-        getVideoUrl(): string;
-        getVideoEmbedCode(): string;
-        getVideoData(): VideoData;
+		/**
+		 * Initializes a new instance of the Player class.
+		 *
+		 * @param id   ID of the DOM element to insert the player's <iframe>.
+		 * @param options   Player options.
+		 */
+		constructor(id: string, options: PlayerOptions);
 
-        // Playlist
-        getPlaylist(): any[];
-        getPlaylistIndex(): number;
+		/**
+		 * Queues a video by ID.
+		 *
+		 * @param videoId   Video ID.
+		 * @param startSeconds   Time from which the video should start playing.
+		 * @param suggestedQuality   Suggested video player quality.
+		 */
+		cueVideoById(videoId: string, startSeconds?: number, suggestedQuality?: SuggestedVideoQuality): void;
 
-        // Event Listener
-        addEventListener(event: string, handler: EventHandler): void;
+		/**
+		 * Queues a video by ID.
+		 *
+		 * @param args   Settings to queue the video.
+		 */
+		cueVideoById(args: VideoByIdSettings): void;
 
-        // DOM
-        destroy(): void;
-    }
+		/**
+		 * Loads and plays a video by ID.
+		 *
+		 * @param videoId   Video ID.
+		 * @param startSeconds   Time from which the video should start playing.
+		 * @param suggestedQuality   Suggested video player quality.
+		 */
+		loadVideoById(videoId: string, startSeconds?: number, suggestedQuality?: SuggestedVideoQuality): void;
 
-    export enum PlayerState {
-        UNSTARTED,
-        BUFFERING,
-        CUED,
-        ENDED,
-        PAUSED,
-        PLAYING
-    }
+		/**
+		 * Loads and plays a video by ID.
+		 *
+		 * @param args   Settings to play the video.
+		 */
+		loadVideoById(args: VideoByIdSettings): void;
+
+		/**
+		 * Queues a video by media content URL.
+		 *
+		 * @param mediaContentUrl   Fully qualified player URL.
+		 * @param startSeconds   Time from which the video should start playing.
+		 * @param suggestedQuality   Suggested video player quality.
+		 */
+		cueVideoByUrl(mediaContentUrl: string, startSeconds?: number, suggestedQuality?: SuggestedVideoQuality): void;
+
+		/**
+		 * Queues a video by media content URL.
+		 *
+		 * @param args   Settings to play the video.
+		 */
+		cueVideoByUrl(args: VideoByMediaContentUrlSettings): void;
+
+		/**
+		 * Loads a video by media content URL.
+		 *
+		 * @param mediaContentUrl   Fully qualified player URL.
+		 * @param startSeconds   Time from which the video should start playing.
+		 * @param suggestedQuality   Suggested video player quality.
+		 */
+		loadVideoByUrl(mediaContentUrl: string, startSeconds?: number, suggestedQuality?: SuggestedVideoQuality): void;
+
+		/**
+		 * Loads a video by media content URL.
+		 *
+		 * @param args   Settings to play the video.
+		 */
+		loadVideoByUrl(args: { mediaContentUrl: string; startSeconds?: number; endSeconds?: number; suggestedQuality?: SuggestedVideoQuality }): void;
+
+		/**
+		 * Queues a playlist of videos.
+		 *
+		 * @param playlist   Video ID(s) to play.
+		 * @param index   Start index of the playlist, if not 0.
+		 * @param startSeconds   Time from which the video should start playing.
+		 * @param suggestedQuality   Suggested video player quality.
+		 */
+		cuePlaylist(playlist: string | string[], index?: number, startSeconds?: number, suggestedQuality?: SuggestedVideoQuality): void;
+
+		/**
+		 * Queues a playlist of videos.
+		 *
+		 * @param args   Settings to queue the playlist.
+		 */
+		cuePlaylist(args: IPlaylistSettings): void;
+
+		/**
+		 * Loads a playlist of videos.
+		 *
+		 * @param playlist   Video ID(s) to play.
+		 * @param index   Start index of the playlist, if not 0.
+		 * @param startSeconds   Time from which the video should start playing.
+		 * @param suggestedQuality   Suggested video player quality.
+		 */
+		loadPlaylist(playlist: string | string[], index?: number, startSeconds?: number, suggestedQuality?: SuggestedVideoQuality): void;
+
+		/**
+		 * Loads a playlist of videos.
+		 *
+		 * @param args    Settings to queue the playlist.
+		 */
+		loadPlaylist(args: IPlaylistSettings): void;
+
+		/**
+		 * Plays the currently cued/loaded video.
+		 */
+		playVideo(): void;
+
+		/**
+		 * Pauses the currently playing video.
+		 */
+		pauseVideo(): void;
+
+		/**
+		 * Stops and cancels loading of the current video.
+		 */
+		stopVideo(): void;
+
+		/**
+		 * Seeks to a specified time in the video.
+		 *
+		 * @param seconds   Time, in seconds from the beginning of the video.
+		 * @param allowSeekAhead   Whether the player is allowed to make a new request for unbuffered data.
+		 */
+		seekTo(seconds: number, allowSeekAhead: boolean): void;
+
+		/**
+		 * Loads and plays the next video in the playlist.
+		 */
+		nextVideo(): void;
+
+		/**
+		 * Loads and plays the previous video in the playlist.
+		 */
+		previousVideo(): void;
+
+		/**
+		 * Loads and plays the specified video in the playlist.
+		 *
+		 * @param index   Index of the video to play.
+		 */
+		playVideoAt(index: number): void;
+
+		/**
+		 * Mutes the player.
+		 */
+		mute(): void;
+
+		/**
+		 * Unmutes the player.
+		 */
+		unMute(): void;
+
+		/**
+		 * @returns Whether the player is muted.
+		 */
+		isMuted(): boolean;
+
+		/**
+		 * Sets the player volume.
+		 *
+		 * @param volume   An integer between 0 and 100.
+		 */
+		setVolume(volume: number): void;
+
+		/**
+		 * @returns The player's current volume, an integer between 0 and 100.
+		 */
+		getVolume(): number;
+
+		/**
+		 * Sets the size in pixels of the <iframe> that contains the player.
+		 *
+		 * @param width   Width in pixels of the <iframe>.
+		 * @param height   Height in pixels of the <iframe>.
+		 */
+		setSize(width: number, height: number): void;
+
+		/**
+		 * @returns Playback rate of the currently playing video.
+		 */
+		getPlaybackRate(): number;
+
+		/**
+		 * Sets the suggested playback rate for the current video.
+		 *
+		 * @param suggestedRate   Suggested playback rate.
+		 */
+		setPlaybackRate(suggestedRate: number): void;
+
+		/**
+		 * @returns Available playback rates for the current video.
+		 */
+		getAvailablePlaybackRates(): number[];
+
+		/**
+		 * Sets whether the player should continuously play a playlist.
+		 *
+		 * @param loopPlaylists   Whether to continuously loop playlists.
+		 */
+		setLoop(loopPlaylists: boolean): void;
+
+		/**
+		 * Sets whether a playlist's videos should be shuffled.
+		 *
+		 * @param shufflePlaylist   Whether to shuffle playlist videos.
+		 */
+		setShuffle(shufflePlaylist: boolean): void;
+
+		/**
+		 * @returns A number between 0 and 1 of how much the player has buffered.
+		 */
+		getVideoLoadedFraction(): number;
+
+		/**
+		 * @returns Current player state.
+		 */
+		getPlayerState(): PlayerState;
+
+		/**
+		 * @returns Elapsed time in seconds since the video started playing.
+		 */
+		getCurrentTime(): number;
+
+		/**
+		 * @returns Actual video quality of the current video.
+		 */
+		getPlaybackQuality(): SuggestedVideoQuality;
+
+		/**
+		 * Sets the suggested video quality for the current video.
+		 *
+		 * @param suggestedQuality   Suggested video quality for the current video.
+		 */
+		setPlaybackQuality(suggestedQuality: SuggestedVideoQuality): void;
+
+		/**
+		 * @returns Quality formats in which the current video is available.
+		 */
+		getAvailableQualityLevels(): SuggestedVideoQuality[];
+
+		/**
+		 * @returns Duration in seconds of the currently playing video.
+		 */
+		getDuration(): number;
+
+		/**
+		 * @returns YouTube.com URL for the currently loaded/playing video.
+		 */
+		getVideoUrl(): string;
+
+		/**
+		 * @returns Embed code for the currently loaded/playing video.
+		 */
+		getVideoEmbedCode(): string;
+
+		/**
+		 * @returns Video IDs in the playlist as they are currently ordered.
+		 */
+		getPlaylist(): string[];
+
+		/**
+		 * @returns Index of the playlist video that is currently playing.
+		 */
+		getPlaylistIndex(): number;
+
+		/**
+		 * Adds an event listener for the specified event.
+		 *
+		 * @param eventName   Name of the event.
+		 * @param listener   Handler for the event.
+		 */
+		addEventListener<TEvent extends PlayerEvent>(eventName: keyof Events, listener: (event: TEvent) => void): void;
+
+		/**
+		 * @returns The DOM node for the embedded <iframe>.
+		 */
+		getIframe(): HTMLIFrameElement;
+
+		/**
+		 * Removes the <iframe> containing the player.
+		 */
+		destroy(): void;
+	}
 }