diff --git a/.gitignore b/.gitignore
index 2ea470b9e..2a52c95e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 *.map
 *.swp
 .DS_Store
+npm-debug.log
 
 _Resharper.DefinitelyTyped
 bin
diff --git a/.travis.yml b/.travis.yml
index f99663162..48704282a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "iojs-v2"
+  - 4
 
 sudo: false
 
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 306bea98e..e9d91ae10 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -8,6 +8,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](acorn/acorn.d.ts) [Acorn](https://github.com/marijnh/acorn) by [RReverser](https://github.com/RReverser)
 * [: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)
+* [:link:](ag-grid/ag-grid.d.ts) [ag-grid](http://www.ag-grid.com) by [Niall Crosby](https://github.com/ceolter)
 * [: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)
@@ -15,10 +16,12 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
+* [: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:](angular2/angular2.d.ts) [Angular 2](http://angular.io) by [angular team](https://github.com/angular)
+* [: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.3](http://janstevens.github.io/angular-growl-2) by [Tadeusz Hucal](https://github.com/mkp05)
+* [: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)
@@ -35,20 +38,20 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](angular-toasty/angular-toasty.d.ts) [Angular Toasty](https://github.com/invertase/angular-toasty) by [Dominik Muench](https://github.com/muenchdo)
 * [: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:](angular2/router.d.ts) [Angular v2.0.0-39](http://angular.io) by [angular team](https://github.com/angular)
-* [:link:](angular2/angular2.d.ts) [Angular v2.0.0-39](http://angular.io) by [angular team](https://github.com/angular)
-* [:link:](angular2/http.d.ts) [Angular v2.0.0-local_sha.7d5c3eb](http://angular.io) by [angular team](https://github.com/angular)
-* [:link:](angular2/test_lib.d.ts) [Angular v2.0.0-local_sha.7d5c3eb](http://angular.io) by [angular team](https://github.com/angular)
 * [:link:](angular-wizard/angular-wizard.d.ts) [Angular Wizard](https://github.com/mgonto/angular-wizard) by [Marko Jurisic](https://github.com/mjurisic)
 * [: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-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-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-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-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-scroll/angular-scroll.d.ts) [angular-scroll](https://github.com/oblador/angular-scroll) by [Sam Herrmann](https://github.com/samherrmann)
@@ -69,6 +72,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](ansicolors/ansicolors.d.ts) [ansicolors](https://github.com/thlorenz/ansicolors) by [rogierschouten](https://github.com/rogierschouten)
 * [: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/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)
@@ -79,11 +84,13 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](async/async.d.ts) [Async](https://github.com/caolan/async) by [Boris Yankov](https://github.com/borisyankov), [Arseniy Maximov](https://github.com/kern0)
+* [: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:](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)
@@ -91,14 +98,15 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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/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:](auth0.lock/auth0.lock.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:](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:](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)
@@ -107,15 +115,18 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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:](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:](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:](bitwise-xor/bitwise-xor.d.ts) [bitwise-xor](https://github.com/czzarr/node-bitwise-xor) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](blob-stream/blob-stream.d.ts) [blob-stream](https://github.com/devongovett/blob-stream) by [Eric Hillah](https://github.com/erichillah)
@@ -123,21 +134,26 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
 * [: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 datetimepicker v3](http://eonasdan.github.io/bootstrap-datetimepicker) by [Jesica N. Fera](https://github.com/bayitajesi)
+* [: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:](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:](box2d/box2dweb.d.ts) [bootstrap.timepicker](http://code.google.com/p/box2dweb) by [jbaldwin](https://github.com/jbaldwin)
+* [: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:](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)
+* [: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)
 * [:link:](bucks/bucks.d.ts) [bucks.js](https://github.com/CyberAgent/bucks.js) by [Shunsuke Ohtani](https://github.com/zaneli)
 * [: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)
@@ -148,6 +164,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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:](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:](camljs/camljs.d.ts) [camljs](http://camljs.codeplex.com) by [Andrey Markeev](http://markeev.com)
@@ -172,7 +190,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
+* [: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://gitbus.com/couven92)
 * [: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)
 * [: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)
@@ -180,8 +198,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](cli-color/cli-color.d.ts) [cli-color](https://github.com/medikoo/cli-color) by [Joel Spadin](https://github.com/ChaosinaCan)
 * [:link:](clone/clone.d.ts) [clone](https://github.com/pvorb/node-clone) by [Kieran Simpson](https://github.com/kierans/DefinitelyTyped)
-* [:link:](codemirror/codemirror-matchbrackets.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [Sixin Li](https://github.com/sixinli)
+* [: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.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [mihailik](https://github.com/mihailik)
 * [:link:](codemirror/searchcursor.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [jacqt](https://github.com/jacqt)
 * [:link:](coffeeify/coffeeify.d.ts) [coffeeify](https://github.com/jnordberg/coffeeify) by [Qubo](https://github.com/tkQubo)
@@ -192,7 +211,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](compare-version/compare-version.d.ts) [compare-version](https://www.npmjs.com/package/compare-version) by [Jonathan Pevarnek](https://github.com/jpevarnek)
 * [:link:](compression/compression.d.ts) [compression](https://github.com/expressjs/compression) by [Santi Albo](https://github.com/santialbo)
 * [: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)
@@ -214,12 +235,14 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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 Couchnode](https://github.com/couchbase/couchnode) by [Basarat Ali Syed](https://github.com/basarat)
 * [: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:](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)
@@ -238,12 +261,15 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
 * [: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-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)
+* [: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:](devextreme/dx.devextreme.d.ts) [DevExtreme](http://js.devexpress.com) by [DevExpress Inc.](http://devexpress.com)
+* [: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)
@@ -252,11 +278,13 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](domo/domo.d.ts) [Domo](http://domo-js.com) by [Steve Fenton](https://github.com/Steve-Fenton)
+* [:link:](requirejs-domready/domready.d.ts) [domReady](https://github.com/requirejs/domReady) by [Nobuhiro Nakamura](https://github.com/lefb766)
 * [:link:](domready/domready.d.ts) [domready](https://github.com/ded/domready) by [Christian Holm Nielsen](https://github.com/dotnetnerd)
 * [: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)
@@ -276,7 +304,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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 [Bart van der Schoor](https://github.com/Bartvds)
+* [: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)
@@ -287,6 +315,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](ejs/ejs.d.ts) [ejs.js](http://ejs.co) by [Ben Liddicott](https://github.com/benliddicott/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 (shared between main and rederer processes)](http://electron.atom.io) by [jedmao](https://github.com/jedmao)
+* [: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-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:](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)
@@ -315,6 +345,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](expectations/expectations.d.ts) [expectations.js](https://github.com/spmason/expectations) by [vvakame](https://github.com/vvakame)
 * [:link:](express/express.d.ts) [Express 4.x](http://expressjs.com) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](express-debug/express-debug.d.ts) [express-debug](https://github.com/devoidfury/express-debug) by [Federico Bond](https://github.com/federicobond)
+* [:link:](express-handlebars/express-handlebars.d.ts) [express-handlebars](https://github.com/ericf/express-handlebars) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [: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-myconnection/express-myconnection.d.ts) [express-myconnection](https://www.npmjs.org/package/express-myconnection) by [Michael Ferris](https://github.com/Cellule)
@@ -337,26 +368,31 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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/2015May/index.html) by [Artifact Health](www.artifacthealth.com)
+* [: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:](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:](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)
+* [: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)
 * [: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:](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)
 * [: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:](flight/flight.d.ts) [Flight](http://flightjs.github.com/flight) by [Jonathan Hedrén](https://github.com/jonathanhedren)
 * [: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)
+* [: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)
@@ -391,12 +427,40 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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.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.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.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.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.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.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.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.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.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.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.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.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.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.drive.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.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.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.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.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.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.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.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.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.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.contacts.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)
@@ -410,15 +474,16 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](google.visualization/google.visualization.d.ts) [Google Visualisation Apis](https://developers.google.com/chart) by [Dan Ludwig](https://github.com/danludwig)
 * [: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:](graphviz/graphviz.d.ts) [Graphviz](git://github.com/glejeune/node-graphviz.git) by [Matt Frantz](https://github.com/mhfrantz)
+* [:link:](graham_scan/graham_scan.d.ts) [graham_scan](https://github.com/brian3kb/graham_scan_js) by [Harm Berntsen](https://github.com/hberntsen)
+* [:link:](graphviz/graphviz.d.ts) [Graphviz](https://github.com/glejeune/node-graphviz) by [Matt Frantz](https://github.com/mhfrantz)
 * [: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/TweenLite.d.ts) [GSAP](http://greensock.com) by [VILIC VANE](https://vilic.github.io)
-* [: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/Ease.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-cached/gulp-cached.d.ts) [gulp-cached](https://github.com/wearefractal/gulp-cached) by [Thomas Corbière](https://github.com/tomc974)
@@ -428,7 +493,6 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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-rev/gulp-rev.d.ts) [gulp-csso](https://github.com/sindresorhus/gulp-rev) 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)
@@ -453,6 +517,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
@@ -481,7 +546,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](highcharts/highcharts.d.ts) [Highcharts](http://www.highcharts.com) by [Damiano Gambarotto](http://github.com/damianog)
+* [:link:](helmet/helmet.d.ts) [helmet](https://github.com/helmetjs/helmet) by [Cyril Schumacher](https://github.com/cyrilschumacher)
+* [: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)
@@ -489,11 +555,11 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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-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:](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:](statuses/statuses.d.ts) [http-errors](https://github.com/jshttp/statuses) 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)
@@ -513,10 +579,13 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](incremental-dom/incremental-dom.d.ts) [Incremetal DOM](https://github.com/google/incremental-dom) by [Basarat Ali Syed](https://github.com/basarat)
 * [:link:](inflection/inflection.d.ts) [inflection](https://github.com/dreamerslab/node.inflection) by [Shogo Iwano](https://github.com/shiwano)
 * [: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:](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:](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)
@@ -607,7 +676,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
@@ -616,7 +687,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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)
@@ -631,8 +704,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](ua-parser-js/ua-parser-js.d.ts) [js-cookie](https://github.com/faisalman/ua-parser-js) by [Viktor Miroshnikov](https://github.com/superduper)
 * [:link:](js-cookie/js-cookie.d.ts) [js-cookie](https://github.com/js-cookie/js-cookie) by [Theodore Brown](https://github.com/theodorejb)
+* [:link:](ua-parser-js/ua-parser-js.d.ts) [js-cookie](https://github.com/faisalman/ua-parser-js) by [Viktor Miroshnikov](https://github.com/superduper)
 * [: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)
@@ -651,6 +724,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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)
@@ -665,7 +739,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](jssha/jssha.d.ts) [jsSHA](https://github.com/Caligatio/jsSHA) by [David Li](https://github.com/randombk)
 * [: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:](jsuri/jsuri.d.ts) [jsUri](https://github.com/derek-watson/jsUri) by [Chris Charabaruk](http://github.com/coldacid)
+* [: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:](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)
@@ -679,6 +754,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](keyboardjs/keyboardjs.d.ts) [KeyboardJS](https://github.com/RobertWHurst/KeyboardJS) by [Vincent Bortone](https://github.com/vbortone)
 * [: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:](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)
@@ -709,6 +785,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](later/later.d.ts) [LaterJS](http://bunkat.github.io/later) by [Jason D Dryhurst-Smith](http://jasonds.co.uk)
 * [: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-editable/leaflet-editable.d.ts) [Leaflet.Editable](https://github.com/yohanboniface/Leaflet.Editable) by [Dominic Alie](https://github.com/dalie)
 * [: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:](jquery.leanModal/jquery.leanModal.d.ts) [leanModal.js](http://leanmodal.finelysliced.com.au) by [FinelySliced](https://github.com/FinelySliced)
@@ -718,9 +795,11 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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:](lockfile/lockfile.d.ts) [lockfile](https://github.com/isaacs/lockfile) by [Bart van der Schoor](https://github.com/Bartvds)
@@ -729,7 +808,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
+* [:link:](loglevel/loglevel.d.ts) [loglevel](https://github.com/pimterry/loglevel) by [Stefan Profanter](https://github.com/Pro), [Florian Wagner](https://github.com/flqw)
 * [: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)
@@ -760,12 +839,14 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
+* [: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:](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)
 * [: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)
 * [: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)
@@ -790,6 +871,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
@@ -800,8 +882,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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:](mobservable/mobservable.d.ts) [mobservable](https://mweststrate.github.io/mobservable) by [Michel Weststrate](https://github.com/mweststrate)
 * [: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/mocha-node.d.ts) [mocha](http://mochajs.org) by [Vadim Macagon](https://github.com/enlight), [vvakame](https://github.com/vvakame)
 * [:link:](mocha-phantomjs/mocha-phantomjs.d.ts) [mocha-phantomjs](http://metaskills.net/mocha-phantomjs) by [Erik Schierboom](https://github.com/ErikSchierboom)
@@ -809,8 +891,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
 * [: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)
 * [: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/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)
 * [: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) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](mongoose/mongoose.d.ts) [Mongoose](http://mongoosejs.com) by [horiuchi](https://github.com/horiuchi)
@@ -822,6 +904,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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)
@@ -842,6 +925,19 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](ngbootbox/ngbootbox.d.ts) [ngbootbox](https://github.com/eriktufvesson/ngBootbox) by [Sam Saint-Pettersen](https://github.com/stpettersens)
+* [: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/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/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-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)
@@ -855,6 +951,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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)
@@ -881,17 +978,18 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](radius/radius.d.ts) [node-radius](https://github.com/retailnext/node-radius) by [Peter Harris](https://github.com/codeanimal)
 * [: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:](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.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-cjs.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
+* [: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.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)
-* [:link:](node/node.d.ts) [Node.js](http://nodejs.org) by [Microsoft TypeScript](http://typescriptlang.org), [DefinitelyTyped](https://github.com/borisyankov/DefinitelyTyped)
 * [:link:](_debugger/_debugger.d.ts) [Node.js debugger API](http://nodejs.org) by [Basarat Ali Syed](https://github.com/basarat)
 * [: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/borisyankov/DefinitelyTyped)
 * [:link:](each/each.d.ts) [NodeEach](http://www.adaltas.com/projects/node-each) by [Michael Zabka](https://github.com/misak113)
 * [:link:](nodemailer/nodemailer.d.ts) [Nodemailer](https://github.com/andris9/Nodemailer) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](nodemailer/nodemailer-types.d.ts) [Nodemailer](https://github.com/andris9/Nodemailer) by [Rogier Schouten](https://github.com/rogierschouten)
@@ -920,10 +1018,12 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](on-finished/on-finished.d.ts) [on-finished](https://github.com/jshttp/on-finished) by [Honza Dvorsky](http://github.com/czechboy0)
 * [: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:](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)
@@ -941,9 +1041,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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-twitter/passport-twitter.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-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-local/passport-local.d.ts) [passport-local](https://github.com/jaredhanson/passport-local) by [Maxime LUCE](https://github.com/SomaticIT)
 * [:link:](path-case/path-case.d.ts) [path-case](https://github.com/blakeembrey/path-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
@@ -970,15 +1070,17 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](physijs/physijs.d.ts) [Physijs](http://chandlerprall.github.io/Physijs) by [Satoru Kimura](https://github.com/gyohk)
 * [:link:](pickadate/pickadate.d.ts) [pickadate.js](https://github.com/amsul/pickadate.js) by [Theodore Brown](https://github.com/theodorejb)
 * [: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:](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](https://github.com/GoodBoyDigital/pixi.js) by [clark-stevenson](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)
@@ -1021,14 +1123,30 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](raygun4js/raygun4js.d.ts) [raygun4js](https://github.com/MindscapeHQ/raygun4js) by [Brian Surowiec](https://github.com/xt0rted)
 * [: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-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-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-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-router/react-router.d.ts) [React Router](https://github.com/rackt/react-router) by [Yuichi Murata](https://github.com/mrk21), [Václav Ostrožlík](https://github.com/vasek17)
 * [:link:](react-bootstrap/react-bootstrap.d.ts) [react-bootstrap](https://github.com/react-bootstrap/react-bootstrap) by [Walker Burgin](https://github.com/walkerburgin)
+* [: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-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-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)
 * [: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:](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:](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)
@@ -1043,9 +1161,10 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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)
+* [:link:](reflux/reflux.d.ts) [RefluxJS](https://github.com/reflux/refluxjs) by [Maurice de Beijer](https://github.com/mauricedb)
+* [: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)
 * [: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)
+* [: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:](resemblejs/resemblejs.d.ts) [Resemble.js](http://huddle.github.io/Resemble.js) by [Tim Perry](https://github.com/pimterry)
 * [:link:](response-time/response-time.d.ts) [response-time](https://github.com/expressjs/response-time) by [Uros Smolnik](https://github.com/urossmolnik)
@@ -1057,10 +1176,12 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](reveal/reveal.d.ts) [Reveal](https://github.com/hakimel/reveal.js) by [grapswiz](https://github.com/grapswiz)
 * [: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-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:](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)
@@ -1088,6 +1209,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](sanitizer/sanitizer.d.ts) [Sanitizer](https://github.com/theSmaw/Caja-HTML-Sanitizer) by [Dave Taylor](http://davetayls.me)
 * [: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:](seedrandom/seedrandom.d.ts) [seedrandom](https://github.com/davidbau/seedrandom) by [Kern Handa](https://github.com/kernhanda)
@@ -1102,11 +1224,11 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](on-headers/on-headers.d.ts) [serve-favicon](https://github.com/jshttp/on-headers) by [John Jeffery](https://github.com/jjeffery)
 * [:link:](serve-static/serve-static.d.ts) [serve-static](https://github.com/expressjs/serve-static) by [Uros Smolnik](https://github.com/urossmolnik)
 * [: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](http://sptypescript.codeplex.com) by [Stanislav Vyshchepan](http://blog.gandjustas.ru), [Andrey Markeev](http://markeev.com)
+* [: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)
@@ -1119,7 +1241,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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/simplestorage.js.d.ts) [simpleStorage](https://github.com/andris9/simpleStorage) by [Áxel Costas Pena](https://github.com/axelcostaspena)
+* [: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)
@@ -1140,6 +1262,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
@@ -1160,6 +1283,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](storejs/storejs.d.ts) [store.js](https://github.com/marcuswestin/store.js) by [Vincent Bortone](https://github.com/vbortone)
 * [:link:](stream-series/stream-series.d.ts) [stream-series](https://github.com/rschmukler/stream-series) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
@@ -1175,6 +1299,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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.d.ts) [svg-pan-zoom](https://github.com/ariutta/svg-pan-zoom) by [Chintan Shah](https://github.com/Promact)
 * [: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)
@@ -1202,16 +1327,19 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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-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:](github-electron/github-electron-main.d.ts) [the Electron 0.25.2 main process](http://electron.atom.io) by [jedmao](https://github.com/jedmao)
 * [:link:](github-electron/github-electron-renderer.d.ts) [the Electron 0.25.2 renderer process (web page)](http://electron.atom.io) by [jedmao](https://github.com/jedmao)
+* [: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)
@@ -1222,7 +1350,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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 r71](http://mrdoob.github.com/three.js) by [Kon](http://phyzkit.net), [Satoru Kimura](https://github.com/gyohk)
+* [:link:](threejs/three.d.ts) [three.js r73](http://mrdoob.github.com/three.js) by [Kon](http://phyzkit.net), [Satoru Kimura](https://github.com/gyohk)
 * [: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)
@@ -1254,14 +1382,15 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](typescript-services/typescriptServices.d.ts) [TypeScript-Services](https://www.npmjs.org/package/typescript-services) by [Basarat Ali Syed](http://github.com/basarat)
-* [:link:](unity-webapi/unity-webapi.d.ts) [Ubuntu Unity Web API](https://launchpad.net/libunity-webapps) by [John Vrbanac](jhttps://github.com/jmvrbanac)
+* [:link:](unity-webapi/unity-webapi.d.ts) [Ubuntu Unity Web API](https://launchpad.net/libunity-webapps) by [John Vrbanac](https://github.com/jmvrbanac)
 * [: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:](umbraco/umbraco-resources.d.ts) [Umbraco](https://github.com/umbraco) by [DeCareSystemsIreland](https://github.com/DeCareSystemsIreland)
+* [:link:](uikit/uikit.d.ts) [uikit](http://getuikit.org) by [Giovanni Silva](https://github.com/giovannicandido)
 * [:link:](umbraco/umbraco.d.ts) [Umbraco](https://github.com/umbraco) by [DeCareSystemsIreland](https://github.com/DeCareSystemsIreland)
+* [: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:](underscore/underscore.d.ts) [Underscore](http://underscorejs.org) by [Boris Yankov](https://github.com/borisyankov), [Josh Baldwin](https://github.com/jbaldwin)
 * [: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)
@@ -1282,6 +1411,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](utils-merge/utils-merge.d.ts) [utils-merge](https://github.com/jaredhanson/utils-merge) by [Ilya Mochalov](https://github.com/chrootsu)
 * [:link:](UUID/UUID.d.ts) [UUID.js core](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)
@@ -1299,6 +1429,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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/vue.d.ts) [vuejs](https://github.com/yyx990803/vue) by [odangosan](https://github.com/odangosan)
 * [:link:](watch/watch.d.ts) [watch](https://github.com/mikeal/watch) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
@@ -1307,7 +1438,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
+* [: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:](webgl-ext/webgl-ext.d.ts) [WebGL Extensions](http://webgl.org) by [Arthur Langereis](https://github.com/zenmumbler)
@@ -1336,7 +1467,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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)
+* [: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)
@@ -1348,10 +1479,12 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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](https://github.com/jonrohan/ZeroClipboard) by [Eric J. Smith](https://github.com/ejsmith), [Blake Niemyjski](https://github.com/niemyjski), [György Balássy](https://github.com/balassy)
 * [: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)
diff --git a/abs/abs-tests.ts b/abs/abs-tests.ts
new file mode 100644
index 000000000..80f52f8ff
--- /dev/null
+++ b/abs/abs-tests.ts
@@ -0,0 +1,5 @@
+/// <reference path="./abs.d.ts" />
+
+import Abs from 'abs';
+
+const x: string = Abs('/foo');
diff --git a/abs/abs.d.ts b/abs/abs.d.ts
new file mode 100644
index 000000000..58a533528
--- /dev/null
+++ b/abs/abs.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for abs 1.1.0
+// Project: https://github.com/IonicaBizau/node-abs
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module "abs" {
+	/**
+	 * Compute the absolute path of an input.
+	 * @param input The input path.
+	 */
+	function Abs(input: string): string;
+
+	export default Abs;
+}
diff --git a/absolute/absolute-tests.ts b/absolute/absolute-tests.ts
new file mode 100644
index 000000000..5c2514450
--- /dev/null
+++ b/absolute/absolute-tests.ts
@@ -0,0 +1,5 @@
+/// <reference path="./absolute.d.ts" />
+
+import absolute from 'absolute';
+
+const x: boolean = absolute('/home/foo');
diff --git a/absolute/absolute.d.ts b/absolute/absolute.d.ts
new file mode 100644
index 000000000..c0e8e9bd6
--- /dev/null
+++ b/absolute/absolute.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for absolute 0.0.1
+// Project: https://github.com/bahamas10/node-absolute
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module "absolute" {
+	/**
+	 * Test if a path is absolute
+	 */
+	function absolute(path: string): boolean;
+
+	export default absolute;
+}
diff --git a/ace/ace.d.ts b/ace/ace.d.ts
index bedcfee54..8fed295f2 100644
--- a/ace/ace.d.ts
+++ b/ace/ace.d.ts
@@ -25,17 +25,17 @@ declare module AceAjax {
 
     export interface CommandManager {
 
-        byName;
+        byName: any;
 
-        commands;
+        commands: any;
 
         platform: string;
 
-        addCommands(commands:EditorCommand[]);
+        addCommands(commands:EditorCommand[]): void;
 
-        addCommand(command:EditorCommand);
+        addCommand(command:EditorCommand): void;
 
-        exec(name: string, editor: Editor, args: any);
+        exec(name: string, editor: Editor, args: any): void;
     }
 
     export interface Annotation {
@@ -63,19 +63,19 @@ declare module AceAjax {
 
     export interface KeyBinding {
 
-        setDefaultHandler(kb);
+        setDefaultHandler(kb: any): void;
 
-        setKeyboardHandler(kb);
+        setKeyboardHandler(kb: any): void;
 
-        addKeyboardHandler(kb, pos);
+        addKeyboardHandler(kb: any, pos: any): void;
 
-        removeKeyboardHandler(kb): boolean;
+        removeKeyboardHandler(kb: any): boolean;
 
         getKeyboardHandler(): any;
 
-        onCommandKey(e, hashId, keyCode);
+        onCommandKey(e: any, hashId: any, keyCode: any): void;
 
-        onTextInput(text);
+        onTextInput(text: any): void;
     }
     var KeyBinding: {
         new(editor: Editor): KeyBinding;
@@ -85,19 +85,19 @@ declare module AceAjax {
 
         getTokenizer(): any;
 
-        toggleCommentLines(state, doc, startRow, endRow);
+        toggleCommentLines(state: any, doc: any, startRow: any, endRow: any): void;
 
-        getNextLineIndent (state, line, tab): string;
+        getNextLineIndent (state: any, line: any, tab: any): string;
 
-        checkOutdent(state, line, input): boolean;
+        checkOutdent(state: any, line: any, input: any): boolean;
 
-        autoOutdent(state, doc, row);
+        autoOutdent(state: any, doc: any, row: any): void;
 
-        createWorker(session): any;
+        createWorker(session: any): any;
 
-        createModeDelegates (mapping);
+        createModeDelegates (mapping: any): void;
 
-        transformAction(state, action, editor, session, param): any;
+        transformAction(state: any, action: any, editor: any, session: any, param: any): any;
     }
 
     ////////////////
@@ -151,7 +151,7 @@ declare module AceAjax {
     **/
     export interface Anchor {
 
-        on(event: string, fn: (e) => any);
+        on(event: string, fn: (e: any) => any): void;
 
         /**
          * Returns an object identifying the `row` and `column` position of the current anchor.
@@ -171,7 +171,7 @@ declare module AceAjax {
          * - `old`: An object describing the old Anchor position
          * - `value`: An object describing the new Anchor position
         **/
-        onChange(e: any);
+        onChange(e: any): void;
 
         /**
          * Sets the anchor position to the specified row and column. If `noClip` is `true`, the position is not clipped.
@@ -179,12 +179,12 @@ declare module AceAjax {
          * @param column The column index to move the anchor to
          * @param noClip Identifies if you want the position to be clipped
         **/
-        setPosition(row: number, column: number, noClip: boolean);
+        setPosition(row: number, column: number, noClip: boolean): void;
 
         /**
          * When called, the `'change'` event listener is removed.
         **/
-        detach();
+        detach(): void;
     }
     var Anchor: {
         /**
@@ -212,31 +212,31 @@ declare module AceAjax {
          * Sets a new tokenizer for this object.
          * @param tokenizer The new tokenizer to use
         **/
-        setTokenizer(tokenizer: Tokenizer);
+        setTokenizer(tokenizer: Tokenizer): void;
 
         /**
          * Sets a new document to associate with this object.
          * @param doc The new document to associate with
         **/
-        setDocument(doc: Document);
+        setDocument(doc: Document): void;
 
         /**
          * Emits the `'update'` event. `firstRow` and `lastRow` are used to define the boundaries of the region to be updated.
          * @param firstRow The starting row region
          * @param lastRow The final row region
         **/
-        fireUpdateEvent(firstRow: number, lastRow: number);
+        fireUpdateEvent(firstRow: number, lastRow: number): void;
 
         /**
          * Starts tokenizing at the row indicated.
          * @param startRow The row to start at
         **/
-        start(startRow: number);
+        start(startRow: number): void;
 
         /**
          * Stops tokenizing.
         **/
-        stop();
+        stop(): void;
 
         /**
          * Gives list of tokens of the row. (tokens are cached)
@@ -269,13 +269,13 @@ declare module AceAjax {
     **/
     export interface Document {
 
-        on(event: string, fn: (e) => any);
+        on(event: string, fn: (e: any) => any): void;
 
         /**
          * Replaces all the lines in the current `Document` with the value of `text`.
          * @param text The text to use
         **/
-        setValue(text: string);
+        setValue(text: string): void;
 
         /**
          * Returns all the lines in the document as a single string, split by the new line character.
@@ -287,7 +287,7 @@ declare module AceAjax {
          * @param row The row number to use
          * @param column The column number to use
         **/
-        createAnchor(row: number, column: number);
+        createAnchor(row: number, column: number): void;
 
         /**
          * Returns the newline character that's being used, depending on the value of `newLineMode`.
@@ -298,7 +298,7 @@ declare module AceAjax {
          * [Sets the new line mode.]{: #Document.setNewLineMode.desc}
          * @param newLineMode [The newline mode to use; can be either `windows`, `unix`, or `auto`]{: #Document.setNewLineMode.param}
         **/
-        setNewLineMode(newLineMode: string);
+        setNewLineMode(newLineMode: string): void;
 
         /**
          * [Returns the type of newlines being used; either `windows`, `unix`, or `auto`]{: #Document.getNewLineMode}
@@ -392,7 +392,7 @@ declare module AceAjax {
          * Removes the new line between `row` and the row immediately following it. This method also triggers the `'change'` event.
          * @param row The row to check
         **/
-        removeNewLine(row: number);
+        removeNewLine(row: number): void;
 
         /**
          * Replaces a range in the document with the new `text`.
@@ -404,12 +404,12 @@ declare module AceAjax {
         /**
          * Applies all the changes previously accumulated. These can be either `'includeText'`, `'insertLines'`, `'removeText'`, and `'removeLines'`.
         **/
-        applyDeltas(deltas: Delta[]);
+        applyDeltas(deltas: Delta[]): void;
 
         /**
          * Reverts any changes previously applied. These can be either `'includeText'`, `'insertLines'`, `'removeText'`, and `'removeLines'`.
         **/
-        revertDeltas(deltas: Delta[]);
+        revertDeltas(deltas: Delta[]): void;
 
         /**
          * Converts an index position in a document to a `{row, column}` object.
@@ -466,33 +466,33 @@ declare module AceAjax {
 
         doc: Document;
 
-        on(event: string, fn: (e) => any);
+        on(event: string, fn: (e: any) => any): void;
 
-        findMatchingBracket(position: Position);
+        findMatchingBracket(position: Position): void;
 
-        addFold(text: string, range: Range);
+        addFold(text: string, range: Range): void;
 
         getFoldAt(row: number, column: number): any;
 
-        removeFold(arg: any);
+        removeFold(arg: any): void;
 
-        expandFold(arg: any);
+        expandFold(arg: any): void;
 
-        unfold(arg1: any, arg2: boolean);
+        unfold(arg1: any, arg2: boolean): void;
 
-        screenToDocumentColumn(row: number, column: number);
+        screenToDocumentColumn(row: number, column: number): void;
 
         getFoldDisplayLine(foldLine: any, docRow: number, docColumn: number): any;
 
         getFoldsInRange(range: Range): any;
 
-        highlight(text: string);
+        highlight(text: string): void;
 
         /**
          * Sets the `EditSession` to point to a new `Document`. If a `BackgroundTokenizer` exists, it also points to `doc`.
          * @param doc The new `Document` to use
         **/
-        setDocument(doc: Document);
+        setDocument(doc: Document): void;
 
         /**
          * Returns the `Document` associated with this session.
@@ -503,15 +503,15 @@ declare module AceAjax {
          * undefined
          * @param row The row to work with
         **/
-        $resetRowCache(row: number);
+        $resetRowCache(row: number): void;
 
         /**
          * Sets the session text.
          * @param text The new text to place
         **/
-        setValue(text: string);
+        setValue(text: string): void;
 
-        setMode(mode: string);
+        setMode(mode: string): void;
 
         /**
          * Returns the current [[Document `Document`]] as a string.
@@ -546,7 +546,7 @@ declare module AceAjax {
          * Sets the undo manager.
          * @param undoManager The new undo manager
         **/
-        setUndoManager(undoManager: UndoManager);
+        setUndoManager(undoManager: UndoManager): void;
 
         /**
          * Returns the current undo manager.
@@ -554,7 +554,7 @@ declare module AceAjax {
         getUndoManager(): UndoManager;
 
         /**
-         * Returns the current value for tabs. If the user is using soft tabs, this will be a series of spaces (defined by [[EditSession.getTabSize `getTabSize()`]]); otherwise it's simply `'\t'`.
+         * Returns the current value for tabs. If the user is using soft tabs, this will be a series of spaces (defined by [[EditSession.getTabSize `getTabSize()`]]): void; otherwise it's simply `'\t'`.
         **/
         getTabString(): string;
 
@@ -562,7 +562,7 @@ declare module AceAjax {
          * Pass `true` to enable the use of soft tabs. Soft tabs means you're using spaces instead of the tab character (`'\t'`).
          * @param useSoftTabs Value indicating whether or not to use soft tabs
         **/
-        setUseSoftTabs(useSoftTabs: boolean);
+        setUseSoftTabs(useSoftTabs: boolean): void;
 
         /**
          * Returns `true` if soft tabs are being used, `false` otherwise.
@@ -573,7 +573,7 @@ declare module AceAjax {
          * Set the number of spaces that define a soft tab; for example, passing in `4` transforms the soft tabs to be equivalent to four spaces. This function also emits the `changeTabSize` event.
          * @param tabSize The new tab size
         **/
-        setTabSize(tabSize: number);
+        setTabSize(tabSize: number): void;
 
         /**
          * Returns the current tab size.
@@ -591,7 +591,7 @@ declare module AceAjax {
          * If overwrites is enabled, any text you enter will type over any text after it. If the value of `overwrite` changes, this function also emites the `changeOverwrite` event.
          * @param overwrite Defines wheter or not to set overwrites
         **/
-        setOverwrite(overwrite: boolean);
+        setOverwrite(overwrite: boolean): void;
 
         /**
          * Returns `true` if overwrites are enabled; `false` otherwise.
@@ -601,21 +601,21 @@ declare module AceAjax {
         /**
          * Sets the value of overwrite to the opposite of whatever it currently is.
         **/
-        toggleOverwrite();
+        toggleOverwrite(): void;
 
         /**
          * Adds `className` to the `row`, to be used for CSS stylings and whatnot.
          * @param row The row number
          * @param className The class to add
         **/
-        addGutterDecoration(row: number, className: string);
+        addGutterDecoration(row: number, className: string): void;
 
         /**
          * Removes `className` from the `row`.
          * @param row The row number
          * @param className The class to add
         **/
-        removeGutterDecoration(row: number, className: string);
+        removeGutterDecoration(row: number, className: string): void;
 
         /**
          * Returns an array of numbers, indicating which rows have breakpoints.
@@ -626,25 +626,25 @@ declare module AceAjax {
          * Sets a breakpoint on every row number given by `rows`. This function also emites the `'changeBreakpoint'` event.
          * @param rows An array of row indices
         **/
-        setBreakpoints(rows: any[]);
+        setBreakpoints(rows: any[]): void;
 
         /**
          * Removes all breakpoints on the rows. This function also emites the `'changeBreakpoint'` event.
         **/
-        clearBreakpoints();
+        clearBreakpoints(): void;
 
         /**
          * Sets a breakpoint on the row number given by `rows`. This function also emites the `'changeBreakpoint'` event.
          * @param row A row index
          * @param className Class of the breakpoint
         **/
-        setBreakpoint(row: number, className: string);
+        setBreakpoint(row: number, className: string): void;
 
         /**
          * Removes a breakpoint on the row number given by `rows`. This function also emites the `'changeBreakpoint'` event.
          * @param row A row index
         **/
-        clearBreakpoint(row: number);
+        clearBreakpoint(row: number): void;
 
         /**
          * Adds a new marker to the given `Range`. If `inFront` is `true`, a front marker is defined, and the `'changeFrontMarker'` event fires; otherwise, the `'changeBackMarker'` event fires.
@@ -653,7 +653,7 @@ declare module AceAjax {
          * @param type Identify the type of the marker
          * @param inFront Set to `true` to establish a front marker
         **/
-        addMarker(range: Range, clazz: string, type: Function, inFront: boolean);
+        addMarker(range: Range, clazz: string, type: Function, inFront: boolean): void;
 
         /**
          * Adds a new marker to the given `Range`. If `inFront` is `true`, a front marker is defined, and the `'changeFrontMarker'` event fires; otherwise, the `'changeBackMarker'` event fires.
@@ -662,20 +662,20 @@ declare module AceAjax {
          * @param type Identify the type of the marker
          * @param inFront Set to `true` to establish a front marker
         **/
-        addMarker(range: Range, clazz: string, type: string, inFront: boolean);
+        addMarker(range: Range, clazz: string, type: string, inFront: boolean): void;
 
         /**
          * Adds a dynamic marker to the session.
          * @param marker object with update method
          * @param inFront Set to `true` to establish a front marker
         **/
-        addDynamicMarker(marker: any, inFront: boolean);
+        addDynamicMarker(marker: any, inFront: boolean): void;
 
         /**
          * Removes the marker with the specified ID. If this marker was in front, the `'changeFrontMarker'` event is emitted. If the marker was in the back, the `'changeBackMarker'` event is emitted.
          * @param markerId A number representing a marker
         **/
-        removeMarker(markerId: number);
+        removeMarker(markerId: number): void;
 
         /**
          * Returns an array containing the IDs of all the markers, either front or back.
@@ -687,7 +687,7 @@ declare module AceAjax {
          * Sets annotations for the `EditSession`. This functions emits the `'changeAnnotation'` event.
          * @param annotations A list of annotations
         **/
-        setAnnotations(annotations: Annotation[]);
+        setAnnotations(annotations: Annotation[]): void;
 
         /**
          * Returns the annotations for the `EditSession`.
@@ -697,13 +697,13 @@ declare module AceAjax {
         /**
          * Clears all the annotations for this session. This function also triggers the `'changeAnnotation'` event.
         **/
-        clearAnnotations();
+        clearAnnotations(): void;
 
         /**
          * If `text` contains either the newline (`\n`) or carriage-return ('\r') characters, `$autoNewLine` stores that value.
          * @param text A block of text
         **/
-        $detectNewLine(text: string);
+        $detectNewLine(text: string): void;
 
         /**
          * Given a starting row and column, this method returns the `Range` of the first word boundary it finds.
@@ -723,7 +723,7 @@ declare module AceAjax {
          * {:Document.setNewLineMode.desc}
          * @param newLineMode {:Document.setNewLineMode.param}
         **/
-        setNewLineMode(newLineMode: string);
+        setNewLineMode(newLineMode: string): void;
 
         /**
          * Returns the current new line mode.
@@ -734,7 +734,7 @@ declare module AceAjax {
          * Identifies if you want to use a worker for the `EditSession`.
          * @param useWorker Set to `true` to use a worker
         **/
-        setUseWorker(useWorker: boolean);
+        setUseWorker(useWorker: boolean): void;
 
         /**
          * Returns `true` if workers are being used.
@@ -744,13 +744,13 @@ declare module AceAjax {
         /**
          * Reloads all the tokens on the current session. This function calls [[BackgroundTokenizer.start `BackgroundTokenizer.start ()`]] to all the rows; it also emits the `'tokenizerUpdate'` event.
         **/
-        onReloadTokenizer();
+        onReloadTokenizer(): void;
 
         /**
          * Sets a new text mode for the `EditSession`. This method also emits the `'changeMode'` event. If a [[BackgroundTokenizer `BackgroundTokenizer`]] is set, the `'tokenizerUpdate'` event is also emitted.
          * @param mode Set a new text mode
         **/
-        $mode(mode: TextMode);
+        $mode(mode: TextMode): void;
 
         /**
          * Returns the current text mode.
@@ -761,7 +761,7 @@ declare module AceAjax {
          * This function sets the scroll top value. It also emits the `'changeScrollTop'` event.
          * @param scrollTop The new scroll top value
         **/
-        setScrollTop(scrollTop: number);
+        setScrollTop(scrollTop: number): void;
 
         /**
          * [Returns the value of the distance between the top of the editor and the topmost part of the visible content.]{: #EditSession.getScrollTop}
@@ -771,7 +771,7 @@ declare module AceAjax {
         /**
          * [Sets the value of the distance between the left of the editor and the leftmost part of the visible content.]{: #EditSession.setScrollLeft}
         **/
-        setScrollLeft();
+        setScrollLeft(): void;
 
         /**
          * [Returns the value of the distance between the left of the editor and the leftmost part of the visible content.]{: #EditSession.getScrollLeft}
@@ -838,7 +838,7 @@ declare module AceAjax {
          * Enables or disables highlighting of the range where an undo occured.
          * @param enable If `true`, selects the range of the reinserted change
         **/
-        setUndoSelect(enable: boolean);
+        setUndoSelect(enable: boolean): void;
 
         /**
          * Replaces a range in the document with the new `text`.
@@ -864,13 +864,13 @@ declare module AceAjax {
          * @param endRow Ending row
          * @param indentString The indent token
         **/
-        indentRows(startRow: number, endRow: number, indentString: string);
+        indentRows(startRow: number, endRow: number, indentString: string): void;
 
         /**
          * Outdents all the rows defined by the `start` and `end` properties of `range`.
          * @param range A range of rows
         **/
-        outdentRows(range: Range);
+        outdentRows(range: Range): void;
 
         /**
          * Shifts all the lines in the document up one, starting from `firstRow` and ending at `lastRow`.
@@ -897,7 +897,7 @@ declare module AceAjax {
          * Sets whether or not line wrapping is enabled. If `useWrapMode` is different than the current value, the `'changeWrapMode'` event is emitted.
          * @param useWrapMode Enable (or disable) wrap mode
         **/
-        setUseWrapMode(useWrapMode: boolean);
+        setUseWrapMode(useWrapMode: boolean): void;
 
         /**
          * Returns `true` if wrap mode is being used; `false` otherwise.
@@ -909,7 +909,7 @@ declare module AceAjax {
          * @param min The minimum wrap value (the left side wrap)
          * @param max The maximum wrap value (the right side wrap)
         **/
-        setWrapLimitRange(min: number, max: number);
+        setWrapLimitRange(min: number, max: number): void;
 
         /**
          * This should generally only be called by the renderer when a resize is detected.
@@ -933,7 +933,7 @@ declare module AceAjax {
          * @param str The string to check
          * @param offset The value to start at
         **/
-        $getDisplayTokens(str: string, offset: number);
+        $getDisplayTokens(str: string, offset: number): void;
 
         /**
          * Calculates the width of the string `str` on the screen while assuming that the string starts at the first column on the screen.
@@ -1006,7 +1006,7 @@ declare module AceAjax {
          * @param docRow
          * @param docColumn
         **/
-        documentToScreenRow(docRow: number, docColumn: number);
+        documentToScreenRow(docRow: number, docColumn: number): void;
 
         /**
          * Returns the length of the screen.
@@ -1036,17 +1036,17 @@ declare module AceAjax {
      * Event sessions dealing with the mouse and keyboard are bubbled up from `Document` to the `Editor`, which decides what to do with them.
     **/
     export interface Editor {
-        
-        addEventListener(ev: 'change', callback: (ev: EditorChangeEvent) => any);
-        addEventListener(ev: string, callback: Function);
+
+        addEventListener(ev: 'change', callback: (ev: EditorChangeEvent) => any): void;
+        addEventListener(ev: string, callback: Function): void;
 
         inMultiSelectMode: boolean;
 
-        selectMoreLines(n: number);
+        selectMoreLines(n: number): void;
 
-        onTextInput(text: string);
+        onTextInput(text: string): void;
 
-        onCommandKey(e, hashId, keyCode);
+        onCommandKey(e: any, hashId: any, keyCode: any): void;
 
         commands: CommandManager;
 
@@ -1060,32 +1060,32 @@ declare module AceAjax {
 
         container: HTMLElement;
 
-        onSelectionChange(e);
+        onSelectionChange(e: any): void;
 
-        onChangeMode(e?);
+        onChangeMode(e?: any): void;
+
+        execCommand(command:string, args?: any): void;
 
-        execCommand(command:string, args?: any);
-        
         /**
          * Sets a Configuration Option
          **/
-        setOption(optionName: any, optionValue: any);
-        
+        setOption(optionName: any, optionValue: any): void;
+
         /**
          * Sets Configuration Options
          **/
-        setOptions(keyValueTuples: any);
-        
+        setOptions(keyValueTuples: any): void;
+
         /**
          * Get a Configuration Option
          **/
         getOption(name: any):any;
-        
+
         /**
          * Get Configuration Options
          **/
         getOptions():any;
-        
+
         /**
          * Get rid of console warning by setting this to Infinity
          **/
@@ -1095,7 +1095,7 @@ declare module AceAjax {
          * Sets a new key handler, such as "vim" or "windows".
          * @param keyboardHandler The new key handler
         **/
-        setKeyboardHandler(keyboardHandler: string);
+        setKeyboardHandler(keyboardHandler: string): void;
 
         /**
          * Returns the keyboard handler, such as "vim" or "windows".
@@ -1106,7 +1106,7 @@ declare module AceAjax {
          * Sets a new editsession to use. This method also emits the `'changeSession'` event.
          * @param session The new session to use
         **/
-        setSession(session: IEditSession);
+        setSession(session: IEditSession): void;
 
         /**
          * Returns the current session being used.
@@ -1134,13 +1134,13 @@ declare module AceAjax {
          * {:VirtualRenderer.onResize}
          * @param force If `true`, recomputes the size, even if the height and width haven't changed
         **/
-        resize(force?: boolean);
+        resize(force?: boolean): void;
 
         /**
          * {:VirtualRenderer.setTheme}
          * @param theme The path to a theme
         **/
-        setTheme(theme: string);
+        setTheme(theme: string): void;
 
         /**
          * {:VirtualRenderer.getTheme}
@@ -1151,54 +1151,54 @@ declare module AceAjax {
          * {:VirtualRenderer.setStyle}
          * @param style A class name
         **/
-        setStyle(style: string);
+        setStyle(style: string): void;
 
         /**
          * {:VirtualRenderer.unsetStyle}
         **/
-        unsetStyle();
+        unsetStyle(): void;
 
         /**
          * Set a new font size (in pixels) for the editor text.
          * @param size A font size ( _e.g._ "12px")
         **/
-        setFontSize(size: string);
+        setFontSize(size: string): void;
 
         /**
          * Brings the current `textInput` into focus.
         **/
-        focus();
+        focus(): void;
 
         /**
          * Returns `true` if the current `textInput` is in focus.
         **/
-        isFocused();
+        isFocused(): void;
 
         /**
          * Blurs the current `textInput`.
         **/
-        blur();
+        blur(): void;
 
         /**
          * Emitted once the editor comes into focus.
         **/
-        onFocus();
+        onFocus(): void;
 
         /**
          * Emitted once the editor has been blurred.
         **/
-        onBlur();
+        onBlur(): void;
 
         /**
          * Emitted whenever the document is changed.
          * @param e Contains a single property, `data`, which has the delta of changes
         **/
-        onDocumentChange(e: any);
+        onDocumentChange(e: any): void;
 
         /**
          * Emitted when the selection changes.
         **/
-        onCursorChange();
+        onCursorChange(): void;
 
         /**
          * Returns the string of text currently highlighted.
@@ -1208,30 +1208,30 @@ declare module AceAjax {
         /**
          * Called whenever a text "copy" happens.
         **/
-        onCopy();
+        onCopy(): void;
 
         /**
          * Called whenever a text "cut" happens.
         **/
-        onCut();
+        onCut(): void;
 
         /**
          * Called whenever a text "paste" happens.
          * @param text The pasted text
         **/
-        onPaste(text: string);
+        onPaste(text: string): void;
 
         /**
          * Inserts `text` into wherever the cursor is pointing.
          * @param text The new text to add
         **/
-        insert(text: string);
+        insert(text: string): void;
 
         /**
          * Pass in `true` to enable overwrites in your session, or `false` to disable. If overwrites is enabled, any text you enter will type over any text after it. If the value of `overwrite` changes, this function also emites the `changeOverwrite` event.
          * @param overwrite Defines wheter or not to set overwrites
         **/
-        setOverwrite(overwrite: boolean);
+        setOverwrite(overwrite: boolean): void;
 
         /**
          * Returns `true` if overwrites are enabled; `false` otherwise.
@@ -1241,13 +1241,13 @@ declare module AceAjax {
         /**
          * Sets the value of overwrite to the opposite of whatever it currently is.
         **/
-        toggleOverwrite();
+        toggleOverwrite(): void;
 
         /**
          * Sets how fast the mouse scrolling should do.
          * @param speed A value indicating the new speed (in milliseconds)
         **/
-        setScrollSpeed(speed: number);
+        setScrollSpeed(speed: number): void;
 
         /**
          * Returns the value indicating how fast the mouse scroll speed is (in milliseconds).
@@ -1258,7 +1258,7 @@ declare module AceAjax {
          * Sets the delay (in milliseconds) of the mouse drag.
          * @param dragDelay A value indicating the new delay
         **/
-        setDragDelay(dragDelay: number);
+        setDragDelay(dragDelay: number): void;
 
         /**
          * Returns the current mouse drag delay.
@@ -1272,7 +1272,7 @@ declare module AceAjax {
          * This function also emits the `'changeSelectionStyle'` event.
          * @param style The new selection style
         **/
-        setSelectionStyle(style: string);
+        setSelectionStyle(style: string): void;
 
         /**
          * Returns the current selection style.
@@ -1283,18 +1283,18 @@ declare module AceAjax {
          * Determines whether or not the current line should be highlighted.
          * @param shouldHighlight Set to `true` to highlight the current line
         **/
-        setHighlightActiveLine(shouldHighlight: boolean);
+        setHighlightActiveLine(shouldHighlight: boolean): void;
 
         /**
          * Returns `true` if current lines are always highlighted.
         **/
-        getHighlightActiveLine();
+        getHighlightActiveLine(): void;
 
         /**
          * Determines if the currently selected word should be highlighted.
          * @param shouldHighlight Set to `true` to highlight the currently selected word
         **/
-        setHighlightSelectedWord(shouldHighlight: boolean);
+        setHighlightSelectedWord(shouldHighlight: boolean): void;
 
         /**
          * Returns `true` if currently highlighted words are to be highlighted.
@@ -1305,7 +1305,7 @@ declare module AceAjax {
          * If `showInvisibiles` is set to `true`, invisible characters&mdash;like spaces or new lines&mdash;are show in the editor.
          * @param showInvisibles Specifies whether or not to show invisible characters
         **/
-        setShowInvisibles(showInvisibles: boolean);
+        setShowInvisibles(showInvisibles: boolean): void;
 
         /**
          * Returns `true` if invisible characters are being shown.
@@ -1316,7 +1316,7 @@ declare module AceAjax {
          * If `showPrintMargin` is set to `true`, the print margin is shown in the editor.
          * @param showPrintMargin Specifies whether or not to show the print margin
         **/
-        setShowPrintMargin(showPrintMargin: boolean);
+        setShowPrintMargin(showPrintMargin: boolean): void;
 
         /**
          * Returns `true` if the print margin is being shown.
@@ -1327,7 +1327,7 @@ declare module AceAjax {
          * Sets the column defining where the print margin should be.
          * @param showPrintMargin Specifies the new print margin
         **/
-        setPrintMarginColumn(showPrintMargin: number);
+        setPrintMarginColumn(showPrintMargin: number): void;
 
         /**
          * Returns the column number of where the print margin is.
@@ -1338,7 +1338,7 @@ declare module AceAjax {
          * If `readOnly` is true, then the editor is set to read-only mode, and none of the content can change.
          * @param readOnly Specifies whether the editor can be modified or not
         **/
-        setReadOnly(readOnly: boolean);
+        setReadOnly(readOnly: boolean): void;
 
         /**
          * Returns `true` if the editor is set to read-only mode.
@@ -1349,7 +1349,7 @@ declare module AceAjax {
          * Specifies whether to use behaviors or not. ["Behaviors" in this case is the auto-pairing of special characters, like quotation marks, parenthesis, or brackets.]{: #BehaviorsDef}
          * @param enabled Enables or disables behaviors
         **/
-        setBehavioursEnabled(enabled: boolean);
+        setBehavioursEnabled(enabled: boolean): void;
 
         /**
          * Returns `true` if the behaviors are currently enabled. {:BehaviorsDef}
@@ -1361,89 +1361,89 @@ declare module AceAjax {
          * when such a character is typed in.
          * @param enabled Enables or disables wrapping behaviors
         **/
-        setWrapBehavioursEnabled(enabled: boolean);
+        setWrapBehavioursEnabled(enabled: boolean): void;
 
         /**
          * Returns `true` if the wrapping behaviors are currently enabled.
         **/
-        getWrapBehavioursEnabled();
+        getWrapBehavioursEnabled(): void;
 
         /**
          * Indicates whether the fold widgets are shown or not.
          * @param show Specifies whether the fold widgets are shown
         **/
-        setShowFoldWidgets(show: boolean);
+        setShowFoldWidgets(show: boolean): void;
 
         /**
          * Returns `true` if the fold widgets are shown.
         **/
-        getShowFoldWidgets();
+        getShowFoldWidgets(): void;
 
         /**
          * Removes words of text from the editor. A "word" is defined as a string of characters bookended by whitespace.
          * @param dir The direction of the deletion to occur, either "left" or "right"
         **/
-        remove(dir: string);
+        remove(dir: string): void;
 
         /**
          * Removes the word directly to the right of the current selection.
         **/
-        removeWordRight();
+        removeWordRight(): void;
 
         /**
          * Removes the word directly to the left of the current selection.
         **/
-        removeWordLeft();
+        removeWordLeft(): void;
 
         /**
          * Removes all the words to the left of the current selection, until the start of the line.
         **/
-        removeToLineStart();
+        removeToLineStart(): void;
 
         /**
          * Removes all the words to the right of the current selection, until the end of the line.
         **/
-        removeToLineEnd();
+        removeToLineEnd(): void;
 
         /**
          * Splits the line at the current selection (by inserting an `'\n'`).
         **/
-        splitLine();
+        splitLine(): void;
 
         /**
          * Transposes current line.
         **/
-        transposeLetters();
+        transposeLetters(): void;
 
         /**
          * Converts the current selection entirely into lowercase.
         **/
-        toLowerCase();
+        toLowerCase(): void;
 
         /**
          * Converts the current selection entirely into uppercase.
         **/
-        toUpperCase();
+        toUpperCase(): void;
 
         /**
          * Inserts an indentation into the current cursor position or indents the selected lines.
         **/
-        indent();
+        indent(): void;
 
         /**
          * Indents the current line.
         **/
-        blockIndent();
+        blockIndent(): void;
 
         /**
          * Outdents the current line.
         **/
-        blockOutdent(arg?: string);
+        blockOutdent(arg?: string): void;
 
         /**
          * Given the currently selected range, this function either comments all the lines, or uncomments all of them.
         **/
-        toggleCommentLines();
+        toggleCommentLines(): void;
 
         /**
          * Works like [[EditSession.getTokenAt]], except it returns a number.
@@ -1454,12 +1454,12 @@ declare module AceAjax {
          * If the character before the cursor is a number, this functions changes its value by `amount`.
          * @param amount The value to change the numeral by (can be negative to decrease value)
         **/
-        modifyNumber(amount: number);
+        modifyNumber(amount: number): void;
 
         /**
          * Removes all the lines in the current selection
         **/
-        removeLines();
+        removeLines(): void;
 
         /**
          * Shifts all the selected lines down one row.
@@ -1516,37 +1516,37 @@ declare module AceAjax {
         /**
          * Selects the text from the current position of the document until where a "page down" finishes.
         **/
-        selectPageDown();
+        selectPageDown(): void;
 
         /**
          * Selects the text from the current position of the document until where a "page up" finishes.
         **/
-        selectPageUp();
+        selectPageUp(): void;
 
         /**
          * Shifts the document to wherever "page down" is, as well as moving the cursor position.
         **/
-        gotoPageDown();
+        gotoPageDown(): void;
 
         /**
          * Shifts the document to wherever "page up" is, as well as moving the cursor position.
         **/
-        gotoPageUp();
+        gotoPageUp(): void;
 
         /**
          * Scrolls the document to wherever "page down" is, without changing the cursor position.
         **/
-        scrollPageDown();
+        scrollPageDown(): void;
 
         /**
          * Scrolls the document to wherever "page up" is, without changing the cursor position.
         **/
-        scrollPageUp();
+        scrollPageUp(): void;
 
         /**
          * Moves the editor to the specified row.
         **/
-        scrollToRow();
+        scrollToRow(): void;
 
         /**
          * Scrolls to a line. If `center` is `true`, it puts the line in middle of screen (or attempts to).
@@ -1555,12 +1555,12 @@ declare module AceAjax {
          * @param animate If `true` animates scrolling
          * @param callback Function to be called when the animation has finished
         **/
-        scrollToLine(line: number, center: boolean, animate: boolean, callback: Function);
+        scrollToLine(line: number, center: boolean, animate: boolean, callback: Function): void;
 
         /**
          * Attempts to center the current selection on the screen.
         **/
-        centerSelection();
+        centerSelection(): void;
 
         /**
          * Gets the current position of the cursor.
@@ -1580,30 +1580,30 @@ declare module AceAjax {
         /**
          * Selects all the text in editor.
         **/
-        selectAll();
+        selectAll(): void;
 
         /**
          * {:Selection.clearSelection}
         **/
-        clearSelection();
+        clearSelection(): void;
 
         /**
          * Moves the cursor to the specified row and column. Note that this does not de-select the current selection.
          * @param row The new row number
          * @param column The new column number
         **/
-        moveCursorTo(row: number, column?: number, animate?:boolean);
+        moveCursorTo(row: number, column?: number, animate?:boolean): void;
 
         /**
          * Moves the cursor to the position indicated by `pos.row` and `pos.column`.
          * @param position An object with two properties, row and column
         **/
-        moveCursorToPosition(position: Position);
+        moveCursorToPosition(position: Position): void;
 
         /**
          * Moves the cursor's row and column to the next matching bracket.
         **/
-        jumpToMatching();
+        jumpToMatching(): void;
 
         /**
          * Moves the cursor to the specified line number, and also into the indiciated column.
@@ -1611,82 +1611,82 @@ declare module AceAjax {
          * @param column A column number to go to
          * @param animate If `true` animates scolling
         **/
-        gotoLine(lineNumber: number, column?: number, animate?: boolean);
+        gotoLine(lineNumber: number, column?: number, animate?: boolean): void;
 
         /**
          * Moves the cursor to the specified row and column. Note that this does de-select the current selection.
          * @param row The new row number
          * @param column The new column number
         **/
-        navigateTo(row: number, column: number);
+        navigateTo(row: number, column: number): void;
 
         /**
          * Moves the cursor up in the document the specified number of times. Note that this does de-select the current selection.
          * @param times The number of times to change navigation
         **/
-        navigateUp(times?: number);
+        navigateUp(times?: number): void;
 
         /**
          * Moves the cursor down in the document the specified number of times. Note that this does de-select the current selection.
          * @param times The number of times to change navigation
         **/
-        navigateDown(times?: number);
+        navigateDown(times?: number): void;
 
         /**
          * Moves the cursor left in the document the specified number of times. Note that this does de-select the current selection.
          * @param times The number of times to change navigation
         **/
-        navigateLeft(times?: number);
+        navigateLeft(times?: number): void;
 
         /**
          * Moves the cursor right in the document the specified number of times. Note that this does de-select the current selection.
          * @param times The number of times to change navigation
         **/
-        navigateRight(times: number);
+        navigateRight(times: number): void;
 
         /**
          * Moves the cursor to the start of the current line. Note that this does de-select the current selection.
         **/
-        navigateLineStart();
+        navigateLineStart(): void;
 
         /**
          * Moves the cursor to the end of the current line. Note that this does de-select the current selection.
         **/
-        navigateLineEnd();
+        navigateLineEnd(): void;
 
         /**
          * Moves the cursor to the end of the current file. Note that this does de-select the current selection.
         **/
-        navigateFileEnd();
+        navigateFileEnd(): void;
 
         /**
          * Moves the cursor to the start of the current file. Note that this does de-select the current selection.
         **/
-        navigateFileStart();
+        navigateFileStart(): void;
 
         /**
          * Moves the cursor to the word immediately to the right of the current position. Note that this does de-select the current selection.
         **/
-        navigateWordRight();
+        navigateWordRight(): void;
 
         /**
          * Moves the cursor to the word immediately to the left of the current position. Note that this does de-select the current selection.
         **/
-        navigateWordLeft();
+        navigateWordLeft(): void;
 
         /**
          * Replaces the first occurance of `options.needle` with the value in `replacement`.
          * @param replacement The text to replace with
          * @param options The [[Search `Search`]] options to use
         **/
-        replace(replacement: string, options?: any);
+        replace(replacement: string, options?: any): void;
 
         /**
          * Replaces all occurances of `options.needle` with the value in `replacement`.
          * @param replacement The text to replace with
          * @param options The [[Search `Search`]] options to use
         **/
-        replaceAll(replacement: string, options?: any);
+        replaceAll(replacement: string, options?: any): void;
 
         /**
          * {:Search.getOptions} For more information on `options`, see [[Search `Search`]].
@@ -1699,36 +1699,36 @@ declare module AceAjax {
          * @param options An object defining various search properties
          * @param animate If `true` animate scrolling
         **/
-        find(needle: string, options?: any, animate?: boolean);
+        find(needle: string, options?: any, animate?: boolean): void;
 
         /**
          * Performs another search for `needle` in the document. For more information on `options`, see [[Search `Search`]].
          * @param options search options
          * @param animate If `true` animate scrolling
         **/
-        findNext(options?: any, animate?: boolean);
+        findNext(options?: any, animate?: boolean): void;
 
         /**
          * Performs a search for `needle` backwards. For more information on `options`, see [[Search `Search`]].
          * @param options search options
          * @param animate If `true` animate scrolling
         **/
-        findPrevious(options?: any, animate?: boolean);
+        findPrevious(options?: any, animate?: boolean): void;
 
         /**
          * {:UndoManager.undo}
         **/
-        undo();
+        undo(): void;
 
         /**
          * {:UndoManager.redo}
         **/
-        redo();
+        redo(): void;
 
         /**
          * Cleans up the entire editor.
         **/
-        destroy();
+        destroy(): void;
 
     }
 
@@ -1740,7 +1740,7 @@ declare module AceAjax {
         **/
         new(renderer: VirtualRenderer, session?: IEditSession): Editor;
     }
-    
+
     interface EditorChangeEvent {
         start: Position;
         end: Position;
@@ -1754,49 +1754,49 @@ declare module AceAjax {
 
     export interface PlaceHolder {
 
-        on(event: string, fn: (e) => any);
+        on(event: string, fn: (e: any) => any): void;
 
         /**
          * PlaceHolder.setup()
          * TODO
         **/
-        setup();
+        setup(): void;
 
         /**
          * PlaceHolder.showOtherMarkers()
          * TODO
         **/
-        showOtherMarkers();
+        showOtherMarkers(): void;
 
         /**
          * PlaceHolder.hideOtherMarkers()
          * Hides all over markers in the [[EditSession `EditSession`]] that are not the currently selected one.
         **/
-        hideOtherMarkers();
+        hideOtherMarkers(): void;
 
         /**
          * PlaceHolder@onUpdate(e)
          * Emitted when the place holder updates.
         **/
-        onUpdate();
+        onUpdate(): void;
 
         /**
          * PlaceHolder@onCursorChange(e)
          * Emitted when the cursor changes.
         **/
-        onCursorChange();
+        onCursorChange(): void;
 
         /**
          * PlaceHolder.detach()
          * TODO
         **/
-        detach();
+        detach(): void;
 
         /**
          * PlaceHolder.cancel()
          * TODO
         **/
-        cancel();
+        cancel(): void;
     }
     var PlaceHolder: {
         /**
@@ -1819,15 +1819,15 @@ declare module AceAjax {
     export interface IRangeList {
         ranges: Range[];
 
-        pointIndex(pos: Position, startIndex?: number);
+        pointIndex(pos: Position, startIndex?: number): void;
 
-        addList(ranges: Range[]);
+        addList(ranges: Range[]): void;
 
-        add(ranges: Range);
+        add(ranges: Range): void;
 
         merge(): Range[];
 
-        substractPoint(pos: Position);
+        substractPoint(pos: Position): void;
     }
     export var RangeList: {
         new (): IRangeList;
@@ -1860,7 +1860,7 @@ declare module AceAjax {
          * Returns `true` if and only if the starting row and column, and ending row and column, are equivalent to those given by `range`.
          * @param range A range to check against
         **/
-        isEqual(range: Range);
+        isEqual(range: Range): void;
 
         /**
          * Returns a string containing the range's row and column information, given like this:
@@ -1868,7 +1868,7 @@ declare module AceAjax {
          * [start.row/start.column] -> [end.row/end.column]
          * ```
         **/
-        toString();
+        toString(): void;
 
         /**
          * Returns `true` if the `row` and `column` provided are within the given range. This can better be expressed as returning `true` if:
@@ -1924,14 +1924,14 @@ declare module AceAjax {
          * @param row A row point to set
          * @param column A column point to set
         **/
-        setStart(row: number, column: number);
+        setStart(row: number, column: number): void;
 
         /**
          * Sets the starting row and column for the range.
          * @param row A row point to set
          * @param column A column point to set
         **/
-        setEnd(row: number, column: number);
+        setEnd(row: number, column: number): void;
 
         /**
          * Returns `true` if the `row` and `column` are within the given range.
@@ -2059,7 +2059,7 @@ declare module AceAjax {
          * Emitted when the scroll bar, well, scrolls.
          * @param e Contains one property, `"data"`, which indicates the current scroll top position
         **/
-        onScroll(e: any);
+        onScroll(e: any): void;
 
         /**
          * Returns the width of the scroll bar.
@@ -2070,19 +2070,19 @@ declare module AceAjax {
          * Sets the height of the scroll bar, in pixels.
          * @param height The new height
         **/
-        setHeight(height: number);
+        setHeight(height: number): void;
 
         /**
          * Sets the inner height of the scroll bar, in pixels.
          * @param height The new inner height
         **/
-        setInnerHeight(height: number);
+        setInnerHeight(height: number): void;
 
         /**
          * Sets the scroll top of the scroll bar.
          * @param scrollTop The new scroll top
         **/
-        setScrollTop(scrollTop: number);
+        setScrollTop(scrollTop: number): void;
     }
     var ScrollBar: {
         /**
@@ -2116,7 +2116,7 @@ declare module AceAjax {
          * Sets the search options via the `options` parameter.
          * @param An object containing all the search propertie
         **/
-        setOptions(An: any);
+        setOptions(An: any): void;
 
         /**
          * Searches for `options.needle`. If found, this method returns the [[Range `Range`]] where the text first occurs. If `options.backwards` is `true`, the search goes backwards in the session.
@@ -2165,21 +2165,21 @@ declare module AceAjax {
     **/
     export interface Selection {
 
-        addEventListener(ev: string, callback: Function);
+        addEventListener(ev: string, callback: Function): void;
 
-        moveCursorWordLeft();
+        moveCursorWordLeft(): void;
 
-        moveCursorWordRight();
+        moveCursorWordRight(): void;
 
-        fromOrientedRange(range: Range);
+        fromOrientedRange(range: Range): void;
 
-        setSelectionRange(match);
+        setSelectionRange(match: any): void;
 
         getAllRanges(): Range[];
 
-        on(event: string, fn: (e) => any);
+        on(event: string, fn: (e: any) => any): void;
 
-        addRange(range: Range);
+        addRange(range: Range): void;
 
         /**
          * Returns `true` if the selection is empty.
@@ -2201,7 +2201,7 @@ declare module AceAjax {
          * @param row The new row
          * @param column The new column
         **/
-        setSelectionAnchor(row: number, column: number);
+        setSelectionAnchor(row: number, column: number): void;
 
         /**
          * Returns an object containing the `row` and `column` of the calling selection anchor.
@@ -2217,7 +2217,7 @@ declare module AceAjax {
          * Shifts the selection up (or down, if [[Selection.isBackwards `isBackwards()`]] is true) the given number of columns.
          * @param columns The number of columns to shift by
         **/
-        shiftSelection(columns: number);
+        shiftSelection(columns: number): void;
 
         /**
          * Returns `true` if the selection is going backwards in the document.
@@ -2232,165 +2232,165 @@ declare module AceAjax {
         /**
          * [Empties the selection (by de-selecting it). This function also emits the `'changeSelection'` event.]{: #Selection.clearSelection}
         **/
-        clearSelection();
+        clearSelection(): void;
 
         /**
          * Selects all the text in the document.
         **/
-        selectAll();
+        selectAll(): void;
 
         /**
          * Sets the selection to the provided range.
          * @param range The range of text to select
          * @param reverse Indicates if the range should go backwards (`true`) or not
         **/
-        setRange(range: Range, reverse: boolean);
+        setRange(range: Range, reverse: boolean): void;
 
         /**
          * Moves the selection cursor to the indicated row and column.
          * @param row The row to select to
          * @param column The column to select to
         **/
-        selectTo(row: number, column: number);
+        selectTo(row: number, column: number): void;
 
         /**
          * Moves the selection cursor to the row and column indicated by `pos`.
          * @param pos An object containing the row and column
         **/
-        selectToPosition(pos: any);
+        selectToPosition(pos: any): void;
 
         /**
          * Moves the selection up one row.
         **/
-        selectUp();
+        selectUp(): void;
 
         /**
          * Moves the selection down one row.
         **/
-        selectDown();
+        selectDown(): void;
 
         /**
          * Moves the selection right one column.
         **/
-        selectRight();
+        selectRight(): void;
 
         /**
          * Moves the selection left one column.
         **/
-        selectLeft();
+        selectLeft(): void;
 
         /**
          * Moves the selection to the beginning of the current line.
         **/
-        selectLineStart();
+        selectLineStart(): void;
 
         /**
          * Moves the selection to the end of the current line.
         **/
-        selectLineEnd();
+        selectLineEnd(): void;
 
         /**
          * Moves the selection to the end of the file.
         **/
-        selectFileEnd();
+        selectFileEnd(): void;
 
         /**
          * Moves the selection to the start of the file.
         **/
-        selectFileStart();
+        selectFileStart(): void;
 
         /**
          * Moves the selection to the first word on the right.
         **/
-        selectWordRight();
+        selectWordRight(): void;
 
         /**
          * Moves the selection to the first word on the left.
         **/
-        selectWordLeft();
+        selectWordLeft(): void;
 
         /**
          * Moves the selection to highlight the entire word.
         **/
-        getWordRange();
+        getWordRange(): void;
 
         /**
          * Selects an entire word boundary.
         **/
-        selectWord();
+        selectWord(): void;
 
         /**
          * Selects a word, including its right whitespace.
         **/
-        selectAWord();
+        selectAWord(): void;
 
         /**
          * Selects the entire line.
         **/
-        selectLine();
+        selectLine(): void;
 
         /**
          * Moves the cursor up one row.
         **/
-        moveCursorUp();
+        moveCursorUp(): void;
 
         /**
          * Moves the cursor down one row.
         **/
-        moveCursorDown();
+        moveCursorDown(): void;
 
         /**
          * Moves the cursor left one column.
         **/
-        moveCursorLeft();
+        moveCursorLeft(): void;
 
         /**
          * Moves the cursor right one column.
         **/
-        moveCursorRight();
+        moveCursorRight(): void;
 
         /**
          * Moves the cursor to the start of the line.
         **/
-        moveCursorLineStart();
+        moveCursorLineStart(): void;
 
         /**
          * Moves the cursor to the end of the line.
         **/
-        moveCursorLineEnd();
+        moveCursorLineEnd(): void;
 
         /**
          * Moves the cursor to the end of the file.
         **/
-        moveCursorFileEnd();
+        moveCursorFileEnd(): void;
 
         /**
          * Moves the cursor to the start of the file.
         **/
-        moveCursorFileStart();
+        moveCursorFileStart(): void;
 
         /**
          * Moves the cursor to the word on the right.
         **/
-        moveCursorLongWordRight();
+        moveCursorLongWordRight(): void;
 
         /**
          * Moves the cursor to the word on the left.
         **/
-        moveCursorLongWordLeft();
+        moveCursorLongWordLeft(): void;
 
         /**
          * Moves the cursor to position indicated by the parameters. Negative numbers move the cursor backwards in the document.
          * @param rows The number of rows to move by
          * @param chars The number of characters to move by
         **/
-        moveCursorBy(rows: number, chars: number);
+        moveCursorBy(rows: number, chars: number): void;
 
         /**
          * Moves the selection to the position indicated by its `row` and `column`.
          * @param position The position to move to
         **/
-        moveCursorToPosition(position: any);
+        moveCursorToPosition(position: any): void;
 
         /**
          * Moves the cursor to the row and column provided. [If `preventUpdateDesiredColumn` is `true`, then the cursor stays in the same column position as its original point.]{: #preventUpdateBoolDesc}
@@ -2398,7 +2398,7 @@ declare module AceAjax {
          * @param column The column to move to
          * @param keepDesiredColumn [If `true`, the cursor move does not respect the previous column]{: #preventUpdateBool}
         **/
-        moveCursorTo(row: number, column: number, keepDesiredColumn?: boolean);
+        moveCursorTo(row: number, column: number, keepDesiredColumn?: boolean): void;
 
         /**
          * Moves the cursor to the screen position indicated by row and column. {:preventUpdateBoolDesc}
@@ -2406,7 +2406,7 @@ declare module AceAjax {
          * @param column The column to move to
          * @param keepDesiredColumn {:preventUpdateBool}
         **/
-        moveCursorToScreen(row: number, column: number, keepDesiredColumn: boolean);
+        moveCursorToScreen(row: number, column: number, keepDesiredColumn: boolean): void;
     }
     var Selection: {
         /**
@@ -2431,7 +2431,7 @@ declare module AceAjax {
          * Returns the editor identified by the index `idx`.
          * @param idx The index of the editor you want
         **/
-        getEditor(idx: number);
+        getEditor(idx: number): void;
 
         /**
          * Returns the current editor.
@@ -2441,44 +2441,44 @@ declare module AceAjax {
         /**
          * Focuses the current editor.
         **/
-        focus();
+        focus(): void;
 
         /**
          * Blurs the current editor.
         **/
-        blur();
+        blur(): void;
 
         /**
          * Sets a theme for each of the available editors.
          * @param theme The name of the theme to set
         **/
-        setTheme(theme: string);
+        setTheme(theme: string): void;
 
         /**
          * Sets the keyboard handler for the editor.
          * @param keybinding
         **/
-        setKeyboardHandler(keybinding: string);
+        setKeyboardHandler(keybinding: string): void;
 
         /**
          * Executes `callback` on all of the available editors.
          * @param callback A callback function to execute
          * @param scope The default scope for the callback
         **/
-        forEach(callback: Function, scope: string);
+        forEach(callback: Function, scope: string): void;
 
         /**
          * Sets the font size, in pixels, for all the available editors.
          * @param size The new font size
         **/
-        setFontSize(size: number);
+        setFontSize(size: number): void;
 
         /**
          * Sets a new [[EditSession `EditSession`]] for the indicated editor.
          * @param session The new edit session
          * @param idx The editor's index you're interested in
         **/
-        setSession(session: IEditSession, idx: number);
+        setSession(session: IEditSession, idx: number): void;
 
         /**
          * Returns the orientation.
@@ -2489,12 +2489,12 @@ declare module AceAjax {
          * Sets the orientation.
          * @param orientation The new orientation value
         **/
-        setOrientation(orientation: number);
+        setOrientation(orientation: number): void;
 
         /**
          * Resizes the editor.
         **/
-        resize();
+        resize(): void;
     }
     var Split: {
         new(): Split;
@@ -2583,7 +2583,7 @@ declare module AceAjax {
          * - `args[1]` is the document to associate with
          * @param options Contains additional properties
         **/
-        execute(options: any);
+        execute(options: any): void;
 
         /**
          * [Perform an undo operation on the document, reverting the last change.]{: #UndoManager.undo}
@@ -2595,12 +2595,12 @@ declare module AceAjax {
          * [Perform a redo operation on the document, reimplementing the last change.]{: #UndoManager.redo}
          * @param dontSelect {:dontSelect}
         **/
-        redo(dontSelect: boolean);
+        redo(dontSelect: boolean): void;
 
         /**
          * Destroys the stack of undo and redo redo operations.
         **/
-        reset();
+        reset(): void;
 
         /**
          * Returns `true` if there are undo operations left to perform.
@@ -2611,12 +2611,12 @@ declare module AceAjax {
          * Returns `true` if there are redo operations left to perform.
         **/
         hasRedo(): boolean;
-        
+
         /**
          * Returns `true` if the dirty counter is 0
         **/
         isClean(): boolean;
-        
+
         /**
          * Sets dirty counter to 0
         **/
@@ -2645,35 +2645,35 @@ declare module AceAjax {
 
         lineHeight: number;
 
-        screenToTextCoordinates(left: number, top: number);
+        screenToTextCoordinates(left: number, top: number): void;
 
         /**
          * Associates the renderer with an [[EditSession `EditSession`]].
         **/
-        setSession(session: IEditSession);
+        setSession(session: IEditSession): void;
 
         /**
          * Triggers a partial update of the text, from the range given by the two parameters.
          * @param firstRow The first row to update
          * @param lastRow The last row to update
         **/
-        updateLines(firstRow: number, lastRow: number);
+        updateLines(firstRow: number, lastRow: number): void;
 
         /**
          * Triggers a full update of the text, for all the rows.
         **/
-        updateText();
+        updateText(): void;
 
         /**
          * Triggers a full update of all the layers, for all the rows.
          * @param force If `true`, forces the changes through
         **/
-        updateFull(force: boolean);
+        updateFull(force: boolean): void;
 
         /**
          * Updates the font size.
         **/
-        updateFontSize();
+        updateFontSize(): void;
 
         /**
          * [Triggers a resize of the editor.]{: #VirtualRenderer.onResize}
@@ -2682,18 +2682,18 @@ declare module AceAjax {
          * @param width The width of the editor in pixels
          * @param height The hiehgt of the editor, in pixels
         **/
-        onResize(force: boolean, gutterWidth: number, width: number, height: number);
+        onResize(force: boolean, gutterWidth: number, width: number, height: number): void;
 
         /**
          * Adjusts the wrap limit, which is the number of characters that can fit within the width of the edit area on screen.
         **/
-        adjustWrapLimit();
+        adjustWrapLimit(): void;
 
         /**
          * Identifies whether you want to have an animated scroll or not.
          * @param shouldAnimate Set to `true` to show animated scrolls
         **/
-        setAnimatedScroll(shouldAnimate: boolean);
+        setAnimatedScroll(shouldAnimate: boolean): void;
 
         /**
          * Returns whether an animated scroll happens or not.
@@ -2704,7 +2704,7 @@ declare module AceAjax {
          * Identifies whether you want to show invisible characters or not.
          * @param showInvisibles Set to `true` to show invisibles
         **/
-        setShowInvisibles(showInvisibles: boolean);
+        setShowInvisibles(showInvisibles: boolean): void;
 
         /**
          * Returns whether invisible characters are being shown or not.
@@ -2715,7 +2715,7 @@ declare module AceAjax {
          * Identifies whether you want to show the print margin or not.
          * @param showPrintMargin Set to `true` to show the print margin
         **/
-        setShowPrintMargin(showPrintMargin: boolean);
+        setShowPrintMargin(showPrintMargin: boolean): void;
 
         /**
          * Returns whether the print margin is being shown or not.
@@ -2726,7 +2726,7 @@ declare module AceAjax {
          * Identifies whether you want to show the print margin column or not.
          * @param showPrintMargin Set to `true` to show the print margin column
         **/
-        setPrintMarginColumn(showPrintMargin: boolean);
+        setPrintMarginColumn(showPrintMargin: boolean): void;
 
         /**
          * Returns whether the print margin column is being shown or not.
@@ -2742,7 +2742,7 @@ declare module AceAjax {
          * Identifies whether you want to show the gutter or not.
          * @param show Set to `true` to show the gutter
         **/
-        setShowGutter(show: boolean);
+        setShowGutter(show: boolean): void;
 
         /**
          * Returns the root element containing this renderer.
@@ -2783,7 +2783,7 @@ declare module AceAjax {
          * Sets the padding for all the layers.
          * @param padding A new padding value (in pixels)
         **/
-        setPadding(padding: number);
+        setPadding(padding: number): void;
 
         /**
          * Returns whether the horizontal scrollbar is set to be always visible.
@@ -2794,58 +2794,58 @@ declare module AceAjax {
          * Identifies whether you want to show the horizontal scrollbar or not.
          * @param alwaysVisible Set to `true` to make the horizontal scroll bar visible
         **/
-        setHScrollBarAlwaysVisible(alwaysVisible: boolean);
+        setHScrollBarAlwaysVisible(alwaysVisible: boolean): void;
 
         /**
          * Schedules an update to all the front markers in the document.
         **/
-        updateFrontMarkers();
+        updateFrontMarkers(): void;
 
         /**
          * Schedules an update to all the back markers in the document.
         **/
-        updateBackMarkers();
+        updateBackMarkers(): void;
 
         /**
          * Deprecated; (moved to [[EditSession]])
         **/
-        addGutterDecoration();
+        addGutterDecoration(): void;
 
         /**
          * Deprecated; (moved to [[EditSession]])
         **/
-        removeGutterDecoration();
+        removeGutterDecoration(): void;
 
         /**
          * Redraw breakpoints.
         **/
-        updateBreakpoints();
+        updateBreakpoints(): void;
 
         /**
          * Sets annotations for the gutter.
          * @param annotations An array containing annotations
         **/
-        setAnnotations(annotations: any[]);
+        setAnnotations(annotations: any[]): void;
 
         /**
          * Updates the cursor icon.
         **/
-        updateCursor();
+        updateCursor(): void;
 
         /**
          * Hides the cursor icon.
         **/
-        hideCursor();
+        hideCursor(): void;
 
         /**
          * Shows the cursor icon.
         **/
-        showCursor();
+        showCursor(): void;
 
         /**
          * Scrolls the cursor into the first visibile area of the editor
         **/
-        scrollCursorIntoView();
+        scrollCursorIntoView(): void;
 
         /**
          * {:EditSession.getScrollTop}
@@ -2871,7 +2871,7 @@ declare module AceAjax {
          * Gracefully scrolls from the top of the editor to the row indicated.
          * @param row A row id
         **/
-        scrollToRow(row: number);
+        scrollToRow(row: number): void;
 
         /**
          * Gracefully scrolls the editor to the row indicated.
@@ -2880,7 +2880,7 @@ declare module AceAjax {
          * @param animate If `true` animates scrolling
          * @param callback Function to be called after the animation has finished
         **/
-        scrollToLine(line: number, center: boolean, animate: boolean, callback: Function);
+        scrollToLine(line: number, center: boolean, animate: boolean, callback: Function): void;
 
         /**
          * Scrolls the editor to the y pixel indicated.
@@ -2899,7 +2899,7 @@ declare module AceAjax {
          * @param deltaX The x value to scroll by
          * @param deltaY The y value to scroll by
         **/
-        scrollBy(deltaX: number, deltaY: number);
+        scrollBy(deltaX: number, deltaY: number): void;
 
         /**
          * Returns `true` if you can still scroll by either parameter; in other words, you haven't reached the end of the file or line.
@@ -2918,35 +2918,35 @@ declare module AceAjax {
         /**
          * Focuses the current container.
         **/
-        visualizeFocus();
+        visualizeFocus(): void;
 
         /**
          * Blurs the current container.
         **/
-        visualizeBlur();
+        visualizeBlur(): void;
 
         /**
          * undefined
          * @param position
         **/
-        showComposition(position: number);
+        showComposition(position: number): void;
 
         /**
          * Sets the inner text of the current composition to `text`.
          * @param text A string of text to use
         **/
-        setCompositionText(text: string);
+        setCompositionText(text: string): void;
 
         /**
          * Hides the current composition.
         **/
-        hideComposition();
+        hideComposition(): void;
 
         /**
          * [Sets a new theme for the editor. `theme` should exist, and be a directory path, like `ace/theme/textmate`.]{: #VirtualRenderer.setTheme}
          * @param theme The path to a theme
         **/
-        setTheme(theme: string);
+        setTheme(theme: string): void;
 
         /**
          * [Returns the path of the current theme.]{: #VirtualRenderer.getTheme}
@@ -2957,18 +2957,18 @@ declare module AceAjax {
          * [Adds a new class, `style`, to the editor.]{: #VirtualRenderer.setStyle}
          * @param style A class name
         **/
-        setStyle(style: string);
+        setStyle(style: string): void;
 
         /**
          * [Removes the class `style` from the editor.]{: #VirtualRenderer.unsetStyle}
          * @param style A class name
         **/
-        unsetStyle(style: string);
+        unsetStyle(style: string): void;
 
         /**
          * Destroys the text and cursor layers for this renderer.
         **/
-        destroy();
+        destroy(): void;
 
     }
     var VirtualRenderer: {
diff --git a/adm-zip/adm-zip-tests.ts b/adm-zip/adm-zip-tests.ts
index f8583ae61..93f8f2f2d 100644
--- a/adm-zip/adm-zip-tests.ts
+++ b/adm-zip/adm-zip-tests.ts
@@ -1,10 +1,9 @@
 /// <reference path="adm-zip.d.ts" />
 import AdmZip = require("adm-zip");
 
-
 // reading archives
 var zip = new AdmZip("./my_file.zip");
-var zipEntries = zip.getEntries(); // an array of ZipEntry records
+var zipEntries: AdmZip.IZipEntry[] = zip.getEntries(); // an array of ZipEntry records
 
 zipEntries.forEach(function (zipEntry) {
     console.log(zipEntry.toString()); // outputs zip entries information
@@ -31,3 +30,32 @@ zip.addLocalFile("/home/me/some_picture.png");
 var willSendthis = zip.toBuffer();
 // or write everything to disk
 zip.writeZip(/*target file name*/"/home/me/files.zip");
+
+function processZipEntry(zipEntry: AdmZip.IZipEntry) {
+    console.log('comment', zipEntry.comment);
+}
+
+//tests taken from examples at https://github.com/cthackers/adm-zip/wiki/ADM-ZIP
+import Zip = require("adm-zip");
+// loads and parses existing zip file local_file.zip
+var zip = new Zip("local_file.zip"); 
+// creates new in memory zip
+zip = new Zip();
+// loads and parses existing zip file local_file.zip
+zip = new Zip("local_file.zip"); 
+// get all entries and iterate them
+zip.getEntries().forEach((entry) => {
+    var entryName = entry.entryName;
+    var decompressedData = zip.readFile(entry); // decompressed buffer of the entry
+    console.log(zip.readAsText(entry)); // outputs the decompressed content of the entry  
+});
+
+// will extract the file myfile.txt from the archive to /home/user/folder/subfolder/myfile.txt
+zip.extractEntryTo("folder/subfolder/myfile.txt", "/home/user/", true, true);
+
+// will extract the file myfile.txt from the archive to /home/user/myfile.txt
+zip.extractEntryTo("folder/subfolder/myfile.txt", "/home/user/", false, true);
+
+function isAdmZipEntry(obj: any): obj is AdmZip.IZipEntry {
+  return obj !== null && typeof obj === "object" && typeof obj['entryName'] === 'string';
+}
\ No newline at end of file
diff --git a/adm-zip/adm-zip.d.ts b/adm-zip/adm-zip.d.ts
index 9f2eb7dfd..208c13b27 100644
--- a/adm-zip/adm-zip.d.ts
+++ b/adm-zip/adm-zip.d.ts
@@ -5,8 +5,8 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module AdmZip {
-    class ZipFile {
+declare module "adm-zip" {
+    class AdmZip {
         /**
          * Create a new, empty archive.
          */
@@ -28,7 +28,7 @@ declare module AdmZip {
          * @param entry ZipEntry object
          * @return Buffer or Null in case of error
          */
-        readFile(entry: IZipEntry): Buffer;
+        readFile(entry: AdmZip.IZipEntry): Buffer;
         /**
          * Asynchronous readFile
          * @param entry String with the full path of the entry
@@ -41,7 +41,7 @@ declare module AdmZip {
          * @param callback Called with a Buffer or Null in case of error
          * @return Buffer or Null in case of error
          */
-        readFileAsync(entry: IZipEntry, callback: (data: Buffer, err: string) => any): void;
+        readFileAsync(entry: AdmZip.IZipEntry, callback: (data: Buffer, err: string) => any): void;
         /**
          * Extracts the given entry from the archive and returns the content as
          * plain text in the given encoding
@@ -57,7 +57,7 @@ declare module AdmZip {
          * @param encoding Optional. If no encoding is specified utf8 is used
          * @return String
          */
-        readAsText(fileName: IZipEntry, encoding?: string): string;
+        readAsText(fileName: AdmZip.IZipEntry, encoding?: string): string;
         /**
          * Asynchronous readAsText
          * @param entry String with the full path of the entry
@@ -71,7 +71,7 @@ declare module AdmZip {
          * @param callback Called with the resulting string.
          * @param encoding Optional. If no encoding is specified utf8 is used
          */
-        readAsTextAsync(fileName: IZipEntry, callback: (data: string) => any, encoding?: string): void;
+        readAsTextAsync(fileName: AdmZip.IZipEntry, callback: (data: string) => any, encoding?: string): void;
         /**
          * Remove the entry from the file or the entry and all its nested directories
          * and files if the given entry is a directory
@@ -83,7 +83,7 @@ declare module AdmZip {
          * and files if the given entry is a directory
          * @param entry A ZipEntry object.
          */
-        deleteFile(entry: IZipEntry): void;
+        deleteFile(entry: AdmZip.IZipEntry): void;
         /**
          * Adds a comment to the zip. The zip must be rewritten after
          * adding the comment.
@@ -110,7 +110,7 @@ declare module AdmZip {
          * @param entry ZipEntry object.
          * @param comment The comment to add to the entry.
          */
-        addZipEntryComment(entry: IZipEntry, comment: string): void;
+        addZipEntryComment(entry: AdmZip.IZipEntry, comment: string): void;
         /**
          * Returns the comment of the specified entry.
          * @param entry String with the full path of the entry.
@@ -122,7 +122,7 @@ declare module AdmZip {
          * @param entry ZipEntry object.
          * @return String The comment of the specified entry.
          */
-        getZipEntryComment(entry: IZipEntry): string;
+        getZipEntryComment(entry: AdmZip.IZipEntry): string;
         /**
          * Updates the content of an existing entry inside the archive. The zip
          * must be rewritten after updating the content
@@ -136,7 +136,7 @@ declare module AdmZip {
          * @param entry ZipEntry object.
          * @param content The entry's new contents.
          */
-        updateFile(entry: IZipEntry, content: Buffer): void;
+        updateFile(entry: AdmZip.IZipEntry, content: Buffer): void;
         /**
          * Adds a file from the disk to the archive.
          * @param localPath Path to a file on disk.
@@ -167,14 +167,14 @@ declare module AdmZip {
          * Returns an array of ZipEntry objects representing the files and folders
          * inside the archive
          */
-        getEntries(): IZipEntry[];
+        getEntries(): AdmZip.IZipEntry[];
         /**
          * Returns a ZipEntry object representing the file or folder specified by
          * ``name``.
          * @param name Name of the file or folder to retrieve.
          * @return ZipEntry The entry corresponding to the name.
          */
-        getEntry(name: string): IZipEntry;
+        getEntry(name: string): AdmZip.IZipEntry;
         /**
          * Extracts the given entry to the given targetPath.
          * If the entry is a directory inside the archive, the entire directory and
@@ -203,7 +203,7 @@ declare module AdmZip {
          *   will be overwriten if this is true. Default is FALSE
          * @return Boolean
          */
-        extractEntryTo(entryPath: IZipEntry, targetPath: string, maintainEntryPath?: boolean, overwrite?: boolean): boolean;
+        extractEntryTo(entryPath: AdmZip.IZipEntry, targetPath: string, maintainEntryPath?: boolean, overwrite?: boolean): boolean;
         /**
          * Extracts the entire archive to the given location
          * @param targetPath Target location
@@ -225,76 +225,75 @@ declare module AdmZip {
         toBuffer(): Buffer;
     }
 
-    /**
-     * The ZipEntry is more than a structure representing the entry inside the
-     * zip file. Beside the normal attributes and headers a entry can have, the
-     * class contains a reference to the part of the file where the compressed
-     * data resides and decompresses it when requested. It also compresses the
-     * data and creates the headers required to write in the zip file.
-     */
-    interface IZipEntry {
+    module AdmZip {    
         /**
-         * Represents the full name and path of the file
+         * The ZipEntry is more than a structure representing the entry inside the
+         * zip file. Beside the normal attributes and headers a entry can have, the
+         * class contains a reference to the part of the file where the compressed
+         * data resides and decompresses it when requested. It also compresses the
+         * data and creates the headers required to write in the zip file.
          */
-        entryName: string;
-        rawEntryName: Buffer;
-        /**
-         * Extra data associated with this entry.
-         */
-        extra: Buffer;
-        /**
-         * Entry comment.
-         */
-        comment: string;
-        name: string;
-        /**
-         * Read-Only property that indicates the type of the entry.
-         */
-        isDirectory: boolean;
-        /**
-         * Get the header associated with this ZipEntry.
-         */
-        header: Buffer;
-        /**
-         * Retrieve the compressed data for this entry. Note that this may trigger
-         * compression if any properties were modified.
-         */
-        getCompressedData(): Buffer;
-        /**
-         * Asynchronously retrieve the compressed data for this entry. Note that
-         * this may trigger compression if any properties were modified.
-         */
-        getCompressedDataAsync(callback: (data: Buffer) => void): void;
-        /**
-         * Set the (uncompressed) data to be associated with this entry.
-         */
-        setData(value: string): void;
-        /**
-         * Set the (uncompressed) data to be associated with this entry.
-         */
-        setData(value: Buffer): void;
-        /**
-         * Get the decompressed data associated with this entry.
-         */
-        getData(): Buffer;
-        /**
-         * Asynchronously get the decompressed data associated with this entry.
-         */
-        getDataAsync(callback: (data: Buffer) => void): void;
-        /**
-         * Returns the CEN Entry Header to be written to the output zip file, plus
-         * the extra data and the entry comment.
-         */
-        packHeader(): Buffer;
-        /**
-         * Returns a nicely formatted string with the most important properties of
-         * the ZipEntry.
-         */
-        toString(): string;
+        interface IZipEntry {
+            /**
+             * Represents the full name and path of the file
+             */
+            entryName: string;
+            rawEntryName: Buffer;
+            /**
+             * Extra data associated with this entry.
+             */
+            extra: Buffer;
+            /**
+             * Entry comment.
+             */
+            comment: string;
+            name: string;
+            /**
+             * Read-Only property that indicates the type of the entry.
+             */
+            isDirectory: boolean;
+            /**
+             * Get the header associated with this ZipEntry.
+             */
+            header: Buffer;
+            /**
+             * Retrieve the compressed data for this entry. Note that this may trigger
+             * compression if any properties were modified.
+             */
+            getCompressedData(): Buffer;
+            /**
+             * Asynchronously retrieve the compressed data for this entry. Note that
+             * this may trigger compression if any properties were modified.
+             */
+            getCompressedDataAsync(callback: (data: Buffer) => void): void;
+            /**
+             * Set the (uncompressed) data to be associated with this entry.
+             */
+            setData(value: string): void;
+            /**
+             * Set the (uncompressed) data to be associated with this entry.
+             */
+            setData(value: Buffer): void;
+            /**
+             * Get the decompressed data associated with this entry.
+             */
+            getData(): Buffer;
+            /**
+             * Asynchronously get the decompressed data associated with this entry.
+             */
+            getDataAsync(callback: (data: Buffer) => void): void;
+            /**
+             * Returns the CEN Entry Header to be written to the output zip file, plus
+             * the extra data and the entry comment.
+             */
+            packHeader(): Buffer;
+            /**
+             * Returns a nicely formatted string with the most important properties of
+             * the ZipEntry.
+             */
+            toString(): string;
+        }
     }
-}
 
-declare module "adm-zip" {
-    import zipFile = AdmZip.ZipFile;
-    export = zipFile;
+    export = AdmZip;
 }
diff --git a/angular-formly/angular-formly.d.ts b/angular-formly/angular-formly.d.ts
index 9917d217f..2bf75af7d 100644
--- a/angular-formly/angular-formly.d.ts
+++ b/angular-formly/angular-formly.d.ts
@@ -9,6 +9,11 @@ declare module 'AngularFormly' {
 	export = AngularFormly;
 }
 
+declare module 'angular-formly' {
+	var angularFormlyDefaultExport: string;
+	export = angularFormlyDefaultExport;
+}
+
 declare module AngularFormly {
 
 
@@ -301,6 +306,17 @@ declare module AngularFormly {
 		};
 
 
+		/**
+		 * This allows you to place attributes with string values on the ng-model element.
+		 * Easy to use alternative to ngModelAttrs option.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#ngmodelelattrs-object
+		 */
+		ngModelElAttrs?: {
+			[key: string]: string;
+		};
+
+
 		/**
 		 * Used to tell angular-formly to not attempt to add the formControl property to your object. This is useful
 		 * for things like validation, but not necessary if your "field" doesn't use ng-model (if it's just a horizontal
@@ -572,4 +588,4 @@ declare module AngularFormly {
 		messages: { [key: string]: ($viewValue: any, $modelValue: any, scope: ITemplateScope) => string };
 	}
 
-}
\ No newline at end of file
+}
diff --git a/angular-google-analytics/angular-google-analytics-tests.ts b/angular-google-analytics/angular-google-analytics-tests.ts
new file mode 100644
index 000000000..9da39ba3c
--- /dev/null
+++ b/angular-google-analytics/angular-google-analytics-tests.ts
@@ -0,0 +1,56 @@
+/// <reference path="angular-google-analytics.d.ts" />
+
+function ConfigurationMethodChaining(AnalyticsProvider: angular.google.analytics.AnalyticsProvider) {
+    AnalyticsProvider
+        .logAllCalls(true)
+        .startOffline(true)
+        .useECommerce(true, true);
+}
+
+function EnableECommerce(AnalyticsProvider: angular.google.analytics.AnalyticsProvider) {
+    AnalyticsProvider.useECommerce(true, false);
+    AnalyticsProvider.useECommerce(true, true);
+    AnalyticsProvider.setCurrency("CDN");
+}
+
+function SetGoogleAnalyticsAccounts(AnalyticsProvider: angular.google.analytics.AnalyticsProvider) {
+    AnalyticsProvider.setAccount("UA-XXXXX-xx");
+    AnalyticsProvider.setAccount([
+        { tracker: "UA-12345-12", name: "tracker1" },
+        { tracker: "UA-12345-34", name: "tracker2" }
+    ]);
+}
+
+function UseClassicAnalytics(AnalyticsProvider: angular.google.analytics.AnalyticsProvider) {
+    AnalyticsProvider.useAnalytics(false);
+}
+
+function UseDisplayFeatures(AnalyticsProvider: angular.google.analytics.AnalyticsProvider) {
+    AnalyticsProvider.useDisplayFeatures(true);
+}
+
+function UseEnhancedLinkAttribution(AnalyticsProvider: angular.google.analytics.AnalyticsProvider) {
+    AnalyticsProvider.useEnhancedLinkAttribution(true);
+}
+
+function UseCrossDomainLinking(AnalyticsProvider: angular.google.analytics.AnalyticsProvider) {
+    AnalyticsProvider.useCrossDomainLinker(true);
+    AnalyticsProvider.setCrossLinkDomains(["domain-1.com", "domain-2.com"]);
+}
+
+function SetCookieConfiguration(AnalyticsProvider: angular.google.analytics.AnalyticsProvider) {
+    AnalyticsProvider.setCookieConfig({
+        cookieDomain: "foo.example.com",
+        cookieName: "myNewName",
+        cookieExpires: 20000
+    });
+}
+
+function SetRouteTrackingBehaviors(AnalyticsProvider: angular.google.analytics.AnalyticsProvider) {
+    AnalyticsProvider.trackPages(true);
+    AnalyticsProvider.trackUrlParams(true);
+    AnalyticsProvider.ignoreFirstPageLoad(true);
+    AnalyticsProvider.trackPrefix("my-application");
+    AnalyticsProvider.setPageEvent("$stateChangeSuccess");
+    AnalyticsProvider.setRemoveRegExp(/\/\d+?$/);
+}
diff --git a/angular-google-analytics/angular-google-analytics.d.ts b/angular-google-analytics/angular-google-analytics.d.ts
new file mode 100644
index 000000000..e3aa5551e
--- /dev/null
+++ b/angular-google-analytics/angular-google-analytics.d.ts
@@ -0,0 +1,173 @@
+// Type definitions for angular-google-analytics v1.1.0
+// Project: https://github.com/revolunet/angular-google-analytics
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../angularjs/angular.d.ts" />
+
+declare module angular.google.analytics {
+    /**
+     * @summary Interface for {@link AnalysticsProvider}.
+     * @interface
+     */
+    interface AnalyticsProvider {
+        /**
+         * @summary Use Delay Script Tag Insertion.
+         * @param {boolean} val If true, the delay script tag is inserted.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        delayScriptTag(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Activates the test mode.
+         */
+        enterTestMode(): void;
+
+        /**
+         * @summary Gets the global cookie configuration.
+         * @return {Object} The global cookie configuration.
+         */
+        getCookieConfig(): Object;
+
+        /**
+         * @summary Ignore first page view.
+         * @param {boolean} val If true, the first page view is ignored.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        ignoreFirstPageLoad(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Enable Service Logging.
+         * @param {boolean} val If true, log all outbound calls to an in-memory array accessible.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        logAllCalls(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Set Google Analytics Accounts.
+         * @param {Object} tracker The account identifier(s).
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        setAccount(tracker: string|Object|Array<Object>): AnalyticsProvider;
+
+        /**
+         * @summary Set Cookie Configuration.
+         * @param {Object} config The custom cookie parameters.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         * @deprecated
+         */
+        setCookieConfig(config: Object): AnalyticsProvider;
+
+        /**
+         * @summary Set cross-linked domains.
+         * @param {Array<string>} domains The domains.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        setCrossLinkDomains(domains: Array<string>): AnalyticsProvider;
+
+        /**
+         * @summary Set currency.
+         * @param {string} currencyCode The currency code.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        setCurrency(currencyCode: string): AnalyticsProvider;
+
+        /**
+         * @summary Set Domain Name.
+         * @param {string} domain The domain name.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        setDomainName(domain: string): AnalyticsProvider;
+
+        /**
+         * @summary Enable Experiment (universal analytics only).
+         * @param {string} id The experiment identifier.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        setExperimentId(id: string): AnalyticsProvider;
+
+        /**
+         * @summary Support Hybrid Mobile Applications.
+         * @param {boolean} val If true, each account object will disable protocol checking and all injected scripts will use the HTTPS protocol.
+         */
+        setHybridMobileSupport(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Set the default page event name.
+         * @param {string} name The default page event name.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        setPageEvent(name: string): AnalyticsProvider;
+
+        /**
+         * @summary Sets the regex to scrub location before sending to analytics.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         * @param {RegExp} regex The regex.
+         */
+        setRemoveRegExp(regex: RegExp): AnalyticsProvider;
+
+        /**
+         * @summary Starts the offline mode.
+         * @param {boolean} val If true, the offline mode is started.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        startOffline(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Track all routes.
+         * @param {boolean} val If true, all routes are tracked.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        trackPages(doTrack: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Sets the URL prefix.
+         * @param {string} prefix The URL prefix.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        trackPrefix(prefix: string): AnalyticsProvider;
+
+        /**
+         * @summary Track all URL query parameters.
+         * @param {boolean} val If true, all URL query parameters are tracked.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        trackUrlParams(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Use Classic Analytics.
+         * @param {boolean} val If true, use classic analytics.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        useAnalytics(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Use Cross Domain Linking.
+         * @param {boolean} val If true, the cross-linked domains are registered with Google Analytics.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        useCrossDomainLinker(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Use Display Features.
+         * @param {boolean} val If true, the display features module is loaded with Google Analytics.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        useDisplayFeatures(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Enable enhanced e-commerce module.
+         * @param {boolean} val If true, the enhanced e-commerce module is enabled.
+         * @param {boolean} enhanced If true, the "ec.js" file is used, otherwises, the "ecommerce.js" is used.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        useECommerce(val: boolean, enhanced: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Use Enhanced Link Attribution.
+         * @param {boolean} val If true, the enhanced link attribution module is loaded with Google Analytics.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        useEnhancedLinkAttribution(val: boolean): AnalyticsProvider;
+    }
+}
diff --git a/angular-growl-v2/angular-growl-v2-tests.ts b/angular-growl-v2/angular-growl-v2-tests.ts
index c9297932e..fdb661161 100644
--- a/angular-growl-v2/angular-growl-v2-tests.ts
+++ b/angular-growl-v2/angular-growl-v2-tests.ts
@@ -8,25 +8,27 @@ app.config((growlProvider:angular.growl.IGrowlProvider, $httpProvider:angular.IH
         error: 4000
     };
 
-    growlProvider.globalTimeToLive(ttl);
-    growlProvider.globalTimeToLive(5000);
-    growlProvider.globalDisableCloseButton(true);
-    growlProvider.globalDisableIcons(true);
-    growlProvider.globalReversedOrder(false);
-    growlProvider.globalDisableCountDown(true);
-    growlProvider.messageVariableKey("someKey");
-    growlProvider.globalInlineMessages(false);
-    growlProvider.globalPosition("top-center");
-    growlProvider.messagesKey("someKey");
-    growlProvider.messageTextKey("someKey");
-    growlProvider.messageTitleKey("someKey");
-    growlProvider.messageSeverityKey("someKey");
-    growlProvider.onlyUniqueMessages(false);
+    growlProvider.globalTimeToLive(ttl)
+        .globalTimeToLive(5000)
+        .globalDisableCloseButton(true)
+        .globalDisableIcons(true)
+        .globalReversedOrder(false)
+        .globalDisableCountDown(true)
+        .messageVariableKey("someKey")
+        .globalInlineMessages(false)
+        .globalPosition("top-center")
+        .messagesKey("someKey")
+        .messageTextKey("someKey")
+        .messageTitleKey("someKey")
+        .messageSeverityKey("someKey")
+        .onlyUniqueMessages(false);
 
     $httpProvider.interceptors.push(growlProvider.serverMessagesInterceptor);
 });
 
-app.controller("Ctrl", ($scope:angular.IScope, growl:angular.growl.IGrowlService) => {
+app.controller("Ctrl", ($scope:angular.IScope,
+                        growl:angular.growl.IGrowlService,
+                        growlMessages:angular.growl.IGrowlMessagesService) => {
     var config:angular.growl.IGrowlMessageConfig = {
         ttl: 5000,
         disableCountDown: true,
@@ -50,4 +52,10 @@ app.controller("Ctrl", ($scope:angular.IScope, growl:angular.growl.IGrowlService
     growl.reverseOrder();
     growl.inlineMessages();
     growl.position();
+
+    growlMessages.initDirective(1, 10);
+    var messages:angular.growl.IGrowlMessage[] = growlMessages.getAllMessages(2);
+    growlMessages.destroyAllMessages(0);
+    growlMessages.addMessage(messages[0]);
+    growlMessages.deleteMessage(messages[1]);
 });
diff --git a/angular-growl-v2/angular-growl-v2.d.ts b/angular-growl-v2/angular-growl-v2.d.ts
index 039490e3d..a8e262071 100644
--- a/angular-growl-v2/angular-growl-v2.d.ts
+++ b/angular-growl-v2/angular-growl-v2.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Angular Growl 2 v.0.7.3
+// Type definitions for Angular Growl 2 v.0.7.5
 // Project: http://janstevens.github.io/angular-growl-2
 // Definitions by: Tadeusz Hucal <https://github.com/mkp05>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -54,73 +54,73 @@ declare module angular.growl {
          * Set default TTL settings.
          * @param ttl configuration of TTL for different type of message
          */
-        globalTimeToLive(ttl: IGrowlTTLConfig): void;
+        globalTimeToLive(ttl: IGrowlTTLConfig): IGrowlProvider;
         /**
          * Set default TTL settings.
          * @param ttl ttl in milliseconds
          */
-        globalTimeToLive(ttl: number): void;
+        globalTimeToLive(ttl: number): IGrowlProvider;
         /**
          * Set default setting for disabling close button.
          * @param disableCloseButton
          */
-        globalDisableCloseButton(disableCloseButton: boolean): void;
+        globalDisableCloseButton(disableCloseButton: boolean): IGrowlProvider;
         /**
          * Set default setting for disabling icons.
          * @param disableIcons
          */
-        globalDisableIcons(disableIcons: boolean): void;
+        globalDisableIcons(disableIcons: boolean): IGrowlProvider;
         /**
          * Set reversing order of displaying new messages.
          * @param reverseOrder
          */
-        globalReversedOrder(reverseOrder: boolean): void
+        globalReversedOrder(reverseOrder: boolean): IGrowlProvider;
         /**
          * Set default setting for displaying message disappear countdown.
          * @param disableCountDown
          */
-        globalDisableCountDown(disableCountDown: boolean): void;
+        globalDisableCountDown(disableCountDown: boolean): IGrowlProvider;
         /**
          * Set default allowance for inline messages.
          * @param inline
          */
-        globalInlineMessages(inline: boolean): void;
+        globalInlineMessages(inline: boolean): IGrowlProvider;
         /**
          * Set default message position.
          * @param position
          */
-        globalPosition(position: string): void;
+        globalPosition(position: string): IGrowlProvider;
         /**
          * Enable/disable displaying only unique messages.
          * @param onlyUniqueMessages
          */
-        onlyUniqueMessages(onlyUniqueMessages: boolean): void;
+        onlyUniqueMessages(onlyUniqueMessages: boolean): IGrowlProvider;
 
         /**
          * Set key where messages are stored (for http interceptor).
          * @param messageVariableKey
          */
-        messagesKey(messageKey: string): void;
+        messagesKey(messageKey: string): IGrowlProvider;
         /**
          * Set key where message text is stored (for http interceptor).
          * @param messageVariableKey
          */
-        messageTextKey(messageTextKey: string): void;
+        messageTextKey(messageTextKey: string): IGrowlProvider;
         /**
          * Set key where title of message is stored (for http interceptor).
          * @param messageVariableKey
          */
-        messageTitleKey(messageTitleKey: string): void;
+        messageTitleKey(messageTitleKey: string): IGrowlProvider;
         /**
          * Set key where severity of message is stored (for http interceptor).
          * @param messageVariableKey
          */
-        messageSeverityKey(messageSeverityKey: string): void;
+        messageSeverityKey(messageSeverityKey: string): IGrowlProvider;
         /**
          * Set key where variables for message are stored (for http interceptor).
          * @param messageVariableKey
          */
-        messageVariableKey(messageVariableKey: string): void;
+        messageVariableKey(messageVariableKey: string): IGrowlProvider;
     }
 
     /**
@@ -211,4 +211,39 @@ declare module angular.growl {
          */
         position(): string;
     }
+
+    /**
+     * GrowlMessages service.
+     */
+    interface IGrowlMessagesService {
+        /**
+         * Initialize a directive
+         * We look at the preloaded directive and use this else we
+         * create a new blank object
+         * @param referenceId
+         * @param limitMessages
+         */
+        initDirective(referenceId: number, limitMessages: number): ng.IDirective;
+
+        /**
+         * Get current messages
+         */
+        getAllMessages(referenceId?: number): IGrowlMessage[];
+
+        /**
+         * Destroy all messages
+         */
+        destroyAllMessages(referenceId?: number): void;
+
+        /**
+         * Add a message
+         */
+        addMessage(message: IGrowlMessage): IGrowlMessage;
+
+        /**
+         * Delete a message
+         */
+        deleteMessage(message: IGrowlMessage): void;
+
+    }
 }
diff --git a/angular-jwt/angular-jwt.d.ts b/angular-jwt/angular-jwt.d.ts
index 55bb3e4f6..620fcc8e4 100644
--- a/angular-jwt/angular-jwt.d.ts
+++ b/angular-jwt/angular-jwt.d.ts
@@ -25,6 +25,6 @@ declare module angular.jwt {
     }
 
     interface IJwtInterceptor {
-        tokenGetter(): string;
+        tokenGetter(...params : any[]): string;
     }
 }
diff --git a/angular-material/angular-material-tests.ts b/angular-material/angular-material-tests.ts
index 238d906db..3c70dd27e 100644
--- a/angular-material/angular-material-tests.ts
+++ b/angular-material/angular-material-tests.ts
@@ -44,10 +44,16 @@ myApp.controller('DialogController', ($scope: ng.IScope, $mdDialog: ng.material.
         });
     };
     $scope['alertDialog'] = () => {
-        $mdDialog.show($mdDialog.alert().content('Alert!'));
+        $mdDialog.show($mdDialog.alert().textContent('Alert!'));
+    };
+    $scope['alertDialog'] = () => {
+        $mdDialog.show($mdDialog.alert().htmlContent('<span>Alert!</span>'));
     };
     $scope['confirmDialog'] = () => {
-        $mdDialog.show($mdDialog.confirm().content('Confirm!'));
+        $mdDialog.show($mdDialog.confirm().textContent('Confirm!'));
+    };
+    $scope['confirmDialog'] = () => {
+        $mdDialog.show($mdDialog.confirm().htmlContent('<span>Confirm!</span>'));
     };
     $scope['hideDialog'] = $mdDialog.hide.bind($mdDialog, 'hide');
     $scope['cancelDialog'] = $mdDialog.cancel.bind($mdDialog, 'cancel');
@@ -90,5 +96,5 @@ myApp.controller('SidenavController', ($scope: ng.IScope, $mdSidenav: ng.materia
 });
 
 myApp.controller('ToastController', ($scope: ng.IScope, $mdToast: ng.material.IToastService) => {
-    $scope['openToast'] = () => $mdToast.show($mdToast.simple().content('Hello!'));
-});
\ No newline at end of file
+    $scope['openToast'] = () => $mdToast.show($mdToast.simple().textContent('Hello!'));
+});
diff --git a/angular-material/angular-material.d.ts b/angular-material/angular-material.d.ts
index 3b9a896c9..43e0b9f53 100644
--- a/angular-material/angular-material.d.ts
+++ b/angular-material/angular-material.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Angular Material 0.10.1-rc1+ (angular.material module)
+// Type definitions for Angular Material 1.0.0-rc5+ (angular.material module)
 // Project: https://github.com/angular/material
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -28,7 +28,8 @@ declare module angular.material {
 
     interface IPresetDialog<T> {
         title(title: string): T;
-        content(content: string): T;
+        textContent(textContent: string): T;
+        htmlContent(htmlContent: string): T;
         ok(ok: string): T;
         theme(theme: string): T;
         templateUrl(templateUrl?: string): T;
@@ -115,7 +116,7 @@ declare module angular.material {
     }
 
     interface IToastPreset<T> {
-        content(content: string): T;
+        textContent(content: string): T;
         action(action: string): T;
         highlightAction(highlightAction: boolean): T;
         capsule(capsule: boolean): T;
diff --git a/angular-modal/angular-modal-tests.ts b/angular-modal/angular-modal-tests.ts
new file mode 100644
index 000000000..cbb090cee
--- /dev/null
+++ b/angular-modal/angular-modal-tests.ts
@@ -0,0 +1,104 @@
+/// <reference path="../jquery/jquery.d.ts" />
+/// <reference path="../angularjs/angular.d.ts" />
+/// <reference path="angular-modal.d.ts" />
+
+var btfModal: angularModal.AngularModalFactory;
+
+// Using template URL
+function withTemplateUrl() {
+    btfModal({
+        controller: 'SomeController',
+        controllerAs: 'vm',
+        templateUrl: 'some-template.html'
+    });
+}
+
+// Using template
+function withTemplate() {
+    btfModal({
+        controller: 'SomeController',
+        controllerAs: 'vm',
+        template: '<div></div>'
+    });
+}
+
+// Using controller function
+function withControllerAsFunction() {
+    btfModal({
+        controller: function () {},
+        template: '<div></div>'
+    })
+}
+
+// Using constructor function
+function withControllerClass() {
+    class TestController {
+        constructor(dependency1:any, dependency2:any) {}
+    }
+    btfModal({
+        controller: TestController,
+        template: '<div></div>'
+    });
+}
+
+// With container as selector
+function withContainerAsString() {
+    btfModal({
+        template: '<div></div>',
+        container: '.container'
+    });
+}
+
+// With container as jQuery element
+function withContainerAsJquery() {
+    var container: JQuery = $('body');
+    btfModal({
+        template: '<div></div>',
+        container: container
+    });
+}
+
+// With container as DOM Element
+function withContainerAsDom() {
+    var container: Element = document.getElementById('container');
+    btfModal({
+        template: '<div></div>',
+        container: container
+    });
+}
+
+// With container as DOM Element Array
+function withContainerAsDomArray() {
+    var container: Element[] = [document.getElementById('container'), document.getElementById('container2')];
+    btfModal({
+        template: '<div></div>',
+        container: container
+    });
+}
+
+// With container as function
+function withContainerAsFunction() {
+    btfModal({
+        template: '<div></div>',
+        container: function() {}
+    });
+}
+
+// With container as array
+function withContainerAsArray() {
+    btfModal({
+        template: '<div></div>',
+        container: ['1', 2]
+    });
+}
+
+// Calling return values
+function callingValues() {
+    var modal: angularModal.AngularModal = btfModal({
+        template: '<div></div>'
+    });
+    modal.activate().then(() => {}, () => {});
+    modal.deactivate().then(() => {}, () => {});
+    var isActive: boolean = modal.active();
+}
+
diff --git a/angular-modal/angular-modal.d.ts b/angular-modal/angular-modal.d.ts
new file mode 100644
index 000000000..0effea95c
--- /dev/null
+++ b/angular-modal/angular-modal.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for angular-modal 0.5.0
+// Project: https://github.com/btford/angular-modal
+// Definitions by: Paul Lessing <https://github.com/paullessing>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../angularjs/angular.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
+
+declare module angularModal {
+
+    type AngularModalControllerDefinition = (new (...args: any[]) => any) | Function | string; // Possible arguments to IControllerService
+
+    type AngularModalJQuerySelector = string | Element | Element[] | JQuery | Function | any[] | {}; // Possible arguments to IAugmentedJQueryStatic
+
+    interface AngularModalSettings {
+        controller?: AngularModalControllerDefinition;
+        controllerAs?: string;
+        container?: AngularModalJQuerySelector;
+    }
+
+    export interface AngularModalSettingsWithTemplate extends AngularModalSettings {
+        template: any;
+    }
+
+    export interface AngularModalSettingsWithTemplateUrl extends AngularModalSettings {
+        templateUrl: string;
+    }
+
+    export interface AngularModal {
+        activate(): angular.IPromise<void>;
+        deactivate(): angular.IPromise<void>;
+        active(): boolean;
+    }
+
+    export interface AngularModalFactory {
+        (settings: AngularModalSettingsWithTemplate | AngularModalSettingsWithTemplateUrl): AngularModal;
+    }
+}
diff --git a/angular-notify/angular-notify.d.ts b/angular-notify/angular-notify.d.ts
index 7e55dc654..f97c94e7a 100644
--- a/angular-notify/angular-notify.d.ts
+++ b/angular-notify/angular-notify.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for angular-notify 2.0.2
+// Type definitions for angular-notify 2.5.0
 // Project: https://github.com/cgross/angular-notify
 // Definitions by: Suwato <https://github.com/Suwato/DefinitelyTyped>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -51,6 +51,11 @@ declare module angular.cgNotify {
              * Optional. Currently center and right are the only acceptable values.
              */
             position? : string;
+            
+            /**
+             * Optional. The duration (in milliseconds) of the message. A duration of 0 will prevent the message from closing automatically.
+             */
+            duration? : number;
 
             /**
              * Optional. Element that contains each notification. Defaults to document.body.
@@ -94,6 +99,11 @@ declare module angular.cgNotify {
              * The default element that contains each notification. Defaults to document.body.
              */
             container? : any;
+            
+            /**
+             * The maximum number of total notifications that can be visible at one time. Older notifications will be closed when the maximum is reached.
+             */
+            maximumOpen? : number;
         }):void;
 
         /**
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index 040622b51..a489141d5 100644
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -165,6 +165,12 @@ declare module angular {
             dot: number;
             codeName: string;
         };
+        
+        /**
+         * If window.name contains prefix NG_DEFER_BOOTSTRAP! when angular.bootstrap is called, the bootstrap process will be paused until angular.resumeBootstrap() is called.
+         * @param extraModules An optional array of modules that should be added to the original list of modules that the app was about to be bootstrapped with.
+         */
+        resumeBootstrap?(extraModules?: string[]): ng.auto.IInjectorService;
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -615,7 +621,7 @@ declare module angular {
     // see http://docs.angularjs.org/api/ng.$interval
     ///////////////////////////////////////////////////////////////////////////
     interface IIntervalService {
-        (func: Function, delay: number, count?: number, invokeApply?: boolean): IPromise<any>;
+        (func: Function, delay: number, count?: number, invokeApply?: boolean, ...args: any[]): IPromise<any>;
         cancel(promise: IPromise<any>): boolean;
     }
 
@@ -774,7 +780,7 @@ declare module angular {
          * @param reverse Reverse the order of the array.
          * @return Reverse the order of the array.
          */
-        <T>(array: T[], expression: string|string[]|((value: T) => any)|((value: T) => any)[], reverse?: boolean): T[];
+        <T>(array: T[], expression: string|((value: T) => any)|(((value: T) => any)|string)[], reverse?: boolean): T[];
     }
 
     /**
@@ -1660,6 +1666,7 @@ declare module angular {
         restrict?: string;
         scope?: any;
         template?: any;
+        templateNamespace?: string;
         templateUrl?: any;
         terminal?: boolean;
         transclude?: any;
diff --git a/archiver/archiver.d.ts b/archiver/archiver.d.ts
index 570e1424a..e595083d6 100644
--- a/archiver/archiver.d.ts
+++ b/archiver/archiver.d.ts
@@ -16,12 +16,13 @@
 /// <reference path="../node/node.d.ts" />
 declare module "archiver" {
     import * as FS from 'fs';
+    import * as STREAM from 'stream';
     
     interface nameInterface {
         name?: string;
     }
         
-    interface Archiver {
+    interface Archiver extends STREAM.Transform {
         pipe(writeStream: FS.WriteStream): void;
         append(readStream: FS.ReadStream, name: nameInterface): void;
         finalize(): void;
@@ -38,4 +39,4 @@ declare module "archiver" {
     }
     
     export = archiver;
-}
\ No newline at end of file
+}
diff --git a/argparse/argparse-tests.ts b/argparse/argparse-tests.ts
new file mode 100644
index 000000000..bf565c5f5
--- /dev/null
+++ b/argparse/argparse-tests.ts
@@ -0,0 +1,306 @@
+/// <reference path="argparse.d.ts" />
+// near copy of each of the tests from https://github.com/nodeca/argparse/tree/master/examples
+
+import {ArgumentParser, RawDescriptionHelpFormatter} from 'argparse';
+var args: any;
+
+var simpleExample = new ArgumentParser({
+  version: '0.0.1',
+  addHelp: true,
+  description: 'Argparse example',
+});
+simpleExample.addArgument(
+  ['-f', '--foo'],
+  {
+    help: 'foo bar',
+  }
+);
+simpleExample.addArgument(
+  ['-b', '--bar'],
+  {
+    help: 'bar foo',
+  }
+);
+
+simpleExample.printHelp();
+console.log('-----------');
+
+args = simpleExample.parseArgs('-f 1 -b2'.split(' '));
+console.dir(args);
+console.log('-----------');
+args = simpleExample.parseArgs('-f=3 --bar=4'.split(' '));
+console.dir(args);
+console.log('-----------');
+args = simpleExample.parseArgs('--foo 5 --bar 6'.split(' '));
+console.dir(args);
+console.log('-----------');
+
+
+
+
+var choicesExample = new ArgumentParser({
+  version: '0.0.1',
+  addHelp: true,
+  description: 'Argparse examples: choice'
+});
+
+choicesExample.addArgument(['foo'], { choices: 'abc' });
+
+choicesExample.printHelp();
+console.log('-----------');
+
+args = choicesExample.parseArgs(['c']);
+console.dir(args);
+console.log('-----------');
+// choicesExample.parseArgs(['X']);
+// console.dir(args);
+
+
+
+
+var constantExample = new ArgumentParser({
+  version: '0.0.1',
+  addHelp: true,
+  description: 'Argparse examples: constant'
+});
+
+constantExample.addArgument(
+  ['-a'],
+  {
+    action: 'storeConst',
+    dest: 'answer',
+    help: 'store constant',
+    constant: 42
+  }
+);
+constantExample.addArgument(
+  ['--str'],
+  {
+    action: 'appendConst',
+    dest: 'types',
+    help: 'append constant "str" to types',
+    constant: 'str'
+  }
+);
+constantExample.addArgument(
+  ['--int'],
+  {
+    action: 'appendConst',
+    dest: 'types',
+    help: 'append constant "int" to types',
+    constant: 'int'
+  }
+);
+
+constantExample.addArgument(
+  ['--true'],
+  {
+    action: 'storeTrue',
+    help: 'store true constant'
+  }
+);
+constantExample.addArgument(
+  ['--false'],
+  {
+    action: 'storeFalse',
+    help: 'store false constant'
+  }
+);
+
+constantExample.printHelp();
+console.log('-----------');
+
+args = constantExample.parseArgs('-a --str --int --true'.split(' '));
+console.dir(args);
+
+
+
+
+var nargsExample = new ArgumentParser({
+  version: '0.0.1',
+  addHelp: true,
+  description: 'Argparse examples: nargs'
+});
+nargsExample.addArgument(
+  ['-f', '--foo'],
+  {
+    help: 'foo bar',
+    nargs: 1
+  }
+);
+nargsExample.addArgument(
+  ['-b', '--bar'],
+  {
+    help: 'bar foo',
+    nargs: '*'
+  }
+);
+
+nargsExample.printHelp();
+console.log('-----------');
+
+args = nargsExample.parseArgs('--foo a --bar c d'.split(' '));
+console.dir(args);
+console.log('-----------');
+args = nargsExample.parseArgs('--bar b c f --foo a'.split(' '));
+console.dir(args);
+
+
+
+
+var parent_parser = new ArgumentParser({ addHelp: false });
+// note addHelp:false to prevent duplication of the -h option
+parent_parser.addArgument(
+  ['--parent'],
+  { type: 'int', help: 'parent' }
+);
+
+var foo_parser = new ArgumentParser({
+  parents: [parent_parser],
+  description: 'child1'
+});
+foo_parser.addArgument(['foo']);
+args = foo_parser.parseArgs(['--parent', '2', 'XXX']);
+console.log(args);
+
+var bar_parser = new ArgumentParser({
+  parents: [parent_parser],
+  description: 'child2'
+});
+bar_parser.addArgument(['--bar']);
+args = bar_parser.parseArgs(['--bar', 'YYY']);
+console.log(args);
+
+
+
+
+var prefixCharsExample = new ArgumentParser({
+  version: '0.0.1',
+  addHelp: true,
+  description: 'Argparse examples: prefix_chars',
+  prefixChars: '-+'
+});
+prefixCharsExample.addArgument(['+f', '++foo']);
+prefixCharsExample.addArgument(['++bar'], { action: 'storeTrue' });
+
+prefixCharsExample.printHelp();
+console.log('-----------');
+
+args = prefixCharsExample.parseArgs(['+f', '1']);
+console.dir(args);
+args = prefixCharsExample.parseArgs(['++bar']);
+console.dir(args);
+args = prefixCharsExample.parseArgs(['++foo', '2', '++bar']);
+console.dir(args);
+
+
+
+
+var subparserExample = new ArgumentParser({
+  version: '0.0.1',
+  addHelp: true,
+  description: 'Argparse examples: sub-commands'
+});
+
+var subparsers = subparserExample.addSubparsers({
+  title: 'subcommands',
+  dest: "subcommand_name"
+});
+
+var bar = subparsers.addParser('c1', { addHelp: true, help: 'c1 help' });
+bar.addArgument(
+  ['-f', '--foo'],
+  {
+    action: 'store',
+    help: 'foo3 bar3'
+  }
+);
+var bar = subparsers.addParser(
+  'c2',
+  { aliases: ['co'], addHelp: true, help: 'c2 help' }
+);
+bar.addArgument(
+  ['-b', '--bar'],
+  {
+    action: 'store',
+    type: 'int',
+    help: 'foo3 bar3'
+  }
+);
+subparserExample.printHelp();
+console.log('-----------');
+
+args = subparserExample.parseArgs('c1 -f 2'.split(' '));
+console.dir(args);
+console.log('-----------');
+args = subparserExample.parseArgs('c2 -b 1'.split(' '));
+console.dir(args);
+console.log('-----------');
+args = subparserExample.parseArgs('co -b 1'.split(' '));
+console.dir(args);
+console.log('-----------');
+subparserExample.parseArgs(['c1', '-h']);
+
+
+
+
+var functionExample = new ArgumentParser({ description: 'Process some integers.' });
+function sum(arr: number[]) {
+  return arr.reduce(function(a, b) {
+    return a + b;
+  }, 0);
+}
+function max(arr: number[]) {
+  return Math.max.apply(Math, arr);
+}
+
+
+functionExample.addArgument(['integers'], {
+  metavar: 'N',
+  type: 'int',
+  nargs: '+',
+  help: 'an integer for the accumulator'
+});
+functionExample.addArgument(['--sum'], {
+  dest: 'accumulate',
+  action: 'storeConst',
+  constant: sum,
+  defaultValue: max,
+  help: 'sum the integers (default: find the max)'
+});
+
+args = functionExample.parseArgs('--sum 1 2 -1'.split(' '));
+console.log(args.accumulate(args.integers));
+
+
+
+
+var formatterExample = new ArgumentParser({
+  prog: 'PROG',
+  formatterClass: RawDescriptionHelpFormatter,
+  description: 'Keep the formatting\n' +
+  '    exactly as it is written\n' +
+  '\n' +
+  'here\n'
+});
+
+formatterExample.addArgument(['--foo'], {
+  help: '  foo help should not\n' +
+  '    retain this odd formatting'
+});
+
+formatterExample.addArgument(['spam'], {
+  'help': 'spam help'
+});
+
+var group = formatterExample.addArgumentGroup({
+  title: 'title',
+  description: '    This text\n' +
+  '  should be indented\n' +
+  '    exactly like it is here\n'
+});
+
+group.addArgument(['--bar'], {
+  help: 'bar help'
+});
+formatterExample.printHelp();
diff --git a/argparse/argparse.d.ts b/argparse/argparse.d.ts
new file mode 100644
index 000000000..7585015a2
--- /dev/null
+++ b/argparse/argparse.d.ts
@@ -0,0 +1,90 @@
+// Type definitions for argparse v1.0.3
+// Project: https://github.com/nodeca/argparse
+// Definitions by: Andrew Schurman <http://github.com/arcticwaters>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "argparse" {
+	export class ArgumentParser extends ArgumentGroup {
+		constructor(options? : ArgumentParserOptions);
+
+		addSubparsers(options? : SubparserOptions) : SubParser;
+		parseArgs(args? : string[], ns? : Namespace|Object) : any;
+		printUsage() : void;
+		printHelp() : void;
+		formatUsage() : string;
+		formatHelp() : string;
+		parseKnownArgs(args? : string[], ns? : Namespace|Object) : any[];
+		convertArgLineToArg(argLine : string) : string[];
+		exit(status : number, message : string) : void;
+		error(err : string|Error) : void;
+	}
+	
+	interface Namespace {}
+	
+	class SubParser {
+		addParser(name : string, options? : SubArgumentParserOptions) : ArgumentParser;
+	}
+	
+	class ArgumentGroup {
+		addArgument(args : string[], options? : ArgumentOptions) : void;
+		addArgumentGroup(options? : ArgumentGroupOptions) : ArgumentGroup;
+		addMutuallyExclusiveGroup(options? : {required : boolean}) : ArgumentGroup;
+		setDefaults(options? : {}) : void;
+		getDefault(dest : string) : any;
+	}
+	
+	interface SubparserOptions {
+		title? : string;
+		description? : string;
+		prog? : string;
+		parserClass? : {new() : any};
+		action? : string;
+		dest? : string;
+		help? : string;
+		metavar? : string;
+	}
+	
+	interface SubArgumentParserOptions extends ArgumentParserOptions {
+		aliases? : string[];
+		help? : string;
+	}
+	
+	interface ArgumentParserOptions {
+		description? : string;
+		epilog? : string;
+		addHelp? : boolean;
+		argumentDefault? : any;
+		parents? : ArgumentParser[];
+		prefixChars? : string;
+		formatterClass? : {new() : HelpFormatter|ArgumentDefaultsHelpFormatter|RawDescriptionHelpFormatter|RawTextHelpFormatter};
+		prog? : string;
+		usage? : string;
+		version? : string;
+	}
+	
+	interface ArgumentGroupOptions {
+		prefixChars? : string;
+		argumentDefault? : any;
+		title? : string;
+		description? : string;
+	}
+
+	export class HelpFormatter {} 	
+	export class ArgumentDefaultsHelpFormatter {}
+	export class RawDescriptionHelpFormatter {}
+	export class RawTextHelpFormatter {}
+
+	interface ArgumentOptions {
+		action? : string;
+		optionStrings? : string[];
+		dest? : string;
+		nargs? : string|number;
+		constant? : any;
+		defaultValue? : any;
+		type? : string|Function;
+		choices? : string|string[];
+		required? : boolean;
+		help? : string;
+		metavar? : string;
+	}
+}
diff --git a/async-writer/async-writer-tests.ts b/async-writer/async-writer-tests.ts
new file mode 100644
index 000000000..c26e31495
--- /dev/null
+++ b/async-writer/async-writer-tests.ts
@@ -0,0 +1,66 @@
+/// <reference path="async-writer.d.ts" />
+
+import asyncWriter = require('async-writer');
+import stream = require('stream');
+
+class TestStream extends stream.Writable {
+	constructor(public output: string) {
+		super();
+	}
+	_write(data: string, encoding: string, callback: Function) {
+		this.output += data;
+		callback();
+	}
+}
+
+// Simple usage
+function simpleUsage(callback: () => void) {
+	var output = '';
+	let testStream = new TestStream(output);
+	let out = asyncWriter.create(testStream)
+	.on('error', (err: Error) => {
+		console.error(err);
+	})
+	.on('finish', () => {
+		console.log(testStream.output);
+		callback();
+	})
+
+	out.write('A');
+	out.write('B');
+	out.write('C');
+	out.end();
+}
+
+
+// Asynchronous, out-of-order writing
+function asyncUsage(callback: () => void) {
+	var output = '';
+	let testStream = new TestStream(output);
+	let out = asyncWriter.create(testStream)
+	.on('error', (err: Error) => {
+		console.error(err);
+	})
+	.on('finish', () => {
+		console.log(testStream.output);
+		callback();
+	})
+
+	out.write('A');
+
+	let asyncOut = out.beginAsync();
+	setTimeout(() => {
+		asyncOut.write('B');
+		asyncOut.end();
+	}, 1000);
+
+	out.write('C');
+	out.end();
+}
+
+// run test
+simpleUsage(() => {
+	asyncUsage(() => {
+		console.log('DONE');
+	});
+});
diff --git a/async-writer/async-writer.d.ts b/async-writer/async-writer.d.ts
new file mode 100644
index 000000000..42f82d35c
--- /dev/null
+++ b/async-writer/async-writer.d.ts
@@ -0,0 +1,78 @@
+// Type definitions for async-writer 1.4.1
+// Project: https://github.com/marko-js/async-writer
+// Definitions by: Yuce Tekol <http://yuce.me/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module 'async-writer' {
+	import stream = require('stream');
+	import events = require('events');
+
+	module async_writer {
+		interface EventFunction {
+			(event: string, callback: Function): void;
+		}
+
+		class StringWriter {
+			constructor(events: events.EventEmitter);
+			end(): void;
+			write(what: string): StringWriter;
+			toString(): string;
+		}
+
+		class BufferedWriter {
+			constructor(wrappedStream: stream.Stream);
+			flush(): void;
+			on(event: string, callback: Function): BufferedWriter;
+			once(event: string, callback: Function): BufferedWriter;
+			clear(): void;
+			end(): void;
+			write(what: string): BufferedWriter;
+		}
+
+		interface BeginAsyncOptions {
+			last?: boolean;
+			timeout?: number;
+			name?: string;
+		}
+
+		class AsyncWriter {
+			static enableAsyncStackTrace():void;
+
+			constructor(writer?: any, global?: {[s: string]: any}, async?: boolean, buffer?: boolean);
+			isAsyncWriter: AsyncWriter;
+			sync(): void;
+			getAttributes(): {[s: string]: any};
+			getAttribute(): any;
+			write(str: string): AsyncWriter;
+			getOutput(): string;
+			captureString(func: Function, thisObj: Object): string;
+			swapWriter(newWriter: StringWriter | BufferedWriter, func: Function, thisObj: Object): void;
+			createNestedWriter(writer: StringWriter | BufferedWriter): AsyncWriter;
+			beginAsync(options?: number | BeginAsyncOptions): AsyncWriter;
+			handleBeginAsync(options: number | BeginAsyncOptions, parent: AsyncWriter): void;
+			on(event: string, callback: Function): AsyncWriter;
+			once(event: string, callback: Function): AsyncWriter;
+			onLast(callback: Function): AsyncWriter;
+			emit(arg: any): AsyncWriter;
+			removeListener(): AsyncWriter;
+			pipe(stream: stream.Stream): AsyncWriter;
+			error(e: Error): void;
+			end(data?: any): AsyncWriter;
+			handleEnd(isAsync: boolean): void;
+			_finish(): void;
+			flush(): void;
+		}
+
+		interface AsyncWriterOptions {
+			global?: {[s: string]: any};
+			buffer?: boolean;
+		}
+
+		function create(writer?: any, options?: AsyncWriterOptions): AsyncWriter;
+		function enableAsyncStackTrace(): void;
+	}
+
+	export = async_writer;
+}
diff --git a/bignum/bignum-tests.ts b/bignum/bignum-tests.ts
new file mode 100644
index 000000000..363fad886
--- /dev/null
+++ b/bignum/bignum-tests.ts
@@ -0,0 +1,248 @@
+/// <reference path="bignum.d.ts" />
+
+var bignum = require('bignum');
+
+// Test constructors.
+var instance = bignum(16);
+bignum('16');
+bignum(instance);
+
+// Test `toNumber` function.
+instance.toNumber();
+
+bignum.toNumber(4);
+bignum.toNumber('4');
+bignum.toNumber(bignum(4));
+
+// Test `toBuffer` function.
+instance.toBuffer();
+
+bignum.toBuffer(4);
+bignum.toBuffer('4');
+bignum.toBuffer(bignum(4));
+
+// Test `add` function.
+instance.add(4);
+instance.add('4');
+instance.add(bignum(4));
+
+bignum.add(instance, 4);
+bignum.add(instance, '4');
+bignum.add(instance, bignum(4));
+
+// Test `sub` function.
+instance.sub(4);
+instance.sub('4');
+instance.sub(bignum(4));
+
+bignum.sub(instance, 4);
+bignum.sub(instance, '4');
+bignum.sub(instance, bignum(4));
+
+// Test `mul` function.
+instance.mul(4);
+instance.mul('4');
+instance.mul(bignum(4));
+
+bignum.mul(instance, 4);
+bignum.mul(instance, '4');
+bignum.mul(instance, bignum(4));
+
+// Test `div` function.
+instance.div(4);
+instance.div('4');
+instance.div(bignum(4));
+
+bignum.div(instance, 4);
+bignum.div(instance, '4');
+bignum.div(instance, bignum(4));
+
+// Test `abs` function.
+instance.abs();
+bignum.abs(instance);
+
+// Test `neg` function.
+instance.neg();
+bignum.neg(instance);
+
+// Test `cmp` function.
+instance.cmp(4);
+instance.cmp('4');
+instance.cmp(bignum(4));
+
+bignum.cmp(instance, 4);
+bignum.cmp(instance, '4');
+bignum.cmp(instance, bignum(4));
+
+// Test `gt` function.
+instance.gt(4);
+instance.gt('4');
+instance.gt(bignum(4));
+
+bignum.gt(instance, 4);
+bignum.gt(instance, '4');
+bignum.gt(instance, bignum(4));
+
+// Test `ge` function.
+instance.ge(4);
+instance.ge('4');
+instance.ge(bignum(4));
+
+bignum.ge(instance, 4);
+bignum.ge(instance, '4');
+bignum.ge(instance, bignum(4));
+
+// Test `eq` function.
+instance.eq(4);
+instance.eq('4');
+instance.eq(bignum(4));
+
+bignum.eq(instance, 4);
+bignum.eq(instance, '4');
+bignum.eq(instance, bignum(4));
+
+// Test `lt` function.
+instance.lt(4);
+instance.lt('4');
+instance.lt(bignum(4));
+
+bignum.lt(instance, 4);
+bignum.lt(instance, '4');
+bignum.lt(instance, bignum(4));
+
+// Test `le` function.
+instance.le(4);
+instance.le('4');
+instance.le(bignum(4));
+
+bignum.le(instance, 4);
+bignum.le(instance, '4');
+bignum.le(instance, bignum(4));
+
+// Test `and` function.
+instance.and(4);
+instance.and('4');
+instance.and(bignum(4));
+
+bignum.and(instance, 4);
+bignum.and(instance, '4');
+bignum.and(instance, bignum(4));
+
+// Test `or` function.
+instance.or(4);
+instance.or('4');
+instance.or(bignum(4));
+
+bignum.or(instance, 4);
+bignum.or(instance, '4');
+bignum.or(instance, bignum(4));
+
+// Test `xor` function.
+instance.xor(4);
+instance.xor('4');
+instance.xor(bignum(4));
+
+bignum.xor(instance, 4);
+bignum.xor(instance, '4');
+bignum.xor(instance, bignum(4));
+
+// Test `mod` function.
+instance.mod(4);
+instance.mod('4');
+instance.mod(bignum(4));
+
+bignum.mod(instance, 4);
+bignum.mod(instance, '4');
+bignum.mod(instance, bignum(4));
+
+// Test `pow` function.
+instance.pow(4);
+instance.pow('4');
+instance.pow(bignum(4));
+
+bignum.pow(instance, 4);
+bignum.pow(instance, '4');
+bignum.pow(instance, bignum(4));
+
+// Test `powm` function.
+instance.powm(4, 4);
+instance.powm('4', 4);
+instance.powm(bignum(4), 4);
+
+bignum.powm(instance, 4, 4);
+bignum.powm(instance, '4', 4);
+bignum.powm(instance, bignum(4), 4);
+
+instance.powm(4, '4');
+instance.powm('4', '4');
+instance.powm(bignum(4), '4');
+
+bignum.powm(instance, 4, '4');
+bignum.powm(instance, '4', '4');
+bignum.powm(instance, bignum(4), '4');
+
+instance.powm(4, bignum(4));
+instance.powm('4', bignum(4));
+instance.powm(bignum(4), bignum(4));
+
+bignum.powm(instance, 4, bignum(4));
+bignum.powm(instance, '4', bignum(4));
+bignum.powm(instance, bignum(4), bignum(4));
+
+// Test `invertm` function.
+instance.invertm(4);
+instance.invertm('4');
+instance.invertm(bignum(4));
+
+bignum.invertm(instance, 4);
+bignum.invertm(instance, '4');
+bignum.invertm(instance, bignum(4));
+
+// Test `rand` function.
+instance.rand();
+instance.rand(20);
+instance.rand('20');
+instance.rand(bignum(20));
+
+bignum.rand(instance);
+bignum.rand(instance, 20);
+bignum.rand(instance, '20');
+bignum.rand(instance, bignum(20));
+
+// Test `probPrime` function.
+instance.probPrime();
+
+bignum.probPrime(instance);
+
+// Test `shiftLeft` function.
+instance.shiftLeft(4);
+instance.shiftLeft('4');
+instance.shiftLeft(bignum(4));
+
+bignum.shiftLeft(instance, 4);
+bignum.shiftLeft(instance, '4');
+bignum.shiftLeft(instance, bignum(4));
+
+// Test `shiftRight` function.
+instance.shiftRight(4);
+instance.shiftRight('4');
+instance.shiftRight(bignum(4));
+
+bignum.shiftRight(instance, 4);
+bignum.shiftRight(instance, '4');
+bignum.shiftRight(instance, bignum(4));
+
+// Test `gcd` function.
+instance.gcd(bignum(4));
+
+bignum.gcd(instance, bignum(4));
+
+// Test `jacobi` function.
+instance.jacobi(bignum(17));
+
+bignum.jacobi(instance, bignum(17));
+
+// Test `bitLength` function.
+instance.bitLength();
+
+bignum.bitLength(instance);
diff --git a/bignum/bignum.d.ts b/bignum/bignum.d.ts
new file mode 100644
index 000000000..b9e653e18
--- /dev/null
+++ b/bignum/bignum.d.ts
@@ -0,0 +1,269 @@
+// Type definitions for BigNum
+// Project: https://github.com/justmoon/node-BigNum
+// Definitions by: Pat Smuk <https://github.com/Patman64>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare class BigNum {
+    /** Create a new BigNum from n. */
+    constructor(n: number|BigNum);
+    
+    /** Create a new BigNum from n and a base. */
+    constructor(n: string, base?: number);
+    
+    /**
+     * Create a new BigNum from a Buffer.
+     * 
+     * The default options are: {endian: 'big', size: 1}.
+     */
+    static fromBuffer(buffer: Buffer, options?: BigNum.BufferOptions): BigNum;
+    
+    /**
+     * Generate a probable prime of length bits.
+     * 
+     * If safe is true, it will be a "safe" prime of the form p=2p'+1 where p' is also prime.
+     */
+    static prime(bits: number, safe?: boolean): BigNum;
+    
+    /** Return true if num is identified as a BigNum instance. Otherwise, return false. */
+    static isBigNum(num: any): boolean;
+    
+    /** Print out the BigNum instance in the requested base as a string. Default: base 10 */
+    toString(base?: number): string;
+    
+    /**
+     * Turn a BigNum into a Number.
+     * 
+     * If the BigNum is too big you'll lose precision or you'll get ±Infinity.
+     */
+    toNumber(): number;
+    
+    /**
+    * Return a new Buffer with the data from the BigNum.
+    * 
+    * The default options are: {endian: 'big', size: 1}.
+    */
+    toBuffer(options?: BigNum.BufferOptions): Buffer;
+    
+    /** Return a new BigNum containing the instance value plus n. */
+    add(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum containing the instance value minus n. */
+    sub(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum containing the instance value multiplied by n. */
+    mul(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum containing the instance value integrally divided by n. */
+    div(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the absolute value of the instance. */
+    abs(): BigNum;
+    
+    /** Return a new BigNum with the negative of the instance value. */
+    neg(): BigNum;
+    
+    /**
+     * Compare the instance value to n.
+     * 
+     * Return a positive integer if > n, a negative integer if < n, and 0 if == n.
+     */
+    cmp(n: BigNum.BigNumCompatible): number;
+    
+    /** Return a boolean: whether the instance value is greater than n (> n). */
+    gt(n: BigNum.BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is greater than or equal to n (>= n). */
+    ge(n: BigNum.BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is equal to n (== n). */
+    eq(n: BigNum.BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is less than n (< n). */
+    lt(n: BigNum.BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is less than or equal to n (<= n). */
+    le(n: BigNum.BigNumCompatible): boolean;
+    
+    /** Return a new BigNum with the instance value bitwise AND (&)-ed with n. */
+    and(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value bitwise inclusive-OR (|)-ed with n. */
+    or(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value bitwise exclusive-OR (^)-ed with n. */
+    xor(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value modulo n. */
+    mod(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value raised to the nth power. */
+    pow(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value raised to the nth power modulo m. */
+    powm(n: BigNum.BigNumCompatible, m: BigNum.BigNumCompatible): BigNum;
+    
+    /** Compute the multiplicative inverse modulo m. */
+    invertm(m: BigNum.BigNumCompatible): BigNum;
+    
+    /**
+     * If upperBound is supplied, return a random BigNum between the instance value and upperBound - 1, inclusive.
+     * Otherwise, return a random BigNum between 0 and the instance value - 1, inclusive.
+     */
+    rand(upperBound?: BigNum.BigNumCompatible): BigNum;
+    
+    /** 
+     * Return whether the BigNum is:
+     *  - certainly prime (true)
+     *  - probably prime ('maybe')
+     *  - certainly composite (false)
+     */
+    probPrime(): boolean | string;
+    
+    /** Return a new BigNum that is the 2^n multiple. Equivalent of the << operator. */
+    shiftLeft(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum of the value integer divided by 2^n. Equivalent of the >> operator. */
+    shiftRight(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return the greatest common divisor of the current BigNum with n as a new BigNum. */
+    gcd(n: BigNum): BigNum;
+    
+    /**
+     * Return the Jacobi symbol (or Legendre symbol if n is prime) of the current BigNum (= a) over n.
+     * Note that n must be odd and >= 3. 0 <= a < n.
+     * 
+     * Returns -1 or 1 as an int (NOT a BigNum). Throws an error on failure.
+     */
+    jacobi(n: BigNum): number;
+    
+    /** Return the number of bits used to represent the current BigNum. */
+    bitLength(): number;
+}
+
+declare namespace BigNum {
+    /** Anything that can be converted to BigNum. */
+    type BigNumCompatible = BigNum | number | string;
+    
+    export interface BufferOptions {
+        /** Can be either 'big' or 'little'. Also accepts 1 for big and -1 for little. Doesn't matter when size = 1. */
+        endian: string | number;
+        
+        /** Number of bytes per word, or 'auto' to flip entire Buffer. */
+        size: number | string;
+    }
+    
+    /**
+     * Turn a BigNum into a Number.
+     * 
+     * If the BigNum is too big you'll lose precision or you'll get ±Infinity.
+     */
+    export function toNumber(n: BigNumCompatible): number;
+    
+    /**
+     * Return a new Buffer with the data from the BigNum.
+     * 
+     * The default options are: {endian: 'big', size: 1}.
+     */
+    export function toBuffer(n: BigNumCompatible, options?: BufferOptions): Buffer;
+    
+    /** Return a new BigNum containing the instance value plus n. */
+    export function add(left: BigNumCompatible, right: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum containing the instance value minus n. */
+    export function sub(left: BigNumCompatible, right: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum containing the instance value multiplied by n. */
+    export function mul(left: BigNumCompatible, right: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum containing the instance value integrally divided by n. */
+    export function div(dividend: BigNumCompatible, divisor: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the absolute value of the instance. */
+    export function abs(n: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the negative of the instance value. */
+    export function neg(n: BigNumCompatible): BigNum;
+    
+    /**
+     * Compare the instance value to n.
+     * 
+     * Return a positive integer if > n, a negative integer if < n, and 0 if == n.
+     */
+    export function cmp(left: BigNumCompatible, right: BigNumCompatible): number;
+    
+    /** Return a boolean: whether the instance value is greater than n (> n). */
+    export function gt(left: BigNumCompatible, right: BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is greater than or equal to n (>= n). */
+    export function ge(left: BigNumCompatible, right: BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is equal to n (== n). */
+    export function eq(left: BigNumCompatible, right: BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is less than n (< n). */
+    export function lt(left: BigNumCompatible, right: BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is less than or equal to n (<= n). */
+    export function le(left: BigNumCompatible, right: BigNumCompatible): boolean;
+    
+    /** Return a new BigNum with the instance value bitwise AND (&)-ed with n. */
+    export function and(left: BigNumCompatible, right: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value bitwise inclusive-OR (|)-ed with n. */
+    export function or(left: BigNumCompatible, right: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value bitwise exclusive-OR (^)-ed with n. */
+    export function xor(left: BigNumCompatible, right: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value modulo n. */
+    export function mod(left: BigNumCompatible, right: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value raised to the nth power. */
+    export function pow(base: BigNumCompatible, exponent: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value raised to the nth power modulo m. */
+    export function powm(base: BigNumCompatible, exponent: BigNumCompatible, m: BigNumCompatible): BigNum;
+    
+    /** Compute the multiplicative inverse modulo m. */
+    export function invertm(n: BigNumCompatible, m: BigNumCompatible): BigNum;
+    
+    /**
+     * If upperBound is supplied, return a random BigNum between the instance value and upperBound - 1, inclusive.
+     * Otherwise, return a random BigNum between 0 and the instance value - 1, inclusive.
+     */
+    export function rand(n: BigNumCompatible, upperBound?: BigNumCompatible): BigNum;
+    
+    /** 
+     * Return whether the BigNum is:
+     *  - certainly prime (true)
+     *  - probably prime ('maybe')
+     *  - certainly composite (false)
+     */
+    export function probPrime(n: BigNumCompatible): boolean | string;
+    
+    /** Return a new BigNum that is the 2^bits multiple. Equivalent of the << operator. */
+    export function shiftLeft(n: BigNumCompatible, bits: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum of the value integer divided by 2^bits. Equivalent of the >> operator. */
+    export function shiftRight(n: BigNumCompatible, bits: BigNumCompatible): BigNum;
+    
+    /** Return the greatest common divisor of the current BigNum with n as a new BigNum. */
+    export function gcd(left: BigNumCompatible, right: BigNum): BigNum;
+    
+    /**
+     * Return the Jacobi symbol (or Legendre symbol if n is prime) of the current BigNum (= a) over n.
+     * Note that n must be odd and >= 3. 0 <= a < n.
+     * 
+     * Returns -1 or 1 as an int (NOT a BigNum). Throws an error on failure.
+     */
+    export function jacobi(a: BigNumCompatible, n: BigNum): number;
+    
+    /** Return the number of bits used to represent the current BigNum. */
+    export function bitLength(n: BigNumCompatible): number;
+}
+
+declare module "bignum" {
+    export = BigNum;
+}
diff --git a/bluebird/bluebird-1.0.d.ts b/bluebird/bluebird-1.0.d.ts
index 69a4f9152..db9dd0dd2 100644
--- a/bluebird/bluebird-1.0.d.ts
+++ b/bluebird/bluebird-1.0.d.ts
@@ -131,7 +131,7 @@ declare class Promise<R> implements Promise.Thenable<R> {
 	 * Promises are by default not cancellable. Use `.cancellable()` to mark a promise as cancellable.
 	 */
 	// TODO what to do with this?
-	cancel<U>(): Promise<U>;
+	cancel<U>(reason?: any): Promise<U>;
 
 	/**
 	 * Like `.then()`, but cancellation of the the returned promise or any of its descendant will not propagate cancellation to this promise or this promise's ancestors.
diff --git a/bluebird/bluebird-tests.ts b/bluebird/bluebird-tests.ts
index ade461074..bd4f46fc4 100644
--- a/bluebird/bluebird-tests.ts
+++ b/bluebird/bluebird-tests.ts
@@ -80,6 +80,7 @@ var voidProm: Promise<void>;
 
 var fooProm: Promise<Foo>;
 var barProm: Promise<Bar>;
+var fooOrBarProm: Promise<Foo|Bar>;
 var bazProm: Promise<Baz>;
 
 // - - - - - - - - - - - - - - - - -
@@ -150,6 +151,7 @@ var BlueBird: typeof Promise;
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 var nodeCallbackFunc = (callback: (err: any, result: string) => void) => {}
+var nodeCallbackFuncErrorOnly = (callback: (err: any) => void) => {}
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -225,6 +227,21 @@ barProm = fooProm.then((value: Foo) => {
 }, (reason: any) => {
 	return bar;
 });
+barProm = fooProm.then((value: Foo) => {
+	return bar;
+}, (reason: any) => {
+	return barProm;
+});
+barProm = fooProm.then((value: Foo) => {
+	return bar;
+}, (reason: any) => {
+	return;
+});
+barProm = fooProm.then((value: Foo) => {
+	return bar;
+}, (reason: any) => {
+	return voidProm;
+});
 barProm = fooProm.then((value: Foo) => {
 	return bar;
 });
@@ -236,36 +253,96 @@ barProm = barProm.then((value: Bar) => {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-barProm = fooProm.catch((reason: any) => {
+fooProm = fooProm.catch((reason: any) => {
+	return;
+});
+
+fooProm = fooProm.caught((reason: any) => {
+	return;
+});
+fooProm = fooProm.catch((error: any) => {
+	return true;
+}, (reason: any) => {
+	return;
+});
+fooProm = fooProm.caught((error: any) => {
+	return true;
+}, (reason: any) => {
+	return;
+});
+
+fooProm = fooProm.catch((reason: any) => {
+	return voidProm;
+});
+
+fooProm = fooProm.caught((reason: any) => {
+	return voidProm;
+});
+fooProm = fooProm.catch((error: any) => {
+	return true;
+}, (reason: any) => {
+	return voidProm;
+});
+fooProm = fooProm.caught((error: any) => {
+	return true;
+}, (reason: any) => {
+	return voidProm;
+});
+
+fooProm = fooProm.catch((reason: any) => {
+	//handle multiple valid return types simultaneously
+	if (true) {
+		return;
+	} else if (false) {
+		return voidProm;
+	} else if (foo) {
+		return foo;
+	}
+});
+
+fooOrBarProm = fooProm.catch((reason: any) => {
 	return bar;
 });
-barProm = fooProm.caught((reason: any) => {
+fooOrBarProm = fooProm.caught((reason: any) => {
 	return bar;
 });
 
-barProm = fooProm.catch((reason: any) => {
-	return bar;
+fooOrBarProm = fooProm.catch((error: any) => {
+	return true;
 }, (reason: any) => {
 	return bar;
 });
-barProm = fooProm.caught((reason: any) => {
-	return bar;
+fooOrBarProm = fooProm.caught((error: any) => {
+	return true;
 }, (reason: any) => {
 	return bar;
 });
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-barProm = fooProm.catch(Error, (reason: any) => {
+fooProm = fooProm.catch(Error, (reason: any) => {
+	return;
+});
+fooProm = fooProm.catch(Promise.CancellationError, (reason: any) => {
+	return;
+});
+fooProm = fooProm.caught(Error, (reason: any) => {
+	return;
+});
+fooProm = fooProm.caught(Promise.CancellationError, (reason: any) => {
+	return;
+});
+
+fooOrBarProm = fooProm.catch(Error, (reason: any) => {
 	return bar;
 });
-barProm = fooProm.catch(Promise.CancellationError, (reason: any) => {
+fooOrBarProm = fooProm.catch(Promise.CancellationError, (reason: any) => {
 	return bar;
 });
-barProm = fooProm.caught(Error, (reason: any) => {
+fooOrBarProm = fooProm.caught(Error, (reason: any) => {
 	return bar;
 });
-barProm = fooProm.caught(Promise.CancellationError, (reason: any) => {
+fooOrBarProm = fooProm.caught(Promise.CancellationError, (reason: any) => {
 	return bar;
 });
 
@@ -678,6 +755,7 @@ func = Promise.promisify(f, obj);
 
 obj = Promise.promisifyAll(obj);
 anyProm = Promise.fromNode(callback => nodeCallbackFunc(callback));
+anyProm = Promise.fromNode(callback => nodeCallbackFuncErrorOnly(callback));
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
diff --git a/bluebird/bluebird.d.ts b/bluebird/bluebird.d.ts
index 878e1051e..9b55578ef 100644
--- a/bluebird/bluebird.d.ts
+++ b/bluebird/bluebird.d.ts
@@ -20,24 +20,24 @@ declare class Promise<R> implements Promise.Thenable<R>, Promise.Inspection<R> {
 	/**
 	 * Create a new promise. The passed in function will receive functions `resolve` and `reject` as its arguments which can be called to seal the fate of the created promise.
 	 */
-	constructor(callback: (resolve: (thenableOrResult: R | Promise.Thenable<R>) => void, reject: (error: any) => void) => void);
+	constructor(callback: (resolve: (thenableOrResult?: R | Promise.Thenable<R>) => void, reject: (error: any) => void) => void);
 
 	/**
 	 * Promises/A+ `.then()` with progress handler. Returns a new promise chained from this promise. The new promise will be rejected or resolved dedefer on the passed `fulfilledHandler`, `rejectedHandler` and the state of this promise.
 	 */
-	then<U>(onFulfill: (value: R) => U|Promise.Thenable<U>, onReject: (error: any) => Promise.Thenable<U>, onProgress?: (note: any) => any): Promise<U>;
-	then<U>(onFulfill: (value: R) => U|Promise.Thenable<U>, onReject?: (error: any) => U, onProgress?: (note: any) => any): Promise<U>;
+	then<U>(onFulfill: (value: R) => U|Promise.Thenable<U>, onReject?: (error: any) => U|Promise.Thenable<U>, onProgress?: (note: any) => any): Promise<U>;
+	then<U>(onFulfill: (value: R) => U|Promise.Thenable<U>, onReject?: (error: any) => void|Promise.Thenable<void>, onProgress?: (note: any) => any): Promise<U>;
 
 	/**
 	 * This is a catch-all exception handler, shortcut for calling `.then(null, handler)` on this promise. Any exception happening in a `.then`-chain will propagate to nearest `.catch` handler.
 	 *
 	 * Alias `.caught();` for compatibility with earlier ECMAScript version.
 	 */
-	catch<U>(onReject?: (error: any) => Promise.Thenable<U>): Promise<U>;
-	caught<U>(onReject?: (error: any) => Promise.Thenable<U>): Promise<U>;
+	catch(onReject?: (error: any) => R|Promise.Thenable<R>|void|Promise.Thenable<void>): Promise<R>;
+	caught(onReject?: (error: any) => R|Promise.Thenable<R>|void|Promise.Thenable<void>): Promise<R>;
 
-	catch<U>(onReject?: (error: any) => U): Promise<U>;
-	caught<U>(onReject?: (error: any) => U): Promise<U>;
+	catch<U>(onReject?: (error: any) => U|Promise.Thenable<U>): Promise<U|R>;
+	caught<U>(onReject?: (error: any) => U|Promise.Thenable<U>): Promise<U|R>;
 
 	/**
 	 * This extends `.catch` to work more like catch-clauses in languages like Java or C#. Instead of manually checking `instanceof` or `.name === "SomeError"`, you may specify a number of error constructors which are eligible for this catch handler. The catch handler that is first met that has eligible constructors specified, is the one that will be called.
@@ -46,17 +46,18 @@ declare class Promise<R> implements Promise.Thenable<R>, Promise.Inspection<R> {
 	 *
 	 * Alias `.caught();` for compatibility with earlier ECMAScript version.
 	 */
-	catch<U>(predicate: (error: any) => boolean, onReject: (error: any) => Promise.Thenable<U>): Promise<U>;
-	caught<U>(predicate: (error: any) => boolean, onReject: (error: any) => Promise.Thenable<U>): Promise<U>;
+	catch(predicate: (error: any) => boolean, onReject: (error: any) => R|Promise.Thenable<R>|void|Promise.Thenable<void>): Promise<R>;
+	caught(predicate: (error: any) => boolean, onReject: (error: any) => R|Promise.Thenable<R>|void|Promise.Thenable<void>): Promise<R>;
 
-	catch<U>(predicate: (error: any) => boolean, onReject: (error: any) => U): Promise<U>;
-	caught<U>(predicate: (error: any) => boolean, onReject: (error: any) => U): Promise<U>;
+	catch<U>(predicate: (error: any) => boolean, onReject: (error: any) => U|Promise.Thenable<U>): Promise<U|R>;
+	caught<U>(predicate: (error: any) => boolean, onReject: (error: any) => U|Promise.Thenable<U>): Promise<U|R>;
 
-	catch<U>(ErrorClass: Function, onReject: (error: any) => Promise.Thenable<U>): Promise<U>;
-	caught<U>(ErrorClass: Function, onReject: (error: any) => Promise.Thenable<U>): Promise<U>;
+	catch(ErrorClass: Function, onReject: (error: any) => R|Promise.Thenable<R>|void|Promise.Thenable<void>): Promise<R>;
+	caught(ErrorClass: Function, onReject: (error: any) => R|Promise.Thenable<R>|void|Promise.Thenable<void>): Promise<R>;
+
+	catch<U>(ErrorClass: Function, onReject: (error: any) => U|Promise.Thenable<U>): Promise<U|R>;
+	caught<U>(ErrorClass: Function, onReject: (error: any) => U|Promise.Thenable<U>): Promise<U|R>;
 
-	catch<U>(ErrorClass: Function, onReject: (error: any) => U): Promise<U>;
-	caught<U>(ErrorClass: Function, onReject: (error: any) => U): Promise<U>;
 
 	/**
 	 * Like `.catch` but instead of catching all types of exceptions, it only catches those that don't originate from thrown errors but rather from explicit rejections.
@@ -133,7 +134,7 @@ declare class Promise<R> implements Promise.Thenable<R>, Promise.Inspection<R> {
 	 * Promises are by default not cancellable. Use `.cancellable()` to mark a promise as cancellable.
 	 */
 	// TODO what to do with this?
-	cancel<U>(): Promise<U>;
+	cancel<U>(reason?: any): Promise<U>;
 
 	/**
 	 * Like `.then()`, but cancellation of the the returned promise or any of its descendant will not propagate cancellation to this promise or this promise's ancestors.
@@ -426,7 +427,7 @@ declare class Promise<R> implements Promise.Thenable<R>, Promise.Inspection<R> {
 	/**
 	 * Returns a promise that is resolved by a node style callback function.
 	 */
-	static fromNode(resolver: (callback: (err: any, result: any) => void) => void): Promise<any>;
+	static fromNode(resolver: (callback: (err: any, result?: any) => void) => void): Promise<any>;
 
 	/**
 	 * Returns a function that can use `yield` to run asynchronous code synchronously. This feature requires the support of generators which are drafted in the next version of the language. Node version greater than `0.11.2` is required and needs to be executed with the `--harmony-generators` (or `--harmony`) command-line switch.
@@ -671,8 +672,8 @@ declare module Promise {
 	export function OperationalError(): OperationalError;
 
 	export interface Thenable<R> {
-		then<U>(onFulfilled: (value: R) => U|Thenable<U>, onRejected: (error: any) => Thenable<U>): Thenable<U>;
-		then<U>(onFulfilled: (value: R) => U|Thenable<U>, onRejected?: (error: any) => U): Thenable<U>;
+		then<U>(onFulfilled: (value: R) => U|Thenable<U>, onRejected?: (error: any) => U|Thenable<U>): Thenable<U>;
+		then<U>(onFulfilled: (value: R) => U|Thenable<U>, onRejected?: (error: any) => void|Thenable<void>): Thenable<U>;
 	}
 
 	export interface Resolver<R> {
diff --git a/bookshelf/bookshelf-tests.ts b/bookshelf/bookshelf-tests.ts
new file mode 100644
index 000000000..67580dae5
--- /dev/null
+++ b/bookshelf/bookshelf-tests.ts
@@ -0,0 +1,100 @@
+/// <reference path="bookshelf.d.ts" />
+/// <reference path="../knex/knex.d.ts" />
+
+import * as Knex from 'knex';
+import * as Bookshelf from 'bookshelf';
+
+var knex = Knex({
+	client: 'sqlite3',
+	connection: {
+		filename: ':memory:',
+	},
+});
+
+// Examples
+
+var bookshelf = Bookshelf(knex);
+
+class User extends bookshelf.Model<User> {
+	get tableName() { return 'users'; }
+	messages() : Bookshelf.Collection<Posts> {
+		return this.hasMany(Posts);
+	}
+}
+
+class Posts extends bookshelf.Model<Posts> {
+	get tableName() { return 'messages'; }
+	tags() : Bookshelf.Collection<Tag> {
+		return this.belongsToMany(Tag);
+	}
+}
+
+class Tag extends bookshelf.Model<Tag> {
+	get tableName() { return 'tags'; }
+}
+
+new User({}).where('id', 1).fetch({withRelated: ['posts.tags']})
+.then(user => {
+	console.log(user.related('posts').toJSON());
+}).catch(err => {
+	console.error(err);
+});
+
+
+// Associations
+
+class Book extends bookshelf.Model<Book> {
+	get tableName() { return 'books'; }
+	summary() {
+		return this.hasOne(Summary);
+	}
+	pages() {
+		return this.hasMany(Pages);
+	}
+	authors() {
+		return this.belongsToMany(Author);
+	}
+}
+
+class Summary extends bookshelf.Model<Summary> {
+	get tableName() { return 'summaries'; }
+	book() : Book {
+		return this.belongsTo(Book);
+	}
+}
+
+class Pages extends bookshelf.Model<Pages> {
+	get tableName() { return 'pages'; }
+	book() {
+		return this.belongsTo(Book);
+	}
+}
+
+class Author extends bookshelf.Model<Author> {
+	get tableName() { return 'author'; }
+	books() {
+		return this.belongsToMany(Book);
+	}
+}
+
+class Site extends bookshelf.Model<Site> {
+	get tableName() { return 'sites'; }
+	photo() {
+		return this.morphOne(Photo, 'imageable');
+	}
+}
+
+class Post extends bookshelf.Model<Post> {
+	get tableName() { return 'posts'; }
+	photos() {
+		return this.morphMany(Photo, 'imageable');
+	}
+}
+
+class Photo extends bookshelf.Model<Photo> {
+	get tableName() { return 'photos'; }
+	imageable() {
+		return this.morphTo('imageable', Site, Post);
+	}
+}
+
diff --git a/bookshelf/bookshelf-tests.ts.tscparams b/bookshelf/bookshelf-tests.ts.tscparams
new file mode 100644
index 000000000..5f84b9777
--- /dev/null
+++ b/bookshelf/bookshelf-tests.ts.tscparams
@@ -0,0 +1 @@
+--noImplicitAny --module commonjs --target es5
diff --git a/bookshelf/bookshelf.d.ts b/bookshelf/bookshelf.d.ts
new file mode 100644
index 000000000..0da1ce2d6
--- /dev/null
+++ b/bookshelf/bookshelf.d.ts
@@ -0,0 +1,313 @@
+// Type definitions for bookshelfjs v0.8.2
+// Project: http://bookshelfjs.org/
+// Definitions by: Andrew Schurman <http://github.com/arcticwaters>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../bluebird/bluebird.d.ts" />
+/// <reference path="../lodash/lodash.d.ts" />
+/// <reference path="../knex/knex.d.ts" />
+
+declare module 'bookshelf' {
+	import knex = require('knex');
+	import Promise = require('bluebird');
+	import Lodash = require('lodash');
+	
+	interface Bookshelf extends Bookshelf.Events<any> {
+		VERSION : string;
+		knex : knex;
+		Model : typeof Bookshelf.Model;
+		Collection : typeof Bookshelf.Collection;
+
+		transaction<T>(callback : (transaction : knex.Transaction) => T) : Promise<T>;
+	}
+	
+	function Bookshelf(knex : knex) : Bookshelf;
+	
+	namespace Bookshelf {
+		abstract class Events<T> {
+			on(event? : string, callback? : EventFunction<T>, context? : any) : void;
+			off(event? : string) : void;
+			trigger(event? : string, ...args : any[]) : void;
+			triggerThen(name : string, ...args : any[]) : Promise<any>;
+			once(event : string, callback : EventFunction<T>, context? : any) : void;
+		}
+		
+		interface IModelBase {
+			/** Should be declared as a getter instead of a plain property. */
+			hasTimestamps? : boolean|string[];
+			/** Should be declared as a getter instead of a plain property. Should be required, but cannot have abstract properties yet. */
+			tableName? : string;
+		}
+		
+		abstract class ModelBase<T extends Model<any>> extends Events<T|Collection<T>> implements IModelBase {
+			/** If overriding, must use a getter instead of a plain property. */
+			idAttribute : string;
+			
+			constructor(attributes? : any, options? : ModelOptions);
+			
+			clear() : T;
+			clone() : T;
+			escape(attribute : string) : string;
+			format(attributes : any) : any;
+			get(attribute : string) : any;
+			has(attribute : string) : boolean;
+			hasChanged(attribute? : string) : boolean;
+			isNew() : boolean;
+			parse(response : any) : any;
+			previousAttributes() : any;
+			previous(attribute : string) : any;
+			related<R extends Model<any>>(relation : string) : R | Collection<R>;
+			serialize(options? : SerializeOptions) : any;
+			set(attribute?: {[key : string] : any}, options? : SetOptions) : T;
+			set(attribute : string, value? : any, options? : SetOptions) : T;
+			timestamp(options? : TimestampOptions) : any;
+			toJSON(options? : SerializeOptions) : any;
+			unset(attribute : string) : T;
+			
+			// lodash methods
+			invert<R extends {}>() : R;
+			keys() : string[];
+			omit<R extends {}>(predicate? : Lodash.ObjectIterator<any, boolean>, thisArg? : any) : R;
+			omit<R extends {}>(...attributes : string[]) : R;
+			pairs() : any[][];
+			pick<R extends {}>(predicate? : Lodash.ObjectIterator<any, boolean>, thisArg? : any) : R;
+			pick<R extends {}>(...attributes : string[]) : R;
+			values() : any[];
+		}
+		
+		class Model<T extends Model<any>> extends ModelBase<T> {
+			static collection<T extends Model<any>>(models? : T[], options? : CollectionOptions<T>) : Collection<T>;
+			static count(column? : string, options? : SyncOptions) : Promise<number>;
+			/** @deprecated use Typescript classes */
+			static extend<T extends Model<any>>(prototypeProperties? : any, classProperties? : any) : Function; // should return a type
+			static fetchAll<T extends Model<any>>() : Promise<Collection<T>>;
+			/** @deprecated should use `new` objects instead. */
+			static forge<T>(attributes? : any, options? : ModelOptions) : T;
+			
+			belongsTo<R extends Model<any>>(target : {new(...args : any[]) : R}, foreignKey? : string) : R;
+			belongsToMany<R extends Model<any>>(target : {new(...args : any[]) : R}, table? : string, foreignKey? : string, otherKey? : string) : Collection<R>;
+			count(column? : string, options? : SyncOptions) : Promise<number>;
+			destroy(options : SyncOptions) : void;
+			fetch(options? : FetchOptions) : Promise<T>;
+			fetchAll(options? : FetchAllOptions) : Promise<Collection<T>>;
+			hasMany<R extends Model<any>>(target : {new(...args : any[]) : R}, foreignKey? : string) : Collection<R>;
+			hasOne<R extends Model<any>>(target : {new(...args : any[]) : R}, foreignKey? : string) : R;
+			load(relations : string|string[], options? : LoadOptions) : Promise<T>;
+			morphMany<R extends Model<any>>(target : {new(...args : any[]) : R}, name? : string, columnNames? : string[], morphValue? : string) : Collection<R>;
+			morphOne<R extends Model<any>>(target : {new(...args : any[]) : R}, name? : string, columnNames? : string[], morphValue? : string) : R;
+			morphTo(name : string, columnNames? : string[], ...target : typeof Model[]) : T;
+			morphTo(name : string, ...target : typeof Model[]) : T;
+			query(...query : string[]) : T;
+			query(query : {[key : string] : any}) : T;
+			query(callback : (qb : knex.QueryBuilder) => void) : T;
+			query() : knex.QueryBuilder;
+			refresh(options? : FetchOptions) : Promise<T>;
+			resetQuery() : T;
+			save(key? : string, val? : string, options? : SaveOptions) : Promise<T>;
+			save(attrs? : {[key : string] : any}, options? : SaveOptions) : Promise<T>;
+			through<R extends Model<any>>(interim : typeof Model, throughForeignKey? : string, otherKey? : string) : R | Collection<R>;
+			where(properties : {[key : string] : any}) : T;
+			where(key : string, operatorOrValue : string|number|boolean, valueIfOperator? : string|number|boolean) : T;
+		}
+		
+		abstract class CollectionBase<T extends Model<any>> extends Events<T> {
+			add(models : T[]|{[key : string] : any}[], options? : CollectionAddOptions) : Collection<T>;
+			at(index : number) : T;
+			clone() : Collection<T>;
+			fetch(options? : CollectionFetchOptions) : Promise<Collection<T>>;
+			findWhere(match : {[key : string] : any}) : T;
+			get(id : any) : T;
+			invokeThen(name : string, ...args : any[]) : Promise<any>;
+			parse(response : any) : any;
+			pluck(attribute : string) : any[];
+			pop() : void;
+			push(model : any) : Collection<T>;
+			reduceThen<R>(iterator : (prev : R, cur : T, idx : number, array : T[]) => R, initialValue : R, context : any) : Promise<R>;
+			remove(model : T, options? : EventOptions) : T;
+			remove(model : T[], options? : EventOptions) : T[];
+			reset(model : any[], options? : CollectionAddOptions) : T[];
+			serialize(options? : SerializeOptions) : any;
+			set(models : T[]|{[key : string] : any}[], options? : CollectionSetOptions) : Collection<T>;
+			shift(options? : EventOptions) : void;
+			slice(begin? : number, end? : number) : void;
+			toJSON(options? : SerializeOptions) : any;
+			unshift(model : any, options? : CollectionAddOptions) : void;
+			where(match : {[key : string] : any}, firstOnly : boolean) : T|Collection<T>;
+			
+			// lodash methods
+			all(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
+			all<R extends {}>(predicate? : R) : boolean;
+			any(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
+			any<R extends {}>(predicate? : R) : boolean;
+			chain() : Lodash.LoDashExplicitObjectWrapper<T>;
+			collect(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
+			collect<R extends {}>(predicate? : R) : T[];
+			contains(value : any, fromIndex? : number) : boolean;
+			countBy(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : Lodash.Dictionary<number>;
+			countBy<R extends {}>(predicate? : R) : Lodash.Dictionary<number>;
+			detect(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T;
+			detect<R extends {}>(predicate? : R) : T;
+			difference(...values : T[]) : T[];
+			drop(n? : number) : T[];
+			each(callback? : Lodash.ListIterator<T, void>, thisArg? : any) : Lodash.List<T>;
+			each(callback? : Lodash.DictionaryIterator<T, void>, thisArg? : any) : Lodash.Dictionary<T>;
+			each(callback? : Lodash.ObjectIterator<T, void>, thisArg? : any) : T;
+			every(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
+			every<R extends {}>(predicate? : R) : boolean;
+			filter(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
+			filter<R extends {}>(predicate? : R) : T[];
+			find(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T;
+			find<R extends {}>(predicate? : R) : T;
+			first() : T;
+			foldl<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
+			foldr<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
+			forEach(callback? : Lodash.ListIterator<T, void>, thisArg? : any) : Lodash.List<T>;
+			forEach(callback? : Lodash.DictionaryIterator<T, void>, thisArg? : any) : Lodash.Dictionary<T>;
+			forEach(callback? : Lodash.ObjectIterator<T, void>, thisArg? : any) : T;
+			groupBy(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : Lodash.Dictionary<T[]>;
+			groupBy<R extends {}>(predicate? : R) : Lodash.Dictionary<T[]>;
+			head() : T;
+			include(value : any, fromIndex? : number) : boolean;
+			indexOf(value : any, fromIndex? : number) : number;
+			initial() : T[];
+			inject<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
+			invoke(methodName : string|Function, ...args : any[]) : any;
+			isEmpty() : boolean;
+			keys() : string[];
+			last() : T;
+			lastIndexOf(value : any, fromIndex? : number) : number;
+			map(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
+			map<R extends {}>(predicate? : R) : T[];
+			max(predicate? : Lodash.ListIterator<T, boolean>|string, thisArg? : any) : T;
+			max<R extends {}>(predicate? : R) : T;
+			min(predicate? : Lodash.ListIterator<T, boolean>|string, thisArg? : any) : T;
+			min<R extends {}>(predicate? : R) : T;
+			reduce<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
+			reduceRight<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
+			reject(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
+			reject<R extends {}>(predicate? : R) : T[];
+			rest() : T[];
+			select(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
+			select<R extends {}>(predicate? : R) : T[];
+			shuffle() : T[];
+			size() : number;
+			some(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
+			some<R extends {}>(predicate? : R) : boolean;
+			sortBy(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
+			sortBy<R extends {}>(predicate? : R) : T[];
+			tail() : T[];
+			take(n? : number) : T[];
+			toArray() : T[];
+			without(...values : any[]) : T[];
+		}
+		
+		class Collection<T extends Model<any>> extends CollectionBase<T> {
+			/** @deprecated use Typescript classes */
+			static extend<T>(prototypeProperties? : any, classProperties? : any) : Function;
+			/** @deprecated should use `new` objects instead. */
+			static forge<T>(attributes? : any, options? : ModelOptions) : T;
+			
+			attach(ids : any[], options? : SyncOptions) : Promise<Collection<T>>;
+			count(column? : string, options? : SyncOptions) : Promise<number>;
+			create(model : {[key : string] : any}, options? : CollectionCreateOptions) : Promise<T>;
+			detach(ids : any[], options? : SyncOptions) : Promise<any>;
+			fetchOne(options? : CollectionFetchOneOptions) : Promise<T>;
+			load(relations : string|string[], options? : SyncOptions) : Promise<Collection<T>>;
+			query(...query : string[]) : Collection<T>;
+			query(query : {[key : string] : any}) : Collection<T>;
+			query(callback : (qb : knex.QueryBuilder) => void) : Collection<T>;
+			query() : knex.QueryBuilder;
+			resetQuery() : Collection<T>;
+			through<R extends Model<any>>(interim : typeof Model, throughForeignKey? : string, otherKey? : string) : R | Collection<R>;
+			updatePivot(attributes : any, options? : PivotOptions) : Promise<number>;
+			withPivot(columns : string[]) : Collection<T>;
+		}
+		
+		interface ModelOptions {
+			tableName? : string;
+			hasTimestamps? : boolean;
+			parse? : boolean;
+		}
+		
+		interface LoadOptions extends SyncOptions {
+			withRelated: string|any|any[];
+		}
+		
+		interface FetchOptions extends SyncOptions {
+			require? : boolean;
+			columns? : string|string[];
+			withRelated? : string|any|any[];
+		}
+		
+		interface FetchAllOptions extends SyncOptions {
+			require? : boolean;
+		}
+		
+		interface SaveOptions extends SyncOptions {
+			method? : string;
+			defaults? : string;
+			patch? : boolean;
+			require? : boolean;
+		}
+		
+		interface SerializeOptions {
+			shallow? : boolean;
+			omitPivot? : boolean;
+		}
+		
+		interface SetOptions {
+			unset? : boolean;
+		}
+		
+		interface TimestampOptions {
+			method? : string;
+		}
+		
+		interface SyncOptions {
+			transacting? : knex.Transaction;
+			debug? : boolean;
+		}
+		
+		interface CollectionOptions<T> {
+			comparator? : boolean|string|((a : T, b : T) => number);
+		}
+		
+		interface CollectionAddOptions extends EventOptions {
+			at? : number;
+			merge? : boolean;
+		}
+		
+		interface CollectionFetchOptions {
+			require? : boolean;
+			withRelated? : string|string[];
+		}
+		
+		interface CollectionFetchOneOptions {
+			require? : boolean;
+			columns? : string|string[];
+		}
+		
+		interface CollectionSetOptions extends EventOptions {
+			add? : boolean;
+			remove? : boolean;
+			merge?: boolean;
+		}
+		
+		interface PivotOptions {
+			query? : Function|any;
+			require? : boolean;
+		}
+		
+		interface EventOptions {
+			silent? : boolean;
+		}
+		
+		interface EventFunction<T> {
+			(model: T, attrs: any, options: any) : Promise<any>|void;
+		}
+		
+		interface CollectionCreateOptions extends ModelOptions, SyncOptions, CollectionAddOptions, SaveOptions {}
+	}
+	
+	export = Bookshelf;
+}
diff --git a/boolify-string/boolify-string-tests.ts b/boolify-string/boolify-string-tests.ts
new file mode 100644
index 000000000..1436a1aea
--- /dev/null
+++ b/boolify-string/boolify-string-tests.ts
@@ -0,0 +1,61 @@
+/// <reference path="boolify-string.d.ts" />
+
+import boolifyString = require('boolify-string');
+
+console.log(boolifyString('true')); // #=> true
+console.log(boolifyString('TRUE')); // #=> true
+console.log(boolifyString('True')); // #=> true
+console.log(boolifyString('false')); // #=> false
+
+console.log(boolifyString('{}')); // #=> true
+console.log(boolifyString('foo')); // #=> true
+console.log(boolifyString('')); // #=> false
+console.log(boolifyString('1')); // #=> true
+console.log(boolifyString('-1')); // #=> true
+console.log(boolifyString('0')); // #=> false
+console.log(boolifyString('[]')); // #=> true
+console.log(boolifyString('undefined')); // #=> false
+console.log(boolifyString('null')); // #=> false
+
+// primitive values as is
+console.log(boolifyString(true)); // #=> true
+console.log(boolifyString(false)); // #=> false
+console.log(boolifyString({})); // #=> true
+console.log(boolifyString(1)); // #=> true
+console.log(boolifyString(-1)); // #=> true
+console.log(boolifyString(0)); // #=> false
+console.log(boolifyString([])); // #=> true
+console.log(boolifyString(undefined)); // #=> false
+console.log(boolifyString(null)); // #=> false
+
+// string constructor
+console.log(boolifyString(new String('true'))); // #=> true
+console.log(boolifyString(new String('false'))); // #=> false
+
+// YAML's specification
+// http://yaml.org/type/bool.html
+// y|Y|yes|Yes|YES|n|N|no|No|NO
+// |true|True|TRUE|false|False|FALSE
+// |on|On|ON|off|Off|OFF
+console.log(boolifyString('y')); // #=> true
+console.log(boolifyString('Y')); // #=> true
+console.log(boolifyString('yes')); // #=> true
+console.log(boolifyString('Yes')); // #=> true
+console.log(boolifyString('YES')); // #=> true
+console.log(boolifyString('n')); // #=> false
+console.log(boolifyString('N')); // #=> false
+console.log(boolifyString('no')); // #=> false
+console.log(boolifyString('No')); // #=> false
+console.log(boolifyString('NO')); // #=> false
+console.log(boolifyString('true')); // #=> true
+console.log(boolifyString('True')); // #=> true
+console.log(boolifyString('TRUE')); // #=> true
+console.log(boolifyString('false')); // #=> false
+console.log(boolifyString('False')); // #=> false
+console.log(boolifyString('FALSE')); // #=> false
+console.log(boolifyString('on')); // #=> true
+console.log(boolifyString('On')); // #=> true
+console.log(boolifyString('ON')); // #=> true
+console.log(boolifyString('off')); // #=> false
+console.log(boolifyString('Off')); // #=> false
+console.log(boolifyString('OFF')); // #=> false
diff --git a/boolify-string/boolify-string.d.ts b/boolify-string/boolify-string.d.ts
new file mode 100644
index 000000000..d4ab286a5
--- /dev/null
+++ b/boolify-string/boolify-string.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for boolify-string
+// Project: https://github.com/sanemat/node-boolify-string
+// Definitions by: Tobias Henöckl <http://www.sisyphus.de/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+declare module "boolify-string" {
+  function boolifyString(obj: any): boolean;
+  export = boolifyString;
+}
diff --git a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts
index 6abf38f94..e17b7b10c 100644
--- a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts
+++ b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts
@@ -6,17 +6,17 @@ function test_cases() {
     $('#datetimepicker').datetimepicker({
         pickDate: false
     });
-	$('#datetimepicker').datetimepicker({
+    $('#datetimepicker').datetimepicker({
         pickTime: false
     });
-	$('#datetimepicker').datetimepicker({
+    $('#datetimepicker').datetimepicker({
         minDate: '2012-12-31'
     });
-	
-	$('#datetimepicker').data("DateTimePicker").setMaxDate('2012-12-31');
-	
-	var startDate = new Date(2012, 1, 20);
-    var endDate = new Date(2012, 1, 25);
+
+    $('#datetimepicker').data("DateTimePicker").maxDate('2012-12-31');
+
+    var startDate = moment(new Date(2012, 1, 20));
+    var endDate = moment(new Date(2012, 1, 25));
     $('#datetimepicker2')
         .datetimepicker()
         .on("dp.change", function (ev) {
diff --git a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts
index 228b7537f..fb0b1b389 100644
--- a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts
+++ b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts
@@ -10,15 +10,15 @@
  */
 
 /// <reference path="../jquery/jquery.d.ts"/>
+/// <reference path="../moment/moment.d.ts"/>
 
 declare module BootstrapV3DatetimePicker {
-    interface DatetimepickerChangeEventObject extends JQueryEventObject {
-        date: any;
-        oldDate: any;
+    interface DatetimepickerChangeEventObject extends DatetimepickerEventObject {
+        oldDate: moment.Moment;
     }
 
     interface DatetimepickerEventObject extends JQueryEventObject {
-        date: any;
+        date: moment.Moment;
     }
 
     interface DatetimepickerIcons {
@@ -35,33 +35,37 @@ declare module BootstrapV3DatetimePicker {
         useSeconds?: boolean;
         useCurrent?: boolean;
         minuteStepping?: number;
-        minDate?: any;
-        maxDate?: any;
+        minDate?: moment.Moment | Date | string;
+        maxDate?: moment.Moment | Date | string;
         showToday?: boolean;
         collapse?: boolean;
         language?: string;
-        defaultDate?: string;
-        disabledDates?: Array<any>;
-        enabledDates?: Array<any>;
+        defaultDate?: moment.Moment | Date | string;
+        disabledDates?: Array<moment.Moment | Date | string>;
+        enabledDates?: Array<moment.Moment | Date | string>;
         icons?: DatetimepickerIcons;
         useStrict?: boolean;
         direction?: string;
         sideBySide?: boolean;
-        daysOfWeekDisabled?: Array<any>;
+        daysOfWeekDisabled?: Array<number>;
         calendarWeeks?: boolean;
         format?: string | boolean;
         locale?: string;
         showTodayButton?: boolean;
+        viewMode?: string;
+        inline?: boolean;
     }
 
     interface Datetimepicker {
-        setDate(date: any): void;
-        setMinDate(date: any): void;
-        setMaxDate(date: any): void;
+        date(date: moment.Moment | Date | string): void;
+        date(): moment.Moment;
+        minDate(date: moment.Moment | Date | string): void;
+        minDate(): moment.Moment | boolean;
+        maxDate(date: moment.Moment | Date | string): void;
+        maxDate(): moment.Moment | boolean;
         show(): void;
         disable(): void;
         enable(): void;
-        getDate(): void;
     }
 
 }
diff --git a/browser-sync/browser-sync.d.ts b/browser-sync/browser-sync.d.ts
index 00c242942..2276f36e5 100644
--- a/browser-sync/browser-sync.d.ts
+++ b/browser-sync/browser-sync.d.ts
@@ -371,7 +371,7 @@ declare module "browser-sync" {
              * The stream method returns a transform stream and can act once or on many files.
              * @param opts Configuration for the stream method
              */
-            stream(opts: { once: boolean }): NodeJS.ReadWriteStream;
+            stream(opts?: { once: boolean }): NodeJS.ReadWriteStream;
             /**
              * Helper method for browser notifications
              * @param message Can be a simple message such as 'Connected' or HTML
diff --git a/browserify/browserify-tests.ts b/browserify/browserify-tests.ts
index 524901566..b4096a7f9 100644
--- a/browserify/browserify-tests.ts
+++ b/browserify/browserify-tests.ts
@@ -2,11 +2,51 @@
 
 import browserify = require("browserify");
 import fs = require("fs");
+import stream = require('stream');
 
-var b: BrowserifyObject = browserify();
+var bNoArg = browserify();
+
+var b = browserify({
+  baseDir: 'somewhere'
+});
 b.add('./browser/main.js');
-b.transform('deamdify');
-b.bundle().pipe(fs.createWriteStream('bundle.js'));
+b.transform('deamdify')
+  .transform(function (file) {
+    return new stream.Transform();
+  }).plugin((b, opts) => { return opts.l; }, {l: 3})
+  .require('foo', { expose: 'bar' })
+  .exclude('baz')
+  .ignore('bat')
+  .reset({ basedir: 'elsewhere' });
 
-var customBrowsify: Browserify = require("browserify");
+b.on('file', (file) => {
+  file += "";
+});
+
+b.external(bNoArg);
+
+var b2 = new browserify(['/some/File', {file: '/some/file' }, fs.createReadStream('/somewhere')], { builtins: ['buffer']})
+  .reset({
+    builtins: {
+      'buffer': './customBuffer'
+    }
+  });
+
+var customBrowsify = require("browserify");
 customBrowsify({entries: []});
+
+var b = browserify('./browser/main.js', {
+  noParse: ['jquery'],
+  debug: true,
+  foo: 'bar'
+});
+b.add('./browser/other.js');
+b.transform(function(file: string): NodeJS.ReadWriteStream {
+  return new stream.PassThrough();
+});
+
+var record_pipeline = b.pipeline.get('record');
+
+b.bundle().pipe(process.stdout);
+
+
diff --git a/browserify/browserify.d.ts b/browserify/browserify.d.ts
index c301df51e..1ce6b653d 100644
--- a/browserify/browserify.d.ts
+++ b/browserify/browserify.d.ts
@@ -1,41 +1,182 @@
-// Type definitions for Browserify
+// Type definitions for Browserify v12.0.1
 // Project: http://browserify.org/
-// Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar/>
+// Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar/>, John Vilk <https://github.com/jvilk>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
 
-interface BrowserifyObject extends NodeJS.EventEmitter {
-  add(file:string, opts?:any): BrowserifyObject;
-  require(file:string, opts?:{
-    expose: string;
-  }): BrowserifyObject;
-  bundle(opts?:{
-    insertGlobals?: boolean;
-    detectGlobals?: boolean;
-    debug?: boolean;
-    standalone?: string;
-    insertGlobalVars?: any;
-  }, cb?:(err:any, src:any) => void): NodeJS.ReadableStream;
+declare module Browserify {
+  /**
+   * Options pertaining to an individual file.
+   */
+  interface FileOptions {
+    // If true, this is considered an entry point to your app.
+    entry?: boolean;
+    // Expose this file under a custom dependency name.
+    // require('./vendor/angular/angular.js', {expose: 'angular'}) enables require('angular')
+    expose?: string;
+    // Basedir to use to resolve this file's path.
+    basedir?: string;
+    // The name/path to the file.
+    file?: string;
+    // Forward file to external() to be externalized.
+    external?: boolean;
+    // Disable transforms on file if set to false.
+    transform?: boolean;
+    // The ID to use for require() statements.
+    id?: string;
+  }
 
-  external(file:string, opts?:any): BrowserifyObject;
-  ignore(file:string, opts?:any): BrowserifyObject;
-  transform(tr:string, opts?:any): BrowserifyObject;
-  transform(tr:Function, opts?:any): BrowserifyObject;
-  plugin(plugin:string, opts?:any): BrowserifyObject;
-  plugin(plugin:Function, opts?:any): BrowserifyObject;
-}
 
-interface Browserify {
-  (): BrowserifyObject;
-  (files:string[]): BrowserifyObject;
-  (opts:{
-    entries?: string[];
+  // Browserify accepts a filename, an input stream for file inputs, or a FileOptions configuration
+  // for each file in a bundle.
+  type InputFile = string | NodeJS.ReadableStream | FileOptions;
+
+  /**
+   * Options pertaining to a Browserify instance.
+   */
+  interface Options {
+    // Custom properties can be defined on Options.
+    // These options are forwarded along to module-deps and browser-pack directly.
+    [propName: string]: any;
+    // String, file object, or array of those types (they may be mixed) specifying entry file(s).
+    entries?: InputFile | InputFile[];
+    // an array which will skip all require() and global parsing for each file in the array.
+    // Use this for giant libs like jquery or threejs that don't have any requires or node-style globals but take forever to parse.
     noParse?: string[];
-  }): BrowserifyObject;
+    // an array of optional extra extensions for the module lookup machinery to use when the extension has not been specified.
+    // By default Browserify considers only .js and .json files in such cases.
+    extensions?: string[];
+    // the directory that Browserify starts bundling from for filenames that start with ..
+    basedir?: string;
+    // an array of directories that Browserify searches when looking for modules which are not referenced using relative path.
+    // Can be absolute or relative to basedir. Equivalent of setting NODE_PATH environmental variable when calling Browserify command.
+    paths?: string[];
+    // sets the algorithm used to parse out the common paths. Use false to turn this off, otherwise it uses the commondir module.
+    commondir?: boolean;
+    // disables converting module ids into numerical indexes. This is useful for preserving the original paths that a bundle was generated with.
+    fullPaths?: boolean;
+    // sets the list of built-ins to use, which by default is set in lib/builtins.js in this distribution.
+    builtins?: string[] | {[builtinName: string]: string} | boolean;
+    // set if external modules should be bundled. Defaults to true.
+    bundleExternal?: boolean;
+    // When true, always insert process, global, __filename, and __dirname without analyzing the AST for faster builds but larger output bundles. Default false.
+    insertGlobals?: boolean;
+    // When true, scan all files for process, global, __filename, and __dirname, defining as necessary.
+    // With this option npm modules are more likely to work but bundling takes longer. Default true.
+    detectGlobals?: boolean;
+    // When true, add a source map inline to the end of the bundle. This makes debugging easier because you can see all the original files if you are in a modern enough browser.
+    debug?: boolean;
+    // When a non-empty string, a standalone module is created with that name and a umd wrapper.
+    // You can use namespaces in the standalone global export using a . in the string name as a separator, for example 'A.B.C'.
+    // The global export will be sanitized and camel cased.
+    standalone?: string;
+    // will be passed to insert-module-globals as the opts.vars parameter.
+    insertGlobalVars?: {[globalName: string]: (file: string, basedir: string) => any};
+    // defaults to 'require' in expose mode but you can use another name.
+    externalRequireName?: string;
+  }
+
+  interface BrowserifyConstructor {
+    (files: InputFile[], opts?: Options): BrowserifyObject;
+    (file: InputFile, opts?: Options): BrowserifyObject;
+    (opts: Options): BrowserifyObject;
+    (): BrowserifyObject
+    new(files: InputFile[], opts?: Options): BrowserifyObject;
+    new(file: InputFile, opts?: Options): BrowserifyObject;
+    new(opts: Options): BrowserifyObject;
+    new(): BrowserifyObject
+  }
+
+  interface BrowserifyObject extends NodeJS.EventEmitter {
+    /**
+     * Add an entry file from file that will be executed when the bundle loads.
+     * If file is an array, each item in file will be added as an entry file.
+     */
+    add(file: InputFile[], opts?: FileOptions): BrowserifyObject;
+    add(file: InputFile, opts?: FileOptions): BrowserifyObject;
+    /**
+     * Make file available from outside the bundle with require(file).
+     * The file param is anything that can be resolved by require.resolve().
+     * file can also be a stream, but you should also use opts.basedir so that relative requires will be resolvable.
+     * If file is an array, each item in file will be required. In file array form, you can use a string or object for each item. Object items should have a file property and the rest of the parameters will be used for the opts.
+     * Use the expose property of opts to specify a custom dependency name. require('./vendor/angular/angular.js', {expose: 'angular'}) enables require('angular')
+     */
+    require(file: InputFile, opts?: FileOptions): BrowserifyObject;
+    /**
+     * Bundle the files and their dependencies into a single javascript file.
+     * Return a readable stream with the javascript file contents or optionally specify a cb(err, buf) to get the buffered results.
+     */
+    bundle(cb?: (err: any, src: Buffer) => any): NodeJS.ReadableStream;
+    /**
+     * Prevent file from being loaded into the current bundle, instead referencing from another bundle.
+     * If file is an array, each item in file will be externalized.
+     * If file is another bundle, that bundle's contents will be read and excluded from the current bundle as the bundle in file gets bundled.
+     */
+    external(file: string[], opts?: { basedir?: string }): BrowserifyObject;
+    external(file: string, opts?: { basedir?: string }): BrowserifyObject;
+    external(file: BrowserifyObject): BrowserifyObject;
+    /**
+     * Prevent the module name or file at file from showing up in the output bundle.
+     * Instead you will get a file with module.exports = {}.
+     */
+    ignore(file: string, opts?: { basedir?: string }): BrowserifyObject;
+    /**
+     * Prevent the module name or file at file from showing up in the output bundle.
+     * If your code tries to require() that file it will throw unless you've provided another mechanism for loading it.
+     */
+    exclude(file: string, opts?: { basedir?: string }): BrowserifyObject;
+    /**
+     * Transform source code before parsing it for require() calls with the transform function or module name tr.
+     * If tr is a function, it will be called with tr(file) and it should return a through-stream that takes the raw file contents and produces the transformed source.
+     * If tr is a string, it should be a module name or file path of a transform module
+     */
+    transform<T extends { basedir?: string }>(tr: string, opts?: T): BrowserifyObject;
+    transform<T extends { basedir?: string }>(tr: (file: string, opts: T) => NodeJS.ReadWriteStream, opts?: T): BrowserifyObject;
+    /**
+     * Register a plugin with opts. Plugins can be a string module name or a function the same as transforms.
+     * plugin(b, opts) is called with the Browserify instance b.
+     */
+    plugin<T extends { basedir?: string }>(plugin: string, opts?: T): BrowserifyObject;
+    plugin<T extends { basedir?: string }>(plugin: (b: BrowserifyObject, opts: T) => any, opts?: T): BrowserifyObject;
+    /**
+     * Reset the pipeline back to a normal state. This function is called automatically when bundle() is called multiple times.
+     * This function triggers a 'reset' event.
+     */
+    reset(opts?: Options): void;
+
+    /**
+     * When a file is resolved for the bundle, the bundle emits a 'file' event with the full file path, the id string passed to require(), and the parent object used by browser-resolve.
+     * You could use the file event to implement a file watcher to regenerate bundles when files change.
+     */
+    on(event: 'file', listener: (file: string, id: string, parent: any) => any): BrowserifyObject;
+    /**
+     * When a package.json file is read, this event fires with the contents.
+     * The package directory is available at pkg.__dirname.
+     */
+    on(event: 'package', listener: (pkg: any) => any): BrowserifyObject;
+    /**
+     * When .bundle() is called, this event fires with the bundle output stream.
+     */
+    on(event: 'bundle', listener: (bundle: NodeJS.ReadableStream) => any): BrowserifyObject;
+    /**
+     * When the .reset() method is called or implicitly called by another call to .bundle(), this event fires.
+     */
+    on(event: 'reset', listener: () => any): BrowserifyObject;
+    /**
+     * When a transform is applied to a file, the 'transform' event fires on the bundle stream with the transform stream tr and the file that the transform is being applied to.
+     */
+    on(event: 'transform', listener: (tr: NodeJS.ReadWriteStream, file: string) => any): BrowserifyObject;
+    on(event: string, listener: Function): BrowserifyObject;
+
+    /**
+     * Set to any until substack/labeled-stream-splicer is defined
+     */
+    pipeline: any;
+  }
 }
 
 declare module "browserify" {
-  var browserify: Browserify;
+  var browserify: Browserify.BrowserifyConstructor;
   export = browserify;
 }
diff --git a/buffer-compare/buffer-compare-tests.ts b/buffer-compare/buffer-compare-tests.ts
new file mode 100644
index 000000000..88e6dddb9
--- /dev/null
+++ b/buffer-compare/buffer-compare-tests.ts
@@ -0,0 +1,27 @@
+/// <reference path="./buffer-compare.d.ts" />
+/// <reference path="../node/node.d.ts" />
+
+import compare = require('buffer-compare');
+
+let result: number;
+
+result = compare(new Buffer(''), new Buffer(''));
+result = compare([], []);
+result = compare('', '');
+result = compare(new Buffer(''), []);
+result = compare([], '');
+result = compare('', new Buffer(''));
+
+result = compare<Buffer>(new Buffer(''), new Buffer(''));
+result = compare<any[]>([], []);
+result = compare<string>('', '');
+result = compare<Buffer|any[]>(new Buffer(''), []);
+result = compare<any[]|string>([], '');
+result = compare<string|Buffer>('', new Buffer(''));
+
+result = compare<Buffer, Buffer>(new Buffer(''), new Buffer(''));
+result = compare<any[], any[]>([], []);
+result = compare<string, string>('', '');
+result = compare<Buffer, any[]>(new Buffer(''), []);
+result = compare<any[], string>([], '');
+result = compare<string, Buffer>('', new Buffer(''));
diff --git a/buffer-compare/buffer-compare.d.ts b/buffer-compare/buffer-compare.d.ts
new file mode 100644
index 000000000..58e4004dc
--- /dev/null
+++ b/buffer-compare/buffer-compare.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for buffer-compare
+// Project: https://github.com/soldair/node-buffer-compare
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "buffer-compare" {
+	interface List {
+		[index: number]: any;
+		length: number
+	}
+
+	function compare(cmp: List, to: List): number;
+	function compare<T>(cmp: T, to: T): number;
+	function compare<C, T>(cmp: C, to: T): number;
+
+	export = compare;
+}
diff --git a/bytebuffer/bytebuffer-tests.ts b/bytebuffer/bytebuffer-tests.ts
new file mode 100644
index 000000000..34db7368d
--- /dev/null
+++ b/bytebuffer/bytebuffer-tests.ts
@@ -0,0 +1,8 @@
+/// <reference path="bytebuffer.d.ts" />
+
+import ByteBuffer = require("bytebuffer");
+
+var bb = new ByteBuffer()
+            .writeIString("Hello world!")
+            .flip();
+console.log(bb.readIString()+" from bytebuffer.js");
\ No newline at end of file
diff --git a/bytebuffer/bytebuffer.d.ts b/bytebuffer/bytebuffer.d.ts
new file mode 100644
index 000000000..8f1a800ea
--- /dev/null
+++ b/bytebuffer/bytebuffer.d.ts
@@ -0,0 +1,615 @@
+// Type definitions for bytebuffer.js 5.0.0
+// Project: https://github.com/dcodeIO/bytebuffer.js
+// Definitions by: Denis Cappellin <http://github.com/cappellin>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions by: SINTEF-9012 <http://github.com/SINTEF-9012>
+
+/// <reference path="../long/long.d.ts" />
+
+declare class ByteBuffer
+{
+    /**
+     * Constructs a new ByteBuffer.
+     */
+    constructor( capacity?: number, littleEndian?: boolean, noAssert?: boolean );
+
+    /**
+     * Big endian constant that can be used instead of its boolean value. Evaluates to false.
+     */
+    static BIG_ENDIAN: boolean;
+
+    /**
+     * Default initial capacity of 16.
+     */
+    static DEFAULT_CAPACITY: number;
+
+    /**
+     * Default no assertions flag of false.
+     */
+    static DEFAULT_NOASSERT: boolean;
+
+    /**
+     * Little endian constant that can be used instead of its boolean value. Evaluates to true.
+     */
+    static LITTLE_ENDIAN: boolean;
+
+    /**
+     * Maximum number of bytes required to store a 32bit base 128 variable-length integer.
+     */
+    static MAX_VARINT32_BYTES: number;
+
+    /**
+     * Maximum number of bytes required to store a 64bit base 128 variable-length integer.
+     */
+    static MAX_VARINT64_BYTES: number;
+
+    /**
+     * Metrics representing number of bytes.Evaluates to 2.
+     */
+    static METRICS_BYTES: number;
+
+    /**
+     * Metrics representing number of UTF8 characters.Evaluates to 1.
+     */
+    static METRICS_CHARS: number;
+
+    /**
+     * ByteBuffer version.
+     */
+    static VERSION: string;
+
+    /**
+     * Backing buffer.
+     */
+    buffer: ArrayBuffer;
+
+    /**
+     * Absolute limit of the contained data. Set to the backing buffer's capacity upon allocation.
+     */
+    limit: number;
+
+    /**
+     * Whether to use little endian byte order, defaults to false for big endian.
+     */
+    littleEndian: boolean;
+
+    /**
+     * Marked offset.
+     */
+    markedOffset: number;
+
+    /**
+     * Whether to skip assertions of offsets and values, defaults to false.
+     */
+    noAssert: boolean;
+
+    /**
+     * Absolute read/write offset.
+     */
+    offset: number;
+
+    /**
+     * Data view to manipulate the backing buffer. Becomes null if the backing buffer has a capacity of 0.
+     */
+    view: DataView;    
+
+    /**
+     * Allocates a new ByteBuffer backed by a buffer of the specified capacity.
+     */
+    static allocate( capacity?: number, littleEndian?: number, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Decodes a base64 encoded string to binary like window.atob does.
+     */
+    static atob( b64: string ): string;
+
+    /**
+     * Encodes a binary string to base64 like window.btoa does.
+     */
+    static btoa( str: string ): string;
+
+    /**
+     * Calculates the number of UTF8 bytes of a string.
+     */
+    static calculateUTF8Byte( str: string ): number;
+
+    /**
+     * Calculates the number of UTF8 characters of a string.JavaScript itself uses UTF- 16, so that a string's length property does not reflect its actual UTF8 size if it contains code points larger than 0xFFFF.
+     */
+    static calculateUTF8Char( str: string ): number;
+
+    /**
+     * Calculates the actual number of bytes required to store a 32bit base 128 variable-length integer.
+     */
+    static calculateVariant32( value: number ): number;
+
+    /**
+     * Calculates the actual number of bytes required to store a 64bit base 128 variable-length integer.
+     */
+    static calculateVariant64( value: number | Long ): number;
+
+    /**
+     * Concatenates multiple ByteBuffers into one.
+     */
+    static concat( buffers: Array<ByteBuffer | ArrayBuffer | Uint8Array | string>, encoding?: string | boolean, litteEndian?: boolean, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Decodes a base64 encoded string to a ByteBuffer.
+     */
+    static fromBase64( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Decodes a binary encoded string, that is using only characters 0x00-0xFF as bytes, to a ByteBuffer.
+     */
+    static fromBinary( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Decodes a hex encoded string with marked offsets to a ByteBuffer.
+     */
+    static fromDebug( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Decodes a hex encoded string to a ByteBuffer.
+     */
+    static fromHex( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Decodes an UTF8 encoded string to a ByteBuffer.
+     */
+    static fromUTF8( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Gets the backing buffer type.
+     */
+    static isByteBuffer( bb: any ): boolean;
+
+    /**
+     * Wraps a buffer or a string. Sets the allocated ByteBuffer's ByteBuffer#offset to 0 and its ByteBuffer#limit to the length of the wrapped data.
+     * @param buffer Anything that can be wrapped
+     * @param encoding String encoding if buffer is a string ("base64", "hex", "binary", defaults to "utf8")
+     * @param littleEndian Whether to use little or big endian byte order. Defaults to ByteBuffer.DEFAULT_ENDIAN.
+     * @param noAssert Whether to skip assertions of offsets and values. Defaults to ByteBuffer.DEFAULT_NOASSERT.
+     */
+    static wrap( buffer: ByteBuffer | ArrayBuffer | Uint8Array | string, enc?: string | boolean, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Decodes a zigzag encoded signed 32bit integer.
+     */
+    static zigZagDecode32( n: number ): number;
+
+    /**
+     * Decodes a zigzag encoded signed 64bit integer.
+     */
+    static zigZagDecode64( n: number | Long ): Long;
+
+    /**
+     * Zigzag encodes a signed 32bit integer so that it can be effectively used with varint encoding.
+     */
+    static zigZagEncode32( n: number ): number;
+
+    /**
+     * Zigzag encodes a signed 64bit integer so that it can be effectively used with varint encoding.
+     */
+    static zigZagEncode64( n: number | Long ): Long;
+
+    /**
+     * Switches (to) big endian byte order.
+     */
+    BE( bigEndian?: boolean ): ByteBuffer;
+
+    /**
+     * Switches (to) little endian byte order.
+     */
+    LE( bigEndian?: boolean ): ByteBuffer;
+
+    /**
+     * Appends some data to this ByteBuffer. This will overwrite any contents behind the specified offset up to the appended data's length.
+     */
+    append( source: ByteBuffer | ArrayBuffer | Uint8Array | string, encoding?: string | number, offset?: number ): ByteBuffer;
+
+    /**
+     * Appends this ByteBuffer's contents to another ByteBuffer. This will overwrite any contents behind the specified offset up to the length of this ByteBuffer's data.
+     */
+    appendTo( target: ByteBuffer, offset?: number ): ByteBuffer;
+
+    /**
+     * Enables or disables assertions of argument types and offsets. Assertions are enabled by default but you can opt to disable them if your code already makes sure that everything is valid.
+     */
+    assert( assert: boolean ): ByteBuffer;
+
+    /**
+     * Gets the capacity of this ByteBuffer's backing buffer.
+     */
+    capacity(): number;
+
+    /**
+     * Clears this ByteBuffer's offsets by setting ByteBuffer#offset to 0 and
+     * ByteBuffer#limit to the backing buffer's capacity. Discards ByteBuffer#markedOffset.
+     */
+    clear(): ByteBuffer;
+
+    /**
+     * Creates a cloned instance of this ByteBuffer, preset with this ByteBuffer's values for ByteBuffer#offset, ByteBuffer#markedOffset and ByteBuffer#limit.
+     */
+    clone( copy?: boolean ): ByteBuffer;
+
+    /**
+     * Compacts this ByteBuffer to be backed by a ByteBuffer#buffer of its contents' length. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit. Will set offset = 0 and limit = capacity and adapt ByteBuffer#markedOffset to the same relative position if set.
+     */
+    compact( begin?: number, end?: number ): ByteBuffer;
+
+    /**
+     * Creates a copy of this ByteBuffer's contents. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit.
+     */
+    copy( begin?: number, end?: number ): ByteBuffer;
+
+    /**
+     * Copies this ByteBuffer's contents to another ByteBuffer. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit.
+     */
+    copyTo( target: ByteBuffer, targetOffset?: number, sourceOffset?: number, sourceLimit?: number ): ByteBuffer;
+
+    /**
+     * Makes sure that this ByteBuffer is backed by a ByteBuffer#buffer of at least the specified capacity. If the current capacity is exceeded, it will be doubled. If double the current capacity is less than the required capacity, the required capacity will be used instead.
+     */
+    ensureCapacity( capacity: number ): ByteBuffer;
+
+    /**
+     * Overwrites this ByteBuffer's contents with the specified value. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit.
+     */
+    fill( value: number | string, begin?: number, end?: number ): ByteBuffer;
+
+    /**
+     * Makes this ByteBuffer ready for a new sequence of write or relative read operations. Sets limit = offset and offset = 0. Make sure always to flip a ByteBuffer when all relative read or write operations are complete.
+     */
+    flip(): ByteBuffer;
+
+    /**
+     * Marks an offset on this ByteBuffer to be used later.
+     */
+    mark( offset?: number ): ByteBuffer;
+
+    /**
+     * Sets the byte order.
+     */
+    order( littleEndian: boolean ): ByteBuffer;
+
+    /**
+     * Prepends some data to this ByteBuffer. This will overwrite any contents before the specified offset up to the prepended data's length. If there is not enough space available before the specified offset, the backing buffer will be resized and its contents moved accordingly.
+     */
+    prepend( source: ByteBuffer | string | ArrayBuffer, encoding?: string | number, offset?: number ): ByteBuffer;
+
+    /**
+     * Prepends this ByteBuffer to another ByteBuffer. This will overwrite any contents before the specified offset up to the prepended data's length. If there is not enough space available before the specified offset, the backing buffer will be resized and its contents moved accordingly.
+     */
+    prependTo( target: ByteBuffer, offset?: number ): ByteBuffer;
+
+    /**
+     * Prints debug information about this ByteBuffer's contents.
+     */
+    printDebug( out?: ( text: string ) => void ): void;
+
+    /**
+     * Reads an 8bit signed integer. This is an alias of ByteBuffer#readInt8.
+     */
+    readByte( offset?: number ): number;
+
+    /**
+     * Reads a NULL-terminated UTF8 encoded string. For this to work the string read must not contain any NULL characters itself.
+     */
+    readCString( offset?: number ): string;
+
+    /**
+     * Reads a 64bit float. This is an alias of ByteBuffer#readFloat64.
+     */
+    readDouble( offset?: number ): number;
+
+    /**
+     * Reads a 32bit float. This is an alias of ByteBuffer#readFloat32.
+     */
+    readFloat( offset?: number ): number;
+
+    /**
+     * Reads a 32bit float.
+     */
+    readFloat32( offset?: number ): number;
+
+    /**
+     * Reads a 64bit float.
+     */
+    readFloat64( offset?: number ): number;
+
+    /**
+     * Reads a length as uint32 prefixed UTF8 encoded string.
+     */
+    readIString( offset?: number ): string;
+
+    /**
+     * Reads a 32bit signed integer.This is an alias of ByteBuffer#readInt32.
+     */
+    readInt( offset?: number ): number;
+
+    /**
+     * Reads a 16bit signed integer.
+     */
+    readInt16( offset?: number ): number;
+
+    /**
+     * Reads a 32bit signed integer.
+     */
+    readInt32( offset?: number ): number;
+
+    /**
+     * Reads a 64bit signed integer.
+     */
+    readInt64( offset?: number ): Long;
+
+    /**
+     * Reads an 8bit signed integer.
+     */
+    readInt8( offset?: number ): number;
+
+    /**
+     * Reads a 64bit signed integer. This is an alias of ByteBuffer#readInt64.
+     */
+    readLong( offset?: number ): Long;
+
+    /**
+     * Reads a 16bit signed integer. This is an alias of ByteBuffer#readInt16.
+     */
+    readShort( offset?: number ): number;
+
+    /**
+     * Reads an UTF8 encoded string. This is an alias of ByteBuffer#readUTF8String.
+     */
+    readString( length: number, metrics?: number, offset?: number ): string;
+
+    /**
+     * Reads an UTF8 encoded string.
+     */
+    readUTF8String( chars: number, offset?: number ): string;
+
+    /**
+     * Reads a 16bit unsigned integer.
+     */
+    readUint16( offset?: number ): number;
+
+    /**
+     * Reads a 32bit unsigned integer.
+     */
+    readUint32( offset?: number ): number;
+
+    /**
+     * Reads a 64bit unsigned integer.
+     */
+    readUint64( offset?: number ): Long;
+    /**
+     * Reads an 8bit unsigned integer.
+     */
+    readUint8( offset?: number ): number;
+
+    /**
+     * Reads a length as varint32 prefixed UTF8 encoded string.
+     */
+    readVString( offset?: number ): string;
+
+    /**
+     * Reads a 32bit base 128 variable-length integer.
+     */
+    readVarint32( offset?: number ): number;
+
+    /**
+     * Reads a zig-zag encoded 32bit base 128 variable-length integer.
+     */
+    readVarint32ZiZag( offset?: number ): number;
+
+    /**
+     * Reads a 64bit base 128 variable-length integer. Requires Long.js.
+     */
+    readVarint64( offset?: number ): Long;
+
+    /**
+     * Reads a zig-zag encoded 64bit base 128 variable-length integer. Requires Long.js.
+     */
+    readVarint64ZigZag( offset?: number ): Long;
+
+    /**
+     * Gets the number of remaining readable bytes. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit, so this returns limit - offset.
+     */
+    remaining(): number;
+
+    /**
+     * Resets this ByteBuffer's ByteBuffer#offset. If an offset has been marked through ByteBuffer#mark before, offset will be set to ByteBuffer#markedOffset, which will then be discarded. If no offset has been marked, sets offset = 0.
+     */
+    reset(): ByteBuffer;
+
+    /**
+     * Resizes this ByteBuffer to be backed by a buffer of at least the given capacity. Will do nothing if already that large or larger.
+     */ 
+    resize( capacity: number ): ByteBuffer;
+
+    /**
+     * Reverses this ByteBuffer's contents
+     */
+    reverse( begin?: number, end?: number ): ByteBuffer;
+
+    /**
+     * Skips the next length bytes. This will just advance
+     */
+    skip( length: number ): ByteBuffer;
+
+    /**
+     * Slices this ByteBuffer by creating a cloned instance with offset = begin and limit = end.
+     */
+    slice( begin?: number, end?: number ): ByteBuffer;
+
+    /**
+     * Returns a raw buffer compacted to contain this ByteBuffer's contents. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit. Will transparently ByteBuffer#flip this ByteBuffer if offset > limit but the actual offsets remain untouched. This is an alias of ByteBuffer#toBuffer.
+     */
+    toArrayBuffer( forceCopy?: boolean ): ArrayBuffer;
+
+    /**
+     * Encodes this ByteBuffer's contents to a base64 encoded string.
+     */
+    toBase64( begin?: number, end?: number ): string;
+
+    /**
+     * Encodes this ByteBuffer to a binary encoded string, that is using only characters 0x00-0xFF as bytes.
+     */
+    toBinary( begin?: number, end?: number ): string;
+
+    /**
+     * Returns a copy of the backing buffer that contains this ByteBuffer's contents. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit. Will transparently ByteBuffer#flip this ByteBuffer if offset > limit but the actual offsets remain untouched.
+     */
+    toBuffer( forceCopy?: boolean ): ArrayBuffer;
+
+    /**
+      *Encodes this ByteBuffer to a hex encoded string with marked offsets. Offset symbols are:
+     *  < : offset,
+     *  ' : markedOffset,
+     *  > : limit,
+     *  | : offset and limit,
+     *  [ : offset and markedOffset,
+     *  ] : markedOffset and limit,
+     *  ! : offset, markedOffset and limit
+     */
+    toDebug( columns?: boolean ): string | Array<string>
+
+    /**
+     * Encodes this ByteBuffer's contents to a hex encoded string.
+     */
+    toHex( begin?: number, end?: number ): string;
+
+    /**
+     * Converts the ByteBuffer's contents to a string.
+     */
+    toString( encoding?: string ): string;
+
+    /**
+     * Encodes this ByteBuffer's contents between ByteBuffer#offset and ByteBuffer#limit to an UTF8 encoded string.
+     */
+    toUTF8(): string;
+
+    /**
+     * Writes an 8bit signed integer. This is an alias of ByteBuffer#writeInt8.
+     */
+    writeByte( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a NULL-terminated UTF8 encoded string. For this to work the specified string must not contain any NULL characters itself.
+     */
+    writeCString( str: string, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 64bit float. This is an alias of ByteBuffer#writeFloat64.
+     */
+    writeDouble( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 32bit float. This is an alias of ByteBuffer#writeFloat32.
+     */
+    writeFloat( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 32bit float.
+     */
+    writeFloat32( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 64bit float.
+     */
+    writeFloat64( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a length as uint32 prefixed UTF8 encoded string.
+     */
+    writeIString( str: string, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 32bit signed integer. This is an alias of ByteBuffer#writeInt32.
+     */
+    writeInt( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 16bit signed integer.
+     */
+    writeInt16( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 32bit signed integer.
+     */
+    writeInt32( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 64bit signed integer.
+     */
+    writeInt64( value: number | Long, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes an 8bit signed integer.
+     */
+    writeInt8( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 16bit signed integer. This is an alias of ByteBuffer#writeInt16.
+     */
+    writeShort( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes an UTF8 encoded string.This is an alias of ByteBuffer#writeUTF8String.
+     */
+    WriteString( str: string, offset?: number ): ByteBuffer | number;
+
+    /**
+     * Writes an UTF8 encoded string.
+     */
+    writeUTF8String( str: string, offset?: number ): ByteBuffer | number;
+
+    /**
+     * Writes a 16bit unsigned integer.
+     */
+    writeUint16( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 32bit unsigned integer.
+     */
+    writeUint32( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 64bit unsigned integer.
+     */
+    writeUint64( value: number | Long, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes an 8bit unsigned integer.
+     */
+    writeUint8( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a length as varint32 prefixed UTF8 encoded string.
+     */
+    writeVString( str: string, offset?: number ): ByteBuffer | number;
+
+    /**
+     * Writes a 32bit base 128 variable-length integer.
+     */
+    writeVarint32( value: number, offset?: number ): ByteBuffer | number;
+
+    /**
+     * Writes a zig-zag encoded 32bit base 128 variable-length integer.
+     */
+    writeVarint32ZigZag( value: number, offset?: number ): ByteBuffer | number;
+
+    /**
+     * Writes a 64bit base 128 variable-length integer.
+     */
+    writeVarint64( value: number | Long, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a zig-zag encoded 64bit base 128 variable-length integer.
+     */
+    writeVarint64ZigZag( value: number | Long, offset?: number ): ByteBuffer | number;
+}
+
+declare module 'bytebuffer' {
+    export = ByteBuffer;
+}
diff --git a/c3/c3.d.ts b/c3/c3.d.ts
index 160e0b169..7ff889073 100644
--- a/c3/c3.d.ts
+++ b/c3/c3.d.ts
@@ -1067,3 +1067,7 @@ declare module c3 {
 
     export function generate(config: ChartConfiguration): ChartAPI;
 }
+
+declare module "c3" {
+    export = c3;
+}
diff --git a/cal-heatmap/cal-heatmap-tests.ts b/cal-heatmap/cal-heatmap-tests.ts
new file mode 100644
index 000000000..4a7b0cb94
--- /dev/null
+++ b/cal-heatmap/cal-heatmap-tests.ts
@@ -0,0 +1,723 @@
+/// <reference path="cal-heatmap.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
+/// <reference path="../d3/d3.d.ts" />
+
+var cal = new CalHeatMap();
+cal.init();
+cal.init({});
+
+cal.init({ itemSelector: "div" });
+cal.init({ itemSelector: "#id" });
+cal.init({ itemSelector: ".class" });
+cal.init({ itemSelector: "[title=hi]" });
+cal.init({ itemSelector: "div > span + b" });
+
+cal.init({ itemSelector: document.getElementById("myId") });
+cal.init({ itemSelector: document.getElementsByClassName(".class")[0] });
+cal.init({ itemSelector: document.querySelector(".class") });
+cal.init({ itemSelector: $(".class")[0] });
+cal.init({ itemSelector: d3.select(".class")[0][0] });
+
+cal.init({
+	itemSelector: "#domain-a",
+	domain: "month",
+	subDomain: "day",
+	cellSize: 20,
+	subDomainTextFormat: "%d",
+	range: 1,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#domain-b",
+	domain: "month",
+	subDomain: "x_day",
+	cellSize: 20, subDomainTextFormat: "%d",
+	range: 1,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#cellSize-a",
+	domain: "day",
+	range: 1,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#cellSize-b",
+	domain: "day",
+	range: 1,
+	cellSize: 15,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#cellPadding-a",
+	domain: "day",
+	range: 1,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#cellPadding-b",
+	domain: "day",
+	range: 1,
+	cellPadding: 5,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#cellRadius-a",
+	cellSize: 15,
+	domain: "day",
+	range: 1,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#cellRadius-b",
+	cellSize: 15,
+	domain: "day",
+	range: 1,
+	cellRadius: 10,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#domainGutter-a",
+	domain: "day",
+	range: 2,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#domainGutter-b",
+	domain: "day",
+	range: 2,
+	domainGutter: 10,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#domainMargin-a",
+	domain: "day",
+	range: 2,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#domainMargin-b",
+	domain: "day",
+	range: 2,
+	displayLegend: false,
+	domainMargin: 10
+});
+
+cal.init({
+	itemSelector: "#domainDynamicDimension-a",
+	domain: "month",
+	range: 5,
+	cellSize: 8,
+	displayLegend: false,
+	nextSelector: "#domainDynamicDimension-next",
+	previousSelector: "#domainDynamicDimension-previous"
+});
+
+cal.init({
+	itemSelector: "#domainDynamicDimension-b",
+	domain: "month",
+	range: 5,
+	cellSize: 8,
+	displayLegend: false,
+	domainDynamicDimension: false,
+	nextSelector: "#domainDynamicDimension-next",
+	previousSelector: "#domainDynamicDimension-previous",
+	itemNamespace: "domainDynamicDimension"
+});
+
+cal.init({
+	itemSelector: "#verticalOrientation-a",
+	domain: "day",
+	range: 2,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#verticalOrientation-b",
+	domain: "day",
+	range: 2,
+	displayLegend: false,
+	verticalOrientation: true
+});
+
+cal.init({
+	itemSelector: "#label-a",
+	domain: "day",
+	range: 2,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#label-b",
+	domain: "day",
+	range: 2,
+	displayLegend: false,
+	label: {
+		position: "top"
+	}
+});
+
+cal.init({
+	itemSelector: "#label-c",
+	domain: "day",
+	range: 2,
+	displayLegend: false,
+	label: {
+		position: "left",
+		width: 46
+	}
+});
+
+cal.init({
+	itemSelector: "#label-d",
+	domain: "day",
+	range: 2,
+	displayLegend: false,
+	label: {
+		position: "right",
+		width: 46,
+		offset: { x: 10, y: 30 }
+	}
+});
+
+cal.init({
+	itemSelector: "#label-e",
+	domain: "day",
+	range: 2,
+	displayLegend: false,
+	label: {
+		position: "left",
+		width: 46,
+		rotate: "left"
+	}
+});
+
+cal.init({
+	itemSelector: "#label-f",
+	domain: "day",
+	range: 2,
+	displayLegend: false,
+	label: {
+		position: "right",
+		width: 150,
+		rotate: "left"
+	}
+});
+
+cal.init({
+	itemSelector: "#label-g",
+	domain: "day",
+	range: 2,
+	displayLegend: false,
+	label: {
+		position: "right",
+		width: 46,
+		rotate: "left"
+	}
+});
+
+cal.init({
+	itemSelector: "#label-h",
+	domain: "day",
+	range: 2,
+	displayLegend: false,
+	label: {
+		position: "right",
+		width: 46,
+		rotate: "right",
+		align: "right"
+	}
+});
+
+cal.init({
+	itemSelector: "#colLimit-a",
+	domain: "day",
+	range: 1,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#colLimit-b",
+	domain: "day",
+	colLimit: 24,
+	range: 1,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#rowLimit-a",
+	domain: "month",
+	range: 1,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#rowLimit-b",
+	domain: "month",
+	rowLimit: 10,
+	range: 1,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#tooltip-a",
+	domain: "month",
+	range: 1,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#tooltip-b",
+	domain: "month",
+	range: 1,
+	displayLegend: false,
+	tooltip: true
+});
+
+cal.init({
+	itemSelector: "#start-a",
+	domain: "day",
+	range: 2,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#start-b",
+	domain: "day",
+	range: 2,
+	start: new Date(2000, 0, 15),
+	displayLegend: false
+});
+
+cal.init({
+	start: new Date(2000, 0), // January, 1st 2000
+	range: 12,
+	domain: "year",
+	subDomain: "month",
+	data: "http://localhost/api?start={{d:start}}&stop={{d:end}}"
+});
+
+cal.init({
+	data: "http://localhost/datas.csv",
+	dataType: "csv"
+});
+
+var dt = new Date();
+dt.setDate(dt.getDate() + 1);
+cal.init({
+	itemSelector: "#highlight-a",
+	domain: "day",
+	range: 2,
+	displayLegend: false,
+	highlight: ["now", dt]
+});
+
+cal.init({
+	itemSelector: "#weekStartOnMonday-a",
+	domain: "month",
+	subDomain: "x_day",
+	cellSize: 20,
+	subDomainTextFormat: "%d",
+	range: 1,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#weekStartOnMonday-b",
+	domain: "month",
+	subDomain: "x_day",
+	cellSize: 20,
+	subDomainTextFormat: "%d",
+	range: 1,
+	weekStartOnMonday: false,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#minDate-a",
+	domain: "month",
+	start: new Date(2000, 4),
+	minDate: new Date(2000, 1),
+	maxDate: new Date(2000, 8),
+	subDomain: "day",
+	range: 4,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#legend-a",
+	domain: "day",
+	range: 2
+});
+
+cal.init({
+	itemSelector: "#legend-b",
+	domain: "day",
+	range: 2, legend: [-2.5, 0, 2.5]
+});
+
+cal.init({
+	itemSelector: "#displayLegend-a",
+	domain: "day",
+	range: 2
+});
+
+cal.init({
+	itemSelector: "#displayLegend-b",
+	domain: "day",
+	range: 2,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#legendCellSize-a",
+	domain: "day",
+	range: 2
+});
+
+cal.init({
+	itemSelector: "#legendCellSize-b",
+	domain: "day",
+	range: 2, legendCellSize: 5
+});
+
+cal.init({
+	itemSelector: "#legendCellPadding-a",
+	domain: "day",
+	range: 3
+});
+
+cal.init({
+	itemSelector: "#legendCellPadding-b",
+	domain: "day",
+	range: 3, legendCellPadding: 5
+});
+
+cal.init({
+	itemSelector: "#legendMargin-a",
+	domain: "day",
+	range: 3
+});
+
+cal.init({
+	itemSelector: "#legendMargin-b",
+	domain: "day",
+	range: 3,
+	legendMargin: [50, 0, 0, 50]
+});
+
+cal.init({
+	itemSelector: "#legendVerticalPosition-a",
+	domain: "day",
+	range: 2
+});
+
+cal.init({
+	itemSelector: "#legendVerticalPosition-b",
+	domain: "day",
+	range: 2,
+	legendVerticalPosition: "top",
+	legendMargin: [0, 0, 10, 0]
+});
+
+cal.init({
+	itemSelector: "#legendVerticalPosition-c",
+	domain: "day",
+	range: 2,
+	legendVerticalPosition: "center",
+	legendMargin: [0, 10, 0, 0]
+});
+
+cal.init({
+	itemSelector: "#legendVerticalPosition-d",
+	domain: "day",
+	range: 2,
+	legendVerticalPosition: "center",
+	legendHorizontalPosition: "right",
+	legendMargin: [0, 0, 0, 10]
+});
+
+cal.init({
+	itemSelector: "#legendHorizontalPosition-a",
+	domain: "day",
+	range: 3
+});
+
+cal.init({
+	itemSelector: "#legendHorizontalPosition-b",
+	domain: "day",
+	range: 3,
+	legendHorizontalPosition: "right"
+});
+
+cal.init({
+	itemSelector: "#legendOrientation-a",
+	domain: "day",
+	range: 3,
+	legendVerticalPosition: "center",
+	legendOrientation: "vertical",
+	legendMargin: [0, 10, 0, 0]
+});
+
+cal.init({
+	itemSelector: "#legendOrientation-b",
+	domain: "month",
+	subDomain: "x_day",
+	range: 3,
+	verticalOrientation: true,
+	legendVerticalPosition: "center",
+	legendHorizontalPosition: "right",
+	legendOrientation: "vertical",
+	legendMargin: [0, 0, 0, 20]
+});
+
+cal.init({
+	legendColors: {
+		min: "#efefef",
+		max: "steelblue",
+		empty: "white"
+		// Will use the CSS for the missing keys
+	}
+});
+
+cal.init({
+	legendColors: ["#efefef", "steelblue"]
+});
+
+cal.init({
+	itemName: ["cat", "cats"]
+});
+cal.init({
+	itemName: "cat"
+});
+cal.init({
+	itemName: ["cat"]
+});
+
+cal.init({
+	subDomainDateFormat: function(date: Date): string
+	{
+		return date.toString();
+	}
+});
+
+cal.init({
+	itemSelector: "#subDomainTextFormat-a",
+	start: new Date(2000, 0, 1, 1),
+	domain: "month",
+	subDomain: "x_day",
+	cellSize: 20,
+	range: 1,
+	displayLegend: false,
+	subDomainTextFormat: "%d"
+});
+
+cal.init({
+	itemSelector: "#subDomainTextFormat-b",
+	start: new Date(2000, 0, 1, 1),
+	data: "datas-years.json",
+	domain: "month",
+	subDomain: "x_day",
+	cellSize: 20,
+	range: 1,
+	displayLegend: false,
+	subDomainTextFormat: function(date: Date, value: number): number
+	{
+		return value;
+	}
+});
+
+cal.init({
+	itemSelector: "#domainLabelFormat-a",
+	domain: "month",
+	subDomain: "day",
+	range: 1,
+	displayLegend: false
+});
+
+cal.init({
+	itemSelector: "#domainLabelFormat-b",
+	domain: "month",
+	subDomain: "day",
+	range: 1,
+	displayLegend: false,
+	domainLabelFormat: "%m-%Y"
+});
+
+cal.init({
+	itemSelector: "#legendTitleFormat-a",
+	domain: "day",
+	range: 3
+});
+
+cal.init({
+	itemSelector: "#animationDuration-a",
+	domain: "day",
+	range: 4,
+	previousSelector: "#animationDuration-previous",
+	nextSelector: "#animationDuration-next",
+	itemNamespace: "animationDuration-a"
+});
+
+cal.init({
+	itemSelector: "#animationDuration-b",
+	domain: "day",
+	range: 4, animationDuration: 1500,
+	previousSelector: "#animationDuration-previous",
+	nextSelector: "#animationDuration-next",
+	itemNamespace: "animationDuration-b"
+});
+
+cal.init({
+	itemSelector: "#previousSelector-a",
+	domain: "day",
+	range: 4,
+	previousSelector: "#previousSelector-a-previous",
+	nextSelector: "#previousSelector-a-next"
+});
+
+cal.init({
+	itemSelector: "#previousSelector-b",
+	domain: "day",
+	range: 4,
+	previousSelector: "#example-previousSelector  ul + p > em",
+	nextSelector: "#example-previousSelector [title=next] li"
+});
+
+cal.init({
+	nextSelector: "#next" // Attach #next onClick event to cal.next()
+});
+
+cal.init({
+	nextSelector: "#next",
+	// Attach #next.cal onClick event to cal.next()
+	itemNamespace: "cal"
+});
+
+
+cal.previous();
+cal.previous(5);
+
+cal.next();
+cal.next(5);
+
+cal.jumpTo(new Date(2000, 4));
+cal.jumpTo(new Date(2000, 4), true);
+
+cal.rewind();
+
+var randomData = {};
+cal.update(randomData);
+cal.update(randomData, () => { }, cal.RESET_ALL_ON_UPDATE);
+cal.update(randomData, false, cal.APPEND_ON_UPDATE);
+cal.update(randomData, false, cal.RESET_SINGLE_ON_UPDATE);
+
+cal.highlight(new Date(2000, 0, 2));
+
+// Add January 5th to already highlighted dates
+cal.options.highlight.push(new Date(2000, 0, 5));
+cal.highlight(cal.options.highlight);
+
+var svg: string = cal.getSVG();
+
+
+cal.options.legendVerticalPosition = "center";
+cal.options.legendHorizontalPosition = "right";
+cal.options.legendOrientation = "vertical";
+
+
+cal.setLegend();
+
+cal.removeLegend();
+
+cal.showLegend();
+
+cal = cal.destroy();
+
+
+cal.init({
+	itemSelector: "#onClick-a",
+	domain: "day",
+	range: 5, data: "datas-years.json",
+	start: new Date(2000, 0),
+	onClick: function(date: Date, nb: number)
+	{
+		$("#onClick-placeholder").html("You just clicked <br/>on <b>" +
+			date + "</b> <br/>with <b>" +
+			(nb === null ? "unknown" : nb) + "</b> items"
+		);
+	}
+});
+
+cal.init({
+	itemSelector: "#afterLoad-a",
+	domain: "day",
+	range: 5,
+	afterLoad: function() { },
+	onComplete: function() { }
+});
+
+cal.init({
+	itemSelector: "#afterLoadPreviousDomain-a",
+	domain: "day",
+	range: 5, afterLoadPreviousDomain: function(date: Date) { },
+	previousSelector: "#afterLoadPreviousDomain-selector"
+});
+
+cal.init({
+	itemSelector: "#afterLoadNextDomain-a",
+	domain: "day",
+	range: 5, afterLoadNextDomain: function(date: Date) { },
+	nextSelector: "#afterLoadNextDomain-selector"
+});
+
+cal.init({
+	itemSelector: "#onComplete-a",
+	domain: "day",
+	range: 5,
+	onComplete: function() { }
+});
+
+var datas = [
+	{ date: 946702811, value: 15 },
+	{ date: 946702812, value: 25 },
+	{ date: 946702813, value: 10 }
+]
+
+cal.init({
+	data: datas,
+	afterLoadData: (data: any) =>
+	{
+		var stats: CalHeatMap.DataFormat = {};
+		for (var d in data)
+		{
+			stats[data[d].date] = data[d].value;
+		}
+		return stats;
+	}
+});
+
+cal.init({
+	itemSelector: "#onMinDomainReached-a",
+	domain: "month",
+	range: 5,
+	start: new Date(2000, 4),
+	minDate: new Date(2000, 3),
+	maxDate: new Date(2000, 11),
+	onMinDomainReached: function(hit: boolean) { },
+	onMaxDomainReached: function(hit: boolean) { },
+	nextSelector: "#onMinDomainReached-next",
+	previousSelector: "#onMinDomainReached-previous",
+	displayLegend: false
+});
diff --git a/cal-heatmap/cal-heatmap.d.ts b/cal-heatmap/cal-heatmap.d.ts
new file mode 100644
index 000000000..b54e3a5bf
--- /dev/null
+++ b/cal-heatmap/cal-heatmap.d.ts
@@ -0,0 +1,514 @@
+// Type definitions for cal-heatmap v3.5.4
+// Project: https://github.com/wa0x6e/cal-heatmap
+// Definitions by: Chris Baker <https://github.com/RetroChrisB/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../d3/d3.d.ts" />
+
+declare module CalHeatMap
+{
+	interface CalHeatMapStatic
+	{
+		new (): CalHeatMap;
+	}
+
+	interface CalHeatMap
+	{
+		/**
+		 * Initialise the CalHeatMap with the specified options
+		 * @param {InitOptions} options The CalHeatMap options
+		 */
+		init(options?: InitOptions): void;
+
+		options: RuntimeOptions;
+
+		// Various update mode when using the update() API
+		/** Reset the whole calendar data before inserting the new data. */
+		RESET_ALL_ON_UPDATE: number;
+		/** 
+		 * Update only the dates (subDomain) you pass in the data argument, replace their value by the new ones. 
+		 * All other dates are leaved untouched.
+		 */
+		RESET_SINGLE_ON_UPDATE: number;
+		/**
+		 * Instead of replacing a date's value by a new one, increment it by the new value. All other dates are leaved untouched.
+		 * That's the one you want to use of you're populating the calendar in realtime!
+		 */
+		APPEND_ON_UPDATE: number;
+
+		/**
+		 * Shift the calendar n domains back
+		 * @param {number} n The number of domains to shift back. The default is 1.
+		 */
+		previous(n?: number): void;
+		/**
+		 * Shift the calendar n domains forward
+		 * @param {number} n The number of domains to shift forward. The default is 1.
+		 */
+		next(n?: number): void;
+		/**
+		 * Jump the calendar to the specified date
+		 * This method will shift the calendar backward or forward, until the domain containing the specified date is visible.
+		 * @param {Date} date The date to jump to.
+		 * @param {boolean} reset Whether to set the domain with the specified as the calendar's first domain.
+		 */
+		jumpTo(date: Date, reset?: boolean): void;
+		/** Reset the calendar back to the start date */
+		rewind(): void;
+		/**
+		 * Update the calendar with new data
+		 * Use update() when you want to refresh the calendar with a new set of data.
+		 * Particularly useful if you're filling the calendar in realtime, or if you want to display a subset of the current data.
+		 * @param {string|Object} data Accept the same format as the data option.
+		 * @param {} afterLoad Whether to execute the afterLoad() callback to convert your data into the json object, expected by cal-heatmap.
+		 *                     It can also directly takes a function, in case your data can not be converted with the afterLoad() function you defined.
+		 * @param {} updateMode Define how to insert the new data into the calendar.
+		 *                      Accepted values are:
+		 *                        Instance.RESET_ALL_ON_UPDATE  (default) Reset the whole calendar data before inserting the new data.
+		 *                        Instance.RESET_SINGLE_ON_UPDATE  Update only the dates (subDomain) you pass in the data argument,
+		 *                                                         replace their value by the new ones. All other dates are leaved untouched.
+		 *                        Instance.APPEND_ON_UPDATE  Instead of replacing a date's value by a new one, increment it by the new value.
+		 *                                                   All other dates are leaved untouched. That's the one you want to use of you're
+		 *                                                   populating the calendar in realtime!
+		 */
+		update(data: string | Object, afterLoad?: boolean | Function, updateMode?: number): void;
+		/**
+		 * Change the highlighted dates.
+		 * Takes an array of Date object. Can also accepts the now string, equivalent to Date.now().
+		 * @param {string|Date|Date[]} dates The date or dates to highlight.
+		 */
+		highlight(dates: string | Date | Date[]): void;
+		/**
+		 * Return the SVG source code with the appropriate CSS
+		 * The returned string code is valid and ready to be placed in a .svg file.
+		 * @returns SVG source code with the appropriate CSS.
+		 */
+		getSVG(): string;
+		/**
+		 * Change the legend settings and/or threshold
+		 * When called without arguments, setLegend() will just redraw the legend.
+		 * @param {} legend Same as legend : an array of thresholds
+		 * @param {} legendColor Same as legendColors : an object with the heatmap's colors, or an array of 2 colors
+		 */
+		setLegend(legend?: number[], legendColors?: LegendColor | string[]): void;
+		/**
+		 * Remove the legend from the calendar
+		 * Settings are kept and you can re-add the legend with the same settings using showLegend().
+		 */
+		removeLegend(): void;
+		/** Display the legend, if not already shown. */
+		showLegend(): void;
+		/**
+		 * Remove the calendar from the DOM
+		 * Remember to self-assign the result of destroy() to your calendar instance, or it'll lead to a memory leak.
+		 * @param {Function} callback function that will be executed when the calendar is removed from the DOM, at the end of the animation.
+		 * @returns always returns null.
+		 */
+		destroy(callback?: Function): CalHeatMap;
+	}
+
+	interface LegendColor
+	{
+		/** Color of the smallest value on the legend */
+		min: string;
+		/** Color of the highest value on the legend */
+		max: string;
+		/** Color for the dates with value == 0 */
+		empty?: string;
+		/** Base color of the date cells */
+		base?: string;
+		/** Color for the special value */
+		overflow?: string;
+	}
+
+	interface InitOptions
+	{
+		// ================================================
+		// Presentation
+		// ================================================
+
+		/** DOM node to insert the calendar in. Default: "#cal-heatmap" */
+		itemSelector?: string | HTMLElement | Element | EventTarget;
+
+		/**
+		 * Type of domain. Default: "hour"
+		 * Valid domains: {"hour", "day", "week", "month", "year"}
+		 */
+		domain?: string;
+
+		/**
+		 * Type of subDomain. Default: "min"
+		 * Valid subDomains: {"min", "x_min", "hour", "x_hour", "day", "x_day", "week", "x_week", "month", "x_month"}
+		 */
+		subDomain?: string;
+
+		/** Number of domain to display. Default: 12 */
+		range?: number;
+
+		/** Size of each subDomain cell, in pixels. Default: 10 */
+		cellSize?: number;
+
+		/** Space between each subDomain cell, in pixel. Default: 2 */
+		cellPadding?: number;
+
+		/** subDomain cell's border radius, for rounder corner, in pixel. Default: 0 */
+		cellRadius?: number;
+
+		/** Space between each domain, in pixel. Default: 2 */
+		domainGutter?: number;
+
+		/**
+		 * Margin around each domain, in pixel. Default: [0,0,0,0]
+		 * Ordered like in CSS (top, right, bottom, left), it also accepts CSS like values
+		 */
+		domainMargin?: number | number[];
+
+		/**
+		 * Whether to enable domain dynamic width and height. Default: true
+		 * Some domain>subdomain couple, like month>days, doesn't always have the same number of
+		 * subDomain cells. Some months have 6 weeks, some only 4.
+		 * With dynamic dimension enabled, the domain width and height will be adjusted to fit the
+		 * domain content, whereas when it's disabled, all domains will have the same dimension : the biggest.
+		 */
+		domainDynamicDimension?: boolean;
+
+		/** To display the calendar vertically, with each domain one under the other. Default: false */
+		verticalOrientation?: boolean;
+
+		/** Position and alignment of the domain label. */
+		label?: Label;
+
+		/**
+		 * Control the number of columns to split the domain dates into. Default: null
+		 * Each domain is split into an arbitrary number of columns (or rows depending on the
+		 * reading direction). You can overwrite that number with colLimit, and force all dates on the
+		 * same line, or split them into more columns.
+		 * That setting limit the maximum number of columns, and doesn't necessary means that each rows will
+		 * contains that number of columns.
+		 */
+		colLimit?: number;
+
+		/** Control the number of rows to split the domain dates into. Default: null
+		 * If rowLimit and colLimit are both used, rowLimit will be ignored. */
+		rowLimit?: number;
+
+		/** Whether to display a tooltip when hovering over a date. Default: false */
+		tooltip?: boolean;
+
+		// ================================================
+		// Data
+		// ================================================
+
+		/**
+		 * Starting date of the calendar. Default: new Date()
+		 * It doesn't have to be precise, the calendar will not start at that date, but at the first domain containing that date.
+		 */
+		start?: Date;
+		/**
+		 * Data used to fill the calendar. Default: ""
+		 * String is interpreted as a URL to an API, which should be returning the data used to fill the calendar.
+		 */
+
+		data?: string | Object;
+
+		/**
+		 * Engine used to parse the data. Default: json
+		 * Valid values:
+		 *  "json" - Interpret the data as json.
+		 *  "csv"  - Interpret the data as csv.
+		 *  "tsv"  - Interpret the data exactly like csv, but are delimited with a tab character, instead of comma.
+		 *  "txt"  - Just return the data as a string.
+		 */
+		dataType?: string;
+
+		/**
+		 * Highlight selected subDomain cells. Default: false
+		 * Takes an array of Date object. Can also accepts the now string, equivalent to Date.now().
+		 */
+		highlight?: string | string[] | Date[] | any[];
+
+		/** Whether to start the week on Monday, instead of Sunday. Default: true */
+		weekStartOnMonday?: boolean;
+
+		/**
+		 * Lower limit of the domain navigation, preventing navigating beyond a certain date. Default: null
+		 * When set, calling previous() will only work only until the leftmost domain containing minDate.
+		 * Like with start, minDate does not have to be precise, and just have to be a date inside the domain.
+		 * previous() will always return true, unless the domain containing minDate is reached, in which case, it'll return false.
+		 */
+		minDate?: Date;
+
+		/** Upper limit of the domain navigation, preventing navigating beyond a certain date. Default: null */
+		maxDate?: Date;
+
+		/**
+		 * Whether to consider missing date:value couple in the data source as equal to 0.  Default: false
+		 * By default, when the a date is not associated to a value, it's considered as null, and rendered as a no value cell.
+		 * You should ask yourself, if the API is not returning result for a date, is it because there is really no value
+		 * associated to this date, or because it's supposed to be equal to 0, and it's skipped in order to save bandwidth ?
+		 */
+		considerMissingDataAsZero?: boolean;
+
+		// ================================================
+		// Legend
+		// ================================================
+
+		/** Assign each range of values to a color. Default: [10, 20, 30, 40] */
+		legend?: number[];
+
+		/** Whether to display the legend. Default: true */
+		displayLegend?: boolean;
+
+		/** Size of the legend cells, in pixels. Default: 10 */
+		legendCellSize?: number;
+
+		/** Padding between each legend cell, in pixels. Default: 2 */
+		legendCellPadding?: number;
+
+		/** Margin around the legend, in pixels. Default: [10, 0, 0, 0] */
+		legendMargin?: number | number[];
+
+		/**
+		 * Vertical position of the legend. Default: "bottom"
+		 * Valid values:
+		 *  "top"    - Place the legend above the calendar
+		 *  "center" - Place the legend on the calendar's side
+		 *             Use with legendHorizontalPosition, to position the legend on the left (default) or on the right.
+		 *  "bottom" - Place the legend on below the calendar
+		 */
+		legendVerticalPosition?: string;
+
+		/**
+		 * Horizontal position of the legend. Default: "left"
+		 * Valid values:
+		 *  "left"   - Align the legend to the left
+		 *  "center" - Center the legend
+		 *  "right"  - Align the legend to the right
+		 */
+		legendHorizontalPosition?: string;
+
+		/**
+		 * Orientation of the legend. Default: "horizontal"
+		 * legendOrientation is best used together with legendHorizontalPosition when the legend is positioned on the side.
+		 * Valid values:
+		 *  "horizontal" - Legend is displayed horizontally, from left to right
+		 *  "vertical"   - Legend is displayed vertically, from top to bottom
+		 */
+		legendOrientation?: string;
+
+		/**
+		 * Set of colors to automagically compute the heatmap colors.
+		 * Instead of relying on the CSS for your heatmap's colors, you can also set the heatmap's colors directly with
+		 * cal-heatmap on initialization, or even dynamically change them after.
+		 * All legend settings can be changed dynamically after calendar initialisation, with setLegend().
+		 */
+		legendColors?: LegendColor | string[];
+
+		// ================================================
+		// i18n
+		// ================================================
+
+		/**
+		 * Name of the entity you're representing on the calendar.
+		 * Takes an array of string, with the first index as the singular form, and the second index the plural form.
+		 * For the lazy, you can also pass a simple string, ar a single element array, and it'll automatically guess
+		 * the plural form, as long as it's the singular form plus the "s" suffix.
+		 */
+		itemName?: string | string[];
+		/**
+		 * Format of the title displayed when hovering a subDomain.
+		 * Some template strings are available, and enclosed in braces.
+		 *  {name}       Name of the entity represented in the calendar (see itemName)
+		 *  {count}      The value associated to the date.
+		 *  {date}       The date of the cell. It's automatically formatted according to the type of subDomain.
+		 *               See subDomainDateFormat to further customize that date formatting.
+		 *  {connector}  An English preposition placed before a datetime (on Monday, at 15:00, etc.). Each subDomain
+		 *               have their own default connector, corresponding to the default date format.
+		 */
+		subDomainTitleFormat?: SubDomainFormatTemplates;
+		/**
+		 * Format of the {date} template string inside subDomainTitleFormat.
+		 * {date} is by default formatted according to the subDomain type.
+		 * subDomainFormat can accept any string with directive accepted by d3.time.format(), like "%Y-%m-%d".
+		 * As d3.time.format() will only output English dates, subDomainDateFormat can also accept a function,
+		 * with the subDomain date as the argument.
+		 */
+		subDomainDateFormat?: string | Function;
+		/**
+		 * Format of the text inside a subDomain cell.
+		 * Disabled by default, you can display a text inside each subDomain cell.
+		 * Works exactly like subDomainDateFormat, except that the function takes the cell value as second argument.
+		 */
+		subDomainTextFormat?: string | Function;
+		/**
+		 * Format of the domain label.
+		 * Works exactly like subDomainDateFormat, and will format the domain label with any string accepted by d3.time.format(), or a function.
+		 * To not display the domain label, set domainLabelFormat to "" (empty string).
+		 */
+		domainLabelFormat?: string | Function;
+		/**
+		 * Formatting of the legend title, displayed when hovering a legend cell.
+		 * Some template strings are available, and enclosed in braces.
+		 *  {name}  Name of the entity represented in the calendar (see itemName)
+		 *  {min}   The first value of the legend array.
+		 *  {max}   The last value of the legend array.
+		 *  {down}  The lower bound of a color
+		 *  {up}    The upper bound of a color
+		 */
+		legendTitleFormat?: LegendTitleTemplates;
+
+		// ================================================
+		// Other
+		// ================================================
+
+		/** Animation duration, in milliseconds. Default value: 500 */
+		animationDuration?: number;
+		/**
+		 * Will attach the previous() event to the specified element, on a mouse click, shifting the calendar one domain back. Default value: false
+		 * If you want to shift by more than one domain, see the previous() method.
+		 */
+		previousSelector?: string | HTMLElement;
+		/**
+		 * Will attach the next() event to the specified element, on a mouse click, shifting the calendar one domain forward. Default value: false
+		 * If you want to shift by more than one domain, see the next() method.
+		 */
+		nextSelector?: string | HTMLElement;
+		/**
+		 * The calendar instance namespace.
+		 * If you have more than one instance of Cal-Heatmap, you should assign each instance its own namespace, in order to isolate each instance event handler.
+		 */
+		itemNamespace?: string;
+
+		// ================================================
+		// Events
+		// ================================================
+
+		/** Called after a mouse click event on a subDomain cell. */
+		onClick?: (date: Date, value: number) => void;
+		/** Called after drawing the empty calendar, and before filling it with data. */
+		afterLoad?: () => void;
+		/**
+		 * Called after shifting the calendar one domain back.
+		 * The date argument is the start date of the domain that was added.
+		 */
+		afterLoadPreviousDomain?: (date: Date) => void;
+		/**
+		 * Called after shifting the calendar one domain forward.
+		 * The date argument is the start date of the domain that was added.
+		 */
+		afterLoadNextDomain?: (date: Date) => void;
+		/**
+		 * Called after drawing and filling the calendar.
+		 * Useful in case you're loading data via ajax, as it's loading data asynchronously. This event will wait for the ajax
+		 * request to complete before triggering.
+		 * This event will only trigger once, on the initial setup. See afterLoadPreviousDomain and afterLoadNextDomain for
+		 * callback events after a domain navigation.
+		 */
+		onComplete?: () => void;
+		/**
+		 * Called after getting the data from source, but before filling the calendar.
+		 * This callback must return a json object formatted in the expected data format.
+		 * afterLoadData() is used to do some works on the data, especially when the data source is not returning data in the expected format.
+		 */
+		afterLoadData?: (data: any) => DataFormat;
+		/**
+		 * Triggered after previous(), when the incoming domain is containing minDate.
+		 * When the leftmost domain set by minDate is loaded into the calendar, onMinDomainReached() will be triggered with true as argument.
+		 * This event is useful if you want to disable your previous button, since there is no more previous domains to load.
+		 * In order to reverse the action, onMinDomainReached() will be called with false as argument afer next(), only once, and only if the
+		 * leftmost domain is not the lower limit domain anymore.
+		 */
+		onMinDomainReached?: (reached: boolean) => void;
+		/**
+		 * Triggered after next(), when the incoming domain is containing maxDate.
+		 * See onMinDomainReached().
+		 */
+		onMaxDomainReached?: (reached: boolean) => void;
+	}
+
+	interface RuntimeOptions extends InitOptions
+	{
+		/** Margin around each domain, in pixels. Ordered like in CSS (top, right, bottom, left) */
+		domainMargin: number[];
+		/** Margin around the legend, in pixels. Ordered like in CSS (top, right, bottom, left) */
+		legendMargin: number[];
+		/** List of dates to highlight */
+		highlight: Date[];
+		/** 
+		 * Name of the items to represent in the calendar. 
+		 * First index is singular form, and the second index, the plural form.
+		 */
+		itemName: string[];
+	}
+
+	interface LegendTitleTemplates
+	{
+		/** Formatting of the smallest (leftmost) value of the legend. Default value: "less than {min} {name}" */
+		lower?: string;
+		/** Formatting of all the value but the first and the last. Default value: "between {down} and {up} {name}" */
+		inner?: string;
+		/** Formatting of the biggest (rightmost) value of the legend. Default value: "more than {max} {name}" */
+		upper?: string;
+	}
+
+	interface SubDomainFormatTemplates
+	{
+		/** Format of the title when there is no value associated to the date. Default value: "{date}" */
+		empty?: string;
+		/** Format of the title when it's associated to a value. Default value: "{count} {name} {connector} {date}" */
+		filled?: string;
+	}
+
+	interface DataFormat
+	{
+		/** timestamp are in seconds, value can be any number (integer or float) */
+		[timestamp: string]: number;
+	}
+
+	interface LabelOffset
+	{
+		x: number;
+		y: number;
+	}
+
+	/** Position and alignment of the domain label. */
+	interface Label
+	{
+		/**
+		 * Position of the label, relative to the domain. Default: "bottom"
+		 * Valid values: {"top", "right", "bottom", "left"}
+		 */
+		position?: string;
+
+		/**
+		 * Horizontal align of the domain. Default: "center"
+		 * Valid values: {"left", "center", "right"}
+		 */
+		align?: string;
+		/**
+		 * Rotation for a vertical label. Default: null
+		 * Valid values: {null, "left", "right"}
+		 */
+		rotate?: string;
+		/**
+		 * Only used when label is rotated, defines the width of the label. Default: 100
+		 * Valid values: any intger
+		 */
+		width?: number;
+		/**
+		 * More control about label positioning, if the default value does not fit your need,
+		 * especially when label is rotated, or when using a big font-size. Default: {x:0, y:0}
+		 */
+		offset?: LabelOffset;
+		/**
+		 * Height of the domain label in pixels.
+		 * By leaving it to null, the label will be set to 2 times the height of the subDomain cell.
+		 * If you want to remove the label, set domainLabelFormat to "" (empty string), instead
+		 * of setting the label height to 0. Default: null
+		 * Valid values: any integer
+		 */
+		height?: number;
+	}
+}
+
+declare var CalHeatMap: CalHeatMap.CalHeatMapStatic;
diff --git a/change-case/change-case-tests.ts b/change-case/change-case-tests.ts
index 24276654c..2e80c8a0d 100644
--- a/change-case/change-case-tests.ts
+++ b/change-case/change-case-tests.ts
@@ -35,3 +35,5 @@ b = changeCase.isLower(s);
 b = changeCase.isLowerCase(s);
 s = changeCase.ucFirst(s);
 s = changeCase.upperCaseFirst(s);
+s = changeCase.lcFirst(s);
+s = changeCase.lowerCaseFirst(s);
diff --git a/change-case/change-case.d.ts b/change-case/change-case.d.ts
index e61d70de6..5551b4d3d 100644
--- a/change-case/change-case.d.ts
+++ b/change-case/change-case.d.ts
@@ -34,4 +34,6 @@ declare module "change-case" {
     function isLowerCase(s: string): boolean;
     function ucFirst(s: string): string;
     function upperCaseFirst(s: string): string;
+    function lcFirst(s: string): string;
+    function lowerCaseFirst(s: string): string;
 }
diff --git a/chartjs/chart-tests.ts b/chartjs/chart-tests.ts
index 4bd8820c6..452ddbf62 100644
--- a/chartjs/chart-tests.ts
+++ b/chartjs/chart-tests.ts
@@ -325,7 +325,7 @@ var myDoughnutChart = new Chart(ctx).Doughnut(pieData, {
     animateRotate: true,
     animateScale: false,
     legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li><span style=\"background-color:<%=segments[i].fillColor%>\"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>"
-}); 
+});
 
 var myDoughnutChartLegend: string = myDoughnutChart.generateLegend();
 var myDoughnutChartImage: string = myDoughnutChart.toBase64Image();
@@ -341,3 +341,32 @@ myDoughnutChart.resize();
 myDoughnutChart.update();
 myDoughnutChart.stop();
 myDoughnutChart.destroy();
+
+// Test using charts with overrides of a subset of global options
+var partialOpts: ChartSettings = {
+    showTooltips: true,
+    tooltipEvents: ["mousemove", "touchstart", "touchmove"],
+    tooltipFillColor: "rgba(0,0,0,0.8)",
+    tooltipFontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
+    tooltipFontSize: 14,
+    tooltipFontStyle: "normal",
+    tooltipFontColor: "#fff",
+    tooltipTitleFontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
+    tooltipTitleFontSize: 14,
+    tooltipTitleFontStyle: "bold",
+    tooltipTitleFontColor: "#fff",
+    tooltipYPadding: 6,
+    tooltipXPadding: 6,
+    tooltipCaretSize: 8,
+    tooltipCornerRadius: 6,
+    tooltipXOffset: 10,
+    tooltipTemplate: "<%if (label){%><%=label%>: <%}%><%= value %>"
+};
+
+var my2ndLineChart = new Chart(ctx).Line(lineData, partialOpts);
+var my2ndBarChart = new Chart(ctx).Bar(barData, partialOpts);
+var my2ndRadarChart = new Chart(ctx).Radar(radarData, partialOpts);
+var my2ndPolarAreaChart = new Chart(ctx).PolarArea(polarAreaData, partialOpts);
+var my2ndPieChart = new Chart(ctx).Pie(pieData, partialOpts);
+var my2ndDoughnutChart = new Chart(ctx).Doughnut(pieData, partialOpts);
+
diff --git a/chartjs/chart.d.ts b/chartjs/chart.d.ts
index d337d144a..62f393b8a 100644
--- a/chartjs/chart.d.ts
+++ b/chartjs/chart.d.ts
@@ -33,49 +33,49 @@ interface CircularChartData {
 }
 
 interface ChartSettings {
-    animation: boolean;
-    animationSteps: number;
-    animationEasing: string;
-    showScale: boolean;
-    scaleOverride: boolean;
-    scaleSteps: number;
-    scaleStepWidth: number;
-    scaleStartValue: number;
-    scaleLineColor: string;
-    scaleLineWidth: number;
-    scaleShowLabels: boolean;
-    scaleLabel: string;
-    scaleIntegersOnly: boolean;
-    scaleBeginAtZero: boolean;
-    scaleFontFamily: string;
-    scaleFontSize: number;
-    scaleFontStyle: string;
-    scaleFontColor: string;
-    responsive: boolean;
-    maintainAspectRatio: boolean;
-    showTooltips: boolean;
-    tooltipEvents: string[];
-    tooltipFillColor: string;
-    tooltipFontFamily: string;
-    tooltipFontSize: number;
-    tooltipFontStyle: string;
-    tooltipFontColor: string;
-    tooltipTitleFontFamily: string;
-    tooltipTitleFontSize: number;
-    tooltipTitleFontStyle: string;
-    tooltipTitleFontColor: string;
-    tooltipYPadding: number;
-    tooltipXPadding: number;
-    tooltipCaretSize: number;
-    tooltipCornerRadius: number;
-    tooltipXOffset: number;
-    tooltipTemplate: string;
-    multiTooltipTemplate: string;
-    onAnimationProgress: () => any;
-    onAnimationComplete: () => any;
+    animation?: boolean;
+    animationSteps?: number;
+    animationEasing?: string;
+    showScale?: boolean;
+    scaleOverride?: boolean;
+    scaleSteps?: number;
+    scaleStepWidth?: number;
+    scaleStartValue?: number;
+    scaleLineColor?: string;
+    scaleLineWidth?: number;
+    scaleShowLabels?: boolean;
+    scaleLabel?: string;
+    scaleIntegersOnly?: boolean;
+    scaleBeginAtZero?: boolean;
+    scaleFontFamily?: string;
+    scaleFontSize?: number;
+    scaleFontStyle?: string;
+    scaleFontColor?: string;
+    responsive?: boolean;
+    maintainAspectRatio?: boolean;
+    showTooltips?: boolean;
+    tooltipEvents?: string[];
+    tooltipFillColor?: string;
+    tooltipFontFamily?: string;
+    tooltipFontSize?: number;
+    tooltipFontStyle?: string;
+    tooltipFontColor?: string;
+    tooltipTitleFontFamily?: string;
+    tooltipTitleFontSize?: number;
+    tooltipTitleFontStyle?: string;
+    tooltipTitleFontColor?: string;
+    tooltipYPadding?: number;
+    tooltipXPadding?: number;
+    tooltipCaretSize?: number;
+    tooltipCornerRadius?: number;
+    tooltipXOffset?: number;
+    tooltipTemplate?: string;
+    multiTooltipTemplate?: string;
+    onAnimationProgress?: () => any;
+    onAnimationComplete?: () => any;
 }
 
-interface ChartOptions {
+interface ChartOptions extends ChartSettings {
     scaleShowGridLines?: boolean;
     scaleGridLineColor?: string;
     scaleGridLineWidth?: number;
@@ -138,7 +138,7 @@ interface BarChartOptions extends ChartOptions {
     barDatasetSpacing?: number;
 }
 
-interface RadarChartOptions {
+interface RadarChartOptions extends ChartSettings {
     scaleShowLine?: boolean;
     angleShowLineOut?: boolean;
     scaleShowLabels?: boolean;
@@ -159,7 +159,7 @@ interface RadarChartOptions {
     legendTemplate?: string;
 }
 
-interface PolarAreaChartOptions {
+interface PolarAreaChartOptions extends ChartSettings {
     scaleShowLabelBackdrop?: boolean;
     scaleBackdropColor?: string;
     scaleBeginAtZero?: boolean;
@@ -176,7 +176,7 @@ interface PolarAreaChartOptions {
     legendTemplate?: string;
 }
 
-interface PieChartOptions {
+interface PieChartOptions extends ChartSettings {
     segmentShowStroke?: boolean;
     segmentStrokeColor?: string;
     segmentStrokeWidth?: number;
diff --git a/chrome/chrome.d.ts b/chrome/chrome.d.ts
index 8829ab044..b27891704 100755
--- a/chrome/chrome.d.ts
+++ b/chrome/chrome.d.ts
@@ -5689,7 +5689,7 @@ declare module chrome.runtime {
      * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation. 
      * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set. 
      */
-	export function setUninstallUrl(url: string, callback?: () => void): void;
+	export function setUninstallURL(url: string, callback?: () => void): void;
     /**
      * Open your Extension's options page, if possible.
      * The precise behavior may depend on your manifest's options_ui or options_page key, or what Chrome happens to support at the time. For example, the page may be opened in a new tab, within chrome://extensions, within an App, or it may just focus an open options page. It will never cause the caller page to reload.
diff --git a/ckeditor/ckeditor.d.ts b/ckeditor/ckeditor.d.ts
index cab51f72c..b3c2f4524 100644
--- a/ckeditor/ckeditor.d.ts
+++ b/ckeditor/ckeditor.d.ts
@@ -74,6 +74,7 @@ declare module CKEDITOR {
     function appendTo(element: string, config?: config, data?: string): editor;
     function appendTo(element: HTMLTextAreaElement, config?: config, data?: string): editor;
     function domReady(): void;
+    function dialogCommand(dialogName: string): void;
     function editorConfig(config: config): void;
     function getCss(): string;
     function getTemplate(name: string): template;
@@ -556,29 +557,34 @@ declare module CKEDITOR {
         groups?: string[];
     }
 
+          // Currently very incomplete. See here for all options that should be included:
+          // http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fileTools_defaultFileName
     interface config {
+        allowedContent?: string | boolean;
+        colorButton_enableMore?: boolean;
+        colorButton_colors?: string;
         contentsCss?: string | string[];
+        contentsLangDirection?: string;
+        customConfig?: string;
+        extraPlugins?: string;
+        font_names?: string;
+        font_defaultLabel?: string;
+        fontSize_sizes?: string;
+        fontSize_defaultLabel?: string;
+        height?: string | number;
+        language?: string;
+        on?: any;
+        plugins?: string;
+        startupFocus?: boolean;
         startupMode?: string;
         removeButtons?: string;
         removePlugins?: string;
         toolbar?: any;
         toolbarGroups?: toolbarGroups[];
-        skin?: string;
-        language?: string;
-        plugins?: string;
-        font_names?: string;
-        font_defaultLabel?: string;
-        fontSize_sizes?: string;
-        fontSize_defaultLabel?: string;
-        colorButton_enableMore?: boolean;
-        colorButton_colors?: string;
-        startupFocus?: boolean;
-        on?: any;
-        extraPlugins?: string;
-        height?: string | number;
         toolbarLocation?: string;
         readOnly?: boolean;
-        customConfig?: string;
+        skin?: string;
+        width?: string | number;
     }
 
 
@@ -745,6 +751,7 @@ declare module CKEDITOR {
             beforeInit?(editor: editor): any;
             init?(editor: editor): any;
             onLoad?(): any;
+            icons?: string;
         }
 
         function add(name: string, definition?: IPluginDefinition): void;
@@ -933,6 +940,8 @@ declare module CKEDITOR {
             interface button extends uiElement {
                 disabled?: boolean;
                 label?: string;
+                command?: string;
+                toolbar?: string;
             }
 
 
@@ -1130,4 +1139,12 @@ declare module CKEDITOR {
         function isTabEnabled(editor: editor, dialogName: string, tabName: string): boolean;
         function okButton(): void;
     }
-}
+
+    module lang {
+        var languages: any;
+        var rtl: any;
+
+        function load(languageCode: string, defaultLanguage: string, callback: Function): void;
+        function detect(defaultLanguage: string, probeLanguage: string): string;
+    }
+}
\ No newline at end of file
diff --git a/complex/complex-tests.ts b/complex/complex-tests.ts
new file mode 100644
index 000000000..46a5f5c69
--- /dev/null
+++ b/complex/complex-tests.ts
@@ -0,0 +1,44 @@
+/// <reference path="./complex.d.ts" />
+
+import Complex from 'complex';
+
+var z: Complex = new Complex(2, 3);
+var z: Complex = Complex.from(2, 3);
+var z: Complex = Complex.from(2, 4);
+var z: Complex = Complex.from(5);
+var z: Complex = Complex.from('2+5i');
+var z: Complex = Complex.fromPolar(3, Math.PI);
+var z: Complex = Complex.i;
+var z: Complex = Complex.one;
+var z: Complex = z.fromRect(2, 3);
+var z: Complex = z.fromPolar(3, Math.PI);
+var z: Complex = z.toPrecision(3);
+var z: Complex = z.toFixed(3);
+var z: Complex = z.finalize();
+var x: number = z.magnitude();
+var x: number = z.abs();
+var x: number = z.angle();
+var x: number = z.arg();
+var x: number = z.phase();
+var z: Complex = z.conjugate();
+var z: Complex = z.negate();
+var z: Complex = z.multiply(z);
+var z: Complex = z.mult(3);
+var z: Complex = z.divide(z);
+var z: Complex = z.div(3);
+var z: Complex = z.add(z);
+var z: Complex = z.subtract(z);
+var z: Complex = z.sub(3);
+var z: Complex = z.pow(z);
+var z: Complex = z.sqrt();
+var z: Complex = z.log(2);
+var z: Complex = z.exp();
+var z: Complex = z.sin();
+var z: Complex = z.cos();
+var z: Complex = z.tan();
+var z: Complex = z.sinh();
+var z: Complex = z.cosh();
+var z: Complex = z.tanh();
+var z: Complex = z.clone();
+var s: string = z.toString();
+var b: boolean = z.equals(z);
diff --git a/complex/complex.d.ts b/complex/complex.d.ts
new file mode 100644
index 000000000..b1ca7c4ac
--- /dev/null
+++ b/complex/complex.d.ts
@@ -0,0 +1,238 @@
+// Type definitions for Complex 3.0.1
+// Project: https://github.com/arian/Complex
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'complex' {
+	export default class Complex {
+		/**
+		 * @param real The real part of the number
+		 * @param im The imaginary part of the number
+		 */
+		constructor(real: number, im: number);
+
+		/**
+		 * A in line function like Number.from.
+		 *
+		 * Examples:
+		 * var z = Complex.from(2, 4);
+		 * var z = Complex.from(5);
+		 * var z = Complex.from('2+5i');
+		 *
+		 * @param real A string representation of the number, for example 1+4i
+		 */
+		static from(real: string): Complex;
+
+		/**
+		 * A in line function like Number.from.
+		 * @param real The real part of the number
+		 * @param im The imaginary part of the number
+		 */
+		static from(real: number, im?: number): Complex;
+
+		/**
+		 * Creates a complex instance from a polar representation
+		 * @param r The radius/magnitude of the number
+		 * @param phi The angle/phase of the number
+		 */
+		static fromPolar(r: number, phi: number): Complex;
+
+		/**
+		 * A instance of the imaginary unit
+		 */
+		static i: Complex;
+
+		/**
+		 * A instance for the real number
+		 */
+		static one: Complex;
+
+		/**
+		 * Set the real and imaginary properties a and b from a + bi.
+		 * @param real The real part of the number
+		 * @param im The imaginary part of the number
+		 */
+		fromRect(real: number, im: number): Complex;
+
+		/**
+		 * Set the a and b in a + bi from a polar representation.
+		 * @param r The radius/magnitude of the number
+		 * @param phi The angle/phase of the number
+		 */
+		fromPolar(r: number, phi: number): Complex;
+
+		/**
+		 * Set the precision of the numbers. Similar to Number.prototype.toPrecision. Useful before printing the number with the toString method.
+		 * @param k An integer specifying the number of significant digits
+		 */
+		toPrecision(k: number): Complex;
+
+		/**
+		 * Format a number using fixed-point notation. Similar to Number.prototype.toFixed. Useful before printing the number with the toString method.
+		 * @param k The number of digits to appear after the decimal point; this may be a value between 0 and 20, inclusive, and implementations may optionally support a larger range of values. If this argument is omitted, it is treated as 0.
+		 */
+		toFixed(k: number): Complex;
+
+		/**
+		 * Finalize the instance. The number will not change and any other method call will return a new instance. Very useful when a complex instance should stay constant. For example the Complex.i variable is a finalized instance.
+		 */
+		finalize(): Complex;
+
+		/**
+		 * Calculate the magnitude of the complex number
+		 */
+		magnitude(): number;
+
+		/**
+		 * Alias for magnitude(). Calculate the magnitude of the complex number.
+		 */
+		abs(): number;
+
+		/**
+		 * Calculate the angle with respect to the real axis, in radians.
+		 */
+		angle(): number;
+
+		/**
+		 * Alias for angle(). Calculate the angle with respect to the real axis, in radians.
+		 */
+		arg(): number;
+
+		/**
+		 * Alias for angle(). Calculate the angle with respect to the real axis, in radians.
+		 */
+		phase(): number;
+
+		/**
+		 * Calculate the conjugate of the complex number (multiplies the imaginary part with -1)
+		 */
+		conjugate(): Complex;
+
+		/**
+		 * Negate the number (multiplies both the real and imaginary part with -1)
+		 */
+		negate(): Complex;
+
+		/**
+		 * Multiply the number with a real or complex number
+		 * @param z The number to multiply with
+		 */
+		multiply(z: number | Complex): Complex;
+
+		/**
+		 * Alias for multiply(). Multiply the number with a real or complex number
+		 * @param z The number to multiply with
+		 */
+		mult(z: number | Complex): Complex;
+
+		/**
+		 * Divide the number by a real or complex number
+		 * @param z The number to divide by
+		 */
+		divide(z: number | Complex): Complex;
+
+		/**
+		 * Alias for divide(). Divide the number by a real or complex number
+		 * @param z The number to divide by
+		 */
+		div(z: number | Complex): Complex;
+
+		/**
+		 * Add a real or complex number
+		 * @param z The number to add
+		 */
+		add(z: number | Complex): Complex;
+
+		/**
+		 * Subtract a real or complex number
+		 * @param z The number to subtract
+		 */
+		subtract(z: number | Complex): Complex;
+
+		/**
+		 * Alias for subtract(). Subtract a real or complex number
+		 * @param z The number to subtract
+		 */
+		sub(z: number | Complex): Complex;
+
+		/**
+		 * Return the base to the exponent
+		 * @param z The exponent
+		 */
+		pow(z: number | Complex): Complex;
+
+		/**
+		 * Return the square root
+		 */
+		sqrt(): Complex;
+
+		/**
+		 * Return the natural logarithm (base E)
+		 * @param k The actual answer has a multiplicity (ln(z) = ln|z| + arg(z)) where arg(z) can return the same for different angles (every 2*pi), with this argument you can define which answer is required
+		 */
+		log(k?: number): Complex;
+
+		/**
+		 * Calculate the e^z where the base is E and the exponential the complex number.
+		 */
+		exp(): Complex;
+
+		/**
+		 * Calculate the sine of the complex number
+		 */
+		sin(): Complex;
+
+		/**
+		 * Calculate the cosine of the complex number
+		 */
+		cos(): Complex;
+
+		/**
+		 * Calculate the tangent of the complex number
+		 */
+		tan(): Complex;
+
+		/**
+		 * Calculate the hyperbolic sine of the complex number
+		 */
+		sinh(): Complex
+
+		/**
+		 * Calculate the hyperbolic cosine of the complex number
+		 */
+		cosh(): Complex
+
+		/**
+		 * Calculate the hyperbolic tangent of the complex number
+		 */
+		tanh(): Complex
+
+		/**
+		 * Return a new Complex instance with the same real and imaginary properties
+		 */
+		clone(): Complex;
+
+		/**
+		 * Return a string representation of the complex number
+		 *
+		 * Examples:
+		 * new Complex(1, 2).toString(); // 1+2i
+		 * new Complex(0, 1).toString(); // i
+		 * new Complex(4, 0).toString(); // 4
+		 * new Complex(1, 1).toString(); // 1+i
+		 * 'my Complex Number is: ' + (new Complex(3, 5)); // 'my Complex Number is: 3+5i
+		 */
+		toString(): string;
+
+		/**
+		 * Check if the real and imaginary components are equal to the passed in compelex components.
+		 *
+		 * Examples:
+		 * new Complex(1, 4).equals(new Complex(1, 4)); // true
+		 * new Complex(1, 4).equals(new Complex(1, 3)); // false
+		 *
+		 * @param z The complex number to compare with
+		 */
+		equals(z: number | Complex): boolean;
+	}
+}
diff --git a/compose-function/compose-function-tests.ts b/compose-function/compose-function-tests.ts
new file mode 100644
index 000000000..dd0a80fef
--- /dev/null
+++ b/compose-function/compose-function-tests.ts
@@ -0,0 +1,21 @@
+/// <reference path="compose-function.d.ts" />
+
+const numberToNumber = (a: number): number => a + 2;
+const numberToString = (a: number): string => "foo";
+const stringToNumber = (a: string): number => 5;
+
+import composeFunction = require("compose-function");
+const t1: number = composeFunction(numberToNumber, numberToNumber)(5);
+const t2: string = composeFunction(numberToString, numberToNumber)(5);
+const t3: string = composeFunction(numberToString, stringToNumber)("f");
+const t4: (a: string) => number = composeFunction(
+    (f: (a: string) => number) => ((p: string) => 5),
+    (f: (a: number) => string) => ((p: string) => 4)
+    )(numberToString);
+
+
+const t5: number = composeFunction(stringToNumber, numberToString, numberToNumber)(5);
+const t6: string = composeFunction(numberToString, stringToNumber, numberToString, numberToNumber)(5);
+
+const t7: string = composeFunction<string>(
+    numberToString, numberToNumber, stringToNumber, numberToString, stringToNumber)("fo");
diff --git a/compose-function/compose-function.d.ts b/compose-function/compose-function.d.ts
new file mode 100644
index 000000000..d4f205fd3
--- /dev/null
+++ b/compose-function/compose-function.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for compose-function
+// Project: https://github.com/stoeffel/compose-function
+// Definitions by: Denis Sokolov <https://github.com/denis-sokolov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module "compose-function" {
+	// Hardcoded signatures for 2-4 parameters
+	function f<A, B, C>(
+		f1: (b: B) => C,
+		f2: (a: A) => B
+	): (a: A) => C
+	function f<A, B, C, D>(
+		f1: (b: C) => D,
+		f2: (a: B) => C,
+		f3: (a: A) => B
+	): (a: A) => D
+	function f<A, B, C, D, E>(
+		f1: (b: D) => E,
+		f2: (a: C) => D,
+		f3: (a: B) => C,
+		f4: (a: A) => B
+	): (a: A) => E
+
+	// Minimal typing for more than 4 parameters
+	function f<Result>(
+		f1: (a: any) => Result,
+		...functions: Function[]
+	): (a: any) => Result
+
+	export = f;
+}
diff --git a/cordova-plugin-app-version/cordova-plugin-app-version.d.ts b/cordova-plugin-app-version/cordova-plugin-app-version.d.ts
index a754368e3..8f4210eb8 100644
--- a/cordova-plugin-app-version/cordova-plugin-app-version.d.ts
+++ b/cordova-plugin-app-version/cordova-plugin-app-version.d.ts
@@ -3,13 +3,14 @@
 // Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
+/// <reference path="../jquery/jquery.d.ts" />
 /// <reference path="../q/Q.d.ts" />
 
 interface Cordova {
-    getAppVersion: {
-		getAppName: () => Q.IPromise<string>;
-		getPackageName: () => Q.IPromise<string>;
-		getVersionCode: () => Q.IPromise<string>;
-		getVersionNumber: () => Q.IPromise<string>;
+	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>;
 	};
 }
\ No newline at end of file
diff --git a/cordova-plugin-spinner/cordova-plugin-spinner-tests.ts b/cordova-plugin-spinner/cordova-plugin-spinner-tests.ts
new file mode 100644
index 000000000..25e6b60ad
--- /dev/null
+++ b/cordova-plugin-spinner/cordova-plugin-spinner-tests.ts
@@ -0,0 +1,10 @@
+/// <reference path="cordova-plugin-spinner.d.ts" />
+
+SpinnerPlugin.activityStart();
+SpinnerPlugin.activityStart("a");
+SpinnerPlugin.activityStart("a", () => {});
+SpinnerPlugin.activityStart("a", () => {}, () => {});
+
+SpinnerPlugin.activityStop();
+SpinnerPlugin.activityStop(() => {});
+SpinnerPlugin.activityStop(() => {}, () => {});
\ No newline at end of file
diff --git a/cordova-plugin-spinner/cordova-plugin-spinner.d.ts b/cordova-plugin-spinner/cordova-plugin-spinner.d.ts
new file mode 100644
index 000000000..44ccdde45
--- /dev/null
+++ b/cordova-plugin-spinner/cordova-plugin-spinner.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for cordova-plugin-spinner 1.0.0
+// Project: https://github.com/Justin-Credible/cordova-plugin-spinner
+// Definitions by: Justin Unterreiner <https://github.com/Justin-Credible>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module SpinnerPlugin {
+
+    interface SpinnerPluginStatic {
+
+        /**
+         * Blocks user input using an indeterminate spinner.
+         * 
+         * An optional label can be shown below the spinner.
+         * 
+         * @param labelText The optional value to show in a label.
+         * @param successCallback The success callback for this asynchronous function.
+         * @param failureCallback The failure callback for this asynchronous function; receives an error string.
+         */
+        activityStart(labelText?: string, successCallback?: () => void, failureCallback?: (error: string) => void): void;
+
+        /**
+         * Allows user input by hiding the indeterminate spinner.
+         * 
+         * @param successCallback The success callback for this asynchronous function.
+         * @param failureCallback The failure callback for this asynchronous function; receives an error string.
+         */
+        activityStop(successCallback?: () => void, failureCallback?: (error: string) => void): void;
+    }
+}
+
+declare var SpinnerPlugin: SpinnerPlugin.SpinnerPluginStatic;
diff --git a/cordova/plugins/Device.d.ts b/cordova/plugins/Device.d.ts
index a25c1aadc..1abb37596 100644
--- a/cordova/plugins/Device.d.ts
+++ b/cordova/plugins/Device.d.ts
@@ -26,6 +26,9 @@ interface Device {
     version: string;
 	/** Get the device's manufacturer. */
 	manufacturer: string;
-}
+	/** Whether the device is running on a simulator. */
+	isVirtual: boolean;
+	/** Get the device hardware serial number. */
+	serial: string;}
 
 declare var device: Device;
\ No newline at end of file
diff --git a/core-js/core-js.d.ts b/core-js/core-js.d.ts
index 9c492e433..e976c4361 100644
--- a/core-js/core-js.d.ts
+++ b/core-js/core-js.d.ts
@@ -2251,782 +2251,782 @@ declare module "core-js/web/immediate" {
 declare module "core-js/web/timers" {
     export = core;
 }
-declare module "core-js/libary" {
+declare module "core-js/library" {
     export = core;
 }
-declare module "core-js/libary/shim" {
+declare module "core-js/library/shim" {
     export = core;
 }
-declare module "core-js/libary/core" {
+declare module "core-js/library/core" {
     export = core;
 }
-declare module "core-js/libary/core/$for" {
+declare module "core-js/library/core/$for" {
     import $for = core.$for;
     export = $for;
 }
-declare module "core-js/libary/core/_" {
+declare module "core-js/library/core/_" {
     var _: typeof core._;
     export = _;
 }
-declare module "core-js/libary/core/array" {
+declare module "core-js/library/core/array" {
     var Array: typeof core.Array;
     export = Array;
 }
-declare module "core-js/libary/core/date" {
+declare module "core-js/library/core/date" {
     var Date: typeof core.Date;
     export = Date;
 }
-declare module "core-js/libary/core/delay" {
+declare module "core-js/library/core/delay" {
     var delay: typeof core.delay;
     export = delay;
 }
-declare module "core-js/libary/core/dict" {
+declare module "core-js/library/core/dict" {
     var Dict: typeof core.Dict;
     export = Dict;
 }
-declare module "core-js/libary/core/function" {
+declare module "core-js/library/core/function" {
     var Function: typeof core.Function;
     export = Function;
 }
-declare module "core-js/libary/core/global" {
+declare module "core-js/library/core/global" {
     var global: typeof core.global;
     export = global;
 }
-declare module "core-js/libary/core/log" {
+declare module "core-js/library/core/log" {
     var log: typeof core.log;
     export = log;
 }
-declare module "core-js/libary/core/number" {
+declare module "core-js/library/core/number" {
     var Number: typeof core.Number;
     export = Number;
 }
-declare module "core-js/libary/core/object" {
+declare module "core-js/library/core/object" {
     var Object: typeof core.Object;
     export = Object;
 }
-declare module "core-js/libary/core/string" {
+declare module "core-js/library/core/string" {
     var String: typeof core.String;
     export = String;
 }
-declare module "core-js/libary/fn/$for" {
+declare module "core-js/library/fn/$for" {
     import $for = core.$for;
     export = $for;
 }
-declare module "core-js/libary/fn/_" {
+declare module "core-js/library/fn/_" {
     var _: typeof core._;
     export = _;
 }
-declare module "core-js/libary/fn/clear-immediate" {
+declare module "core-js/library/fn/clear-immediate" {
     var clearImmediate: typeof core.clearImmediate;
     export = clearImmediate;
 }
-declare module "core-js/libary/fn/delay" {
+declare module "core-js/library/fn/delay" {
     var delay: typeof core.delay;
     export = delay;
 }
-declare module "core-js/libary/fn/dict" {
+declare module "core-js/library/fn/dict" {
     var Dict: typeof core.Dict;
     export = Dict;
 }
-declare module "core-js/libary/fn/get-iterator" {
+declare module "core-js/library/fn/get-iterator" {
     var getIterator: typeof core.getIterator;
     export = getIterator;
 }
-declare module "core-js/libary/fn/global" {
+declare module "core-js/library/fn/global" {
     var global: typeof core.global;
     export = global;
 }
-declare module "core-js/libary/fn/is-iterable" {
+declare module "core-js/library/fn/is-iterable" {
     var isIterable: typeof core.isIterable;
     export = isIterable;
 }
-declare module "core-js/libary/fn/log" {
+declare module "core-js/library/fn/log" {
     var log: typeof core.log;
     export = log;
 }
-declare module "core-js/libary/fn/map" {
+declare module "core-js/library/fn/map" {
     var Map: typeof core.Map;
     export = Map;
 }
-declare module "core-js/libary/fn/promise" {
+declare module "core-js/library/fn/promise" {
     var Promise: typeof core.Promise;
     export = Promise;
 }
-declare module "core-js/libary/fn/set" {
+declare module "core-js/library/fn/set" {
     var Set: typeof core.Set;
     export = Set;
 }
-declare module "core-js/libary/fn/set-immediate" {
+declare module "core-js/library/fn/set-immediate" {
     var setImmediate: typeof core.setImmediate;
     export = setImmediate;
 }
-declare module "core-js/libary/fn/set-interval" {
+declare module "core-js/library/fn/set-interval" {
     var setInterval: typeof core.setInterval;
     export = setInterval;
 }
-declare module "core-js/libary/fn/set-timeout" {
+declare module "core-js/library/fn/set-timeout" {
     var setTimeout: typeof core.setTimeout;
     export = setTimeout;
 }
-declare module "core-js/libary/fn/weak-map" {
+declare module "core-js/library/fn/weak-map" {
     var WeakMap: typeof core.WeakMap;
     export = WeakMap;
 }
-declare module "core-js/libary/fn/weak-set" {
+declare module "core-js/library/fn/weak-set" {
     var WeakSet: typeof core.WeakSet;
     export = WeakSet;
 }
-declare module "core-js/libary/fn/array" {
+declare module "core-js/library/fn/array" {
     var Array: typeof core.Array;
     export = Array;
 }
-declare module "core-js/libary/fn/array/concat" {
+declare module "core-js/library/fn/array/concat" {
     var concat: typeof core.Array.concat;
     export = concat;
 }
-declare module "core-js/libary/fn/array/copy-within" {
+declare module "core-js/library/fn/array/copy-within" {
     var copyWithin: typeof core.Array.copyWithin;
     export = copyWithin;
 }
-declare module "core-js/libary/fn/array/entries" {
+declare module "core-js/library/fn/array/entries" {
     var entries: typeof core.Array.entries;
     export = entries;
 }
-declare module "core-js/libary/fn/array/every" {
+declare module "core-js/library/fn/array/every" {
     var every: typeof core.Array.every;
     export = every;
 }
-declare module "core-js/libary/fn/array/fill" {
+declare module "core-js/library/fn/array/fill" {
     var fill: typeof core.Array.fill;
     export = fill;
 }
-declare module "core-js/libary/fn/array/filter" {
+declare module "core-js/library/fn/array/filter" {
     var filter: typeof core.Array.filter;
     export = filter;
 }
-declare module "core-js/libary/fn/array/find" {
+declare module "core-js/library/fn/array/find" {
     var find: typeof core.Array.find;
     export = find;
 }
-declare module "core-js/libary/fn/array/find-index" {
+declare module "core-js/library/fn/array/find-index" {
     var findIndex: typeof core.Array.findIndex;
     export = findIndex;
 }
-declare module "core-js/libary/fn/array/for-each" {
+declare module "core-js/library/fn/array/for-each" {
     var forEach: typeof core.Array.forEach;
     export = forEach;
 }
-declare module "core-js/libary/fn/array/from" {
+declare module "core-js/library/fn/array/from" {
     var from: typeof core.Array.from;
     export = from;
 }
-declare module "core-js/libary/fn/array/includes" {
+declare module "core-js/library/fn/array/includes" {
     var includes: typeof core.Array.includes;
     export = includes;
 }
-declare module "core-js/libary/fn/array/index-of" {
+declare module "core-js/library/fn/array/index-of" {
     var indexOf: typeof core.Array.indexOf;
     export = indexOf;
 }
-declare module "core-js/libary/fn/array/join" {
+declare module "core-js/library/fn/array/join" {
     var join: typeof core.Array.join;
     export = join;
 }
-declare module "core-js/libary/fn/array/keys" {
+declare module "core-js/library/fn/array/keys" {
     var keys: typeof core.Array.keys;
     export = keys;
 }
-declare module "core-js/libary/fn/array/last-index-of" {
+declare module "core-js/library/fn/array/last-index-of" {
     var lastIndexOf: typeof core.Array.lastIndexOf;
     export = lastIndexOf;
 }
-declare module "core-js/libary/fn/array/map" {
+declare module "core-js/library/fn/array/map" {
     var map: typeof core.Array.map;
     export = map;
 }
-declare module "core-js/libary/fn/array/of" {
+declare module "core-js/library/fn/array/of" {
     var of: typeof core.Array.of;
     export = of;
 }
-declare module "core-js/libary/fn/array/pop" {
+declare module "core-js/library/fn/array/pop" {
     var pop: typeof core.Array.pop;
     export = pop;
 }
-declare module "core-js/libary/fn/array/push" {
+declare module "core-js/library/fn/array/push" {
     var push: typeof core.Array.push;
     export = push;
 }
-declare module "core-js/libary/fn/array/reduce" {
+declare module "core-js/library/fn/array/reduce" {
     var reduce: typeof core.Array.reduce;
     export = reduce;
 }
-declare module "core-js/libary/fn/array/reduce-right" {
+declare module "core-js/library/fn/array/reduce-right" {
     var reduceRight: typeof core.Array.reduceRight;
     export = reduceRight;
 }
-declare module "core-js/libary/fn/array/reverse" {
+declare module "core-js/library/fn/array/reverse" {
     var reverse: typeof core.Array.reverse;
     export = reverse;
 }
-declare module "core-js/libary/fn/array/shift" {
+declare module "core-js/library/fn/array/shift" {
     var shift: typeof core.Array.shift;
     export = shift;
 }
-declare module "core-js/libary/fn/array/slice" {
+declare module "core-js/library/fn/array/slice" {
     var slice: typeof core.Array.slice;
     export = slice;
 }
-declare module "core-js/libary/fn/array/some" {
+declare module "core-js/library/fn/array/some" {
     var some: typeof core.Array.some;
     export = some;
 }
-declare module "core-js/libary/fn/array/sort" {
+declare module "core-js/library/fn/array/sort" {
     var sort: typeof core.Array.sort;
     export = sort;
 }
-declare module "core-js/libary/fn/array/splice" {
+declare module "core-js/library/fn/array/splice" {
     var splice: typeof core.Array.splice;
     export = splice;
 }
-declare module "core-js/libary/fn/array/turn" {
+declare module "core-js/library/fn/array/turn" {
     var turn: typeof core.Array.turn;
     export = turn;
 }
-declare module "core-js/libary/fn/array/unshift" {
+declare module "core-js/library/fn/array/unshift" {
     var unshift: typeof core.Array.unshift;
     export = unshift;
 }
-declare module "core-js/libary/fn/array/values" {
+declare module "core-js/library/fn/array/values" {
     var values: typeof core.Array.values;
     export = values;
 }
-declare module "core-js/libary/fn/date" {
+declare module "core-js/library/fn/date" {
     var Date: typeof core.Date;
     export = Date;
 }
-declare module "core-js/libary/fn/date/add-locale" {
+declare module "core-js/library/fn/date/add-locale" {
     var addLocale: typeof core.addLocale;
     export = addLocale;
 }
-declare module "core-js/libary/fn/date/format" {
+declare module "core-js/library/fn/date/format" {
     var format: typeof core.Date.format;
     export = format;
 }
-declare module "core-js/libary/fn/date/formatUTC" {
+declare module "core-js/library/fn/date/formatUTC" {
     var formatUTC: typeof core.Date.formatUTC;
     export = formatUTC;
 }
-declare module "core-js/libary/fn/function" {
+declare module "core-js/library/fn/function" {
     var Function: typeof core.Function;
     export = Function;
 }
-declare module "core-js/libary/fn/function/has-instance" {
+declare module "core-js/library/fn/function/has-instance" {
     var hasInstance: (value: any) => boolean;
     export = hasInstance;
 }
-declare module "core-js/libary/fn/function/name" {
+declare module "core-js/library/fn/function/name" {
 }
-declare module "core-js/libary/fn/function/part" {
+declare module "core-js/library/fn/function/part" {
     var part: typeof core.Function.part;
     export = part;
 }
-declare module "core-js/libary/fn/math" {
+declare module "core-js/library/fn/math" {
     var Math: typeof core.Math;
     export = Math;
 }
-declare module "core-js/libary/fn/math/acosh" {
+declare module "core-js/library/fn/math/acosh" {
     var acosh: typeof core.Math.acosh;
     export = acosh;
 }
-declare module "core-js/libary/fn/math/asinh" {
+declare module "core-js/library/fn/math/asinh" {
     var asinh: typeof core.Math.asinh;
     export = asinh;
 }
-declare module "core-js/libary/fn/math/atanh" {
+declare module "core-js/library/fn/math/atanh" {
     var atanh: typeof core.Math.atanh;
     export = atanh;
 }
-declare module "core-js/libary/fn/math/cbrt" {
+declare module "core-js/library/fn/math/cbrt" {
     var cbrt: typeof core.Math.cbrt;
     export = cbrt;
 }
-declare module "core-js/libary/fn/math/clz32" {
+declare module "core-js/library/fn/math/clz32" {
     var clz32: typeof core.Math.clz32;
     export = clz32;
 }
-declare module "core-js/libary/fn/math/cosh" {
+declare module "core-js/library/fn/math/cosh" {
     var cosh: typeof core.Math.cosh;
     export = cosh;
 }
-declare module "core-js/libary/fn/math/expm1" {
+declare module "core-js/library/fn/math/expm1" {
     var expm1: typeof core.Math.expm1;
     export = expm1;
 }
-declare module "core-js/libary/fn/math/fround" {
+declare module "core-js/library/fn/math/fround" {
     var fround: typeof core.Math.fround;
     export = fround;
 }
-declare module "core-js/libary/fn/math/hypot" {
+declare module "core-js/library/fn/math/hypot" {
     var hypot: typeof core.Math.hypot;
     export = hypot;
 }
-declare module "core-js/libary/fn/math/imul" {
+declare module "core-js/library/fn/math/imul" {
     var imul: typeof core.Math.imul;
     export = imul;
 }
-declare module "core-js/libary/fn/math/log10" {
+declare module "core-js/library/fn/math/log10" {
     var log10: typeof core.Math.log10;
     export = log10;
 }
-declare module "core-js/libary/fn/math/log1p" {
+declare module "core-js/library/fn/math/log1p" {
     var log1p: typeof core.Math.log1p;
     export = log1p;
 }
-declare module "core-js/libary/fn/math/log2" {
+declare module "core-js/library/fn/math/log2" {
     var log2: typeof core.Math.log2;
     export = log2;
 }
-declare module "core-js/libary/fn/math/sign" {
+declare module "core-js/library/fn/math/sign" {
     var sign: typeof core.Math.sign;
     export = sign;
 }
-declare module "core-js/libary/fn/math/sinh" {
+declare module "core-js/library/fn/math/sinh" {
     var sinh: typeof core.Math.sinh;
     export = sinh;
 }
-declare module "core-js/libary/fn/math/tanh" {
+declare module "core-js/library/fn/math/tanh" {
     var tanh: typeof core.Math.tanh;
     export = tanh;
 }
-declare module "core-js/libary/fn/math/trunc" {
+declare module "core-js/library/fn/math/trunc" {
     var trunc: typeof core.Math.trunc;
     export = trunc;
 }
-declare module "core-js/libary/fn/number" {
+declare module "core-js/library/fn/number" {
     var Number: typeof core.Number;
     export = Number;
 }
-declare module "core-js/libary/fn/number/epsilon" {
+declare module "core-js/library/fn/number/epsilon" {
     var EPSILON: typeof core.Number.EPSILON;
     export = EPSILON;
 }
-declare module "core-js/libary/fn/number/is-finite" {
+declare module "core-js/library/fn/number/is-finite" {
     var isFinite: typeof core.Number.isFinite;
     export = isFinite;
 }
-declare module "core-js/libary/fn/number/is-integer" {
+declare module "core-js/library/fn/number/is-integer" {
     var isInteger: typeof core.Number.isInteger;
     export = isInteger;
 }
-declare module "core-js/libary/fn/number/is-nan" {
+declare module "core-js/library/fn/number/is-nan" {
     var isNaN: typeof core.Number.isNaN;
     export = isNaN;
 }
-declare module "core-js/libary/fn/number/is-safe-integer" {
+declare module "core-js/library/fn/number/is-safe-integer" {
     var isSafeInteger: typeof core.Number.isSafeInteger;
     export = isSafeInteger;
 }
-declare module "core-js/libary/fn/number/max-safe-integer" {
+declare module "core-js/library/fn/number/max-safe-integer" {
     var MAX_SAFE_INTEGER: typeof core.Number.MAX_SAFE_INTEGER;
     export = MAX_SAFE_INTEGER;
 }
-declare module "core-js/libary/fn/number/min-safe-interger" {
+declare module "core-js/library/fn/number/min-safe-interger" {
     var MIN_SAFE_INTEGER: typeof core.Number.MIN_SAFE_INTEGER;
     export = MIN_SAFE_INTEGER;
 }
-declare module "core-js/libary/fn/number/parse-float" {
+declare module "core-js/library/fn/number/parse-float" {
     var parseFloat: typeof core.Number.parseFloat;
     export = parseFloat;
 }
-declare module "core-js/libary/fn/number/parse-int" {
+declare module "core-js/library/fn/number/parse-int" {
     var parseInt: typeof core.Number.parseInt;
     export = parseInt;
 }
-declare module "core-js/libary/fn/number/random" {
+declare module "core-js/library/fn/number/random" {
     var random: typeof core.Number.random;
     export = random;
 }
-declare module "core-js/libary/fn/object" {
+declare module "core-js/library/fn/object" {
     var Object: typeof core.Object;
     export = Object;
 }
-declare module "core-js/libary/fn/object/assign" {
+declare module "core-js/library/fn/object/assign" {
     var assign: typeof core.Object.assign;
     export = assign;
 }
-declare module "core-js/libary/fn/object/classof" {
+declare module "core-js/library/fn/object/classof" {
     var classof: typeof core.Object.classof;
     export = classof;
 }
-declare module "core-js/libary/fn/object/create" {
+declare module "core-js/library/fn/object/create" {
     var create: typeof core.Object.create;
     export = create;
 }
-declare module "core-js/libary/fn/object/define" {
+declare module "core-js/library/fn/object/define" {
     var define: typeof core.Object.define;
     export = define;
 }
-declare module "core-js/libary/fn/object/define-properties" {
+declare module "core-js/library/fn/object/define-properties" {
     var defineProperties: typeof core.Object.defineProperties;
     export = defineProperties;
 }
-declare module "core-js/libary/fn/object/define-property" {
+declare module "core-js/library/fn/object/define-property" {
     var defineProperty: typeof core.Object.defineProperty;
     export = defineProperty;
 }
-declare module "core-js/libary/fn/object/entries" {
+declare module "core-js/library/fn/object/entries" {
     var entries: typeof core.Object.entries;
     export = entries;
 }
-declare module "core-js/libary/fn/object/freeze" {
+declare module "core-js/library/fn/object/freeze" {
     var freeze: typeof core.Object.freeze;
     export = freeze;
 }
-declare module "core-js/libary/fn/object/get-own-property-descriptor" {
+declare module "core-js/library/fn/object/get-own-property-descriptor" {
     var getOwnPropertyDescriptor: typeof core.Object.getOwnPropertyDescriptor;
     export = getOwnPropertyDescriptor;
 }
-declare module "core-js/libary/fn/object/get-own-property-descriptors" {
+declare module "core-js/library/fn/object/get-own-property-descriptors" {
     var getOwnPropertyDescriptors: typeof core.Object.getOwnPropertyDescriptors;
     export = getOwnPropertyDescriptors;
 }
-declare module "core-js/libary/fn/object/get-own-property-names" {
+declare module "core-js/library/fn/object/get-own-property-names" {
     var getOwnPropertyNames: typeof core.Object.getOwnPropertyNames;
     export = getOwnPropertyNames;
 }
-declare module "core-js/libary/fn/object/get-own-property-symbols" {
+declare module "core-js/library/fn/object/get-own-property-symbols" {
     var getOwnPropertySymbols: typeof core.Object.getOwnPropertySymbols;
     export = getOwnPropertySymbols;
 }
-declare module "core-js/libary/fn/object/get-prototype-of" {
+declare module "core-js/library/fn/object/get-prototype-of" {
     var getPrototypeOf: typeof core.Object.getPrototypeOf;
     export = getPrototypeOf;
 }
-declare module "core-js/libary/fn/object/is" {
+declare module "core-js/library/fn/object/is" {
     var is: typeof core.Object.is;
     export = is;
 }
-declare module "core-js/libary/fn/object/is-extensible" {
+declare module "core-js/library/fn/object/is-extensible" {
     var isExtensible: typeof core.Object.isExtensible;
     export = isExtensible;
 }
-declare module "core-js/libary/fn/object/is-frozen" {
+declare module "core-js/library/fn/object/is-frozen" {
     var isFrozen: typeof core.Object.isFrozen;
     export = isFrozen;
 }
-declare module "core-js/libary/fn/object/is-object" {
+declare module "core-js/library/fn/object/is-object" {
     var isObject: typeof core.Object.isObject;
     export = isObject;
 }
-declare module "core-js/libary/fn/object/is-sealed" {
+declare module "core-js/library/fn/object/is-sealed" {
     var isSealed: typeof core.Object.isSealed;
     export = isSealed;
 }
-declare module "core-js/libary/fn/object/keys" {
+declare module "core-js/library/fn/object/keys" {
     var keys: typeof core.Object.keys;
     export = keys;
 }
-declare module "core-js/libary/fn/object/make" {
+declare module "core-js/library/fn/object/make" {
     var make: typeof core.Object.make;
     export = make;
 }
-declare module "core-js/libary/fn/object/prevent-extensions" {
+declare module "core-js/library/fn/object/prevent-extensions" {
     var preventExtensions: typeof core.Object.preventExtensions;
     export = preventExtensions;
 }
-declare module "core-js/libary/fn/object/seal" {
+declare module "core-js/library/fn/object/seal" {
     var seal: typeof core.Object.seal;
     export = seal;
 }
-declare module "core-js/libary/fn/object/set-prototype-of" {
+declare module "core-js/library/fn/object/set-prototype-of" {
     var setPrototypeOf: typeof core.Object.setPrototypeOf;
     export = setPrototypeOf;
 }
-declare module "core-js/libary/fn/object/values" {
+declare module "core-js/library/fn/object/values" {
     var values: typeof core.Object.values;
     export = values;
 }
-declare module "core-js/libary/fn/reflect" {
+declare module "core-js/library/fn/reflect" {
     var Reflect: typeof core.Reflect;
     export = Reflect;
 }
-declare module "core-js/libary/fn/reflect/apply" {
+declare module "core-js/library/fn/reflect/apply" {
     var apply: typeof core.Reflect.apply;
     export = apply;
 }
-declare module "core-js/libary/fn/reflect/construct" {
+declare module "core-js/library/fn/reflect/construct" {
     var construct: typeof core.Reflect.construct;
     export = construct;
 }
-declare module "core-js/libary/fn/reflect/define-property" {
+declare module "core-js/library/fn/reflect/define-property" {
     var defineProperty: typeof core.Reflect.defineProperty;
     export = defineProperty;
 }
-declare module "core-js/libary/fn/reflect/delete-property" {
+declare module "core-js/library/fn/reflect/delete-property" {
     var deleteProperty: typeof core.Reflect.deleteProperty;
     export = deleteProperty;
 }
-declare module "core-js/libary/fn/reflect/enumerate" {
+declare module "core-js/library/fn/reflect/enumerate" {
     var enumerate: typeof core.Reflect.enumerate;
     export = enumerate;
 }
-declare module "core-js/libary/fn/reflect/get" {
+declare module "core-js/library/fn/reflect/get" {
     var get: typeof core.Reflect.get;
     export = get;
 }
-declare module "core-js/libary/fn/reflect/get-own-property-descriptor" {
+declare module "core-js/library/fn/reflect/get-own-property-descriptor" {
     var getOwnPropertyDescriptor: typeof core.Reflect.getOwnPropertyDescriptor;
     export = getOwnPropertyDescriptor;
 }
-declare module "core-js/libary/fn/reflect/get-prototype-of" {
+declare module "core-js/library/fn/reflect/get-prototype-of" {
     var getPrototypeOf: typeof core.Reflect.getPrototypeOf;
     export = getPrototypeOf;
 }
-declare module "core-js/libary/fn/reflect/has" {
+declare module "core-js/library/fn/reflect/has" {
     var has: typeof core.Reflect.has;
     export = has;
 }
-declare module "core-js/libary/fn/reflect/is-extensible" {
+declare module "core-js/library/fn/reflect/is-extensible" {
     var isExtensible: typeof core.Reflect.isExtensible;
     export = isExtensible;
 }
-declare module "core-js/libary/fn/reflect/own-keys" {
+declare module "core-js/library/fn/reflect/own-keys" {
     var ownKeys: typeof core.Reflect.ownKeys;
     export = ownKeys;
 }
-declare module "core-js/libary/fn/reflect/prevent-extensions" {
+declare module "core-js/library/fn/reflect/prevent-extensions" {
     var preventExtensions: typeof core.Reflect.preventExtensions;
     export = preventExtensions;
 }
-declare module "core-js/libary/fn/reflect/set" {
+declare module "core-js/library/fn/reflect/set" {
     var set: typeof core.Reflect.set;
     export = set;
 }
-declare module "core-js/libary/fn/reflect/set-prototype-of" {
+declare module "core-js/library/fn/reflect/set-prototype-of" {
     var setPrototypeOf: typeof core.Reflect.setPrototypeOf;
     export = setPrototypeOf;
 }
-declare module "core-js/libary/fn/regexp" {
+declare module "core-js/library/fn/regexp" {
     var RegExp: typeof core.RegExp;
     export = RegExp;
 }
-declare module "core-js/libary/fn/regexp/escape" {
+declare module "core-js/library/fn/regexp/escape" {
     var escape: typeof core.RegExp.escape;
     export = escape;
 }
-declare module "core-js/libary/fn/string" {
+declare module "core-js/library/fn/string" {
     var String: typeof core.String;
     export = String;
 }
-declare module "core-js/libary/fn/string/at" {
+declare module "core-js/library/fn/string/at" {
     var at: typeof core.String.at;
     export = at;
 }
-declare module "core-js/libary/fn/string/code-point-at" {
+declare module "core-js/library/fn/string/code-point-at" {
     var codePointAt: typeof core.String.codePointAt;
     export = codePointAt;
 }
-declare module "core-js/libary/fn/string/ends-with" {
+declare module "core-js/library/fn/string/ends-with" {
     var endsWith: typeof core.String.endsWith;
     export = endsWith;
 }
-declare module "core-js/libary/fn/string/escape-html" {
+declare module "core-js/library/fn/string/escape-html" {
     var escapeHTML: typeof core.String.escapeHTML;
     export = escapeHTML;
 }
-declare module "core-js/libary/fn/string/from-code-point" {
+declare module "core-js/library/fn/string/from-code-point" {
     var fromCodePoint: typeof core.String.fromCodePoint;
     export = fromCodePoint;
 }
-declare module "core-js/libary/fn/string/includes" {
+declare module "core-js/library/fn/string/includes" {
     var includes: typeof core.String.includes;
     export = includes;
 }
-declare module "core-js/libary/fn/string/lpad" {
+declare module "core-js/library/fn/string/lpad" {
     var lpad: typeof core.String.lpad;
     export = lpad;
 }
-declare module "core-js/libary/fn/string/raw" {
+declare module "core-js/library/fn/string/raw" {
     var raw: typeof core.String.raw;
     export = raw;
 }
-declare module "core-js/libary/fn/string/repeat" {
+declare module "core-js/library/fn/string/repeat" {
     var repeat: typeof core.String.repeat;
     export = repeat;
 }
-declare module "core-js/libary/fn/string/rpad" {
+declare module "core-js/library/fn/string/rpad" {
     var rpad: typeof core.String.rpad;
     export = rpad;
 }
-declare module "core-js/libary/fn/string/starts-with" {
+declare module "core-js/library/fn/string/starts-with" {
     var startsWith: typeof core.String.startsWith;
     export = startsWith;
 }
-declare module "core-js/libary/fn/string/unescape-html" {
+declare module "core-js/library/fn/string/unescape-html" {
     var unescapeHTML: typeof core.String.unescapeHTML;
     export = unescapeHTML;
 }
-declare module "core-js/libary/fn/symbol" {
+declare module "core-js/library/fn/symbol" {
     var Symbol: typeof core.Symbol;
     export = Symbol;
 }
-declare module "core-js/libary/fn/symbol/for" {
+declare module "core-js/library/fn/symbol/for" {
     var _for: typeof core.Symbol.for;
     export = _for;
 }
-declare module "core-js/libary/fn/symbol/has-instance" {
+declare module "core-js/library/fn/symbol/has-instance" {
     var hasInstance: typeof core.Symbol.hasInstance;
     export = hasInstance;
 }
-declare module "core-js/libary/fn/symbol/is-concat-spreadable" {
+declare module "core-js/library/fn/symbol/is-concat-spreadable" {
     var isConcatSpreadable: typeof core.Symbol.isConcatSpreadable;
     export = isConcatSpreadable;
 }
-declare module "core-js/libary/fn/symbol/iterator" {
+declare module "core-js/library/fn/symbol/iterator" {
     var iterator: typeof core.Symbol.iterator;
     export = iterator;
 }
-declare module "core-js/libary/fn/symbol/key-for" {
+declare module "core-js/library/fn/symbol/key-for" {
     var keyFor: typeof core.Symbol.keyFor;
     export = keyFor;
 }
-declare module "core-js/libary/fn/symbol/match" {
+declare module "core-js/library/fn/symbol/match" {
     var match: typeof core.Symbol.match;
     export = match;
 }
-declare module "core-js/libary/fn/symbol/replace" {
+declare module "core-js/library/fn/symbol/replace" {
     var replace: typeof core.Symbol.replace;
     export = replace;
 }
-declare module "core-js/libary/fn/symbol/search" {
+declare module "core-js/library/fn/symbol/search" {
     var search: typeof core.Symbol.search;
     export = search;
 }
-declare module "core-js/libary/fn/symbol/species" {
+declare module "core-js/library/fn/symbol/species" {
     var species: typeof core.Symbol.species;
     export = species;
 }
-declare module "core-js/libary/fn/symbol/split" {
+declare module "core-js/library/fn/symbol/split" {
     var split: typeof core.Symbol.split;
     export = split;
 }
-declare module "core-js/libary/fn/symbol/to-primitive" {
+declare module "core-js/library/fn/symbol/to-primitive" {
     var toPrimitive: typeof core.Symbol.toPrimitive;
     export = toPrimitive;
 }
-declare module "core-js/libary/fn/symbol/to-string-tag" {
+declare module "core-js/library/fn/symbol/to-string-tag" {
     var toStringTag: typeof core.Symbol.toStringTag;
     export = toStringTag;
 }
-declare module "core-js/libary/fn/symbol/unscopables" {
+declare module "core-js/library/fn/symbol/unscopables" {
     var unscopables: typeof core.Symbol.unscopables;
     export = unscopables;
 }
-declare module "core-js/libary/es5" {
+declare module "core-js/library/es5" {
     export = core;
 }
-declare module "core-js/libary/es6" {
+declare module "core-js/library/es6" {
     export = core;
 }
-declare module "core-js/libary/es6/array" {
+declare module "core-js/library/es6/array" {
     var Array: typeof core.Array;
     export = Array;
 }
-declare module "core-js/libary/es6/function" {
+declare module "core-js/library/es6/function" {
     var Function: typeof core.Function;
     export = Function;
 }
-declare module "core-js/libary/es6/map" {
+declare module "core-js/library/es6/map" {
     var Map: typeof core.Map;
     export = Map;
 }
-declare module "core-js/libary/es6/math" {
+declare module "core-js/library/es6/math" {
     var Math: typeof core.Math;
     export = Math;
 }
-declare module "core-js/libary/es6/number" {
+declare module "core-js/library/es6/number" {
     var Number: typeof core.Number;
     export = Number;
 }
-declare module "core-js/libary/es6/object" {
+declare module "core-js/library/es6/object" {
     var Object: typeof core.Object;
     export = Object;
 }
-declare module "core-js/libary/es6/promise" {
+declare module "core-js/library/es6/promise" {
     var Promise: typeof core.Promise;
     export = Promise;
 }
-declare module "core-js/libary/es6/reflect" {
+declare module "core-js/library/es6/reflect" {
     var Reflect: typeof core.Reflect;
     export = Reflect;
 }
-declare module "core-js/libary/es6/regexp" {
+declare module "core-js/library/es6/regexp" {
     var RegExp: typeof core.RegExp;
     export = RegExp;
 }
-declare module "core-js/libary/es6/set" {
+declare module "core-js/library/es6/set" {
     var Set: typeof core.Set;
     export = Set;
 }
-declare module "core-js/libary/es6/string" {
+declare module "core-js/library/es6/string" {
     var String: typeof core.String;
     export = String;
 }
-declare module "core-js/libary/es6/symbol" {
+declare module "core-js/library/es6/symbol" {
     var Symbol: typeof core.Symbol;
     export = Symbol;
 }
-declare module "core-js/libary/es6/weak-map" {
+declare module "core-js/library/es6/weak-map" {
     var WeakMap: typeof core.WeakMap;
     export = WeakMap;
 }
-declare module "core-js/libary/es6/weak-set" {
+declare module "core-js/library/es6/weak-set" {
     var WeakSet: typeof core.WeakSet;
     export = WeakSet;
 }
-declare module "core-js/libary/es7" {
+declare module "core-js/library/es7" {
     export = core;
 }
-declare module "core-js/libary/es7/array" {
+declare module "core-js/library/es7/array" {
     var Array: typeof core.Array;
     export = Array;
 }
-declare module "core-js/libary/es7/map" {
+declare module "core-js/library/es7/map" {
     var Map: typeof core.Map;
     export = Map;
 }
-declare module "core-js/libary/es7/object" {
+declare module "core-js/library/es7/object" {
     var Object: typeof core.Object;
     export = Object;
 }
-declare module "core-js/libary/es7/regexp" {
+declare module "core-js/library/es7/regexp" {
     var RegExp: typeof core.RegExp;
     export = RegExp;
 }
-declare module "core-js/libary/es7/set" {
+declare module "core-js/library/es7/set" {
     var Set: typeof core.Set;
     export = Set;
 }
-declare module "core-js/libary/es7/string" {
+declare module "core-js/library/es7/string" {
     var String: typeof core.String;
     export = String;
 }
-declare module "core-js/libary/js" {
+declare module "core-js/library/js" {
     export = core;
 }
-declare module "core-js/libary/js/array" {
+declare module "core-js/library/js/array" {
     var Array: typeof core.Array;
     export = Array;
 }
-declare module "core-js/libary/web" {
+declare module "core-js/library/web" {
     export = core;
 }
-declare module "core-js/libary/web/dom" {
+declare module "core-js/library/web/dom" {
     export = core;
 }
-declare module "core-js/libary/web/immediate" {
+declare module "core-js/library/web/immediate" {
     export = core;
 }
-declare module "core-js/libary/web/timers" {
+declare module "core-js/library/web/timers" {
     export = core;
 }
diff --git a/css/css-tests.ts b/css/css-tests.ts
new file mode 100644
index 000000000..d223679e2
--- /dev/null
+++ b/css/css-tests.ts
@@ -0,0 +1,62 @@
+/// <reference path="./css.d.ts" />
+
+import css = require("css");
+
+// Check that user can parse, modify and persist CSS content
+
+var parserOptions: css.ParserOptions;
+parserOptions = {
+	silent: true,
+	source: "test.css"
+};
+
+var stylesheet = css.parse("body { font-size: 12px; }", parserOptions);
+
+var comment: css.Comment;
+comment = {
+	type: "comment",
+	comment: "Hello World"
+};
+
+stylesheet.stylesheet.rules.push(comment);
+
+var stringifyOptions: css.StringifyOptions;
+stringifyOptions = {
+	indent: "    "
+};
+
+var content = css.stringify(stylesheet, stringifyOptions);
+
+// Create new stylesheet and save it
+
+var bgDeclaration: css.Declaration = {
+	type: "declaration",
+	property: "background",
+	value: "#eee"
+};
+
+var colorDeclaration: css.Declaration = {
+	type: "declaration",
+	property: "color",
+	value: "#888"
+};
+
+var ruleComment: css.Comment = {
+	type: "comment",
+	comment: "New CSS AST Tree Rule"
+};
+
+var bodyRule: css.Rule = {
+	type: "rule",
+	selectors: ["body"],
+	declarations: [ruleComment, bgDeclaration, colorDeclaration]
+};
+
+var newStylesheet: css.Stylesheet = {
+	type: "stylesheet",
+	stylesheet: {
+		rules: [bodyRule]
+	}
+};
+
+content = css.stringify(newStylesheet);
\ No newline at end of file
diff --git a/css/css.d.ts b/css/css.d.ts
new file mode 100644
index 000000000..acea1acf0
--- /dev/null
+++ b/css/css.d.ts
@@ -0,0 +1,258 @@
+// Type definitions for css
+// Project: https://github.com/reworkcss/css
+// Definitions by: Ilya Verbitskiy <https://github.com/ilich>
+// Definitions: https://github.com/ilich/DefinitelyTyped
+
+/**
+ * CSS parser / stringifier for Node.js
+ */
+declare module "css" {
+
+	/**
+	 * css.parse options
+	 */
+	interface ParserOptions {
+		/** Silently fail on parse errors */
+		silent?: boolean;
+		/** The path to the file containing css. Makes errors and source maps more helpful, by letting them know where code comes from. */
+		source?: string;
+	}
+
+	/**
+	 * css.stringify options
+	 */
+	interface StringifyOptions {
+		/** The string used to indent the output. Defaults to two spaces. */
+		indent?: string;
+		/** Omit comments and extraneous whitespace. */
+		compress?: boolean;
+		/** Return a sourcemap along with the CSS output. 
+		 * Using the source option of css.parse is strongly recommended 
+		 * when creating a source map. Specify sourcemap: 'generator' 
+		 * to return the SourceMapGenerator object instead of serializing the source map. 
+		 */
+		sourcemap?: string;
+		/** (enabled by default, specify false to disable)
+		 *  Reads any source maps referenced by the input files 
+		 * when generating the output source map. When enabled, 
+		 * file system access may be required for reading the referenced source maps. 
+		 */
+		inputSourcemaps?: boolean;
+	}
+
+	/**
+	 * Error thrown during parsing.
+	 */
+	interface ParserError {
+		/** The full error message with the source position. */
+		message?: string;
+		/** The error message without position. */
+		reason?: string;
+		/** The value of options.source if passed to css.parse. Otherwise undefined. */
+		filename?: string;
+		line?: number;
+		column?: number;
+		/** The portion of code that couldn't be parsed. */
+		source?: string;
+	}
+
+	// ---------------------------------------------------------------------------------
+	// AST Tree
+	// ---------------------------------------------------------------------------------
+
+	/**
+	 * Information about a position in the code.
+	 * The line and column numbers are 1-based: The first line is 1 and the first column of a line is 1 (not 0).
+	 */
+	interface Position {
+		line?: number;
+		column?: number;
+	}
+
+	/**
+	 * Base AST Tree Node.
+	 */
+	interface Node {
+		/** The possible values are the ones listed in the Types section on https://github.com/reworkcss/css page. */
+		type?: string;
+		/** A reference to the parent node, or null if the node has no parent. */
+		parent?: Node;
+		/** Information about the position in the source string that corresponds to the node. */
+		position?: {
+			start?: Position;
+			end?: Position;
+			/** The value of options.source if passed to css.parse. Otherwise undefined. */
+			source?: string;
+			/** The full source string passed to css.parse. */
+			content?: string;
+		};
+	}
+
+	interface Rule extends Node {
+		/** The list of selectors of the rule, split on commas. Each selector is trimmed from whitespace and comments. */
+		selectors?: Array<string>;
+		/** Array of nodes with the types declaration and comment. */
+		declarations?: Array<Declaration|Comment>;
+	}
+
+	interface Declaration extends Node {
+		/** The property name, trimmed from whitespace and comments. May not be empty. */
+		property?: string;
+		/** The value of the property, trimmed from whitespace and comments. Empty values are allowed. */
+		value?: string;
+	}
+
+	/** 
+	 * A rule-level or declaration-level comment. Comments inside selectors, properties and values etc. are lost.
+	 */
+	interface Comment extends Node {
+		comment?: string;
+	}
+
+	/** 
+	 * The @charset at-rule. 
+	 */
+	interface Charset {
+		/** The part following @charset. */
+		charset?: string;
+	}
+
+	/**
+	 * The @custom-media at-rule 
+	 */
+	interface CustomMedia {
+		/** The ---prefixed name. */
+		name?: string;
+		/** The part following the name. */
+		media?: string;
+	}
+
+	/**
+	 * The @document at-rule.
+	 */
+	interface Document {
+		/** The part following @document. */
+		document?: string;
+		/** The vendor prefix in @document, or undefined if there is none. */
+		vendor?: string;
+		/** Array of nodes with the types rule, comment and any of the at-rule types. */
+		rules?: Array<Rule|Comment|AtRule>;
+	}
+
+	/**
+	 * The @font-face at-rule.
+	 */
+	interface FontFace {
+		/** Array of nodes with the types declaration and comment. */
+		declarations?: Array<Declaration|Comment>;
+	}
+
+	/**
+	 * The @host at-rule.
+	 */
+	interface Host {
+		/** Array of nodes with the types rule, comment and any of the at-rule types. */
+		rules?: Array<Rule|Comment|AtRule>;
+	}
+
+	/**
+	 * The @import at-rule.
+	 */
+	interface Import {
+		/** The part following @import. */
+		import?: string;
+	}
+
+	/**
+	 * The @keyframes at-rule.
+	 */
+	interface KeyFrames {
+		/** The name of the keyframes rule. */
+		name?: string;
+		/** The vendor prefix in @keyframes, or undefined if there is none. */
+		vendor?: string;
+		/** Array of nodes with the types keyframe and comment. */
+		keyframes?: Array<KeyFrame|Comment>;
+	}
+
+	interface KeyFrame {
+		/** The list of "selectors" of the keyframe rule, split on commas. Each “selector” is trimmed from whitespace. */
+		values?: Array<string>;
+		/** Array of nodes with the types declaration and comment. */
+		declarations?: Array<Declaration|Comment>;
+	}
+
+	/**
+	 * The @media at-rule.
+	 */
+	interface Media {
+		/** The part following @media. */
+		media?: string;
+		/** Array of nodes with the types rule, comment and any of the at-rule types. */
+		rules?: Array<Rule|Comment|AtRule>;
+	}
+
+	/**
+	 * The @namespace at-rule.
+	 */
+	interface Namespace {
+		/** The part following @namespace. */
+		namespace?: string;
+	}
+
+	/**
+	 * The @page at-rule.
+	 */
+	interface Page {
+		/** The list of selectors of the rule, split on commas. Each selector is trimmed from whitespace and comments. */
+		selectors?: Array<string>;
+		/** Array of nodes with the types declaration and comment. */
+		declarations?: Array<Declaration|Comment>;
+	}
+
+	/**
+	 * The @supports at-rule.
+	 */
+	interface Supports {
+		/** The part following @supports. */
+		supports?: string;
+		/** Array of nodes with the types rule, comment and any of the at-rule types. */
+		rules?: Array<Rule|Comment|AtRule>;
+	}
+
+	/** All at-rules. */
+	type AtRule = Charset|CustomMedia|Document|FontFace|Host|Import|KeyFrames|Media|Namespace|Page|Supports;
+
+	/** 
+	 * The root node returned by css.parse. 
+	 */
+	interface Stylesheet extends Node {
+		stylesheet?: {
+			/** Array of nodes with the types rule, comment and any of the at-rule types. */
+			rules?: Array<Rule|Comment|AtRule>;
+			/** Array of Errors. Errors collected during parsing when option silent is true. */
+			parsingErrors?: Array<ParserError>
+		};
+	}
+
+	// ---------------------------------------------------------------------------------
+
+	/**
+	 * Accepts a CSS string and returns an AST object.
+	 * 
+	 * @param {string} code - CSS code.
+	 * @param {ParserOptions} options - CSS parser options.
+	 * @return {Stylesheet} AST object built using provides CSS code.
+	 */
+	function parse(code: string, options?: ParserOptions): Stylesheet;
+
+	/**
+	 * Accepts an AST object (as css.parse produces) and returns a CSS string.
+	 * 
+	 * @param {Stylesheet} stylesheet - AST tree.
+	 * @param {StringifyOptions} options - AST tree to string serializaiton options.
+	 * @return {string} CSS code.
+	 */
+	function stringify(stylesheet: Stylesheet, options?: StringifyOptions): string;
+
+}
\ No newline at end of file
diff --git a/d3/d3.d.ts b/d3/d3.d.ts
index 87e6ef0e0..396d0307e 100644
--- a/d3/d3.d.ts
+++ b/d3/d3.d.ts
@@ -2697,24 +2697,24 @@ declare module d3 {
         response(): (request: XMLHttpRequest) => any;
         response(value: (request: XMLHttpRequest) => any): DsvXhr<T>;
 
-        get(callback?: (err: any, data: T) => void): DsvXhr<T>;
-        post(data?: any, callback?: (err: any, data: T) => void): DsvXhr<T>;
-        post(callback: (err: any, data: T) => void): DsvXhr<T>;
+        get(callback?: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
+        post(data?: any, callback?: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
+        post(callback: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
 
-        send(method: string, data?: any, callback?: (err: any, data: T) => void): DsvXhr<T>;
-        send(method: string, callback: (err: any, data: T) => void): DsvXhr<T>;
+        send(method: string, data?: any, callback?: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
+        send(method: string, callback: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
 
         abort(): DsvXhr<T>;
 
         on(type: "beforesend"): (request: XMLHttpRequest) => void;
         on(type: "progress"): (request: XMLHttpRequest) => void;
-        on(type: "load"): (response: T) => void;
+        on(type: "load"): (response: T[]) => void;
         on(type: "error"): (err: any) => void;
         on(type: string): (...args: any[]) => void;
 
         on(type: "beforesend", listener: (request: XMLHttpRequest) => void): DsvXhr<T>;
         on(type: "progress", listener: (request: XMLHttpRequest) => void): DsvXhr<T>;
-        on(type: "load", listener: (response: T) => void): DsvXhr<T>;
+        on(type: "load", listener: (response: T[]) => void): DsvXhr<T>;
         on(type: "error", listener: (err: any) => void): DsvXhr<T>;
         on(type: string, listener: (...args: any[]) => void): DsvXhr<T>;
     }
diff --git a/dexie/dexie.d.ts b/dexie/dexie.d.ts
index d6c26283c..13b9b31e0 100644
--- a/dexie/dexie.d.ts
+++ b/dexie/dexie.d.ts
@@ -38,7 +38,7 @@ declare class Dexie {
 
     static deepClone(obj: Object): Object;
 
-    version(versionNumber: number): Dexie.Version
+    version(versionNumber: number): Dexie.Version;
 
     on: {
         (eventName: string, subscriber: () => any): void;
@@ -48,7 +48,7 @@ declare class Dexie {
         populate: Dexie.DexieEvent;
         blocked: Dexie.DexieEvent;
         versionchange: Dexie.DexieVersionChangeEvent;
-    }
+    };
 
     open(): Dexie.Promise<void>;
 
diff --git a/dojo/dijit.d.ts b/dojo/dijit.d.ts
index 0bb2ab67d..94f64d0db 100644
--- a/dojo/dijit.d.ts
+++ b/dojo/dijit.d.ts
@@ -490,7 +490,7 @@ declare module dijit {
          * @param widget             
          * @param insertIndex               Optional            
          */
-        addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+        addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
         /**
          * 
          */
@@ -821,7 +821,7 @@ declare module dijit {
          * @param alwaysUseString Don't cache the DOM tree for this template, even if it doesn't have any variables             
          * @param doc               OptionalThe target document.   Defaults to document global if unspecified.             
          */
-        getCachedTemplate(templateString: String, alwaysUseString: boolean, doc: HTMLDocument): any;
+        getCachedTemplate(templateString: String, alwaysUseString: boolean, doc?: HTMLDocument): any;
     }
     module _TemplatedMixin {
         /**
@@ -1260,21 +1260,21 @@ declare module dijit {
          * @param widget             
          * @param insertIndex               Optional            
          */
-        addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+        addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * Construct the UI for this widget, setting this.domNode.
          * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -1433,7 +1433,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -1491,7 +1491,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Default focus() implementation: focus the first child.
          * 
@@ -1617,7 +1617,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -1628,7 +1628,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -1639,7 +1639,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -1650,7 +1650,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -1661,7 +1661,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -1672,7 +1672,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -2345,7 +2345,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -2490,7 +2490,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -2911,14 +2911,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * Construct the UI for this widget, setting this.domNode.
          * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -3061,7 +3061,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -3119,7 +3119,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Get a property from a widget.
          * Get a named property from a widget. The property may
@@ -3201,7 +3201,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -3212,7 +3212,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -3223,7 +3223,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -3234,7 +3234,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -3245,7 +3245,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -3256,7 +3256,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -3877,7 +3877,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -3935,7 +3935,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Get a property from a widget.
          * Get a named property from a widget. The property may
@@ -3984,7 +3984,7 @@ declare module dijit {
          * @param dateObject             
          * @param locale               Optional            
          */
-        isDisabledDate(dateObject: Date, locale: String): boolean;
+        isDisabledDate(dateObject: Date, locale?: String): boolean;
         /**
          * Return true if this widget can currently be focused
          * and false if not
@@ -4032,7 +4032,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -4043,7 +4043,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -4054,7 +4054,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -4065,7 +4065,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -4076,7 +4076,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -4087,7 +4087,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * Processing after the DOM fragment is created
          * Called after the DOM fragment has been created, but not necessarily
@@ -4132,7 +4132,7 @@ declare module dijit {
          * @param dateObject A Date object             
          * @param options               OptionalAn object with the following properties:selector (String): "date" or "time" for partial formatting of the Date object.Both date and time will be formatted by default.zulu (Boolean): if true, UTC/GMT is used for a timezonemilliseconds (Boolean): if true, output milliseconds            
          */
-        serialize(dateObject: Date, options: Object): any;
+        serialize(dateObject: Date, options?: Object): any;
         /**
          * Set a property on a widget
          * Sets named properties on a widget which may potentially be handled by a
@@ -4787,7 +4787,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -4845,7 +4845,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Focus the calendar by focusing one of the calendar cells
          * 
@@ -4888,7 +4888,7 @@ declare module dijit {
          * @param dateObject             
          * @param locale               Optional            
          */
-        getClassForDate(dateObject: Date, locale: String): String;
+        getClassForDate(dateObject: Date, locale?: String): String;
         /**
          * Returns the parent widget of this widget.
          * 
@@ -4905,7 +4905,7 @@ declare module dijit {
          * @param dateObject             
          * @param locale               Optional            
          */
-        isDisabledDate(dateObject: Date, locale: String): boolean;
+        isDisabledDate(dateObject: Date, locale?: String): boolean;
         /**
          * Return true if this widget can currently be focused
          * and false if not
@@ -4953,7 +4953,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -4964,7 +4964,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -4975,7 +4975,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -4986,7 +4986,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -4997,7 +4997,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -5008,7 +5008,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -5453,7 +5453,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -5511,7 +5511,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -5594,7 +5594,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -5605,7 +5605,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -5616,7 +5616,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -5627,7 +5627,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -5638,7 +5638,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -5649,7 +5649,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * Processing after the DOM fragment is created
              * Called after the DOM fragment has been created, but not necessarily
@@ -5978,14 +5978,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -6126,7 +6126,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -6184,7 +6184,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Get a property from a widget.
          * Get a named property from a widget. The property may
@@ -6266,7 +6266,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -6277,7 +6277,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -6288,7 +6288,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -6299,7 +6299,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -6310,7 +6310,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -6321,7 +6321,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -6896,14 +6896,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -7044,7 +7044,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -7102,7 +7102,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Focus the calendar by focusing one of the calendar cells
          * 
@@ -7178,7 +7178,7 @@ declare module dijit {
          * @param dateObject             
          * @param locale               Optional            
          */
-        isDisabledDate(dateObject: Date, locale: String): boolean;
+        isDisabledDate(dateObject: Date, locale?: String): boolean;
         /**
          * Return true if this widget can currently be focused
          * and false if not
@@ -7226,7 +7226,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -7237,7 +7237,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -7248,7 +7248,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -7259,7 +7259,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -7270,7 +7270,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -7281,7 +7281,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -7767,14 +7767,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -7917,7 +7917,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -7975,7 +7975,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -8057,7 +8057,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -8068,7 +8068,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -8079,7 +8079,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -8090,7 +8090,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -8101,7 +8101,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -8112,7 +8112,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -8770,21 +8770,21 @@ declare module dijit {
              * @param widget             
              * @param insertIndex               Optional            
              */
-            addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+            addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -8940,7 +8940,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -8998,7 +8998,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Put focus on this widget
              * 
@@ -9122,7 +9122,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -9133,7 +9133,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -9144,7 +9144,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -9155,7 +9155,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -9166,7 +9166,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -9177,7 +9177,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -9779,14 +9779,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -9927,7 +9927,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -9985,7 +9985,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Focus on this MenuItem
          * 
@@ -10091,7 +10091,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -10102,7 +10102,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -10113,7 +10113,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -10124,7 +10124,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -10135,7 +10135,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -10146,7 +10146,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -10638,14 +10638,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * Construct the UI for this widget, setting this.domNode.
          * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -10788,7 +10788,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * 
          */
@@ -10836,7 +10836,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Get a property from a widget.
          * Get a named property from a widget. The property may
@@ -10923,7 +10923,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -10934,7 +10934,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -10945,7 +10945,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -10956,7 +10956,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -10967,7 +10967,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -10978,7 +10978,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -11780,21 +11780,21 @@ declare module dijit {
          * @param widget             
          * @param insertIndex               Optional            
          */
-        addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+        addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -11954,7 +11954,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * 
          */
@@ -11976,7 +11976,7 @@ declare module dijit {
          * 
          * @param preserveDom               OptionalIf true, this method will leave the original DOM structure aloneduring tear-down. Note: this will not work with _Templatedwidgets yet.             
          */
-        destroyRendering(preserveDom: boolean): void;
+        destroyRendering(preserveDom?: boolean): void;
         /**
          * Deprecated, will be removed in 2.0, use handle.remove() instead.
          * 
@@ -12003,7 +12003,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Callback when the user hits the submit button.
          * Override this method to handle Dialog execution.
@@ -12140,7 +12140,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, DocumentFragment, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -12151,7 +12151,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, DocumentFragment, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -12173,7 +12173,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, DocumentFragment, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -12184,7 +12184,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, DocumentFragment, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -12195,7 +12195,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, DocumentFragment, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference:  dijit._WidgetBase, position: number): any;
+        placeAt(reference:  dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -13052,21 +13052,21 @@ declare module dijit {
          * @param widget             
          * @param insertIndex               Optional            
          */
-        addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+        addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -13226,7 +13226,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * 
          */
@@ -13275,7 +13275,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Callback when the user hits the submit button.
          * Override this method to handle Dialog execution.
@@ -13412,7 +13412,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -13423,7 +13423,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -13434,7 +13434,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -13445,7 +13445,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -13456,7 +13456,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -13467,7 +13467,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -14447,14 +14447,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -14595,7 +14595,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -14653,7 +14653,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Focus this widget.  Puts focus on the most recently focused cell.
          * 
@@ -14740,7 +14740,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -14751,7 +14751,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -14762,7 +14762,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -14773,7 +14773,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -14784,7 +14784,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -14795,7 +14795,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -15584,21 +15584,21 @@ declare module dijit {
          * @param widget             
          * @param insertIndex               Optional            
          */
-        addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+        addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -15750,7 +15750,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * 
          */
@@ -15794,7 +15794,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Get a property from a widget.
          * Get a named property from a widget. The property may
@@ -15900,7 +15900,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -15911,7 +15911,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -15922,7 +15922,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -15933,7 +15933,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -15944,7 +15944,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -15955,7 +15955,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -16640,21 +16640,21 @@ declare module dijit {
          * @param widget             
          * @param insertIndex               Optional            
          */
-        addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+        addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * Construct the UI for this widget, setting this.domNode.
          * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -16813,7 +16813,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -16871,7 +16871,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Default focus() implementation: focus the first child.
          * 
@@ -16997,7 +16997,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -17008,7 +17008,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -17019,7 +17019,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -17030,7 +17030,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -17041,7 +17041,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -17052,7 +17052,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -17756,7 +17756,7 @@ declare module dijit {
          * @param plugin String, args object, plugin instance, or plugin constructor             
          * @param index               OptionalUsed when creating an instance fromsomething already in this.plugins. Ensures that the newinstance is assigned to this.plugins at that index.             
          */
-        addPlugin(plugin: String, index: number): void;
+        addPlugin(plugin: String, index?: number): void;
         /**
          * takes a plugin name as a string or a plugin instance and
          * adds it to the toolbar and associates it with this editor
@@ -17768,7 +17768,7 @@ declare module dijit {
          * @param plugin String, args object, plugin instance, or plugin constructor             
          * @param index               OptionalUsed when creating an instance fromsomething already in this.plugins. Ensures that the newinstance is assigned to this.plugins at that index.             
          */
-        addPlugin(plugin: Object, index: number): void;
+        addPlugin(plugin: Object, index?: number): void;
         /**
          * takes a plugin name as a string or a plugin instance and
          * adds it to the toolbar and associates it with this editor
@@ -17780,7 +17780,7 @@ declare module dijit {
          * @param plugin String, args object, plugin instance, or plugin constructor             
          * @param index               OptionalUsed when creating an instance fromsomething already in this.plugins. Ensures that the newinstance is assigned to this.plugins at that index.             
          */
-        addPlugin(plugin: Function, index: number): void;
+        addPlugin(plugin: Function, index?: number): void;
         /**
          * add an external stylesheet for the editing area
          * 
@@ -17793,14 +17793,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * Remove focus from this instance.
          * 
@@ -17948,7 +17948,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * 
          */
@@ -17996,7 +17996,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Main handler for executing any commands to the editor, like paste, bold, etc.
          * Called by plugins, but not meant to be called by end users.
@@ -18117,7 +18117,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -18128,7 +18128,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -18139,7 +18139,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -18150,7 +18150,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -18161,7 +18161,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -18172,7 +18172,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -18733,14 +18733,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * Construct the UI for this widget, setting this.domNode.
          * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -18883,7 +18883,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * 
          */
@@ -18942,7 +18942,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Get a property from a widget.
          * Get a named property from a widget. The property may
@@ -19029,7 +19029,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -19040,7 +19040,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -19051,7 +19051,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -19062,7 +19062,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -19073,7 +19073,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -19084,7 +19084,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -19577,14 +19577,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -19729,7 +19729,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              */
@@ -19777,7 +19777,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * User overridable function returning a Boolean to indicate
              * if the Save button should be enabled or not - usually due to invalid conditions
@@ -19875,7 +19875,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -19886,7 +19886,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -19897,7 +19897,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -19908,7 +19908,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -19919,7 +19919,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -19930,7 +19930,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -20511,7 +20511,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -20569,7 +20569,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Get a property from a widget.
          * Get a named property from a widget. The property may
@@ -20670,7 +20670,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -20681,7 +20681,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -20692,7 +20692,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -20703,7 +20703,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -20714,7 +20714,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -20725,7 +20725,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * Processing after the DOM fragment is created
          * Called after the DOM fragment has been created, but not necessarily
@@ -21199,21 +21199,21 @@ declare module dijit {
          * @param widget             
          * @param insertIndex               Optional            
          */
-        addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+        addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * Construct the UI for this widget, setting this.domNode.
          * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -21372,7 +21372,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -21430,7 +21430,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Default focus() implementation: focus the first child.
          * 
@@ -21554,7 +21554,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -21565,7 +21565,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -21576,7 +21576,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -21587,7 +21587,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -21598,7 +21598,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -21609,7 +21609,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -22291,21 +22291,21 @@ declare module dijit {
          * @param widget             
          * @param insertIndex               Optional            
          */
-        addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+        addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * Attach menu to given node
          * 
@@ -22476,7 +22476,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * 
          */
@@ -22524,7 +22524,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Default focus() implementation: focus the first child.
          * 
@@ -22657,7 +22657,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -22668,7 +22668,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -22679,7 +22679,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -22690,7 +22690,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -22701,7 +22701,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -22712,7 +22712,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -23310,14 +23310,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -23458,7 +23458,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -23516,7 +23516,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Focus on this MenuItem
          * 
@@ -23622,7 +23622,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -23633,7 +23633,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -23644,7 +23644,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -23655,7 +23655,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -23666,7 +23666,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -23677,7 +23677,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -24227,14 +24227,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -24375,7 +24375,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -24433,7 +24433,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Focus on this MenuItem
          * 
@@ -24539,7 +24539,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -24550,7 +24550,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -24561,7 +24561,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -24572,7 +24572,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -24583,7 +24583,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -24594,7 +24594,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -25159,14 +25159,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -25307,7 +25307,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -25363,7 +25363,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Focus on this MenuItem
          * 
@@ -25469,7 +25469,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -25480,7 +25480,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -25491,7 +25491,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -25502,7 +25502,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -25513,7 +25513,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -25524,7 +25524,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -26066,14 +26066,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -26214,7 +26214,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -26270,7 +26270,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Focus on this MenuItem
          * 
@@ -26376,7 +26376,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -26387,7 +26387,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -26398,7 +26398,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -26409,7 +26409,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -26420,7 +26420,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -26431,7 +26431,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -26956,14 +26956,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -27104,7 +27104,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -27162,7 +27162,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Get a property from a widget.
          * Get a named property from a widget. The property may
@@ -27244,7 +27244,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -27255,7 +27255,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -27266,7 +27266,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -27277,7 +27277,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -27288,7 +27288,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -27299,7 +27299,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -27876,14 +27876,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -28024,7 +28024,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -28082,7 +28082,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Focus on this MenuItem
          * 
@@ -28188,7 +28188,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -28199,7 +28199,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -28210,7 +28210,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -28221,7 +28221,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -28232,7 +28232,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -28243,7 +28243,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -28745,21 +28745,21 @@ declare module dijit {
          * @param widget             
          * @param insertIndex               Optional            
          */
-        addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+        addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * Construct the UI for this widget, setting this.domNode.
          * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -28916,7 +28916,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -28974,7 +28974,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Default focus() implementation: focus the first child.
          * 
@@ -29100,7 +29100,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -29111,7 +29111,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -29122,7 +29122,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -29133,7 +29133,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -29144,7 +29144,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -29155,7 +29155,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -29696,14 +29696,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -29844,7 +29844,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * 
          */
@@ -29892,7 +29892,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Get a property from a widget.
          * Get a named property from a widget. The property may
@@ -29986,7 +29986,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -29997,7 +29997,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -30008,7 +30008,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -30019,7 +30019,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -30030,7 +30030,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -30041,7 +30041,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -30515,14 +30515,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -30665,7 +30665,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -30723,7 +30723,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -30823,7 +30823,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -30834,7 +30834,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -30845,7 +30845,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -30856,7 +30856,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -30867,7 +30867,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -30878,7 +30878,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -31359,14 +31359,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -31507,7 +31507,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * Destroy this widget, but not its descendants.  Descendants means widgets inside of
          * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -31565,7 +31565,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Get a property from a widget.
          * Get a named property from a widget. The property may
@@ -31646,7 +31646,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -31657,7 +31657,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -31668,7 +31668,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -31679,7 +31679,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -31690,7 +31690,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -31701,7 +31701,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -32377,21 +32377,21 @@ declare module dijit {
          * @param widget             
          * @param insertIndex               Optional            
          */
-        addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+        addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -32543,7 +32543,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * 
          */
@@ -32587,7 +32587,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Get a property from a widget.
          * Get a named property from a widget. The property may
@@ -32693,7 +32693,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -32704,7 +32704,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -32715,7 +32715,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -32726,7 +32726,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -32737,7 +32737,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -32748,7 +32748,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -33478,21 +33478,21 @@ declare module dijit {
          * @param widget             
          * @param insertIndex               Optional            
          */
-        addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+        addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * 
          */
@@ -33652,7 +33652,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * 
          */
@@ -33701,7 +33701,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Callback when the user hits the submit button.
          * Override this method to handle Dialog execution.
@@ -33844,7 +33844,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -33855,7 +33855,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -33866,7 +33866,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -33877,7 +33877,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -33888,7 +33888,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -33899,7 +33899,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -34845,14 +34845,14 @@ declare module dijit {
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: String, value: Object): any;
+        attr(name: String, value?: Object): any;
         /**
          * This method is deprecated, use get() or set() directly.
          * 
          * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
          * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
          */
-        attr(name: Object, value: Object): any;
+        attr(name: Object, value?: Object): any;
         /**
          * Construct the UI for this widget, setting this.domNode.
          * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -35000,7 +35000,7 @@ declare module dijit {
          * @param fcn Function reference.             
          * @param delay               OptionalDelay, defaults to 0.             
          */
-        defer(fcn: Function, delay: number): Object;
+        defer(fcn: Function, delay?: number): Object;
         /**
          * 
          */
@@ -35050,7 +35050,7 @@ declare module dijit {
          * @param eventObj               Optional            
          * @param callbackArgs               Optional            
          */
-        emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+        emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
         /**
          * Expand all nodes in the tree
          * 
@@ -35274,7 +35274,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: String): any;
+        placeAt(reference: String, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -35285,7 +35285,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: String): any;
+        placeAt(reference: HTMLElement, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -35296,7 +35296,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: String): any;
+        placeAt(reference: dijit._WidgetBase, position?: String): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -35307,7 +35307,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: String, position: number): any;
+        placeAt(reference: String, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -35318,7 +35318,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: HTMLElement, position: number): any;
+        placeAt(reference: HTMLElement, position?: number): any;
         /**
          * Place this widget somewhere in the DOM based
          * on standard domConstruct.place() conventions.
@@ -35329,7 +35329,7 @@ declare module dijit {
          * @param reference Widget, DOMNode, or id of widget or DOMNode             
          * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
          */
-        placeAt(reference: dijit._WidgetBase, position: number): any;
+        placeAt(reference: dijit._WidgetBase, position?: number): any;
         /**
          * 
          */
@@ -35886,21 +35886,21 @@ declare module dijit {
              * @param widget             
              * @param insertIndex               Optional            
              */
-            addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+            addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -36046,7 +36046,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -36104,7 +36104,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Show my children
              * 
@@ -36239,7 +36239,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -36250,7 +36250,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -36261,7 +36261,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -36272,7 +36272,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -36283,7 +36283,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -36294,7 +36294,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -37349,14 +37349,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Remove focus from this instance.
              * 
@@ -37504,7 +37504,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              */
@@ -37552,7 +37552,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Executes a command in the Rich Text area
              * 
@@ -37668,7 +37668,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -37679,7 +37679,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -37690,7 +37690,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -37701,7 +37701,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -37712,7 +37712,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -37723,7 +37723,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -38578,14 +38578,14 @@ declare module dijit {
                      * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                      * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                      */
-                    attr(name: String, value: Object): any;
+                    attr(name: String, value?: Object): any;
                     /**
                      * This method is deprecated, use get() or set() directly.
                      * 
                      * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                      * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                      */
-                    attr(name: Object, value: Object): any;
+                    attr(name: Object, value?: Object): any;
                     /**
                      * Construct the UI for this widget, setting this.domNode.
                      * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -38733,7 +38733,7 @@ declare module dijit {
                      * @param fcn Function reference.             
                      * @param delay               OptionalDelay, defaults to 0.             
                      */
-                    defer(fcn: Function, delay: number): Object;
+                    defer(fcn: Function, delay?: number): Object;
                     /**
                      * Destroy this widget, but not its descendants.  Descendants means widgets inside of
                      * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -38791,7 +38791,7 @@ declare module dijit {
                      * @param eventObj               Optional            
                      * @param callbackArgs               Optional            
                      */
-                    emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+                    emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
                     /**
                      * Over-ride for focus control of this widget.  Delegates focus down to the
                      * filtering select.
@@ -38879,7 +38879,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: String, position: String): any;
+                    placeAt(reference: String, position?: String): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -38890,7 +38890,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: HTMLElement, position: String): any;
+                    placeAt(reference: HTMLElement, position?: String): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -38901,7 +38901,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: dijit._WidgetBase, position: String): any;
+                    placeAt(reference: dijit._WidgetBase, position?: String): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -38912,7 +38912,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: String, position: number): any;
+                    placeAt(reference: String, position?: number): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -38923,7 +38923,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: HTMLElement, position: number): any;
+                    placeAt(reference: HTMLElement, position?: number): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -38934,7 +38934,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: dijit._WidgetBase, position: number): any;
+                    placeAt(reference: dijit._WidgetBase, position?: number): any;
                     /**
                      * Over-ride for the default postCreate action
                      * This establishes the filtering selects and the like.
@@ -39440,14 +39440,14 @@ declare module dijit {
                      * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                      * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                      */
-                    attr(name: String, value: Object): any;
+                    attr(name: String, value?: Object): any;
                     /**
                      * This method is deprecated, use get() or set() directly.
                      * 
                      * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                      * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                      */
-                    attr(name: Object, value: Object): any;
+                    attr(name: Object, value?: Object): any;
                     /**
                      * Construct the UI for this widget, setting this.domNode.
                      * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -39595,7 +39595,7 @@ declare module dijit {
                      * @param fcn Function reference.             
                      * @param delay               OptionalDelay, defaults to 0.             
                      */
-                    defer(fcn: Function, delay: number): Object;
+                    defer(fcn: Function, delay?: number): Object;
                     /**
                      * Destroy this widget, but not its descendants.  Descendants means widgets inside of
                      * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -39653,7 +39653,7 @@ declare module dijit {
                      * @param eventObj               Optional            
                      * @param callbackArgs               Optional            
                      */
-                    emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+                    emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
                     /**
                      * Over-ride for focus control of this widget.  Delegates focus down to the
                      * filtering select.
@@ -39750,7 +39750,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: String, position: String): any;
+                    placeAt(reference: String, position?: String): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -39761,7 +39761,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: HTMLElement, position: String): any;
+                    placeAt(reference: HTMLElement, position?: String): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -39772,7 +39772,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: dijit._WidgetBase, position: String): any;
+                    placeAt(reference: dijit._WidgetBase, position?: String): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -39783,7 +39783,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: String, position: number): any;
+                    placeAt(reference: String, position?: number): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -39794,7 +39794,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: HTMLElement, position: number): any;
+                    placeAt(reference: HTMLElement, position?: number): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -39805,7 +39805,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: dijit._WidgetBase, position: number): any;
+                    placeAt(reference: dijit._WidgetBase, position?: number): any;
                     /**
                      * Over-ride for the default postCreate action
                      * This establishes the filtering selects and the like.
@@ -40311,14 +40311,14 @@ declare module dijit {
                      * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                      * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                      */
-                    attr(name: String, value: Object): any;
+                    attr(name: String, value?: Object): any;
                     /**
                      * This method is deprecated, use get() or set() directly.
                      * 
                      * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                      * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                      */
-                    attr(name: Object, value: Object): any;
+                    attr(name: Object, value?: Object): any;
                     /**
                      * Construct the UI for this widget, setting this.domNode.
                      * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -40466,7 +40466,7 @@ declare module dijit {
                      * @param fcn Function reference.             
                      * @param delay               OptionalDelay, defaults to 0.             
                      */
-                    defer(fcn: Function, delay: number): Object;
+                    defer(fcn: Function, delay?: number): Object;
                     /**
                      * Destroy this widget, but not its descendants.  Descendants means widgets inside of
                      * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -40524,7 +40524,7 @@ declare module dijit {
                      * @param eventObj               Optional            
                      * @param callbackArgs               Optional            
                      */
-                    emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+                    emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
                     /**
                      * Over-ride for focus control of this widget.  Delegates focus down to the
                      * filtering select.
@@ -40623,7 +40623,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: String, position: String): any;
+                    placeAt(reference: String, position?: String): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -40634,7 +40634,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: HTMLElement, position: String): any;
+                    placeAt(reference: HTMLElement, position?: String): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -40645,7 +40645,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: dijit._WidgetBase, position: String): any;
+                    placeAt(reference: dijit._WidgetBase, position?: String): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -40656,7 +40656,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: String, position: number): any;
+                    placeAt(reference: String, position?: number): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -40667,7 +40667,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: HTMLElement, position: number): any;
+                    placeAt(reference: HTMLElement, position?: number): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -40678,7 +40678,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: dijit._WidgetBase, position: number): any;
+                    placeAt(reference: dijit._WidgetBase, position?: number): any;
                     /**
                      * Over-ride for the default postCreate action
                      * This establishes the filtering selects and the like.
@@ -41184,14 +41184,14 @@ declare module dijit {
                      * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                      * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                      */
-                    attr(name: String, value: Object): any;
+                    attr(name: String, value?: Object): any;
                     /**
                      * This method is deprecated, use get() or set() directly.
                      * 
                      * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                      * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                      */
-                    attr(name: Object, value: Object): any;
+                    attr(name: Object, value?: Object): any;
                     /**
                      * Construct the UI for this widget, setting this.domNode.
                      * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -41339,7 +41339,7 @@ declare module dijit {
                      * @param fcn Function reference.             
                      * @param delay               OptionalDelay, defaults to 0.             
                      */
-                    defer(fcn: Function, delay: number): Object;
+                    defer(fcn: Function, delay?: number): Object;
                     /**
                      * Destroy this widget, but not its descendants.  Descendants means widgets inside of
                      * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -41397,7 +41397,7 @@ declare module dijit {
                      * @param eventObj               Optional            
                      * @param callbackArgs               Optional            
                      */
-                    emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+                    emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
                     /**
                      * Over-ride for focus control of this widget.  Delegates focus down to the
                      * filtering select.
@@ -41494,7 +41494,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: String, position: String): any;
+                    placeAt(reference: String, position?: String): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -41505,7 +41505,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: HTMLElement, position: String): any;
+                    placeAt(reference: HTMLElement, position?: String): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -41516,7 +41516,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: dijit._WidgetBase, position: String): any;
+                    placeAt(reference: dijit._WidgetBase, position?: String): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -41527,7 +41527,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: String, position: number): any;
+                    placeAt(reference: String, position?: number): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -41538,7 +41538,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: HTMLElement, position: number): any;
+                    placeAt(reference: HTMLElement, position?: number): any;
                     /**
                      * Place this widget somewhere in the DOM based
                      * on standard domConstruct.place() conventions.
@@ -41549,7 +41549,7 @@ declare module dijit {
                      * @param reference Widget, DOMNode, or id of widget or DOMNode             
                      * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                      */
-                    placeAt(reference: dijit._WidgetBase, position: number): any;
+                    placeAt(reference: dijit._WidgetBase, position?: number): any;
                     /**
                      * 
                      */
@@ -44620,7 +44620,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -44678,7 +44678,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -44782,7 +44782,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -44793,7 +44793,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -44804,7 +44804,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -44815,7 +44815,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -44826,7 +44826,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -44837,7 +44837,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -45701,14 +45701,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -45861,7 +45861,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -45926,7 +45926,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Auto-corrections (such as trimming) that are applied to textbox
              * value on blur or form submit.
@@ -46110,7 +46110,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -46121,7 +46121,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -46132,7 +46132,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -46143,7 +46143,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -46154,7 +46154,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -46165,7 +46165,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -46985,14 +46985,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -47140,7 +47140,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Clean up our connections
              * 
@@ -47189,7 +47189,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Put focus on this widget
              * 
@@ -47287,7 +47287,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -47298,7 +47298,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -47309,7 +47309,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -47320,7 +47320,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -47331,7 +47331,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -47342,7 +47342,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * sets up our event handling that we need for functioning
              * as a select
@@ -48057,14 +48057,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -48218,7 +48218,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -48276,7 +48276,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Put focus on this widget
              * 
@@ -48368,7 +48368,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -48379,7 +48379,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -48390,7 +48390,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -48401,7 +48401,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -48412,7 +48412,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -48423,7 +48423,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -49020,14 +49020,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -49181,7 +49181,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -49239,7 +49239,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Put focus on this widget
              * 
@@ -49331,7 +49331,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -49342,7 +49342,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -49353,7 +49353,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -49364,7 +49364,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -49375,7 +49375,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -49386,7 +49386,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -50555,14 +50555,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -50712,7 +50712,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -50770,7 +50770,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Put focus on this widget
              * 
@@ -50862,7 +50862,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -50873,7 +50873,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -50884,7 +50884,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -50895,7 +50895,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -50906,7 +50906,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -50917,7 +50917,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -51840,14 +51840,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -51995,7 +51995,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -52060,7 +52060,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Auto-corrections (such as trimming) that are applied to textbox
              * value on blur or form submit.
@@ -52211,7 +52211,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -52222,7 +52222,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -52233,7 +52233,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -52244,7 +52244,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -52255,7 +52255,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -52266,7 +52266,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -52950,14 +52950,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -53107,7 +53107,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -53165,7 +53165,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Put focus on this widget
              * 
@@ -53257,7 +53257,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -53268,7 +53268,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -53279,7 +53279,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -53290,7 +53290,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -53301,7 +53301,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -53312,7 +53312,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -53991,21 +53991,21 @@ declare module dijit {
              * @param widget             
              * @param insertIndex               Optional            
              */
-            addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+            addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -54161,7 +54161,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -54219,7 +54219,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Focuses this widget to according to position, if specified,
              * otherwise on arrow node
@@ -54345,7 +54345,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -54356,7 +54356,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -54367,7 +54367,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -54378,7 +54378,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -54389,7 +54389,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -54400,7 +54400,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -55388,14 +55388,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -55551,7 +55551,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -55631,7 +55631,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Auto-corrections (such as trimming) that are applied to textbox
              * value on blur or form submit.
@@ -55807,7 +55807,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -55818,7 +55818,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -55829,7 +55829,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -55840,7 +55840,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -55851,7 +55851,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -55862,7 +55862,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -56701,14 +56701,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -56856,7 +56856,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -56921,7 +56921,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Auto-corrections (such as trimming) that are applied to textbox
              * value on blur or form submit.
@@ -57072,7 +57072,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -57083,7 +57083,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -57094,7 +57094,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -57105,7 +57105,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -57116,7 +57116,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -57127,7 +57127,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -57726,14 +57726,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -57884,7 +57884,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -57947,7 +57947,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Deprecated: use submit()
              * 
@@ -58045,7 +58045,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -58056,7 +58056,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -58067,7 +58067,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -58078,7 +58078,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -58089,7 +58089,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -58100,7 +58100,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -58817,21 +58817,21 @@ declare module dijit {
              * @param widget             
              * @param insertIndex               Optional            
              */
-            addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+            addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -58987,7 +58987,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -59045,7 +59045,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Put focus on this widget
              * 
@@ -59169,7 +59169,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -59180,7 +59180,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -59191,7 +59191,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -59202,7 +59202,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -59213,7 +59213,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -59224,7 +59224,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -60064,14 +60064,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -60224,7 +60224,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -60289,7 +60289,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Auto-corrections (such as trimming) that are applied to textbox
              * value on blur or form submit.
@@ -60473,7 +60473,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -60484,7 +60484,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -60495,7 +60495,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -60506,7 +60506,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -60517,7 +60517,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -60528,7 +60528,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
 
             /**
              * 
@@ -61073,14 +61073,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -61221,7 +61221,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -61279,7 +61279,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -61361,7 +61361,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -61372,7 +61372,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -61383,7 +61383,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -61394,7 +61394,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -61405,7 +61405,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -61416,7 +61416,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -62380,14 +62380,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -62541,7 +62541,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -62621,7 +62621,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Auto-corrections (such as trimming) that are applied to textbox
              * value on blur or form submit.
@@ -62794,7 +62794,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -62805,7 +62805,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -62816,7 +62816,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -62827,7 +62827,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -62838,7 +62838,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -62849,7 +62849,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -63443,14 +63443,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -63591,7 +63591,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -63649,7 +63649,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -63737,7 +63737,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -63748,7 +63748,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -63759,7 +63759,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -63770,7 +63770,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -63781,7 +63781,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -63792,7 +63792,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -64536,14 +64536,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -64691,7 +64691,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -64756,7 +64756,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Auto-corrections (such as trimming) that are applied to textbox
              * value on blur or form submit.
@@ -64904,7 +64904,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -64915,7 +64915,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -64926,7 +64926,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -64937,7 +64937,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -64948,7 +64948,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -64959,7 +64959,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -65604,14 +65604,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -65761,7 +65761,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -65819,7 +65819,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Put focus on this widget
              * 
@@ -65922,7 +65922,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -65933,7 +65933,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -65944,7 +65944,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -65955,7 +65955,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -65966,7 +65966,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -65977,7 +65977,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -66636,21 +66636,21 @@ declare module dijit {
              * @param widget             
              * @param insertIndex               Optional            
              */
-            addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+            addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -66798,7 +66798,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              */
@@ -66846,7 +66846,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Put focus on this widget
              * 
@@ -66949,7 +66949,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -66960,7 +66960,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -66971,7 +66971,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -66982,7 +66982,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -66993,7 +66993,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -67004,7 +67004,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -67861,14 +67861,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -68016,7 +68016,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -68081,7 +68081,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Auto-corrections (such as trimming) that are applied to textbox
              * value on blur or form submit.
@@ -68231,7 +68231,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -68242,7 +68242,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -68253,7 +68253,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -68264,7 +68264,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -68275,7 +68275,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -68286,7 +68286,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -69287,14 +69287,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -69442,7 +69442,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -69507,7 +69507,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Auto-corrections (such as trimming) that are applied to textbox
              * value on blur or form submit.
@@ -69658,7 +69658,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -69669,7 +69669,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -69680,7 +69680,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -69691,7 +69691,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -69702,7 +69702,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -69713,7 +69713,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -70385,14 +70385,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -70542,7 +70542,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -70600,7 +70600,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Put focus on this widget
              * 
@@ -70692,7 +70692,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -70703,7 +70703,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -70714,7 +70714,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -70725,7 +70725,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -70736,7 +70736,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -70747,7 +70747,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -71443,14 +71443,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -71598,7 +71598,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -71656,7 +71656,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * 
              * @param value             
@@ -71772,7 +71772,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -71783,7 +71783,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -71794,7 +71794,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -71805,7 +71805,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -71816,7 +71816,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -71827,7 +71827,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -72612,14 +72612,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -72767,7 +72767,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -72832,7 +72832,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Auto-corrections (such as trimming) that are applied to textbox
              * value on blur or form submit.
@@ -72983,7 +72983,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -72994,7 +72994,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -73005,7 +73005,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -73016,7 +73016,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -73027,7 +73027,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -73038,7 +73038,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -73785,14 +73785,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -73940,7 +73940,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -73998,7 +73998,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * 
              * @param value             
@@ -74114,7 +74114,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -74125,7 +74125,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -74136,7 +74136,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -74147,7 +74147,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -74158,7 +74158,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -74169,7 +74169,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -75010,14 +75010,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -75176,7 +75176,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              * @param preserveDom             
@@ -75225,7 +75225,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * 
              */
@@ -75369,7 +75369,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -75380,7 +75380,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -75391,7 +75391,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -75402,7 +75402,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -75413,7 +75413,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -75424,7 +75424,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * stop mousemove from selecting text on IE to be consistent with other browsers
              * 
@@ -76130,21 +76130,21 @@ declare module dijit {
                  * @param widget             
                  * @param insertIndex               Optional            
                  */
-                addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+                addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
                 /**
                  * This method is deprecated, use get() or set() directly.
                  * 
                  * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                  * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                  */
-                attr(name: String, value: Object): any;
+                attr(name: String, value?: Object): any;
                 /**
                  * This method is deprecated, use get() or set() directly.
                  * 
                  * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                  * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                  */
-                attr(name: Object, value: Object): any;
+                attr(name: Object, value?: Object): any;
                 /**
                  * 
                  */
@@ -76301,7 +76301,7 @@ declare module dijit {
                  * @param fcn Function reference.             
                  * @param delay               OptionalDelay, defaults to 0.             
                  */
-                defer(fcn: Function, delay: number): Object;
+                defer(fcn: Function, delay?: number): Object;
                 /**
                  * Destroy this widget, but not its descendants.  Descendants means widgets inside of
                  * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -76359,7 +76359,7 @@ declare module dijit {
                  * @param eventObj               Optional            
                  * @param callbackArgs               Optional            
                  */
-                emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+                emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
                 /**
                  * Overridden so that the previously selected value will be focused instead of only the first item
                  * 
@@ -76485,7 +76485,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: String, position: String): any;
+                placeAt(reference: String, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -76496,7 +76496,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: HTMLElement, position: String): any;
+                placeAt(reference: HTMLElement, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -76507,7 +76507,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: dijit._WidgetBase, position: String): any;
+                placeAt(reference: dijit._WidgetBase, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -76518,7 +76518,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: String, position: number): any;
+                placeAt(reference: String, position?: number): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -76529,7 +76529,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: HTMLElement, position: number): any;
+                placeAt(reference: HTMLElement, position?: number): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -76540,7 +76540,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: dijit._WidgetBase, position: number): any;
+                placeAt(reference: dijit._WidgetBase, position?: number): any;
                 /**
                  * stop mousemove from selecting text on IE to be consistent with other browsers
                  * 
@@ -77238,14 +77238,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -77395,7 +77395,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -77453,7 +77453,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Auto-corrections (such as trimming) that are applied to textbox
              * value on blur or form submit.
@@ -77582,7 +77582,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -77593,7 +77593,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -77604,7 +77604,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -77615,7 +77615,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -77626,7 +77626,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -77637,7 +77637,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -78491,14 +78491,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -78651,7 +78651,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -78716,7 +78716,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Auto-corrections (such as trimming) that are applied to textbox
              * value on blur or form submit.
@@ -78900,7 +78900,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -78911,7 +78911,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -78922,7 +78922,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -78933,7 +78933,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -78944,7 +78944,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -78955,7 +78955,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -79626,14 +79626,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -79783,7 +79783,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -79841,7 +79841,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Put focus on this widget
              * 
@@ -79933,7 +79933,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -79944,7 +79944,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -79955,7 +79955,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -79966,7 +79966,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -79977,7 +79977,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -79988,7 +79988,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -80502,14 +80502,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -80650,7 +80650,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -80708,7 +80708,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -80790,7 +80790,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -80801,7 +80801,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -80812,7 +80812,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -80823,7 +80823,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -80834,7 +80834,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -80845,7 +80845,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -81374,14 +81374,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -81522,7 +81522,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -81580,7 +81580,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -81668,7 +81668,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -81679,7 +81679,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -81690,7 +81690,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -81701,7 +81701,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -81712,7 +81712,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -81723,7 +81723,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -82467,14 +82467,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -82624,7 +82624,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -82689,7 +82689,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Auto-corrections (such as trimming) that are applied to textbox
              * value on blur or form submit.
@@ -82830,7 +82830,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -82841,7 +82841,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -82852,7 +82852,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -82863,7 +82863,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -82874,7 +82874,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -82885,7 +82885,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -83563,21 +83563,21 @@ declare module dijit {
              * @param widget             
              * @param insertIndex               Optional            
              */
-            addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+            addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -83725,7 +83725,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              */
@@ -83773,7 +83773,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Put focus on this widget
              * 
@@ -83876,7 +83876,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -83887,7 +83887,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -83898,7 +83898,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -83909,7 +83909,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -83920,7 +83920,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -83931,7 +83931,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -84460,14 +84460,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -84608,7 +84608,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -84666,7 +84666,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -84787,7 +84787,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -84798,7 +84798,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -84809,7 +84809,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -84820,7 +84820,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -84831,7 +84831,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -84842,7 +84842,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -85354,14 +85354,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Go back to previous page.
              * 
@@ -85512,7 +85512,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              */
@@ -85558,7 +85558,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Advance to next page.
              * 
@@ -85669,7 +85669,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -85680,7 +85680,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -85691,7 +85691,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -85702,7 +85702,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -85713,7 +85713,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -85724,7 +85724,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -86218,14 +86218,14 @@ declare module dijit {
                  * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                  * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                  */
-                attr(name: String, value: Object): any;
+                attr(name: String, value?: Object): any;
                 /**
                  * This method is deprecated, use get() or set() directly.
                  * 
                  * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                  * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                  */
-                attr(name: Object, value: Object): any;
+                attr(name: Object, value?: Object): any;
                 /**
                  * 
                  */
@@ -86366,7 +86366,7 @@ declare module dijit {
                  * @param fcn Function reference.             
                  * @param delay               OptionalDelay, defaults to 0.             
                  */
-                defer(fcn: Function, delay: number): Object;
+                defer(fcn: Function, delay?: number): Object;
                 /**
                  * 
                  */
@@ -86412,7 +86412,7 @@ declare module dijit {
                  * @param eventObj               Optional            
                  * @param callbackArgs               Optional            
                  */
-                emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+                emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
                 /**
                  * Get a property from a widget.
                  * Get a named property from a widget. The property may
@@ -86494,7 +86494,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: String, position: String): any;
+                placeAt(reference: String, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -86505,7 +86505,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: HTMLElement, position: String): any;
+                placeAt(reference: HTMLElement, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -86516,7 +86516,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: dijit._WidgetBase, position: String): any;
+                placeAt(reference: dijit._WidgetBase, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -86527,7 +86527,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: String, position: number): any;
+                placeAt(reference: String, position?: number): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -86538,7 +86538,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: HTMLElement, position: number): any;
+                placeAt(reference: HTMLElement, position?: number): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -86549,7 +86549,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: dijit._WidgetBase, position: number): any;
+                placeAt(reference: dijit._WidgetBase, position?: number): any;
                 /**
                  * 
                  */
@@ -87037,14 +87037,14 @@ declare module dijit {
                  * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                  * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                  */
-                attr(name: String, value: Object): any;
+                attr(name: String, value?: Object): any;
                 /**
                  * This method is deprecated, use get() or set() directly.
                  * 
                  * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                  * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                  */
-                attr(name: Object, value: Object): any;
+                attr(name: Object, value?: Object): any;
                 /**
                  * 
                  */
@@ -87185,7 +87185,7 @@ declare module dijit {
                  * @param fcn Function reference.             
                  * @param delay               OptionalDelay, defaults to 0.             
                  */
-                defer(fcn: Function, delay: number): Object;
+                defer(fcn: Function, delay?: number): Object;
                 /**
                  * Destroy this widget, but not its descendants.  Descendants means widgets inside of
                  * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -87243,7 +87243,7 @@ declare module dijit {
                  * @param eventObj               Optional            
                  * @param callbackArgs               Optional            
                  */
-                emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+                emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
                 /**
                  * Get a property from a widget.
                  * Get a named property from a widget. The property may
@@ -87325,7 +87325,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: String, position: String): any;
+                placeAt(reference: String, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -87336,7 +87336,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: HTMLElement, position: String): any;
+                placeAt(reference: HTMLElement, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -87347,7 +87347,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: dijit._WidgetBase, position: String): any;
+                placeAt(reference: dijit._WidgetBase, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -87358,7 +87358,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: String, position: number): any;
+                placeAt(reference: String, position?: number): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -87369,7 +87369,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: HTMLElement, position: number): any;
+                placeAt(reference: HTMLElement, position?: number): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -87380,7 +87380,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: dijit._WidgetBase, position: number): any;
+                placeAt(reference: dijit._WidgetBase, position?: number): any;
                 /**
                  * 
                  */
@@ -87909,14 +87909,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Go back to previous page.
              * 
@@ -88062,7 +88062,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              * @param preserveDom             
@@ -88109,7 +88109,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Advance to next page.
              * 
@@ -88230,7 +88230,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -88241,7 +88241,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -88252,7 +88252,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -88263,7 +88263,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -88274,7 +88274,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -88285,7 +88285,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -88799,14 +88799,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -88947,7 +88947,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -89000,7 +89000,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -89112,7 +89112,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -89123,7 +89123,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -89134,7 +89134,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -89145,7 +89145,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -89156,7 +89156,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -89167,7 +89167,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -89633,14 +89633,14 @@ declare module dijit {
                  * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                  * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                  */
-                attr(name: String, value: Object): any;
+                attr(name: String, value?: Object): any;
                 /**
                  * This method is deprecated, use get() or set() directly.
                  * 
                  * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                  * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                  */
-                attr(name: Object, value: Object): any;
+                attr(name: Object, value?: Object): any;
                 /**
                  * 
                  */
@@ -89781,7 +89781,7 @@ declare module dijit {
                  * @param fcn Function reference.             
                  * @param delay               OptionalDelay, defaults to 0.             
                  */
-                defer(fcn: Function, delay: number): Object;
+                defer(fcn: Function, delay?: number): Object;
                 /**
                  * Destroy this widget, but not its descendants.  Descendants means widgets inside of
                  * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -89839,7 +89839,7 @@ declare module dijit {
                  * @param eventObj               Optional            
                  * @param callbackArgs               Optional            
                  */
-                emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+                emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
                 /**
                  * Get a property from a widget.
                  * Get a named property from a widget. The property may
@@ -89921,7 +89921,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: String, position: String): any;
+                placeAt(reference: String, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -89932,7 +89932,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: HTMLElement, position: String): any;
+                placeAt(reference: HTMLElement, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -89943,7 +89943,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: dijit._WidgetBase, position: String): any;
+                placeAt(reference: dijit._WidgetBase, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -89954,7 +89954,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: String, position: number): any;
+                placeAt(reference: String, position?: number): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -89965,7 +89965,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: HTMLElement, position: number): any;
+                placeAt(reference: HTMLElement, position?: number): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -89976,7 +89976,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: dijit._WidgetBase, position: number): any;
+                placeAt(reference: dijit._WidgetBase, position?: number): any;
                 /**
                  * 
                  */
@@ -90463,14 +90463,14 @@ declare module dijit {
                  * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                  * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                  */
-                attr(name: String, value: Object): any;
+                attr(name: String, value?: Object): any;
                 /**
                  * This method is deprecated, use get() or set() directly.
                  * 
                  * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                  * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                  */
-                attr(name: Object, value: Object): any;
+                attr(name: Object, value?: Object): any;
                 /**
                  * 
                  */
@@ -90611,7 +90611,7 @@ declare module dijit {
                  * @param fcn Function reference.             
                  * @param delay               OptionalDelay, defaults to 0.             
                  */
-                defer(fcn: Function, delay: number): Object;
+                defer(fcn: Function, delay?: number): Object;
                 /**
                  * 
                  */
@@ -90659,7 +90659,7 @@ declare module dijit {
                  * @param eventObj               Optional            
                  * @param callbackArgs               Optional            
                  */
-                emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+                emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
                 /**
                  * Get a property from a widget.
                  * Get a named property from a widget. The property may
@@ -90741,7 +90741,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: String, position: String): any;
+                placeAt(reference: String, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -90752,7 +90752,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: HTMLElement, position: String): any;
+                placeAt(reference: HTMLElement, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -90763,7 +90763,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: dijit._WidgetBase, position: String): any;
+                placeAt(reference: dijit._WidgetBase, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -90774,7 +90774,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: String, position: number): any;
+                placeAt(reference: String, position?: number): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -90785,7 +90785,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: HTMLElement, position: number): any;
+                placeAt(reference: HTMLElement, position?: number): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -90796,7 +90796,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: dijit._WidgetBase, position: number): any;
+                placeAt(reference: dijit._WidgetBase, position?: number): any;
                 /**
                  * 
                  */
@@ -91411,21 +91411,21 @@ declare module dijit {
              * @param widget             
              * @param insertIndex               Optional            
              */
-            addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+            addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -91577,7 +91577,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              */
@@ -91621,7 +91621,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -91727,7 +91727,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -91738,7 +91738,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -91749,7 +91749,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -91760,7 +91760,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -91771,7 +91771,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -91782,7 +91782,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -92360,14 +92360,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -92508,7 +92508,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -92566,7 +92566,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -92682,7 +92682,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -92693,7 +92693,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -92704,7 +92704,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -92715,7 +92715,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -92726,7 +92726,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -92737,7 +92737,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -93387,21 +93387,21 @@ declare module dijit {
              * @param widget             
              * @param insertIndex               Optional            
              */
-            addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+            addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -93553,7 +93553,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              */
@@ -93597,7 +93597,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -93703,7 +93703,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -93714,7 +93714,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -93725,7 +93725,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -93736,7 +93736,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -93747,7 +93747,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -93758,7 +93758,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -94466,21 +94466,21 @@ declare module dijit {
              * @param widget             
              * @param insertIndex               Optional            
              */
-            addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+            addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -94632,7 +94632,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              */
@@ -94676,7 +94676,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -94782,7 +94782,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -94793,7 +94793,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -94804,7 +94804,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -94815,7 +94815,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -94826,7 +94826,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -94837,7 +94837,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -95466,21 +95466,21 @@ declare module dijit {
              * @param widget             
              * @param insertIndex               Optional            
              */
-            addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+            addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -95636,7 +95636,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              * @param preserveDom             
@@ -95704,7 +95704,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -95803,7 +95803,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -95814,7 +95814,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -95825,7 +95825,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -95836,7 +95836,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -95847,7 +95847,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -95858,7 +95858,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -96391,14 +96391,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Begin dragging the splitter between child[i] and child[i+1]
              * 
@@ -96552,7 +96552,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              */
@@ -96600,7 +96600,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * 
              */
@@ -96721,7 +96721,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -96732,7 +96732,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -96743,7 +96743,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -96754,7 +96754,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -96765,7 +96765,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -96776,7 +96776,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -97300,14 +97300,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Go back to previous page.
              * 
@@ -97453,7 +97453,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -97509,7 +97509,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Advance to next page.
              * 
@@ -97630,7 +97630,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -97641,7 +97641,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -97652,7 +97652,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -97663,7 +97663,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -97674,7 +97674,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -97685,7 +97685,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -98220,21 +98220,21 @@ declare module dijit {
              * @param widget             
              * @param insertIndex               Optional            
              */
-            addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+            addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -98382,7 +98382,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              * @param preserveDom             
@@ -98431,7 +98431,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -98530,7 +98530,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -98541,7 +98541,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -98552,7 +98552,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -98563,7 +98563,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -98574,7 +98574,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -98585,7 +98585,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -99218,14 +99218,14 @@ declare module dijit {
                  * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                  * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                  */
-                attr(name: String, value: Object): any;
+                attr(name: String, value?: Object): any;
                 /**
                  * This method is deprecated, use get() or set() directly.
                  * 
                  * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                  * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                  */
-                attr(name: Object, value: Object): any;
+                attr(name: Object, value?: Object): any;
                 /**
                  * 
                  * @param evt             
@@ -99374,7 +99374,7 @@ declare module dijit {
                  * @param fcn Function reference.             
                  * @param delay               OptionalDelay, defaults to 0.             
                  */
-                defer(fcn: Function, delay: number): Object;
+                defer(fcn: Function, delay?: number): Object;
                 /**
                  * Destroy this widget, but not its descendants.  Descendants means widgets inside of
                  * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -99432,7 +99432,7 @@ declare module dijit {
                  * @param eventObj               Optional            
                  * @param callbackArgs               Optional            
                  */
-                emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+                emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
                 /**
                  * Put focus on this widget
                  * 
@@ -99524,7 +99524,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: String, position: String): any;
+                placeAt(reference: String, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -99535,7 +99535,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: HTMLElement, position: String): any;
+                placeAt(reference: HTMLElement, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -99546,7 +99546,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: dijit._WidgetBase, position: String): any;
+                placeAt(reference: dijit._WidgetBase, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -99557,7 +99557,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: String, position: number): any;
+                placeAt(reference: String, position?: number): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -99568,7 +99568,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: HTMLElement, position: number): any;
+                placeAt(reference: HTMLElement, position?: number): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -99579,7 +99579,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: dijit._WidgetBase, position: number): any;
+                placeAt(reference: dijit._WidgetBase, position?: number): any;
                 /**
                  * 
                  */
@@ -100167,14 +100167,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Go back to previous page.
              * 
@@ -100320,7 +100320,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              * @param preserveDom             
@@ -100367,7 +100367,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Advance to next page.
              * 
@@ -100488,7 +100488,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -100499,7 +100499,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -100510,7 +100510,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -100521,7 +100521,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -100532,7 +100532,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -100543,7 +100543,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -101051,21 +101051,21 @@ declare module dijit {
              * @param widget             
              * @param insertIndex               Optional            
              */
-            addChild(widget: dijit._WidgetBase, insertIndex: number): void;
+            addChild(widget: dijit._WidgetBase, insertIndex?: number): void;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * Construct the UI for this widget, setting this.domNode.
              * Most widgets will mixin dijit._TemplatedMixin, which implements this method.
@@ -101213,7 +101213,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * 
              * @param preserveDom             
@@ -101262,7 +101262,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Get a property from a widget.
              * Get a named property from a widget. The property may
@@ -101361,7 +101361,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -101372,7 +101372,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -101383,7 +101383,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -101394,7 +101394,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -101405,7 +101405,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -101416,7 +101416,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
@@ -102034,14 +102034,14 @@ declare module dijit {
                  * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                  * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                  */
-                attr(name: String, value: Object): any;
+                attr(name: String, value?: Object): any;
                 /**
                  * This method is deprecated, use get() or set() directly.
                  * 
                  * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
                  * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
                  */
-                attr(name: Object, value: Object): any;
+                attr(name: Object, value?: Object): any;
                 /**
                  * 
                  */
@@ -102189,7 +102189,7 @@ declare module dijit {
                  * @param fcn Function reference.             
                  * @param delay               OptionalDelay, defaults to 0.             
                  */
-                defer(fcn: Function, delay: number): Object;
+                defer(fcn: Function, delay?: number): Object;
                 /**
                  * Destroy this widget, but not its descendants.  Descendants means widgets inside of
                  * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -102247,7 +102247,7 @@ declare module dijit {
                  * @param eventObj               Optional            
                  * @param callbackArgs               Optional            
                  */
-                emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+                emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
                 /**
                  * Put focus on this widget
                  * 
@@ -102339,7 +102339,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: String, position: String): any;
+                placeAt(reference: String, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -102350,7 +102350,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: HTMLElement, position: String): any;
+                placeAt(reference: HTMLElement, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -102361,7 +102361,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: dijit._WidgetBase, position: String): any;
+                placeAt(reference: dijit._WidgetBase, position?: String): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -102372,7 +102372,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: String, position: number): any;
+                placeAt(reference: String, position?: number): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -102383,7 +102383,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: HTMLElement, position: number): any;
+                placeAt(reference: HTMLElement, position?: number): any;
                 /**
                  * Place this widget somewhere in the DOM based
                  * on standard domConstruct.place() conventions.
@@ -102394,7 +102394,7 @@ declare module dijit {
                  * @param reference Widget, DOMNode, or id of widget or DOMNode             
                  * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
                  */
-                placeAt(reference: dijit._WidgetBase, position: number): any;
+                placeAt(reference: dijit._WidgetBase, position?: number): any;
                 /**
                  * 
                  */
@@ -105018,14 +105018,14 @@ declare module dijit {
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: String, value: Object): any;
+            attr(name: String, value?: Object): any;
             /**
              * This method is deprecated, use get() or set() directly.
              * 
              * @param name The property to get or set. If an object is passed here and nota string, its keys are used as names of attributes to be setand the value of the object as values to set in the widget.             
              * @param value               OptionalOptional. If provided, attr() operates as a setter. If omitted,the current value of the named property is returned.             
              */
-            attr(name: Object, value: Object): any;
+            attr(name: Object, value?: Object): any;
             /**
              * 
              */
@@ -105166,7 +105166,7 @@ declare module dijit {
              * @param fcn Function reference.             
              * @param delay               OptionalDelay, defaults to 0.             
              */
-            defer(fcn: Function, delay: number): Object;
+            defer(fcn: Function, delay?: number): Object;
             /**
              * Destroy this widget, but not its descendants.  Descendants means widgets inside of
              * this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
@@ -105224,7 +105224,7 @@ declare module dijit {
              * @param eventObj               Optional            
              * @param callbackArgs               Optional            
              */
-            emit(type: String, eventObj: Object, callbackArgs: any[]): any;
+            emit(type: String, eventObj?: Object, callbackArgs?: any[]): any;
             /**
              * Focus the calendar by focusing one of the calendar cells
              * 
@@ -105348,7 +105348,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: String): any;
+            placeAt(reference: String, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -105359,7 +105359,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: String): any;
+            placeAt(reference: HTMLElement, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -105370,7 +105370,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: String): any;
+            placeAt(reference: dijit._WidgetBase, position?: String): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -105381,7 +105381,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: String, position: number): any;
+            placeAt(reference: String, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -105392,7 +105392,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: HTMLElement, position: number): any;
+            placeAt(reference: HTMLElement, position?: number): any;
             /**
              * Place this widget somewhere in the DOM based
              * on standard domConstruct.place() conventions.
@@ -105403,7 +105403,7 @@ declare module dijit {
              * @param reference Widget, DOMNode, or id of widget or DOMNode             
              * @param position               OptionalIf reference is a widget (or id of widget), and that widget has an ".addChild" method,it will be called passing this widget instance into that method, supplying the optionalposition index passed.  In this case position (if specified) should be an integer.If reference is a DOMNode (or id matching a DOMNode but not a widget),the position argument can be a numeric index or a string"first", "last", "before", or "after", same as dojo/dom-construct::place().             
              */
-            placeAt(reference: dijit._WidgetBase, position: number): any;
+            placeAt(reference: dijit._WidgetBase, position?: number): any;
             /**
              * 
              */
diff --git a/dojo/dojo.d.ts b/dojo/dojo.d.ts
index a2c653de2..ccdeda71e 100644
--- a/dojo/dojo.d.ts
+++ b/dojo/dojo.d.ts
@@ -100,14 +100,14 @@ declare module dojo {
              * @param url URL to request             
              * @param options               OptionalOptions for the request.             
              */
-            get(url: String, options: dojo.request.iframe.__BaseOptions): dojo.request.__Promise;
+            get(url: String, options?: dojo.request.iframe.__BaseOptions): dojo.request.__Promise;
             /**
              * Send an HTTP POST request using an iframe element with the given URL and options.
              * 
              * @param url URL to request             
              * @param options               OptionalOptions for the request.             
              */
-            post(url: String, options: dojo.request.iframe.__BaseOptions): dojo.request.__Promise;
+            post(url: String, options?: dojo.request.iframe.__BaseOptions): dojo.request.__Promise;
             /**
              * 
              * @param _iframe             
@@ -295,28 +295,28 @@ declare module dojo {
              * @param url URL to request             
              * @param options               OptionalOptions for the request.             
              */
-            del(url: String, options: dojo.request.node.__BaseOptions): dojo.request.__Promise;
+            del(url: String, options?: dojo.request.node.__BaseOptions): dojo.request.__Promise;
             /**
              * Send an HTTP GET request using XMLHttpRequest with the given URL and options.
              * 
              * @param url URL to request             
              * @param options               OptionalOptions for the request.             
              */
-            get(url: String, options: dojo.request.node.__BaseOptions): dojo.request.__Promise;
+            get(url: String, options?: dojo.request.node.__BaseOptions): dojo.request.__Promise;
             /**
              * Send an HTTP POST request using XMLHttpRequest with the given URL and options.
              * 
              * @param url URL to request             
              * @param options               OptionalOptions for the request.             
              */
-            post(url: String, options: dojo.request.node.__BaseOptions): dojo.request.__Promise;
+            post(url: String, options?: dojo.request.node.__BaseOptions): dojo.request.__Promise;
             /**
              * Send an HTTP PUT request using XMLHttpRequest with the given URL and options.
              * 
              * @param url URL to request             
              * @param options               OptionalOptions for the request.             
              */
-            put(url: String, options: dojo.request.node.__BaseOptions): dojo.request.__Promise;
+            put(url: String, options?: dojo.request.node.__BaseOptions): dojo.request.__Promise;
         }
 
         module node {
@@ -497,7 +497,7 @@ declare module dojo {
              * @param url URL to request             
              * @param options               OptionalOptions for the request.             
              */
-            get(url: String, options: dojo.request.script.__BaseOptions): dojo.request.__Promise;
+            get(url: String, options?: dojo.request.script.__BaseOptions): dojo.request.__Promise;
         }
 
         module script {
@@ -657,28 +657,28 @@ declare module dojo {
              * @param url URL to request             
              * @param options               OptionalOptions for the request.             
              */
-            del(url: String, options: dojo.request.xhr.__BaseOptions): dojo.request.__Promise;
+            del(url: String, options?: dojo.request.xhr.__BaseOptions): dojo.request.__Promise;
             /**
              * Send an HTTP GET request using XMLHttpRequest with the given URL and options.
              * 
              * @param url URL to request             
              * @param options               OptionalOptions for the request.             
              */
-            get(url: String, options: dojo.request.xhr.__BaseOptions): dojo.request.__Promise;
+            get(url: String, options?: dojo.request.xhr.__BaseOptions): dojo.request.__Promise;
             /**
              * Send an HTTP POST request using XMLHttpRequest with the given URL and options.
              * 
              * @param url URL to request             
              * @param options               OptionalOptions for the request.             
              */
-            post(url: String, options: dojo.request.xhr.__BaseOptions): dojo.request.__Promise;
+            post(url: String, options?: dojo.request.xhr.__BaseOptions): dojo.request.__Promise;
             /**
              * Send an HTTP PUT request using XMLHttpRequest with the given URL and options.
              * 
              * @param url URL to request             
              * @param options               OptionalOptions for the request.             
              */
-            put(url: String, options: dojo.request.xhr.__BaseOptions): dojo.request.__Promise;
+            put(url: String, options?: dojo.request.xhr.__BaseOptions): dojo.request.__Promise;
         }
 
         module xhr {
@@ -952,7 +952,7 @@ declare module dojo {
              * @param reason A message that may be sent to the deferred's canceler,explaining why it's being canceled.             
              * @param strict               OptionalIf strict, will throw an error if the deferred has alreadybeen fulfilled and consequently cannot be canceled.             
              */
-            cancel(reason: any, strict: boolean): any;
+            cancel(reason: any, strict?: boolean): any;
             /**
              * Checks whether the promise has been canceled.
              * 
@@ -1067,7 +1067,7 @@ declare module dojo {
              * @param type               OptionalThe event to listen for. Events emitted: "start", "send","load", "error", "done", "stop".             
              * @param listener               OptionalA callback to be run when an event happens.             
              */
-            notify(type: String, listener: Function): any;
+            notify(type?: String, listener?: Function): any;
             /**
              * 
              * @param url             
@@ -1117,7 +1117,7 @@ declare module dojo {
          * @param directReturn               OptionalIf directReturn is true, the value passed in for wrap will bereturned instead of being called. Alternately, theAdapterRegistry can be set globally to "return not call" usingthe returnWrappers property. Either way, this behavior allowsthe registry to act as a "search" function instead of afunction interception library.             
          * @param override               OptionalIf override is given and true, the check function will be givenhighest priority. Otherwise, it will be the lowest priorityadapter.             
          */
-        register(name: String, check: Function, wrap: Function, directReturn: boolean, override: boolean): void;
+        register(name: String, check: Function, wrap: Function, directReturn?: boolean, override?: boolean): void;
         /**
          * Remove a named adapter from the registry
          * 
@@ -1310,7 +1310,7 @@ declare module dojo {
          * @param now               OptionalOptional. Omit if test is not a function. Provides a way to immediatelyrun the test and cache the result.             
          * @param force               OptionalOptional. If the test already exists and force is truthy, then the existingtest will be replaced; otherwise, add does not replace an existing test (thatis, by default, the first test advice wins).             
          */
-        add(name: String, test: Function, now: boolean, force: boolean): any;
+        add(name: String, test: Function, now?: boolean, force?: boolean): any;
         /**
          * Register a new feature test for some named feature.
          * 
@@ -1319,7 +1319,7 @@ declare module dojo {
          * @param now               OptionalOptional. Omit if test is not a function. Provides a way to immediatelyrun the test and cache the result.             
          * @param force               OptionalOptional. If the test already exists and force is truthy, then the existingtest will be replaced; otherwise, add does not replace an existing test (thatis, by default, the first test advice wins).             
          */
-        add(name: number, test: Function, now: boolean, force: boolean): any;
+        add(name: number, test: Function, now?: boolean, force?: boolean): any;
         /**
          * Deletes the contents of the element passed to test functions.
          * 
@@ -1833,7 +1833,7 @@ declare module dojo {
          * @param reason A message that may be sent to the deferred's canceler,explaining why it's being canceled.             
          * @param strict               OptionalIf strict, will throw an error if the deferred has alreadybeen fulfilled and consequently cannot be canceled.             
          */
-        cancel(reason: any, strict: boolean): any;
+        cancel(reason: any, strict?: boolean): any;
         /**
          * Checks whether the deferred has been canceled.
          * 
@@ -1863,7 +1863,7 @@ declare module dojo {
          * @param update The progress update. Passed to progbacks.             
          * @param strict               OptionalIf strict, will throw an error if the deferred has alreadybeen fulfilled and consequently no progress can be emitted.             
          */
-        progress(update: any, strict: boolean): dojo.promise.Promise<any>;
+        progress(update: any, strict?: boolean): dojo.promise.Promise<any>;
         /**
          * Reject the deferred.
          * Reject the deferred, putting it in an error state.
@@ -1871,7 +1871,7 @@ declare module dojo {
          * @param error The error result of the deferred. Passed to errbacks.             
          * @param strict               OptionalIf strict, will throw an error if the deferred has alreadybeen fulfilled and consequently cannot be rejected.             
          */
-        reject(error: any, strict: boolean): any;
+        reject(error: any, strict?: boolean): any;
         /**
          * Resolve the deferred.
          * Resolve the deferred, putting it in a success state.
@@ -1889,7 +1889,7 @@ declare module dojo {
          * @param errback               OptionalCallback to be invoked when the promise is rejected.Receives the rejection error.             
          * @param progback               OptionalCallback to be invoked when the promise emits a progressupdate. Receives the progress update.             
          */
-        then(callback: Function, errback: Function, progback: Function): dojo.promise.Promise<any>;
+        then(callback?: Function, errback?: Function, progback?: Function): dojo.promise.Promise<any>;
         /**
          * 
          */
@@ -1971,7 +1971,7 @@ declare module dojo {
          * @param content the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
          * @param position               Optionalcan be one of:"last"||"end" (default)"first||"start""before""after""replace" (replaces nodes in this NodeList with new content)"only" (removes other children of the nodes so new content is the only child)or an offset in the childNodes property             
          */
-        addContent(content: String, position: String): Function;
+        addContent(content: String, position?: String): Function;
         /**
          * add a node, NodeList or some HTML as a string to every item in the
          * list.  Returns the original list.
@@ -1983,7 +1983,7 @@ declare module dojo {
          * @param content the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
          * @param position               Optionalcan be one of:"last"||"end" (default)"first||"start""before""after""replace" (replaces nodes in this NodeList with new content)"only" (removes other children of the nodes so new content is the only child)or an offset in the childNodes property             
          */
-        addContent(content: HTMLElement, position: String): Function;
+        addContent(content: HTMLElement, position?: String): Function;
         /**
          * add a node, NodeList or some HTML as a string to every item in the
          * list.  Returns the original list.
@@ -1995,7 +1995,7 @@ declare module dojo {
          * @param content the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
          * @param position               Optionalcan be one of:"last"||"end" (default)"first||"start""before""after""replace" (replaces nodes in this NodeList with new content)"only" (removes other children of the nodes so new content is the only child)or an offset in the childNodes property             
          */
-        addContent(content: Object, position: String): Function;
+        addContent(content: Object, position?: String): Function;
         /**
          * add a node, NodeList or some HTML as a string to every item in the
          * list.  Returns the original list.
@@ -2007,7 +2007,7 @@ declare module dojo {
          * @param content the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
          * @param position               Optionalcan be one of:"last"||"end" (default)"first||"start""before""after""replace" (replaces nodes in this NodeList with new content)"only" (removes other children of the nodes so new content is the only child)or an offset in the childNodes property             
          */
-        addContent(content:  dojo.NodeList, position: String): Function;
+        addContent(content:  dojo.NodeList, position?: String): Function;
         /**
          * add a node, NodeList or some HTML as a string to every item in the
          * list.  Returns the original list.
@@ -2019,7 +2019,7 @@ declare module dojo {
          * @param content the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
          * @param position               Optionalcan be one of:"last"||"end" (default)"first||"start""before""after""replace" (replaces nodes in this NodeList with new content)"only" (removes other children of the nodes so new content is the only child)or an offset in the childNodes property             
          */
-        addContent(content: String, position: number): Function;
+        addContent(content: String, position?: number): Function;
         /**
          * add a node, NodeList or some HTML as a string to every item in the
          * list.  Returns the original list.
@@ -2031,7 +2031,7 @@ declare module dojo {
          * @param content the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
          * @param position               Optionalcan be one of:"last"||"end" (default)"first||"start""before""after""replace" (replaces nodes in this NodeList with new content)"only" (removes other children of the nodes so new content is the only child)or an offset in the childNodes property             
          */
-        addContent(content: HTMLElement, position: number): Function;
+        addContent(content: HTMLElement, position?: number): Function;
         /**
          * add a node, NodeList or some HTML as a string to every item in the
          * list.  Returns the original list.
@@ -2043,7 +2043,7 @@ declare module dojo {
          * @param content the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
          * @param position               Optionalcan be one of:"last"||"end" (default)"first||"start""before""after""replace" (replaces nodes in this NodeList with new content)"only" (removes other children of the nodes so new content is the only child)or an offset in the childNodes property             
          */
-        addContent(content: Object, position: number): Function;
+        addContent(content: Object, position?: number): Function;
         /**
          * add a node, NodeList or some HTML as a string to every item in the
          * list.  Returns the original list.
@@ -2055,7 +2055,7 @@ declare module dojo {
          * @param content the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
          * @param position               Optionalcan be one of:"last"||"end" (default)"first||"start""before""after""replace" (replaces nodes in this NodeList with new content)"only" (removes other children of the nodes so new content is the only child)or an offset in the childNodes property             
          */
-        addContent(content:  dojo.NodeList, position: number): Function;
+        addContent(content:  dojo.NodeList, position?: number): Function;
         /**
          * places any/all elements in queryOrListOrNode at a
          * position relative to the first element in this list.
@@ -2064,7 +2064,7 @@ declare module dojo {
          * @param queryOrListOrNode a DOM node or a query string or a query result.Represents the nodes to be adopted relative to thefirst element of this NodeList.             
          * @param position               Optionalcan be one of:"last" (default)"first""before""after""only""replace"or an offset in the childNodes property             
          */
-        adopt(queryOrListOrNode: String, position: String): any;
+        adopt(queryOrListOrNode: String, position?: String): any;
         /**
          * places any/all elements in queryOrListOrNode at a
          * position relative to the first element in this list.
@@ -2073,7 +2073,7 @@ declare module dojo {
          * @param queryOrListOrNode a DOM node or a query string or a query result.Represents the nodes to be adopted relative to thefirst element of this NodeList.             
          * @param position               Optionalcan be one of:"last" (default)"first""before""after""only""replace"or an offset in the childNodes property             
          */
-        adopt(queryOrListOrNode: any[], position: String): any;
+        adopt(queryOrListOrNode: any[], position?: String): any;
         /**
          * places any/all elements in queryOrListOrNode at a
          * position relative to the first element in this list.
@@ -2082,7 +2082,7 @@ declare module dojo {
          * @param queryOrListOrNode a DOM node or a query string or a query result.Represents the nodes to be adopted relative to thefirst element of this NodeList.             
          * @param position               Optionalcan be one of:"last" (default)"first""before""after""only""replace"or an offset in the childNodes property             
          */
-        adopt(queryOrListOrNode: HTMLElement, position: String): any;
+        adopt(queryOrListOrNode: HTMLElement, position?: String): any;
         /**
          * Places the content after every node in the NodeList.
          * The content will be cloned if the length of NodeList
@@ -2128,14 +2128,14 @@ declare module dojo {
          * @param onEnd               OptionalA function to be called when the animation ends             
          * @param delay               Optionalhow long to delay playing the returned animation             
          */
-        anim(properties: Object, duration: number, easing: Function, onEnd: Function, delay: number): any;
+        anim(properties: Object, duration?: number, easing?: Function, onEnd?: Function, delay?: number): any;
         /**
          * Animate all elements of this NodeList across the properties specified.
          * syntax identical to dojo.animateProperty
          * 
          * @param args               OptionalAdditional dojo/_base/fx.Animation arguments to mix into this set with the addition ofan auto parameter.             
          */
-        animateProperty(args: Object): any;
+        animateProperty(args?: Object): any;
         /**
          * appends the content to every node in the NodeList.
          * The content will be cloned if the length of NodeList
@@ -2187,7 +2187,7 @@ declare module dojo {
          * @param property the attribute to get/set             
          * @param value               Optionaloptional. The value to set the property to             
          */
-        attr(property: String, value: String): any;
+        attr(property: String, value?: String): any;
         /**
          * Places the content before every node in the NodeList.
          * The content will be cloned if the length of NodeList
@@ -2223,7 +2223,7 @@ declare module dojo {
          * 
          * @param query               Optionala CSS selector.             
          */
-        children(query: String): any;
+        children(query?: String): any;
         /**
          * Clones all the nodes in this NodeList and returns them as a new NodeList.
          * Only the DOM nodes are cloned, not any attached event handlers.
@@ -2239,7 +2239,7 @@ declare module dojo {
          * @param query a CSS selector.             
          * @param root               OptionalIf specified, query is relative to "root" rather than document body.             
          */
-        closest(query: String, root: String): any;
+        closest(query: String, root?: String): any;
         /**
          * Returns closest parent that matches query, including current node in this
          * dojo/NodeList if it matches the query.
@@ -2249,7 +2249,7 @@ declare module dojo {
          * @param query a CSS selector.             
          * @param root               OptionalIf specified, query is relative to "root" rather than document body.             
          */
-        closest(query: String, root: HTMLElement): any;
+        closest(query: String, root?: HTMLElement): any;
         /**
          * Returns a new NodeList comprised of items in this NodeList
          * as well as items passed in as parameters
@@ -2271,7 +2271,7 @@ declare module dojo {
          * @param objOrFunc if 2 arguments are passed (methodName, objOrFunc), objOrFunc shouldreference a function or be the name of the function in the globalnamespace to attach. If 3 arguments are provided(methodName, objOrFunc, funcName), objOrFunc must be the scope tolocate the bound function in             
          * @param funcName               Optionaloptional. A string naming the function in objOrFunc to bind to theevent. May also be a function reference.             
          */
-        connect(methodName: String, objOrFunc: Object, funcName: String): void;
+        connect(methodName: String, objOrFunc: Object, funcName?: String): void;
         /**
          * Attach event handlers to every item of the NodeList. Uses dojo.connect()
          * so event properties are normalized.
@@ -2282,7 +2282,7 @@ declare module dojo {
          * @param objOrFunc if 2 arguments are passed (methodName, objOrFunc), objOrFunc shouldreference a function or be the name of the function in the globalnamespace to attach. If 3 arguments are provided(methodName, objOrFunc, funcName), objOrFunc must be the scope tolocate the bound function in             
          * @param funcName               Optionaloptional. A string naming the function in objOrFunc to bind to theevent. May also be a function reference.             
          */
-        connect(methodName: String, objOrFunc: Function, funcName: String): void;
+        connect(methodName: String, objOrFunc: Function, funcName?: String): void;
         /**
          * Attach event handlers to every item of the NodeList. Uses dojo.connect()
          * so event properties are normalized.
@@ -2293,7 +2293,7 @@ declare module dojo {
          * @param objOrFunc if 2 arguments are passed (methodName, objOrFunc), objOrFunc shouldreference a function or be the name of the function in the globalnamespace to attach. If 3 arguments are provided(methodName, objOrFunc, funcName), objOrFunc must be the scope tolocate the bound function in             
          * @param funcName               Optionaloptional. A string naming the function in objOrFunc to bind to theevent. May also be a function reference.             
          */
-        connect(methodName: String, objOrFunc: String, funcName: String): void;
+        connect(methodName: String, objOrFunc: String, funcName?: String): void;
         /**
          * Deprecated: Use position() for border-box x/y/w/h
          * or marginBox() for margin-box w/h/l/t.
@@ -2317,7 +2317,7 @@ declare module dojo {
          * @param key               OptionalIf an object, act as a setter and iterate over said object setting data items as defined.If a string, and value present, set the data for defined key to valueIf a string, and value absent, act as a getter, returning the data associated with said key             
          * @param value               OptionalThe value to set for said key, provided key is a string (and not an object)             
          */
-        data(key: Object, value: any): any;
+        data(key?: Object, value?: any): any;
         /**
          * stash or get some arbitrary data on/from these nodes.
          * Stash or get some arbitrary data on/from these nodes. This private _data function is
@@ -2332,7 +2332,7 @@ declare module dojo {
          * @param key               OptionalIf an object, act as a setter and iterate over said object setting data items as defined.If a string, and value present, set the data for defined key to valueIf a string, and value absent, act as a getter, returning the data associated with said key             
          * @param value               OptionalThe value to set for said key, provided key is a string (and not an object)             
          */
-        data(key: String, value: any): any;
+        data(key?: String, value?: any): any;
         /**
          * Monitor nodes in this NodeList for [bubbled] events on nodes that match selector.
          * Calls fn(evt) for those events, where (inside of fn()), this == the node
@@ -2413,19 +2413,19 @@ declare module dojo {
          * @param callback the callback             
          * @param thisObject               Optionalthe context             
          */
-        every(callback: Function, thisObject: Object): any;
+        every(callback: Function, thisObject?: Object): any;
         /**
          * fade in all elements of this NodeList via dojo.fadeIn
          * 
          * @param args               OptionalAdditional dojo/_base/fx.Animation arguments to mix into this set with the addition ofan auto parameter.             
          */
-        fadeIn(args: Object): any;
+        fadeIn(args?: Object): any;
         /**
          * fade out all elements of this NodeList via dojo.fadeOut
          * 
          * @param args               OptionalAdditional dojo/_base/fx.Animation arguments to mix into this set with the addition ofan auto parameter.             
          */
-        fadeOut(args: Object): any;
+        fadeOut(args?: Object): any;
         /**
          * "masks" the built-in javascript filter() method (supported
          * in Dojo via dojo.filter) to support passing a simple
@@ -2477,7 +2477,7 @@ declare module dojo {
          * 
          * @param value               Optional            
          */
-        html(value: String): any;
+        html(value?: String): any;
         /**
          * allows setting the innerHTML of each node in the NodeList,
          * if there is a value passed in, otherwise, reads the innerHTML value of the first node.
@@ -2495,7 +2495,7 @@ declare module dojo {
          * 
          * @param value               Optional            
          */
-        html(value: HTMLElement): any;
+        html(value?: HTMLElement): any;
         /**
          * allows setting the innerHTML of each node in the NodeList,
          * if there is a value passed in, otherwise, reads the innerHTML value of the first node.
@@ -2513,7 +2513,7 @@ declare module dojo {
          * 
          * @param value               Optional            
          */
-        html(value: NodeList): any;
+        html(value?: NodeList): any;
         /**
          * see dojo/_base/array.indexOf(). The primary difference is that the acted-on
          * array is implicitly this NodeList
@@ -2542,7 +2542,7 @@ declare module dojo {
          * 
          * @param value               Optional            
          */
-        innerHTML(value: String): any;
+        innerHTML(value?: String): any;
         /**
          * allows setting the innerHTML of each node in the NodeList,
          * if there is a value passed in, otherwise, reads the innerHTML value of the first node.
@@ -2560,7 +2560,7 @@ declare module dojo {
          * 
          * @param value               Optional            
          */
-        innerHTML(value: HTMLElement): any;
+        innerHTML(value?: HTMLElement): any;
         /**
          * allows setting the innerHTML of each node in the NodeList,
          * if there is a value passed in, otherwise, reads the innerHTML value of the first node.
@@ -2578,7 +2578,7 @@ declare module dojo {
          * 
          * @param value               Optional            
          */
-        innerHTML(value: NodeList): any;
+        innerHTML(value?: NodeList): any;
         /**
          * The nodes in this NodeList will be placed after the nodes
          * matched by the query passed to insertAfter.
@@ -2607,7 +2607,7 @@ declare module dojo {
          * @param declaredClass             
          * @param properties               Optional            
          */
-        instantiate(declaredClass: String, properties: Object): any;
+        instantiate(declaredClass: String, properties?: Object): any;
         /**
          * Create a new instance of a specified class, using the
          * specified properties and each node in the NodeList as a
@@ -2616,7 +2616,7 @@ declare module dojo {
          * @param declaredClass             
          * @param properties               Optional            
          */
-        instantiate(declaredClass: Object, properties: Object): any;
+        instantiate(declaredClass: Object, properties?: Object): any;
         /**
          * Returns the last node in this dojo/NodeList as a dojo/NodeList.
          * .end() can be used on the returned dojo/NodeList to get back to the
@@ -2634,7 +2634,7 @@ declare module dojo {
          * @param value The value to search for.             
          * @param fromIndex               OptionalThe location to start searching from. Optional. Defaults to 0.             
          */
-        lastIndexOf(value: Object, fromIndex: number): any;
+        lastIndexOf(value: Object, fromIndex?: number): any;
         /**
          * see dojo/_base/array.map(). The primary difference is that the acted-on
          * array is implicitly this NodeList and the return is a
@@ -2643,7 +2643,7 @@ declare module dojo {
          * @param func             
          * @param obj               Optional            
          */
-        map(func: Function, obj: Function): any;
+        map(func: Function, obj?: Function): any;
         /**
          * Returns margin-box size of nodes
          * 
@@ -2657,7 +2657,7 @@ declare module dojo {
          * 
          * @param query               Optionala CSS selector.             
          */
-        next(query: String): any;
+        next(query?: String): any;
         /**
          * Returns all sibling elements that come after the nodes in this dojo/NodeList.
          * Optionally takes a query to filter the sibling elements.
@@ -2666,7 +2666,7 @@ declare module dojo {
          * 
          * @param query               Optionala CSS selector.             
          */
-        nextAll(query: String): any;
+        nextAll(query?: String): any;
         /**
          * Returns the odd nodes in this dojo/NodeList as a dojo/NodeList.
          * .end() can be used on the returned dojo/NodeList to get back to the
@@ -2687,7 +2687,7 @@ declare module dojo {
          * 
          * @param filter               OptionalCSS selector like ".foo" or "div > span"             
          */
-        orphan(filter: String): any;
+        orphan(filter?: String): any;
         /**
          * Returns immediate parent elements for nodes in this dojo/NodeList.
          * Optionally takes a query to filter the parent elements.
@@ -2696,7 +2696,7 @@ declare module dojo {
          * 
          * @param query               Optionala CSS selector.             
          */
-        parent(query: String): any;
+        parent(query?: String): any;
         /**
          * Returns all parent elements for nodes in this dojo/NodeList.
          * Optionally takes a query to filter the child elements.
@@ -2705,7 +2705,7 @@ declare module dojo {
          * 
          * @param query               Optionala CSS selector.             
          */
-        parents(query: String): any;
+        parents(query?: String): any;
         /**
          * places elements of this node list relative to the first element matched
          * by queryOrNode. Returns the original NodeList. See: dojo/dom-construct.place
@@ -2774,7 +2774,7 @@ declare module dojo {
          * 
          * @param query               Optionala CSS selector.             
          */
-        prev(query: String): any;
+        prev(query?: String): any;
         /**
          * Returns all sibling elements that come before the nodes in this dojo/NodeList.
          * Optionally takes a query to filter the sibling elements.
@@ -2785,7 +2785,7 @@ declare module dojo {
          * 
          * @param query               Optionala CSS selector.             
          */
-        prevAll(query: String): any;
+        prevAll(query?: String): any;
         /**
          * Returns a new list whose members match the passed query,
          * assuming elements of the current NodeList as the root for
@@ -2800,7 +2800,7 @@ declare module dojo {
          * 
          * @param filter               OptionalCSS selector like ".foo" or "div > span"             
          */
-        remove(filter: String): any;
+        remove(filter?: String): any;
         /**
          * Removes an attribute from each node in the list.
          * 
@@ -2812,7 +2812,7 @@ declare module dojo {
          * 
          * @param className               OptionalAn optional String class name to remove, or several space-separatedclass names, or an array of class names. If omitted, all class nameswill be deleted.             
          */
-        removeClass(className: String): any;
+        removeClass(className?: String): any;
         /**
          * removes the specified class from every node in the list
          * 
@@ -2832,7 +2832,7 @@ declare module dojo {
          * 
          * @param key               OptionalIf omitted, clean all data for this node.If passed, remove the data item found at key             
          */
-        removeData(key: String): void;
+        removeData(key?: String): void;
         /**
          * replaces nodes matched by the query passed to replaceAll with the nodes
          * in this NodeList.
@@ -2850,7 +2850,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replaceClass(addClassStr: String, removeClassStr: String): void;
+        replaceClass(addClassStr: String, removeClassStr?: String): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling removeClass() and addClass()
@@ -2858,7 +2858,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replaceClass(addClassStr: any[], removeClassStr: String): void;
+        replaceClass(addClassStr: any[], removeClassStr?: String): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling removeClass() and addClass()
@@ -2866,7 +2866,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replaceClass(addClassStr: String, removeClassStr: any[]): void;
+        replaceClass(addClassStr: String, removeClassStr?: any[]): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling removeClass() and addClass()
@@ -2874,7 +2874,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replaceClass(addClassStr: any[], removeClassStr: any[]): void;
+        replaceClass(addClassStr: any[], removeClassStr?: any[]): void;
         /**
          * Replaces each node in ths NodeList with the content passed to replaceWith.
          * The content will be cloned if the length of NodeList
@@ -2910,7 +2910,7 @@ declare module dojo {
          * 
          * @param query               Optionala CSS selector.             
          */
-        siblings(query: String): any;
+        siblings(query?: String): any;
         /**
          * Returns a new NodeList, maintaining this one in place
          * This method behaves exactly like the Array.slice method
@@ -2921,13 +2921,13 @@ declare module dojo {
          * @param begin Can be a positive or negative integer, with positiveintegers noting the offset to begin at, and negativeintegers denoting an offset from the end (i.e., to the leftof the end)             
          * @param end               OptionalOptional parameter to describe what position relative tothe NodeList's zero index to end the slice at. Like begin,can be positive or negative.             
          */
-        slice(begin: number, end: number): any;
+        slice(begin: number, end?: number): any;
         /**
          * slide all elements of the node list to the specified place via dojo/fx.slideTo()
          * 
          * @param args               OptionalAdditional dojo/_base/fx.Animation arguments to mix into this set with the addition ofan auto parameter.             
          */
-        slideTo(args: Object): any;
+        slideTo(args?: Object): any;
         /**
          * Takes the same structure of arguments and returns as
          * dojo/_base/array.some() with the caveat that the passed array is
@@ -2938,7 +2938,7 @@ declare module dojo {
          * @param callback the callback             
          * @param thisObject               Optionalthe context             
          */
-        some(callback: Function, thisObject: Object): any;
+        some(callback: Function, thisObject?: Object): any;
         /**
          * Returns a new NodeList, manipulating this NodeList based on
          * the arguments passed, potentially splicing in new elements
@@ -2954,14 +2954,14 @@ declare module dojo {
          * @param howmany               OptionalOptional parameter to describe what position relative tothe NodeList's zero index to end the slice at. Like begin,can be positive or negative.             
          * @param item               OptionalAny number of optional parameters may be passed in to bespliced into the NodeList             
          */
-        splice(index: number, howmany: number, item: Object[]): any;
+        splice(index: number, howmany?: number, item?: Object[]): any;
         /**
          * gets or sets the CSS property for every element in the NodeList
          * 
          * @param property the CSS property to get/set, in JavaScript notation("lineHieght" instead of "line-height")             
          * @param value               Optionaloptional. The value to set the property to             
          */
-        style(property: String, value: String): any;
+        style(property: String, value?: String): any;
         /**
          * allows setting the text value of each node in the NodeList,
          * if there is a value passed in, otherwise, returns the text value for all the
@@ -2977,7 +2977,7 @@ declare module dojo {
          * @param className the CSS class to add             
          * @param condition               OptionalIf passed, true means to add the class, false means to remove.             
          */
-        toggleClass(className: String, condition: boolean): void;
+        toggleClass(className: String, condition?: boolean): void;
         /**
          * Animate the effect of adding or removing a class to all nodes in this list.
          * see dojox.fx.toggleClass
@@ -3014,13 +3014,13 @@ declare module dojo {
          * 
          * @param args               OptionalAdditional dojo/_base/fx.Animation arguments to mix into this set with the addition ofan auto parameter.             
          */
-        wipeIn(args: Object): any;
+        wipeIn(args?: Object): any;
         /**
          * wipe out all elements of this NodeList via dojo/fx.wipeOut()
          * 
          * @param args               OptionalAdditional dojo/_base/fx.Animation arguments to mix into this set with the addition ofan auto parameter.             
          */
-        wipeOut(args: Object): any;
+        wipeOut(args?: Object): any;
         /**
          * Wrap each node in the NodeList with html passed to wrap.
          * html will be cloned if the NodeList has more than one
@@ -3112,7 +3112,7 @@ declare module dojo {
          * 
          * @param params               Optional            
          */
-        postscript(params: Object): void;
+        postscript(params?: Object): void;
         /**
          * Set a property on a Stateful instance
          * Sets named properties on a stateful object and notifies any watchers of
@@ -3325,7 +3325,7 @@ declare module dojo {
                  * @param mixins Specifies a list of bases (the left-most one is the most deepestbase).             
                  * @param props               OptionalAn optional object whose properties are copied to the created prototype.             
                  */
-                createSubclass(mixins: Function[], props: Object): dojo._base.declare.__DeclareCreatedObject;
+                createSubclass(mixins: Function[], props?: Object): dojo._base.declare.__DeclareCreatedObject;
                 /**
                  * Adds all properties and methods of source to constructor's
                  * prototype, making them available to all instances created with
@@ -3351,7 +3351,7 @@ declare module dojo {
                  * @param name               OptionalThe optional method name. Should be the same as the caller'sname. Usually "name" is specified in complex dynamic cases, whenthe calling method was dynamically added, undecorated bydeclare(), and it cannot be determined.             
                  * @param args The caller supply this argument, which should be the original"arguments".             
                  */
-                getInherited(name: String, args: Object): any;
+                getInherited(name?: String, args?: Object): any;
                 /**
                  * Calls a super method.
                  * This method is used inside method of classes produced with
@@ -3382,7 +3382,7 @@ declare module dojo {
                  * @param args The caller supply this argument, which should be the original"arguments".             
                  * @param newArgs               OptionalIf "true", the found function will be returned withoutexecuting it.If Array, it will be used to call a super method. Otherwise"args" will be used.             
                  */
-                inherited(name: String, args: Object, newArgs: Object): any;
+                inherited(name?: String, args?: Object, newArgs?: Object): any;
                 /**
                  * Checks the inheritance chain to see if it is inherited from this
                  * class.
@@ -3476,7 +3476,7 @@ declare module dojo {
              * @param callback               OptionalThe callback attached to this deferred object.             
              * @param errback               OptionalThe error callback attached to this deferred object.             
              */
-            addCallbacks(callback: Function, errback: Function): any;
+            addCallbacks(callback?: Function, errback?: Function): any;
             /**
              * Adds error callback for this deferred instance.
              * 
@@ -3557,7 +3557,7 @@ declare module dojo {
              * @param errorCallback               Optional            
              * @param progressCallback               Optional            
              */
-            then(resolvedCallback: Function, errorCallback: Function, progressCallback: Function): any;
+            then(resolvedCallback?: Function, errorCallback?: Function, progressCallback?: Function): any;
             /**
              * Transparently applies callbacks to values and/or promises.
              * Accepts promises but also transparently handles non-promises. If no
@@ -3574,7 +3574,7 @@ declare module dojo {
              * @param errback               OptionalCallback to be invoked when the promise is rejected.             
              * @param progback               OptionalCallback to be invoked when the promise emits a progress update.             
              */
-            when(valueOrPromise: any, callback: Function, errback: Function, progback: Function): any;
+            when(valueOrPromise?: any, callback?: Function, errback?: Function, progback?: Function): any;
         }
 
         module Deferred {
@@ -3739,7 +3739,7 @@ declare module dojo {
              * @param formNode             
              * @param prettyPrint               Optional            
              */
-            formToJson(formNode: HTMLElement, prettyPrint: boolean): any;
+            formToJson(formNode: HTMLElement, prettyPrint?: boolean): any;
             /**
              * Create a serialized JSON string from a form node or string
              * ID identifying the form to serialize
@@ -3747,7 +3747,7 @@ declare module dojo {
              * @param formNode             
              * @param prettyPrint               Optional            
              */
-            formToJson(formNode: String, prettyPrint: boolean): any;
+            formToJson(formNode: String, prettyPrint?: boolean): any;
             /**
              * Serialize a form node to a JavaScript object.
              * Returns the values encoded in an HTML form as
@@ -4115,7 +4115,7 @@ declare module dojo {
              * @param weight             
              * @param obj               Optional            
              */
-            blendColors(start: dojo._base.Color, end: dojo._base.Color, weight: number, obj: dojo._base.Color): any;
+            blendColors(start: dojo._base.Color, end: dojo._base.Color, weight: number, obj?: dojo._base.Color): any;
             /**
              * Builds a Color from a 3 or 4 element array, mapping each
              * element in sequence to the rgb(a) values of the color.
@@ -4123,7 +4123,7 @@ declare module dojo {
              * @param a             
              * @param obj               Optional            
              */
-            fromArray(a: any[], obj: dojo._base.Color): any;
+            fromArray(a: any[], obj?: dojo._base.Color): any;
             /**
              * Converts a hex string with a '#' prefix to a color object.
              * Supports 12-bit #rgb shorthand. Optionally accepts a
@@ -4132,7 +4132,7 @@ declare module dojo {
              * @param color             
              * @param obj               Optional            
              */
-            fromHex(color: String, obj: dojo._base.Color): any;
+            fromHex(color: String, obj?: dojo._base.Color): any;
             /**
              * get rgb(a) array from css-style color declarations
              * this function can handle all 4 CSS3 Color Module formats: rgb,
@@ -4141,7 +4141,7 @@ declare module dojo {
              * @param color             
              * @param obj               Optional            
              */
-            fromRgb(color: String, obj: dojo._base.Color): any;
+            fromRgb(color: String, obj?: dojo._base.Color): any;
             /**
              * Parses str for a color value. Accepts hex, rgb, and rgba
              * style color values.
@@ -4153,14 +4153,14 @@ declare module dojo {
              * @param str             
              * @param obj               Optional            
              */
-            fromString(str: String, obj: dojo._base.Color): any;
+            fromString(str: String, obj?: dojo._base.Color): any;
             /**
              * creates a greyscale color with an optional alpha
              * 
              * @param g             
              * @param a               Optional            
              */
-            makeGrey(g: number, a: number): void;
+            makeGrey(g: number, a?: number): void;
             /**
              * makes sure that the object has correct attributes
              * 
@@ -4205,7 +4205,7 @@ declare module dojo {
              * 
              * @param includeAlpha               Optional            
              */
-            toCss(includeAlpha: boolean): String;
+            toCss(includeAlpha?: boolean): String;
             /**
              * Returns a CSS color string in hexadecimal representation
              * 
@@ -5051,7 +5051,7 @@ declare module dojo {
              * @param thisObject               Optionalmay be used to scope the call to callback             
              * @param Ctr             
              */
-            map(arr: any[], callback: Function, thisObject: Object, Ctr: any): any[];
+            map(arr: any[], callback: Function, thisObject?: Object, Ctr?: any): any[];
             /**
              * applies callback to each element of arr and returns
              * an Array with the results
@@ -5066,7 +5066,7 @@ declare module dojo {
              * @param thisObject               Optionalmay be used to scope the call to callback             
              * @param Ctr             
              */
-            map(arr: String, callback: Function, thisObject: Object, Ctr: any): any[];
+            map(arr: String, callback: Function, thisObject?: Object, Ctr?: any): any[];
             /**
              * applies callback to each element of arr and returns
              * an Array with the results
@@ -5081,7 +5081,7 @@ declare module dojo {
              * @param thisObject               Optionalmay be used to scope the call to callback             
              * @param Ctr             
              */
-            map(arr: any[], callback: String, thisObject: Object, Ctr: any): any[];
+            map(arr: any[], callback: String, thisObject?: Object, Ctr?: any): any[];
             /**
              * applies callback to each element of arr and returns
              * an Array with the results
@@ -5096,7 +5096,7 @@ declare module dojo {
              * @param thisObject               Optionalmay be used to scope the call to callback             
              * @param Ctr             
              */
-            map(arr: String, callback: String, thisObject: Object, Ctr: any): any[];
+            map(arr: String, callback: String, thisObject?: Object, Ctr?: any): any[];
             /**
              * Determines whether or not any item in arr satisfies the
              * condition implemented by callback.
@@ -5206,7 +5206,7 @@ declare module dojo {
              * @param method A function reference, or name of a function in context.The function identified by method fires after event does.method receives the same arguments as the event.See context argument comments for information on method's scope.             
              * @param dontFix               OptionalIf obj is a DOM node, set dontFix to true to prevent delegationof this connection to the DOM event manager.             
              */
-            connect(obj: Object, event: String, context: Object, method: String, dontFix: boolean): any;
+            connect(obj: Object, event: String, context: Object, method: String, dontFix?: boolean): any;
             /**
              * dojo.connect is a deprecated event handling and delegation method in
              * Dojo. It allows one function to "listen in" on the execution of
@@ -5246,7 +5246,7 @@ declare module dojo {
              * @param method A function reference, or name of a function in context.The function identified by method fires after event does.method receives the same arguments as the event.See context argument comments for information on method's scope.             
              * @param dontFix               OptionalIf obj is a DOM node, set dontFix to true to prevent delegationof this connection to the DOM event manager.             
              */
-            connect(obj: Object, event: String, context: any, method: String, dontFix: boolean): any;
+            connect(obj: Object, event: String, context: any, method: String, dontFix?: boolean): any;
             /**
              * dojo.connect is a deprecated event handling and delegation method in
              * Dojo. It allows one function to "listen in" on the execution of
@@ -5286,7 +5286,7 @@ declare module dojo {
              * @param method A function reference, or name of a function in context.The function identified by method fires after event does.method receives the same arguments as the event.See context argument comments for information on method's scope.             
              * @param dontFix               OptionalIf obj is a DOM node, set dontFix to true to prevent delegationof this connection to the DOM event manager.             
              */
-            connect(obj: Object, event: String, context: Object, method: Function, dontFix: boolean): any;
+            connect(obj: Object, event: String, context: Object, method: Function, dontFix?: boolean): any;
             /**
              * dojo.connect is a deprecated event handling and delegation method in
              * Dojo. It allows one function to "listen in" on the execution of
@@ -5326,7 +5326,7 @@ declare module dojo {
              * @param method A function reference, or name of a function in context.The function identified by method fires after event does.method receives the same arguments as the event.See context argument comments for information on method's scope.             
              * @param dontFix               OptionalIf obj is a DOM node, set dontFix to true to prevent delegationof this connection to the DOM event manager.             
              */
-            connect(obj: Object, event: String, context: any, method: Function, dontFix: boolean): any;
+            connect(obj: Object, event: String, context: any, method: Function, dontFix?: boolean): any;
             /**
              * Ensure that every time obj.event() is called, a message is published
              * on the topic. Returns a handle which can be passed to
@@ -5357,7 +5357,7 @@ declare module dojo {
              * @param topic The name of the topic to publish.             
              * @param args               OptionalAn array of arguments. The arguments will be appliedto each topic subscriber (as first class parameters, via apply).             
              */
-            publish(topic: String, args: any[]): any;
+            publish(topic: String, args?: any[]): any;
             /**
              * Attach a listener to a named topic. The listener function is invoked whenever the
              * named topic is published (see: dojo.publish).
@@ -5367,7 +5367,7 @@ declare module dojo {
              * @param context               OptionalScope in which method will be invoked, or null for default scope.             
              * @param method The name of a function in context, or a function reference. This is the function thatis invoked when topic is published.             
              */
-            subscribe(topic: String, context: Object, method: String): any;
+            subscribe(topic: String, context?: Object, method?: String): any;
             /**
              * Attach a listener to a named topic. The listener function is invoked whenever the
              * named topic is published (see: dojo.publish).
@@ -5377,7 +5377,7 @@ declare module dojo {
              * @param context               OptionalScope in which method will be invoked, or null for default scope.             
              * @param method The name of a function in context, or a function reference. This is the function thatis invoked when topic is published.             
              */
-            subscribe(topic: String, context: Object, method: Function): any;
+            subscribe(topic: String, context?: Object, method?: Function): any;
             /**
              * Remove a topic listener.
              * 
@@ -5469,7 +5469,7 @@ declare module dojo {
              * @param onEnd               OptionalA function to be called when the animation finishesrunning.             
              * @param delay               OptionalThe number of milliseconds to delay beginning theanimation by. The default is 0.             
              */
-            anim  (node: HTMLElement, properties: Object, duration: number, easing: Function, onEnd: Function, delay: number): any ;
+            anim  (node: HTMLElement, properties: Object, duration?: number, easing?: Function, onEnd?: Function, delay?: number): any ;
             /**
              * A simpler interface to animateProperty(), also returns
              * an instance of Animation but begins the animation
@@ -5490,7 +5490,7 @@ declare module dojo {
              * @param onEnd               OptionalA function to be called when the animation finishesrunning.             
              * @param delay               OptionalThe number of milliseconds to delay beginning theanimation by. The default is 0.             
              */
-            anim  (node: String, properties: Object, duration: number, easing: Function, onEnd: Function, delay: number): any ;
+            anim  (node: String, properties: Object, duration?: number, easing?: Function, onEnd?: Function, delay?: number): any ;
             /**
              * Returns an animation that will transition the properties of
              * node defined in args depending how they are defined in
@@ -5502,7 +5502,7 @@ declare module dojo {
              * 
              * @param args An object with the following properties:properties (Object, optional): A hash map of style properties to Objects describing the transition,such as the properties of _Line with an additional 'units' propertynode (DOMNode|String): The node referenced in the animationduration (Integer, optional): Duration of the animation in milliseconds.easing (Function, optional): An easing function.            
              */
-            animateProperty  (args: Object): any ;
+            animateProperty  (args?: Object): any ;
             
             /**
              * Returns an animation that will fade node defined in 'args' from
@@ -5584,7 +5584,7 @@ declare module dojo {
              * @param name Path to an object, in the form "A.B.C".             
              * @param obj               OptionalObject to use as root of path. Defaults to'dojo.global'. Null may be passed.             
              */
-            exists(name: String, obj: Object): boolean;
+            exists(name: String, obj?: Object): boolean;
             /**
              * Adds all properties and methods of props to constructor's
              * prototype, making them available to all instances created with
@@ -5603,7 +5603,7 @@ declare module dojo {
              * @param create               OptionalOptional. Defaults to false. If true, Objects will becreated at any point along the 'path' that is undefined.             
              * @param context               OptionalOptional. Object to use as root of path. Defaults to'dojo.global'. Null may be passed.             
              */
-            getObject(name: String, create: boolean, context: Object): any;
+            getObject(name: String, create?: boolean, context?: Object): any;
             /**
              * Returns a function that will only ever execute in the a given scope.
              * This allows for easy use of object member functions
@@ -5715,7 +5715,7 @@ declare module dojo {
              * @param map If an object, it is used as a dictionary to look up substitutions.If a function, it is called for every substitution with following parameters:a whole match, a name, an offset, and the whole templatestring (see https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/String/replacefor more details).             
              * @param pattern               OptionalOptional regular expression objects that overrides the default pattern.Must be global and match one item. The default is: /{([^}]+)}/g,which matches patterns like that: "{xxx}", where "xxx" is any sequenceof characters, which doesn't include "}".             
              */
-            replace(tmpl: String, map: Object, pattern: RegExp): String;
+            replace(tmpl: String, map: Object, pattern?: RegExp): String;
             /**
              * Performs parameterized substitutions on a string. Throws an
              * exception if any parameter is unmatched.
@@ -5724,7 +5724,7 @@ declare module dojo {
              * @param map If an object, it is used as a dictionary to look up substitutions.If a function, it is called for every substitution with following parameters:a whole match, a name, an offset, and the whole templatestring (see https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/String/replacefor more details).             
              * @param pattern               OptionalOptional regular expression objects that overrides the default pattern.Must be global and match one item. The default is: /{([^}]+)}/g,which matches patterns like that: "{xxx}", where "xxx" is any sequenceof characters, which doesn't include "}".             
              */
-            replace(tmpl: String, map: Function, pattern: RegExp): String;
+            replace(tmpl: String, map: Function, pattern?: RegExp): String;
             /**
              * Set a property from a dot-separated string, such as "A.B.C"
              * Useful for longer api chains where you have to test each object in
@@ -5736,7 +5736,7 @@ declare module dojo {
              * @param value value or object to place at location given by name             
              * @param context               OptionalOptional. Object to use as root of path. Defaults todojo.global.             
              */
-            setObject(name: String, value: any, context: Object): any;
+            setObject(name: String, value: any, context?: Object): any;
             /**
              * Trims whitespace from both sides of the string
              * This version of trim() was selected for inclusion into the base due
@@ -5779,7 +5779,7 @@ declare module dojo {
              * @param obj               Optional            
              * @param functionName               Optional            
              */
-            addOnUnload(obj: Object, functionName: String): void;
+            addOnUnload(obj?: Object, functionName?: String): void;
             /**
              * registers a function to be triggered when the page unloads.
              * The first time that addOnUnload is called Dojo will
@@ -5802,7 +5802,7 @@ declare module dojo {
              * @param obj               Optional            
              * @param functionName               Optional            
              */
-            addOnUnload(obj: Function, functionName: String): void;
+            addOnUnload(obj?: Function, functionName?: String): void;
             /**
              * registers a function to be triggered when the page unloads.
              * The first time that addOnUnload is called Dojo will
@@ -5825,7 +5825,7 @@ declare module dojo {
              * @param obj               Optional            
              * @param functionName               Optional            
              */
-            addOnUnload(obj: Object, functionName: Function): void;
+            addOnUnload(obj?: Object, functionName?: Function): void;
             /**
              * registers a function to be triggered when the page unloads.
              * The first time that addOnUnload is called Dojo will
@@ -5848,7 +5848,7 @@ declare module dojo {
              * @param obj               Optional            
              * @param functionName               Optional            
              */
-            addOnUnload(obj: Function, functionName: Function): void;
+            addOnUnload(obj?: Function, functionName?: Function): void;
             /**
              * registers a function to be triggered when window.onunload
              * fires.
@@ -5866,7 +5866,7 @@ declare module dojo {
              * @param obj               Optional            
              * @param functionName               Optional            
              */
-            addOnWindowUnload(obj: Object, functionName: String): void;
+            addOnWindowUnload(obj?: Object, functionName?: String): void;
             /**
              * registers a function to be triggered when window.onunload
              * fires.
@@ -5884,7 +5884,7 @@ declare module dojo {
              * @param obj               Optional            
              * @param functionName               Optional            
              */
-            addOnWindowUnload(obj: Function, functionName: String): void;
+            addOnWindowUnload(obj?: Function, functionName?: String): void;
             /**
              * registers a function to be triggered when window.onunload
              * fires.
@@ -5902,7 +5902,7 @@ declare module dojo {
              * @param obj               Optional            
              * @param functionName               Optional            
              */
-            addOnWindowUnload(obj: Object, functionName: Function): void;
+            addOnWindowUnload(obj?: Object, functionName?: Function): void;
             /**
              * registers a function to be triggered when window.onunload
              * fires.
@@ -5920,7 +5920,7 @@ declare module dojo {
              * @param obj               Optional            
              * @param functionName               Optional            
              */
-            addOnWindowUnload(obj: Function, functionName: Function): void;
+            addOnWindowUnload(obj?: Function, functionName?: Function): void;
         }
         /**
          * Permalink: http://dojotoolkit.org/api/1.9/dojo/_base/window.html
@@ -5946,7 +5946,7 @@ declare module dojo {
              * 
              * @param doc               Optional            
              */
-            body(doc: HTMLDocument): any;
+            body(doc?: HTMLDocument): any;
             /**
              * changes the behavior of many core Dojo functions that deal with
              * namespace and DOM lookup, changing them to work in a new global
@@ -5970,7 +5970,7 @@ declare module dojo {
              * @param thisObject               Optional            
              * @param cbArguments               Optional            
              */
-            withDoc(documentObject: HTMLDocument, callback: Function, thisObject: Object, cbArguments: any[]): any;
+            withDoc(documentObject: HTMLDocument, callback: Function, thisObject?: Object, cbArguments?: any[]): any;
             /**
              * Invoke callback with globalObject as dojo.global and
              * globalObject.document as dojo.doc.
@@ -5985,7 +5985,7 @@ declare module dojo {
              * @param thisObject               Optional            
              * @param cbArguments               Optional            
              */
-            withGlobal(globalObject: Object, callback: Function, thisObject: Object, cbArguments: any[]): any;
+            withGlobal(globalObject: Object, callback: Function, thisObject?: Object, cbArguments?: any[]): any;
         }
         module window {
             /**
@@ -6335,7 +6335,7 @@ declare module dojo {
              * 
              * @param returnWrappers               Optional            
              */
-            AdapterRegistry(returnWrappers: boolean): void;
+            AdapterRegistry(returnWrappers?: boolean): void;
             /**
              * Adds the specified classes to the end of the class list on the
              * passed node. Will not re-apply duplicate classes.
@@ -6379,7 +6379,7 @@ declare module dojo {
              * @param context The context in which to run execute callback, or a callback if not using context             
              * @param callback               OptionalThe function to execute.             
              */
-            addOnLoad(priority: number, context: any, callback: Function): void;
+            addOnLoad(priority: number, context: any, callback?: Function): void;
             /**
              * registers a function to be triggered when the page unloads.
              * The first time that addOnUnload is called Dojo will
@@ -6402,7 +6402,7 @@ declare module dojo {
              * @param obj               Optional            
              * @param functionName               Optional            
              */
-            addOnUnload(obj: Object, functionName: String): void;
+            addOnUnload(obj?: Object, functionName?: String): void;
             /**
              * registers a function to be triggered when the page unloads.
              * The first time that addOnUnload is called Dojo will
@@ -6425,7 +6425,7 @@ declare module dojo {
              * @param obj               Optional            
              * @param functionName               Optional            
              */
-            addOnUnload(obj: Function, functionName: String): void;
+            addOnUnload(obj?: Function, functionName?: String): void;
             /**
              * registers a function to be triggered when the page unloads.
              * The first time that addOnUnload is called Dojo will
@@ -6448,7 +6448,7 @@ declare module dojo {
              * @param obj               Optional            
              * @param functionName               Optional            
              */
-            addOnUnload(obj: Object, functionName: Function): void;
+            addOnUnload(obj?: Object, functionName?: Function): void;
             /**
              * registers a function to be triggered when the page unloads.
              * The first time that addOnUnload is called Dojo will
@@ -6471,7 +6471,7 @@ declare module dojo {
              * @param obj               Optional            
              * @param functionName               Optional            
              */
-            addOnUnload(obj: Function, functionName: Function): void;
+            addOnUnload(obj?: Function, functionName?: Function): void;
             /**
              * registers a function to be triggered when window.onunload fires.
              * Be careful trying to modify the DOM or access JavaScript properties
@@ -6482,7 +6482,7 @@ declare module dojo {
              * @param obj               Optional            
              * @param functionName               Optional            
              */
-            addOnWindowUnload(obj: Object, functionName: String): void;
+            addOnWindowUnload(obj?: Object, functionName?: String): void;
             /**
              * registers a function to be triggered when window.onunload fires.
              * Be careful trying to modify the DOM or access JavaScript properties
@@ -6514,7 +6514,7 @@ declare module dojo {
              * @param onEnd               OptionalA function to be called when the animation finishesrunning.             
              * @param delay               OptionalThe number of milliseconds to delay beginning theanimation by. The default is 0.             
              */
-            anim(node: HTMLElement, properties: Object, duration: number, easing: Function, onEnd: Function, delay: number): any;
+            anim(node: HTMLElement, properties: Object, duration?: number, easing?: Function, onEnd?: Function, delay?: number): any;
             /**
              * A simpler interface to animateProperty(), also returns
              * an instance of Animation but begins the animation
@@ -6535,7 +6535,7 @@ declare module dojo {
              * @param onEnd               OptionalA function to be called when the animation finishesrunning.             
              * @param delay               OptionalThe number of milliseconds to delay beginning theanimation by. The default is 0.             
              */
-            anim(node: String, properties: Object, duration: number, easing: Function, onEnd: Function, delay: number): any;
+            anim(node: String, properties: Object, duration?: number, easing?: Function, onEnd?: Function, delay?: number): any;
             /**
              * Returns an animation that will transition the properties of
              * node defined in args depending how they are defined in
@@ -6584,7 +6584,7 @@ declare module dojo {
              * @param name the name of the attribute to get or set.             
              * @param value               OptionalThe value to set for the attribute             
              */
-            attr(node: HTMLElement, name: String, value: String): any;
+            attr(node: HTMLElement, name: String, value?: String): any;
             /**
              * Gets or sets an attribute on an HTML element.
              * Handles normalized getting and setting of attributes on DOM
@@ -6608,7 +6608,7 @@ declare module dojo {
              * @param name the name of the attribute to get or set.             
              * @param value               OptionalThe value to set for the attribute             
              */
-            attr(node: String, name: String, value: String): any;
+            attr(node: String, name: String, value?: String): any;
             /**
              * Gets or sets an attribute on an HTML element.
              * Handles normalized getting and setting of attributes on DOM
@@ -6632,7 +6632,7 @@ declare module dojo {
              * @param name the name of the attribute to get or set.             
              * @param value               OptionalThe value to set for the attribute             
              */
-            attr(node: HTMLElement, name: Object, value: String): any;
+            attr(node: HTMLElement, name: Object, value?: String): any;
             /**
              * Gets or sets an attribute on an HTML element.
              * Handles normalized getting and setting of attributes on DOM
@@ -6656,7 +6656,7 @@ declare module dojo {
              * @param name the name of the attribute to get or set.             
              * @param value               OptionalThe value to set for the attribute             
              */
-            attr(node: String, name: Object, value: String): any;
+            attr(node: String, name: Object, value?: String): any;
             /**
              * Blend colors end and start with weight from 0 to 1, 0.5 being a 50/50 blend,
              * can reuse a previously allocated Color object for the result
@@ -6666,13 +6666,13 @@ declare module dojo {
              * @param weight             
              * @param obj               Optional            
              */
-            blendColors(start: dojo._base.Color, end: dojo._base.Color, weight: number, obj: dojo._base.Color): any;
+            blendColors(start: dojo._base.Color, end: dojo._base.Color, weight: number, obj?: dojo._base.Color): any;
             /**
              * Return the body element of the specified document or of dojo/_base/window::doc.
              * 
              * @param doc               Optional            
              */
-            body(doc: HTMLDocument): any;
+            body(doc?: HTMLDocument): any;
             /**
              * Returns DOM node with matching id attribute or falsy value (ex: null or undefined)
              * if not found.  If id is a DomNode, this function is a no-op.
@@ -6680,7 +6680,7 @@ declare module dojo {
              * @param id A string to match an HTML id attribute or a reference to a DOM Node             
              * @param doc               OptionalDocument to work in. Defaults to the current value ofdojo/_base/window.doc.  Can be used to retrievenode references from other documents.             
              */
-            byId(id: String, doc: HTMLDocument): any;
+            byId(id: String, doc?: HTMLDocument): any;
             /**
              * Returns DOM node with matching id attribute or falsy value (ex: null or undefined)
              * if not found.  If id is a DomNode, this function is a no-op.
@@ -6688,7 +6688,7 @@ declare module dojo {
              * @param id A string to match an HTML id attribute or a reference to a DOM Node             
              * @param doc               OptionalDocument to work in. Defaults to the current value ofdojo/_base/window.doc.  Can be used to retrievenode references from other documents.             
              */
-            byId(id: HTMLElement, doc: HTMLDocument): any;
+            byId(id: HTMLElement, doc?: HTMLDocument): any;
             /**
              * A getter and setter for storing the string content associated with the
              * module and url arguments.
@@ -6708,7 +6708,7 @@ declare module dojo {
              * @param url The rest of the path to append to the path derived from the module argument. Ifmodule is an object, then this second argument should be the "value" argument instead.             
              * @param value               OptionalIf a String, the value to use in the cache for the module/url combination.If an Object, it can have two properties: value and sanitize. The value propertyshould be the value to use in the cache, and sanitize can be set to true or false,to indicate if XML declarations should be removed from the value and if the HTMLinside a body tag in the value should be extracted as the real value. The value argumentor the value property on the value argument are usually only used by the build systemas it inlines cache content.             
              */
-            cache(module: String, url: String, value: String): any;
+            cache(module: String, url: String, value?: String): any;
             /**
              * A getter and setter for storing the string content associated with the
              * module and url arguments.
@@ -6728,7 +6728,7 @@ declare module dojo {
              * @param url The rest of the path to append to the path derived from the module argument. Ifmodule is an object, then this second argument should be the "value" argument instead.             
              * @param value               OptionalIf a String, the value to use in the cache for the module/url combination.If an Object, it can have two properties: value and sanitize. The value propertyshould be the value to use in the cache, and sanitize can be set to true or false,to indicate if XML declarations should be removed from the value and if the HTMLinside a body tag in the value should be extracted as the real value. The value argumentor the value property on the value argument are usually only used by the build systemas it inlines cache content.             
              */
-            cache(module: Object, url: String, value: String): any;
+            cache(module: Object, url: String, value?: String): any;
             /**
              * A getter and setter for storing the string content associated with the
              * module and url arguments.
@@ -6748,7 +6748,7 @@ declare module dojo {
              * @param url The rest of the path to append to the path derived from the module argument. Ifmodule is an object, then this second argument should be the "value" argument instead.             
              * @param value               OptionalIf a String, the value to use in the cache for the module/url combination.If an Object, it can have two properties: value and sanitize. The value propertyshould be the value to use in the cache, and sanitize can be set to true or false,to indicate if XML declarations should be removed from the value and if the HTMLinside a body tag in the value should be extracted as the real value. The value argumentor the value property on the value argument are usually only used by the build systemas it inlines cache content.             
              */
-            cache(module: String, url: String, value: Object): any;
+            cache(module: String, url: String, value?: Object): any;
             /**
              * A getter and setter for storing the string content associated with the
              * module and url arguments.
@@ -6768,7 +6768,7 @@ declare module dojo {
              * @param url The rest of the path to append to the path derived from the module argument. Ifmodule is an object, then this second argument should be the "value" argument instead.             
              * @param value               OptionalIf a String, the value to use in the cache for the module/url combination.If an Object, it can have two properties: value and sanitize. The value propertyshould be the value to use in the cache, and sanitize can be set to true or false,to indicate if XML declarations should be removed from the value and if the HTMLinside a body tag in the value should be extracted as the real value. The value argumentor the value property on the value argument are usually only used by the build systemas it inlines cache content.             
              */
-            cache(module: Object, url: String, value: Object): any;
+            cache(module: Object, url: String, value?: Object): any;
             /**
              * 
              */
@@ -6804,7 +6804,7 @@ declare module dojo {
              * @param a             
              * @param obj               Optional            
              */
-            colorFromArray(a: any[], obj: dojo._base.Color): any;
+            colorFromArray(a: any[], obj?: dojo._base.Color): any;
             /**
              * Converts a hex string with a '#' prefix to a color object.
              * Supports 12-bit #rgb shorthand. Optionally accepts a
@@ -6813,7 +6813,7 @@ declare module dojo {
              * @param color             
              * @param obj               Optional            
              */
-            colorFromHex(color: String, obj: dojo._base.Color): any;
+            colorFromHex(color: String, obj?: dojo._base.Color): any;
             /**
              * get rgb(a) array from css-style color declarations
              * this function can handle all 4 CSS3 Color Module formats: rgb,
@@ -6822,7 +6822,7 @@ declare module dojo {
              * @param color             
              * @param obj               Optional            
              */
-            colorFromRgb(color: String, obj: dojo._base.Color): any;
+            colorFromRgb(color: String, obj?: dojo._base.Color): any;
             /**
              * Parses str for a color value. Accepts hex, rgb, and rgba
              * style color values.
@@ -6834,7 +6834,7 @@ declare module dojo {
              * @param str             
              * @param obj               Optional            
              */
-            colorFromString(str: String, obj: dojo._base.Color): any;
+            colorFromString(str: String, obj?: dojo._base.Color): any;
             /**
              * dojo.connect is a deprecated event handling and delegation method in
              * Dojo. It allows one function to "listen in" on the execution of
@@ -6874,7 +6874,7 @@ declare module dojo {
              * @param method A function reference, or name of a function in context.The function identified by method fires after event does.method receives the same arguments as the event.See context argument comments for information on method's scope.             
              * @param dontFix               OptionalIf obj is a DOM node, set dontFix to true to prevent delegationof this connection to the DOM event manager.             
              */
-            connect(obj: Object, event: String, context: Object, method: String, dontFix: boolean): any;
+            connect(obj: Object, event: String, context: Object, method: String, dontFix?: boolean): any;
             /**
              * dojo.connect is a deprecated event handling and delegation method in
              * Dojo. It allows one function to "listen in" on the execution of
@@ -6914,7 +6914,7 @@ declare module dojo {
              * @param method A function reference, or name of a function in context.The function identified by method fires after event does.method receives the same arguments as the event.See context argument comments for information on method's scope.             
              * @param dontFix               OptionalIf obj is a DOM node, set dontFix to true to prevent delegationof this connection to the DOM event manager.             
              */
-            connect(obj: Object, event: String, context: any, method: String, dontFix: boolean): any;
+            connect(obj: Object, event: String, context: any, method: String, dontFix?: boolean): any;
             /**
              * dojo.connect is a deprecated event handling and delegation method in
              * Dojo. It allows one function to "listen in" on the execution of
@@ -6954,7 +6954,7 @@ declare module dojo {
              * @param method A function reference, or name of a function in context.The function identified by method fires after event does.method receives the same arguments as the event.See context argument comments for information on method's scope.             
              * @param dontFix               OptionalIf obj is a DOM node, set dontFix to true to prevent delegationof this connection to the DOM event manager.             
              */
-            connect(obj: Object, event: String, context: Object, method: Function, dontFix: boolean): any;
+            connect(obj: Object, event: String, context: Object, method: Function, dontFix?: boolean): any;
             /**
              * dojo.connect is a deprecated event handling and delegation method in
              * Dojo. It allows one function to "listen in" on the execution of
@@ -6994,7 +6994,7 @@ declare module dojo {
              * @param method A function reference, or name of a function in context.The function identified by method fires after event does.method receives the same arguments as the event.See context argument comments for information on method's scope.             
              * @param dontFix               OptionalIf obj is a DOM node, set dontFix to true to prevent delegationof this connection to the DOM event manager.             
              */
-            connect(obj: Object, event: String, context: any, method: Function, dontFix: boolean): any;
+            connect(obj: Object, event: String, context: any, method: Function, dontFix?: boolean): any;
             /**
              * Getter/setter for the content-box of node.
              * Returns an object in the expected format of box (regardless if box is passed).
@@ -7011,7 +7011,7 @@ declare module dojo {
              * @param node id or reference to DOM Node to get/set box for             
              * @param box               OptionalIf passed, denotes that dojo.contentBox() shouldupdate/set the content box for node. Box is an object in theabove format, but only w (width) and h (height) are supported.All properties are optional if passed.             
              */
-            contentBox(node: HTMLElement, box: Object): any;
+            contentBox(node: HTMLElement, box?: Object): any;
             /**
              * Getter/setter for the content-box of node.
              * Returns an object in the expected format of box (regardless if box is passed).
@@ -7028,7 +7028,7 @@ declare module dojo {
              * @param node id or reference to DOM Node to get/set box for             
              * @param box               OptionalIf passed, denotes that dojo.contentBox() shouldupdate/set the content box for node. Box is an object in theabove format, but only w (width) and h (height) are supported.All properties are optional if passed.             
              */
-            contentBox(node: String, box: Object): any;
+            contentBox(node: String, box?: Object): any;
             /**
              * Get or set a cookie.
              * If one argument is passed, returns the value of the cookie
@@ -7038,7 +7038,7 @@ declare module dojo {
              * @param value               OptionalValue for the cookie             
              * @param props               OptionalProperties for the cookie             
              */
-            cookie(name: String, value: String, props: Object): any;
+            cookie(name: String, value?: String, props?: Object): any;
             /**
              * Deprecated: Use position() for border-box x/y/w/h
              * or marginBox() for margin-box w/h/l/t.
@@ -7057,7 +7057,7 @@ declare module dojo {
              * @param node             
              * @param includeScroll               Optional            
              */
-            coords(node: HTMLElement, includeScroll: boolean): any;
+            coords(node: HTMLElement, includeScroll?: boolean): any;
             /**
              * Deprecated: Use position() for border-box x/y/w/h
              * or marginBox() for margin-box w/h/l/t.
@@ -7076,7 +7076,7 @@ declare module dojo {
              * @param node             
              * @param includeScroll               Optional            
              */
-            coords(node: String, includeScroll: boolean): any;
+            coords(node: String, includeScroll?: boolean): any;
             /**
              * Create an element, allowing for optional attribute decoration
              * and placement.
@@ -7095,7 +7095,7 @@ declare module dojo {
              * @param refNode               OptionalOptional reference node. Used by dojo.place to place the newly creatednode somewhere in the dom relative to refNode. Can be a DomNode referenceor String ID of a node.             
              * @param pos               OptionalOptional positional reference. Defaults to "last" by way of dojo.place,though can be set to "first","after","before","last", "replace" or "only"to further control the placement of the new node relative to the refNode.'refNode' is required if a 'pos' is specified.             
              */
-            create(tag: HTMLElement, attrs: Object, refNode: HTMLElement, pos: String): any;
+            create(tag: HTMLElement, attrs: Object, refNode?: HTMLElement, pos?: String): any;
             /**
              * Create an element, allowing for optional attribute decoration
              * and placement.
@@ -7114,7 +7114,7 @@ declare module dojo {
              * @param refNode               OptionalOptional reference node. Used by dojo.place to place the newly creatednode somewhere in the dom relative to refNode. Can be a DomNode referenceor String ID of a node.             
              * @param pos               OptionalOptional positional reference. Defaults to "last" by way of dojo.place,though can be set to "first","after","before","last", "replace" or "only"to further control the placement of the new node relative to the refNode.'refNode' is required if a 'pos' is specified.             
              */
-            create(tag: String, attrs: Object, refNode: HTMLElement, pos: String): any;
+            create(tag: String, attrs: Object, refNode?: HTMLElement, pos?: String): any;
             /**
              * Create an element, allowing for optional attribute decoration
              * and placement.
@@ -7133,7 +7133,7 @@ declare module dojo {
              * @param refNode               OptionalOptional reference node. Used by dojo.place to place the newly creatednode somewhere in the dom relative to refNode. Can be a DomNode referenceor String ID of a node.             
              * @param pos               OptionalOptional positional reference. Defaults to "last" by way of dojo.place,though can be set to "first","after","before","last", "replace" or "only"to further control the placement of the new node relative to the refNode.'refNode' is required if a 'pos' is specified.             
              */
-            create(tag: HTMLElement, attrs: Object, refNode: String, pos: String): any;
+            create(tag: HTMLElement, attrs: Object, refNode?: String, pos?: String): any;
             /**
              * Create an element, allowing for optional attribute decoration
              * and placement.
@@ -7152,7 +7152,7 @@ declare module dojo {
              * @param refNode               OptionalOptional reference node. Used by dojo.place to place the newly creatednode somewhere in the dom relative to refNode. Can be a DomNode referenceor String ID of a node.             
              * @param pos               OptionalOptional positional reference. Defaults to "last" by way of dojo.place,though can be set to "first","after","before","last", "replace" or "only"to further control the placement of the new node relative to the refNode.'refNode' is required if a 'pos' is specified.             
              */
-            create(tag: String, attrs: Object, refNode: String, pos: String): any;
+            create(tag: String, attrs: Object, refNode?: String, pos?: String): any;
             /**
              * Create a feature-rich constructor from compact notation.
              * Create a constructor using a compact notation for inheritance and
@@ -7364,7 +7364,7 @@ declare module dojo {
              * @param consumeErrors               Optional            
              * @param canceller               OptionalA deferred canceller function, see dojo.Deferred             
              */
-            DeferredList(list: any[], fireOnOneCallback: boolean, fireOnOneErrback: boolean, consumeErrors: boolean, canceller: Function): void;
+            DeferredList(list: any[], fireOnOneCallback?: boolean, fireOnOneErrback?: boolean, consumeErrors?: boolean, canceller?: Function): void;
             /**
              * Log a debug message to indicate that a behavior has been
              * deprecated.
@@ -7373,7 +7373,7 @@ declare module dojo {
              * @param extra               OptionalText to append to the message. Often provides advice on anew function or facility to achieve the same goal duringthe deprecation period.             
              * @param removal               OptionalText to indicate when in the future the behavior will beremoved. Usually a version number.             
              */
-            deprecated(behaviour: String, extra: String, removal: String): void;
+            deprecated(behaviour: String, extra?: String, removal?: String): void;
             /**
              * 
              * @param node             
@@ -7391,7 +7391,7 @@ declare module dojo {
              * 
              * @param doc               OptionalOptional document to query.   If unspecified, use win.doc.             
              */
-            docScroll(doc: HTMLDocument): Object;
+            docScroll(doc?: HTMLDocument): Object;
             /**
              * 
              * @param node             
@@ -7431,7 +7431,7 @@ declare module dojo {
              * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
              * @param thisObject               Optionalmay be used to scope the call to callback             
              */
-            every(arr: any[], callback: Function, thisObject: Object): boolean;
+            every(arr: any[], callback: Function, thisObject?: Object): boolean;
             /**
              * Determines whether or not every item in arr satisfies the
              * condition implemented by callback.
@@ -7445,7 +7445,7 @@ declare module dojo {
              * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
              * @param thisObject               Optionalmay be used to scope the call to callback             
              */
-            every(arr: String, callback: Function, thisObject: Object): boolean;
+            every(arr: String, callback: Function, thisObject?: Object): boolean;
             /**
              * Determines whether or not every item in arr satisfies the
              * condition implemented by callback.
@@ -7459,7 +7459,7 @@ declare module dojo {
              * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
              * @param thisObject               Optionalmay be used to scope the call to callback             
              */
-            every(arr: any[], callback: String, thisObject: Object): boolean;
+            every(arr: any[], callback: String, thisObject?: Object): boolean;
             /**
              * Determines whether or not every item in arr satisfies the
              * condition implemented by callback.
@@ -7473,7 +7473,7 @@ declare module dojo {
              * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
              * @param thisObject               Optionalmay be used to scope the call to callback             
              */
-            every(arr: String, callback: String, thisObject: Object): boolean;
+            every(arr: String, callback: String, thisObject?: Object): boolean;
             /**
              * 
              * @param exitcode             
@@ -7490,7 +7490,7 @@ declare module dojo {
              * @param moduleName The name of a module, or the name of a module file or a specificfunction             
              * @param extra               Optionalsome additional message for the user             
              */
-            experimental(moduleName: String, extra: String): void;
+            experimental(moduleName: String, extra?: String): void;
             /**
              * Returns an animation that will fade node defined in 'args' from
              * its current opacity to fully opaque.
@@ -7538,7 +7538,7 @@ declare module dojo {
              * @param callback a function that is invoked with three arguments (item,index, array). The return of this function is expected tobe a boolean which determines whether the passed-in itemwill be included in the returned array.             
              * @param thisObject               Optionalmay be used to scope the call to callback             
              */
-            filter(arr: any[], callback: Function, thisObject: Object): any[];
+            filter(arr: any[], callback: Function, thisObject?: Object): any[];
             /**
              * Returns a new Array with those items from arr that match the
              * condition implemented by callback.
@@ -7552,7 +7552,7 @@ declare module dojo {
              * @param callback a function that is invoked with three arguments (item,index, array). The return of this function is expected tobe a boolean which determines whether the passed-in itemwill be included in the returned array.             
              * @param thisObject               Optionalmay be used to scope the call to callback             
              */
-            filter(arr: any[], callback: String, thisObject: Object): any[];
+            filter(arr: any[], callback: String, thisObject?: Object): any[];
             /**
              * normalizes properties on the event object including event
              * bubbling methods, keystroke normalization, and x/y positions
@@ -7570,7 +7570,7 @@ declare module dojo {
              * @param scrollLeft             
              * @param doc               OptionalOptional document to query.   If unspecified, use win.doc.             
              */
-            fixIeBiDiScrollLeft(scrollLeft: number, doc: HTMLDocument): number;
+            fixIeBiDiScrollLeft(scrollLeft: number, doc?: HTMLDocument): number;
             /**
              * for every item in arr, callback is invoked. Return values are ignored.
              * If you want to break out of the loop, consider using array.every() or array.some().
@@ -7585,7 +7585,7 @@ declare module dojo {
              * @param callback             
              * @param thisObject               Optional            
              */
-            forEach(arr: any[], callback: Function, thisObject: Object): void;
+            forEach(arr: any[], callback: Function, thisObject?: Object): void;
             /**
              * for every item in arr, callback is invoked. Return values are ignored.
              * If you want to break out of the loop, consider using array.every() or array.some().
@@ -7600,7 +7600,7 @@ declare module dojo {
              * @param callback             
              * @param thisObject               Optional            
              */
-            forEach(arr: String, callback: Function, thisObject: Object): void;
+            forEach(arr: String, callback: Function, thisObject?: Object): void;
             /**
              * for every item in arr, callback is invoked. Return values are ignored.
              * If you want to break out of the loop, consider using array.every() or array.some().
@@ -7615,7 +7615,7 @@ declare module dojo {
              * @param callback             
              * @param thisObject               Optional            
              */
-            forEach(arr: any[], callback: String, thisObject: Object): void;
+            forEach(arr: any[], callback: String, thisObject?: Object): void;
             /**
              * for every item in arr, callback is invoked. Return values are ignored.
              * If you want to break out of the loop, consider using array.every() or array.some().
@@ -7630,7 +7630,7 @@ declare module dojo {
              * @param callback             
              * @param thisObject               Optional            
              */
-            forEach(arr: String, callback: String, thisObject: Object): void;
+            forEach(arr: String, callback: String, thisObject?: Object): void;
             /**
              * Create a serialized JSON string from a form node or string
              * ID identifying the form to serialize
@@ -7638,7 +7638,7 @@ declare module dojo {
              * @param formNode             
              * @param prettyPrint               Optional            
              */
-            formToJson(formNode: HTMLElement, prettyPrint: boolean): String;
+            formToJson(formNode: HTMLElement, prettyPrint?: boolean): String;
             /**
              * Create a serialized JSON string from a form node or string
              * ID identifying the form to serialize
@@ -7646,7 +7646,7 @@ declare module dojo {
              * @param formNode             
              * @param prettyPrint               Optional            
              */
-            formToJson(formNode: String, prettyPrint: boolean): String;
+            formToJson(formNode: String, prettyPrint?: boolean): String;
             /**
              * Serialize a form node to a JavaScript object.
              * Returns the values encoded in an HTML form as
@@ -7721,7 +7721,7 @@ declare module dojo {
              * @param node             
              * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
              */
-            getBorderExtents(node: HTMLElement, computedStyle: Object): Object;
+            getBorderExtents(node: HTMLElement, computedStyle?: Object): Object;
             /**
              * Returns a "computed style" object.
              * Gets a "computed style" object which can be used to gather
@@ -7748,7 +7748,7 @@ declare module dojo {
              * @param node             
              * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
              */
-            getContentBox(node: HTMLElement, computedStyle: Object): Object;
+            getContentBox(node: HTMLElement, computedStyle?: Object): Object;
             /**
              * returns the offset in x and y from the document body to the
              * visual edge of the page for IE
@@ -7768,7 +7768,7 @@ declare module dojo {
              * 
              * @param doc               OptionalOptional document to query.   If unspecified, use win.doc.             
              */
-            getIeDocumentElementOffset(doc: HTMLDocument): Object;
+            getIeDocumentElementOffset(doc?: HTMLDocument): Object;
             /**
              * 
              * @param moduleName             
@@ -7783,7 +7783,7 @@ declare module dojo {
              * @param node             
              * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
              */
-            getMarginBox(node: HTMLElement, computedStyle: Object): Object;
+            getMarginBox(node: HTMLElement, computedStyle?: Object): Object;
             /**
              * returns object with properties useful for box fitting with
              * regards to box margins (i.e., the outer-box).
@@ -7798,7 +7798,7 @@ declare module dojo {
              * @param node             
              * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
              */
-            getMarginExtents(node: HTMLElement, computedStyle: Object): Object;
+            getMarginExtents(node: HTMLElement, computedStyle?: Object): Object;
             /**
              * returns an object that encodes the width and height of
              * the node's margin box
@@ -7806,7 +7806,7 @@ declare module dojo {
              * @param node             
              * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
              */
-            getMarginSize(node: HTMLElement, computedStyle: Object): Object;
+            getMarginSize(node: HTMLElement, computedStyle?: Object): Object;
             /**
              * returns an object that encodes the width and height of
              * the node's margin box
@@ -7814,7 +7814,7 @@ declare module dojo {
              * @param node             
              * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
              */
-            getMarginSize(node: String, computedStyle: Object): Object;
+            getMarginSize(node: String, computedStyle?: Object): Object;
             /**
              * Returns an effective value of a property or an attribute.
              * 
@@ -7842,7 +7842,7 @@ declare module dojo {
              * @param node             
              * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
              */
-            getPadBorderExtents(node: HTMLElement, computedStyle: Object): Object;
+            getPadBorderExtents(node: HTMLElement, computedStyle?: Object): Object;
             /**
              * Returns object with special values specifically useful for node
              * fitting.
@@ -7860,7 +7860,7 @@ declare module dojo {
              * @param node             
              * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
              */
-            getPadExtents(node: HTMLElement, computedStyle: Object): Object;
+            getPadExtents(node: HTMLElement, computedStyle?: Object): Object;
             /**
              * Gets a property on an HTML element.
              * Handles normalized getting of properties on DOM nodes.
@@ -7890,7 +7890,7 @@ declare module dojo {
              * @param node id or reference to node to get style for             
              * @param name               Optionalthe style property to get             
              */
-            getStyle(node: HTMLElement, name: String): any;
+            getStyle(node: HTMLElement, name?: String): any;
             /**
              * Accesses styles on a node.
              * Getting the style value uses the computed style for the node, so the value
@@ -7904,7 +7904,7 @@ declare module dojo {
              * @param node id or reference to node to get style for             
              * @param name               Optionalthe style property to get             
              */
-            getStyle(node: String, name: String): any;
+            getStyle(node: String, name?: String): any;
             /**
              * Returns true if the requested attribute is specified on the
              * given element, and false otherwise.
@@ -7947,7 +7947,7 @@ declare module dojo {
              * @param hash               Optionalthe hash is set - #string.             
              * @param replace               OptionalIf true, updates the hash value in the current historystate instead of creating a new history state.             
              */
-            hash(hash: String, replace: boolean): any;
+            hash(hash?: String, replace?: boolean): any;
             /**
              * locates the first index of the provided value in the
              * passed array. If the value is not found, -1 is returned.
@@ -7964,13 +7964,13 @@ declare module dojo {
              * @param fromIndex               Optional            
              * @param findLast               OptionalMakes indexOf() work like lastIndexOf().  Used internally; not meant for external usage.             
              */
-            indexOf(arr: any[], value: Object, fromIndex: number, findLast: boolean): number;
+            indexOf(arr: any[], value: Object, fromIndex?: number, findLast?: boolean): number;
             /**
              * Returns true if the current language is left-to-right, and false otherwise.
              * 
              * @param doc               OptionalOptional document to query.   If unspecified, use win.doc.             
              */
-            isBodyLtr(doc: HTMLDocument): boolean;
+            isBodyLtr(doc?: HTMLDocument): boolean;
             /**
              * Returns true if node is a descendant of ancestor
              * 
@@ -8014,7 +8014,7 @@ declare module dojo {
              * @param value             
              * @param fromIndex               Optional            
              */
-            lastIndexOf(arr: any, value: any, fromIndex: number): number;
+            lastIndexOf(arr: any, value: any, fromIndex?: number): number;
             /**
              * 
              * @param f             
@@ -8093,7 +8093,7 @@ declare module dojo {
              * @param node id or reference to DOM Node to get/set box for             
              * @param box               OptionalIf passed, denotes that dojo.marginBox() shouldupdate/set the margin box for node. Box is an object in theabove format. All properties are optional if passed.             
              */
-            marginBox(node: HTMLElement, box: Object): any;
+            marginBox(node: HTMLElement, box?: Object): any;
             /**
              * Getter/setter for the margin-box of node.
              * Getter/setter for the margin-box of node.
@@ -8107,14 +8107,14 @@ declare module dojo {
              * @param node id or reference to DOM Node to get/set box for             
              * @param box               OptionalIf passed, denotes that dojo.marginBox() shouldupdate/set the margin box for node. Box is an object in theabove format. All properties are optional if passed.             
              */
-            marginBox(node: String, box: Object): any;
+            marginBox(node: String, box?: Object): any;
             /**
              * Returns a URL relative to a module.
              * 
              * @param module dojo/dom-class             
              * @param url               Optional            
              */
-            moduleUrl(module: String, url: String): String;
+            moduleUrl(module: String, url?: String): String;
             /**
              * Array-like object which adds syntactic
              * sugar for chaining, common iteration operations, animation, and
@@ -8145,7 +8145,7 @@ declare module dojo {
              * @param refNode id or node reference to use as basis for placement             
              * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
              */
-            place(node: HTMLElement, refNode: HTMLElement, position: String): HTMLElement;
+            place(node: HTMLElement, refNode: HTMLElement, position?: String): HTMLElement;
             /**
              * Attempt to insert node into the DOM, choosing from various positioning options.
              * Returns the first argument resolved to a DOM node.
@@ -8154,7 +8154,7 @@ declare module dojo {
              * @param refNode id or node reference to use as basis for placement             
              * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
              */
-            place(node: String, refNode: HTMLElement, position: String): HTMLElement;
+            place(node: String, refNode: HTMLElement, position?: String): HTMLElement;
             /**
              * Attempt to insert node into the DOM, choosing from various positioning options.
              * Returns the first argument resolved to a DOM node.
@@ -8163,7 +8163,7 @@ declare module dojo {
              * @param refNode id or node reference to use as basis for placement             
              * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
              */
-            place(node: HTMLElement, refNode: String, position: String): HTMLElement;
+            place(node: HTMLElement, refNode: String, position?: String): HTMLElement;
             /**
              * Attempt to insert node into the DOM, choosing from various positioning options.
              * Returns the first argument resolved to a DOM node.
@@ -8172,7 +8172,7 @@ declare module dojo {
              * @param refNode id or node reference to use as basis for placement             
              * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
              */
-            place(node: String, refNode: String, position: String): HTMLElement;
+            place(node: String, refNode: String, position?: String): HTMLElement;
             /**
              * Attempt to insert node into the DOM, choosing from various positioning options.
              * Returns the first argument resolved to a DOM node.
@@ -8181,7 +8181,7 @@ declare module dojo {
              * @param refNode id or node reference to use as basis for placement             
              * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
              */
-            place(node: HTMLElement, refNode: HTMLElement, position: number): HTMLElement;
+            place(node: HTMLElement, refNode: HTMLElement, position?: number): HTMLElement;
             /**
              * Attempt to insert node into the DOM, choosing from various positioning options.
              * Returns the first argument resolved to a DOM node.
@@ -8190,7 +8190,7 @@ declare module dojo {
              * @param refNode id or node reference to use as basis for placement             
              * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
              */
-            place(node: String, refNode: HTMLElement, position: number): HTMLElement;
+            place(node: String, refNode: HTMLElement, position?: number): HTMLElement;
             /**
              * Attempt to insert node into the DOM, choosing from various positioning options.
              * Returns the first argument resolved to a DOM node.
@@ -8199,7 +8199,7 @@ declare module dojo {
              * @param refNode id or node reference to use as basis for placement             
              * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
              */
-            place(node: HTMLElement, refNode: String, position: number): HTMLElement;
+            place(node: HTMLElement, refNode: String, position?: number): HTMLElement;
             /**
              * Attempt to insert node into the DOM, choosing from various positioning options.
              * Returns the first argument resolved to a DOM node.
@@ -8208,7 +8208,7 @@ declare module dojo {
              * @param refNode id or node reference to use as basis for placement             
              * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
              */
-            place(node: String, refNode: String, position: number): HTMLElement;
+            place(node: String, refNode: String, position?: number): HTMLElement;
             /**
              * require one or more modules based on which host environment
              * Dojo is currently operating in
@@ -8247,7 +8247,7 @@ declare module dojo {
              * @param node             
              * @param includeScroll               Optional            
              */
-            position(node: HTMLElement, includeScroll: boolean): Object;
+            position(node: HTMLElement, includeScroll?: boolean): Object;
             /**
              * Gets the position and size of the passed element relative to
              * the viewport (if includeScroll==false), or relative to the
@@ -8263,7 +8263,7 @@ declare module dojo {
              * @param node             
              * @param includeScroll               Optional            
              */
-            position(node: String, includeScroll: boolean): Object;
+            position(node: String, includeScroll?: boolean): Object;
             /**
              * Gets or sets a property on an HTML element.
              * Handles normalized getting and setting of properties on DOM
@@ -8287,7 +8287,7 @@ declare module dojo {
              * @param name the name of the property to get or set.             
              * @param value               OptionalThe value to set for the property             
              */
-            prop(node: HTMLElement, name: String, value: String): any;
+            prop(node: HTMLElement, name: String, value?: String): any;
             /**
              * Gets or sets a property on an HTML element.
              * Handles normalized getting and setting of properties on DOM
@@ -8311,7 +8311,7 @@ declare module dojo {
              * @param name the name of the property to get or set.             
              * @param value               OptionalThe value to set for the property             
              */
-            prop(node: String, name: String, value: String): any;
+            prop(node: String, name: String, value?: String): any;
             /**
              * Gets or sets a property on an HTML element.
              * Handles normalized getting and setting of properties on DOM
@@ -8335,7 +8335,7 @@ declare module dojo {
              * @param name the name of the property to get or set.             
              * @param value               OptionalThe value to set for the property             
              */
-            prop(node: HTMLElement, name: Object, value: String): any;
+            prop(node: HTMLElement, name: Object, value?: String): any;
             /**
              * Gets or sets a property on an HTML element.
              * Handles normalized getting and setting of properties on DOM
@@ -8359,7 +8359,7 @@ declare module dojo {
              * @param name the name of the property to get or set.             
              * @param value               OptionalThe value to set for the property             
              */
-            prop(node: String, name: Object, value: String): any;
+            prop(node: String, name: Object, value?: String): any;
             /**
              * 
              * @param mid             
@@ -8389,7 +8389,7 @@ declare module dojo {
              * @param g               OptionalThe global context. If a string, the id of the frame tosearch for a context and document.             
              * @param d               OptionalThe document element to execute subsequent code with.             
              */
-            pushContext(g: Object, d: HTMLDocument): void;
+            pushContext(g?: Object, d?: HTMLDocument): void;
             /**
              * causes subsequent calls to Dojo methods to assume the
              * passed object and, optionally, document as the default
@@ -8414,7 +8414,7 @@ declare module dojo {
              * @param g               OptionalThe global context. If a string, the id of the frame tosearch for a context and document.             
              * @param d               OptionalThe document element to execute subsequent code with.             
              */
-            pushContext(g: String, d: HTMLDocument): void;
+            pushContext(g?: String, d?: HTMLDocument): void;
             /**
              * Create an object representing a de-serialized query section of a
              * URL. Query keys with multiple values are returned in an array.
@@ -8447,7 +8447,7 @@ declare module dojo {
              * @param context The context in which to run execute callback, or a callback if not using context             
              * @param callback               OptionalThe function to execute.             
              */
-            ready(priority: number, context: any, callback: Function): void;
+            ready(priority: number, context: any, callback?: Function): void;
             /**
              * Maps a module name to a path
              * An unregistered module is given the default path of ../[module],
@@ -8480,7 +8480,7 @@ declare module dojo {
              * @param node String ID or DomNode reference to remove the class from.             
              * @param classStr               OptionalAn optional String class name to remove, or several space-separatedclass names, or an array of class names. If omitted, all class nameswill be deleted.             
              */
-            removeClass(node: String, classStr: String): void;
+            removeClass(node: String, classStr?: String): void;
             /**
              * Removes the specified classes from node. No contains()
              * check is required.
@@ -8488,7 +8488,7 @@ declare module dojo {
              * @param node String ID or DomNode reference to remove the class from.             
              * @param classStr               OptionalAn optional String class name to remove, or several space-separatedclass names, or an array of class names. If omitted, all class nameswill be deleted.             
              */
-            removeClass(node: HTMLElement, classStr: String): void;
+            removeClass(node: HTMLElement, classStr?: String): void;
             /**
              * Removes the specified classes from node. No contains()
              * check is required.
@@ -8496,7 +8496,7 @@ declare module dojo {
              * @param node String ID or DomNode reference to remove the class from.             
              * @param classStr               OptionalAn optional String class name to remove, or several space-separatedclass names, or an array of class names. If omitted, all class nameswill be deleted.             
              */
-            removeClass(node: String, classStr: any[]): void;
+            removeClass(node: String, classStr?: any[]): void;
             /**
              * Removes the specified classes from node. No contains()
              * check is required.
@@ -8504,7 +8504,7 @@ declare module dojo {
              * @param node String ID or DomNode reference to remove the class from.             
              * @param classStr               OptionalAn optional String class name to remove, or several space-separatedclass names, or an array of class names. If omitted, all class nameswill be deleted.             
              */
-            removeClass(node: HTMLElement, classStr: any[]): void;
+            removeClass(node: HTMLElement, classStr?: any[]): void;
             /**
              * Replaces one or more classes on a node if not present.
              * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -8513,7 +8513,7 @@ declare module dojo {
              * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
              * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
              */
-            replaceClass(node: String, addClassStr: String, removeClassStr: String): void;
+            replaceClass(node: String, addClassStr: String, removeClassStr?: String): void;
             /**
              * Replaces one or more classes on a node if not present.
              * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -8522,7 +8522,7 @@ declare module dojo {
              * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
              * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
              */
-            replaceClass(node: HTMLElement, addClassStr: String, removeClassStr: String): void;
+            replaceClass(node: HTMLElement, addClassStr: String, removeClassStr?: String): void;
             /**
              * Replaces one or more classes on a node if not present.
              * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -8531,7 +8531,7 @@ declare module dojo {
              * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
              * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
              */
-            replaceClass(node: String, addClassStr: any[], removeClassStr: String): void;
+            replaceClass(node: String, addClassStr: any[], removeClassStr?: String): void;
             /**
              * Replaces one or more classes on a node if not present.
              * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -8540,7 +8540,7 @@ declare module dojo {
              * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
              * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
              */
-            replaceClass(node: HTMLElement, addClassStr: any[], removeClassStr: String): void;
+            replaceClass(node: HTMLElement, addClassStr: any[], removeClassStr?: String): void;
             /**
              * Replaces one or more classes on a node if not present.
              * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -8549,7 +8549,7 @@ declare module dojo {
              * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
              * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
              */
-            replaceClass(node: String, addClassStr: String, removeClassStr: any[]): void;
+            replaceClass(node: String, addClassStr: String, removeClassStr?: any[]): void;
             /**
              * Replaces one or more classes on a node if not present.
              * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -8558,7 +8558,7 @@ declare module dojo {
              * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
              * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
              */
-            replaceClass(node: HTMLElement, addClassStr: String, removeClassStr: any[]): void;
+            replaceClass(node: HTMLElement, addClassStr: String, removeClassStr?: any[]): void;
             /**
              * Replaces one or more classes on a node if not present.
              * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -8567,7 +8567,7 @@ declare module dojo {
              * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
              * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
              */
-            replaceClass(node: String, addClassStr: any[], removeClassStr: any[]): void;
+            replaceClass(node: String, addClassStr: any[], removeClassStr?: any[]): void;
             /**
              * Replaces one or more classes on a node if not present.
              * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -8576,7 +8576,7 @@ declare module dojo {
              * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
              * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
              */
-            replaceClass(node: HTMLElement, addClassStr: any[], removeClassStr: any[]): void;
+            replaceClass(node: HTMLElement, addClassStr: any[], removeClassStr?: any[]): void;
             /**
              * loads a Javascript module from the appropriate URI
              * Modules are loaded via dojo.require by using one of two loaders: the normal loader
@@ -8640,7 +8640,7 @@ declare module dojo {
              * @param moduleName             
              * @param omitModuleCheck               Optional            
              */
-            requireAfterIf(condition: boolean, moduleName: String, omitModuleCheck: boolean): void;
+            requireAfterIf(condition: boolean, moduleName: String, omitModuleCheck?: boolean): void;
             /**
              * If the condition is true then call dojo.require() for the specified
              * resource
@@ -8649,14 +8649,14 @@ declare module dojo {
              * @param moduleName             
              * @param omitModuleCheck               Optional            
              */
-            requireIf(condition: boolean, moduleName: String, omitModuleCheck: boolean): void;
+            requireIf(condition: boolean, moduleName: String, omitModuleCheck?: boolean): void;
             /**
              * 
              * @param moduleName             
              * @param bundleName             
              * @param locale               Optional            
              */
-            requireLocalization(moduleName: String, bundleName: String, locale: String): void;
+            requireLocalization(moduleName: String, bundleName: String, locale?: String): void;
             /**
              * Mix in properties skipping a constructor and decorating functions
              * like it is done by declare().
@@ -8693,7 +8693,7 @@ declare module dojo {
              * @param name the name of the attribute to set, or a hash of key-value pairs to set.             
              * @param value               Optionalthe value to set for the attribute, if the name is a string.             
              */
-            setAttr(node: HTMLElement, name: String, value: String): any;
+            setAttr(node: HTMLElement, name: String, value?: String): any;
             /**
              * Sets an attribute on an HTML element.
              * Handles normalized setting of attributes on DOM Nodes.
@@ -8712,7 +8712,7 @@ declare module dojo {
              * @param name the name of the attribute to set, or a hash of key-value pairs to set.             
              * @param value               Optionalthe value to set for the attribute, if the name is a string.             
              */
-            setAttr(node: String, name: String, value: String): any;
+            setAttr(node: String, name: String, value?: String): any;
             /**
              * Sets an attribute on an HTML element.
              * Handles normalized setting of attributes on DOM Nodes.
@@ -8731,7 +8731,7 @@ declare module dojo {
              * @param name the name of the attribute to set, or a hash of key-value pairs to set.             
              * @param value               Optionalthe value to set for the attribute, if the name is a string.             
              */
-            setAttr(node: HTMLElement, name: Object, value: String): any;
+            setAttr(node: HTMLElement, name: Object, value?: String): any;
             /**
              * Sets an attribute on an HTML element.
              * Handles normalized setting of attributes on DOM Nodes.
@@ -8750,7 +8750,7 @@ declare module dojo {
              * @param name the name of the attribute to set, or a hash of key-value pairs to set.             
              * @param value               Optionalthe value to set for the attribute, if the name is a string.             
              */
-            setAttr(node: String, name: Object, value: String): any;
+            setAttr(node: String, name: Object, value?: String): any;
             /**
              * Sets the size of the node's contents, irrespective of margins,
              * padding, or borders.
@@ -8759,7 +8759,7 @@ declare module dojo {
              * @param box hash with optional "w", and "h" properties for "width", and "height"respectively. All specified properties should have numeric values in whole pixels.             
              * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
              */
-            setContentSize(node: HTMLElement, box: Object, computedStyle: Object): void;
+            setContentSize(node: HTMLElement, box: Object, computedStyle?: Object): void;
             /**
              * changes the behavior of many core Dojo functions that deal with
              * namespace and DOM lookup, changing them to work in a new global
@@ -8781,7 +8781,7 @@ declare module dojo {
              * @param box hash with optional "l", "t", "w", and "h" properties for "left", "right", "width", and "height"respectively. All specified properties should have numeric values in whole pixels.             
              * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
              */
-            setMarginBox(node: HTMLElement, box: Object, computedStyle: Object): void;
+            setMarginBox(node: HTMLElement, box: Object, computedStyle?: Object): void;
             /**
              * Sets a property on an HTML element.
              * Handles normalized setting of properties on DOM nodes.
@@ -8800,7 +8800,7 @@ declare module dojo {
              * @param name the name of the property to set, or a hash object to setmultiple properties at once.             
              * @param value               OptionalThe value to set for the property             
              */
-            setProp(node: HTMLElement, name: String, value: String): any;
+            setProp(node: HTMLElement, name: String, value?: String): any;
             /**
              * Sets a property on an HTML element.
              * Handles normalized setting of properties on DOM nodes.
@@ -8819,7 +8819,7 @@ declare module dojo {
              * @param name the name of the property to set, or a hash object to setmultiple properties at once.             
              * @param value               OptionalThe value to set for the property             
              */
-            setProp(node: String, name: String, value: String): any;
+            setProp(node: String, name: String, value?: String): any;
             /**
              * Sets a property on an HTML element.
              * Handles normalized setting of properties on DOM nodes.
@@ -8838,7 +8838,7 @@ declare module dojo {
              * @param name the name of the property to set, or a hash object to setmultiple properties at once.             
              * @param value               OptionalThe value to set for the property             
              */
-            setProp(node: HTMLElement, name: Object, value: String): any;
+            setProp(node: HTMLElement, name: Object, value?: String): any;
             /**
              * Sets a property on an HTML element.
              * Handles normalized setting of properties on DOM nodes.
@@ -8857,7 +8857,7 @@ declare module dojo {
              * @param name the name of the property to set, or a hash object to setmultiple properties at once.             
              * @param value               OptionalThe value to set for the property             
              */
-            setProp(node: String, name: Object, value: String): any;
+            setProp(node: String, name: Object, value?: String): any;
             /**
              * 
              * @param node             
@@ -8871,7 +8871,7 @@ declare module dojo {
              * @param name the style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
              * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
              */
-            setStyle(node: HTMLElement, name: String, value: String): String;
+            setStyle(node: HTMLElement, name: String, value?: String): String;
             /**
              * Sets styles on a node.
              * 
@@ -8879,7 +8879,7 @@ declare module dojo {
              * @param name the style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
              * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
              */
-            setStyle(node: String, name: String, value: String): String;
+            setStyle(node: String, name: String, value?: String): String;
             /**
              * Sets styles on a node.
              * 
@@ -8887,7 +8887,7 @@ declare module dojo {
              * @param name the style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
              * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
              */
-            setStyle(node: HTMLElement, name: Object, value: String): String;
+            setStyle(node: HTMLElement, name: Object, value?: String): String;
             /**
              * Sets styles on a node.
              * 
@@ -8895,7 +8895,7 @@ declare module dojo {
              * @param name the style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
              * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
              */
-            setStyle(node: String, name: Object, value: String): String;
+            setStyle(node: String, name: Object, value?: String): String;
             /**
              * Determines whether or not any item in arr satisfies the
              * condition implemented by callback.
@@ -8909,7 +8909,7 @@ declare module dojo {
              * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
              * @param thisObject               Optionalmay be used to scope the call to callback             
              */
-            some(arr: any[], callback: Function, thisObject: Object): boolean;
+            some(arr: any[], callback: Function, thisObject?: Object): boolean;
             /**
              * Determines whether or not any item in arr satisfies the
              * condition implemented by callback.
@@ -8923,7 +8923,7 @@ declare module dojo {
              * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
              * @param thisObject               Optionalmay be used to scope the call to callback             
              */
-            some(arr: String, callback: Function, thisObject: Object): boolean;
+            some(arr: String, callback: Function, thisObject?: Object): boolean;
             /**
              * Determines whether or not any item in arr satisfies the
              * condition implemented by callback.
@@ -8937,7 +8937,7 @@ declare module dojo {
              * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
              * @param thisObject               Optionalmay be used to scope the call to callback             
              */
-            some(arr: any[], callback: String, thisObject: Object): boolean;
+            some(arr: any[], callback: String, thisObject?: Object): boolean;
             /**
              * Determines whether or not any item in arr satisfies the
              * condition implemented by callback.
@@ -8951,7 +8951,7 @@ declare module dojo {
              * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
              * @param thisObject               Optionalmay be used to scope the call to callback             
              */
-            some(arr: String, callback: String, thisObject: Object): boolean;
+            some(arr: String, callback: String, thisObject?: Object): boolean;
             /**
              * 
              */
@@ -8979,7 +8979,7 @@ declare module dojo {
              * @param name               Optionalthe style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
              * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
              */
-            style(node: HTMLElement, name: String, value: String): any;
+            style(node: HTMLElement, name?: String, value?: String): any;
             /**
              * Accesses styles on a node. If 2 arguments are
              * passed, acts as a getter. If 3 arguments are passed, acts
@@ -8996,7 +8996,7 @@ declare module dojo {
              * @param name               Optionalthe style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
              * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
              */
-            style(node: String, name: String, value: String): any;
+            style(node: String, name?: String, value?: String): any;
             /**
              * Accesses styles on a node. If 2 arguments are
              * passed, acts as a getter. If 3 arguments are passed, acts
@@ -9013,7 +9013,7 @@ declare module dojo {
              * @param name               Optionalthe style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
              * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
              */
-            style(node: HTMLElement, name: Object, value: String): any;
+            style(node: HTMLElement, name?: Object, value?: String): any;
             /**
              * Accesses styles on a node. If 2 arguments are
              * passed, acts as a getter. If 3 arguments are passed, acts
@@ -9030,14 +9030,14 @@ declare module dojo {
              * @param name               Optionalthe style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
              * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
              */
-            style(node: String, name: Object, value: String): any;
+            style(node: String, name?: Object, value?: String): any;
             /**
              * instantiates an HTML fragment returning the corresponding DOM.
              * 
              * @param frag the HTML fragment             
              * @param doc               Optionaloptional document to use when creating DOM nodes, defaults todojo/_base/window.doc if not specified.             
              */
-            toDom(frag: String, doc: HTMLDocument): any;
+            toDom(frag: String, doc?: HTMLDocument): any;
             /**
              * Adds a class to node if not present, or removes if present.
              * Pass a boolean condition if you want to explicitly add or remove.
@@ -9089,7 +9089,7 @@ declare module dojo {
              * @param it an object to be serialized. Objects may define their ownserialization via a special "json" or "json" functionproperty. If a specialized serializer has been defined, it willbe used as a fallback.Note that in 1.6, toJson would serialize undefined, but this no longer supportedsince it is not supported by native JSON serializer.             
              * @param prettyPrint               Optionalif true, we indent objects and arrays to make the output prettier.The variable dojo.toJsonIndentStr is used as the indent string --to use something other than the default (tab), change that variablebefore calling dojo.toJson().Note that if native JSON support is available, it will be used for serialization,and native implementations vary on the exact spacing used in pretty printing.             
              */
-            toJson(it: Object, prettyPrint: boolean): any;
+            toJson(it: Object, prettyPrint?: boolean): any;
             /**
              * converts style value to pixels on IE or return a numeric value.
              * 
@@ -9119,7 +9119,7 @@ declare module dojo {
              * @param errback               OptionalCallback to be invoked when the promise is rejected.             
              * @param progback               OptionalCallback to be invoked when the promise emits a progress update.             
              */
-            when(valueOrPromise: any, callback: Function, errback: Function, progback: Function): dojo.promise.Promise<any>;
+            when(valueOrPromise: any, callback?: Function, errback?: Function, progback?: Function): dojo.promise.Promise<any>;
             /**
              * signal fired by impending window destruction. You may use
              * dojo.addOnWIndowUnload() or dojo.connect() to this method to perform
@@ -9139,7 +9139,7 @@ declare module dojo {
              * @param thisObject               Optional            
              * @param cbArguments               Optional            
              */
-            withDoc(documentObject: HTMLDocument, callback: Function, thisObject: Object, cbArguments: any[]): any;
+            withDoc(documentObject: HTMLDocument, callback: Function, thisObject?: Object, cbArguments?: any[]): any;
             /**
              * Invoke callback with globalObject as dojo.global and
              * globalObject.document as dojo.doc.
@@ -9154,7 +9154,7 @@ declare module dojo {
              * @param thisObject               Optional            
              * @param cbArguments               Optional            
              */
-            withGlobal(globalObject: Object, callback: Function, thisObject: Object, cbArguments: any[]): any;
+            withGlobal(globalObject: Object, callback: Function, thisObject?: Object, cbArguments?: any[]): any;
             /**
              * 
              * @param method             
@@ -9545,7 +9545,7 @@ declare module dojo {
                  * 
                  * @param params               Optional            
                  */
-                postscript(params: Object): void;
+                postscript(params?: Object): void;
                 /**
                  * Set a property on a Stateful instance
                  * Sets named properties on a stateful object and notifies any watchers of
@@ -9787,7 +9787,7 @@ declare module dojo {
                  * @param g             
                  * @param a               Optional            
                  */
-                makeGrey(g: number, a: number): void;
+                makeGrey(g: number, a?: number): void;
             }
             /**
              * Permalink: http://dojotoolkit.org/api/1.9/dojo/_base/kernel.config.html
@@ -10109,7 +10109,7 @@ declare module dojo {
                  * @param date2               OptionalDate object.  If not specified, the current Date is used.             
                  * @param portion               OptionalA string indicating the "date" or "time" portion of a Date object.Compares both "date" and "time" by default.  One of the following:"date", "time", "datetime"             
                  */
-                compare(date1: Date, date2: Date, portion: String): number;
+                compare(date1: Date, date2?: Date, portion?: String): number;
                 /**
                  * Get the difference in a specific unit of time (e.g., number of
                  * months, weeks, days, etc.) between two dates, rounded to the
@@ -10119,7 +10119,7 @@ declare module dojo {
                  * @param date2               OptionalDate object.  If not specified, the current Date is used.             
                  * @param interval               OptionalA string representing the interval.  One of the following:"year", "month", "day", "hour", "minute", "second","millisecond", "quarter", "week", "weekday"Defaults to "day".             
                  */
-                difference(date1: Date, date2: Date, interval: String): any;
+                difference(date1: Date, date2?: Date, interval?: String): any;
                 /**
                  * Returns the number of days in the month used by dateObject
                  * 
@@ -10224,7 +10224,7 @@ declare module dojo {
                  * @param expression             
                  * @param options               OptionalAn object with the following properties:type (String, optional): Should not be set.  Value is assumed to be currency.currency (String, optional): an ISO4217 currency code, a three letter sequence like "USD".For use with dojo.currency only.symbol (String, optional): localized currency symbol. The default will be looked up in table of supported currencies in dojo.cldrA ISO4217 currency code will be used if not found.places (Number, optional): fixed number of decimal places to accept.  The default is determined based on which currency is used.fractional (Boolean|Array, optional): Whether to include the fractional portion, where the number of decimal places are implied by the currencyor explicit 'places' parameter.  The value [true,false] makes the fractional portion optional.By default for currencies, it the fractional portion is optional.pattern (String, optional): override formatting patternwith this string.  Default value is based on locale.  Overriding this property will defeatlocalization.  Literal characters in patterns are not supported.locale (String, optional): override the locale used to determine formatting rulesstrict (Boolean, optional): strict parsing, false by default.  Strict parsing requires input as produced by the format() method.Non-strict is more permissive, e.g. flexible on white space, omitting thousands separators            
                  */
-                parse(expression: String, options: Object): any;
+                parse(expression: String, options?: Object): any;
                 /**
                  * 
                  * @param options               OptionalAn object with the following properties:pattern (String, optional): override formatting patternwith this string.  Default value is based on locale.  Overriding this property will defeatlocalization.type (String, optional): choose a format type based on the locale from the following:decimal, scientific (not yet supported), percent, currency. decimal by default.locale (String, optional): override the locale used to determine formatting rulesstrict (Boolean, optional): strict parsing, false by default.  Strict parsing requires input as produced by the format() method.Non-strict is more permissive, e.g. flexible on white space, omitting thousands separatorsplaces (Number|String, optional): number of decimal places to accept: Infinity, a positive number, ora range "n,m".  Defined by pattern or Infinity if pattern not provided.            
@@ -10516,7 +10516,7 @@ declare module dojo {
                  * @param cont the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
                  * @param params               OptionalOptional flags/properties to configure the content-setting. See dojo/html/_ContentSetter             
                  */
-                set(node: HTMLElement, cont: String, params: Object): any;
+                set(node: HTMLElement, cont: String, params?: Object): any;
                 /**
                  * inserts (replaces) the given content into the given node. dojo/dom-construct.place(cont, node, "only")
                  * may be a better choice for simple HTML insertion.
@@ -10533,7 +10533,7 @@ declare module dojo {
                  * @param cont the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
                  * @param params               OptionalOptional flags/properties to configure the content-setting. See dojo/html/_ContentSetter             
                  */
-                set(node: HTMLElement, cont: HTMLElement, params: Object): any;
+                set(node: HTMLElement, cont: HTMLElement, params?: Object): any;
                 /**
                  * inserts (replaces) the given content into the given node. dojo/dom-construct.place(cont, node, "only")
                  * may be a better choice for simple HTML insertion.
@@ -10550,7 +10550,7 @@ declare module dojo {
                  * @param cont the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
                  * @param params               OptionalOptional flags/properties to configure the content-setting. See dojo/html/_ContentSetter             
                  */
-                set(node: HTMLElement, cont: NodeList, params: Object): any;
+                set(node: HTMLElement, cont: NodeList, params?: Object): any;
             }
             /**
              * Permalink: http://dojotoolkit.org/api/1.9/dojo/_base/kernel.io.html
@@ -11081,7 +11081,7 @@ declare module dojo {
                  * @param re A function. Takes one parameter and converts it to a regularexpression.             
                  * @param nonCapture               OptionalIf true, uses non-capturing match, otherwise matches are retainedby regular expression. Defaults to false             
                  */
-                buildGroupRE(arr: Object, re: Function, nonCapture: boolean): any;
+                buildGroupRE(arr: Object, re: Function, nonCapture?: boolean): any;
                 /**
                  * Builds a regular expression that groups subexpressions
                  * A utility function used by some of the RE generators. The
@@ -11094,21 +11094,21 @@ declare module dojo {
                  * @param re A function. Takes one parameter and converts it to a regularexpression.             
                  * @param nonCapture               OptionalIf true, uses non-capturing match, otherwise matches are retainedby regular expression. Defaults to false             
                  */
-                buildGroupRE(arr: any[], re: Function, nonCapture: boolean): any;
+                buildGroupRE(arr: any[], re: Function, nonCapture?: boolean): any;
                 /**
                  * Adds escape sequences for special characters in regular expressions
                  * 
                  * @param str             
                  * @param except               Optionala String with special characters to be left unescaped             
                  */
-                escapeString(str: String, except: String): any;
+                escapeString(str: String, except?: String): any;
                 /**
                  * adds group match to expression
                  * 
                  * @param expression             
                  * @param nonCapture               OptionalIf true, uses non-capturing match, otherwise matches are retainedby regular expression.             
                  */
-                group(expression: String, nonCapture: boolean): String;
+                group(expression: String, nonCapture?: boolean): String;
             }
             /**
              * Permalink: http://dojotoolkit.org/api/1.9/dojo/_base/kernel.number.html
@@ -11128,7 +11128,7 @@ declare module dojo {
                  * @param value the number to be formatted             
                  * @param options               OptionalAn object with the following properties:pattern (String, optional): override formatting patternwith this string.  Default value is based on locale.  Overriding this property will defeatlocalization.  Literal characters in patterns are not supported.type (String, optional): choose a format type based on the locale from the following:decimal, scientific (not yet supported), percent, currency. decimal by default.places (Number, optional): fixed number of decimal places to show.  This overrides anyinformation in the provided pattern.round (Number, optional): 5 rounds to nearest .5; 0 rounds to nearest whole (default). -1means do not round.locale (String, optional): override the locale used to determine formatting rulesfractional (Boolean, optional): If false, show no decimal places, overriding places and pattern settings.            
                  */
-                format(value: number, options: Object): any;
+                format(value: number, options?: Object): any;
                 /**
                  * Convert a properly formatted string to a primitive Number, using
                  * locale-specific settings.
@@ -11141,7 +11141,7 @@ declare module dojo {
                  * @param expression A string representation of a Number             
                  * @param options               OptionalAn object with the following properties:pattern (String, optional): override formatting patternwith this string.  Default value is based on locale.  Overriding this property will defeatlocalization.  Literal characters in patterns are not supported.type (String, optional): choose a format type based on the locale from the following:decimal, scientific (not yet supported), percent, currency. decimal by default.locale (String, optional): override the locale used to determine formatting rulesstrict (Boolean, optional): strict parsing, false by default.  Strict parsing requires input as produced by the format() method.Non-strict is more permissive, e.g. flexible on white space, omitting thousands separatorsfractional (Boolean|Array, optional): Whether to include the fractional portion, where the number of decimal places are implied by patternor explicit 'places' parameter.  The value [true,false] makes the fractional portion optional.            
                  */
-                parse(expression: String, options: Object): number;
+                parse(expression: String, options?: Object): number;
                 /**
                  * Builds the regular needed to parse a number
                  * Returns regular expression with positive and negative match, group
@@ -11161,7 +11161,7 @@ declare module dojo {
                  * @param places               OptionalThe number of decimal places where rounding takes place.  Defaults to 0 for whole rounding.Must be non-negative.             
                  * @param increment               OptionalRounds next place to nearest value of increment/10.  10 by default.             
                  */
-                round(value: number, places: number, increment: number): number;
+                round(value: number, places?: number, increment?: number): number;
             }
             /**
              * Permalink: http://dojotoolkit.org/api/1.9/dojo/_base/kernel.scopeMap.html
@@ -11511,7 +11511,7 @@ declare module dojo {
                  * @param ch               Optionalcharacter to pad, defaults to '0'             
                  * @param end               Optionaladds padding at the end if true, otherwise pads at start             
                  */
-                pad(text: String, size: number, ch: String, end: boolean): number;
+                pad(text: String, size: number, ch?: String, end?: boolean): number;
                 /**
                  * Efficiently replicate a string n times.
                  * 
@@ -11528,7 +11528,7 @@ declare module dojo {
                  * @param transform               Optionala function to process all parameters before substitution takesplace, e.g. mylib.encodeXML             
                  * @param thisObject               Optionalwhere to look for optional format function; default to the globalnamespace             
                  */
-                substitute(template: String, map: Object, transform: Function, thisObject: Object): any;
+                substitute(template: String, map: Object, transform?: Function, thisObject?: Object): any;
                 /**
                  * Performs parameterized substitutions on a string. Throws an
                  * exception if any parameter is unmatched.
@@ -11538,7 +11538,7 @@ declare module dojo {
                  * @param transform               Optionala function to process all parameters before substitution takesplace, e.g. mylib.encodeXML             
                  * @param thisObject               Optionalwhere to look for optional format function; default to the globalnamespace             
                  */
-                substitute(template: String, map: any[], transform: Function, thisObject: Object): any;
+                substitute(template: String, map: any[], transform?: Function, thisObject?: Object): any;
                 /**
                  * Trims whitespace from both sides of the string
                  * This version of trim() was taken from Steven Levithan's blog.
@@ -11677,14 +11677,14 @@ declare module dojo {
                  * 
                  * @param doc               Optional            
                  */
-                getBox(doc: HTMLDocument): Object;
+                getBox(doc?: HTMLDocument): Object;
                 /**
                  * Scroll the passed node into view using minimal movement, if it is not already.
                  * 
                  * @param node             
                  * @param pos               Optional            
                  */
-                scrollIntoView(node: HTMLElement, pos: Object): void;
+                scrollIntoView(node: HTMLElement, pos?: Object): void;
             }
         }
 
@@ -11725,7 +11725,7 @@ declare module dojo {
              * 
              * @param locale               Optional            
              */
-            getFirstDayOfWeek(locale: String): number;
+            getFirstDayOfWeek(locale?: String): number;
             /**
              * Returns a hash containing the start and end days of the weekend
              * Returns a hash containing the start and end days of the weekend according to local custom using locale,
@@ -11734,7 +11734,7 @@ declare module dojo {
              * 
              * @param locale               Optional            
              */
-            getWeekend(locale: String): Object;
+            getWeekend(locale?: String): Object;
         }
     }
 
@@ -11804,13 +11804,13 @@ declare module dojo {
              * 
              * @param request               Optional            
              */
-            close(request: dojo.data.api.Request ): void;
+            close(request?: dojo.data.api.Request ): void;
             /**
              * See dojo/data/api/Read.close()
              * 
              * @param request               Optional            
              */
-            close(request: Object): void;
+            close(request?: Object): void;
             /**
              * See dojo/data/api/Read.containsValue()
              * 
@@ -11927,7 +11927,7 @@ declare module dojo {
              * @param attribute             
              * @param defaultValue               Optional            
              */
-            getValue(item: dojo.data.api.Item, attribute: String, defaultValue: any): any;
+            getValue(item: dojo.data.api.Item, attribute: String, defaultValue?: any): any;
             /**
              * See dojo/data/api/Read.getValues()
              * 
@@ -12079,7 +12079,7 @@ declare module dojo {
              * @param property property to look up value for             
              * @param defaultValue               Optionalthe default value             
              */
-            getValue(item: Object, property: String, defaultValue: any): any;
+            getValue(item: Object, property: String, defaultValue?: any): any;
             /**
              * Gets the value of an item's 'property' and returns
              * it. If this value is an array it is just returned,
@@ -12260,7 +12260,7 @@ declare module dojo {
              * 
              * @param request               Optional            
              */
-            close(request: Object): void;
+            close(request?: Object): void;
             /**
              * See dojo/data/api/Read.containsValue()
              * 
@@ -12383,7 +12383,7 @@ declare module dojo {
              * @param attribute             
              * @param defaultValue               Optional            
              */
-            getValue(item: dojo.data.api.Item, attribute: String, defaultValue: any): any;
+            getValue(item: dojo.data.api.Item, attribute: String, defaultValue?: any): any;
             /**
              * See dojo/data/api/Read.getValues()
              * 
@@ -12403,7 +12403,7 @@ declare module dojo {
              * 
              * @param item               Optional            
              */
-            isDirty(item: any): any;
+            isDirty(item?: any): any;
             /**
              * See dojo/data/api/Read.isItem()
              * 
@@ -12428,7 +12428,7 @@ declare module dojo {
              * @param keywordArgs               Optional            
              * @param parentInfo               Optional            
              */
-            newItem(keywordArgs: Object, parentInfo: Object): Object;
+            newItem(keywordArgs?: Object, parentInfo?: Object): Object;
             /**
              * 
              * @param type             
@@ -12481,7 +12481,7 @@ declare module dojo {
              * @param newItem             
              * @param parentInfo               Optional            
              */
-            onNew(newItem: dojo.data.api.Item, parentInfo: Object): void;
+            onNew(newItem: dojo.data.api.Item, parentInfo?: Object): void;
             /**
              * See dojo/data/api/Notification.onSet()
              * 
@@ -12553,7 +12553,7 @@ declare module dojo {
                  * 
                  * @param request               OptionalAn instance of a request for the store to use to identify what to close out.If no request is passed, then the store should clear all internal caches (if any)and close out all 'open' connections.  It does not render the store unusable fromthere on, it merely cleans out any current data and resets the store to initialstate.             
                  */
-                close(request: dojo.data.api.Request ): void;
+                close(request?: dojo.data.api.Request ): void;
                 /**
                  * The close() method is intended for instructing the store to 'close' out
                  * any information associated with a particular request.
@@ -12566,7 +12566,7 @@ declare module dojo {
                  * 
                  * @param request               OptionalAn instance of a request for the store to use to identify what to close out.If no request is passed, then the store should clear all internal caches (if any)and close out all 'open' connections.  It does not render the store unusable fromthere on, it merely cleans out any current data and resets the store to initialstate.             
                  */
-                close(request: Object): void;
+                close(request?: Object): void;
                 /**
                  * Returns true if the given value is one of the values that getValues()
                  * would return.
@@ -12684,7 +12684,7 @@ declare module dojo {
                  * @param attribute The attribute to access represented as a string.             
                  * @param defaultValue               OptionalOptional.  A default value to use for the getValue return in the attribute does not exist or has no value.             
                  */
-                getValue(item: dojo.data.api.Item, attribute: String, defaultValue: any): any;
+                getValue(item: dojo.data.api.Item, attribute: String, defaultValue?: any): any;
                 /**
                  * This getValues() method works just like the getValue() method, but getValues()
                  * always returns an array rather than a single attribute value.  The array
@@ -12794,7 +12794,7 @@ declare module dojo {
                  * 
                  * @param request               OptionalAn instance of a request for the store to use to identify what to close out.If no request is passed, then the store should clear all internal caches (if any)and close out all 'open' connections.  It does not render the store unusable fromthere on, it merely cleans out any current data and resets the store to initialstate.             
                  */
-                close(request: dojo.data.api.Request ): void;
+                close(request?: dojo.data.api.Request ): void;
                 /**
                  * The close() method is intended for instructing the store to 'close' out
                  * any information associated with a particular request.
@@ -12807,7 +12807,7 @@ declare module dojo {
                  * 
                  * @param request               OptionalAn instance of a request for the store to use to identify what to close out.If no request is passed, then the store should clear all internal caches (if any)and close out all 'open' connections.  It does not render the store unusable fromthere on, it merely cleans out any current data and resets the store to initialstate.             
                  */
-                close(request: Object): void;
+                close(request?: Object): void;
                 /**
                  * Returns true if the given value is one of the values that getValues()
                  * would return.
@@ -12894,7 +12894,7 @@ declare module dojo {
                  * @param attribute The attribute to access represented as a string.             
                  * @param defaultValue               OptionalOptional.  A default value to use for the getValue return in the attribute does not exist or has no value.             
                  */
-                getValue(item: dojo.data.api.Item, attribute: String, defaultValue: any): any;
+                getValue(item: dojo.data.api.Item, attribute: String, defaultValue?: any): any;
                 /**
                  * This getValues() method works just like the getValue() method, but getValues()
                  * always returns an array rather than a single attribute value.  The array
@@ -12961,7 +12961,7 @@ declare module dojo {
                  * @param newItem The item created.             
                  * @param parentInfo               OptionalAn optional javascript object that is passed when the item created was placed in the storehierarchy as a value f another item's attribute, instead of a root level item.  Note that if thisfunction is invoked with a value for parentInfo, then onSet is not invoked stating the attribute ofthe parent item was modified.  This is to avoid getting two notification  events occurring when a new itemwith a parent is created.  The structure passed in is as follows:{    item: someItem,                         //The parent item    attribute:  "attribute-name-string",    //The attribute the new item was assigned to.    oldValue: something //Whatever was the previous value for the attribute.                //If it is a single-value attribute only, then this value will be a single value.                //If it was a multi-valued attribute, then this will be an array of all the values minus the new one.    newValue: something //The new value of the attribute.  In the case of single value calls, such as setValue, this value will be                //generally be an atomic value of some sort (string, int, etc, object).  In the case of multi-valued attributes,                //it will be an array.}             
                  */
-                onNew(newItem: dojo.data.api.Item, parentInfo: Object): any;
+                onNew(newItem: dojo.data.api.Item, parentInfo?: Object): any;
                 /**
                  * This function is called any time an item is modified via setValue, setValues, unsetAttribute, etc.
                  * This function is called any time an item is modified via setValue, setValues, unsetAttribute, etc.
@@ -13038,7 +13038,7 @@ declare module dojo {
                  * 
                  * @param request               OptionalAn instance of a request for the store to use to identify what to close out.If no request is passed, then the store should clear all internal caches (if any)and close out all 'open' connections.  It does not render the store unusable fromthere on, it merely cleans out any current data and resets the store to initialstate.             
                  */
-                close(request: dojo.data.api.Request ): void;
+                close(request?: dojo.data.api.Request ): void;
                 /**
                  * The close() method is intended for instructing the store to 'close' out
                  * any information associated with a particular request.
@@ -13051,7 +13051,7 @@ declare module dojo {
                  * 
                  * @param request               OptionalAn instance of a request for the store to use to identify what to close out.If no request is passed, then the store should clear all internal caches (if any)and close out all 'open' connections.  It does not render the store unusable fromthere on, it merely cleans out any current data and resets the store to initialstate.             
                  */
-                close(request: Object): void;
+                close(request?: Object): void;
                 /**
                  * Returns true if the given value is one of the values that getValues()
                  * would return.
@@ -13146,7 +13146,7 @@ declare module dojo {
                  * @param attribute The attribute to access represented as a string.             
                  * @param defaultValue               OptionalOptional.  A default value to use for the getValue return in the attribute does not exist or has no value.             
                  */
-                getValue(item: dojo.data.api.Item, attribute: String, defaultValue: any): any;
+                getValue(item: dojo.data.api.Item, attribute: String, defaultValue?: any): any;
                 /**
                  * This getValues() method works just like the getValue() method, but getValues()
                  * always returns an array rather than a single attribute value.  The array
@@ -13218,7 +13218,7 @@ declare module dojo {
                  * 
                  * @param request               OptionalAn instance of a request for the store to use to identify what to close out.If no request is passed, then the store should clear all internal caches (if any)and close out all 'open' connections.  It does not render the store unusable fromthere on, it merely cleans out any current data and resets the store to initialstate.             
                  */
-                close(request: dojo.data.api.Request ): void;
+                close(request?: dojo.data.api.Request ): void;
                 /**
                  * The close() method is intended for instructing the store to 'close' out
                  * any information associated with a particular request.
@@ -13231,7 +13231,7 @@ declare module dojo {
                  * 
                  * @param request               OptionalAn instance of a request for the store to use to identify what to close out.If no request is passed, then the store should clear all internal caches (if any)and close out all 'open' connections.  It does not render the store unusable fromthere on, it merely cleans out any current data and resets the store to initialstate.             
                  */
-                close(request: Object): void;
+                close(request?: Object): void;
                 /**
                  * Returns true if the given value is one of the values that getValues()
                  * would return.
@@ -13324,7 +13324,7 @@ declare module dojo {
                  * @param attribute The attribute to access represented as a string.             
                  * @param defaultValue               OptionalOptional.  A default value to use for the getValue return in the attribute does not exist or has no value.             
                  */
-                getValue(item: dojo.data.api.Item, attribute: String, defaultValue: any): any;
+                getValue(item: dojo.data.api.Item, attribute: String, defaultValue?: any): any;
                 /**
                  * This getValues() method works just like the getValue() method, but getValues()
                  * always returns an array rather than a single attribute value.  The array
@@ -13353,7 +13353,7 @@ declare module dojo {
                  * 
                  * @param item               OptionalThe item to check.             
                  */
-                isDirty(item: any): void;
+                isDirty(item?: any): void;
                 /**
                  * Returns true if something is an item and came from the store instance.
                  * Returns false if something is a literal, an item from another store instance,
@@ -13396,7 +13396,7 @@ declare module dojo {
                  * @param keywordArgs               OptionalA javascript object defining the initial content of the item as a set of JavaScript 'property name: value' pairs.             
                  * @param parentInfo               OptionalAn optional javascript object defining what item is the parent of this item (in a hierarchical store.  Not all stores do hierarchical items),and what attribute of that parent to assign the new item to.  If this is present, and the attribute specifiedis a multi-valued attribute, it will append this item into the array of values for that attribute.  The structureof the object is as follows:{    parent: someItem,    attribute: "attribute-name-string"}             
                  */
-                newItem(keywordArgs: Object, parentInfo: Object): void;
+                newItem(keywordArgs?: Object, parentInfo?: Object): void;
                 /**
                  * Discards any unsaved changes.
                  * Discards any unsaved changes.
@@ -13464,7 +13464,7 @@ declare module dojo {
                  * @param pattern A simple matching pattern to convert that follows basic rules:Means match anything, so ca* means match anything starting with ca? Means match single character.  So, b?b will match to bob and bab, and so on.\ is an escape character.  So for example, * means do not treat  as a match, but literal character .To use a \ as a character in the string, it must be escaped.  So in the pattern it should berepresented by \ to be treated as an ordinary \ character instead of an escape.             
                  * @param ignoreCase               OptionalAn optional flag to indicate if the pattern matching should be treated as case-sensitive or not when comparingBy default, it is assumed case sensitive.             
                  */
-                patternToRegExp(pattern: String, ignoreCase: boolean): any;
+                patternToRegExp(pattern: String, ignoreCase?: boolean): any;
             }
             /**
              * Permalink: http://dojotoolkit.org/api/1.9/dojo/data/util/simpleFetch.html
@@ -13970,7 +13970,7 @@ declare module dojo {
              * @param keyPressed the "copy" key was pressed             
              * @param self               Optionaloptional flag that means that we are about to drop on itself             
              */
-            copyState(keyPressed: boolean, self: boolean): any;
+            copyState(keyPressed: boolean, self?: boolean): any;
             /**
              * creator function, dummy at the moment
              * 
@@ -14005,7 +14005,7 @@ declare module dojo {
              * @param f             
              * @param o               Optional            
              */
-            forInItems(f: Function, o: Object): String;
+            forInItems(f: Function, o?: Object): String;
             /**
              * iterates over selected items;
              * see dojo/dnd/Container.forInItems() for details
@@ -14013,7 +14013,7 @@ declare module dojo {
              * @param f             
              * @param o               Optional            
              */
-            forInSelectedItems(f: Function, o: Object): void;
+            forInSelectedItems(f: Function, o?: Object): void;
             /**
              * returns a list (an array) of all valid child nodes
              * 
@@ -14475,7 +14475,7 @@ declare module dojo {
              * @param f             
              * @param o               Optional            
              */
-            forInItems(f: Function, o: Object): String;
+            forInItems(f: Function, o?: Object): String;
             /**
              * iterates over selected items;
              * see dojo/dnd/Container.forInItems() for details
@@ -14483,7 +14483,7 @@ declare module dojo {
              * @param f             
              * @param o               Optional            
              */
-            forInSelectedItems(f: Function, o: Object): void;
+            forInSelectedItems(f: Function, o?: Object): void;
             /**
              * returns a list (an array) of all valid child nodes
              * 
@@ -14823,7 +14823,7 @@ declare module dojo {
              * @param keyPressed the "copy" key was pressed             
              * @param self               Optionaloptional flag that means that we are about to drop on itself             
              */
-            copyState(keyPressed: boolean, self: boolean): any;
+            copyState(keyPressed: boolean, self?: boolean): any;
             /**
              * creator function, dummy at the moment
              * 
@@ -14858,7 +14858,7 @@ declare module dojo {
              * @param f             
              * @param o               Optional            
              */
-            forInItems(f: Function, o: Object): String;
+            forInItems(f: Function, o?: Object): String;
             /**
              * iterates over selected items;
              * see dojo/dnd/Container.forInItems() for details
@@ -14866,7 +14866,7 @@ declare module dojo {
              * @param f             
              * @param o               Optional            
              */
-            forInSelectedItems(f: Function, o: Object): void;
+            forInSelectedItems(f: Function, o?: Object): void;
             /**
              * returns a list (an array) of all valid child nodes
              * 
@@ -15147,7 +15147,7 @@ declare module dojo {
              * @param keyPressed the "copy" key was pressed             
              * @param self               Optionaloptional flag that means that we are about to drop on itself             
              */
-            copyState(keyPressed: boolean, self: boolean): any;
+            copyState(keyPressed: boolean, self?: boolean): any;
             /**
              * creator function, dummy at the moment
              * 
@@ -15182,7 +15182,7 @@ declare module dojo {
              * @param f             
              * @param o               Optional            
              */
-            forInItems(f: Function, o: Object): String;
+            forInItems(f: Function, o?: Object): String;
             /**
              * iterates over selected items;
              * see dojo/dnd/Container.forInItems() for details
@@ -15190,7 +15190,7 @@ declare module dojo {
              * @param f             
              * @param o               Optional            
              */
-            forInSelectedItems(f: Function, o: Object): void;
+            forInSelectedItems(f: Function, o?: Object): void;
             /**
              * returns a list (an array) of all valid child nodes
              * 
@@ -15417,7 +15417,7 @@ declare module dojo {
              * 
              * @param doc               Optional            
              */
-            getViewport(doc: HTMLDocument): Object;
+            getViewport(doc?: HTMLDocument): Object;
         }
         module autoscroll {
             /**
@@ -16138,7 +16138,7 @@ declare module dojo {
              * @param reason A message that may be sent to the deferred's canceler,explaining why it's being canceled.             
              * @param strict               OptionalIf strict, will throw an error if the deferred has alreadybeen fulfilled and consequently cannot be canceled.             
              */
-            cancel(reason: any, strict: boolean): any;
+            cancel(reason: any, strict?: boolean): any;
             /**
              * Checks whether the promise has been canceled.
              * 
@@ -16164,7 +16164,7 @@ declare module dojo {
              * 
              * @param errback               OptionalCallback to be invoked when the promise is rejected.             
              */
-            otherwise<U>(errback: Callback<any, U>): Promise<U>;
+            otherwise<U>(errback?: Callback<any, U>): Promise<U>;
             /**
              * Add new callbacks to the promise.
              * Add new callbacks to the deferred. Callbacks can be added
@@ -16174,7 +16174,7 @@ declare module dojo {
              * @param errback               OptionalCallback to be invoked when the promise is rejected.Receives the rejection error.             
              * @param progback               OptionalCallback to be invoked when the promise emits a progressupdate. Receives the progress update.             
              */
-            then<U>(callback: Callback<T, U>, errback?: Callback<any, U>, progback?: Callback<any, U>): Promise<U>;
+            then<U>(callback?: Callback<T, U>, errback?: Callback<any, U>, progback?: Callback<any, U>): Promise<U>;
             /**
              * 
              */
@@ -16633,7 +16633,7 @@ declare module dojo {
              * @param filter             
              * @param root               Optional            
              */
-            filter(nodeList: HTMLElement[], filter: String, root: String): void;
+            filter(nodeList: HTMLElement[], filter: String, root?: String): void;
             /**
              * function for filtering a NodeList based on a selector, optimized for simple selectors
              * 
@@ -16641,7 +16641,7 @@ declare module dojo {
              * @param filter             
              * @param root               Optional            
              */
-            filter(nodeList: HTMLElement[], filter: String, root: HTMLElement): void;
+            filter(nodeList: HTMLElement[], filter: String, root?: HTMLElement): void;
         }
 
         module acme {
@@ -16721,7 +16721,7 @@ declare module dojo {
              * @param object The object to add to the store.             
              * @param directives               OptionalAny additional parameters needed to describe how the add should be performed.             
              */
-            add(object: Object, directives: any): number;
+            add(object: Object, directives?: any): number;
             /**
              * Remove the object with the given id from the underlying caching store.
              * 
@@ -16741,7 +16741,7 @@ declare module dojo {
              * @param parent The object to find the children of.             
              * @param options               OptionalAdditional options to apply to the retrieval of the children.             
              */
-            getChildren(parent: Object, options: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
+            getChildren(parent: Object, options?: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
             /**
              * Returns an object's identity
              * 
@@ -16761,21 +16761,21 @@ declare module dojo {
              * @param object The object to put to the store.             
              * @param directives               OptionalAny additional parameters needed to describe how the put should be performed.             
              */
-            put(object: Object, directives: dojo.store.api.Store.PutDirectives): number;
+            put(object: Object, directives?: dojo.store.api.Store.PutDirectives): number;
             /**
              * Query the underlying master store and cache any results.
              * 
              * @param query The object or string containing query information. Dependent on the query engine used.             
              * @param directives               OptionalAn optional keyword arguments object with additional parameters describing the query.             
              */
-            query(query: Object, directives: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
+            query(query: Object, directives?: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
             /**
              * Query the underlying master store and cache any results.
              * 
              * @param query The object or string containing query information. Dependent on the query engine used.             
              * @param directives               OptionalAn optional keyword arguments object with additional parameters describing the query.             
              */
-            query(query: String, directives: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
+            query(query: String, directives?: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
             /**
              * Remove the object with the specific id.
              * 
@@ -16836,7 +16836,7 @@ declare module dojo {
              * @param parent The object to find the children of.             
              * @param options               OptionalAdditional options to apply to the retrieval of the children.             
              */
-            getChildren(parent: Object, options: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
+            getChildren(parent: Object, options?: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
             /**
              * Fetch the identity for the given object.
              * 
@@ -16856,21 +16856,21 @@ declare module dojo {
              * @param object The object to store.             
              * @param options               OptionalAdditional metadata for storing the data.  Includes a reference to an idthat the object may be stored with (i.e. { id: "foo" }).             
              */
-            put(object: Object, options: Object): void;
+            put(object: Object, options?: Object): void;
             /**
              * Queries the store for objects.
              * 
              * @param query The query to use for retrieving objects from the store             
              * @param options               OptionalOptional options object as used by the underlying dojo.data Store.             
              */
-            query(query: Object, options: Object): any;
+            query(query: Object, options?: Object): any;
             /**
              * Defines the query engine to use for querying the data store
              * 
              * @param query An object hash with fields that may match fields of items in the store.Values in the hash will be compared by normal == operator, but regular expressionsor any object that provides a test() method are also supported and can beused to match strings by more complex expressions(and then the regex's or object's test() method will be used to match values).             
              * @param options               OptionalAn object that contains optional information such as sort, start, and count.             
              */
-            queryEngine(query: Object, options: dojo.store.api.Store.QueryOptions): any;
+            queryEngine(query: Object, options?: dojo.store.api.Store.QueryOptions): any;
             /**
              * Deletes an object by its identity.
              * 
@@ -16917,7 +16917,7 @@ declare module dojo {
              * @param object The object to store.             
              * @param options               OptionalAdditional metadata for storing the data.  Includes an "id"property if a specific id is to be used.             
              */
-            add(object: Object, options: dojo.store.api.Store.PutDirectives): any;
+            add(object: Object, options?: dojo.store.api.Store.PutDirectives): any;
             /**
              * Retrieves an object by its identity
              * 
@@ -16930,7 +16930,7 @@ declare module dojo {
              * @param parent The object to find the children of.             
              * @param options               OptionalAdditional options to apply to the retrieval of the children.             
              */
-            getChildren(parent: Object, options: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
+            getChildren(parent: Object, options?: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
             /**
              * Returns an object's identity
              * 
@@ -16950,21 +16950,21 @@ declare module dojo {
              * @param object The object to store.             
              * @param options               OptionalAdditional metadata for storing the data.  Includes an "id"property if a specific id is to be used.             
              */
-            put(object: Object, options: dojo.store.api.Store.PutDirectives): any;
+            put(object: Object, options?: dojo.store.api.Store.PutDirectives): any;
             /**
              * Queries the store for objects.
              * 
              * @param query The query to use for retrieving objects from the store.             
              * @param options               OptionalThe optional arguments to apply to the resultset.             
              */
-            query(query: Object, options: dojo.store.api.Store.QueryOptions): any;
+            query(query: Object, options?: dojo.store.api.Store.QueryOptions): any;
             /**
              * Defines the query engine to use for querying the data store
              * 
              * @param query An object hash with fields that may match fields of items in the store.Values in the hash will be compared by normal == operator, but regular expressionsor any object that provides a test() method are also supported and can beused to match strings by more complex expressions(and then the regex's or object's test() method will be used to match values).             
              * @param options               OptionalAn object that contains optional information such as sort, start, and count.             
              */
-            queryEngine(query: Object, options: dojo.store.api.Store.QueryOptions): any;
+            queryEngine(query: Object, options?: dojo.store.api.Store.QueryOptions): any;
             /**
              * Deletes an object by its identity
              * 
@@ -17055,7 +17055,7 @@ declare module dojo {
              * @param object The object to store.             
              * @param options               OptionalAdditional metadata for storing the data.  Includes an "id"property if a specific id is to be used.             
              */
-            add(object: Object, options: Object): any;
+            add(object: Object, options?: Object): any;
             /**
              * Retrieves an object by its identity. This will trigger a GET request to the server using
              * the url this.target + id.
@@ -17070,7 +17070,7 @@ declare module dojo {
              * @param parent The object to find the children of.             
              * @param options               OptionalAdditional options to apply to the retrieval of the children.             
              */
-            getChildren(parent: Object, options: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
+            getChildren(parent: Object, options?: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
             /**
              * Returns an object's identity
              * 
@@ -17091,7 +17091,7 @@ declare module dojo {
              * @param object The object to store.             
              * @param options               OptionalAdditional metadata for storing the data.  Includes an "id"property if a specific id is to be used.             
              */
-            put(object: Object, options: Object): any;
+            put(object: Object, options?: Object): any;
             /**
              * Queries the store for objects. This will trigger a GET request to the server, with the
              * query added as a query string.
@@ -17099,7 +17099,7 @@ declare module dojo {
              * @param query The query to use for retrieving objects from the store.             
              * @param options               OptionalThe optional arguments to apply to the resultset.             
              */
-            query(query: Object, options: Object): any;
+            query(query: Object, options?: Object): any;
             /**
              * Deletes an object by its identity. This will trigger a DELETE request to the server.
              * 
@@ -17163,7 +17163,7 @@ declare module dojo {
                  * @param object The object to store.             
                  * @param directives               OptionalAdditional directives for creating objects.             
                  */
-                add(object: Object, directives: dojo.store.api.Store.PutDirectives): any;
+                add(object: Object, directives?: dojo.store.api.Store.PutDirectives): any;
                 /**
                  * Retrieves an object by its identity
                  * 
@@ -17176,7 +17176,7 @@ declare module dojo {
                  * @param parent The object to find the children of.             
                  * @param options               OptionalAdditional options to apply to the retrieval of the children.             
                  */
-                getChildren(parent: Object, options: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
+                getChildren(parent: Object, options?: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
                 /**
                  * Returns an object's identity
                  * 
@@ -17196,7 +17196,7 @@ declare module dojo {
                  * @param object The object to store.             
                  * @param directives               OptionalAdditional directives for storing objects.             
                  */
-                put(object: Object, directives: dojo.store.api.Store.PutDirectives): any;
+                put(object: Object, directives?: dojo.store.api.Store.PutDirectives): any;
                 /**
                  * 
                  */
@@ -17208,7 +17208,7 @@ declare module dojo {
                  * @param query The query to use for retrieving objects from the store.             
                  * @param options The optional arguments to apply to the resultset.             
                  */
-                query(query: String, options: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
+                query(query: String, options?: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
                 /**
                  * Queries the store for objects. This does not alter the store, but returns a
                  * set of data from the store.
@@ -17216,7 +17216,7 @@ declare module dojo {
                  * @param query The query to use for retrieving objects from the store.             
                  * @param options The optional arguments to apply to the resultset.             
                  */
-                query(query: Object, options: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
+                query(query: Object, options?: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
                 /**
                  * Queries the store for objects. This does not alter the store, but returns a
                  * set of data from the store.
@@ -17224,7 +17224,7 @@ declare module dojo {
                  * @param query The query to use for retrieving objects from the store.             
                  * @param options The optional arguments to apply to the resultset.             
                  */
-                query(query: Function, options: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
+                query(query: Function, options?: dojo.store.api.Store.QueryOptions): dojo.store.api.Store.QueryResults;
                 /**
                  * 
                  */
@@ -17520,7 +17520,7 @@ declare module dojo {
          * @param date2               OptionalDate object.  If not specified, the current Date is used.             
          * @param portion               OptionalA string indicating the "date" or "time" portion of a Date object.Compares both "date" and "time" by default.  One of the following:"date", "time", "datetime"             
          */
-        compare(date1: Date, date2: Date, portion: String): number;
+        compare(date1: Date, date2?: Date, portion?: String): number;
         /**
          * Get the difference in a specific unit of time (e.g., number of
          * months, weeks, days, etc.) between two dates, rounded to the
@@ -17530,7 +17530,7 @@ declare module dojo {
          * @param date2               OptionalDate object.  If not specified, the current Date is used.             
          * @param interval               OptionalA string representing the interval.  One of the following:"year", "month", "day", "hour", "minute", "second","millisecond", "quarter", "week", "weekday"Defaults to "day".             
          */
-        difference(date1: Date, date2: Date, interval: String): any;
+        difference(date1: Date, date2?: Date, interval?: String): any;
         /**
          * Returns the number of days in the month used by dateObject
          * 
@@ -17594,7 +17594,7 @@ declare module dojo {
              * @param formattedString A string such as 2005-06-30T08:05:00-07:00 or 2005-06-30 or T08:05:00             
              * @param defaultTime               OptionalUsed for defaults for fields omitted in the formattedString.Uses 1970-01-01T00:00:00.0Z by default.             
              */
-            fromISOString(formattedString: String, defaultTime: number): any;
+            fromISOString(formattedString: String, defaultTime?: number): any;
             /**
              * Format a Date object as a string according a subset of the ISO-8601 standard
              * When options.selector is omitted, output follows RFC3339
@@ -17604,7 +17604,7 @@ declare module dojo {
              * @param dateObject A Date object             
              * @param options               OptionalAn object with the following properties:selector (String): "date" or "time" for partial formatting of the Date object.Both date and time will be formatted by default.zulu (Boolean): if true, UTC/GMT is used for a timezonemilliseconds (Boolean): if true, output milliseconds            
              */
-            toISOString(dateObject: Date, options: Object): any;
+            toISOString(dateObject: Date, options?: Object): any;
         }
         /**
          * Permalink: http://dojotoolkit.org/api/1.9/dojo/date/locale.html
@@ -17640,7 +17640,7 @@ declare module dojo {
              * @param dateObject the date and/or time to be formatted.  If a time only is formatted,the values in the year, month, and day fields are irrelevant.  Theopposite is true when formatting only dates.             
              * @param options               OptionalAn object with the following properties:selector (String): choice of 'time','date' (default: date and time)formatLength (String): choice of long, short, medium or full (plus any custom additions).  Defaults to 'short'datePattern (String): override pattern with this stringtimePattern (String): override pattern with this stringam (String): override strings for am in timespm (String): override strings for pm in timeslocale (String): override the locale used to determine formatting rulesfullYear (Boolean): (format only) use 4 digit years whenever 2 digit years are called forstrict (Boolean): (parse only) strict parsing, off by default            
              */
-            format(dateObject: Date, options: Object): any;
+            format(dateObject: Date, options?: Object): any;
             /**
              * Used to get localized strings from dojo.cldr for day or month names.
              * 
@@ -17649,14 +17649,14 @@ declare module dojo {
              * @param context               Optional'standAlone' || 'format' (default)             
              * @param locale               Optionaloverride locale used to find the names             
              */
-            getNames(item: String, type: String, context: String, locale: String): any;
+            getNames(item: String, type: String, context?: String, locale?: String): any;
             /**
              * Determines if the date falls on a weekend, according to local custom.
              * 
              * @param dateObject               Optional            
              * @param locale               Optional            
              */
-            isWeekend(dateObject: Date, locale: String): boolean;
+            isWeekend(dateObject?: Date, locale?: String): boolean;
             /**
              * Convert a properly formatted string to a primitive Date object,
              * using locale-specific settings.
@@ -17676,13 +17676,13 @@ declare module dojo {
              * @param value A string representation of a date             
              * @param options               OptionalAn object with the following properties:selector (String): choice of 'time','date' (default: date and time)formatLength (String): choice of long, short, medium or full (plus any custom additions).  Defaults to 'short'datePattern (String): override pattern with this stringtimePattern (String): override pattern with this stringam (String): override strings for am in timespm (String): override strings for pm in timeslocale (String): override the locale used to determine formatting rulesfullYear (Boolean): (format only) use 4 digit years whenever 2 digit years are called forstrict (Boolean): (parse only) strict parsing, off by default            
              */
-            parse(value: String, options: Object): any;
+            parse(value: String, options?: Object): any;
             /**
              * Builds the regular needed to parse a localized date
              * 
              * @param options               OptionalAn object with the following properties:selector (String): choice of 'time','date' (default: date and time)formatLength (String): choice of long, short, medium or full (plus any custom additions).  Defaults to 'short'datePattern (String): override pattern with this stringtimePattern (String): override pattern with this stringam (String): override strings for am in timespm (String): override strings for pm in timeslocale (String): override the locale used to determine formatting rulesfullYear (Boolean): (format only) use 4 digit years whenever 2 digit years are called forstrict (Boolean): (parse only) strict parsing, off by default            
              */
-            regexp(options: Object): any;
+            regexp(options?: Object): any;
         }
         module locale {
             /**
@@ -17842,7 +17842,7 @@ declare module dojo {
              * 
              * @param delay               OptionalAmount of time to stall playing the hide animation             
              */
-            hide(delay: number): any;
+            hide(delay?: number): any;
             /**
              * The function that returns the dojo.Animation to hide the node
              * 
@@ -17854,7 +17854,7 @@ declare module dojo {
              * 
              * @param delay               OptionalAmount of time to stall playing the show animation             
              */
-            show(delay: number): any;
+            show(delay?: number): any;
             /**
              * The function that returns the dojo.Animation to show the node
              * 
@@ -17893,7 +17893,7 @@ declare module dojo {
              * 
              * @param n               Optional            
              */
-            backIn(n: number): number;
+            backIn(n?: number): number;
             /**
              * An easing function combining the effects of backIn and backOut
              * An easing function combining the effects of backIn and backOut.
@@ -17902,7 +17902,7 @@ declare module dojo {
              * 
              * @param n               Optional            
              */
-            backInOut(n: number): number;
+            backInOut(n?: number): number;
             /**
              * An easing function that pops past the range briefly, and slowly comes back.
              * An easing function that pops past the range briefly, and slowly comes back.
@@ -17912,55 +17912,55 @@ declare module dojo {
              * 
              * @param n               Optional            
              */
-            backOut(n: number): number;
+            backOut(n?: number): number;
             /**
              * An easing function that 'bounces' near the beginning of an Animation
              * 
              * @param n               Optional            
              */
-            bounceIn(n: number): number;
+            bounceIn(n?: number): number;
             /**
              * An easing function that 'bounces' at the beginning and end of the Animation
              * 
              * @param n               Optional            
              */
-            bounceInOut(n: number): number;
+            bounceInOut(n?: number): number;
             /**
              * An easing function that 'bounces' near the end of an Animation
              * 
              * @param n               Optional            
              */
-            bounceOut(n: number): number;
+            bounceOut(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            circIn(n: number): number;
+            circIn(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            circInOut(n: number): number;
+            circInOut(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            circOut(n: number): any;
+            circOut(n?: number): any;
             /**
              * 
              * @param n               Optional            
              */
-            cubicIn(n: number): any;
+            cubicIn(n?: number): any;
             /**
              * 
              * @param n               Optional            
              */
-            cubicInOut(n: number): number;
+            cubicInOut(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            cubicOut(n: number): number;
+            cubicOut(n?: number): number;
             /**
              * An easing function the elastically snaps from the start value
              * An easing function the elastically snaps from the start value
@@ -17970,7 +17970,7 @@ declare module dojo {
              * 
              * @param n               Optional            
              */
-            elasticIn(n: number): number;
+            elasticIn(n?: number): number;
             /**
              * An easing function that elasticly snaps around the value, near
              * the beginning and end of the Animation.
@@ -17982,7 +17982,7 @@ declare module dojo {
              * 
              * @param n               Optional            
              */
-            elasticInOut(n: number): number;
+            elasticInOut(n?: number): number;
             /**
              * An easing function that elasticly snaps around the target value,
              * near the end of the Animation
@@ -17994,88 +17994,88 @@ declare module dojo {
              * 
              * @param n               Optional            
              */
-            elasticOut(n: number): number;
+            elasticOut(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            expoIn(n: number): any;
+            expoIn(n?: number): any;
             /**
              * 
              * @param n               Optional            
              */
-            expoInOut(n: number): number;
+            expoInOut(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            expoOut(n: number): number;
+            expoOut(n?: number): number;
             /**
              * A linear easing function
              * 
              * @param n               Optional            
              */
-            linear(n: number): number;
+            linear(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            quadIn(n: number): any;
+            quadIn(n?: number): any;
             /**
              * 
              * @param n               Optional            
              */
-            quadInOut(n: number): number;
+            quadInOut(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            quadOut(n: number): number;
+            quadOut(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            quartIn(n: number): any;
+            quartIn(n?: number): any;
             /**
              * 
              * @param n               Optional            
              */
-            quartInOut(n: number): number;
+            quartInOut(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            quartOut(n: number): number;
+            quartOut(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            quintIn(n: number): any;
+            quintIn(n?: number): any;
             /**
              * 
              * @param n               Optional            
              */
-            quintInOut(n: number): number;
+            quintInOut(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            quintOut(n: number): number;
+            quintOut(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            sineIn(n: number): number;
+            sineIn(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            sineInOut(n: number): number;
+            sineInOut(n?: number): number;
             /**
              * 
              * @param n               Optional            
              */
-            sineOut(n: number): any;
+            sineOut(n?: number): any;
         }
     }
 
@@ -18242,7 +18242,7 @@ declare module dojo {
          * @param advice This is function to be called after the original method             
          * @param receiveArguments               OptionalIf this is set to true, the advice function receives the original arguments (from when the original mehtodwas called) rather than the return value of the original/previous method.             
          */
-        after(target: Object, methodName: String, advice: Function, receiveArguments: boolean): any;
+        after(target: Object, methodName: String, advice: Function, receiveArguments?: boolean): any;
         /**
          * The "around" export of the aspect module is a function that can be used to attach
          * "around" advice to a method. The advisor function is immediately executed when
@@ -18419,18 +18419,18 @@ declare module dojo {
          * @param value the number to be formatted.             
          * @param options               Optional            
          */
-        format(value: number, options: dojo.currency.__FormatOptions): any;
+        format(value: number, options?: dojo.currency.__FormatOptions): any;
         /**
          * 
          * @param expression             
          * @param options               OptionalAn object with the following properties:type (String, optional): Should not be set.  Value is assumed to be currency.currency (String, optional): an ISO4217 currency code, a three letter sequence like "USD".For use with dojo.currency only.symbol (String, optional): localized currency symbol. The default will be looked up in table of supported currencies in dojo.cldrA ISO4217 currency code will be used if not found.places (Number, optional): fixed number of decimal places to accept.  The default is determined based on which currency is used.fractional (Boolean|Array, optional): Whether to include the fractional portion, where the number of decimal places are implied by the currencyor explicit 'places' parameter.  The value [true,false] makes the fractional portion optional.By default for currencies, it the fractional portion is optional.pattern (String, optional): override formatting patternwith this string.  Default value is based on locale.  Overriding this property will defeatlocalization.  Literal characters in patterns are not supported.locale (String, optional): override the locale used to determine formatting rulesstrict (Boolean, optional): strict parsing, false by default.  Strict parsing requires input as produced by the format() method.Non-strict is more permissive, e.g. flexible on white space, omitting thousands separators            
          */
-        parse(expression: String, options: Object): any;
+        parse(expression: String, options?: Object): any;
         /**
          * 
          * @param options               OptionalAn object with the following properties:pattern (String, optional): override formatting patternwith this string.  Default value is based on locale.  Overriding this property will defeatlocalization.type (String, optional): choose a format type based on the locale from the following:decimal, scientific (not yet supported), percent, currency. decimal by default.locale (String, optional): override the locale used to determine formatting rulesstrict (Boolean, optional): strict parsing, false by default.  Strict parsing requires input as produced by the format() method.Non-strict is more permissive, e.g. flexible on white space, omitting thousands separatorsplaces (Number|String, optional): number of decimal places to accept: Infinity, a positive number, ora range "n,m".  Defined by pattern or Infinity if pattern not provided.            
          */
-        regexp(options: Object): any;
+        regexp(options?: Object): any;
     }
     module currency {
         /**
@@ -18685,7 +18685,7 @@ declare module dojo {
          * @param name the name of the attribute to set, or a hash of key-value pairs to set.             
          * @param value               Optionalthe value to set for the attribute, if the name is a string.             
          */
-        set(node: HTMLElement, name: String, value: String): any;
+        set(node: HTMLElement, name: String, value?: String): any;
         /**
          * Sets an attribute on an HTML element.
          * Handles normalized setting of attributes on DOM Nodes.
@@ -18704,7 +18704,7 @@ declare module dojo {
          * @param name the name of the attribute to set, or a hash of key-value pairs to set.             
          * @param value               Optionalthe value to set for the attribute, if the name is a string.             
          */
-        set(node: String, name: String, value: String): any;
+        set(node: String, name: String, value?: String): any;
         /**
          * Sets an attribute on an HTML element.
          * Handles normalized setting of attributes on DOM Nodes.
@@ -18723,7 +18723,7 @@ declare module dojo {
          * @param name the name of the attribute to set, or a hash of key-value pairs to set.             
          * @param value               Optionalthe value to set for the attribute, if the name is a string.             
          */
-        set(node: HTMLElement, name: Object, value: String): any;
+        set(node: HTMLElement, name: Object, value?: String): any;
         /**
          * Sets an attribute on an HTML element.
          * Handles normalized setting of attributes on DOM Nodes.
@@ -18742,7 +18742,7 @@ declare module dojo {
          * @param name the name of the attribute to set, or a hash of key-value pairs to set.             
          * @param value               Optionalthe value to set for the attribute, if the name is a string.             
          */
-        set(node: String, name: Object, value: String): any;
+        set(node: String, name: Object, value?: String): any;
     }
     /**
      * Permalink: http://dojotoolkit.org/api/1.9/dojo/dom-class.html
@@ -18806,7 +18806,7 @@ declare module dojo {
          * @param node String ID or DomNode reference to remove the class from.             
          * @param classStr               OptionalAn optional String class name to remove, or several space-separatedclass names, or an array of class names. If omitted, all class nameswill be deleted.             
          */
-        remove(node: String, classStr: String): void;
+        remove(node: String, classStr?: String): void;
         /**
          * Removes the specified classes from node. No contains()
          * check is required.
@@ -18814,7 +18814,7 @@ declare module dojo {
          * @param node String ID or DomNode reference to remove the class from.             
          * @param classStr               OptionalAn optional String class name to remove, or several space-separatedclass names, or an array of class names. If omitted, all class nameswill be deleted.             
          */
-        remove(node: HTMLElement, classStr: String): void;
+        remove(node: HTMLElement, classStr?: String): void;
         /**
          * Removes the specified classes from node. No contains()
          * check is required.
@@ -18822,7 +18822,7 @@ declare module dojo {
          * @param node String ID or DomNode reference to remove the class from.             
          * @param classStr               OptionalAn optional String class name to remove, or several space-separatedclass names, or an array of class names. If omitted, all class nameswill be deleted.             
          */
-        remove(node: String, classStr: any[]): void;
+        remove(node: String, classStr?: any[]): void;
         /**
          * Removes the specified classes from node. No contains()
          * check is required.
@@ -18830,7 +18830,7 @@ declare module dojo {
          * @param node String ID or DomNode reference to remove the class from.             
          * @param classStr               OptionalAn optional String class name to remove, or several space-separatedclass names, or an array of class names. If omitted, all class nameswill be deleted.             
          */
-        remove(node: HTMLElement, classStr: any[]): void;
+        remove(node: HTMLElement, classStr?: any[]): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -18839,7 +18839,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replace(node: String, addClassStr: String, removeClassStr: String): void;
+        replace(node: String, addClassStr: String, removeClassStr?: String): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -18848,7 +18848,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replace(node: HTMLElement, addClassStr: String, removeClassStr: String): void;
+        replace(node: HTMLElement, addClassStr: String, removeClassStr?: String): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -18857,7 +18857,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replace(node: String, addClassStr: any[], removeClassStr: String): void;
+        replace(node: String, addClassStr: any[], removeClassStr?: String): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -18866,7 +18866,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replace(node: HTMLElement, addClassStr: any[], removeClassStr: String): void;
+        replace(node: HTMLElement, addClassStr: any[], removeClassStr?: String): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -18875,7 +18875,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replace(node: String, addClassStr: String, removeClassStr: any[]): void;
+        replace(node: String, addClassStr: String, removeClassStr?: any[]): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -18884,7 +18884,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replace(node: HTMLElement, addClassStr: String, removeClassStr: any[]): void;
+        replace(node: HTMLElement, addClassStr: String, removeClassStr?: any[]): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -18893,7 +18893,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replace(node: String, addClassStr: any[], removeClassStr: any[]): void;
+        replace(node: String, addClassStr: any[], removeClassStr?: any[]): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -18902,7 +18902,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replace(node: HTMLElement, addClassStr: any[], removeClassStr: any[]): void;
+        replace(node: HTMLElement, addClassStr: any[], removeClassStr?: any[]): void;
         /**
          * Adds a class to node if not present, or removes if present.
          * Pass a boolean condition if you want to explicitly add or remove.
@@ -18912,7 +18912,7 @@ declare module dojo {
          * @param classStr A String class name to toggle, or several space-separated class names,or an array of class names.             
          * @param condition               OptionalIf passed, true means to add the class, false means to remove.Otherwise dojo.hasClass(node, classStr) is used to detect the class presence.             
          */
-        toggle(node: String, classStr: String, condition: boolean): boolean;
+        toggle(node: String, classStr: String, condition?: boolean): boolean;
         /**
          * Adds a class to node if not present, or removes if present.
          * Pass a boolean condition if you want to explicitly add or remove.
@@ -18922,7 +18922,7 @@ declare module dojo {
          * @param classStr A String class name to toggle, or several space-separated class names,or an array of class names.             
          * @param condition               OptionalIf passed, true means to add the class, false means to remove.Otherwise dojo.hasClass(node, classStr) is used to detect the class presence.             
          */
-        toggle(node: HTMLElement, classStr: String, condition: boolean): boolean;
+        toggle(node: HTMLElement, classStr: String, condition?: boolean): boolean;
         /**
          * Adds a class to node if not present, or removes if present.
          * Pass a boolean condition if you want to explicitly add or remove.
@@ -18932,7 +18932,7 @@ declare module dojo {
          * @param classStr A String class name to toggle, or several space-separated class names,or an array of class names.             
          * @param condition               OptionalIf passed, true means to add the class, false means to remove.Otherwise dojo.hasClass(node, classStr) is used to detect the class presence.             
          */
-        toggle(node: String, classStr: any[], condition: boolean): boolean;
+        toggle(node: String, classStr: any[], condition?: boolean): boolean;
         /**
          * Adds a class to node if not present, or removes if present.
          * Pass a boolean condition if you want to explicitly add or remove.
@@ -18942,7 +18942,7 @@ declare module dojo {
          * @param classStr A String class name to toggle, or several space-separated class names,or an array of class names.             
          * @param condition               OptionalIf passed, true means to add the class, false means to remove.Otherwise dojo.hasClass(node, classStr) is used to detect the class presence.             
          */
-        toggle(node: HTMLElement, classStr: any[], condition: boolean): boolean;
+        toggle(node: HTMLElement, classStr: any[], condition?: boolean): boolean;
     }
     /**
      * Permalink: http://dojotoolkit.org/api/1.9/dojo/dom-form.html
@@ -18978,7 +18978,7 @@ declare module dojo {
          * @param formNode             
          * @param prettyPrint               Optional            
          */
-        toJson(formNode: HTMLElement, prettyPrint: boolean): String;
+        toJson(formNode: HTMLElement, prettyPrint?: boolean): String;
         /**
          * Create a serialized JSON string from a form node or string
          * ID identifying the form to serialize
@@ -18986,7 +18986,7 @@ declare module dojo {
          * @param formNode             
          * @param prettyPrint               Optional            
          */
-        toJson(formNode: String, prettyPrint: boolean): String;
+        toJson(formNode: String, prettyPrint?: boolean): String;
         /**
          * Serialize a form node to a JavaScript object.
          * Returns the values encoded in an HTML form as
@@ -19046,7 +19046,7 @@ declare module dojo {
          * @param refNode               OptionalOptional reference node. Used by dojo.place to place the newly creatednode somewhere in the dom relative to refNode. Can be a DomNode referenceor String ID of a node.             
          * @param pos               OptionalOptional positional reference. Defaults to "last" by way of dojo.place,though can be set to "first","after","before","last", "replace" or "only"to further control the placement of the new node relative to the refNode.'refNode' is required if a 'pos' is specified.             
          */
-        create(tag: HTMLElement, attrs: Object, refNode: HTMLElement, pos: String): any;
+        create(tag: HTMLElement, attrs: Object, refNode?: HTMLElement, pos?: String): any;
         /**
          * Create an element, allowing for optional attribute decoration
          * and placement.
@@ -19065,7 +19065,7 @@ declare module dojo {
          * @param refNode               OptionalOptional reference node. Used by dojo.place to place the newly creatednode somewhere in the dom relative to refNode. Can be a DomNode referenceor String ID of a node.             
          * @param pos               OptionalOptional positional reference. Defaults to "last" by way of dojo.place,though can be set to "first","after","before","last", "replace" or "only"to further control the placement of the new node relative to the refNode.'refNode' is required if a 'pos' is specified.             
          */
-        create(tag: String, attrs: Object, refNode: HTMLElement, pos: String): any;
+        create(tag: String, attrs: Object, refNode?: HTMLElement, pos?: String): any;
         /**
          * Create an element, allowing for optional attribute decoration
          * and placement.
@@ -19084,7 +19084,7 @@ declare module dojo {
          * @param refNode               OptionalOptional reference node. Used by dojo.place to place the newly creatednode somewhere in the dom relative to refNode. Can be a DomNode referenceor String ID of a node.             
          * @param pos               OptionalOptional positional reference. Defaults to "last" by way of dojo.place,though can be set to "first","after","before","last", "replace" or "only"to further control the placement of the new node relative to the refNode.'refNode' is required if a 'pos' is specified.             
          */
-        create(tag: HTMLElement, attrs: Object, refNode: String, pos: String): any;
+        create(tag: HTMLElement, attrs: Object, refNode?: String, pos?: String): any;
         /**
          * Create an element, allowing for optional attribute decoration
          * and placement.
@@ -19103,7 +19103,7 @@ declare module dojo {
          * @param refNode               OptionalOptional reference node. Used by dojo.place to place the newly creatednode somewhere in the dom relative to refNode. Can be a DomNode referenceor String ID of a node.             
          * @param pos               OptionalOptional positional reference. Defaults to "last" by way of dojo.place,though can be set to "first","after","before","last", "replace" or "only"to further control the placement of the new node relative to the refNode.'refNode' is required if a 'pos' is specified.             
          */
-        create(tag: String, attrs: Object, refNode: String, pos: String): any;
+        create(tag: String, attrs: Object, refNode?: String, pos?: String): any;
         /**
          * Removes a node from its parent, clobbering it and all of its
          * children.
@@ -19142,7 +19142,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: HTMLElement, refNode: HTMLElement, position: String): HTMLElement;
+        place(node: HTMLElement, refNode: HTMLElement, position?: String): HTMLElement;
         /**
          * Attempt to insert node into the DOM, choosing from various positioning options.
          * Returns the first argument resolved to a DOM node.
@@ -19151,7 +19151,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: String, refNode: HTMLElement, position: String): HTMLElement;
+        place(node: String, refNode: HTMLElement, position?: String): HTMLElement;
         /**
          * Attempt to insert node into the DOM, choosing from various positioning options.
          * Returns the first argument resolved to a DOM node.
@@ -19160,7 +19160,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: HTMLElement, refNode: String, position: String): HTMLElement;
+        place(node: HTMLElement, refNode: String, position?: String): HTMLElement;
         /**
          * Attempt to insert node into the DOM, choosing from various positioning options.
          * Returns the first argument resolved to a DOM node.
@@ -19169,7 +19169,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: String, refNode: String, position: String): HTMLElement;
+        place(node: String, refNode: String, position?: String): HTMLElement;
         /**
          * Attempt to insert node into the DOM, choosing from various positioning options.
          * Returns the first argument resolved to a DOM node.
@@ -19178,7 +19178,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: HTMLElement, refNode: HTMLElement, position: number): HTMLElement;
+        place(node: HTMLElement, refNode: HTMLElement, position?: number): HTMLElement;
         /**
          * Attempt to insert node into the DOM, choosing from various positioning options.
          * Returns the first argument resolved to a DOM node.
@@ -19187,7 +19187,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: String, refNode: HTMLElement, position: number): HTMLElement;
+        place(node: String, refNode: HTMLElement, position?: number): HTMLElement;
         /**
          * Attempt to insert node into the DOM, choosing from various positioning options.
          * Returns the first argument resolved to a DOM node.
@@ -19196,7 +19196,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: HTMLElement, refNode: String, position: number): HTMLElement;
+        place(node: HTMLElement, refNode: String, position?: number): HTMLElement;
         /**
          * Attempt to insert node into the DOM, choosing from various positioning options.
          * Returns the first argument resolved to a DOM node.
@@ -19205,14 +19205,14 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: String, refNode: String, position: number): HTMLElement;
+        place(node: String, refNode: String, position?: number): HTMLElement;
         /**
          * instantiates an HTML fragment returning the corresponding DOM.
          * 
          * @param frag the HTML fragment             
          * @param doc               Optionaloptional document to use when creating DOM nodes, defaults todojo/_base/window.doc if not specified.             
          */
-        toDom(frag: String, doc: HTMLDocument): any;
+        toDom(frag: String, doc?: HTMLDocument): any;
     }
     /**
      * Permalink: http://dojotoolkit.org/api/1.9/dojo/dom-prop.html
@@ -19258,7 +19258,7 @@ declare module dojo {
          * @param name the name of the property to set, or a hash object to setmultiple properties at once.             
          * @param value               OptionalThe value to set for the property             
          */
-        set(node: HTMLElement, name: String, value: String): any;
+        set(node: HTMLElement, name: String, value?: String): any;
         /**
          * Sets a property on an HTML element.
          * Handles normalized setting of properties on DOM nodes.
@@ -19277,7 +19277,7 @@ declare module dojo {
          * @param name the name of the property to set, or a hash object to setmultiple properties at once.             
          * @param value               OptionalThe value to set for the property             
          */
-        set(node: String, name: String, value: String): any;
+        set(node: String, name: String, value?: String): any;
         /**
          * Sets a property on an HTML element.
          * Handles normalized setting of properties on DOM nodes.
@@ -19296,7 +19296,7 @@ declare module dojo {
          * @param name the name of the property to set, or a hash object to setmultiple properties at once.             
          * @param value               OptionalThe value to set for the property             
          */
-        set(node: HTMLElement, name: Object, value: String): any;
+        set(node: HTMLElement, name: Object, value?: String): any;
         /**
          * Sets a property on an HTML element.
          * Handles normalized setting of properties on DOM nodes.
@@ -19315,7 +19315,7 @@ declare module dojo {
          * @param name the name of the property to set, or a hash object to setmultiple properties at once.             
          * @param value               OptionalThe value to set for the property             
          */
-        set(node: String, name: Object, value: String): any;
+        set(node: String, name: Object, value?: String): any;
     }
     module dom_prop {
         /**
@@ -19414,28 +19414,28 @@ declare module dojo {
          * @param name             
          * @param value               Optional            
          */
-        set(node: HTMLElement, name: String, value: String): any;
+        set(node: HTMLElement, name: String, value?: String): any;
         /**
          * 
          * @param node             
          * @param name             
          * @param value               Optional            
          */
-        set(node: String, name: String, value: String): any;
+        set(node: String, name: String, value?: String): any;
         /**
          * 
          * @param node             
          * @param name             
          * @param value               Optional            
          */
-        set(node: HTMLElement, name: Object, value: String): any;
+        set(node: HTMLElement, name: Object, value?: String): any;
         /**
          * 
          * @param node             
          * @param name             
          * @param value               Optional            
          */
-        set(node: String, name: Object, value: String): any;
+        set(node: String, name: Object, value?: String): any;
         /**
          * converts style value to pixels on IE or return a numeric value.
          * 
@@ -19460,7 +19460,7 @@ declare module dojo {
          * 
          * @param doc               OptionalOptional document to query.   If unspecified, use win.doc.             
          */
-        docScroll(doc: HTMLDocument): Object;
+        docScroll(doc?: HTMLDocument): Object;
         /**
          * In RTL direction, scrollLeft should be a negative value, but IE
          * returns a positive one. All codes using documentElement.scrollLeft
@@ -19470,7 +19470,7 @@ declare module dojo {
          * @param scrollLeft             
          * @param doc               OptionalOptional document to query.   If unspecified, use win.doc.             
          */
-        fixIeBiDiScrollLeft(scrollLeft: number, doc: HTMLDocument): number;
+        fixIeBiDiScrollLeft(scrollLeft: number, doc?: HTMLDocument): number;
         /**
          * returns an object with properties useful for noting the border
          * dimensions.
@@ -19484,7 +19484,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getBorderExtents(node: HTMLElement, computedStyle: Object): Object;
+        getBorderExtents(node: HTMLElement, computedStyle?: Object): Object;
         /**
          * Returns an object that encodes the width, height, left and top
          * positions of the node's content box, irrespective of the
@@ -19493,7 +19493,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getContentBox(node: HTMLElement, computedStyle: Object): Object;
+        getContentBox(node: HTMLElement, computedStyle?: Object): Object;
         /**
          * returns the offset in x and y from the document body to the
          * visual edge of the page for IE
@@ -19513,7 +19513,7 @@ declare module dojo {
          * 
          * @param doc               OptionalOptional document to query.   If unspecified, use win.doc.             
          */
-        getIeDocumentElementOffset(doc: HTMLDocument): Object;
+        getIeDocumentElementOffset(doc?: HTMLDocument): Object;
         /**
          * returns an object that encodes the width, height, left and top
          * positions of the node's margin box.
@@ -19521,7 +19521,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getMarginBox(node: HTMLElement, computedStyle: Object): Object;
+        getMarginBox(node: HTMLElement, computedStyle?: Object): Object;
         /**
          * returns object with properties useful for box fitting with
          * regards to box margins (i.e., the outer-box).
@@ -19536,7 +19536,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getMarginExtents(node: HTMLElement, computedStyle: Object): Object;
+        getMarginExtents(node: HTMLElement, computedStyle?: Object): Object;
         /**
          * returns an object that encodes the width and height of
          * the node's margin box
@@ -19544,7 +19544,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getMarginSize(node: HTMLElement, computedStyle: Object): Object;
+        getMarginSize(node: HTMLElement, computedStyle?: Object): Object;
         /**
          * returns an object that encodes the width and height of
          * the node's margin box
@@ -19552,7 +19552,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getMarginSize(node: String, computedStyle: Object): Object;
+        getMarginSize(node: String, computedStyle?: Object): Object;
         /**
          * Returns object with properties useful for box fitting with
          * regards to padding.
@@ -19566,7 +19566,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getPadBorderExtents(node: HTMLElement, computedStyle: Object): Object;
+        getPadBorderExtents(node: HTMLElement, computedStyle?: Object): Object;
         /**
          * Returns object with special values specifically useful for node
          * fitting.
@@ -19584,13 +19584,13 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getPadExtents(node: HTMLElement, computedStyle: Object): Object;
+        getPadExtents(node: HTMLElement, computedStyle?: Object): Object;
         /**
          * Returns true if the current language is left-to-right, and false otherwise.
          * 
          * @param doc               OptionalOptional document to query.   If unspecified, use win.doc.             
          */
-        isBodyLtr(doc: HTMLDocument): boolean;
+        isBodyLtr(doc?: HTMLDocument): boolean;
         /**
          * Normalizes the geometry of a DOM event, normalizing the pageX, pageY,
          * offsetX, offsetY, layerX, and layerX properties
@@ -19638,7 +19638,7 @@ declare module dojo {
          * @param box hash with optional "w", and "h" properties for "width", and "height"respectively. All specified properties should have numeric values in whole pixels.             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        setContentSize(node: HTMLElement, box: Object, computedStyle: Object): void;
+        setContentSize(node: HTMLElement, box: Object, computedStyle?: Object): void;
         /**
          * sets the size of the node's margin box and placement
          * (left/top), irrespective of box model. Think of it as a
@@ -19649,7 +19649,7 @@ declare module dojo {
          * @param box hash with optional "l", "t", "w", and "h" properties for "left", "right", "width", and "height"respectively. All specified properties should have numeric values in whole pixels.             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        setMarginBox(node: HTMLElement, box: Object, computedStyle: Object): void;
+        setMarginBox(node: HTMLElement, box: Object, computedStyle?: Object): void;
     }
     /**
      * Permalink: http://dojotoolkit.org/api/1.9/dojo/gears.html
@@ -19698,7 +19698,7 @@ declare module dojo {
          * @param cont the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
          * @param params               OptionalOptional flags/properties to configure the content-setting. See dojo/html/_ContentSetter             
          */
-        set(node: HTMLElement, cont: String, params: Object): any;
+        set(node: HTMLElement, cont: String, params?: Object): any;
         /**
          * inserts (replaces) the given content into the given node. dojo/dom-construct.place(cont, node, "only")
          * may be a better choice for simple HTML insertion.
@@ -19715,7 +19715,7 @@ declare module dojo {
          * @param cont the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
          * @param params               OptionalOptional flags/properties to configure the content-setting. See dojo/html/_ContentSetter             
          */
-        set(node: HTMLElement, cont: HTMLElement, params: Object): any;
+        set(node: HTMLElement, cont: HTMLElement, params?: Object): any;
         /**
          * inserts (replaces) the given content into the given node. dojo/dom-construct.place(cont, node, "only")
          * may be a better choice for simple HTML insertion.
@@ -19732,7 +19732,7 @@ declare module dojo {
          * @param cont the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
          * @param params               OptionalOptional flags/properties to configure the content-setting. See dojo/html/_ContentSetter             
          */
-        set(node: HTMLElement, cont: NodeList, params: Object): any;
+        set(node: HTMLElement, cont: NodeList, params?: Object): any;
     }
     module html {
         /**
@@ -19800,21 +19800,21 @@ declare module dojo {
              * @param cont               OptionalAn html string, node or enumerable list of nodes for insertion into the domIf not provided, the object's content property will be used             
              * @param params               Optional            
              */
-            set(cont: String, params: Object): any;
+            set(cont: String, params?: Object): any;
             /**
              * front-end to the set-content sequence
              * 
              * @param cont               OptionalAn html string, node or enumerable list of nodes for insertion into the domIf not provided, the object's content property will be used             
              * @param params               Optional            
              */
-            set(cont: HTMLElement, params: Object): any;
+            set(cont: HTMLElement, params?: Object): any;
             /**
              * front-end to the set-content sequence
              * 
              * @param cont               OptionalAn html string, node or enumerable list of nodes for insertion into the domIf not provided, the object's content property will be used             
              * @param params               Optional            
              */
-            set(cont: NodeList, params: Object): any;
+            set(cont: NodeList, params?: Object): any;
             /**
              * sets the content on the node
              * 
@@ -20473,7 +20473,7 @@ declare module dojo {
          * @param expression A string representation of a Number             
          * @param options               OptionalAn object with the following properties:pattern (String, optional): override formatting patternwith this string.  Default value is based on locale.  Overriding this property will defeatlocalization.  Literal characters in patterns are not supported.type (String, optional): choose a format type based on the locale from the following:decimal, scientific (not yet supported), percent, currency. decimal by default.locale (String, optional): override the locale used to determine formatting rulesstrict (Boolean, optional): strict parsing, false by default.  Strict parsing requires input as produced by the format() method.Non-strict is more permissive, e.g. flexible on white space, omitting thousands separatorsfractional (Boolean|Array, optional): Whether to include the fractional portion, where the number of decimal places are implied by patternor explicit 'places' parameter.  The value [true,false] makes the fractional portion optional.            
          */
-        parse(expression: String, options: Object): number;
+        parse(expression: String, options?: Object): number;
         /**
          * Builds the regular needed to parse a number
          * Returns regular expression with positive and negative match, group
@@ -20493,7 +20493,7 @@ declare module dojo {
          * @param places               OptionalThe number of decimal places where rounding takes place.  Defaults to 0 for whole rounding.Must be non-negative.             
          * @param increment               OptionalRounds next place to nearest value of increment/10.  10 by default.             
          */
-        round(value: number, places: number, increment: number): number;
+        round(value: number, places?: number, increment?: number): number;
     }
     module number_ {
         /**
@@ -20738,7 +20738,7 @@ declare module dojo {
          * @param scripts               OptionalArray of <script type="dojo//"> DOMNodes.  If not specified, will search for <script> tags inside node.             
          * @param inherited               OptionalSettings from dir=rtl or lang=... on a node above this node.   Overrides options.inherited.             
          */
-        construct(ctor: Function, node: HTMLElement, mixin: Object, options: Object, scripts: HTMLElement[], inherited: Object): any;
+        construct(ctor: Function, node: HTMLElement, mixin?: Object, options?: Object, scripts?: HTMLElement[], inherited?: Object): any;
         /**
          * Takes array of nodes, and turns them into class instances and
          * potentially calls a startup method to allow them to connect with
@@ -20748,7 +20748,7 @@ declare module dojo {
          * @param mixin               OptionalAn object that will be mixed in with each node in the array.Values in the mixin will override values in the node, if theyexist.             
          * @param options               OptionalAn object used to hold kwArgs for instantiation.See parse.options argument for details.             
          */
-        instantiate(nodes: any[], mixin: Object, options: Object): any;
+        instantiate(nodes: any[], mixin?: Object, options?: Object): any;
         /**
          * Scan the DOM for class instances, and instantiate them.
          * Search specified node (or root node) recursively for class instances,
@@ -20770,7 +20770,7 @@ declare module dojo {
          * @param rootNode               OptionalA default starting root node from which to start the parsing. Can beomitted, defaulting to the entire document. If omitted, the optionsobject can be passed in this place. If the options object has arootNode member, that is used.             
          * @param options               OptionalA hash of options.noStart: Boolean?:  when set will prevent the parser from calling .startup()  when locating the nodes.rootNode: DomNode?:  identical to the function's rootNode argument, though  allowed to be passed in via this `options object.template: Boolean:  If true, ignores ContentPane's stopParser flag and parses contents inside of  a ContentPane inside of a template.   This allows dojoAttachPoint on widgets/nodes  nested inside the ContentPane to work.inherited: Object:  Hash possibly containing dir and lang settings to be applied to  parsed widgets, unless there's another setting on a sub-node that overridesscope: String:  Root for attribute names to search for.   If scopeName is dojo,  will search for data-dojo-type (or dojoType).   For backwards compatibility  reasons defaults to dojo._scopeName (which is "dojo" except when  multi-version support is used, when it will be something like dojo16, dojo20, etc.)propsThis: Object:  If specified, "this" referenced from data-dojo-props will refer to propsThis.  Intended for use from the widgets-in-template feature of dijit._WidgetsInTemplateMixincontextRequire: Function:  If specified, this require is utilised for looking resolving modules instead of the  dojo/parser context require().  Intended for use from the widgets-in-template feature of  dijit._WidgetsInTemplateMixin.             
          */
-        parse(rootNode: HTMLElement, options: Object): any;
+        parse(rootNode?: HTMLElement, options?: Object): any;
         /**
          * Scan a DOM tree and return an array of objects representing the DOMNodes
          * that need to be turned into widgets.
@@ -20786,7 +20786,7 @@ declare module dojo {
          * @param root               OptionalA default starting root node from which to start the parsing. Can beomitted, defaulting to the entire document. If omitted, the optionsobject can be passed in this place. If the options object has arootNode member, that is used.             
          * @param options a kwArgs options object, see parse() for details             
          */
-        scan(root: HTMLElement, options: Object): dojo.promise.Promise<any>;
+        scan(root?: HTMLElement, options?: Object): dojo.promise.Promise<any>;
     }
     /**
      * Permalink: http://dojotoolkit.org/api/1.9/dojo/regexp.html
@@ -20807,7 +20807,7 @@ declare module dojo {
          * @param re A function. Takes one parameter and converts it to a regularexpression.             
          * @param nonCapture               OptionalIf true, uses non-capturing match, otherwise matches are retainedby regular expression. Defaults to false             
          */
-        buildGroupRE(arr: Object, re: Function, nonCapture: boolean): any;
+        buildGroupRE(arr: Object, re: Function, nonCapture?: boolean): any;
         /**
          * Builds a regular expression that groups subexpressions
          * A utility function used by some of the RE generators. The
@@ -20820,21 +20820,21 @@ declare module dojo {
          * @param re A function. Takes one parameter and converts it to a regularexpression.             
          * @param nonCapture               OptionalIf true, uses non-capturing match, otherwise matches are retainedby regular expression. Defaults to false             
          */
-        buildGroupRE(arr: any[], re: Function, nonCapture: boolean): any;
+        buildGroupRE(arr: any[], re: Function, nonCapture?: boolean): any;
         /**
          * Adds escape sequences for special characters in regular expressions
          * 
          * @param str             
          * @param except               Optionala String with special characters to be left unescaped             
          */
-        escapeString(str: String, except: String): any;
+        escapeString(str: String, except?: String): any;
         /**
          * adds group match to expression
          * 
          * @param expression             
          * @param nonCapture               OptionalIf true, uses non-capturing match, otherwise matches are retainedby regular expression.             
          */
-        group(expression: String, nonCapture: boolean): String;
+        group(expression: String, nonCapture?: boolean): String;
     }
     /**
      * Permalink: http://dojotoolkit.org/api/1.9/dojo/require.html
@@ -20888,7 +20888,7 @@ declare module dojo {
          * @param charOrCode char/JS keyCode/dojo.keys.* constant for the key you want to hold downWarning: holding down a shifted key, like 'A', can have unpredictable results.             
          * @param delay               OptionalDelay, in milliseconds, to wait before firing.The delay is a delta with respect to the previous automation call.For example, the following code ends after 600ms:robot.mouseClick({left: true}, 100) // first call; wait 100msrobot.typeKeys("dij", 500) // 500ms AFTER previous call; 600ms in all             
          */
-        keyDown(charOrCode: number, delay: number): void;
+        keyDown(charOrCode: number, delay?: number): void;
         /**
          * Types a key combination, like SHIFT-TAB.
          * Types a key combination, like SHIFT-TAB.
@@ -20906,7 +20906,7 @@ declare module dojo {
          * @param charOrCode char/JS keyCode/dojo.keys.* constant for the key you want to releaseWarning: releasing a shifted key, like 'A', can have unpredictable results.             
          * @param delay               OptionalDelay, in milliseconds, to wait before firing.The delay is a delta with respect to the previous automation call.For example, the following code ends after 600ms:robot.mouseClick({left: true}, 100) // first call; wait 100msrobot.typeKeys("dij", 500) // 500ms AFTER previous call; 600ms in all             
          */
-        keyUp(charOrCode: number, delay: number): void;
+        keyUp(charOrCode: number, delay?: number): void;
         /**
          * 
          */
@@ -20920,7 +20920,7 @@ declare module dojo {
          * @param buttons             
          * @param delay               Optional            
          */
-        mouseClick(buttons: Object, delay: number): void;
+        mouseClick(buttons: Object, delay?: number): void;
         /**
          * Moves the mouse to the specified x,y offset relative to the viewport.
          * 
@@ -20990,7 +20990,7 @@ declare module dojo {
          * @param buttons JSON object that represents all of the mouse buttons being pressed.It takes the following Boolean attributes:leftmiddleright             
          * @param delay               OptionalDelay, in milliseconds, to wait before firing.The delay is a delta with respect to the previous automation call.For example, the following code ends after 600ms:robot.mouseClick({left: true}, 100) // first call; wait 100msrobot.typeKeys("dij", 500) // 500ms AFTER previous call; 600ms in all             
          */
-        mousePress(buttons: Object, delay: number): void;
+        mousePress(buttons: Object, delay?: number): void;
         /**
          * Releases mouse buttons.
          * Releases the mouse buttons you pass as true.
@@ -21001,7 +21001,7 @@ declare module dojo {
          * @param buttons             
          * @param delay               Optional            
          */
-        mouseRelease(buttons: Object, delay: number): void;
+        mouseRelease(buttons: Object, delay?: number): void;
         /**
          * Spins the mouse wheel.
          * Spins the wheel wheelAmt "notches."
@@ -21015,7 +21015,7 @@ declare module dojo {
          * @param delay               OptionalDelay, in milliseconds, to wait before firing.The delay is a delta with respect to the previous automation call.For example, the following code ends after 600ms:    robot.mouseClick({left: true}, 100) // first call; wait 100ms    robot.typeKeys("dij", 500) // 500ms AFTER previous call; 600ms in all             
          * @param duration               OptionalApproximate time Robot will spend moving the mouseBy default, the Robot will wheel the mouse as fast as possible.             
          */
-        mouseWheel(wheelAmt: number, delay: number, duration: number): void;
+        mouseWheel(wheelAmt: number, delay?: number, duration?: number): void;
         /**
          * Scroll the passed node into view, if it is not.
          * 
@@ -21044,7 +21044,7 @@ declare module dojo {
          * @param delay               OptionalDelay, in milliseconds, to wait before firing.The delay is a delta with respect to the previous automation call.For example, the following code ends after 600ms:robot.mouseClick({left: true}, 100) // first call; wait 100msrobot.typeKeys("dij", 500) // 500ms AFTER previous call; 600ms in all             
          * @param duration               OptionalDelay to wait after firing.             
          */
-        sequence(f: Function, delay: number, duration: number): void;
+        sequence(f: Function, delay?: number, duration?: number): void;
         /**
          * Set clipboard content.
          * Set data as clipboard content, overriding anything already there. The
@@ -21053,7 +21053,7 @@ declare module dojo {
          * @param data New clipboard content to set             
          * @param format               OptionalSet this to "text/html" to put richtext to the clipboard.Otherwise, data is treated as plaintext. By default, plaintextis used.             
          */
-        setClipboard(data: String, format: String): void;
+        setClipboard(data: String, format?: String): void;
         /**
          * 
          */
@@ -21066,7 +21066,7 @@ declare module dojo {
          * @param delay               OptionalDelay, in milliseconds, to wait before firing.The delay is a delta with respect to the previous automation call.For example, the following code ends after 600ms:robot.mouseClick({left: true}, 100) // first call; wait 100msrobot.typeKeys("dij", 500) // 500ms AFTER previous call; 600ms in all             
          * @param duration               OptionalTime, in milliseconds, to spend pressing all of the keys.The default is (string length)*50 ms.             
          */
-        typeKeys(chars: String, delay: number, duration: number): void;
+        typeKeys(chars: String, delay?: number, duration?: number): void;
         /**
          * Types a string of characters in order, or types a dojo.keys.* constant.
          * Types a string of characters in order, or types a dojo.keys.* constant.
@@ -21075,7 +21075,7 @@ declare module dojo {
          * @param delay               OptionalDelay, in milliseconds, to wait before firing.The delay is a delta with respect to the previous automation call.For example, the following code ends after 600ms:robot.mouseClick({left: true}, 100) // first call; wait 100msrobot.typeKeys("dij", 500) // 500ms AFTER previous call; 600ms in all             
          * @param duration               OptionalTime, in milliseconds, to spend pressing all of the keys.The default is (string length)*50 ms.             
          */
-        typeKeys(chars: number, delay: number, duration: number): void;
+        typeKeys(chars: number, delay?: number, duration?: number): void;
         /**
          * Notifies DOH that the doh.robot is about to make a page change in the application it is driving,
          * returning a doh.Deferred object the user should return in their runTest function as part of a DOH test.
@@ -21134,7 +21134,7 @@ declare module dojo {
          * @param charOrCode char/JS keyCode/dojo.keys.* constant for the key you want to hold downWarning: holding down a shifted key, like 'A', can have unpredictable results.             
          * @param delay               OptionalDelay, in milliseconds, to wait before firing.The delay is a delta with respect to the previous automation call.For example, the following code ends after 600ms:robot.mouseClick({left: true}, 100) // first call; wait 100msrobot.typeKeys("dij", 500) // 500ms AFTER previous call; 600ms in all             
          */
-        keyDown(charOrCode: number, delay: number): void;
+        keyDown(charOrCode: number, delay?: number): void;
         /**
          * Types a key combination, like SHIFT-TAB.
          * Types a key combination, like SHIFT-TAB.
@@ -21152,7 +21152,7 @@ declare module dojo {
          * @param charOrCode char/JS keyCode/dojo.keys.* constant for the key you want to releaseWarning: releasing a shifted key, like 'A', can have unpredictable results.             
          * @param delay               OptionalDelay, in milliseconds, to wait before firing.The delay is a delta with respect to the previous automation call.For example, the following code ends after 600ms:robot.mouseClick({left: true}, 100) // first call; wait 100msrobot.typeKeys("dij", 500) // 500ms AFTER previous call; 600ms in all             
          */
-        keyUp(charOrCode: number, delay: number): void;
+        keyUp(charOrCode: number, delay?: number): void;
         /**
          * 
          */
@@ -21166,7 +21166,7 @@ declare module dojo {
          * @param buttons             
          * @param delay               Optional            
          */
-        mouseClick(buttons: Object, delay: number): void;
+        mouseClick(buttons: Object, delay?: number): void;
         /**
          * Moves the mouse to the specified x,y offset relative to the viewport.
          * 
@@ -21236,7 +21236,7 @@ declare module dojo {
          * @param buttons JSON object that represents all of the mouse buttons being pressed.It takes the following Boolean attributes:leftmiddleright             
          * @param delay               OptionalDelay, in milliseconds, to wait before firing.The delay is a delta with respect to the previous automation call.For example, the following code ends after 600ms:robot.mouseClick({left: true}, 100) // first call; wait 100msrobot.typeKeys("dij", 500) // 500ms AFTER previous call; 600ms in all             
          */
-        mousePress(buttons: Object, delay: number): void;
+        mousePress(buttons: Object, delay?: number): void;
         /**
          * Releases mouse buttons.
          * Releases the mouse buttons you pass as true.
@@ -21247,7 +21247,7 @@ declare module dojo {
          * @param buttons             
          * @param delay               Optional            
          */
-        mouseRelease(buttons: Object, delay: number): void;
+        mouseRelease(buttons: Object, delay?: number): void;
         /**
          * Spins the mouse wheel.
          * Spins the wheel wheelAmt "notches."
@@ -21290,7 +21290,7 @@ declare module dojo {
          * @param delay               OptionalDelay, in milliseconds, to wait before firing.The delay is a delta with respect to the previous automation call.For example, the following code ends after 600ms:robot.mouseClick({left: true}, 100) // first call; wait 100msrobot.typeKeys("dij", 500) // 500ms AFTER previous call; 600ms in all             
          * @param duration               OptionalDelay to wait after firing.             
          */
-        sequence(f: Function, delay: number, duration: number): void;
+        sequence(f: Function, delay?: number, duration?: number): void;
         /**
          * Set clipboard content.
          * Set data as clipboard content, overriding anything already there. The
@@ -21299,7 +21299,7 @@ declare module dojo {
          * @param data New clipboard content to set             
          * @param format               OptionalSet this to "text/html" to put richtext to the clipboard.Otherwise, data is treated as plaintext. By default, plaintextis used.             
          */
-        setClipboard(data: String, format: String): void;
+        setClipboard(data: String, format?: String): void;
         /**
          * 
          */
@@ -21312,7 +21312,7 @@ declare module dojo {
          * @param delay               OptionalDelay, in milliseconds, to wait before firing.The delay is a delta with respect to the previous automation call.For example, the following code ends after 600ms:robot.mouseClick({left: true}, 100) // first call; wait 100msrobot.typeKeys("dij", 500) // 500ms AFTER previous call; 600ms in all             
          * @param duration               OptionalTime, in milliseconds, to spend pressing all of the keys.The default is (string length)*50 ms.             
          */
-        typeKeys(chars: String, delay: number, duration: number): void;
+        typeKeys(chars: String, delay?: number, duration?: number): void;
         /**
          * Types a string of characters in order, or types a dojo.keys.* constant.
          * Types a string of characters in order, or types a dojo.keys.* constant.
@@ -21321,7 +21321,7 @@ declare module dojo {
          * @param delay               OptionalDelay, in milliseconds, to wait before firing.The delay is a delta with respect to the previous automation call.For example, the following code ends after 600ms:robot.mouseClick({left: true}, 100) // first call; wait 100msrobot.typeKeys("dij", 500) // 500ms AFTER previous call; 600ms in all             
          * @param duration               OptionalTime, in milliseconds, to spend pressing all of the keys.The default is (string length)*50 ms.             
          */
-        typeKeys(chars: number, delay: number, duration: number): void;
+        typeKeys(chars: number, delay?: number, duration?: number): void;
         /**
          * Notifies DOH that the doh.robot is about to make a page change in the application it is driving,
          * returning a doh.Deferred object the user should return in their runTest function as part of a DOH test.
@@ -21683,7 +21683,7 @@ declare module dojo {
          * @param context The context in which to run execute callback, or a callback if not using context             
          * @param callback               OptionalThe function to execute.             
          */
-        addOnLoad(priority: number, context: any, callback: Function): void;
+        addOnLoad(priority: number, context: any, callback?: Function): void;
         /**
          * registers a function to be triggered when the page unloads.
          * The first time that addOnUnload is called Dojo will
@@ -21706,7 +21706,7 @@ declare module dojo {
          * @param obj               Optional            
          * @param functionName               Optional            
          */
-        addOnUnload(obj: Object, functionName: String): void;
+        addOnUnload(obj?: Object, functionName?: String): void;
         /**
          * registers a function to be triggered when the page unloads.
          * The first time that addOnUnload is called Dojo will
@@ -21729,7 +21729,7 @@ declare module dojo {
          * @param obj               Optional            
          * @param functionName               Optional            
          */
-        addOnUnload(obj: Function, functionName: String): void;
+        addOnUnload(obj?: Function, functionName?: String): void;
         /**
          * registers a function to be triggered when the page unloads.
          * The first time that addOnUnload is called Dojo will
@@ -21752,7 +21752,7 @@ declare module dojo {
          * @param obj               Optional            
          * @param functionName               Optional            
          */
-        addOnUnload(obj: Object, functionName: Function): void;
+        addOnUnload(obj?: Object, functionName?: Function): void;
         /**
          * registers a function to be triggered when the page unloads.
          * The first time that addOnUnload is called Dojo will
@@ -21775,7 +21775,7 @@ declare module dojo {
          * @param obj               Optional            
          * @param functionName               Optional            
          */
-        addOnUnload(obj: Function, functionName: Function): void;
+        addOnUnload(obj?: Function, functionName?: Function): void;
         /**
          * registers a function to be triggered when window.onunload fires.
          * Be careful trying to modify the DOM or access JavaScript properties
@@ -21786,7 +21786,7 @@ declare module dojo {
          * @param obj               Optional            
          * @param functionName               Optional            
          */
-        addOnWindowUnload(obj: Object, functionName: String): void;
+        addOnWindowUnload(obj?: Object, functionName?: String): void;
         /**
          * registers a function to be triggered when window.onunload fires.
          * Be careful trying to modify the DOM or access JavaScript properties
@@ -21797,7 +21797,7 @@ declare module dojo {
          * @param obj               Optional            
          * @param functionName               Optional            
          */
-        addOnWindowUnload(obj: Object, functionName: Function): void;
+        addOnWindowUnload(obj?: Object, functionName?: Function): void;
         /**
          * A simpler interface to animateProperty(), also returns
          * an instance of Animation but begins the animation
@@ -21818,7 +21818,7 @@ declare module dojo {
          * @param onEnd               OptionalA function to be called when the animation finishesrunning.             
          * @param delay               OptionalThe number of milliseconds to delay beginning theanimation by. The default is 0.             
          */
-        anim(node: HTMLElement, properties: Object, duration: number, easing: Function, onEnd: Function, delay: number): any;
+        anim(node: HTMLElement, properties: Object, duration?: number, easing?: Function, onEnd?: Function, delay?: number): any;
         /**
          * A simpler interface to animateProperty(), also returns
          * an instance of Animation but begins the animation
@@ -21839,7 +21839,7 @@ declare module dojo {
          * @param onEnd               OptionalA function to be called when the animation finishesrunning.             
          * @param delay               OptionalThe number of milliseconds to delay beginning theanimation by. The default is 0.             
          */
-        anim(node: String, properties: Object, duration: number, easing: Function, onEnd: Function, delay: number): any;
+        anim(node: String, properties: Object, duration?: number, easing?: Function, onEnd?: Function, delay?: number): any;
         /**
          * Returns an animation that will transition the properties of
          * node defined in args depending how they are defined in
@@ -21888,7 +21888,7 @@ declare module dojo {
          * @param name the name of the attribute to get or set.             
          * @param value               OptionalThe value to set for the attribute             
          */
-        attr(node: HTMLElement, name: String, value: String): any;
+        attr(node: HTMLElement, name: String, value?: String): any;
         /**
          * Gets or sets an attribute on an HTML element.
          * Handles normalized getting and setting of attributes on DOM
@@ -21912,7 +21912,7 @@ declare module dojo {
          * @param name the name of the attribute to get or set.             
          * @param value               OptionalThe value to set for the attribute             
          */
-        attr(node: String, name: String, value: String): any;
+        attr(node: String, name: String, value?: String): any;
         /**
          * Gets or sets an attribute on an HTML element.
          * Handles normalized getting and setting of attributes on DOM
@@ -21936,7 +21936,7 @@ declare module dojo {
          * @param name the name of the attribute to get or set.             
          * @param value               OptionalThe value to set for the attribute             
          */
-        attr(node: HTMLElement, name: Object, value: String): any;
+        attr(node: HTMLElement, name: Object, value?: String): any;
         /**
          * Gets or sets an attribute on an HTML element.
          * Handles normalized getting and setting of attributes on DOM
@@ -21960,7 +21960,7 @@ declare module dojo {
          * @param name the name of the attribute to get or set.             
          * @param value               OptionalThe value to set for the attribute             
          */
-        attr(node: String, name: Object, value: String): any;
+        attr(node: String, name: Object, value?: String): any;
         /**
          * Blend colors end and start with weight from 0 to 1, 0.5 being a 50/50 blend,
          * can reuse a previously allocated Color object for the result
@@ -21970,13 +21970,13 @@ declare module dojo {
          * @param weight             
          * @param obj               Optional            
          */
-        blendColors(start: dojo._base.Color, end: dojo._base.Color, weight: number, obj: dojo._base.Color): any;
+        blendColors(start: dojo._base.Color, end: dojo._base.Color, weight: number, obj?: dojo._base.Color): any;
         /**
          * Return the body element of the specified document or of dojo/_base/window::doc.
          * 
          * @param doc               Optional            
          */
-        body(doc: HTMLDocument): any;
+        body(doc?: HTMLDocument): any;
         /**
          * Returns DOM node with matching id attribute or falsy value (ex: null or undefined)
          * if not found.  If id is a DomNode, this function is a no-op.
@@ -21984,7 +21984,7 @@ declare module dojo {
          * @param id A string to match an HTML id attribute or a reference to a DOM Node             
          * @param doc               OptionalDocument to work in. Defaults to the current value ofdojo/_base/window.doc.  Can be used to retrievenode references from other documents.             
          */
-        byId(id: String, doc: HTMLDocument): any;
+        byId(id: String, doc?: HTMLDocument): any;
         /**
          * Returns DOM node with matching id attribute or falsy value (ex: null or undefined)
          * if not found.  If id is a DomNode, this function is a no-op.
@@ -21992,7 +21992,7 @@ declare module dojo {
          * @param id A string to match an HTML id attribute or a reference to a DOM Node             
          * @param doc               OptionalDocument to work in. Defaults to the current value ofdojo/_base/window.doc.  Can be used to retrievenode references from other documents.             
          */
-        byId(id: HTMLElement, doc: HTMLDocument): any;
+        byId(id: HTMLElement, doc?: HTMLDocument): any;
         /**
          * A getter and setter for storing the string content associated with the
          * module and url arguments.
@@ -22012,7 +22012,7 @@ declare module dojo {
          * @param url The rest of the path to append to the path derived from the module argument. Ifmodule is an object, then this second argument should be the "value" argument instead.             
          * @param value               OptionalIf a String, the value to use in the cache for the module/url combination.If an Object, it can have two properties: value and sanitize. The value propertyshould be the value to use in the cache, and sanitize can be set to true or false,to indicate if XML declarations should be removed from the value and if the HTMLinside a body tag in the value should be extracted as the real value. The value argumentor the value property on the value argument are usually only used by the build systemas it inlines cache content.             
          */
-        cache(module: String, url: String, value: String): any;
+        cache(module: String, url: String, value?: String): any;
         /**
          * A getter and setter for storing the string content associated with the
          * module and url arguments.
@@ -22032,7 +22032,7 @@ declare module dojo {
          * @param url The rest of the path to append to the path derived from the module argument. Ifmodule is an object, then this second argument should be the "value" argument instead.             
          * @param value               OptionalIf a String, the value to use in the cache for the module/url combination.If an Object, it can have two properties: value and sanitize. The value propertyshould be the value to use in the cache, and sanitize can be set to true or false,to indicate if XML declarations should be removed from the value and if the HTMLinside a body tag in the value should be extracted as the real value. The value argumentor the value property on the value argument are usually only used by the build systemas it inlines cache content.             
          */
-        cache(module: Object, url: String, value: String): any;
+        cache(module: Object, url: String, value?: String): any;
         /**
          * A getter and setter for storing the string content associated with the
          * module and url arguments.
@@ -22052,7 +22052,7 @@ declare module dojo {
          * @param url The rest of the path to append to the path derived from the module argument. Ifmodule is an object, then this second argument should be the "value" argument instead.             
          * @param value               OptionalIf a String, the value to use in the cache for the module/url combination.If an Object, it can have two properties: value and sanitize. The value propertyshould be the value to use in the cache, and sanitize can be set to true or false,to indicate if XML declarations should be removed from the value and if the HTMLinside a body tag in the value should be extracted as the real value. The value argumentor the value property on the value argument are usually only used by the build systemas it inlines cache content.             
          */
-        cache(module: String, url: String, value: Object): any;
+        cache(module: String, url: String, value?: Object): any;
         /**
          * A getter and setter for storing the string content associated with the
          * module and url arguments.
@@ -22072,7 +22072,7 @@ declare module dojo {
          * @param url The rest of the path to append to the path derived from the module argument. Ifmodule is an object, then this second argument should be the "value" argument instead.             
          * @param value               OptionalIf a String, the value to use in the cache for the module/url combination.If an Object, it can have two properties: value and sanitize. The value propertyshould be the value to use in the cache, and sanitize can be set to true or false,to indicate if XML declarations should be removed from the value and if the HTMLinside a body tag in the value should be extracted as the real value. The value argumentor the value property on the value argument are usually only used by the build systemas it inlines cache content.             
          */
-        cache(module: Object, url: String, value: Object): any;
+        cache(module: Object, url: String, value?: Object): any;
         /**
          * 
          */
@@ -22108,7 +22108,7 @@ declare module dojo {
          * @param a             
          * @param obj               Optional            
          */
-        colorFromArray(a: any[], obj: dojo._base.Color): any;
+        colorFromArray(a: any[], obj?: dojo._base.Color): any;
         /**
          * Converts a hex string with a '#' prefix to a color object.
          * Supports 12-bit #rgb shorthand. Optionally accepts a
@@ -22117,7 +22117,7 @@ declare module dojo {
          * @param color             
          * @param obj               Optional            
          */
-        colorFromHex(color: String, obj: dojo._base.Color): any;
+        colorFromHex(color: String, obj?: dojo._base.Color): any;
         /**
          * get rgb(a) array from css-style color declarations
          * this function can handle all 4 CSS3 Color Module formats: rgb,
@@ -22126,7 +22126,7 @@ declare module dojo {
          * @param color             
          * @param obj               Optional            
          */
-        colorFromRgb(color: String, obj: dojo._base.Color): any;
+        colorFromRgb(color: String, obj?: dojo._base.Color): any;
         /**
          * Parses str for a color value. Accepts hex, rgb, and rgba
          * style color values.
@@ -22138,7 +22138,7 @@ declare module dojo {
          * @param str             
          * @param obj               Optional            
          */
-        colorFromString(str: String, obj: dojo._base.Color): any;
+        colorFromString(str: String, obj?: dojo._base.Color): any;
         /**
          * dojo.connect is a deprecated event handling and delegation method in
          * Dojo. It allows one function to "listen in" on the execution of
@@ -22178,7 +22178,7 @@ declare module dojo {
          * @param method A function reference, or name of a function in context.The function identified by method fires after event does.method receives the same arguments as the event.See context argument comments for information on method's scope.             
          * @param dontFix               OptionalIf obj is a DOM node, set dontFix to true to prevent delegationof this connection to the DOM event manager.             
          */
-        connect(obj: Object, event: String, context: Object, method: String, dontFix: boolean): any;
+        connect(obj: Object, event: String, context: Object, method: String, dontFix?: boolean): any;
         /**
          * dojo.connect is a deprecated event handling and delegation method in
          * Dojo. It allows one function to "listen in" on the execution of
@@ -22218,7 +22218,7 @@ declare module dojo {
          * @param method A function reference, or name of a function in context.The function identified by method fires after event does.method receives the same arguments as the event.See context argument comments for information on method's scope.             
          * @param dontFix               OptionalIf obj is a DOM node, set dontFix to true to prevent delegationof this connection to the DOM event manager.             
          */
-        connect(obj: Object, event: String, context: any, method: String, dontFix: boolean): any;
+        connect(obj: Object, event: String, context: any, method: String, dontFix?: boolean): any;
         /**
          * dojo.connect is a deprecated event handling and delegation method in
          * Dojo. It allows one function to "listen in" on the execution of
@@ -22258,7 +22258,7 @@ declare module dojo {
          * @param method A function reference, or name of a function in context.The function identified by method fires after event does.method receives the same arguments as the event.See context argument comments for information on method's scope.             
          * @param dontFix               OptionalIf obj is a DOM node, set dontFix to true to prevent delegationof this connection to the DOM event manager.             
          */
-        connect(obj: Object, event: String, context: Object, method: Function, dontFix: boolean): any;
+        connect(obj: Object, event: String, context: Object, method: Function, dontFix?: boolean): any;
         /**
          * dojo.connect is a deprecated event handling and delegation method in
          * Dojo. It allows one function to "listen in" on the execution of
@@ -22298,7 +22298,7 @@ declare module dojo {
          * @param method A function reference, or name of a function in context.The function identified by method fires after event does.method receives the same arguments as the event.See context argument comments for information on method's scope.             
          * @param dontFix               OptionalIf obj is a DOM node, set dontFix to true to prevent delegationof this connection to the DOM event manager.             
          */
-        connect(obj: Object, event: String, context: any, method: Function, dontFix: boolean): any;
+        connect(obj: Object, event: String, context: any, method: Function, dontFix?: boolean): any;
         /**
          * Getter/setter for the content-box of node.
          * Returns an object in the expected format of box (regardless if box is passed).
@@ -22315,7 +22315,7 @@ declare module dojo {
          * @param node id or reference to DOM Node to get/set box for             
          * @param box               OptionalIf passed, denotes that dojo.contentBox() shouldupdate/set the content box for node. Box is an object in theabove format, but only w (width) and h (height) are supported.All properties are optional if passed.             
          */
-        contentBox(node: HTMLElement, box: Object): any;
+        contentBox(node: HTMLElement, box?: Object): any;
         /**
          * Getter/setter for the content-box of node.
          * Returns an object in the expected format of box (regardless if box is passed).
@@ -22332,7 +22332,7 @@ declare module dojo {
          * @param node id or reference to DOM Node to get/set box for             
          * @param box               OptionalIf passed, denotes that dojo.contentBox() shouldupdate/set the content box for node. Box is an object in theabove format, but only w (width) and h (height) are supported.All properties are optional if passed.             
          */
-        contentBox(node: String, box: Object): any;
+        contentBox(node: String, box?: Object): any;
         /**
          * Get or set a cookie.
          * If one argument is passed, returns the value of the cookie
@@ -22342,7 +22342,7 @@ declare module dojo {
          * @param value               OptionalValue for the cookie             
          * @param props               OptionalProperties for the cookie             
          */
-        cookie(name: String, value: String, props: Object): any;
+        cookie(name: String, value?: String, props?: Object): any;
         /**
          * Deprecated: Use position() for border-box x/y/w/h
          * or marginBox() for margin-box w/h/l/t.
@@ -22361,7 +22361,7 @@ declare module dojo {
          * @param node             
          * @param includeScroll               Optional            
          */
-        coords(node: HTMLElement, includeScroll: boolean): any;
+        coords(node: HTMLElement, includeScroll?: boolean): any;
         /**
          * Deprecated: Use position() for border-box x/y/w/h
          * or marginBox() for margin-box w/h/l/t.
@@ -22380,7 +22380,7 @@ declare module dojo {
          * @param node             
          * @param includeScroll               Optional            
          */
-        coords(node: String, includeScroll: boolean): any;
+        coords(node: String, includeScroll?: boolean): any;
         /**
          * Create an element, allowing for optional attribute decoration
          * and placement.
@@ -22399,7 +22399,7 @@ declare module dojo {
          * @param refNode               OptionalOptional reference node. Used by dojo.place to place the newly creatednode somewhere in the dom relative to refNode. Can be a DomNode referenceor String ID of a node.             
          * @param pos               OptionalOptional positional reference. Defaults to "last" by way of dojo.place,though can be set to "first","after","before","last", "replace" or "only"to further control the placement of the new node relative to the refNode.'refNode' is required if a 'pos' is specified.             
          */
-        create(tag: HTMLElement, attrs: Object, refNode: HTMLElement, pos: String): any;
+        create(tag: HTMLElement, attrs: Object, refNode?: HTMLElement, pos?: String): any;
         /**
          * Create an element, allowing for optional attribute decoration
          * and placement.
@@ -22418,7 +22418,7 @@ declare module dojo {
          * @param refNode               OptionalOptional reference node. Used by dojo.place to place the newly creatednode somewhere in the dom relative to refNode. Can be a DomNode referenceor String ID of a node.             
          * @param pos               OptionalOptional positional reference. Defaults to "last" by way of dojo.place,though can be set to "first","after","before","last", "replace" or "only"to further control the placement of the new node relative to the refNode.'refNode' is required if a 'pos' is specified.             
          */
-        create(tag: String, attrs: Object, refNode: HTMLElement, pos: String): any;
+        create(tag: String, attrs: Object, refNode?: HTMLElement, pos?: String): any;
         /**
          * Create an element, allowing for optional attribute decoration
          * and placement.
@@ -22437,7 +22437,7 @@ declare module dojo {
          * @param refNode               OptionalOptional reference node. Used by dojo.place to place the newly creatednode somewhere in the dom relative to refNode. Can be a DomNode referenceor String ID of a node.             
          * @param pos               OptionalOptional positional reference. Defaults to "last" by way of dojo.place,though can be set to "first","after","before","last", "replace" or "only"to further control the placement of the new node relative to the refNode.'refNode' is required if a 'pos' is specified.             
          */
-        create(tag: HTMLElement, attrs: Object, refNode: String, pos: String): any;
+        create(tag: HTMLElement, attrs: Object, refNode?: String, pos?: String): any;
         /**
          * Create an element, allowing for optional attribute decoration
          * and placement.
@@ -22456,7 +22456,7 @@ declare module dojo {
          * @param refNode               OptionalOptional reference node. Used by dojo.place to place the newly creatednode somewhere in the dom relative to refNode. Can be a DomNode referenceor String ID of a node.             
          * @param pos               OptionalOptional positional reference. Defaults to "last" by way of dojo.place,though can be set to "first","after","before","last", "replace" or "only"to further control the placement of the new node relative to the refNode.'refNode' is required if a 'pos' is specified.             
          */
-        create(tag: String, attrs: Object, refNode: String, pos: String): any;
+        create(tag: String, attrs: Object, refNode?: String, pos?: String): any;
         /**
          * Create a feature-rich constructor from compact notation.
          * Create a constructor using a compact notation for inheritance and
@@ -22668,7 +22668,7 @@ declare module dojo {
          * @param consumeErrors               Optional            
          * @param canceller               OptionalA deferred canceller function, see dojo.Deferred             
          */
-        DeferredList(list: any[], fireOnOneCallback: boolean, fireOnOneErrback: boolean, consumeErrors: boolean, canceller: Function): void;
+        DeferredList(list: any[], fireOnOneCallback?: boolean, fireOnOneErrback?: boolean, consumeErrors?: boolean, canceller?: Function): void;
         /**
          * Log a debug message to indicate that a behavior has been
          * deprecated.
@@ -22677,7 +22677,7 @@ declare module dojo {
          * @param extra               OptionalText to append to the message. Often provides advice on anew function or facility to achieve the same goal duringthe deprecation period.             
          * @param removal               OptionalText to indicate when in the future the behavior will beremoved. Usually a version number.             
          */
-        deprecated(behaviour: String, extra: String, removal: String): void;
+        deprecated(behaviour: String, extra?: String, removal?: String): void;
         /**
          * 
          * @param node             
@@ -22695,7 +22695,7 @@ declare module dojo {
          * 
          * @param doc               OptionalOptional document to query.   If unspecified, use win.doc.             
          */
-        docScroll(doc: HTMLDocument): Object;
+        docScroll(doc?: HTMLDocument): Object;
         /**
          * 
          * @param node             
@@ -22735,7 +22735,7 @@ declare module dojo {
          * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
          * @param thisObject               Optionalmay be used to scope the call to callback             
          */
-        every(arr: any[], callback: Function, thisObject: Object): boolean;
+        every(arr: any[], callback: Function, thisObject?: Object): boolean;
         /**
          * Determines whether or not every item in arr satisfies the
          * condition implemented by callback.
@@ -22749,7 +22749,7 @@ declare module dojo {
          * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
          * @param thisObject               Optionalmay be used to scope the call to callback             
          */
-        every(arr: String, callback: Function, thisObject: Object): boolean;
+        every(arr: String, callback: Function, thisObject?: Object): boolean;
         /**
          * Determines whether or not every item in arr satisfies the
          * condition implemented by callback.
@@ -22763,7 +22763,7 @@ declare module dojo {
          * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
          * @param thisObject               Optionalmay be used to scope the call to callback             
          */
-        every(arr: any[], callback: String, thisObject: Object): boolean;
+        every(arr: any[], callback: String, thisObject?: Object): boolean;
         /**
          * Determines whether or not every item in arr satisfies the
          * condition implemented by callback.
@@ -22777,7 +22777,7 @@ declare module dojo {
          * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
          * @param thisObject               Optionalmay be used to scope the call to callback             
          */
-        every(arr: String, callback: String, thisObject: Object): boolean;
+        every(arr: String, callback: String, thisObject?: Object): boolean;
         /**
          * 
          * @param exitcode             
@@ -22794,7 +22794,7 @@ declare module dojo {
          * @param moduleName The name of a module, or the name of a module file or a specificfunction             
          * @param extra               Optionalsome additional message for the user             
          */
-        experimental(moduleName: String, extra: String): void;
+        experimental(moduleName: String, extra?: String): void;
         /**
          * Returns an animation that will fade node defined in 'args' from
          * its current opacity to fully opaque.
@@ -22842,7 +22842,7 @@ declare module dojo {
          * @param callback a function that is invoked with three arguments (item,index, array). The return of this function is expected tobe a boolean which determines whether the passed-in itemwill be included in the returned array.             
          * @param thisObject               Optionalmay be used to scope the call to callback             
          */
-        filter(arr: any[], callback: Function, thisObject: Object): any[];
+        filter(arr: any[], callback: Function, thisObject?: Object): any[];
         /**
          * Returns a new Array with those items from arr that match the
          * condition implemented by callback.
@@ -22856,7 +22856,7 @@ declare module dojo {
          * @param callback a function that is invoked with three arguments (item,index, array). The return of this function is expected tobe a boolean which determines whether the passed-in itemwill be included in the returned array.             
          * @param thisObject               Optionalmay be used to scope the call to callback             
          */
-        filter(arr: any[], callback: String, thisObject: Object): any[];
+        filter(arr: any[], callback: String, thisObject?: Object): any[];
         /**
          * normalizes properties on the event object including event
          * bubbling methods, keystroke normalization, and x/y positions
@@ -22874,7 +22874,7 @@ declare module dojo {
          * @param scrollLeft             
          * @param doc               OptionalOptional document to query.   If unspecified, use win.doc.             
          */
-        fixIeBiDiScrollLeft(scrollLeft: number, doc: HTMLDocument): number;
+        fixIeBiDiScrollLeft(scrollLeft: number, doc?: HTMLDocument): number;
         /**
          * for every item in arr, callback is invoked. Return values are ignored.
          * If you want to break out of the loop, consider using array.every() or array.some().
@@ -22889,7 +22889,7 @@ declare module dojo {
          * @param callback             
          * @param thisObject               Optional            
          */
-        forEach(arr: any[], callback: Function, thisObject: Object): void;
+        forEach(arr: any[], callback: Function, thisObject?: Object): void;
         /**
          * for every item in arr, callback is invoked. Return values are ignored.
          * If you want to break out of the loop, consider using array.every() or array.some().
@@ -22904,7 +22904,7 @@ declare module dojo {
          * @param callback             
          * @param thisObject               Optional            
          */
-        forEach(arr: String, callback: Function, thisObject: Object): void;
+        forEach(arr: String, callback: Function, thisObject?: Object): void;
         /**
          * for every item in arr, callback is invoked. Return values are ignored.
          * If you want to break out of the loop, consider using array.every() or array.some().
@@ -22919,7 +22919,7 @@ declare module dojo {
          * @param callback             
          * @param thisObject               Optional            
          */
-        forEach(arr: any[], callback: String, thisObject: Object): void;
+        forEach(arr: any[], callback: String, thisObject?: Object): void;
         /**
          * for every item in arr, callback is invoked. Return values are ignored.
          * If you want to break out of the loop, consider using array.every() or array.some().
@@ -22934,7 +22934,7 @@ declare module dojo {
          * @param callback             
          * @param thisObject               Optional            
          */
-        forEach(arr: String, callback: String, thisObject: Object): void;
+        forEach(arr: String, callback: String, thisObject?: Object): void;
         /**
          * Create a serialized JSON string from a form node or string
          * ID identifying the form to serialize
@@ -22942,7 +22942,7 @@ declare module dojo {
          * @param formNode             
          * @param prettyPrint               Optional            
          */
-        formToJson(formNode: HTMLElement, prettyPrint: boolean): String;
+        formToJson(formNode: HTMLElement, prettyPrint?: boolean): String;
         /**
          * Create a serialized JSON string from a form node or string
          * ID identifying the form to serialize
@@ -22950,7 +22950,7 @@ declare module dojo {
          * @param formNode             
          * @param prettyPrint               Optional            
          */
-        formToJson(formNode: String, prettyPrint: boolean): String;
+        formToJson(formNode: String, prettyPrint?: boolean): String;
         /**
          * Serialize a form node to a JavaScript object.
          * Returns the values encoded in an HTML form as
@@ -23025,7 +23025,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getBorderExtents(node: HTMLElement, computedStyle: Object): Object;
+        getBorderExtents(node: HTMLElement, computedStyle?: Object): Object;
         /**
          * Returns a "computed style" object.
          * Gets a "computed style" object which can be used to gather
@@ -23052,7 +23052,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getContentBox(node: HTMLElement, computedStyle: Object): Object;
+        getContentBox(node: HTMLElement, computedStyle?: Object): Object;
         /**
          * returns the offset in x and y from the document body to the
          * visual edge of the page for IE
@@ -23072,7 +23072,7 @@ declare module dojo {
          * 
          * @param doc               OptionalOptional document to query.   If unspecified, use win.doc.             
          */
-        getIeDocumentElementOffset(doc: HTMLDocument): Object;
+        getIeDocumentElementOffset(doc?: HTMLDocument): Object;
         /**
          * 
          * @param moduleName             
@@ -23087,7 +23087,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getMarginBox(node: HTMLElement, computedStyle: Object): Object;
+        getMarginBox(node: HTMLElement, computedStyle?: Object): Object;
         /**
          * returns object with properties useful for box fitting with
          * regards to box margins (i.e., the outer-box).
@@ -23102,7 +23102,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getMarginExtents(node: HTMLElement, computedStyle: Object): Object;
+        getMarginExtents(node: HTMLElement, computedStyle?: Object): Object;
         /**
          * returns an object that encodes the width and height of
          * the node's margin box
@@ -23110,7 +23110,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getMarginSize(node: HTMLElement, computedStyle: Object): Object;
+        getMarginSize(node: HTMLElement, computedStyle?: Object): Object;
         /**
          * returns an object that encodes the width and height of
          * the node's margin box
@@ -23118,7 +23118,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getMarginSize(node: String, computedStyle: Object): Object;
+        getMarginSize(node: String, computedStyle?: Object): Object;
         /**
          * Returns an effective value of a property or an attribute.
          * 
@@ -23146,7 +23146,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getPadBorderExtents(node: HTMLElement, computedStyle: Object): Object;
+        getPadBorderExtents(node: HTMLElement, computedStyle?: Object): Object;
         /**
          * Returns object with special values specifically useful for node
          * fitting.
@@ -23164,7 +23164,7 @@ declare module dojo {
          * @param node             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        getPadExtents(node: HTMLElement, computedStyle: Object): Object;
+        getPadExtents(node: HTMLElement, computedStyle?: Object): Object;
         /**
          * Gets a property on an HTML element.
          * Handles normalized getting of properties on DOM nodes.
@@ -23194,7 +23194,7 @@ declare module dojo {
          * @param node id or reference to node to get style for             
          * @param name               Optionalthe style property to get             
          */
-        getStyle(node: HTMLElement, name: String): any;
+        getStyle(node: HTMLElement, name?: String): any;
         /**
          * Accesses styles on a node.
          * Getting the style value uses the computed style for the node, so the value
@@ -23208,7 +23208,7 @@ declare module dojo {
          * @param node id or reference to node to get style for             
          * @param name               Optionalthe style property to get             
          */
-        getStyle(node: String, name: String): any;
+        getStyle(node: String, name?: String): any;
         /**
          * Returns true if the requested attribute is specified on the
          * given element, and false otherwise.
@@ -23251,7 +23251,7 @@ declare module dojo {
          * @param hash               Optionalthe hash is set - #string.             
          * @param replace               OptionalIf true, updates the hash value in the current historystate instead of creating a new history state.             
          */
-        hash(hash: String, replace: boolean): any;
+        hash(hash?: String, replace?: boolean): any;
         /**
          * locates the first index of the provided value in the
          * passed array. If the value is not found, -1 is returned.
@@ -23268,13 +23268,13 @@ declare module dojo {
          * @param fromIndex               Optional            
          * @param findLast               OptionalMakes indexOf() work like lastIndexOf().  Used internally; not meant for external usage.             
          */
-        indexOf(arr: any[], value: Object, fromIndex: number, findLast: boolean): number;
+        indexOf(arr: any[], value: Object, fromIndex?: number, findLast?: boolean): number;
         /**
          * Returns true if the current language is left-to-right, and false otherwise.
          * 
          * @param doc               OptionalOptional document to query.   If unspecified, use win.doc.             
          */
-        isBodyLtr(doc: HTMLDocument): boolean;
+        isBodyLtr(doc?: HTMLDocument): boolean;
         /**
          * Returns true if node is a descendant of ancestor
          * 
@@ -23318,7 +23318,7 @@ declare module dojo {
          * @param value             
          * @param fromIndex               Optional            
          */
-        lastIndexOf(arr: any, value: any, fromIndex: number): number;
+        lastIndexOf(arr: any, value: any, fromIndex?: number): number;
         /**
          * 
          * @param f             
@@ -23397,7 +23397,7 @@ declare module dojo {
          * @param node id or reference to DOM Node to get/set box for             
          * @param box               OptionalIf passed, denotes that dojo.marginBox() shouldupdate/set the margin box for node. Box is an object in theabove format. All properties are optional if passed.             
          */
-        marginBox(node: HTMLElement, box: Object): any;
+        marginBox(node: HTMLElement, box?: Object): any;
         /**
          * Getter/setter for the margin-box of node.
          * Getter/setter for the margin-box of node.
@@ -23411,14 +23411,14 @@ declare module dojo {
          * @param node id or reference to DOM Node to get/set box for             
          * @param box               OptionalIf passed, denotes that dojo.marginBox() shouldupdate/set the margin box for node. Box is an object in theabove format. All properties are optional if passed.             
          */
-        marginBox(node: String, box: Object): any;
+        marginBox(node: String, box?: Object): any;
         /**
          * Returns a URL relative to a module.
          * 
          * @param module dojo/dom-class             
          * @param url               Optional            
          */
-        moduleUrl(module: String, url: String): String;
+        moduleUrl(module: String, url?: String): String;
         /**
          * Array-like object which adds syntactic
          * sugar for chaining, common iteration operations, animation, and
@@ -23449,7 +23449,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: HTMLElement, refNode: HTMLElement, position: String): HTMLElement;
+        place(node: HTMLElement, refNode: HTMLElement, position?: String): HTMLElement;
         /**
          * Attempt to insert node into the DOM, choosing from various positioning options.
          * Returns the first argument resolved to a DOM node.
@@ -23458,7 +23458,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: String, refNode: HTMLElement, position: String): HTMLElement;
+        place(node: String, refNode: HTMLElement, position?: String): HTMLElement;
         /**
          * Attempt to insert node into the DOM, choosing from various positioning options.
          * Returns the first argument resolved to a DOM node.
@@ -23467,7 +23467,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: HTMLElement, refNode: String, position: String): HTMLElement;
+        place(node: HTMLElement, refNode: String, position?: String): HTMLElement;
         /**
          * Attempt to insert node into the DOM, choosing from various positioning options.
          * Returns the first argument resolved to a DOM node.
@@ -23476,7 +23476,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: String, refNode: String, position: String): HTMLElement;
+        place(node: String, refNode: String, position?: String): HTMLElement;
         /**
          * Attempt to insert node into the DOM, choosing from various positioning options.
          * Returns the first argument resolved to a DOM node.
@@ -23485,7 +23485,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: HTMLElement, refNode: HTMLElement, position: number): HTMLElement;
+        place(node: HTMLElement, refNode: HTMLElement, position?: number): HTMLElement;
         /**
          * Attempt to insert node into the DOM, choosing from various positioning options.
          * Returns the first argument resolved to a DOM node.
@@ -23494,7 +23494,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: String, refNode: HTMLElement, position: number): HTMLElement;
+        place(node: String, refNode: HTMLElement, position?: number): HTMLElement;
         /**
          * Attempt to insert node into the DOM, choosing from various positioning options.
          * Returns the first argument resolved to a DOM node.
@@ -23503,7 +23503,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: HTMLElement, refNode: String, position: number): HTMLElement;
+        place(node: HTMLElement, refNode: String, position?: number): HTMLElement;
         /**
          * Attempt to insert node into the DOM, choosing from various positioning options.
          * Returns the first argument resolved to a DOM node.
@@ -23512,7 +23512,7 @@ declare module dojo {
          * @param refNode id or node reference to use as basis for placement             
          * @param position               Optionalstring noting the position of node relative to refNode or anumber indicating the location in the childNodes collection of refNode.Accepted string values are:beforeafterreplaceonlyfirstlast"first" and "last" indicate positions as children of refNode, "replace" replaces refNode,"only" replaces all children.  position defaults to "last" if not specified             
          */
-        place(node: String, refNode: String, position: number): HTMLElement;
+        place(node: String, refNode: String, position?: number): HTMLElement;
         /**
          * require one or more modules based on which host environment
          * Dojo is currently operating in
@@ -23567,7 +23567,7 @@ declare module dojo {
          * @param node             
          * @param includeScroll               Optional            
          */
-        position(node: String, includeScroll: boolean): Object;
+        position(node: String, includeScroll?: boolean): Object;
         /**
          * Gets or sets a property on an HTML element.
          * Handles normalized getting and setting of properties on DOM
@@ -23591,7 +23591,7 @@ declare module dojo {
          * @param name the name of the property to get or set.             
          * @param value               OptionalThe value to set for the property             
          */
-        prop(node: HTMLElement, name: String, value: String): any;
+        prop(node: HTMLElement, name: String, value?: String): any;
         /**
          * Gets or sets a property on an HTML element.
          * Handles normalized getting and setting of properties on DOM
@@ -23615,7 +23615,7 @@ declare module dojo {
          * @param name the name of the property to get or set.             
          * @param value               OptionalThe value to set for the property             
          */
-        prop(node: String, name: String, value: String): any;
+        prop(node: String, name: String, value?: String): any;
         /**
          * Gets or sets a property on an HTML element.
          * Handles normalized getting and setting of properties on DOM
@@ -23639,7 +23639,7 @@ declare module dojo {
          * @param name the name of the property to get or set.             
          * @param value               OptionalThe value to set for the property             
          */
-        prop(node: HTMLElement, name: Object, value: String): any;
+        prop(node: HTMLElement, name: Object, value?: String): any;
         /**
          * Gets or sets a property on an HTML element.
          * Handles normalized getting and setting of properties on DOM
@@ -23663,7 +23663,7 @@ declare module dojo {
          * @param name the name of the property to get or set.             
          * @param value               OptionalThe value to set for the property             
          */
-        prop(node: String, name: Object, value: String): any;
+        prop(node: String, name: Object, value?: String): any;
         /**
          * 
          * @param mid             
@@ -23693,7 +23693,7 @@ declare module dojo {
          * @param g               OptionalThe global context. If a string, the id of the frame tosearch for a context and document.             
          * @param d               OptionalThe document element to execute subsequent code with.             
          */
-        pushContext(g: Object, d: HTMLDocument): void;
+        pushContext(g?: Object, d?: HTMLDocument): void;
         /**
          * causes subsequent calls to Dojo methods to assume the
          * passed object and, optionally, document as the default
@@ -23718,7 +23718,7 @@ declare module dojo {
          * @param g               OptionalThe global context. If a string, the id of the frame tosearch for a context and document.             
          * @param d               OptionalThe document element to execute subsequent code with.             
          */
-        pushContext(g: String, d: HTMLDocument): void;
+        pushContext(g?: String, d?: HTMLDocument): void;
         /**
          * Create an object representing a de-serialized query section of a
          * URL. Query keys with multiple values are returned in an array.
@@ -23784,7 +23784,7 @@ declare module dojo {
          * @param node String ID or DomNode reference to remove the class from.             
          * @param classStr               OptionalAn optional String class name to remove, or several space-separatedclass names, or an array of class names. If omitted, all class nameswill be deleted.             
          */
-        removeClass(node: String, classStr: String): void;
+        removeClass(node: String, classStr?: String): void;
         /**
          * Removes the specified classes from node. No contains()
          * check is required.
@@ -23792,7 +23792,7 @@ declare module dojo {
          * @param node String ID or DomNode reference to remove the class from.             
          * @param classStr               OptionalAn optional String class name to remove, or several space-separatedclass names, or an array of class names. If omitted, all class nameswill be deleted.             
          */
-        removeClass(node: HTMLElement, classStr: String): void;
+        removeClass(node: HTMLElement, classStr?: String): void;
         /**
          * Removes the specified classes from node. No contains()
          * check is required.
@@ -23800,7 +23800,7 @@ declare module dojo {
          * @param node String ID or DomNode reference to remove the class from.             
          * @param classStr               OptionalAn optional String class name to remove, or several space-separatedclass names, or an array of class names. If omitted, all class nameswill be deleted.             
          */
-        removeClass(node: String, classStr: any[]): void;
+        removeClass(node: String, classStr?: any[]): void;
         /**
          * Removes the specified classes from node. No contains()
          * check is required.
@@ -23808,7 +23808,7 @@ declare module dojo {
          * @param node String ID or DomNode reference to remove the class from.             
          * @param classStr               OptionalAn optional String class name to remove, or several space-separatedclass names, or an array of class names. If omitted, all class nameswill be deleted.             
          */
-        removeClass(node: HTMLElement, classStr: any[]): void;
+        removeClass(node: HTMLElement, classStr?: any[]): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -23817,7 +23817,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replaceClass(node: String, addClassStr: String, removeClassStr: String): void;
+        replaceClass(node: String, addClassStr: String, removeClassStr?: String): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -23826,7 +23826,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replaceClass(node: HTMLElement, addClassStr: String, removeClassStr: String): void;
+        replaceClass(node: HTMLElement, addClassStr: String, removeClassStr?: String): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -23835,7 +23835,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replaceClass(node: String, addClassStr: any[], removeClassStr: String): void;
+        replaceClass(node: String, addClassStr: any[], removeClassStr?: String): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -23844,7 +23844,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replaceClass(node: HTMLElement, addClassStr: any[], removeClassStr: String): void;
+        replaceClass(node: HTMLElement, addClassStr: any[], removeClassStr?: String): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -23853,7 +23853,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replaceClass(node: String, addClassStr: String, removeClassStr: any[]): void;
+        replaceClass(node: String, addClassStr: String, removeClassStr?: any[]): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -23862,7 +23862,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replaceClass(node: HTMLElement, addClassStr: String, removeClassStr: any[]): void;
+        replaceClass(node: HTMLElement, addClassStr: String, removeClassStr?: any[]): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -23871,7 +23871,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replaceClass(node: String, addClassStr: any[], removeClassStr: any[]): void;
+        replaceClass(node: String, addClassStr: any[], removeClassStr?: any[]): void;
         /**
          * Replaces one or more classes on a node if not present.
          * Operates more quickly than calling dojo.removeClass and dojo.addClass
@@ -23880,7 +23880,7 @@ declare module dojo {
          * @param addClassStr A String class name to add, or several space-separated class names,or an array of class names.             
          * @param removeClassStr               OptionalA String class name to remove, or several space-separated class names,or an array of class names.             
          */
-        replaceClass(node: HTMLElement, addClassStr: any[], removeClassStr: any[]): void;
+        replaceClass(node: HTMLElement, addClassStr: any[], removeClassStr?: any[]): void;
         /**
          * loads a Javascript module from the appropriate URI
          * Modules are loaded via dojo.require by using one of two loaders: the normal loader
@@ -23935,7 +23935,7 @@ declare module dojo {
          * @param moduleName module name to load, using periods for separators, e.g. "dojo.date.locale".  Module paths are de-referenced by dojo'sinternal mapping of locations to names and are disambiguated bylongest prefix. See dojo.registerModulePath() for details onregistering new modules.             
          * @param omitModuleCheck               Optionalif true, omitModuleCheck skips the step of ensuring that theloaded file actually defines the symbol it is referenced by.For example if it called as dojo.require("a.b.c") and thefile located at a/b/c.js does not define an object a.b.c,and exception will be throws whereas no exception is raisedwhen called as dojo.require("a.b.c", true)             
          */
-        require(moduleName: String, omitModuleCheck: boolean): any;
+        require(moduleName: String, omitModuleCheck?: boolean): any;
         /**
          * If the condition is true then call dojo.require() for the specified
          * resource
@@ -23944,7 +23944,7 @@ declare module dojo {
          * @param moduleName             
          * @param omitModuleCheck               Optional            
          */
-        requireAfterIf(condition: boolean, moduleName: String, omitModuleCheck: boolean): void;
+        requireAfterIf(condition: boolean, moduleName: String, omitModuleCheck?: boolean): void;
         /**
          * If the condition is true then call dojo.require() for the specified
          * resource
@@ -23953,14 +23953,14 @@ declare module dojo {
          * @param moduleName             
          * @param omitModuleCheck               Optional            
          */
-        requireIf(condition: boolean, moduleName: String, omitModuleCheck: boolean): void;
+        requireIf(condition: boolean, moduleName: String, omitModuleCheck?: boolean): void;
         /**
          * 
          * @param moduleName             
          * @param bundleName             
          * @param locale               Optional            
          */
-        requireLocalization(moduleName: String, bundleName: String, locale: String): void;
+        requireLocalization(moduleName: String, bundleName: String, locale?: String): void;
         /**
          * Mix in properties skipping a constructor and decorating functions
          * like it is done by declare().
@@ -23997,7 +23997,7 @@ declare module dojo {
          * @param name the name of the attribute to set, or a hash of key-value pairs to set.             
          * @param value               Optionalthe value to set for the attribute, if the name is a string.             
          */
-        setAttr(node: HTMLElement, name: String, value: String): any;
+        setAttr(node: HTMLElement, name: String, value?: String): any;
         /**
          * Sets an attribute on an HTML element.
          * Handles normalized setting of attributes on DOM Nodes.
@@ -24016,7 +24016,7 @@ declare module dojo {
          * @param name the name of the attribute to set, or a hash of key-value pairs to set.             
          * @param value               Optionalthe value to set for the attribute, if the name is a string.             
          */
-        setAttr(node: String, name: String, value: String): any;
+        setAttr(node: String, name: String, value?: String): any;
         /**
          * Sets an attribute on an HTML element.
          * Handles normalized setting of attributes on DOM Nodes.
@@ -24035,7 +24035,7 @@ declare module dojo {
          * @param name the name of the attribute to set, or a hash of key-value pairs to set.             
          * @param value               Optionalthe value to set for the attribute, if the name is a string.             
          */
-        setAttr(node: HTMLElement, name: Object, value: String): any;
+        setAttr(node: HTMLElement, name: Object, value?: String): any;
         /**
          * Sets an attribute on an HTML element.
          * Handles normalized setting of attributes on DOM Nodes.
@@ -24054,7 +24054,7 @@ declare module dojo {
          * @param name the name of the attribute to set, or a hash of key-value pairs to set.             
          * @param value               Optionalthe value to set for the attribute, if the name is a string.             
          */
-        setAttr(node: String, name: Object, value: String): any;
+        setAttr(node: String, name: Object, value?: String): any;
         /**
          * Sets the size of the node's contents, irrespective of margins,
          * padding, or borders.
@@ -24063,7 +24063,7 @@ declare module dojo {
          * @param box hash with optional "w", and "h" properties for "width", and "height"respectively. All specified properties should have numeric values in whole pixels.             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        setContentSize(node: HTMLElement, box: Object, computedStyle: Object): void;
+        setContentSize(node: HTMLElement, box: Object, computedStyle?: Object): void;
         /**
          * changes the behavior of many core Dojo functions that deal with
          * namespace and DOM lookup, changing them to work in a new global
@@ -24085,7 +24085,7 @@ declare module dojo {
          * @param box hash with optional "l", "t", "w", and "h" properties for "left", "right", "width", and "height"respectively. All specified properties should have numeric values in whole pixels.             
          * @param computedStyle               OptionalThis parameter accepts computed styles object.If this parameter is omitted, the functions will calldojo/dom-style.getComputedStyle to get one. It is a better way, callingdojo/dom-style.getComputedStyle once, and then pass the reference to thiscomputedStyle parameter. Wherever possible, reuse the returnedobject of dojo/dom-style.getComputedStyle().             
          */
-        setMarginBox(node: HTMLElement, box: Object, computedStyle: Object): void;
+        setMarginBox(node: HTMLElement, box: Object, computedStyle?: Object): void;
         /**
          * Sets a property on an HTML element.
          * Handles normalized setting of properties on DOM nodes.
@@ -24104,7 +24104,7 @@ declare module dojo {
          * @param name the name of the property to set, or a hash object to setmultiple properties at once.             
          * @param value               OptionalThe value to set for the property             
          */
-        setProp(node: HTMLElement, name: String, value: String): any;
+        setProp(node: HTMLElement, name: String, value?: String): any;
         /**
          * Sets a property on an HTML element.
          * Handles normalized setting of properties on DOM nodes.
@@ -24123,7 +24123,7 @@ declare module dojo {
          * @param name the name of the property to set, or a hash object to setmultiple properties at once.             
          * @param value               OptionalThe value to set for the property             
          */
-        setProp(node: String, name: String, value: String): any;
+        setProp(node: String, name: String, value?: String): any;
         /**
          * Sets a property on an HTML element.
          * Handles normalized setting of properties on DOM nodes.
@@ -24142,7 +24142,7 @@ declare module dojo {
          * @param name the name of the property to set, or a hash object to setmultiple properties at once.             
          * @param value               OptionalThe value to set for the property             
          */
-        setProp(node: HTMLElement, name: Object, value: String): any;
+        setProp(node: HTMLElement, name: Object, value?: String): any;
         /**
          * Sets a property on an HTML element.
          * Handles normalized setting of properties on DOM nodes.
@@ -24161,7 +24161,7 @@ declare module dojo {
          * @param name the name of the property to set, or a hash object to setmultiple properties at once.             
          * @param value               OptionalThe value to set for the property             
          */
-        setProp(node: String, name: Object, value: String): any;
+        setProp(node: String, name: Object, value?: String): any;
         /**
          * 
          * @param node             
@@ -24175,7 +24175,7 @@ declare module dojo {
          * @param name the style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
          * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
          */
-        setStyle(node: HTMLElement, name: String, value: String): String;
+        setStyle(node: HTMLElement, name: String, value?: String): String;
         /**
          * Sets styles on a node.
          * 
@@ -24183,7 +24183,7 @@ declare module dojo {
          * @param name the style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
          * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
          */
-        setStyle(node: String, name: String, value: String): String;
+        setStyle(node: String, name: String, value?: String): String;
         /**
          * Sets styles on a node.
          * 
@@ -24191,7 +24191,7 @@ declare module dojo {
          * @param name the style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
          * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
          */
-        setStyle(node: HTMLElement, name: Object, value: String): String;
+        setStyle(node: HTMLElement, name: Object, value?: String): String;
         /**
          * Sets styles on a node.
          * 
@@ -24199,7 +24199,7 @@ declare module dojo {
          * @param name the style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
          * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
          */
-        setStyle(node: String, name: Object, value: String): String;
+        setStyle(node: String, name: Object, value?: String): String;
         /**
          * Determines whether or not any item in arr satisfies the
          * condition implemented by callback.
@@ -24213,7 +24213,7 @@ declare module dojo {
          * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
          * @param thisObject               Optionalmay be used to scope the call to callback             
          */
-        some(arr: any[], callback: Function, thisObject: Object): boolean;
+        some(arr: any[], callback: Function, thisObject?: Object): boolean;
         /**
          * Determines whether or not any item in arr satisfies the
          * condition implemented by callback.
@@ -24227,7 +24227,7 @@ declare module dojo {
          * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
          * @param thisObject               Optionalmay be used to scope the call to callback             
          */
-        some(arr: String, callback: Function, thisObject: Object): boolean;
+        some(arr: String, callback: Function, thisObject?: Object): boolean;
         /**
          * Determines whether or not any item in arr satisfies the
          * condition implemented by callback.
@@ -24241,7 +24241,7 @@ declare module dojo {
          * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
          * @param thisObject               Optionalmay be used to scope the call to callback             
          */
-        some(arr: any[], callback: String, thisObject: Object): boolean;
+        some(arr: any[], callback: String, thisObject?: Object): boolean;
         /**
          * Determines whether or not any item in arr satisfies the
          * condition implemented by callback.
@@ -24255,7 +24255,7 @@ declare module dojo {
          * @param callback a function is invoked with three arguments: item, index,and array and returns true if the condition is met.             
          * @param thisObject               Optionalmay be used to scope the call to callback             
          */
-        some(arr: String, callback: String, thisObject: Object): boolean;
+        some(arr: String, callback: String, thisObject?: Object): boolean;
         /**
          * 
          */
@@ -24283,7 +24283,7 @@ declare module dojo {
          * @param name               Optionalthe style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
          * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
          */
-        style(node: HTMLElement, name: String, value: String): any;
+        style(node: HTMLElement, name?: String, value?: String): any;
         /**
          * Accesses styles on a node. If 2 arguments are
          * passed, acts as a getter. If 3 arguments are passed, acts
@@ -24300,7 +24300,7 @@ declare module dojo {
          * @param name               Optionalthe style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
          * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
          */
-        style(node: String, name: String, value: String): any;
+        style(node: String, name?: String, value?: String): any;
         /**
          * Accesses styles on a node. If 2 arguments are
          * passed, acts as a getter. If 3 arguments are passed, acts
@@ -24317,7 +24317,7 @@ declare module dojo {
          * @param name               Optionalthe style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
          * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
          */
-        style(node: HTMLElement, name: Object, value: String): any;
+        style(node: HTMLElement, name?: Object, value?: String): any;
         /**
          * Accesses styles on a node. If 2 arguments are
          * passed, acts as a getter. If 3 arguments are passed, acts
@@ -24334,14 +24334,14 @@ declare module dojo {
          * @param name               Optionalthe style property to set in DOM-accessor format("borderWidth", not "border-width") or an object with key/valuepairs suitable for setting each property.             
          * @param value               OptionalIf passed, sets value on the node for style, handlingcross-browser concerns.  When setting a pixel value,be sure to include "px" in the value. For instance, top: "200px".Otherwise, in some cases, some browsers will not apply the style.             
          */
-        style(node: String, name: Object, value: String): any;
+        style(node: String, name?: Object, value?: String): any;
         /**
          * instantiates an HTML fragment returning the corresponding DOM.
          * 
          * @param frag the HTML fragment             
          * @param doc               Optionaloptional document to use when creating DOM nodes, defaults todojo/_base/window.doc if not specified.             
          */
-        toDom(frag: String, doc: HTMLDocument): any;
+        toDom(frag: String, doc?: HTMLDocument): any;
         /**
          * Adds a class to node if not present, or removes if present.
          * Pass a boolean condition if you want to explicitly add or remove.
@@ -24351,7 +24351,7 @@ declare module dojo {
          * @param classStr A String class name to toggle, or several space-separated class names,or an array of class names.             
          * @param condition               OptionalIf passed, true means to add the class, false means to remove.Otherwise dojo.hasClass(node, classStr) is used to detect the class presence.             
          */
-        toggleClass(node: String, classStr: String, condition: boolean): boolean;
+        toggleClass(node: String, classStr: String, condition?: boolean): boolean;
         /**
          * Adds a class to node if not present, or removes if present.
          * Pass a boolean condition if you want to explicitly add or remove.
@@ -24361,7 +24361,7 @@ declare module dojo {
          * @param classStr A String class name to toggle, or several space-separated class names,or an array of class names.             
          * @param condition               OptionalIf passed, true means to add the class, false means to remove.Otherwise dojo.hasClass(node, classStr) is used to detect the class presence.             
          */
-        toggleClass(node: HTMLElement, classStr: String, condition: boolean): boolean;
+        toggleClass(node: HTMLElement, classStr: String, condition?: boolean): boolean;
         /**
          * Adds a class to node if not present, or removes if present.
          * Pass a boolean condition if you want to explicitly add or remove.
@@ -24371,7 +24371,7 @@ declare module dojo {
          * @param classStr A String class name to toggle, or several space-separated class names,or an array of class names.             
          * @param condition               OptionalIf passed, true means to add the class, false means to remove.Otherwise dojo.hasClass(node, classStr) is used to detect the class presence.             
          */
-        toggleClass(node: String, classStr: any[], condition: boolean): boolean;
+        toggleClass(node: String, classStr: any[], condition?: boolean): boolean;
         /**
          * Adds a class to node if not present, or removes if present.
          * Pass a boolean condition if you want to explicitly add or remove.
@@ -24381,7 +24381,7 @@ declare module dojo {
          * @param classStr A String class name to toggle, or several space-separated class names,or an array of class names.             
          * @param condition               OptionalIf passed, true means to add the class, false means to remove.Otherwise dojo.hasClass(node, classStr) is used to detect the class presence.             
          */
-        toggleClass(node: HTMLElement, classStr: any[], condition: boolean): boolean;
+        toggleClass(node: HTMLElement, classStr: any[], condition?: boolean): boolean;
         /**
          * Returns a JSON serialization of an object.
          * Returns a JSON serialization of an object.
@@ -24393,7 +24393,7 @@ declare module dojo {
          * @param it an object to be serialized. Objects may define their ownserialization via a special "json" or "json" functionproperty. If a specialized serializer has been defined, it willbe used as a fallback.Note that in 1.6, toJson would serialize undefined, but this no longer supportedsince it is not supported by native JSON serializer.             
          * @param prettyPrint               Optionalif true, we indent objects and arrays to make the output prettier.The variable dojo.toJsonIndentStr is used as the indent string --to use something other than the default (tab), change that variablebefore calling dojo.toJson().Note that if native JSON support is available, it will be used for serialization,and native implementations vary on the exact spacing used in pretty printing.             
          */
-        toJson(it: Object, prettyPrint: boolean): any;
+        toJson(it: Object, prettyPrint?: boolean): any;
         /**
          * converts style value to pixels on IE or return a numeric value.
          * 
@@ -24423,7 +24423,7 @@ declare module dojo {
          * @param errback               OptionalCallback to be invoked when the promise is rejected.             
          * @param progback               OptionalCallback to be invoked when the promise emits a progress update.             
          */
-        when(valueOrPromise: any, callback: Function, errback: Function, progback: Function): dojo.promise.Promise<any>;
+        when(valueOrPromise: any, callback?: Function, errback?: Function, progback?: Function): dojo.promise.Promise<any>;
         /**
          * signal fired by impending window destruction. You may use
          * dojo.addOnWIndowUnload() or dojo.connect() to this method to perform
@@ -24443,7 +24443,7 @@ declare module dojo {
          * @param thisObject               Optional            
          * @param cbArguments               Optional            
          */
-        withDoc(documentObject: HTMLDocument, callback: Function, thisObject: Object, cbArguments: any[]): any;
+        withDoc(documentObject: HTMLDocument, callback: Function, thisObject?: Object, cbArguments?: any[]): any;
         /**
          * Invoke callback with globalObject as dojo.global and
          * globalObject.document as dojo.doc.
@@ -24458,7 +24458,7 @@ declare module dojo {
          * @param thisObject               Optional            
          * @param cbArguments               Optional            
          */
-        withGlobal(globalObject: Object, callback: Function, thisObject: Object, cbArguments: any[]): any;
+        withGlobal(globalObject: Object, callback: Function, thisObject?: Object, cbArguments?: any[]): any;
         /**
          * 
          * @param method             
@@ -24849,7 +24849,7 @@ declare module dojo {
              * 
              * @param params               Optional            
              */
-            postscript(params: Object): void;
+            postscript(params?: Object): void;
             /**
              * Set a property on a Stateful instance
              * Sets named properties on a stateful object and notifies any watchers of
@@ -24981,7 +24981,7 @@ declare module dojo {
              * @param g             
              * @param a               Optional            
              */
-            makeGrey(g: number, a: number): void;
+            makeGrey(g: number, a?: number): void;
         }
         /**
          * Permalink: http://dojotoolkit.org/api/1.9/dojo/main.back.html
@@ -25383,7 +25383,7 @@ declare module dojo {
              * @param date2               OptionalDate object.  If not specified, the current Date is used.             
              * @param portion               OptionalA string indicating the "date" or "time" portion of a Date object.Compares both "date" and "time" by default.  One of the following:"date", "time", "datetime"             
              */
-            compare(date1: Date, date2: Date, portion: String): number;
+            compare(date1: Date, date2?: Date, portion?: String): number;
             /**
              * Get the difference in a specific unit of time (e.g., number of
              * months, weeks, days, etc.) between two dates, rounded to the
@@ -25393,7 +25393,7 @@ declare module dojo {
              * @param date2               OptionalDate object.  If not specified, the current Date is used.             
              * @param interval               OptionalA string representing the interval.  One of the following:"year", "month", "day", "hour", "minute", "second","millisecond", "quarter", "week", "weekday"Defaults to "day".             
              */
-            difference(date1: Date, date2: Date, interval: String): any;
+            difference(date1: Date, date2?: Date, interval?: String): any;
             /**
              * Returns the number of days in the month used by dateObject
              * 
@@ -25446,13 +25446,13 @@ declare module dojo {
              * @param value the number to be formatted.             
              * @param options               Optional            
              */
-            format(value: number, options: dojo.currency.__FormatOptions): any;
+            format(value: number, options?: dojo.currency.__FormatOptions): any;
             /**
              * 
              * @param expression             
              * @param options               OptionalAn object with the following properties:type (String, optional): Should not be set.  Value is assumed to be currency.currency (String, optional): an ISO4217 currency code, a three letter sequence like "USD".For use with dojo.currency only.symbol (String, optional): localized currency symbol. The default will be looked up in table of supported currencies in dojo.cldrA ISO4217 currency code will be used if not found.places (Number, optional): fixed number of decimal places to accept.  The default is determined based on which currency is used.fractional (Boolean|Array, optional): Whether to include the fractional portion, where the number of decimal places are implied by the currencyor explicit 'places' parameter.  The value [true,false] makes the fractional portion optional.By default for currencies, it the fractional portion is optional.pattern (String, optional): override formatting patternwith this string.  Default value is based on locale.  Overriding this property will defeatlocalization.  Literal characters in patterns are not supported.locale (String, optional): override the locale used to determine formatting rulesstrict (Boolean, optional): strict parsing, false by default.  Strict parsing requires input as produced by the format() method.Non-strict is more permissive, e.g. flexible on white space, omitting thousands separators            
              */
-            parse(expression: String, options: Object): any;
+            parse(expression: String, options?: Object): any;
             /**
              * 
              * @param options               OptionalAn object with the following properties:pattern (String, optional): override formatting patternwith this string.  Default value is based on locale.  Overriding this property will defeatlocalization.type (String, optional): choose a format type based on the locale from the following:decimal, scientific (not yet supported), percent, currency. decimal by default.locale (String, optional): override the locale used to determine formatting rulesstrict (Boolean, optional): strict parsing, false by default.  Strict parsing requires input as produced by the format() method.Non-strict is more permissive, e.g. flexible on white space, omitting thousands separatorsplaces (Number|String, optional): number of decimal places to accept: Infinity, a positive number, ora range "n,m".  Defined by pattern or Infinity if pattern not provided.            
@@ -25836,7 +25836,7 @@ declare module dojo {
              * @param cont the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
              * @param params               OptionalOptional flags/properties to configure the content-setting. See dojo/html/_ContentSetter             
              */
-            set(node: HTMLElement, cont: String, params: Object): any;
+            set(node: HTMLElement, cont: String, params?: Object): any;
             /**
              * inserts (replaces) the given content into the given node. dojo/dom-construct.place(cont, node, "only")
              * may be a better choice for simple HTML insertion.
@@ -25853,7 +25853,7 @@ declare module dojo {
              * @param cont the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
              * @param params               OptionalOptional flags/properties to configure the content-setting. See dojo/html/_ContentSetter             
              */
-            set(node: HTMLElement, cont: HTMLElement, params: Object): any;
+            set(node: HTMLElement, cont: HTMLElement, params?: Object): any;
             /**
              * inserts (replaces) the given content into the given node. dojo/dom-construct.place(cont, node, "only")
              * may be a better choice for simple HTML insertion.
@@ -25870,7 +25870,7 @@ declare module dojo {
              * @param cont the content to be set on the parent element.This can be an html string, a node reference or a NodeList, dojo/NodeList, Array or other enumerable list of nodes             
              * @param params               OptionalOptional flags/properties to configure the content-setting. See dojo/html/_ContentSetter             
              */
-            set(node: HTMLElement, cont: NodeList, params: Object): any;
+            set(node: HTMLElement, cont: NodeList, params?: Object): any;
         }
         /**
          * Permalink: http://dojotoolkit.org/api/1.9/dojo/main.dojox.html
@@ -26338,7 +26338,7 @@ declare module dojo {
              * @param re A function. Takes one parameter and converts it to a regularexpression.             
              * @param nonCapture               OptionalIf true, uses non-capturing match, otherwise matches are retainedby regular expression. Defaults to false             
              */
-            buildGroupRE(arr: Object, re: Function, nonCapture: boolean): any;
+            buildGroupRE(arr: Object, re: Function, nonCapture?: boolean): any;
             /**
              * Builds a regular expression that groups subexpressions
              * A utility function used by some of the RE generators. The
@@ -26351,21 +26351,21 @@ declare module dojo {
              * @param re A function. Takes one parameter and converts it to a regularexpression.             
              * @param nonCapture               OptionalIf true, uses non-capturing match, otherwise matches are retainedby regular expression. Defaults to false             
              */
-            buildGroupRE(arr: any[], re: Function, nonCapture: boolean): any;
+            buildGroupRE(arr: any[], re: Function, nonCapture?: boolean): any;
             /**
              * Adds escape sequences for special characters in regular expressions
              * 
              * @param str             
              * @param except               Optionala String with special characters to be left unescaped             
              */
-            escapeString(str: String, except: String): any;
+            escapeString(str: String, except?: String): any;
             /**
              * adds group match to expression
              * 
              * @param expression             
              * @param nonCapture               OptionalIf true, uses non-capturing match, otherwise matches are retainedby regular expression.             
              */
-            group(expression: String, nonCapture: boolean): String;
+            group(expression: String, nonCapture?: boolean): String;
         }
         /**
          * Permalink: http://dojotoolkit.org/api/1.9/dojo/main.mouseButtons.html
@@ -26451,7 +26451,7 @@ declare module dojo {
              * @param value the number to be formatted             
              * @param options               OptionalAn object with the following properties:pattern (String, optional): override formatting patternwith this string.  Default value is based on locale.  Overriding this property will defeatlocalization.  Literal characters in patterns are not supported.type (String, optional): choose a format type based on the locale from the following:decimal, scientific (not yet supported), percent, currency. decimal by default.places (Number, optional): fixed number of decimal places to show.  This overrides anyinformation in the provided pattern.round (Number, optional): 5 rounds to nearest .5; 0 rounds to nearest whole (default). -1means do not round.locale (String, optional): override the locale used to determine formatting rulesfractional (Boolean, optional): If false, show no decimal places, overriding places and pattern settings.            
              */
-            format(value: number, options: Object): any;
+            format(value: number, options?: Object): any;
             /**
              * Convert a properly formatted string to a primitive Number, using
              * locale-specific settings.
@@ -26464,7 +26464,7 @@ declare module dojo {
              * @param expression A string representation of a Number             
              * @param options               OptionalAn object with the following properties:pattern (String, optional): override formatting patternwith this string.  Default value is based on locale.  Overriding this property will defeatlocalization.  Literal characters in patterns are not supported.type (String, optional): choose a format type based on the locale from the following:decimal, scientific (not yet supported), percent, currency. decimal by default.locale (String, optional): override the locale used to determine formatting rulesstrict (Boolean, optional): strict parsing, false by default.  Strict parsing requires input as produced by the format() method.Non-strict is more permissive, e.g. flexible on white space, omitting thousands separatorsfractional (Boolean|Array, optional): Whether to include the fractional portion, where the number of decimal places are implied by patternor explicit 'places' parameter.  The value [true,false] makes the fractional portion optional.            
              */
-            parse(expression: String, options: Object): number;
+            parse(expression: String, options?: Object): number;
             /**
              * Builds the regular needed to parse a number
              * Returns regular expression with positive and negative match, group
@@ -26472,7 +26472,7 @@ declare module dojo {
              * 
              * @param options               OptionalAn object with the following properties:pattern (String, optional): override formatting patternwith this string.  Default value is based on locale.  Overriding this property will defeatlocalization.type (String, optional): choose a format type based on the locale from the following:decimal, scientific (not yet supported), percent, currency. decimal by default.locale (String, optional): override the locale used to determine formatting rulesstrict (Boolean, optional): strict parsing, false by default.  Strict parsing requires input as produced by the format() method.Non-strict is more permissive, e.g. flexible on white space, omitting thousands separatorsplaces (Number|String, optional): number of decimal places to accept: Infinity, a positive number, ora range "n,m".  Defined by pattern or Infinity if pattern not provided.            
              */
-            regexp(options: Object): any;
+            regexp(options?: Object): any;
             /**
              * Rounds to the nearest value with the given number of decimal places, away from zero
              * Rounds to the nearest value with the given number of decimal places, away from zero if equal.
@@ -26484,7 +26484,7 @@ declare module dojo {
              * @param places               OptionalThe number of decimal places where rounding takes place.  Defaults to 0 for whole rounding.Must be non-negative.             
              * @param increment               OptionalRounds next place to nearest value of increment/10.  10 by default.             
              */
-            round(value: number, places: number, increment: number): number;
+            round(value: number, places?: number, increment?: number): number;
         }
         /**
          * Permalink: http://dojotoolkit.org/api/1.9/dojo/main.keys.html
@@ -26815,7 +26815,7 @@ declare module dojo {
              * @param ch               Optionalcharacter to pad, defaults to '0'             
              * @param end               Optionaladds padding at the end if true, otherwise pads at start             
              */
-            pad(text: String, size: number, ch: String, end: boolean): number;
+            pad(text: String, size: number, ch?: String, end?: boolean): number;
             /**
              * Efficiently replicate a string n times.
              * 
@@ -26832,7 +26832,7 @@ declare module dojo {
              * @param transform               Optionala function to process all parameters before substitution takesplace, e.g. mylib.encodeXML             
              * @param thisObject               Optionalwhere to look for optional format function; default to the globalnamespace             
              */
-            substitute(template: String, map: Object, transform: Function, thisObject: Object): any;
+            substitute(template: String, map: Object, transform?: Function, thisObject?: Object): any;
             /**
              * Performs parameterized substitutions on a string. Throws an
              * exception if any parameter is unmatched.
@@ -26842,7 +26842,7 @@ declare module dojo {
              * @param transform               Optionala function to process all parameters before substitution takesplace, e.g. mylib.encodeXML             
              * @param thisObject               Optionalwhere to look for optional format function; default to the globalnamespace             
              */
-            substitute(template: String, map: any[], transform: Function, thisObject: Object): any;
+            substitute(template: String, map: any[], transform?: Function, thisObject?: Object): any;
             /**
              * Trims whitespace from both sides of the string
              * This version of trim() was taken from Steven Levithan's blog.
@@ -26981,7 +26981,7 @@ declare module dojo {
              * 
              * @param doc               Optional            
              */
-            getBox(doc: HTMLDocument): Object;
+            getBox(doc?: HTMLDocument): Object;
             /**
              * Scroll the passed node into view using minimal movement, if it is not already.
              * 
@@ -27009,7 +27009,7 @@ declare module dojo {
          * @param ch               Optionalcharacter to pad, defaults to '0'             
          * @param end               Optionaladds padding at the end if true, otherwise pads at start             
          */
-        pad(text: String, size: number, ch: String, end: boolean): number;
+        pad(text: String, size: number, ch?: String, end?: boolean): number;
         /**
          * Efficiently replicate a string n times.
          * 
@@ -27026,7 +27026,7 @@ declare module dojo {
          * @param transform               Optionala function to process all parameters before substitution takesplace, e.g. mylib.encodeXML             
          * @param thisObject               Optionalwhere to look for optional format function; default to the globalnamespace             
          */
-        substitute(template: String, map: Object, transform: Function, thisObject: Object): any;
+        substitute(template: String, map: Object, transform?: Function, thisObject?: Object): any;
         /**
          * Performs parameterized substitutions on a string. Throws an
          * exception if any parameter is unmatched.
@@ -27036,7 +27036,7 @@ declare module dojo {
          * @param transform               Optionala function to process all parameters before substitution takesplace, e.g. mylib.encodeXML             
          * @param thisObject               Optionalwhere to look for optional format function; default to the globalnamespace             
          */
-        substitute(template: String, map: any[], transform: Function, thisObject: Object): any;
+        substitute(template: String, map: any[], transform?: Function, thisObject?: Object): any;
         /**
          * Trims whitespace from both sides of the string
          * This version of trim() was taken from Steven Levithan's blog.
@@ -27137,7 +27137,7 @@ declare module dojo {
          * 
          * @param doc               Optional            
          */
-        getBox(doc: HTMLDocument): Object;
+        getBox(doc?: HTMLDocument): Object;
         /**
          * Scroll the passed node into view using minimal movement, if it is not already.
          * 
diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts
index a46f2484e..73b45b810 100644
--- a/easeljs/easeljs.d.ts
+++ b/easeljs/easeljs.d.ts
@@ -825,7 +825,7 @@ declare module createjs {
         timeSlice: number;
 
         // methods
-        addAnimation(name: string, frames: number[], next?: string, frequency?: number): void;
+        addAnimation(name: string, frames: number[], next?: string|boolean, frequency?: number): void;
         addFrame(source: DisplayObject, sourceRect?: Rectangle, scale?: number, setupFunction?: () => any, setupData?: Object): number;
         addMovieClip(source: MovieClip, sourceRect?: Rectangle, scale?: number, setupFunction?: () => any, setupData?: Object, labelFunction?: () => any): void;
         build(): SpriteSheet;
diff --git a/email-templates/email-templates-tests.ts b/email-templates/email-templates-tests.ts
new file mode 100644
index 000000000..9b7072810
--- /dev/null
+++ b/email-templates/email-templates-tests.ts
@@ -0,0 +1,26 @@
+///<reference path="email-templates.d.ts"/>
+
+import EmailTemplates = require('email-templates');
+
+var EmailTemplate = EmailTemplates.EmailTemplate;
+var template = new EmailTemplate("./");
+var users = [
+    {
+        email: 'pappa.pizza@spaghetti.com',
+        name: {
+            first: 'Pappa',
+            last: 'Pizza'
+        }
+    },
+    {
+        email: 'mister.geppetto@spaghetti.com',
+        name: {
+            first: 'Mister',
+            last: 'Geppetto'
+        }
+    }
+]
+
+var templates = users.map(function(user) {
+    return template.render(user);
+})
diff --git a/email-templates/email-templates.d.ts b/email-templates/email-templates.d.ts
new file mode 100644
index 000000000..e3e1095c3
--- /dev/null
+++ b/email-templates/email-templates.d.ts
@@ -0,0 +1,54 @@
+// Type definitions for node-email-templates
+// Project: https://github.com/niftylettuce/node-email-templates
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/**
+ * @summary Interface for result of email template.
+ * @interface
+ */
+interface EmailTemplateResults {
+    /**
+     * @summary HTML result.
+     * @type {string}
+     */
+    html: string;
+
+    /**
+     * @summary Text result.
+     * @type {string}
+     */
+    text: string;
+}
+
+/**
+ * @summary Interface for callback of email callback.
+ * @interface
+ */
+interface EmailTemplateCallback {
+    /**
+     * @summary Callback signature.
+     */
+    (err: Object, results: EmailTemplateResults): void;
+}
+
+declare module "email-templates" {
+    /**
+     * @summary Email template class.
+     * @class
+     */
+    export class EmailTemplate {
+        /**
+         * @summary Constructor.
+         * @param {string} templateDir The template directory.
+         */
+        constructor(templateDir: string);
+
+        /**
+         * @summary Render a single template.
+         * @param {EmailTemplateCallback|Object} locals The variables or callback function.
+         * @param {EmailTemplateCallback} callback The callback function.
+         */
+        render(locals: EmailTemplateCallback|Object, callback?: EmailTemplateCallback): void;
+    }
+}
diff --git a/email-validator/email-validator-tests.ts b/email-validator/email-validator-tests.ts
new file mode 100644
index 000000000..61d4c6dfa
--- /dev/null
+++ b/email-validator/email-validator-tests.ts
@@ -0,0 +1,13 @@
+/// <reference path="email-validator.d.ts" />
+
+import emailValidator = require('email-validator');
+import { validate } from 'email-validator';
+
+var result: boolean;
+
+// Trivial code requires trivial tests
+result = validate('some email');
+result = validate(null);
+
+result = emailValidator.validate('some email');
+result = emailValidator.validate(null);
diff --git a/email-validator/email-validator.d.ts b/email-validator/email-validator.d.ts
new file mode 100644
index 000000000..299ebb19f
--- /dev/null
+++ b/email-validator/email-validator.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for email-validator 1.0.3
+// Project: https://github.com/Sembiance/email-validator
+// Definitions by: Paul Lessing <https://github.com/paullessing>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module "email-validator" {
+    export function validate(email: String): boolean;
+}
diff --git a/emscripten/emscripten-tests.ts b/emscripten/emscripten-tests.ts
index 0a614a540..76342ae18 100644
--- a/emscripten/emscripten-tests.ts
+++ b/emscripten/emscripten-tests.ts
@@ -11,6 +11,8 @@ function ModuleTest(): void {
 
     var myTypedArray = new Uint8Array(10);
     var buf = Module._malloc(myTypedArray.length*myTypedArray.BYTES_PER_ELEMENT);
+    Module.setValue(buf, 10, 'i32');
+    var x = Module.getValue(buf, 'i32') + 123;
     Module.HEAPU8.set(myTypedArray, buf);
     Module.ccall('my_function', 'number', ['number'], [buf]);
     Module._free(buf);
diff --git a/emscripten/emscripten.d.ts b/emscripten/emscripten.d.ts
index 547f10c76..640f8915c 100644
--- a/emscripten/emscripten.d.ts
+++ b/emscripten/emscripten.d.ts
@@ -22,8 +22,8 @@ declare module Module {
     function ccall(ident: string, returnType: string, argTypes: string[], args: any[]): any;
     function cwrap(ident: string, returnType: string, argTypes: string[]): any;
 
-    function setValue(ptr: number, value: any, type: string, noSafe: boolean): void;
-    function getValue(ptr: number, type: string, noSafe: boolean): any;
+    function setValue(ptr: number, value: any, type: string, noSafe?: boolean): void;
+    function getValue(ptr: number, type: string, noSafe?: boolean): number;
 
     var ALLOC_NORMAL: number;
     var ALLOC_STACK: number;
diff --git a/envify/envify.d.ts b/envify/envify.d.ts
index 39479f503..cc343ad33 100644
--- a/envify/envify.d.ts
+++ b/envify/envify.d.ts
@@ -3,12 +3,14 @@
 // Definitions by: Qubo <https://github.com/tkQubo>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
+/// <reference path="../node/node.d.ts" />
+
 declare module "envify" {
-	var envify: Function;
+	var envify: (file: string, environment: { [name: string]: any }) => NodeJS.ReadWriteStream;
 	export = envify;
 }
 
 declare module "envify/custom" {
-	function envify(environment: { [name: string]: any }): Function;
+	function envify(environment: { [name: string]: any }): (file: string, environment: { [name: string]: any }) => NodeJS.ReadWriteStream;
 	export = envify;
 }
diff --git a/errorhandler/errorhandler-tests.ts b/errorhandler/errorhandler-tests.ts
index 1d02ed14c..0ba9edb56 100644
--- a/errorhandler/errorhandler-tests.ts
+++ b/errorhandler/errorhandler-tests.ts
@@ -5,3 +5,13 @@ import errorhandler = require('errorhandler');
 var app = express();
 
 app.use(errorhandler());
+
+app.use(errorhandler({ log: true }));
+
+app.use(errorhandler({ log: (err, str, req, res) => {
+    const { message, name, stack } = err;
+    const messageIsStr = message === str;
+
+    const requestWasFresh = req && req.fresh;
+    const responseContentType = res && res.contentType
+}}))
\ No newline at end of file
diff --git a/errorhandler/errorhandler.d.ts b/errorhandler/errorhandler.d.ts
index 40f845d09..8ae5e924c 100644
--- a/errorhandler/errorhandler.d.ts
+++ b/errorhandler/errorhandler.d.ts
@@ -7,6 +7,26 @@
 
 declare module "errorhandler" {
     import express = require('express');
-    function e(options?: {log?: any}): express.ErrorRequestHandler;
-    export = e;
+    
+    function errorHandler(options?: errorHandler.Options): express.ErrorRequestHandler;
+    
+    namespace errorHandler {
+        interface LoggingCallback {
+            (err: Error, str: string, req: express.Request, res: express.Response): void;
+        }
+        
+        interface Options {
+            /**
+             * Defaults to true.
+             * 
+             * Possible values:
+             *   true       : Log errors using console.error(str).
+             *   false      : Only send the error back in the response.
+             *   A function : pass the error to a function for handling.
+             */
+            log: boolean | LoggingCallback;
+        }
+    }
+    
+    export = errorHandler;
 }
diff --git a/es6-promise/es6-promise.d.ts b/es6-promise/es6-promise.d.ts
index 86c82273a..daf7134f7 100644
--- a/es6-promise/es6-promise.d.ts
+++ b/es6-promise/es6-promise.d.ts
@@ -12,7 +12,7 @@ declare class Promise<R> implements Thenable<R> {
 	/**
 	 * If you call resolve in the body of the callback passed to the constructor,
 	 * your promise is fulfilled with result object passed to resolve.
-	 * If you call reject your promise is rejected with the object passed to resolve.
+	 * If you call reject your promise is rejected with the object passed to reject.
 	 * For consistency and debugging (eg stack traces), obj should be an instanceof Error.
 	 * Any errors thrown in the constructor callback will be implicitly passed to reject().
 	 */
diff --git a/express-handlebars/express-handlebars.d.ts b/express-handlebars/express-handlebars.d.ts
index 6ed538c21..04eb07162 100644
--- a/express-handlebars/express-handlebars.d.ts
+++ b/express-handlebars/express-handlebars.d.ts
@@ -21,7 +21,7 @@ interface ExphbsOptions {
     handlebars?: any;
     extname?: string;
     layoutsDir?: string;
-    partialsDir?: string;
+    partialsDir?: any;
     defaultLayout?: string;
     helpers?: any;
     compilerOptions?: any;
diff --git a/express/express.d.ts b/express/express.d.ts
index 523f8f7c6..db1981d5d 100644
--- a/express/express.d.ts
+++ b/express/express.d.ts
@@ -110,6 +110,7 @@ declare module "express" {
             use(path: string[], handler: ErrorRequestHandler): T;
             use(path: RegExp, ...handler: RequestHandler[]): T;
             use(path: RegExp, handler: ErrorRequestHandler): T;
+            use(path:string, router:Router): T;
         }
 
         export function Router(options?: any): Router;
diff --git a/fbsdk/fbsdk.d.ts b/fbsdk/fbsdk.d.ts
index 2be6f513a..36078fdde 100644
--- a/fbsdk/fbsdk.d.ts
+++ b/fbsdk/fbsdk.d.ts
@@ -149,13 +149,17 @@ interface FBSDKCanvas{
     stopTimer(handler?: (fbResponseObject : Object) => any) : void;
 }
 
+interface FBResponseObject {
+    error: any;
+}
+
 interface FBSDK{
     /* This method is used to initialize and setup the SDK. */
     init(fbInitObject : FBInitParams) : void;
 
     /* This method lets you make calls to the Graph API. */
     api(path : string, method : string, callback : (fbResponseObject : Object) => any) :  Object;
-    api(path : string, params : Object, callback : (fbResponseObject : Object) => any) :  Object;
+    api(path : string, params : Object, callback : (fbResponseObject : FBResponseObject) => any) :  Object;
     api(path : string, method : string, params : Object, callback : (fbResponseObject : Object) => any) : Object;
 
     /* This method is used to trigger different forms of Facebook created UI dialogs. */
diff --git a/file-url/file-url-tests.ts b/file-url/file-url-tests.ts
new file mode 100644
index 000000000..801d5e703
--- /dev/null
+++ b/file-url/file-url-tests.ts
@@ -0,0 +1,9 @@
+// Copied from https://github.com/sindresorhus/file-url/blob/14c7a69ae3798f50b3a4a21823c86e10b38160fe/readme.md
+
+/// <reference path="file-url.d.ts" />
+
+fileUrl('unicorn.jpg');
+//=> 'file:///Users/sindresorhus/dev/file-url/unicorn.jpg'
+
+fileUrl('/Users/pony/pics/unicorn.jpg');
+//=> 'file:///Users/pony/pics/unicorn.jpg'
diff --git a/file-url/file-url.d.ts b/file-url/file-url.d.ts
new file mode 100644
index 000000000..d0c0dd02c
--- /dev/null
+++ b/file-url/file-url.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for file-url v1.0.1
+// Project: https://github.com/sindresorhus/file-url
+// Definitions by: MEDIA CHECK s.r.o. <http://www.mediacheck.cz/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Convert a path to a file URL.
+ */
+declare function fileUrl(path:string):string;
+
+/**
+ * Convert a path to a file URL.
+ */
+declare module "file-url" {
+    export = fileUrl;
+}
diff --git a/fixed-data-table/fixed-data-table-tests.tsx b/fixed-data-table/fixed-data-table-tests.tsx
index 9265186fb..28dae2890 100644
--- a/fixed-data-table/fixed-data-table-tests.tsx
+++ b/fixed-data-table/fixed-data-table-tests.tsx
@@ -1,7 +1,9 @@
 ///<reference path="./fixed-data-table.d.ts"" />
 /// <reference path="../react/react.d.ts"/>
+/// <reference path="../react/react-dom.d.ts"/>
 
 import * as React from "react";
+import * as ReactDOM from "react-dom";
 import * as FixedDataTable from "fixed-data-table";
 
 var rows = [
@@ -34,4 +36,4 @@ function rowGetter(rowIndex: number) {
                 />
             </FixedDataTable.Table>   
 
-React.render(table, document.body);
+ReactDOM.render(table, document.body);
diff --git a/flux-standard-action/flux-standard-action-tests.ts b/flux-standard-action/flux-standard-action-tests.ts
new file mode 100644
index 000000000..9c54d810d
--- /dev/null
+++ b/flux-standard-action/flux-standard-action-tests.ts
@@ -0,0 +1,26 @@
+/// <reference path="flux-standard-action.d.ts" />
+
+//import action = require('flux-standard-action');
+import { isError, isFSA, Action, ErrorAction } from 'flux-standard-action';
+
+interface TextPayload {
+    text: string;
+}
+
+var sample1: Action<TextPayload> = {
+    type: 'ADD_TODO',
+    payload: {
+        text: 'Do something.'
+    }
+};
+
+var sample2: ErrorAction = {
+    type: 'ADD_TODO',
+    payload: new Error(),
+    error: true
+};
+
+var result1: boolean = isError(sample1);
+var result2: boolean = isFSA(sample1);
+var result3: boolean = isError(sample2);
+var result4: boolean = isFSA(sample2);
diff --git a/flux-standard-action/flux-standard-action.d.ts b/flux-standard-action/flux-standard-action.d.ts
new file mode 100644
index 000000000..e98d5eeb9
--- /dev/null
+++ b/flux-standard-action/flux-standard-action.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for flux-standard-action 0.5.0
+// Project: https://github.com/acdlite/flux-standard-action
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "flux-standard-action" {
+    export interface ErrorAction extends Action<Error> {
+        error: boolean;
+    }
+
+    export interface Action<T> {
+        type: string;
+        payload?: T;
+        error?: boolean;
+    }
+
+    // Usage: var action: Action<sring> & AnyMeta;
+    export interface AnyMeta {
+        meta: any
+    }
+
+    // Usage: var action: Action<sring> & TypedMeta<string>;
+    export interface TypedMeta<T> {
+        meta: T
+    }
+
+    export function isFSA(action: any): boolean;
+
+    export function isError(action: any): boolean;
+}
+
diff --git a/flux/flux-tests.ts b/flux/flux-tests.ts
index f41d15aff..24369ef2d 100644
--- a/flux/flux-tests.ts
+++ b/flux/flux-tests.ts
@@ -1,6 +1,12 @@
 /// <reference path="flux.d.ts" />
+/// <reference path="../react/react.d.ts" />
 
 import flux = require('flux')
+import FluxUtils = require('flux/utils')
+import React = require('react')
+
+var Component = React.Component
+var Container = FluxUtils.Container
 
 //
 // Basic dispatcher usage
@@ -78,4 +84,46 @@ class CustomDispatcher extends flux.Dispatcher<Action> {
 
 var customDispatcher = new CustomDispatcher()
 
-export = customDispatcher
\ No newline at end of file
+export = customDispatcher
+
+
+// Sample Reduce Store
+class CounterStore extends FluxUtils.ReduceStore<number> {
+  getInitialState(): number {
+    return 0;
+  }
+
+  reduce(state: number, action: any): number {
+    switch (action.type) {
+      case 'increment':
+        return state + 1;
+
+      case 'square':
+        return state * state;
+
+      default:
+        return state;
+    }
+  }
+}
+
+const Store = new CounterStore(basicDispatcher);
+
+// Sample Flux container with CounterStore
+class CounterContainer extends Component<any, any> {
+  static getStores() {
+    return [Store];
+  }
+
+  static calculateState(prevState: any) {
+    return {
+      counter: Store.getState(),
+    };
+  }
+
+  render() {
+    return this.state.counter;
+  }
+}
+
+const container = Container.create(CounterContainer);
diff --git a/flux/flux.d.ts b/flux/flux.d.ts
index bf5bafac4..c65892321 100644
--- a/flux/flux.d.ts
+++ b/flux/flux.d.ts
@@ -1,8 +1,10 @@
 // Type definitions for Flux
 // Project: http://facebook.github.io/flux/
-// Definitions by: Steve Baker <https://github.com/stkb/>
+// Definitions by: Steve Baker <https://github.com/stkb/>, Giedrius Grabauskas <https://github.com/QuatroDevOfficial/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
+/// <reference path="../react/react-global.d.ts" />
+
 declare module Flux {
 
     /**
@@ -65,3 +67,127 @@ declare module Flux {
 declare module "flux" {
     export = Flux;
 }
+
+declare module FluxUtils {
+
+    export class Container {
+        constructor();
+        /**
+        * Create is used to transform a react class into a container 
+        * that updates its state when relevant stores change. 
+        * The provided base class must have static methods getStores() and calculateState().
+        */
+        static create(base: React.ComponentClass<any>, options?: any): React.ComponentClass<any>;
+    }
+
+    /**
+    * This class extends ReduceStore and defines the state as an immutable map.
+    */
+    // TODO: Change <any>  to <Immutable.Map<K, V>>
+    export class MapStore<K extends string | number, V> extends ReduceStore<any> {
+        /**
+        * Access the value at the given key. 
+        * Throws an error if the key does not exist in the cache.
+        */
+        at(key: K): V;
+        
+        /**
+        *  Check if the cache has a particular key
+        */
+        has(key: K): boolean;
+
+        /**
+        * Get the value of a particular key. 
+        * Returns undefined if the key does not exist in the cache.
+        */
+        get(key: K): V;
+
+        /**
+        * Gets an array of keys and puts the values in a map if they exist,
+        * it allows providing a previous result to update instead of generating a new map.
+        * Providing a previous result allows the possibility of keeping the same reference if the keys did not change.
+        */
+        // TODO: Update with Immutable interface. 
+        // getAll(keys: Immutable.IndexedIterable<K>, prev?: Immutable.Map<K, V>): Immutable.Map<K, V>;
+        getAll(keys: any, prev?: any): any;
+    }
+
+    export class ReduceStore<T> extends Store {
+        /**
+        * Getter that exposes the entire state of this store. 
+        * If your state is not immutable you should override this and not expose state directly.
+        */
+        getState(): T;
+
+        /**
+        * Constructs the initial state for this store. 
+        * This is called once during construction of the store.
+        */
+        getInitialState(): T;
+
+        /**
+        * Reduces the current state, and an action to the new state of this store. 
+        * All subclasses must implement this method. 
+        * This method should be pure and have no side-effects.
+        */
+        reduce(state: T, action: any): T;
+
+        /**
+        * Checks if two versions of state are the same. 
+        * You do not need to override this if your state is immutable.
+        */
+        areEqual(one: T, two: T): boolean;
+
+    }
+
+    export class Store {
+        
+        /**
+        * Constructs and registers an instance of this store with the given dispatcher.
+        */
+        constructor(dispatcher: Flux.Dispatcher<any>);
+
+        /**
+        * Adds a listener to the store, when the store changes the given callback will be called. 
+        * A token is returned that can be used to remove the listener. 
+        * Calling the remove() function on the returned token will remove the listener.
+        */
+        addListener(callback: Function): { remove: Function };
+
+        /**
+        * Returns the dispatcher this store is registered with.
+        */
+        getDispatcher(): Flux.Dispatcher<any>;
+
+        /**
+        * Returns the dispatch token that the dispatcher recognizes this store by. 
+        * Can be used to waitFor() this store.
+        */
+        getDispatchToken(): string;
+
+        /**
+        * Ask if a store has changed during the current dispatch. 
+        * Can only be invoked while dispatching. 
+        * This can be used for constructing derived stores that depend on data from other stores.
+        */
+        hasChanged(): boolean;
+
+        /**
+        *Emit an event notifying all listeners that this store has changed.
+        * This can only be invoked when dispatching.
+        * Changes are de-duplicated and resolved at the end of this store's __onDispatch function.
+        */
+        __emitChange(): void;
+
+        /**
+        * Subclasses must override this method.
+        * This is how the store receives actions from the dispatcher.
+        * All state mutation logic must be done during this method.
+        */
+        __onDispatch(payload: any): void;
+    }
+}
+
+declare module 'flux/utils' {
+    export = FluxUtils;
+}
diff --git a/form-serializer/form-serializer-tests.ts b/form-serializer/form-serializer-tests.ts
new file mode 100644
index 000000000..e262d0742
--- /dev/null
+++ b/form-serializer/form-serializer-tests.ts
@@ -0,0 +1,4 @@
+/// <reference path="form-serializer.d.ts" />
+
+$("#form").serializeObject();
+$("#form").serializeJSON();
diff --git a/form-serializer/form-serializer.d.ts b/form-serializer/form-serializer.d.ts
new file mode 100644
index 000000000..61f3b3b00
--- /dev/null
+++ b/form-serializer/form-serializer.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for jquery.serialize-object 2.5.0
+// Project: https://github.com/macek/jquery-serialize-object
+// Definitions by: Florian Wagner <https://github.com/flqw>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts"/>
+
+declare module FormSerializer {
+
+  interface FormSerializerPatterns {
+    validate: RegExp;
+    key: RegExp;
+    push: RegExp;
+    fixed: RegExp;
+    named: RegExp;
+  }
+
+  export var patterns: FormSerializerPatterns;
+
+}
+
+declare module "jquery-serialize-object" {
+  export = FormSerializer;
+}
+
+declare module "form-serializer" {
+  export = FormSerializer;
+}
+
+interface JQuery {
+
+  /**
+   * Serializes the selected form into a JavaScript object.
+   */
+  serializeObject(): Object;
+
+  /**
+   * Serializes the selected form into JSON.
+   */
+  serializeJSON(): string;
+
+}
diff --git a/fs-extra/fs-extra-tests.ts b/fs-extra/fs-extra-tests.ts
index 0919ef1b0..80655ab5b 100644
--- a/fs-extra/fs-extra-tests.ts
+++ b/fs-extra/fs-extra-tests.ts
@@ -45,6 +45,7 @@ var openOpts: fs.OpenOptions;
 var watcher: fs.FSWatcher;
 var readStreeam: stream.Readable;
 var writeStream: stream.Writable;
+var outputStream: stream.Writable;
 
 fs.copy(src, dest, errorCallback);
 fs.copy(src, dest, (src: string) => {
@@ -150,7 +151,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);
@@ -217,6 +218,17 @@ fs.exists(path, (exists: boolean) => {
 });
 bool = fs.existsSync(path);
 
+fs.ensureDir(path, errorCallback);
+fs.ensureDirSync(path);
+fs.ensureFile(path, errorCallback);
+fs.ensureFileSync(path);
+fs.ensureLink(path, errorCallback);
+fs.ensureLinkSync(path);
+fs.ensureSymlink(path, errorCallback);
+fs.ensureSymlinkSync(path);
+fs.emptyDir(path, errorCallback);
+fs.emptyDirSync(path);
+
 readStreeam = fs.createReadStream(path);
 readStreeam = fs.createReadStream(path, {
 	flags: str,
@@ -231,3 +243,9 @@ writeStream = fs.createWriteStream(path, {
 	encoding: str,
 	string: str
 });
+outputStream = fs.createOutputStream(path);
+outputStream = fs.createOutputStream(path, {
+	flags: str,
+	encoding: str,
+	string: str
+});
diff --git a/fs-extra/fs-extra.d.ts b/fs-extra/fs-extra.d.ts
index 852956a71..d997d12a8 100644
--- a/fs-extra/fs-extra.d.ts
+++ b/fs-extra/fs-extra.d.ts
@@ -167,6 +167,15 @@ declare module "fs-extra" {
 	export function exists(path: string, callback?: (exists: boolean) => void ): void;
 	export function existsSync(path: string): boolean;
     export function ensureDir(path: string, cb: (err: Error) => void): void;
+    export function ensureDirSync(path: string): void;
+	export function ensureFile(path: string, cb: (err: Error) => void): void;
+	export function ensureFileSync(path: string): void;
+	export function ensureLink(path: string, cb: (err: Error) => void): void;
+	export function ensureLinkSync(path: string): void;
+	export function ensureSymlink(path: string, cb: (err: Error) => void): void;
+	export function ensureSymlinkSync(path: string): void;
+    export function emptyDir(path: string, callback?: (err: Error) => void): void;
+    export function emptyDirSync(path: string): boolean;
 
 	export interface OpenOptions {
 		encoding?: string;
@@ -192,4 +201,5 @@ declare module "fs-extra" {
 	}
 	export function createReadStream(path: string, options?: ReadStreamOptions): ReadStream;
 	export function createWriteStream(path: string, options?: WriteStreamOptions): WriteStream;
+	export function createOutputStream(path: string, options?: WriteStreamOptions): WriteStream;
 }
diff --git a/fullCalendar/fullCalendar-tests.ts b/fullCalendar/fullCalendar-tests.ts
index 6890cbe42..b3ec7973c 100644
--- a/fullCalendar/fullCalendar-tests.ts
+++ b/fullCalendar/fullCalendar-tests.ts
@@ -4,11 +4,10 @@
 
 // All examples from http://arshaw.com/fullcalendar/docs/
 
-$('#calendar').fullCalendar({
-})
+$('#calendar').fullCalendar({});
 
 $('#calendar').fullCalendar({
-    weekends: false 
+    weekends: false
 });
 
 $('#calendar').fullCalendar({
@@ -67,7 +66,7 @@ $('#calendar').fullCalendar({
 $('#calendar').fullCalendar('option', 'aspectRatio', 1.8);
 
 $('#calendar').fullCalendar({
-    viewRender: function(view) {
+    viewRender: function (view) {
         alert('The new title of the view is ' + view.title);
     }
 });
@@ -81,22 +80,19 @@ $('#calendar').fullCalendar({
 $('#calendar').fullCalendar('render');
 
 $('#calendar').fullCalendar({
-    dragOpacity: {
-        month: .2,
-        '': .5
-    }
+    dragOpacity: .5
 });
 
 var view = $('#calendar').fullCalendar('getView');
 alert("The view's title is " + view.title);
 
 $(document).ready(function () {
-    
+
     var date = new Date();
     var d = date.getDate();
     var m = date.getMonth();
     var y = date.getFullYear();
-    
+
     $('#calendar').fullCalendar({
         header: {
             left: 'prev,next today',
@@ -155,12 +151,12 @@ $(document).ready(function () {
 });
 
 $(document).ready(function () {
-    
+
     var date = new Date();
     var d = date.getDate();
     var m = date.getMonth();
     var y = date.getFullYear();
-    
+
     $('#calendar').fullCalendar({
         header: {
             left: 'prev,next today',
@@ -220,12 +216,12 @@ $(document).ready(function () {
 });
 
 $(document).ready(function () {
-    
+
     var date = new Date();
     var d = date.getDate();
     var m = date.getMonth();
     var y = date.getFullYear();
-    
+
     $('#calendar').fullCalendar({
         header: {
             left: 'prev,next today',
@@ -274,12 +270,12 @@ $(document).ready(function () {
 });
 
 $(document).ready(function () {
-    
+
     var date = new Date();
     var d = date.getDate();
     var m = date.getMonth();
     var y = date.getFullYear();
-    
+
     $('#calendar').fullCalendar({
         editable: true,
         header: {
@@ -339,12 +335,12 @@ $(document).ready(function () {
 });
 
 $(document).ready(function () {
-    
+
     var date = new Date();
     var d = date.getDate();
     var m = date.getMonth();
     var y = date.getFullYear();
-    
+
     $('#calendar').fullCalendar({
         header: {
             left: 'prev,next today',
@@ -715,12 +711,12 @@ $('#draggable1').draggable();
 $('#draggable2').draggable();
 
 $(document).ready(function () {
-    
+
     var date = new Date();
     var d = date.getDate();
     var m = date.getMonth();
     var y = date.getFullYear();
-    
+
     $('#calendar').fullCalendar({
         theme: true,
         header: {
@@ -799,11 +795,11 @@ $(document).ready(function () {
             revert: true,      // will cause the event to go back to its
             revertDuration: 0  //  original position after the drag
         });
-    
+
     });
     /* initialize the calendar
     -----------------------------------------------------------------*/
-    
+
     $('#calendar').fullCalendar({
         header: {
             left: 'prev,next today',
@@ -833,9 +829,8 @@ $(document).ready(function () {
                 // if so, remove the element from the "Draggable Events" list
                 $(this).remove();
             }
-        
         }
     });
 });
 
-$('#calendar').fullCalendar('refetchEvents')
\ No newline at end of file
+$('#calendar').fullCalendar('refetchEvents');
diff --git a/fullCalendar/fullCalendar.d.ts b/fullCalendar/fullCalendar.d.ts
index f73dc2d8b..6400dba7e 100644
--- a/fullCalendar/fullCalendar.d.ts
+++ b/fullCalendar/fullCalendar.d.ts
@@ -4,6 +4,7 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../jquery/jquery.d.ts"/>
+/// <reference path="../moment/moment.d.ts"/>
 
 declare module FullCalendar {
     export interface Calendar {
@@ -34,7 +35,18 @@ declare module FullCalendar {
         version: string;
     }
 
-    export interface Options {
+    export interface BusinessHours {
+        start: moment.Duration;
+        end: moment.Duration;
+        dow: Array<number>;
+    }
+
+    export interface Timespan {
+        start: moment.Moment;
+        end: moment.Moment;
+    }
+
+    export interface Options extends AgendaOptions, EventDraggingResizingOptions, DroppingExternalElementsOptions, SelectionOptions {
 
         // General display - http://arshaw.com/fullcalendar/docs/display/
 
@@ -55,14 +67,19 @@ declare module FullCalendar {
         weekMode?: string;
         weekNumbers?: boolean;
         weekNumberCalculation?: any; // String/Function
+        businessHours?: boolean | BusinessHours;
         height?: number;
         contentHeight?: number;
         aspectRatio?: number;
         handleWindowResize?: boolean;
-        viewRender?: (view: View, element: JQuery) => void;
-        viewDestroy?: (view: View, element: JQuery) => void;
+        viewRender?: (view: ViewObject, element: JQuery) => void;
+        viewDestroy?: (view: ViewObject, element: JQuery) => void;
         dayRender?: (date: Date, cell: HTMLTableDataCellElement) => void;
-        windowResize?: (view: View) => void;
+        windowResize?: (view: ViewObject) => void;
+
+        // Timezone
+        timezone?: string | boolean;
+        now?: moment.Moment | Date | string | (() => moment.Moment)
 
         // Views - http://arshaw.com/fullcalendar/docs/views/
 
@@ -70,6 +87,7 @@ declare module FullCalendar {
 
         // Current Date - http://arshaw.com/fullcalendar/docs/current_date/
 
+        defaultDate?: moment.Moment | Date | string;
         year?: number;
         month?: number;
         date?: number;
@@ -79,6 +97,7 @@ declare module FullCalendar {
         timeFormat?: any; // String/ViewOptionHash
         columnFormat?: any; // String/ViewOptionHash
         titleFormat?: any; // String/ViewOptionHash
+        
         buttonText?: ButtonTextObject;
         monthNames?: Array<string>;
         monthNamesShort?: Array<string>;
@@ -88,19 +107,10 @@ declare module FullCalendar {
 
         // Clicking & Hovering - http://arshaw.com/fullcalendar/docs/mouse/
 
-        dayClick?: (date: Date, allDay: boolean, jsEvent: MouseEvent, view: View) => void;
-        eventClick?: (event: EventObject, jsEvent: MouseEvent, view: View) => any; // return type boolean or void
-        eventMouseover?: (event: EventObject, jsEvent: MouseEvent, view: View) => void;
-        eventMouseout?: (event: EventObject, jsEvent: MouseEvent, view: View) => void;
-
-        // Selection - http://arshaw.com/fullcalendar/docs/selection/
-
-        selectable?: any; // Boolean/ViewOptionHash
-        selectHelper?: any; // Boolean/Function
-        unselectAuto?: boolean;
-        unselectCancel?: string;
-        select?: (startDate: Date | string, endDate: Date | string, allDay: boolean, jsEvent: MouseEvent, view: View) => void;
-        unselect?: (view: View, jsEvent: Event) => void;
+        dayClick?: (date: Date, allDay: boolean, jsEvent: MouseEvent, view: ViewObject) => void;
+        eventClick?: (event: EventObject, jsEvent: MouseEvent, view: ViewObject) => any; // return type boolean or void
+        eventMouseover?: (event: EventObject, jsEvent: MouseEvent, view: ViewObject) => void;
+        eventMouseout?: (event: EventObject, jsEvent: MouseEvent, view: ViewObject) => void;
 
         // Event Data - http://arshaw.com/fullcalendar/docs/event_data/
 
@@ -129,7 +139,7 @@ declare module FullCalendar {
         endParam?: string
         lazyFetching?: boolean;
         eventDataTransform?: (eventData: any) => EventObject;
-        loading?: (isLoading: boolean, view: View) => void;
+        loading?: (isLoading: boolean, view: ViewObject) => void;
 
         // Event Rendering - http://arshaw.com/fullcalendar/docs/event_rendering/
 
@@ -137,37 +147,12 @@ declare module FullCalendar {
         eventBackgroundColor?: string;
         eventBorderColor?: string;
         eventTextColor?: string;
-        eventRender?: (event: EventObject, element: HTMLDivElement, view: View) => void;
-        eventAfterRender?: (event: EventObject, element: HTMLDivElement, view: View) => void;
-        eventAfterAllRender?: (view: View) => void;
-        eventDestroy?: (event: EventObject, element: JQuery, view: View) => void;
+        eventRender?: (event: EventObject, element: HTMLDivElement, view: ViewObject) => void;
+        eventAfterRender?: (event: EventObject, element: HTMLDivElement, view: ViewObject) => void;
+        eventAfterAllRender?: (view: ViewObject) => void;
+        eventDestroy?: (event: EventObject, element: JQuery, view: ViewObject) => void;
 
-        // Event Dragging & Resizing
 
-        editable?: boolean;
-        eventStartEditable?: boolean;
-        eventDurationEditable?: boolean;
-        dragRevertDuration?: number;
-        dragOpacity?: any; // Float/ViewOptionHash
-        eventDragStart?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: View) => void;
-        eventDragStop?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: View) => void;
-        eventDrop?: (event: EventObject, dayDelta: number, minuteDelta: number, revertFunc: Function, jsEvent: Event, ui: any, view: View) => void;
-        eventResizeStart?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: View) => void;
-        eventResizeStop?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: View) => void;
-        eventResize?: (event: EventObject, dayDelta: number, minuteDelta: number, revertFunc: Function, jsEvent: Event, ui: any, view: View) => void;
-
-        droppable?: boolean;
-        dropAccept?: any; // String/Function
-        drop?: (date: Date, allDay: boolean, jsEvent: MouseEvent, ui: any) => void;
-    }
-
-    export interface View {
-        name: string;
-        title: string;
-        start: Date | string;
-        end: Date | string;
-        visStart: Date;
-        visEnd: Date;
     }
 
     export interface ViewOptionHash {
@@ -189,16 +174,56 @@ declare module FullCalendar {
     export interface AgendaOptions {
         allDaySlot?: boolean;
         allDayText?: string;
-        axisFormat?: string;
-        slotMinutes?: number;
-        snapMinutes?: number;
-        defaultEventMinutes?: number;
-        firstHour?: number;
-        minTime?: any; // Integer/String
-        maxTime?: any; // Integer/String
+        slotDuration?: moment.Duration;
+        slotLabelFormat?: string;
+        slotLabelInterval?: moment.Duration;
+        snapDuration?: moment.Duration;
+        scrollTime?: moment.Duration;
+        minTime?: moment.Duration; // Integer/String
+        maxTime?: moment.Duration; // Integer/String
         slotEventOverlap?: boolean;
     }
 
+    /*
+    * Event Dragging & Resizing
+    */
+    export interface EventDraggingResizingOptions {
+        editable?: boolean;
+        eventStartEditable?: boolean;
+        eventDurationEditable?: boolean;
+        dragRevertDuration?: number; // integer, milliseconds
+        dragOpacity?: number; // float
+        dragScroll?: boolean;
+        eventOverlap?: boolean | ((stillEvent: EventObject, movingEvent: EventObject) => boolean);
+        eventConstraint?: BusinessHours | Timespan;
+        eventDragStart?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject) => void;
+        eventDragStop?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject) => void;
+        eventDrop?: (event: EventObject, delta: moment.Duration, revertFunc: Function, jsEvent: Event, ui: any, view: ViewObject) => void;
+        eventResizeStart?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject) => void;
+        eventResizeStop?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject) => void;
+        eventResize?: (event: EventObject, delta: moment.Duration, revertFunc: Function, jsEvent: Event, ui: any, view: ViewObject) => void;
+    }
+    /*
+    * Selection - http://arshaw.com/fullcalendar/docs/selection/
+    */
+    export interface SelectionOptions {
+        selectable?: boolean;
+        selectHelper?: boolean | ((start: moment.Moment, end: moment.Moment) => HTMLElement);
+        unselectAuto?: boolean;
+        unselectCancel?: string;
+        selectOverlap?: boolean | ((event: EventObject) => boolean);
+        selectConstraint?: Timespan | BusinessHours;
+        select?: (start: moment.Moment, end: moment.Moment, jsEvent: MouseEvent, view: ViewObject, resource?: any) => void;
+        unselect?: (view: ViewObject, jsEvent: Event) => void;
+    }
+
+    export interface DroppingExternalElementsOptions {
+        droppable?: boolean;
+        dropAccept?: string | ((draggable: any) => boolean);
+        drop?: (date: moment.Moment, jsEvent: MouseEvent, ui: any) => void;
+        eventReceive?: (event: EventObject) => void
+    }
+
     export interface ButtonTextObject {
         prev?: string;
         next?: string;
@@ -210,12 +235,10 @@ declare module FullCalendar {
         day?: string;
     }
 
-    export interface EventObject {
+    export interface EventObject extends Timespan {
         id?: any // String/number
         title: string;
         allDay?: boolean;
-        start: Date | string;
-        end?: Date | string;
         url?: string;
         className?: any; // string/Array<string>
         editable?: boolean;
@@ -226,6 +249,13 @@ declare module FullCalendar {
         textColor?: string;
     }
 
+    export interface ViewObject extends Timespan {
+        name: string;
+        title: string;
+        intervalStart: moment.Moment;
+        intervalEnd: moment.Moment;
+    }
+
     export interface EventSource extends JQueryAjaxSettings {
 
         /**
@@ -272,7 +302,7 @@ interface JQuery {
     /**
      * Returns the View Object for the current view.
      */
-    fullCalendar(method: 'getView'): FullCalendar.View;
+    fullCalendar(method: 'getView'): FullCalendar.ViewObject;
 
     /**
      * Immediately switches to a different view.
diff --git a/github-electron/github-electron-main-tests.ts b/github-electron/github-electron-main-tests.ts
index 3bce8390e..bafbaa49f 100644
--- a/github-electron/github-electron-main-tests.ts
+++ b/github-electron/github-electron-main-tests.ts
@@ -57,13 +57,17 @@ app.on('ready', () => {
 	mainWindow = new BrowserWindow({ width: 800, height: 600 });
 
 	// and load the index.html of the app.
-	mainWindow.loadUrl(`file://${__dirname}/index.html`);
-	mainWindow.loadUrl('file://foo/bar', {userAgent: 'cool-agent', httpReferrer: 'greateRefferer'});
-	mainWindow.webContents.loadUrl('file://foo/bar', {userAgent: 'cool-agent', httpReferrer: 'greateRefferer'});
+	mainWindow.loadURL(`file://${__dirname}/index.html`);
+	mainWindow.loadURL('file://foo/bar', {userAgent: 'cool-agent', httpReferrer: 'greateRefferer'});
+	mainWindow.webContents.loadURL('file://foo/bar', {userAgent: 'cool-agent', httpReferrer: 'greateRefferer'});
 
-	mainWindow.openDevTools()
-	var opened: boolean = mainWindow.isDevToolsOpened()
-	mainWindow.toggleDevTools()
+	mainWindow.webContents.openDevTools();
+	mainWindow.webContents.toggleDevTools();
+	mainWindow.webContents.openDevTools({detach: true});
+	mainWindow.webContents.closeDevTools();
+	mainWindow.webContents.addWorkSpace('/path/to/workspace');
+	mainWindow.webContents.removeWorkSpace('/path/to/workspace');
+	var opened: boolean = mainWindow.webContents.isDevToolsOpened()
 	// Emitted when the window is closed.
 	mainWindow.on('closed', () => {
 		// Dereference the window object, usually you would store windows
@@ -149,7 +153,7 @@ var onlineStatusWindow: GitHubElectron.BrowserWindow;
 
 app.on('ready', () => {
 	onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false });
-	onlineStatusWindow.loadUrl(`file://${__dirname}/online-status.html`);
+	onlineStatusWindow.loadURL(`file://${__dirname}/online-status.html`);
 });
 
 ipc.on('online-status-changed', (event: any, status: any) => {
@@ -165,7 +169,7 @@ app.on('ready', () => {
 		height: 600, 
 		'title-bar-style': 'hidden-inset',
 	});
-	window.loadUrl('https://github.com');
+	window.loadURL('https://github.com');
 });
 
 // Supported Chrome command line switches
@@ -179,7 +183,7 @@ app.commandLine.appendSwitch('vmodule', 'console=0');
 // auto-updater
 // https://github.com/atom/electron/blob/master/docs/api/auto-updater.md
 
-AutoUpdater.setFeedUrl('http://mycompany.com/myapp/latest?version=' + app.getVersion());
+AutoUpdater.setFeedURL('http://mycompany.com/myapp/latest?version=' + app.getVersion());
 
 // browser-window
 // https://github.com/atom/electron/blob/master/docs/api/browser-window.md
@@ -189,7 +193,7 @@ win.on('closed', () => {
 	win = null;
 });
 
-win.loadUrl('https://github.com');
+win.loadURL('https://github.com');
 win.show();
 
 // content-tracing
@@ -344,7 +348,7 @@ var template = [
 			{
 				label: 'Toggle DevTools',
 				accelerator: 'Alt+Command+I',
-				click: () => { BrowserWindow.getFocusedWindow().toggleDevTools(); }
+				click: () => { BrowserWindow.getFocusedWindow().webContents.toggleDevTools(); }
 			}
 		]
 	},
@@ -446,7 +450,7 @@ console.log(Clipboard.readText('selection'));
 CrashReporter.start({
 	productName: 'YourName',
 	companyName: 'YourCompany',
-	submitUrl: 'https://your-domain.com/url-to-submit',
+	submitURL: 'https://your-domain.com/url-to-submit',
 	autoSubmit: true
 });
 
diff --git a/github-electron/github-electron-renderer-tests.ts b/github-electron/github-electron-renderer-tests.ts
index 4c940b651..86680600f 100644
--- a/github-electron/github-electron-renderer-tests.ts
+++ b/github-electron/github-electron-renderer-tests.ts
@@ -24,7 +24,7 @@ ipc.send('asynchronous-message', 'ping');
 
 var BrowserWindow: typeof GitHubElectron.BrowserWindow = remote.require('browser-window');
 var win = new BrowserWindow({ width: 800, height: 600 });
-win.loadUrl('https://github.com');
+win.loadURL('https://github.com');
 
 remote.getCurrentWindow().on('close', () => {
 	// blabla...
@@ -66,7 +66,7 @@ console.log(Clipboard.readText('selection'));
 CrashReporter.start({
 	productName: 'YourName',
 	companyName: 'YourCompany',
-	submitUrl: 'https://your-domain.com/url-to-submit',
+	submitURL: 'https://your-domain.com/url-to-submit',
 	autoSubmit: true
 });
 
diff --git a/github-electron/github-electron-renderer.d.ts b/github-electron/github-electron-renderer.d.ts
index 2fff2bb34..62b29d9cd 100644
--- a/github-electron/github-electron-renderer.d.ts
+++ b/github-electron/github-electron-renderer.d.ts
@@ -90,7 +90,7 @@ declare module GitHubElectron {
 		 * warnings. For example, https and data are secure schemes because they cannot be
 		 * corrupted by active network attackers.
 		 */
-		registerUrlSchemeAsSecure(scheme: string): void;
+		registerURLSchemeAsSecure(scheme: string): void;
 	}
 }
 
diff --git a/github-electron/github-electron.d.ts b/github-electron/github-electron.d.ts
index fee13c29f..d4ab0099f 100644
--- a/github-electron/github-electron.d.ts
+++ b/github-electron/github-electron.d.ts
@@ -24,9 +24,9 @@ declare module GitHubElectron {
 		 */
 		static createFromBuffer(buffer: Buffer, scaleFactor?: number): NativeImage;
 		/**
-		 * Creates a new NativeImage instance from dataUrl
+		 * Creates a new NativeImage instance from dataURL
 		 */
-		static createFromDataUrl(dataUrl: string): NativeImage;
+		static createFromDataURL(dataURL: string): NativeImage;
 		/**
 		 * @returns Buffer Contains the image's PNG encoded data.
 		 */
@@ -38,7 +38,7 @@ declare module GitHubElectron {
 		/**
 		 * @returns string The data URL of the image.
 		 */
-		toDataUrl(): string;
+		toDataURL(): string;
 		/**
 		 * @returns boolean Whether the image is empty.
 		 */
@@ -343,27 +343,6 @@ declare module GitHubElectron {
 		 * @returns Whether the window's document has been edited.
 		 */
 		isDocumentEdited(): boolean;
-		/**
-		 * Opens the developer tools.
-		 */
-		openDevTools(options?: {
-			/**
-			 * Opens devtools in a new window.
-			 */
-			detach?: boolean;
-		}): void;
-		/**
-		 * Closes the developer tools.
-		 */
-		closeDevTools(): void;
-		/**
-		 * Returns whether the developer tools are opened.
-		 */
-		isDevToolsOpened(): boolean;
-		/**
-		 * Toggle the developer tools.
-		 */
-		toggleDevTools(): void;
 		reloadIgnoringCache(): void;
 		/**
 		 * Starts inspecting element at position (x, y).
@@ -398,9 +377,9 @@ declare module GitHubElectron {
 			landscape?: boolean;
 		}, callback: (error: Error, data: Buffer) => void): void;
 		/**
-		 * Same with webContents.loadUrl(url).
+		 * Same with webContents.loadURL(url).
 		 */
-		loadUrl(url: string, options?: {
+		loadURL(url: string, options?: {
 			httpReferrer?: string;
 			userAgent?: string;
 		}): void;
@@ -541,14 +520,14 @@ declare module GitHubElectron {
 		 * Loads the url in the window.
 		 * @param url Must contain the protocol prefix (e.g., the http:// or file://).
 		 */
-		loadUrl(url: string, options?: {
+		loadURL(url: string, options?: {
 			httpReferrer?: string;
 			userAgent?: string;
 		}): void;
 		/**
 		 * @returns The URL of current web page.
 		 */
-		getUrl(): string;
+		getURL(): string;
 		/**
 		 * @returns The title of web page.
 		 */
@@ -731,6 +710,35 @@ declare module GitHubElectron {
 		 *   data Buffer - PDF file content
 		 */
 		callback: (error: Error, data: Buffer) => void): void;
+		/**
+		 * Adds the specified path to DevTools workspace.
+		 */
+		addWorkSpace(path: string): void;
+		/**
+		 * Removes the specified path from DevTools workspace.
+		 */
+		removeWorkSpace(path: string): void;
+		/**
+		 * Opens the developer tools.
+		 */
+		openDevTools(options?: {
+			/**
+			 * Opens devtools in a new window.
+			 */
+			detach?: boolean;
+		}): void;
+		/**
+		 * Closes the developer tools.
+		 */
+		closeDevTools(): void;
+		/**
+		 * Returns whether the developer tools are opened.
+		 */
+		isDevToolsOpened(): boolean;
+		/**
+		 * Toggle the developer tools.
+		 */
+		toggleDevTools(): void;
 		/**
 		 * Send args.. to the web page via channel in asynchronous message, the web page
 		 * can handle it by listening to the channel event of ipc module.
@@ -1108,9 +1116,9 @@ declare module GitHubElectron {
 		 * Set the url and initialize the auto updater.
 		 * The url cannot be changed once it is set.
 		 */
-		setFeedUrl(url: string): void;
+		setFeedURL(url: string): void;
 		/**
-		 * Ask the server whether there is an update, you have to call setFeedUrl
+		 * Ask the server whether there is an update, you have to call setFeedURL
 		 * before using this API
 		 */
 		checkForUpdates(): any;
@@ -1305,7 +1313,7 @@ declare module GitHubElectron {
 		* URL that crash reports would be sent to as POST.
 		* Default: http://54.249.141.255:1127/post
 		*/
-		submitUrl?: string;
+		submitURL?: string;
 		/**
 		* Send the crash report without user interaction.
 		* Default: true.
diff --git a/google-apps-script/NOTICE b/google-apps-script/NOTICE
new file mode 100644
index 000000000..589a96059
--- /dev/null
+++ b/google-apps-script/NOTICE
@@ -0,0 +1,13 @@
+License Notices:
+
+The API definitions and documents are from Google Apps Script reference site [1].
+
+The document comments are reproduced from work created and shared by Google [2]
+and used according to terms described in the Creative Commons 3.0 Attribution License [3].
+
+The code samples in the documents and the test code are licensed under the Apache 2.0 License [4].
+
+[1] https://developers.google.com/apps-script/
+[2] https://developers.google.com/readme/policies/
+[3] http://creativecommons.org/licenses/by/3.0/
+[4] http://www.apache.org/licenses/LICENSE-2.0
diff --git a/google-apps-script/google-apps-script-tests.ts b/google-apps-script/google-apps-script-tests.ts
new file mode 100644
index 000000000..fecb7adc9
--- /dev/null
+++ b/google-apps-script/google-apps-script-tests.ts
@@ -0,0 +1,27 @@
+/// <reference path="google-apps-script.document.d.ts" />
+/// <reference path="google-apps-script.gmail.d.ts" />
+
+// from https://developers.google.com/apps-script/overview
+
+function createAndSendDocument() {
+  // Create a new Google Doc named 'Hello, world!'
+  var doc = DocumentApp.create('Hello, world!');
+
+  // Access the body of the document, then add a paragraph.
+  doc.getBody().appendParagraph('This document was created by Google Apps Script.');
+
+  // Get the URL of the document.
+  var url = doc.getUrl();
+
+  // Get the email address of the active user - that's you.
+  var email = Session.getActiveUser().getEmail();
+
+  // Get the name of the document to use as an email subject line.
+  var subject = doc.getName();
+
+  // Append a new string to the "url" variable to use as an email body.
+  var body = 'Link to your doc: ' + url;
+
+  // Send yourself an email with a link to the document.
+  GmailApp.sendEmail(email, subject, body);
+}
diff --git a/google-apps-script/google-apps-script.base.d.ts b/google-apps-script/google-apps-script.base.d.ts
new file mode 100644
index 000000000..b1e38ce45
--- /dev/null
+++ b/google-apps-script/google-apps-script.base.d.ts
@@ -0,0 +1,283 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Base {
+    /**
+     * A data interchange object for Apps Script services.
+     */
+    export interface Blob {
+      copyBlob(): Blob;
+      getAs(contentType: string): Blob;
+      getBytes(): Byte[];
+      getContentType(): string;
+      getDataAsString(): string;
+      getDataAsString(charset: string): string;
+      getName(): string;
+      isGoogleType(): boolean;
+      setBytes(data: Byte[]): Blob;
+      setContentType(contentType: string): Blob;
+      setContentTypeFromExtension(): Blob;
+      setDataFromString(string: string): Blob;
+      setDataFromString(string: string, charset: string): Blob;
+      setName(name: string): Blob;
+      getAllBlobs(): Blob[];
+    }
+
+    /**
+     * Interface for objects that can export their data as a Blob.
+     * Implementing classes
+     * 
+     * NameBrief description
+     * 
+     * AttachmentA Sites Attachment such as a file attached to a page.
+     * 
+     * BlobA data interchange object for Apps Script services.
+     * 
+     * ChartA Chart object, which can be embedded into documents, UI elements, or used as a static image.
+     * 
+     * DocumentA document, containing rich text and elements such as tables and lists.
+     * 
+     * EmbeddedChartRepresents a chart that has been embedded into a Spreadsheet.
+     * 
+     * FileA file in Google Drive.
+     * 
+     * GmailAttachmentAn attachment from Gmail.
+     * 
+     * HTTPResponseThis class allows users to access specific information on HTTP responses.
+     * 
+     * HtmlOutputAn HtmlOutput object that can be served from a script.
+     * 
+     * InlineImageAn element representing an embedded image.
+     * 
+     * JdbcBlobA JDBC Blob.
+     * 
+     * JdbcClobA JDBC Clob.
+     * 
+     * SpreadsheetThis class allows users to access and modify Google Sheets files.
+     * 
+     * StaticMapAllows for the creation and decoration of static map images.
+     */
+    export interface BlobSource {
+      getAs(contentType: string): Blob;
+      getBlob(): Blob;
+    }
+
+    /**
+     * This class provides access to Google Apps specific dialog boxes.
+     * 
+     *  The methods in this class are only available for use in the context of a Google Spreadsheet.
+     * See also
+     * 
+     * ButtonSet
+     */
+    export interface Browser {
+      Buttons: ButtonSet
+      inputBox(prompt: string): string;
+      inputBox(prompt: string, buttons: ButtonSet): string;
+      inputBox(title: string, prompt: string, buttons: ButtonSet): string;
+      msgBox(prompt: string): string;
+      msgBox(prompt: string, buttons: ButtonSet): string;
+      msgBox(title: string, prompt: string, buttons: ButtonSet): string;
+    }
+
+    /**
+     * An enum representing predetermined, localized dialog buttons returned by an
+     *  alert or PromptResponse.getSelectedButton() to
+     *  indicate which button in a dialog the user clicked. These values cannot be set; to add buttons to
+     *  an alert or
+     *  prompt, use ButtonSet instead.
+     * 
+     *      // Display a dialog box with a message and "Yes" and "No" buttons.
+     *      var ui = DocumentApp.getUi();
+     *      var response = ui.alert('Are you sure you want to continue?', ui.ButtonSet.YES_NO);
+     *     
+     *      // Process the user's response.
+     *      if (response == ui.Button.YES) {
+     *        Logger.log('The user clicked "Yes."');
+     *      } else {
+     *        Logger.log('The user clicked "No" or the dialog\'s close button.');
+     *      }
+     */
+    export enum Button { CLOSE, OK, CANCEL, YES, NO }
+
+    /**
+     * An enum representing predetermined, localized sets of one or more dialog buttons that can be
+     *  added to an alert or a
+     *  prompt. To determine which button the user
+     *  clicked, use Button.
+     * 
+     *      // Display a dialog box with a message and "Yes" and "No" buttons.
+     *      var ui = DocumentApp.getUi();
+     *      var response = ui.alert('Are you sure you want to continue?', ui.ButtonSet.YES_NO);
+     *     
+     *      // Process the user's response.
+     *      if (response == ui.Button.YES) {
+     *        Logger.log('The user clicked "Yes."');
+     *      } else {
+     *        Logger.log('The user clicked "No" or the dialog\'s close button.');
+     *      }
+     */
+    export enum ButtonSet { OK, OK_CANCEL, YES_NO, YES_NO_CANCEL }
+
+    /**
+     * This class allows the developer to write out text to the debugging logs.
+     */
+    export interface Logger {
+      clear(): void;
+      getLog(): string;
+      log(data: Object): Logger;
+      log(format: string, ...values: Object[]): Logger;
+    }
+
+    /**
+     * A custom menu in an instance of the user interface for a Google App. A script can only interact
+     *  with the UI for the current instance of an open document or form, and only if the script is
+     *  container-bound to the document or form. For more
+     *  information, see the guide to menus.
+     * 
+     *      // Add a custom menu to the active spreadsheet, including a separator and a sub-menu.
+     *      function onOpen(e) {
+     *        SpreadsheetApp.getUi()
+     *            .createMenu('My Menu')
+     *            .addItem('My Menu Item', 'myFunction')
+     *            .addSeparator()
+     *            .addSubMenu(SpreadsheetApp.getUi().createMenu('My Submenu')
+     *                .addItem('One Submenu Item', 'mySecondFunction')
+     *                .addItem('Another Submenu Item', 'myThirdFunction'))
+     *            .addToUi();
+     *      }
+     */
+    export interface Menu {
+      addItem(caption: string, functionName: string): Menu;
+      addSeparator(): Menu;
+      addSubMenu(menu: Menu): Menu;
+      addToUi(): void;
+    }
+
+    /**
+     * An enumeration that provides access to MIME-type declarations without typing the strings
+     *  explicitly. Any method that expects a MIME type rendered as a string (for example,
+     *  'image/png') will also accept one of the values below, so long as the method
+     *  supports the underlying MIME type.
+     * 
+     *      // Use MimeType enum to log the name of every Google Doc in the user's Drive.
+     *      var docs = DriveApp.getFilesByType(MimeType.GOOGLE_DOCS);
+     *      while (docs.hasNext()) {
+     *       var doc = docs.next();
+     *       Logger.log(doc.getName())
+     *      }
+     *     
+     *      // Use plain string to log the size of every PNG in the user's Drive.
+     *      var pngs = DriveApp.getFilesByType('image/png');
+     *      while (pngs.hasNext()) {
+     *       var png = pngs.next();
+     *       Logger.log(png.getSize());
+     *      }
+     */
+    export enum MimeType { GOOGLE_APPS_SCRIPT, GOOGLE_DRAWINGS, GOOGLE_DOCS, GOOGLE_FORMS, GOOGLE_SHEETS, GOOGLE_SLIDES, FOLDER, BMP, GIF, JPEG, PNG, SVG, PDF, CSS, CSV, HTML, JAVASCRIPT, PLAIN_TEXT, RTF, OPENDOCUMENT_GRAPHICS, OPENDOCUMENT_PRESENTATION, OPENDOCUMENT_SPREADSHEET, OPENDOCUMENT_TEXT, MICROSOFT_EXCEL, MICROSOFT_EXCEL_LEGACY, MICROSOFT_POWERPOINT, MICROSOFT_POWERPOINT_LEGACY, MICROSOFT_WORD, MICROSOFT_WORD_LEGACY, ZIP }
+
+    /**
+     * An enum representing the months of the year.
+     */
+    export enum Month { JANUARY, FEBRUARY, MARCH, APRIL, MAY, JUNE, JULY, AUGUST, SEPTEMBER, OCTOBER, NOVEMBER, DECEMBER }
+
+    /**
+     * A response to a prompt dialog displayed in the
+     *  user-interface environment for a Google App. The response contains any text the user entered in
+     *  the dialog's input field and indicates which button the user clicked to dismiss the dialog.
+     * 
+     *      // Display a dialog box with a title, message, input field, and "Yes" and "No" buttons. The
+     *      // user can also close the dialog by clicking the close button in its title bar.
+     *      var ui = DocumentApp.getUi();
+     *      var response = ui.prompt('Getting to know you', 'May I know your name?', ui.ButtonSet.YES_NO);
+     *     
+     *      // Process the user's response.
+     *      if (response.getSelectedButton() == ui.Button.YES) {
+     *        Logger.log('The user\'s name is %s.', response.getResponseText());
+     *      } else if (response.getSelectedButton() == ui.Button.NO) {
+     *        Logger.log('The user didn\'t want to provide a name.');
+     *      } else {
+     *        Logger.log('The user clicked the close button in the dialog\'s title bar.');
+     *      }
+     */
+    export interface PromptResponse {
+      getResponseText(): string;
+      getSelectedButton(): Button;
+    }
+
+    /**
+     * The Session class provides access to session information, such as the user's email address (in
+     *  some circumstances) and language setting.
+     */
+    export interface Session {
+      getActiveUser(): User;
+      getActiveUserLocale(): string;
+      getEffectiveUser(): User;
+      getScriptTimeZone(): string;
+      getTimeZone(): string;
+      getUser(): User;
+    }
+
+    /**
+     * An instance of the user-interface environment for a Google App that allows the script to add
+     *  features like menus, dialogs, and sidebars. A script can only interact with the UI for the
+     *  current instance of an open editor, and only if the script is
+     *  container-bound to the editor.
+     * 
+     *      // Display a dialog box with a title, message, input field, and "Yes" and "No" buttons. The
+     *      // user can also close the dialog by clicking the close button in its title bar.
+     *      var ui = SpreadsheetApp.getUi();
+     *      var response = ui.prompt('Getting to know you', 'May I know your name?', ui.ButtonSet.YES_NO);
+     *     
+     *      // Process the user's response.
+     *      if (response.getSelectedButton() == ui.Button.YES) {
+     *        Logger.log('The user\'s name is %s.', response.getResponseText());
+     *      } else if (response.getSelectedButton() == ui.Button.NO) {
+     *        Logger.log('The user didn\'t want to provide a name.');
+     *      } else {
+     *        Logger.log('The user clicked the close button in the dialog\'s title bar.');
+     *      }
+     */
+    export interface Ui {
+      Button: Button
+      ButtonSet: ButtonSet
+      alert(prompt: string): Button;
+      alert(prompt: string, buttons: ButtonSet): Button;
+      alert(title: string, prompt: string, buttons: ButtonSet): Button;
+      createAddonMenu(): Menu;
+      createMenu(caption: string): Menu;
+      prompt(prompt: string): PromptResponse;
+      prompt(prompt: string, buttons: ButtonSet): PromptResponse;
+      prompt(title: string, prompt: string, buttons: ButtonSet): PromptResponse;
+      showModalDialog(userInterface: Object, title: string): void;
+      showModelessDialog(userInterface: Object, title: string): void;
+      showSidebar(userInterface: Object): void;
+      showDialog(userInterface: Object): void;
+    }
+
+    /**
+     * Representation of a user, suitable for scripting.
+     */
+    export interface User {
+      getEmail(): string;
+      getUserLoginId(): string;
+    }
+
+    /**
+     * An enum representing the days of the week.
+     */
+    export enum Weekday { SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY }
+
+  }
+}
+
+declare var Browser: GoogleAppsScript.Base.Browser;
+declare var Logger: GoogleAppsScript.Base.Logger;
+// conflicts with MimeType in lib.d.ts
+// declare var MimeType: GoogleAppsScript.Base.MimeType;
+declare var Session: GoogleAppsScript.Base.Session;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.cache.d.ts b/google-apps-script/google-apps-script.cache.d.ts
new file mode 100644
index 000000000..7d375c52d
--- /dev/null
+++ b/google-apps-script/google-apps-script.cache.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Cache {
+    /**
+     * A reference to a particular cache.
+     * 
+     *  This class allows you to insert, retrieve, and remove items from a cache. This can be
+     *  particularly useful when you want frequent access to an expensive or slow resource. For
+     *  example, say you have an RSS feed at example.com that takes 20 seconds to fetch, but you want
+     *  to speed up access on an average request.
+     * 
+     *      function getRssFeed() {
+     *        var cache = CacheService.getPublicCache();
+     *        var cached = cache.get("rss-feed-contents");
+     *        if (cached != null) {
+     *          return cached;
+     *        }
+     *        var result = UrlFetchApp.fetch("http://example.com/my-slow-rss-feed.xml"); // takes 20 seconds
+     *        var contents = result.getContentText();
+     *        cache.put("rss-feed-contents", contents, 1500); // cache for 25 minutes
+     *        return contents;
+     *      }
+     */
+    export interface Cache {
+      get(key: string): string;
+      getAll(keys: String[]): Object;
+      put(key: string, value: string): void;
+      put(key: string, value: string, expirationInSeconds: Integer): void;
+      putAll(values: Object): void;
+      putAll(values: Object, expirationInSeconds: Integer): void;
+      remove(key: string): void;
+      removeAll(keys: String[]): void;
+    }
+
+    /**
+     * CacheService allows you to access a cache for short term storage of data.
+     * 
+     *  This class lets you get a specific cache instance. Public caches are for things that are not
+     *  dependent on which user is accessing your script. Private caches are for things which are
+     *  user-specific, like settings or recent activity.
+     */
+    export interface CacheService {
+      getDocumentCache(): Cache;
+      getScriptCache(): Cache;
+      getUserCache(): Cache;
+    }
+
+  }
+}
+
+declare var CacheService: GoogleAppsScript.Cache.CacheService;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.calendar.d.ts b/google-apps-script/google-apps-script.calendar.d.ts
new file mode 100644
index 000000000..f86b64df5
--- /dev/null
+++ b/google-apps-script/google-apps-script.calendar.d.ts
@@ -0,0 +1,294 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Calendar {
+    /**
+     * Represents a calendar that the user owns or is subscribed to.
+     */
+    export interface Calendar {
+      createAllDayEvent(title: string, date: Date): CalendarEvent;
+      createAllDayEvent(title: string, date: Date, options: Object): CalendarEvent;
+      createAllDayEventSeries(title: string, startDate: Date, recurrence: EventRecurrence): CalendarEventSeries;
+      createAllDayEventSeries(title: string, startDate: Date, recurrence: EventRecurrence, options: Object): CalendarEventSeries;
+      createEvent(title: string, startTime: Date, endTime: Date): CalendarEvent;
+      createEvent(title: string, startTime: Date, endTime: Date, options: Object): CalendarEvent;
+      createEventFromDescription(description: string): CalendarEvent;
+      createEventSeries(title: string, startTime: Date, endTime: Date, recurrence: EventRecurrence): CalendarEventSeries;
+      createEventSeries(title: string, startTime: Date, endTime: Date, recurrence: EventRecurrence, options: Object): CalendarEventSeries;
+      deleteCalendar(): void;
+      getColor(): string;
+      getDescription(): string;
+      getEventSeriesById(iCalId: string): CalendarEventSeries;
+      getEvents(startTime: Date, endTime: Date): CalendarEvent[];
+      getEvents(startTime: Date, endTime: Date, options: Object): CalendarEvent[];
+      getEventsForDay(date: Date): CalendarEvent[];
+      getEventsForDay(date: Date, options: Object): CalendarEvent[];
+      getId(): string;
+      getName(): string;
+      getTimeZone(): string;
+      isHidden(): boolean;
+      isMyPrimaryCalendar(): boolean;
+      isOwnedByMe(): boolean;
+      isSelected(): boolean;
+      setColor(color: string): Calendar;
+      setDescription(description: string): Calendar;
+      setHidden(hidden: boolean): Calendar;
+      setName(name: string): Calendar;
+      setSelected(selected: boolean): Calendar;
+      setTimeZone(timeZone: string): Calendar;
+      unsubscribeFromCalendar(): void;
+    }
+
+    /**
+     * Allows a script to read and update the user's Google Calendar. This class provides direct
+     *  access to the user's default calendar, as well as the ability to retrieve additional calendars
+     *  that the user owns or is subscribed to.
+     */
+    export interface CalendarApp {
+      Color: Color
+      GuestStatus: GuestStatus
+      Month: Base.Month
+      Visibility: Visibility
+      Weekday: Base.Weekday
+      createAllDayEvent(title: string, date: Date): CalendarEvent;
+      createAllDayEvent(title: string, date: Date, options: Object): CalendarEvent;
+      createAllDayEventSeries(title: string, startDate: Date, recurrence: EventRecurrence): CalendarEventSeries;
+      createAllDayEventSeries(title: string, startDate: Date, recurrence: EventRecurrence, options: Object): CalendarEventSeries;
+      createCalendar(name: string): Calendar;
+      createCalendar(name: string, options: Object): Calendar;
+      createEvent(title: string, startTime: Date, endTime: Date): CalendarEvent;
+      createEvent(title: string, startTime: Date, endTime: Date, options: Object): CalendarEvent;
+      createEventFromDescription(description: string): CalendarEvent;
+      createEventSeries(title: string, startTime: Date, endTime: Date, recurrence: EventRecurrence): CalendarEventSeries;
+      createEventSeries(title: string, startTime: Date, endTime: Date, recurrence: EventRecurrence, options: Object): CalendarEventSeries;
+      getAllCalendars(): Calendar[];
+      getAllOwnedCalendars(): Calendar[];
+      getCalendarById(id: string): Calendar;
+      getCalendarsByName(name: string): Calendar[];
+      getColor(): string;
+      getDefaultCalendar(): Calendar;
+      getDescription(): string;
+      getEventSeriesById(iCalId: string): CalendarEventSeries;
+      getEvents(startTime: Date, endTime: Date): CalendarEvent[];
+      getEvents(startTime: Date, endTime: Date, options: Object): CalendarEvent[];
+      getEventsForDay(date: Date): CalendarEvent[];
+      getEventsForDay(date: Date, options: Object): CalendarEvent[];
+      getId(): string;
+      getName(): string;
+      getOwnedCalendarById(id: string): Calendar;
+      getOwnedCalendarsByName(name: string): Calendar[];
+      getTimeZone(): string;
+      isHidden(): boolean;
+      isMyPrimaryCalendar(): boolean;
+      isOwnedByMe(): boolean;
+      isSelected(): boolean;
+      newRecurrence(): EventRecurrence;
+      setColor(color: string): Calendar;
+      setDescription(description: string): Calendar;
+      setHidden(hidden: boolean): Calendar;
+      setName(name: string): Calendar;
+      setSelected(selected: boolean): Calendar;
+      setTimeZone(timeZone: string): Calendar;
+      subscribeToCalendar(id: string): Calendar;
+      subscribeToCalendar(id: string, options: Object): Calendar;
+    }
+
+    /**
+     * Represents a single calendar event.
+     */
+    export interface CalendarEvent {
+      addEmailReminder(minutesBefore: Integer): CalendarEvent;
+      addGuest(email: string): CalendarEvent;
+      addPopupReminder(minutesBefore: Integer): CalendarEvent;
+      addSmsReminder(minutesBefore: Integer): CalendarEvent;
+      anyoneCanAddSelf(): boolean;
+      deleteEvent(): void;
+      deleteTag(key: string): CalendarEvent;
+      getAllDayEndDate(): Date;
+      getAllDayStartDate(): Date;
+      getAllTagKeys(): String[];
+      getCreators(): String[];
+      getDateCreated(): Date;
+      getDescription(): string;
+      getEmailReminders(): Integer[];
+      getEndTime(): Date;
+      getEventSeries(): CalendarEventSeries;
+      getGuestByEmail(email: string): EventGuest;
+      getGuestList(): EventGuest[];
+      getGuestList(includeOwner: boolean): EventGuest[];
+      getId(): string;
+      getLastUpdated(): Date;
+      getLocation(): string;
+      getMyStatus(): GuestStatus;
+      getOriginalCalendarId(): string;
+      getPopupReminders(): Integer[];
+      getSmsReminders(): Integer[];
+      getStartTime(): Date;
+      getTag(key: string): string;
+      getTitle(): string;
+      getVisibility(): Visibility;
+      guestsCanInviteOthers(): boolean;
+      guestsCanModify(): boolean;
+      guestsCanSeeGuests(): boolean;
+      isAllDayEvent(): boolean;
+      isOwnedByMe(): boolean;
+      isRecurringEvent(): boolean;
+      removeAllReminders(): CalendarEvent;
+      removeGuest(email: string): CalendarEvent;
+      resetRemindersToDefault(): CalendarEvent;
+      setAllDayDate(date: Date): CalendarEvent;
+      setAnyoneCanAddSelf(anyoneCanAddSelf: boolean): CalendarEvent;
+      setDescription(description: string): CalendarEvent;
+      setGuestsCanInviteOthers(guestsCanInviteOthers: boolean): CalendarEvent;
+      setGuestsCanModify(guestsCanModify: boolean): CalendarEvent;
+      setGuestsCanSeeGuests(guestsCanSeeGuests: boolean): CalendarEvent;
+      setLocation(location: string): CalendarEvent;
+      setMyStatus(status: GuestStatus): CalendarEvent;
+      setTag(key: string, value: string): CalendarEvent;
+      setTime(startTime: Date, endTime: Date): CalendarEvent;
+      setTitle(title: string): CalendarEvent;
+      setVisibility(visibility: Visibility): CalendarEvent;
+    }
+
+    /**
+     * Represents a series of events (a recurring event).
+     */
+    export interface CalendarEventSeries {
+      addEmailReminder(minutesBefore: Integer): CalendarEventSeries;
+      addGuest(email: string): CalendarEventSeries;
+      addPopupReminder(minutesBefore: Integer): CalendarEventSeries;
+      addSmsReminder(minutesBefore: Integer): CalendarEventSeries;
+      anyoneCanAddSelf(): boolean;
+      deleteEventSeries(): void;
+      deleteTag(key: string): CalendarEventSeries;
+      getAllTagKeys(): String[];
+      getCreators(): String[];
+      getDateCreated(): Date;
+      getDescription(): string;
+      getEmailReminders(): Integer[];
+      getGuestByEmail(email: string): EventGuest;
+      getGuestList(): EventGuest[];
+      getGuestList(includeOwner: boolean): EventGuest[];
+      getId(): string;
+      getLastUpdated(): Date;
+      getLocation(): string;
+      getMyStatus(): GuestStatus;
+      getOriginalCalendarId(): string;
+      getPopupReminders(): Integer[];
+      getSmsReminders(): Integer[];
+      getTag(key: string): string;
+      getTitle(): string;
+      getVisibility(): Visibility;
+      guestsCanInviteOthers(): boolean;
+      guestsCanModify(): boolean;
+      guestsCanSeeGuests(): boolean;
+      isOwnedByMe(): boolean;
+      removeAllReminders(): CalendarEventSeries;
+      removeGuest(email: string): CalendarEventSeries;
+      resetRemindersToDefault(): CalendarEventSeries;
+      setAnyoneCanAddSelf(anyoneCanAddSelf: boolean): CalendarEventSeries;
+      setDescription(description: string): CalendarEventSeries;
+      setGuestsCanInviteOthers(guestsCanInviteOthers: boolean): CalendarEventSeries;
+      setGuestsCanModify(guestsCanModify: boolean): CalendarEventSeries;
+      setGuestsCanSeeGuests(guestsCanSeeGuests: boolean): CalendarEventSeries;
+      setLocation(location: string): CalendarEventSeries;
+      setMyStatus(status: GuestStatus): CalendarEventSeries;
+      setRecurrence(recurrence: EventRecurrence, startDate: Date): CalendarEventSeries;
+      setRecurrence(recurrence: EventRecurrence, startTime: Date, endTime: Date): CalendarEventSeries;
+      setTag(key: string, value: string): CalendarEventSeries;
+      setTitle(title: string): CalendarEventSeries;
+      setVisibility(visibility: Visibility): CalendarEventSeries;
+    }
+
+    /**
+     * An enum representing the named colors available in the Calendar service.
+     */
+    export enum Color { BLUE, BROWN, CHARCOAL, CHESTNUT, GRAY, GREEN, INDIGO, LIME, MUSTARD, OLIVE, ORANGE, PINK, PLUM, PURPLE, RED, RED_ORANGE, SEA_BLUE, SLATE, TEAL, TURQOISE, YELLOW }
+
+    /**
+     * Represents a guest of an event.
+     */
+    export interface EventGuest {
+      getAdditionalGuests(): Integer;
+      getEmail(): string;
+      getGuestStatus(): GuestStatus;
+      getName(): string;
+      getStatus(): string;
+    }
+
+    /**
+     * Represents the recurrence settings for an event series.
+     */
+    export interface EventRecurrence {
+      addDailyExclusion(): RecurrenceRule;
+      addDailyRule(): RecurrenceRule;
+      addDate(date: Date): EventRecurrence;
+      addDateExclusion(date: Date): EventRecurrence;
+      addMonthlyExclusion(): RecurrenceRule;
+      addMonthlyRule(): RecurrenceRule;
+      addWeeklyExclusion(): RecurrenceRule;
+      addWeeklyRule(): RecurrenceRule;
+      addYearlyExclusion(): RecurrenceRule;
+      addYearlyRule(): RecurrenceRule;
+      setTimeZone(timeZone: string): EventRecurrence;
+    }
+
+    /**
+     * An enum representing the statuses a guest can have for an event.
+     */
+    export enum GuestStatus { INVITED, MAYBE, NO, OWNER, YES }
+
+    /**
+     * Represents a recurrence rule for an event series.
+     * 
+     * Note that this class also behaves like the EventRecurrence that it belongs
+     *  to, allowing you to chain rule creation together like so:
+     * 
+     *      recurrence.addDailyRule().times(3).interval(2).addWeeklyExclusion().times(2);
+     * 
+     * times(times)
+     * interval(interval)
+     */
+    export interface RecurrenceRule {
+      addDailyExclusion(): RecurrenceRule;
+      addDailyRule(): RecurrenceRule;
+      addDate(date: Date): EventRecurrence;
+      addDateExclusion(date: Date): EventRecurrence;
+      addMonthlyExclusion(): RecurrenceRule;
+      addMonthlyRule(): RecurrenceRule;
+      addWeeklyExclusion(): RecurrenceRule;
+      addWeeklyRule(): RecurrenceRule;
+      addYearlyExclusion(): RecurrenceRule;
+      addYearlyRule(): RecurrenceRule;
+      interval(interval: Integer): RecurrenceRule;
+      onlyInMonth(month: Base.Month): RecurrenceRule;
+      onlyInMonths(months: Base.Month[]): RecurrenceRule;
+      onlyOnMonthDay(day: Integer): RecurrenceRule;
+      onlyOnMonthDays(days: Integer[]): RecurrenceRule;
+      onlyOnWeek(week: Integer): RecurrenceRule;
+      onlyOnWeekday(day: Base.Weekday): RecurrenceRule;
+      onlyOnWeekdays(days: Base.Weekday[]): RecurrenceRule;
+      onlyOnWeeks(weeks: Integer[]): RecurrenceRule;
+      onlyOnYearDay(day: Integer): RecurrenceRule;
+      onlyOnYearDays(days: Integer[]): RecurrenceRule;
+      setTimeZone(timeZone: string): EventRecurrence;
+      times(times: Integer): RecurrenceRule;
+      until(endDate: Date): RecurrenceRule;
+      weekStartsOn(day: Base.Weekday): RecurrenceRule;
+    }
+
+    /**
+     * An enum representing the visibility of an event.
+     */
+    export enum Visibility { CONFIDENTIAL, DEFAULT, PRIVATE, PUBLIC }
+
+  }
+}
+
+declare var CalendarApp: GoogleAppsScript.Calendar.CalendarApp;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.charts.d.ts b/google-apps-script/google-apps-script.charts.d.ts
new file mode 100644
index 000000000..a7c90e534
--- /dev/null
+++ b/google-apps-script/google-apps-script.charts.d.ts
@@ -0,0 +1,975 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+/// <reference path="google-apps-script.ui.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Charts {
+    /**
+     * Builder for area charts. For more details, see the 
+     *  Google Charts documentation.
+     * 
+     *  Here is an example that shows how to build an area chart.
+     * 
+     *      function doGet() {
+     *        // Create a data table with some sample data.
+     *        var sampleData = Charts.newDataTable()
+     *            .addColumn(Charts.ColumnType.STRING, "Month")
+     *            .addColumn(Charts.ColumnType.NUMBER, "Dining")
+     *            .addColumn(Charts.ColumnType.NUMBER, "Total")
+     *            .addRow(["Jan", 60, 520])
+     *            .addRow(["Feb", 50, 430])
+     *            .addRow(["Mar", 53, 440])
+     *            .addRow(["Apr", 70, 410])
+     *            .addRow(["May", 80, 390])
+     *            .addRow(["Jun", 60, 500])
+     *            .addRow(["Jul", 100, 450])
+     *            .addRow(["Aug", 140, 431])
+     *            .addRow(["Sep", 75, 488])
+     *            .addRow(["Oct", 70, 521])
+     *            .addRow(["Nov", 58, 388])
+     *            .addRow(["Dec", 63, 400])
+     *            .build();
+     *        
+     *        var chart = Charts.newAreaChart()
+     *            .setTitle('Yearly Spending')
+     *            .setXAxisTitle('Month')
+     *            .setYAxisTitle('Spending (USD)')
+     *            .setDimensions(600, 500)
+     *            .setStacked()
+     *            .setColors(['red', 'green'])
+     *            .setDataTable(sampleData)
+     *            .build();
+     *        
+     *        return UiApp.createApplication().add(chart);
+     *      }
+     */
+    export interface AreaChartBuilder {
+      build(): Chart;
+      reverseCategories(): AreaChartBuilder;
+      setBackgroundColor(cssValue: string): AreaChartBuilder;
+      setColors(cssValues: String[]): AreaChartBuilder;
+      setDataSourceUrl(url: string): AreaChartBuilder;
+      setDataTable(tableBuilder: DataTableBuilder): AreaChartBuilder;
+      setDataTable(table: DataTableSource): AreaChartBuilder;
+      setDataViewDefinition(dataViewDefinition: DataViewDefinition): AreaChartBuilder;
+      setDimensions(width: Integer, height: Integer): AreaChartBuilder;
+      setLegendPosition(position: Position): AreaChartBuilder;
+      setLegendTextStyle(textStyle: TextStyle): AreaChartBuilder;
+      setOption(option: string, value: Object): AreaChartBuilder;
+      setPointStyle(style: PointStyle): AreaChartBuilder;
+      setRange(start: Number, end: Number): AreaChartBuilder;
+      setStacked(): AreaChartBuilder;
+      setTitle(chartTitle: string): AreaChartBuilder;
+      setTitleTextStyle(textStyle: TextStyle): AreaChartBuilder;
+      setXAxisTextStyle(textStyle: TextStyle): AreaChartBuilder;
+      setXAxisTitle(title: string): AreaChartBuilder;
+      setXAxisTitleTextStyle(textStyle: TextStyle): AreaChartBuilder;
+      setYAxisTextStyle(textStyle: TextStyle): AreaChartBuilder;
+      setYAxisTitle(title: string): AreaChartBuilder;
+      setYAxisTitleTextStyle(textStyle: TextStyle): AreaChartBuilder;
+      useLogScale(): AreaChartBuilder;
+    }
+
+    /**
+     * Builder for bar charts. For more details, see the 
+     *  Google Charts documentation.
+     * 
+     *  Here is an example that shows how to build a bar chart. The data is 
+     *  
+     *  imported from a Google spreadsheet.
+     * 
+     *      function doGet() {
+     *       // Get sample data from a spreadsheet.
+     *       var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=B1%3AC11' +
+     *           '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=0&headers=-1';
+     *     
+     *       var chartBuilder = Charts.newBarChart()
+     *           .setTitle('Top Grossing Films in US and Canada')
+     *           .setXAxisTitle('USD')
+     *           .setYAxisTitle('Film')
+     *           .setDimensions(600, 500)
+     *           .setLegendPosition(Charts.Position.BOTTOM)
+     *           .setDataSourceUrl(dataSourceUrl);
+     *     
+     *       var chart = chartBuilder.build();
+     *       return UiApp.createApplication().add(chart);
+     *      }
+     */
+    export interface BarChartBuilder {
+      build(): Chart;
+      reverseCategories(): BarChartBuilder;
+      reverseDirection(): BarChartBuilder;
+      setBackgroundColor(cssValue: string): BarChartBuilder;
+      setColors(cssValues: String[]): BarChartBuilder;
+      setDataSourceUrl(url: string): BarChartBuilder;
+      setDataTable(tableBuilder: DataTableBuilder): BarChartBuilder;
+      setDataTable(table: DataTableSource): BarChartBuilder;
+      setDataViewDefinition(dataViewDefinition: DataViewDefinition): BarChartBuilder;
+      setDimensions(width: Integer, height: Integer): BarChartBuilder;
+      setLegendPosition(position: Position): BarChartBuilder;
+      setLegendTextStyle(textStyle: TextStyle): BarChartBuilder;
+      setOption(option: string, value: Object): BarChartBuilder;
+      setRange(start: Number, end: Number): BarChartBuilder;
+      setStacked(): BarChartBuilder;
+      setTitle(chartTitle: string): BarChartBuilder;
+      setTitleTextStyle(textStyle: TextStyle): BarChartBuilder;
+      setXAxisTextStyle(textStyle: TextStyle): BarChartBuilder;
+      setXAxisTitle(title: string): BarChartBuilder;
+      setXAxisTitleTextStyle(textStyle: TextStyle): BarChartBuilder;
+      setYAxisTextStyle(textStyle: TextStyle): BarChartBuilder;
+      setYAxisTitle(title: string): BarChartBuilder;
+      setYAxisTitleTextStyle(textStyle: TextStyle): BarChartBuilder;
+      useLogScale(): BarChartBuilder;
+    }
+
+    /**
+     * A builder for category filter controls.
+     * 
+     *  A category filter is a picker to choose one or more between a set of defined values.
+     *  Given a column of type string, this control will filter out the rows that
+     *  don't match any of the picked values.
+     * 
+     *  Here is an example that creates a table chart a binds a category filter to it. This allows the
+     *  user to filter the data the table displays.
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var sampleData = Charts.newDataTable()
+     *            .addColumn(Charts.ColumnType.STRING, "Month")
+     *            .addColumn(Charts.ColumnType.NUMBER, "Dining")
+     *            .addColumn(Charts.ColumnType.NUMBER, "Total")
+     *            .addRow(["Jan", 60, 520])
+     *            .addRow(["Feb", 50, 430])
+     *            .addRow(["Mar", 53, 440])
+     *            .addRow(["Apr", 70, 410])
+     *            .addRow(["May", 80, 390])
+     *            .addRow(["Jun", 60, 500])
+     *            .addRow(["Jul", 100, 450])
+     *            .addRow(["Aug", 140, 431])
+     *            .addRow(["Sep", 75, 488])
+     *            .addRow(["Oct", 70, 521])
+     *            .addRow(["Nov", 58, 388])
+     *            .addRow(["Dec", 63, 400])
+     *            .build();
+     *            
+     *        var chart = Charts.newTableChart()
+     *            .setDimensions(600, 500)
+     *            .build();
+     *            
+     *        var categoryFilter = Charts.newCategoryFilter()
+     *            .setFilterColumnLabel("Month")
+     *            .setAllowMultiple(true)
+     *            .setSortValues(true)
+     *            .setLabelStacking(Charts.Orientation.VERTICAL)
+     *            .setCaption('Choose categories...')
+     *            .build();
+     *        
+     *        var panel = app.createVerticalPanel().setSpacing(10);
+     *        panel.add(categoryFilter).add(chart);
+     *        
+     *        var dashboard = Charts.newDashboardPanel()
+     *            .setDataTable(sampleData)
+     *            .bind(categoryFilter, chart)
+     *            .build();
+     *            
+     *        dashboard.add(panel);
+     *        app.add(dashboard);
+     *        return app;
+     *      }
+     * 
+     *  documentation
+     */
+    export interface CategoryFilterBuilder {
+      build(): Control;
+      setAllowMultiple(allowMultiple: boolean): CategoryFilterBuilder;
+      setAllowNone(allowNone: boolean): CategoryFilterBuilder;
+      setAllowTyping(allowTyping: boolean): CategoryFilterBuilder;
+      setCaption(caption: string): CategoryFilterBuilder;
+      setDataTable(tableBuilder: DataTableBuilder): CategoryFilterBuilder;
+      setDataTable(table: DataTableSource): CategoryFilterBuilder;
+      setFilterColumnIndex(columnIndex: Integer): CategoryFilterBuilder;
+      setFilterColumnLabel(columnLabel: string): CategoryFilterBuilder;
+      setLabel(label: string): CategoryFilterBuilder;
+      setLabelSeparator(labelSeparator: string): CategoryFilterBuilder;
+      setLabelStacking(orientation: Orientation): CategoryFilterBuilder;
+      setSelectedValuesLayout(layout: PickerValuesLayout): CategoryFilterBuilder;
+      setSortValues(sortValues: boolean): CategoryFilterBuilder;
+      setValues(values: String[]): CategoryFilterBuilder;
+    }
+
+    /**
+     * A Chart object, which can be embedded into documents, UI elements, or used as a static image. For
+     *  charts embedded in spreadsheets, see
+     *  EmbeddedChart.
+     */
+    export interface Chart {
+      getAs(contentType: string): Base.Blob;
+      getBlob(): Base.Blob;
+      getId(): string;
+      getOptions(): ChartOptions;
+      getType(): string;
+      setId(id: string): Chart;
+    }
+
+    /**
+     * Exposes options currently configured for a Chart, such as height, color, etc.
+     * 
+     *  Please see the visualization
+     *  reference documentation for information on what options are available. Specific options for
+     *  each chart can be found by clicking on the specific chart in the chart gallery.
+     * 
+     *  These options are immutable.
+     */
+    export interface ChartOptions {
+      get(option: string): Object;
+    }
+
+    /**
+     * Chart types supported by the Charts service.
+     */
+    export enum ChartType { AREA, BAR, COLUMN, LINE, PIE, SCATTER, TABLE }
+
+    /**
+     * Entry point for creating Charts in scripts.
+     * 
+     *  This example creates a basic data table, populates an area chart with the data, and adds it into
+     *  a UiApp:
+     * 
+     *      function doGet() {
+     *        var data = Charts.newDataTable()
+     *            .addColumn(Charts.ColumnType.STRING, "Month")
+     *            .addColumn(Charts.ColumnType.NUMBER, "In Store")
+     *            .addColumn(Charts.ColumnType.NUMBER, "Online")
+     *            .addRow(["January", 10, 1])
+     *            .addRow(["February", 12, 1])
+     *            .addRow(["March", 20, 2])
+     *            .addRow(["April", 25, 3])
+     *            .addRow(["May", 30, 4])
+     *            .build();
+     *     
+     *        var chart = Charts.newAreaChart()
+     *            .setDataTable(data)
+     *            .setStacked()
+     *            .setRange(0, 40)
+     *            .setTitle("Sales per Month")
+     *            .build();
+     *     
+     *        var uiApp = UiApp.createApplication().setTitle("My Chart");
+     *        uiApp.add(chart);
+     *        return uiApp;
+     *      }
+     */
+    export interface Charts {
+      ChartType: ChartType
+      ColumnType: ColumnType
+      CurveStyle: CurveStyle
+      MatchType: MatchType
+      Orientation: Orientation
+      PickerValuesLayout: PickerValuesLayout
+      PointStyle: PointStyle
+      Position: Position
+      newAreaChart(): AreaChartBuilder;
+      newBarChart(): BarChartBuilder;
+      newCategoryFilter(): CategoryFilterBuilder;
+      newColumnChart(): ColumnChartBuilder;
+      newDashboardPanel(): DashboardPanelBuilder;
+      newDataTable(): DataTableBuilder;
+      newDataViewDefinition(): DataViewDefinitionBuilder;
+      newLineChart(): LineChartBuilder;
+      newNumberRangeFilter(): NumberRangeFilterBuilder;
+      newPieChart(): PieChartBuilder;
+      newScatterChart(): ScatterChartBuilder;
+      newStringFilter(): StringFilterBuilder;
+      newTableChart(): TableChartBuilder;
+      newTextStyle(): TextStyleBuilder;
+    }
+
+    /**
+     * Builder for column charts. For more details, see the 
+     *  Google Charts documentation.
+     * 
+     *  This example shows how to create a column chart with data from a data table.
+     * 
+     *       function doGet() {
+     *        var sampleData = Charts.newDataTable()
+     *            .addColumn(Charts.ColumnType.STRING, "Year")
+     *            .addColumn(Charts.ColumnType.NUMBER, "Sales")
+     *            .addColumn(Charts.ColumnType.NUMBER, "Expenses")
+     *            .addRow(["2004", 1000, 400])
+     *            .addRow(["2005", 1170, 460])
+     *            .addRow(["2006", 660, 1120])
+     *            .addRow(["2007", 1030, 540])
+     *            .addRow(["2008", 800, 600])
+     *            .addRow(["2009", 943, 678])
+     *            .addRow(["2010", 1020, 550])
+     *            .addRow(["2011", 910, 700])
+     *            .addRow(["2012", 1230, 840])
+     *            .build();
+     *        
+     *        var chart = Charts.newColumnChart()
+     *            .setTitle('Sales vs. Expenses')
+     *            .setXAxisTitle('Year')
+     *            .setYAxisTitle('Amount (USD)')
+     *            .setDimensions(600, 500)
+     *            .setDataTable(sampleData)
+     *            .build();
+     *        
+     *        return UiApp.createApplication().add(chart);
+     *      }
+     */
+    export interface ColumnChartBuilder {
+      build(): Chart;
+      reverseCategories(): ColumnChartBuilder;
+      setBackgroundColor(cssValue: string): ColumnChartBuilder;
+      setColors(cssValues: String[]): ColumnChartBuilder;
+      setDataSourceUrl(url: string): ColumnChartBuilder;
+      setDataTable(tableBuilder: DataTableBuilder): ColumnChartBuilder;
+      setDataTable(table: DataTableSource): ColumnChartBuilder;
+      setDataViewDefinition(dataViewDefinition: DataViewDefinition): ColumnChartBuilder;
+      setDimensions(width: Integer, height: Integer): ColumnChartBuilder;
+      setLegendPosition(position: Position): ColumnChartBuilder;
+      setLegendTextStyle(textStyle: TextStyle): ColumnChartBuilder;
+      setOption(option: string, value: Object): ColumnChartBuilder;
+      setRange(start: Number, end: Number): ColumnChartBuilder;
+      setStacked(): ColumnChartBuilder;
+      setTitle(chartTitle: string): ColumnChartBuilder;
+      setTitleTextStyle(textStyle: TextStyle): ColumnChartBuilder;
+      setXAxisTextStyle(textStyle: TextStyle): ColumnChartBuilder;
+      setXAxisTitle(title: string): ColumnChartBuilder;
+      setXAxisTitleTextStyle(textStyle: TextStyle): ColumnChartBuilder;
+      setYAxisTextStyle(textStyle: TextStyle): ColumnChartBuilder;
+      setYAxisTitle(title: string): ColumnChartBuilder;
+      setYAxisTitleTextStyle(textStyle: TextStyle): ColumnChartBuilder;
+      useLogScale(): ColumnChartBuilder;
+    }
+
+    /**
+     * An enumeration of the valid data types for columns in a DataTable.
+     */
+    export enum ColumnType { DATE, NUMBER, STRING }
+
+    /**
+     * A user interface control object, that drives the data displayed by a DashboardPanel.
+     * 
+     *  A control can be embedded in a UI application. Controls are user interface widgets (category
+     *  pickers, range sliders, autocompleters, etc.) users interact with in order to drive the data
+     *  managed by a dashboard and the charts that are part of it.
+     *  Controls collect user input and use the information to decide which of the data the
+     *  dashboard is managing should be made available to the charts that are part of it.
+     *  Given a data table, a control will filter out the data that doesn't comply with the
+     *  conditions implied by its current state, and will expose the filtered data table as
+     *  an output.
+     * 
+     *  For more details, see the Gviz
+     *  
+     *  documentation.
+     */
+    export interface Control {
+      getId(): string;
+      getType(): string;
+      setId(id: string): Control;
+    }
+
+    /**
+     * An enumeration of the styles for curves in a chart.
+     */
+    export enum CurveStyle { NORMAL, SMOOTH }
+
+    /**
+     * A dashboard is a visual structure that enables the organization and management
+     *  of multiple charts that share the same underlying data.
+     * 
+     *  Controls are user interface widgets (category pickers, range sliders, autocompleters, etc.)
+     *  users interact with in order to drive the data managed by a dashboard and the charts that
+     *  are part of it. For example, a string filter control is a simple text input field that lets
+     *  the user filter data via string matching. Given a column and matching options, the control
+     *  will filter out the rows that don't match the term that's in the input field.
+     * 
+     *  The Gviz API defines a dashboard as a set of charts and controls bound together. The
+     *  bindings between the different components define the data flow, the state of the
+     *  controls filters views of the data which propagate in the dashboard and are
+     *  eventually visualized with charts. For more details, see the Gviz
+     *  
+     *  documentation.
+     * 
+     *  The dashboard panel has two purposes, one is being a container for the charts and
+     *  controls objects that compose the dashboard, and the other is holding the data and use
+     *  as an interface for binding controls to charts.
+     * 
+     *  Here's an example of creating a dashboard and showing it in a UI app:
+     * 
+     *      function doGet() {
+     *        // Create a data table with some sample data.
+     *        var data = Charts.newDataTable()
+     *          .addColumn(Charts.ColumnType.STRING, "Name")
+     *          .addColumn(Charts.ColumnType.NUMBER, "Age")
+     *          .addRow(["Michael", 18])
+     *          .addRow(["Elisa", 12])
+     *          .addRow(["John", 20])
+     *          .addRow(["Jessica", 25])
+     *          .addRow(["Aaron", 14])
+     *          .addRow(["Margareth", 19])
+     *          .addRow(["Miranda", 22])
+     *          .addRow(["May", 20])
+     *          .build();
+     *     
+     *        var chart = Charts.newBarChart()
+     *          .setTitle("Ages")
+     *          .build();
+     *     
+     *        var control = Charts.newStringFilter()
+     *          .setFilterColumnLabel("Name")
+     *          .build();
+     *     
+     *        // Bind the control to the chart in a dashboard panel.
+     *        var dashboard = Charts.newDashboardPanel()
+     *          .setDataTable(data)
+     *          .bind(control, chart)
+     *          .build();
+     *     
+     *        var uiApp = UiApp.createApplication().setTitle("My Dashboard");
+     *     
+     *        var panel = uiApp.createHorizontalPanel()
+     *          .setVerticalAlignment(UiApp.VerticalAlignment.MIDDLE)
+     *          .setSpacing(50);
+     *     
+     *        panel.add(control);
+     *        panel.add(chart);
+     *        dashboard.add(panel);
+     *        uiApp.add(dashboard);
+     *        return uiApp;
+     *      }
+     */
+    export interface DashboardPanel {
+      add(widget: UI.Widget): DashboardPanel;
+      getId(): string;
+      getType(): string;
+      setId(id: string): DashboardPanel;
+    }
+
+    /**
+     * A builder for a dashboard panel object. For an example of how to use
+     *  DashboardPanelBuilder, refer to DashboardPanel.
+     * 
+     *  For more details, see the Gviz
+     *  
+     *  documentation.
+     */
+    export interface DashboardPanelBuilder {
+      bind(control: Control, chart: Chart, controls: Control[], charts: Chart[]): DashboardPanelBuilder;
+      bind(control: Control, chart: Chart, controls: Control[], charts: Chart[]): DashboardPanelBuilder;
+      build(): DashboardPanel;
+      setDataTable(tableBuilder: DataTableBuilder): DashboardPanelBuilder;
+      setDataTable(source: DataTableSource): DashboardPanelBuilder;
+    }
+
+    /**
+     * A Data Table to be used in charts. A DataTable can come from sources such as Google
+     *  Sheets or specified data-table URLs, or can be filled in by hand. This class intentionally has no
+     *  methods: a DataTable can be passed around, but not manipulated directly.
+     */
+    export interface DataTable {
+    }
+
+    /**
+     * Builder of DataTable objects.  Building a data table consists of first specifying its columns,
+     *  and then adding its rows, one at a time.  Example:
+     * 
+     *      var data = Charts.newDataTable()
+     *          .addColumn(Charts.ColumnType.STRING, "Month")
+     *          .addColumn(Charts.ColumnType.NUMBER, "In Store")
+     *          .addColumn(Charts.ColumnType.NUMBER, "Online")
+     *          .addRow(["January", 10, 1])
+     *          .addRow(["February", 12, 1])
+     *          .addRow(["March", 20, 2])
+     *          .addRow(["April", 25, 3])
+     *          .addRow(["May", 30, 4])
+     *          .build();
+     */
+    export interface DataTableBuilder {
+      addColumn(type: ColumnType, label: string): DataTableBuilder;
+      addRow(values: Object[]): DataTableBuilder;
+      build(): DataTable;
+      setValue(row: Integer, column: Integer, value: Object): DataTableBuilder;
+    }
+
+    /**
+     * Interface for objects that can represent their data as a DataTable.
+     * Implementing classes
+     * 
+     * NameBrief description
+     * 
+     * DataTableA Data Table to be used in charts.
+     * 
+     * RangeAccess and modify spreadsheet ranges.
+     */
+    export interface DataTableSource {
+      getDataTable(): DataTable;
+    }
+
+    /**
+     * A data view definition for visualizing chart data.
+     * 
+     *  Data view definition can be set for charts to visualize a view derived from the given data table
+     *  and not the data table itself. For example if the view definition of a chart states that the view
+     *  columns are [0, 3], only the first and the third columns of the data table will be taken into
+     *  consideration when drawing the chart. See DataViewDefinitionBuilder for an example on how
+     *  to define and use a DataViewDefinition.
+     */
+    export interface DataViewDefinition {
+    }
+
+    /**
+     * Builder for DataViewDefinition objects.
+     * 
+     *  Here's an example of using the builder. The data is imported from a Google spreadsheet.
+     * 
+     *      function doGet() {
+     *        // This example creates two table charts side by side. One uses a data view definition to
+     *        // restrict the number of displayed columns.
+     *        var app = UiApp.createApplication();
+     *        // Get sample data from a spreadsheet.
+     *        var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AF' +
+     *            '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=4&headers=-1';
+     *        
+     *        // Create a chart to display all of the data.
+     *        var originalChart = Charts.newTableChart()
+     *            .setDimensions(600, 500)
+     *            .setDataSourceUrl(dataSourceUrl)
+     *            .build();
+     *          
+     *        // Create another chart to display a subset of the data (only columns 1 and 4).
+     *        var dataViewDefinition = Charts.newDataViewDefinition().setColumns([0, 3]);
+     *        var limitedChart = Charts.newTableChart()
+     *            .setDimensions(200, 500)
+     *            .setDataSourceUrl(dataSourceUrl)
+     *            .setDataViewDefinition(dataViewDefinition)
+     *            .build();
+     *            
+     *        var panel = app.createHorizontalPanel().setSpacing(15);
+     *        panel.add(originalChart).add(limitedChart);
+     *        return app.add(panel);
+     *      }
+     */
+    export interface DataViewDefinitionBuilder {
+      build(): DataViewDefinition;
+      setColumns(columns: Object[]): DataViewDefinitionBuilder;
+    }
+
+    /**
+     * Builder for line charts. For more details, see the 
+     *  Google Charts documentation.
+     * 
+     *  Here is an example that shows how to build a line chart. The data is
+     *  imported from a Google spreadsheet.
+     * 
+     *      function doGet() {
+     *        // Get sample data from a spreadsheet.
+     *        var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AG5' +
+     *            '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=2&headers=-1';
+     *        
+     *        var chartBuilder = Charts.newLineChart()
+     *            .setTitle('Yearly Rainfall')
+     *            .setXAxisTitle('Month')
+     *            .setYAxisTitle('Rainfall (in)')
+     *            .setDimensions(600, 500)
+     *            .setCurveStyle(Charts.CurveStyle.SMOOTH)
+     *            .setPointStyle(Charts.PointStyle.MEDIUM)
+     *            .setDataSourceUrl(dataSourceUrl);
+     *        
+     *        var chart = chartBuilder.build();
+     *        return UiApp.createApplication().add(chart);
+     *      }
+     */
+    export interface LineChartBuilder {
+      build(): Chart;
+      reverseCategories(): LineChartBuilder;
+      setBackgroundColor(cssValue: string): LineChartBuilder;
+      setColors(cssValues: String[]): LineChartBuilder;
+      setCurveStyle(style: CurveStyle): LineChartBuilder;
+      setDataSourceUrl(url: string): LineChartBuilder;
+      setDataTable(tableBuilder: DataTableBuilder): LineChartBuilder;
+      setDataTable(table: DataTableSource): LineChartBuilder;
+      setDataViewDefinition(dataViewDefinition: DataViewDefinition): LineChartBuilder;
+      setDimensions(width: Integer, height: Integer): LineChartBuilder;
+      setLegendPosition(position: Position): LineChartBuilder;
+      setLegendTextStyle(textStyle: TextStyle): LineChartBuilder;
+      setOption(option: string, value: Object): LineChartBuilder;
+      setPointStyle(style: PointStyle): LineChartBuilder;
+      setRange(start: Number, end: Number): LineChartBuilder;
+      setTitle(chartTitle: string): LineChartBuilder;
+      setTitleTextStyle(textStyle: TextStyle): LineChartBuilder;
+      setXAxisTextStyle(textStyle: TextStyle): LineChartBuilder;
+      setXAxisTitle(title: string): LineChartBuilder;
+      setXAxisTitleTextStyle(textStyle: TextStyle): LineChartBuilder;
+      setYAxisTextStyle(textStyle: TextStyle): LineChartBuilder;
+      setYAxisTitle(title: string): LineChartBuilder;
+      setYAxisTitleTextStyle(textStyle: TextStyle): LineChartBuilder;
+      useLogScale(): LineChartBuilder;
+    }
+
+    /**
+     * An enumeration of how a string value should be matched.
+     *  Matching a string is a boolean operation. Given a string, a match term (string), and a match
+     *  type, the operation will output true in the following cases:
+     * 
+     * If the match type equals EXACT and the match term equals the string.
+     * If the match type equals PREFIX and the match term is a prefix of the string.
+     * If the match type equals ANY and the match term is a substring of the string.
+     * 
+     * This enumeration can be used in by a string filter control to decide which rows to filter out
+     *  of the data table. Given a column to filter on, leave only the rows that match the value
+     *  entered in the filter input box, using one of the above matching types.
+     */
+    export enum MatchType { EXACT, PREFIX, ANY }
+
+    /**
+     * A builder for number range filter controls.
+     * 
+     *  A number range filter is a slider with two thumbs that lets the user select ranges of
+     *  numeric values. Given a column of type number and matching options, this control will
+     *  filter out the rows that don't match the range that was selected.
+     * 
+     *  This example creates a table chart bound to a number range filter:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        // Get sample data from a spreadsheet.
+     *        var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AF' +
+     *            '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=4&headers=-1';
+     *        var data = SpreadsheetApp.openByUrl(dataSourceUrl).getSheetByName('US_GDP').getRange("A1:F");
+     *            
+     *        var chart = Charts.newTableChart()
+     *            .setDimensions(600, 500)
+     *            .build();
+     *            
+     *        var numberRangeFilter = Charts.newNumberRangeFilter()
+     *            .setFilterColumnLabel("Year")
+     *            .setShowRangeValues(true)
+     *            .setLabel("Restrict year range")
+     *            .build();
+     *        
+     *        var panel = app.createVerticalPanel().setSpacing(10);
+     *        panel.add(numberRangeFilter).add(chart);
+     *        
+     *        // Create a new dashboard panel to bind the filter and chart together.
+     *        var dashboard = Charts.newDashboardPanel()
+     *            .setDataTable(data)
+     *            .bind(numberRangeFilter, chart)
+     *            .build();
+     *            
+     *        dashboard.add(panel);
+     *        app.add(dashboard);
+     *        return app;
+     *      }
+     * 
+     *  documentation
+     */
+    export interface NumberRangeFilterBuilder {
+      build(): Control;
+      setDataTable(tableBuilder: DataTableBuilder): NumberRangeFilterBuilder;
+      setDataTable(table: DataTableSource): NumberRangeFilterBuilder;
+      setFilterColumnIndex(columnIndex: Integer): NumberRangeFilterBuilder;
+      setFilterColumnLabel(columnLabel: string): NumberRangeFilterBuilder;
+      setLabel(label: string): NumberRangeFilterBuilder;
+      setLabelSeparator(labelSeparator: string): NumberRangeFilterBuilder;
+      setLabelStacking(orientation: Orientation): NumberRangeFilterBuilder;
+      setMaxValue(maxValue: Integer): NumberRangeFilterBuilder;
+      setMinValue(minValue: Integer): NumberRangeFilterBuilder;
+      setOrientation(orientation: Orientation): NumberRangeFilterBuilder;
+      setShowRangeValues(showRangeValues: boolean): NumberRangeFilterBuilder;
+      setTicks(ticks: Integer): NumberRangeFilterBuilder;
+    }
+
+    /**
+     * An enumeration of the orientation of an object.
+     */
+    export enum Orientation { HORIZONTAL, VERTICAL }
+
+    /**
+     * An enumeration of how to display selected values in picker widget.
+     */
+    export enum PickerValuesLayout { ASIDE, BELOW, BELOW_WRAPPING, BELOW_STACKED }
+
+    /**
+     * A builder for pie charts. For more details, see the 
+     *  Google Charts documentation.
+     * 
+     *  Here is an example that shows how to build a pie chart. The data is 
+     *  imported from a Google spreadsheet.
+     * 
+     *      function doGet() {
+     *        // Get sample data from a spreadsheet.
+     *        var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AB8' +
+     *            '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=3&headers=-1';
+     *        
+     *        var chartBuilder = Charts.newPieChart()
+     *            .setTitle('World Population by Continent')
+     *            .setDimensions(600, 500)
+     *            .set3D()
+     *            .setDataSourceUrl(dataSourceUrl);
+     *        
+     *        var chart = chartBuilder.build();
+     *        return UiApp.createApplication().add(chart);
+     *      }
+     */
+    export interface PieChartBuilder {
+      build(): Chart;
+      reverseCategories(): PieChartBuilder;
+      set3D(): PieChartBuilder;
+      setBackgroundColor(cssValue: string): PieChartBuilder;
+      setColors(cssValues: String[]): PieChartBuilder;
+      setDataSourceUrl(url: string): PieChartBuilder;
+      setDataTable(tableBuilder: DataTableBuilder): PieChartBuilder;
+      setDataTable(table: DataTableSource): PieChartBuilder;
+      setDataViewDefinition(dataViewDefinition: DataViewDefinition): PieChartBuilder;
+      setDimensions(width: Integer, height: Integer): PieChartBuilder;
+      setLegendPosition(position: Position): PieChartBuilder;
+      setLegendTextStyle(textStyle: TextStyle): PieChartBuilder;
+      setOption(option: string, value: Object): PieChartBuilder;
+      setTitle(chartTitle: string): PieChartBuilder;
+      setTitleTextStyle(textStyle: TextStyle): PieChartBuilder;
+    }
+
+    /**
+     * An enumeration of the styles of points in a line.
+     */
+    export enum PointStyle { NONE, TINY, MEDIUM, LARGE, HUGE }
+
+    /**
+     * An enumeration of legend positions within a chart.
+     */
+    export enum Position { TOP, RIGHT, BOTTOM, NONE }
+
+    /**
+     * Builder for scatter charts. For more details, see the 
+     *  Google Charts documentation.
+     * 
+     *  Here is an example that shows how to build a scatter chart. The data is
+     *  imported from a Google spreadsheet.
+     * 
+     *      function doGet() {
+     *        // Get sample data from a spreadsheet.
+     *        var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=C1%3AD' +
+     *            '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=4&headers=-1';
+     *        
+     *        var chartBuilder = Charts.newScatterChart()
+     *            .setTitle('Adjusted GDP vs. U.S. Population')
+     *            .setXAxisTitle('U.S. Population (millions)')
+     *            .setYAxisTitle('Adjusted GDP ($ billions)')
+     *            .setDimensions(600, 500)
+     *            .setLegendPosition(Charts.Position.NONE)
+     *            .setDataSourceUrl(dataSourceUrl);
+     *        
+     *        var chart = chartBuilder.build();
+     *        return UiApp.createApplication().add(chart);
+     *      }
+     */
+    export interface ScatterChartBuilder {
+      build(): Chart;
+      setBackgroundColor(cssValue: string): ScatterChartBuilder;
+      setColors(cssValues: String[]): ScatterChartBuilder;
+      setDataSourceUrl(url: string): ScatterChartBuilder;
+      setDataTable(tableBuilder: DataTableBuilder): ScatterChartBuilder;
+      setDataTable(table: DataTableSource): ScatterChartBuilder;
+      setDataViewDefinition(dataViewDefinition: DataViewDefinition): ScatterChartBuilder;
+      setDimensions(width: Integer, height: Integer): ScatterChartBuilder;
+      setLegendPosition(position: Position): ScatterChartBuilder;
+      setLegendTextStyle(textStyle: TextStyle): ScatterChartBuilder;
+      setOption(option: string, value: Object): ScatterChartBuilder;
+      setPointStyle(style: PointStyle): ScatterChartBuilder;
+      setTitle(chartTitle: string): ScatterChartBuilder;
+      setTitleTextStyle(textStyle: TextStyle): ScatterChartBuilder;
+      setXAxisLogScale(): ScatterChartBuilder;
+      setXAxisRange(start: Number, end: Number): ScatterChartBuilder;
+      setXAxisTextStyle(textStyle: TextStyle): ScatterChartBuilder;
+      setXAxisTitle(title: string): ScatterChartBuilder;
+      setXAxisTitleTextStyle(textStyle: TextStyle): ScatterChartBuilder;
+      setYAxisLogScale(): ScatterChartBuilder;
+      setYAxisRange(start: Number, end: Number): ScatterChartBuilder;
+      setYAxisTextStyle(textStyle: TextStyle): ScatterChartBuilder;
+      setYAxisTitle(title: string): ScatterChartBuilder;
+      setYAxisTitleTextStyle(textStyle: TextStyle): ScatterChartBuilder;
+    }
+
+    /**
+     * A builder for string filter controls.
+     * 
+     *  A string filter is a simple text input field that lets the user filter data via string matching.
+     *  Given a column of type string and matching options, this control will filter out the rows that
+     *  don't match the term that's in the input field.
+     * 
+     *  This example creates a table chart and binds it to a string filter. Using the filter, it is
+     *  possible to change the table chart to display a subset of its data.
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var sampleData = Charts.newDataTable()
+     *            .addColumn(Charts.ColumnType.STRING, "Month")
+     *            .addColumn(Charts.ColumnType.NUMBER, "Dining")
+     *            .addColumn(Charts.ColumnType.NUMBER, "Total")
+     *            .addRow(["Jan", 60, 520])
+     *            .addRow(["Feb", 50, 430])
+     *            .addRow(["Mar", 53, 440])
+     *            .addRow(["Apr", 70, 410])
+     *            .addRow(["May", 80, 390])
+     *            .addRow(["Jun", 60, 500])
+     *            .addRow(["Jul", 100, 450])
+     *            .addRow(["Aug", 140, 431])
+     *            .addRow(["Sep", 75, 488])
+     *            .addRow(["Oct", 70, 521])
+     *            .addRow(["Nov", 58, 388])
+     *            .addRow(["Dec", 63, 400])
+     *            .build();
+     *            
+     *        var chart = Charts.newTableChart()
+     *            .setDimensions(600, 500)
+     *            .build();
+     *            
+     *        var stringFilter = Charts.newStringFilter()
+     *            .setFilterColumnLabel("Month")
+     *            .setRealtimeTrigger(true)
+     *            .setCaseSensitive(true)
+     *            .setLabel("Filter months shown")
+     *            .build();
+     *        
+     *        var panel = app.createVerticalPanel().setSpacing(10);
+     *        panel.add(stringFilter).add(chart);
+     *        
+     *        // Create a dashboard panel to bind the filter and the chart together.
+     *        var dashboard = Charts.newDashboardPanel()
+     *            .setDataTable(sampleData)
+     *            .bind(stringFilter, chart)
+     *            .build();
+     *            
+     *        dashboard.add(panel);
+     *        app.add(dashboard);
+     *        return app;
+     *      }
+     * 
+     *  documentation
+     */
+    export interface StringFilterBuilder {
+      build(): Control;
+      setCaseSensitive(caseSensitive: boolean): StringFilterBuilder;
+      setDataTable(tableBuilder: DataTableBuilder): StringFilterBuilder;
+      setDataTable(table: DataTableSource): StringFilterBuilder;
+      setFilterColumnIndex(columnIndex: Integer): StringFilterBuilder;
+      setFilterColumnLabel(columnLabel: string): StringFilterBuilder;
+      setLabel(label: string): StringFilterBuilder;
+      setLabelSeparator(labelSeparator: string): StringFilterBuilder;
+      setLabelStacking(orientation: Orientation): StringFilterBuilder;
+      setMatchType(matchType: MatchType): StringFilterBuilder;
+      setRealtimeTrigger(realtimeTrigger: boolean): StringFilterBuilder;
+    }
+
+    /**
+     * A builder for table charts. For more details, see the 
+     *  Google Charts documentation.
+     * 
+     *  Here is an example that shows how to build a table chart. The data is
+     *  imported from a Google spreadsheet.
+     * 
+     *      function doGet() {
+     *        // Get sample data from a spreadsheet.
+     *        var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AF' +
+     *            '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=4&headers=-1';
+     *        
+     *        var chartBuilder = Charts.newTableChart()
+     *            .setDimensions(600, 500)
+     *            .enablePaging(20)
+     *            .setDataSourceUrl(dataSourceUrl);
+     *        
+     *        var chart = chartBuilder.build();
+     *        return UiApp.createApplication().add(chart);
+     *      }
+     */
+    export interface TableChartBuilder {
+      build(): Chart;
+      enablePaging(enablePaging: boolean): TableChartBuilder;
+      enablePaging(pageSize: Integer): TableChartBuilder;
+      enablePaging(pageSize: Integer, startPage: Integer): TableChartBuilder;
+      enableRtlTable(rtlEnabled: boolean): TableChartBuilder;
+      enableSorting(enableSorting: boolean): TableChartBuilder;
+      setDataSourceUrl(url: string): TableChartBuilder;
+      setDataTable(tableBuilder: DataTableBuilder): TableChartBuilder;
+      setDataTable(table: DataTableSource): TableChartBuilder;
+      setDataViewDefinition(dataViewDefinition: DataViewDefinition): TableChartBuilder;
+      setDimensions(width: Integer, height: Integer): TableChartBuilder;
+      setFirstRowNumber(number: Integer): TableChartBuilder;
+      setInitialSortingAscending(column: Integer): TableChartBuilder;
+      setInitialSortingDescending(column: Integer): TableChartBuilder;
+      setOption(option: string, value: Object): TableChartBuilder;
+      showRowNumberColumn(showRowNumber: boolean): TableChartBuilder;
+      useAlternatingRowStyle(alternate: boolean): TableChartBuilder;
+    }
+
+    /**
+     * A text style configuration object. Used in charts options to configure text style for
+     *  elements that accepts it, such as title, horizontal axis, vertical axis, legend and tooltip.
+     * 
+     *      // This example creates a chart specifying different text styles for the title and axes.
+     *      function doGet() {
+     *        var sampleData = Charts.newDataTable()
+     *            .addColumn(Charts.ColumnType.STRING, "Seasons")
+     *            .addColumn(Charts.ColumnType.NUMBER, "Rainy Days")
+     *            .addRow(["Winter", 5])
+     *            .addRow(["Spring", 12])
+     *            .addRow(["Summer", 8])
+     *            .addRow(["Fall", 8])
+     *            .build();
+     *     
+     *        var titleTextStyleBuilder = Charts.newTextStyle()
+     *            .setColor('#0000FF').setFontSize(26).setFontName('Ariel');
+     *        var axisTextStyleBuilder = Charts.newTextStyle()
+     *            .setColor('#3A3A3A').setFontSize(20).setFontName('Ariel');
+     *        var titleTextStyle = titleTextStyleBuilder.build();
+     *        var axisTextStyle = axisTextStyleBuilder.build();
+     *     
+     *        var chart = Charts.newLineChart()
+     *            .setTitleTextStyle(titleTextStyle)
+     *            .setXAxisTitleTextStyle(axisTextStyle)
+     *            .setYAxisTitleTextStyle(axisTextStyle)
+     *            .setTitle('Rainy Days Per Season')
+     *            .setXAxisTitle('Season')
+     *            .setYAxisTitle('Number of Rainy Days')
+     *            .setDataTable(sampleData)
+     *            .build();
+     *     
+     *        return UiApp.createApplication().add(chart);
+     *      }
+     */
+    export interface TextStyle {
+      getColor(): string;
+      getFontName(): string;
+      getFontSize(): Number;
+    }
+
+    /**
+     * A builder used to create TextStyle objects. It allows configuration of the text's
+     *  properties such as name, color, and size.
+     * 
+     *  The following example shows how to create a text style using the builder. For a more complete
+     *  example, refer to the documentation for TextStyle.
+     * 
+     *      // Creates a new text style that uses 26-point, blue, Ariel font.
+     *      var textStyleBuilder = Charts.newTextStyle()
+     *          .setColor('#0000FF').setFontName('Ariel').setFontSize(26);
+     *      var style = textStyleBuilder.build();
+     */
+    export interface TextStyleBuilder {
+      build(): TextStyle;
+      setColor(cssValue: string): TextStyleBuilder;
+      setFontName(fontName: string): TextStyleBuilder;
+      setFontSize(fontSize: Number): TextStyleBuilder;
+    }
+
+  }
+}
+
+declare var Charts: GoogleAppsScript.Charts.Charts;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.contacts.d.ts b/google-apps-script/google-apps-script.contacts.d.ts
new file mode 100644
index 000000000..2c7b4704d
--- /dev/null
+++ b/google-apps-script/google-apps-script.contacts.d.ts
@@ -0,0 +1,299 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Contacts {
+    /**
+     * Address field in a contact.
+     */
+    export interface AddressField {
+      deleteAddressField(): void;
+      getAddress(): string;
+      getLabel(): Object;
+      isPrimary(): boolean;
+      setAddress(address: string): AddressField;
+      setAsPrimary(): AddressField;
+      setLabel(field: Field): AddressField;
+      setLabel(label: string): AddressField;
+    }
+
+    /**
+     * Company field in a Contact.
+     */
+    export interface CompanyField {
+      deleteCompanyField(): void;
+      getCompanyName(): string;
+      getJobTitle(): string;
+      isPrimary(): boolean;
+      setAsPrimary(): CompanyField;
+      setCompanyName(company: string): CompanyField;
+      setJobTitle(title: string): CompanyField;
+    }
+
+    /**
+     * A Contact contains the name, address, and various contact details of a contact.
+     */
+    export interface Contact {
+      addAddress(label: Object, address: string): AddressField;
+      addCompany(company: string, title: string): CompanyField;
+      addCustomField(label: Object, content: Object): CustomField;
+      addDate(label: Object, month: Base.Month, day: Integer, year: Integer): DateField;
+      addEmail(label: Object, address: string): EmailField;
+      addIM(label: Object, address: string): IMField;
+      addPhone(label: Object, number: string): PhoneField;
+      addToGroup(group: ContactGroup): Contact;
+      addUrl(label: Object, url: string): UrlField;
+      deleteContact(): void;
+      getAddresses(): AddressField[];
+      getAddresses(label: Object): AddressField[];
+      getCompanies(): CompanyField[];
+      getContactGroups(): ContactGroup[];
+      getCustomFields(): CustomField[];
+      getCustomFields(label: Object): CustomField[];
+      getDates(): DateField[];
+      getDates(label: Object): DateField[];
+      getEmails(): EmailField[];
+      getEmails(label: Object): EmailField[];
+      getFamilyName(): string;
+      getFullName(): string;
+      getGivenName(): string;
+      getIMs(): IMField[];
+      getIMs(label: Object): IMField[];
+      getId(): string;
+      getInitials(): string;
+      getLastUpdated(): Date;
+      getMaidenName(): string;
+      getMiddleName(): string;
+      getNickname(): string;
+      getNotes(): string;
+      getPhones(): PhoneField[];
+      getPhones(label: Object): PhoneField[];
+      getPrefix(): string;
+      getPrimaryEmail(): string;
+      getShortName(): string;
+      getSuffix(): string;
+      getUrls(): UrlField[];
+      getUrls(label: Object): UrlField[];
+      removeFromGroup(group: ContactGroup): Contact;
+      setFamilyName(familyName: string): Contact;
+      setFullName(fullName: string): Contact;
+      setGivenName(givenName: string): Contact;
+      setInitials(initials: string): Contact;
+      setMaidenName(maidenName: string): Contact;
+      setMiddleName(middleName: string): Contact;
+      setNickname(nickname: string): Contact;
+      setNotes(notes: string): Contact;
+      setPrefix(prefix: string): Contact;
+      setShortName(shortName: string): Contact;
+      setSuffix(suffix: string): Contact;
+      getEmailAddresses(): String[];
+      getHomeAddress(): string;
+      getHomeFax(): string;
+      getHomePhone(): string;
+      getMobilePhone(): string;
+      getPager(): string;
+      getUserDefinedField(key: string): string;
+      getUserDefinedFields(): Object;
+      getWorkAddress(): string;
+      getWorkFax(): string;
+      getWorkPhone(): string;
+      setHomeAddress(addr: string): void;
+      setHomeFax(phone: string): void;
+      setHomePhone(phone: string): void;
+      setMobilePhone(phone: string): void;
+      setPager(phone: string): void;
+      setPrimaryEmail(primaryEmail: string): void;
+      setUserDefinedField(key: string, value: string): void;
+      setUserDefinedFields(o: Object): void;
+      setWorkAddress(addr: string): void;
+      setWorkFax(phone: string): void;
+      setWorkPhone(phone: string): void;
+    }
+
+    /**
+     * A ContactGroup is is a group of contacts.
+     */
+    export interface ContactGroup {
+      addContact(contact: Contact): ContactGroup;
+      deleteGroup(): void;
+      getContacts(): Contact[];
+      getId(): string;
+      getName(): string;
+      isSystemGroup(): boolean;
+      removeContact(contact: Contact): ContactGroup;
+      setName(name: string): ContactGroup;
+      getGroupName(): string;
+      setGroupName(name: string): void;
+    }
+
+    /**
+     * This class allows users to access their own Google Contacts and create, remove, and update
+     *  contacts listed therein.
+     */
+    export interface ContactsApp {
+      ExtendedField: ExtendedField
+      Field: Field
+      Gender: Gender
+      Month: Base.Month
+      Priority: Priority
+      Sensitivity: Sensitivity
+      createContact(givenName: string, familyName: string, email: string): Contact;
+      createContactGroup(name: string): ContactGroup;
+      deleteContact(contact: Contact): void;
+      deleteContactGroup(group: ContactGroup): void;
+      getContact(emailAddress: string): Contact;
+      getContactById(id: string): Contact;
+      getContactGroup(name: string): ContactGroup;
+      getContactGroupById(id: string): ContactGroup;
+      getContactGroups(): ContactGroup[];
+      getContacts(): Contact[];
+      getContactsByAddress(query: string): Contact[];
+      getContactsByAddress(query: string, label: Field): Contact[];
+      getContactsByAddress(query: string, label: string): Contact[];
+      getContactsByCompany(query: string): Contact[];
+      getContactsByCustomField(query: Object, label: ExtendedField): Contact[];
+      getContactsByDate(month: Base.Month, day: Integer, label: Field): Contact[];
+      getContactsByDate(month: Base.Month, day: Integer, year: Integer, label: Field): Contact[];
+      getContactsByDate(month: Base.Month, day: Integer, year: Integer, label: string): Contact[];
+      getContactsByDate(month: Base.Month, day: Integer, label: string): Contact[];
+      getContactsByEmailAddress(query: string): Contact[];
+      getContactsByEmailAddress(query: string, label: Field): Contact[];
+      getContactsByEmailAddress(query: string, label: string): Contact[];
+      getContactsByGroup(group: ContactGroup): Contact[];
+      getContactsByIM(query: string): Contact[];
+      getContactsByIM(query: string, label: Field): Contact[];
+      getContactsByIM(query: string, label: string): Contact[];
+      getContactsByJobTitle(query: string): Contact[];
+      getContactsByName(query: string): Contact[];
+      getContactsByName(query: string, label: Field): Contact[];
+      getContactsByNotes(query: string): Contact[];
+      getContactsByPhone(query: string): Contact[];
+      getContactsByPhone(query: string, label: Field): Contact[];
+      getContactsByPhone(query: string, label: string): Contact[];
+      getContactsByUrl(query: string): Contact[];
+      getContactsByUrl(query: string, label: Field): Contact[];
+      getContactsByUrl(query: string, label: string): Contact[];
+      findByEmailAddress(email: string): Contact;
+      findContactGroup(name: string): ContactGroup;
+      getAllContacts(): Contact[];
+    }
+
+    /**
+     * A custom field in a Contact.
+     */
+    export interface CustomField {
+      deleteCustomField(): void;
+      getLabel(): Object;
+      getValue(): Object;
+      setLabel(field: ExtendedField): CustomField;
+      setLabel(label: string): CustomField;
+      setValue(value: Object): CustomField;
+    }
+
+    /**
+     * A date field in a Contact.
+     */
+    export interface DateField {
+      deleteDateField(): void;
+      getDay(): Integer;
+      getLabel(): Object;
+      getMonth(): Base.Month;
+      getYear(): Integer;
+      setDate(month: Base.Month, day: Integer): DateField;
+      setDate(month: Base.Month, day: Integer, year: Integer): DateField;
+      setLabel(label: Field): DateField;
+      setLabel(label: string): DateField;
+    }
+
+    /**
+     * An email field in a Contact.
+     */
+    export interface EmailField {
+      deleteEmailField(): void;
+      getAddress(): string;
+      getDisplayName(): string;
+      getLabel(): Object;
+      isPrimary(): boolean;
+      setAddress(address: string): EmailField;
+      setAsPrimary(): EmailField;
+      setDisplayName(name: string): EmailField;
+      setLabel(field: Field): EmailField;
+      setLabel(label: string): EmailField;
+    }
+
+    /**
+     * An enum for extended contacts fields.
+     */
+    export enum ExtendedField { HOBBY, MILEAGE, LANGUAGE, GENDER, BILLING_INFORMATION, DIRECTORY_SERVER, SENSITIVITY, PRIORITY, HOME, WORK, USER, OTHER }
+
+    /**
+     * An enum for contacts fields.
+     */
+    export enum Field { FULL_NAME, GIVEN_NAME, MIDDLE_NAME, FAMILY_NAME, MAIDEN_NAME, NICKNAME, SHORT_NAME, INITIALS, PREFIX, SUFFIX, HOME_EMAIL, WORK_EMAIL, BIRTHDAY, ANNIVERSARY, HOME_ADDRESS, WORK_ADDRESS, ASSISTANT_PHONE, CALLBACK_PHONE, MAIN_PHONE, PAGER, HOME_FAX, WORK_FAX, HOME_PHONE, WORK_PHONE, MOBILE_PHONE, GOOGLE_VOICE, NOTES, GOOGLE_TALK, AIM, YAHOO, SKYPE, QQ, MSN, ICQ, JABBER, BLOG, FTP, PROFILE, HOME_PAGE, WORK_WEBSITE, HOME_WEBSITE, JOB_TITLE, COMPANY }
+
+    /**
+     * An enum for contact gender.
+     */
+    export enum Gender { MALE, FEMALE }
+
+    /**
+     * An instant messaging field in a Contact.
+     */
+    export interface IMField {
+      deleteIMField(): void;
+      getAddress(): string;
+      getLabel(): Object;
+      isPrimary(): boolean;
+      setAddress(address: string): IMField;
+      setAsPrimary(): IMField;
+      setLabel(field: Field): IMField;
+      setLabel(label: string): IMField;
+    }
+
+    /**
+     * A phone number field in a Contact.
+     */
+    export interface PhoneField {
+      deletePhoneField(): void;
+      getLabel(): Object;
+      getPhoneNumber(): string;
+      isPrimary(): boolean;
+      setAsPrimary(): PhoneField;
+      setLabel(field: Field): PhoneField;
+      setLabel(label: string): PhoneField;
+      setPhoneNumber(number: string): PhoneField;
+    }
+
+    /**
+     * An enum for contact priority.
+     */
+    export enum Priority { HIGH, LOW, NORMAL }
+
+    /**
+     * An enum for contact sensitivity.
+     */
+    export enum Sensitivity { CONFIDENTIAL, NORMAL, PERSONAL, PRIVATE }
+
+    /**
+     * A URL field in a Contact.
+     */
+    export interface UrlField {
+      deleteUrlField(): void;
+      getAddress(): string;
+      getLabel(): Object;
+      isPrimary(): boolean;
+      setAddress(address: string): UrlField;
+      setAsPrimary(): UrlField;
+      setLabel(field: Field): UrlField;
+      setLabel(label: string): UrlField;
+    }
+
+  }
+}
+
+declare var ContactsApp: GoogleAppsScript.Contacts.ContactsApp;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.content.d.ts b/google-apps-script/google-apps-script.content.d.ts
new file mode 100644
index 000000000..60055aad1
--- /dev/null
+++ b/google-apps-script/google-apps-script.content.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Content {
+    /**
+     * Service for returning text content from a script.
+     * 
+     *  You can serve up text in various forms. For example, publish this script as a web app.
+     * 
+     *      function doGet() {
+     *        return ContentService.createTextOutput("Hello World");
+     *      }
+     */
+    export interface ContentService {
+      MimeType: MimeType
+      createTextOutput(): TextOutput;
+      createTextOutput(content: string): TextOutput;
+    }
+
+    /**
+     * An enum for mime types that can be served from a script.
+     */
+    export enum MimeType { ATOM, CSV, ICAL, JAVASCRIPT, JSON, RSS, TEXT, VCARD, XML }
+
+    /**
+     * A TextOutput object that can be served from a script.
+     *  
+     *  Due to security considerations, scripts cannot directly return text content to a browser.
+     *  Instead, the browser is redirected to googleusercontent.com, which will display it without any
+     *  further sanitization or manipulation.
+     *  
+     *  You can return text content like this:
+     * 
+     *      function doGet() {
+     *        return ContentService.createPlainTextOutput("hello world!");
+     *      }
+     * 
+     * ContentService
+     */
+    export interface TextOutput {
+      append(addedContent: string): TextOutput;
+      clear(): TextOutput;
+      downloadAsFile(filename: string): TextOutput;
+      getContent(): string;
+      getFileName(): string;
+      getMimeType(): MimeType;
+      setContent(content: string): TextOutput;
+      setMimeType(mimeType: MimeType): TextOutput;
+    }
+
+  }
+}
+
+declare var ContentService: GoogleAppsScript.Content.ContentService;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.document.d.ts b/google-apps-script/google-apps-script.document.d.ts
new file mode 100644
index 000000000..fde2a73ec
--- /dev/null
+++ b/google-apps-script/google-apps-script.document.d.ts
@@ -0,0 +1,1482 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Document {
+    /**
+     * An enumeration of the element attributes.
+     * 
+     * Use attributes to compose custom styles. For example:
+     * 
+     *      // Define a style with yellow background.
+     *      var highlightStyle = {};
+     *      highlightStyle[DocumentApp.Attribute.BACKGROUND_COLOR] = '#FFFF00';
+     *      highlightStyle[DocumentApp.Attribute.BOLD] = true;
+     *     
+     *      // Insert "Hello", highlighted.
+     *      DocumentApp.getActiveDocument().editAsText()
+     *        .insertText(0, 'Hello\n')
+     *        .setAttributes(0, 4, highlightStyle);
+     */
+    export enum Attribute { BACKGROUND_COLOR, BOLD, BORDER_COLOR, BORDER_WIDTH, CODE, FONT_FAMILY, FONT_SIZE, FOREGROUND_COLOR, HEADING, HEIGHT, HORIZONTAL_ALIGNMENT, INDENT_END, INDENT_FIRST_LINE, INDENT_START, ITALIC, GLYPH_TYPE, LEFT_TO_RIGHT, LINE_SPACING, LINK_URL, LIST_ID, MARGIN_BOTTOM, MARGIN_LEFT, MARGIN_RIGHT, MARGIN_TOP, NESTING_LEVEL, MINIMUM_HEIGHT, PADDING_BOTTOM, PADDING_LEFT, PADDING_RIGHT, PADDING_TOP, PAGE_HEIGHT, PAGE_WIDTH, SPACING_AFTER, SPACING_BEFORE, STRIKETHROUGH, UNDERLINE, VERTICAL_ALIGNMENT, WIDTH }
+
+    /**
+     * An element representing a document body. The Body may contain ListItem,
+     *  Paragraph, Table, and TableOfContents elements. For more information on
+     *  document structure, see the
+     *  guide to extending Google Docs.
+     * 
+     * The Body typically contains the full document contents except for the
+     *  HeaderSection, FooterSection, and any FootnoteSection elements.
+     * 
+     *      var doc = DocumentApp.getActiveDocument();
+     *      var body = doc.getBody();
+     *      
+     *      // Append a paragraph and a page break to the document body section directly.
+     *      body.appendParagraph("A paragraph.");
+     *      body.appendPageBreak();
+     */
+    export interface Body {
+      appendHorizontalRule(): HorizontalRule;
+      appendImage(image: Base.BlobSource): InlineImage;
+      appendImage(image: InlineImage): InlineImage;
+      appendListItem(listItem: ListItem): ListItem;
+      appendListItem(text: string): ListItem;
+      appendPageBreak(): PageBreak;
+      appendPageBreak(pageBreak: PageBreak): PageBreak;
+      appendParagraph(paragraph: Paragraph): Paragraph;
+      appendParagraph(text: string): Paragraph;
+      appendTable(): Table;
+      appendTable(cells: String[][]): Table;
+      appendTable(table: Table): Table;
+      clear(): Body;
+      copy(): Body;
+      editAsText(): Text;
+      findElement(elementType: ElementType): RangeElement;
+      findElement(elementType: ElementType, from: RangeElement): RangeElement;
+      findText(searchPattern: string): RangeElement;
+      findText(searchPattern: string, from: RangeElement): RangeElement;
+      getAttributes(): Object;
+      getChild(childIndex: Integer): Element;
+      getChildIndex(child: Element): Integer;
+      getImages(): InlineImage[];
+      getListItems(): ListItem[];
+      getMarginBottom(): Number;
+      getMarginLeft(): Number;
+      getMarginRight(): Number;
+      getMarginTop(): Number;
+      getNumChildren(): Integer;
+      getPageHeight(): Number;
+      getPageWidth(): Number;
+      getParagraphs(): Paragraph[];
+      getParent(): ContainerElement;
+      getTables(): Table[];
+      getText(): string;
+      getTextAlignment(): TextAlignment;
+      getType(): ElementType;
+      insertHorizontalRule(childIndex: Integer): HorizontalRule;
+      insertImage(childIndex: Integer, image: Base.BlobSource): InlineImage;
+      insertImage(childIndex: Integer, image: InlineImage): InlineImage;
+      insertListItem(childIndex: Integer, listItem: ListItem): ListItem;
+      insertListItem(childIndex: Integer, text: string): ListItem;
+      insertPageBreak(childIndex: Integer): PageBreak;
+      insertPageBreak(childIndex: Integer, pageBreak: PageBreak): PageBreak;
+      insertParagraph(childIndex: Integer, paragraph: Paragraph): Paragraph;
+      insertParagraph(childIndex: Integer, text: string): Paragraph;
+      insertTable(childIndex: Integer): Table;
+      insertTable(childIndex: Integer, cells: String[][]): Table;
+      insertTable(childIndex: Integer, table: Table): Table;
+      removeChild(child: Element): Body;
+      replaceText(searchPattern: string, replacement: string): Element;
+      setAttributes(attributes: Object): Body;
+      setMarginBottom(marginBottom: Number): Body;
+      setMarginLeft(marginLeft: Number): Body;
+      setMarginRight(marginRight: Number): Body;
+      setMarginTop(marginTop: Number): Body;
+      setPageHeight(pageHeight: Number): Body;
+      setPageWidth(pageWidth: Number): Body;
+      setText(text: string): Body;
+      setTextAlignment(textAlignment: TextAlignment): Body;
+      getFootnotes(): Footnote[];
+      getLinkUrl(): string;
+      getNextSibling(): Element;
+      getPreviousSibling(): Element;
+      isAtDocumentEnd(): boolean;
+      setLinkUrl(url: string): Body;
+    }
+
+    /**
+     * An object representing a bookmark.
+     * 
+     *      // Insert a bookmark at the cursor position and log its ID.
+     *      var doc = DocumentApp.getActiveDocument();
+     *      var cursor = doc.getCursor();
+     *      var bookmark = doc.addBookmark(cursor);
+     *      Logger.log(bookmark.getId());
+     */
+    export interface Bookmark {
+      getId(): string;
+      getPosition(): Position;
+      remove(): void;
+    }
+
+    /**
+     * A generic element that may contain other elements. All elements that may contain child elements,
+     *  such as Paragraph, inherit from ContainerElement.
+     */
+    export interface ContainerElement {
+      asBody(): Body;
+      asEquation(): Equation;
+      asFooterSection(): FooterSection;
+      asFootnoteSection(): FootnoteSection;
+      asHeaderSection(): HeaderSection;
+      asListItem(): ListItem;
+      asParagraph(): Paragraph;
+      asTable(): Table;
+      asTableCell(): TableCell;
+      asTableOfContents(): TableOfContents;
+      asTableRow(): TableRow;
+      clear(): ContainerElement;
+      copy(): ContainerElement;
+      editAsText(): Text;
+      findElement(elementType: ElementType): RangeElement;
+      findElement(elementType: ElementType, from: RangeElement): RangeElement;
+      findText(searchPattern: string): RangeElement;
+      findText(searchPattern: string, from: RangeElement): RangeElement;
+      getAttributes(): Object;
+      getChild(childIndex: Integer): Element;
+      getChildIndex(child: Element): Integer;
+      getLinkUrl(): string;
+      getNextSibling(): Element;
+      getNumChildren(): Integer;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getText(): string;
+      getTextAlignment(): TextAlignment;
+      getType(): ElementType;
+      isAtDocumentEnd(): boolean;
+      merge(): ContainerElement;
+      removeFromParent(): ContainerElement;
+      replaceText(searchPattern: string, replacement: string): Element;
+      setAttributes(attributes: Object): ContainerElement;
+      setLinkUrl(url: string): ContainerElement;
+      setTextAlignment(textAlignment: TextAlignment): ContainerElement;
+    }
+
+    /**
+     * A document, containing rich text and elements such as tables and lists.
+     * 
+     * Documents may be opened or created using DocumentApp.
+     * 
+     *      // Open a document by ID.
+     *      var doc = DocumentApp.openById("<my-id>");
+     *     
+     *      // Create and open a document.
+     *      doc = DocumentApp.create("Document Title");
+     */
+    export interface Document {
+      addBookmark(position: Position): Bookmark;
+      addEditor(emailAddress: string): Document;
+      addEditor(user: Base.User): Document;
+      addEditors(emailAddresses: String[]): Document;
+      addFooter(): FooterSection;
+      addHeader(): HeaderSection;
+      addNamedRange(name: string, range: Range): NamedRange;
+      addViewer(emailAddress: string): Document;
+      addViewer(user: Base.User): Document;
+      addViewers(emailAddresses: String[]): Document;
+      getAs(contentType: string): Base.Blob;
+      getBlob(): Base.Blob;
+      getBody(): Body;
+      getBookmark(id: string): Bookmark;
+      getBookmarks(): Bookmark[];
+      getCursor(): Position;
+      getEditors(): Base.User[];
+      getFooter(): FooterSection;
+      getFootnotes(): Footnote[];
+      getHeader(): HeaderSection;
+      getId(): string;
+      getName(): string;
+      getNamedRangeById(id: string): NamedRange;
+      getNamedRanges(): NamedRange[];
+      getNamedRanges(name: string): NamedRange[];
+      getSelection(): Range;
+      getUrl(): string;
+      getViewers(): Base.User[];
+      newPosition(element: Element, offset: Integer): Position;
+      newRange(): RangeBuilder;
+      removeEditor(emailAddress: string): Document;
+      removeEditor(user: Base.User): Document;
+      removeViewer(emailAddress: string): Document;
+      removeViewer(user: Base.User): Document;
+      saveAndClose(): void;
+      setCursor(position: Position): Document;
+      setName(name: string): Document;
+      setSelection(range: Range): Document;
+    }
+
+    /**
+     * The document service creates and opens Documents that can be edited.
+     * 
+     *      // Open a document by ID.
+     *      var doc = DocumentApp.openById('DOCUMENT_ID_GOES_HERE');
+     *     
+     *      // Create and open a document.
+     *      doc = DocumentApp.create('Document Name');
+     */
+    export interface DocumentApp {
+      Attribute: Attribute
+      ElementType: ElementType
+      FontFamily: FontFamily
+      GlyphType: GlyphType
+      HorizontalAlignment: HorizontalAlignment
+      ParagraphHeading: ParagraphHeading
+      TextAlignment: TextAlignment
+      VerticalAlignment: VerticalAlignment
+      create(name: string): Document;
+      getActiveDocument(): Document;
+      getUi(): Base.Ui;
+      openById(id: string): Document;
+      openByUrl(url: string): Document;
+    }
+
+    /**
+     * A generic element. Document contents are
+     *  represented as elements. For example, ListItem, Paragraph, and Table
+     *  are elements and inherit all of the methods defined by Element, such as
+     *  getType().
+     * Implementing classes
+     * 
+     * NameBrief description
+     * 
+     * BodyAn element representing a document body.
+     * 
+     * ContainerElementA generic element that may contain other elements.
+     * 
+     * EquationAn element representing a mathematical expression.
+     * 
+     * EquationFunctionAn element representing a function in a mathematical Equation.
+     * 
+     * EquationFunctionArgumentSeparatorAn element representing a function separator in a mathematical Equation.
+     * 
+     * EquationSymbolAn element representing a symbol in a mathematical Equation.
+     * 
+     * FooterSectionAn element representing a footer section.
+     * 
+     * FootnoteAn element representing a footnote.
+     * 
+     * FootnoteSectionAn element representing a footnote section.
+     * 
+     * HeaderSectionAn element representing a header section.
+     * 
+     * HorizontalRuleAn element representing an horizontal rule.
+     * 
+     * InlineDrawingAn element representing an embedded drawing.
+     * 
+     * InlineImageAn element representing an embedded image.
+     * 
+     * ListItemAn element representing a list item.
+     * 
+     * PageBreakAn element representing a page break.
+     * 
+     * ParagraphAn element representing a paragraph.
+     * 
+     * TableAn element representing a table.
+     * 
+     * TableCellAn element representing a table cell.
+     * 
+     * TableOfContentsAn element containing a table of contents.
+     * 
+     * TableRowAn element representing a table row.
+     * 
+     * TextAn element representing a rich text region.
+     * 
+     * UnsupportedElementAn element representing a region that is unknown or cannot be affected by a script, such as a
+     *  page number.
+     */
+    export interface Element {
+      asBody(): Body;
+      asEquation(): Equation;
+      asEquationFunction(): EquationFunction;
+      asEquationFunctionArgumentSeparator(): EquationFunctionArgumentSeparator;
+      asEquationSymbol(): EquationSymbol;
+      asFooterSection(): FooterSection;
+      asFootnote(): Footnote;
+      asFootnoteSection(): FootnoteSection;
+      asHeaderSection(): HeaderSection;
+      asHorizontalRule(): HorizontalRule;
+      asInlineDrawing(): InlineDrawing;
+      asInlineImage(): InlineImage;
+      asListItem(): ListItem;
+      asPageBreak(): PageBreak;
+      asParagraph(): Paragraph;
+      asTable(): Table;
+      asTableCell(): TableCell;
+      asTableOfContents(): TableOfContents;
+      asTableRow(): TableRow;
+      asText(): Text;
+      copy(): Element;
+      getAttributes(): Object;
+      getNextSibling(): Element;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getType(): ElementType;
+      isAtDocumentEnd(): boolean;
+      merge(): Element;
+      removeFromParent(): Element;
+      setAttributes(attributes: Object): Element;
+    }
+
+    /**
+     * An enumeration of all the element types.
+     * 
+     * Use the ElementType enumeration to check the type of a given
+     *  element, for instance:
+     * 
+     *      var firstChild = DocumentApp.getActiveDocument().getBody().getChild(0);
+     *      if (firstChild.getType() == DocumentApp.ElementType.PARAGRAPH) {
+     *        // It's a paragraph, apply a paragraph heading.
+     *        firstChild.asParagraph().setHeading(DocumentApp.ParagraphHeading.HEADING1);
+     *      }
+     */
+    export enum ElementType { BODY_SECTION, COMMENT_SECTION, DOCUMENT, EQUATION, EQUATION_FUNCTION, EQUATION_FUNCTION_ARGUMENT_SEPARATOR, EQUATION_SYMBOL, FOOTER_SECTION, FOOTNOTE, FOOTNOTE_SECTION, HEADER_SECTION, HORIZONTAL_RULE, INLINE_DRAWING, INLINE_IMAGE, LIST_ITEM, PAGE_BREAK, PARAGRAPH, TABLE, TABLE_CELL, TABLE_OF_CONTENTS, TABLE_ROW, TEXT, UNSUPPORTED }
+
+    /**
+     * An element representing a mathematical expression. An Equation may contain
+     *  EquationFunction, EquationSymbol, and Text elements.  For more
+     *  information on document structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface Equation {
+      clear(): Equation;
+      copy(): Equation;
+      editAsText(): Text;
+      findElement(elementType: ElementType): RangeElement;
+      findElement(elementType: ElementType, from: RangeElement): RangeElement;
+      findText(searchPattern: string): RangeElement;
+      findText(searchPattern: string, from: RangeElement): RangeElement;
+      getAttributes(): Object;
+      getChild(childIndex: Integer): Element;
+      getChildIndex(child: Element): Integer;
+      getLinkUrl(): string;
+      getNextSibling(): Element;
+      getNumChildren(): Integer;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getText(): string;
+      getTextAlignment(): TextAlignment;
+      getType(): ElementType;
+      isAtDocumentEnd(): boolean;
+      merge(): Equation;
+      removeFromParent(): Equation;
+      replaceText(searchPattern: string, replacement: string): Element;
+      setAttributes(attributes: Object): Equation;
+      setLinkUrl(url: string): Equation;
+      setTextAlignment(textAlignment: TextAlignment): Equation;
+    }
+
+    /**
+     * An element representing a function in a mathematical Equation. An
+     *  EquationFunction may contain EquationFunction,
+     *  EquationFunctionArgumentSeparator, EquationSymbol, and Text elements. For
+     *  more information on document structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface EquationFunction {
+      clear(): EquationFunction;
+      copy(): EquationFunction;
+      editAsText(): Text;
+      findElement(elementType: ElementType): RangeElement;
+      findElement(elementType: ElementType, from: RangeElement): RangeElement;
+      findText(searchPattern: string): RangeElement;
+      findText(searchPattern: string, from: RangeElement): RangeElement;
+      getAttributes(): Object;
+      getChild(childIndex: Integer): Element;
+      getChildIndex(child: Element): Integer;
+      getCode(): string;
+      getLinkUrl(): string;
+      getNextSibling(): Element;
+      getNumChildren(): Integer;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getText(): string;
+      getTextAlignment(): TextAlignment;
+      getType(): ElementType;
+      isAtDocumentEnd(): boolean;
+      merge(): EquationFunction;
+      removeFromParent(): EquationFunction;
+      replaceText(searchPattern: string, replacement: string): Element;
+      setAttributes(attributes: Object): EquationFunction;
+      setLinkUrl(url: string): EquationFunction;
+      setTextAlignment(textAlignment: TextAlignment): EquationFunction;
+    }
+
+    /**
+     * An element representing a function separator in a mathematical Equation. An
+     *  EquationFunctionArgumentSeparator cannot contain any other element. For more information
+     *  on document structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface EquationFunctionArgumentSeparator {
+      copy(): EquationFunctionArgumentSeparator;
+      getAttributes(): Object;
+      getNextSibling(): Element;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getType(): ElementType;
+      isAtDocumentEnd(): boolean;
+      merge(): EquationFunctionArgumentSeparator;
+      removeFromParent(): EquationFunctionArgumentSeparator;
+      setAttributes(attributes: Object): EquationFunctionArgumentSeparator;
+    }
+
+    /**
+     * An element representing a symbol in a mathematical Equation. An EquationSymbol
+     *  cannot contain any other element. For more information on document structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface EquationSymbol {
+      copy(): EquationSymbol;
+      getAttributes(): Object;
+      getCode(): string;
+      getNextSibling(): Element;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getType(): ElementType;
+      isAtDocumentEnd(): boolean;
+      merge(): EquationSymbol;
+      removeFromParent(): EquationSymbol;
+      setAttributes(attributes: Object): EquationSymbol;
+    }
+
+    /**
+     * 
+     * Deprecated. The methods getFontFamily() and setFontFamily(String) now use string
+     *      names for fonts instead of this enum. Although this enum is deprecated, it will remain
+     *      available for compatibility with older scripts.
+     * An enumeration of the supported fonts.
+     * 
+     * Use the FontFamily enumeration to set the font for a range of
+     *  text, element or document.
+     * 
+     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     
+     *      // Insert a paragraph at the start of the document.
+     *      body.insertParagraph(0, "Hello, Apps Script!");
+     *     
+     *      // Set the document font to Calibri.
+     *      body.editAsText().setFontFamily(DocumentApp.FontFamily.CALIBRI);
+     *     
+     *      // Set the first paragraph font to Arial.
+     *      body.getParagraphs()[0].setFontFamily(DocumentApp.FontFamily.ARIAL);
+     *     
+     *      // Set "Apps Script" to Comic Sans MS.
+     *      var text = 'Apps Script';
+     *      var a = body.getText().indexOf(text);
+     *      var b = a + text.length - 1;
+     *      body.editAsText().setFontFamily(a, b, DocumentApp.FontFamily.COMIC_SANS_MS);
+     */
+    export enum FontFamily { AMARANTH, ARIAL, ARIAL_BLACK, ARIAL_NARROW, ARVO, CALIBRI, CAMBRIA, COMIC_SANS_MS, CONSOLAS, CORSIVA, COURIER_NEW, DANCING_SCRIPT, DROID_SANS, DROID_SERIF, GARAMOND, GEORGIA, GLORIA_HALLELUJAH, GREAT_VIBES, LOBSTER, MERRIWEATHER, PACIFICO, PHILOSOPHER, POIRET_ONE, QUATTROCENTO, ROBOTO, SHADOWS_INTO_LIGHT, SYNCOPATE, TAHOMA, TIMES_NEW_ROMAN, TREBUCHET_MS, UBUNTU, VERDANA }
+
+    /**
+     * An element representing a footer section. A
+     *  Document typically contains at most one
+     *  FooterSection. The FooterSection may contain ListItem, Paragraph,
+     *  and Table elements. For more information on document structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface FooterSection {
+      appendHorizontalRule(): HorizontalRule;
+      appendImage(image: Base.BlobSource): InlineImage;
+      appendImage(image: InlineImage): InlineImage;
+      appendListItem(listItem: ListItem): ListItem;
+      appendListItem(text: string): ListItem;
+      appendParagraph(paragraph: Paragraph): Paragraph;
+      appendParagraph(text: string): Paragraph;
+      appendTable(): Table;
+      appendTable(cells: String[][]): Table;
+      appendTable(table: Table): Table;
+      clear(): FooterSection;
+      copy(): FooterSection;
+      editAsText(): Text;
+      findElement(elementType: ElementType): RangeElement;
+      findElement(elementType: ElementType, from: RangeElement): RangeElement;
+      findText(searchPattern: string): RangeElement;
+      findText(searchPattern: string, from: RangeElement): RangeElement;
+      getAttributes(): Object;
+      getChild(childIndex: Integer): Element;
+      getChildIndex(child: Element): Integer;
+      getImages(): InlineImage[];
+      getListItems(): ListItem[];
+      getNumChildren(): Integer;
+      getParagraphs(): Paragraph[];
+      getParent(): ContainerElement;
+      getTables(): Table[];
+      getText(): string;
+      getTextAlignment(): TextAlignment;
+      getType(): ElementType;
+      insertHorizontalRule(childIndex: Integer): HorizontalRule;
+      insertImage(childIndex: Integer, image: Base.BlobSource): InlineImage;
+      insertImage(childIndex: Integer, image: InlineImage): InlineImage;
+      insertListItem(childIndex: Integer, listItem: ListItem): ListItem;
+      insertListItem(childIndex: Integer, text: string): ListItem;
+      insertParagraph(childIndex: Integer, paragraph: Paragraph): Paragraph;
+      insertParagraph(childIndex: Integer, text: string): Paragraph;
+      insertTable(childIndex: Integer): Table;
+      insertTable(childIndex: Integer, cells: String[][]): Table;
+      insertTable(childIndex: Integer, table: Table): Table;
+      removeChild(child: Element): FooterSection;
+      removeFromParent(): FooterSection;
+      replaceText(searchPattern: string, replacement: string): Element;
+      setAttributes(attributes: Object): FooterSection;
+      setText(text: string): FooterSection;
+      setTextAlignment(textAlignment: TextAlignment): FooterSection;
+      getFootnotes(): Footnote[];
+      getLinkUrl(): string;
+      getNextSibling(): Element;
+      getPreviousSibling(): Element;
+      isAtDocumentEnd(): boolean;
+      setLinkUrl(url: string): FooterSection;
+    }
+
+    /**
+     * An element representing a footnote. Each Footnote is contained within a ListItem
+     *  or Paragraph and has a corresponding FootnoteSection element for the footnote's
+     *  contents. The Footnote itself cannot contain any other element. For more information on
+     *  document structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface Footnote {
+      copy(): Footnote;
+      getAttributes(): Object;
+      getFootnoteContents(): FootnoteSection;
+      getNextSibling(): Element;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getType(): ElementType;
+      isAtDocumentEnd(): boolean;
+      removeFromParent(): Footnote;
+      setAttributes(attributes: Object): Footnote;
+    }
+
+    /**
+     * An element representing a footnote section. A FootnoteSection contains the text that
+     *  corresponds to a Footnote. The FootnoteSection may contain ListItem or
+     *  Paragraph elements. For more information on document structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface FootnoteSection {
+      appendParagraph(paragraph: Paragraph): Paragraph;
+      appendParagraph(text: string): Paragraph;
+      clear(): FootnoteSection;
+      copy(): FootnoteSection;
+      editAsText(): Text;
+      findElement(elementType: ElementType): RangeElement;
+      findElement(elementType: ElementType, from: RangeElement): RangeElement;
+      findText(searchPattern: string): RangeElement;
+      findText(searchPattern: string, from: RangeElement): RangeElement;
+      getAttributes(): Object;
+      getChild(childIndex: Integer): Element;
+      getChildIndex(child: Element): Integer;
+      getNextSibling(): Element;
+      getNumChildren(): Integer;
+      getParagraphs(): Paragraph[];
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getText(): string;
+      getTextAlignment(): TextAlignment;
+      getType(): ElementType;
+      insertParagraph(childIndex: Integer, paragraph: Paragraph): Paragraph;
+      insertParagraph(childIndex: Integer, text: string): Paragraph;
+      removeChild(child: Element): FootnoteSection;
+      removeFromParent(): FootnoteSection;
+      replaceText(searchPattern: string, replacement: string): Element;
+      setAttributes(attributes: Object): FootnoteSection;
+      setText(text: string): FootnoteSection;
+      setTextAlignment(textAlignment: TextAlignment): FootnoteSection;
+      getFootnotes(): Footnote[];
+      getLinkUrl(): string;
+      isAtDocumentEnd(): boolean;
+      setLinkUrl(url: string): FootnoteSection;
+    }
+
+    /**
+     * An enumeration of the supported glyph types.
+     * 
+     * Use the GlyphType enumeration to set the bullet type for list
+     *  items.
+     * 
+     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     
+     *      // Insert at list item, with the default nesting level of zero.
+     *       body.appendListItem("Item 1");
+     *     
+     *       // Append a second list item, with a nesting level of one, indented one inch.
+     *       // The two items will have different bullet glyphs.
+     *       body.appendListItem("Item 2").setNestingLevel(1).setIndentStart(72)
+     *           .setGlyphType(DocumentApp.GlyphType.SQUARE_BULLET);
+     */
+    export enum GlyphType { BULLET, HOLLOW_BULLET, SQUARE_BULLET, NUMBER, LATIN_UPPER, LATIN_LOWER, ROMAN_UPPER, ROMAN_LOWER }
+
+    /**
+     * An element representing a header section. A
+     *  Document typically
+     *  contains at most one HeaderSection. The HeaderSection may contain
+     *  ListItem, Paragraph, and Table elements. For more information on document
+     *  structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface HeaderSection {
+      appendHorizontalRule(): HorizontalRule;
+      appendImage(image: Base.BlobSource): InlineImage;
+      appendImage(image: InlineImage): InlineImage;
+      appendListItem(listItem: ListItem): ListItem;
+      appendListItem(text: string): ListItem;
+      appendParagraph(paragraph: Paragraph): Paragraph;
+      appendParagraph(text: string): Paragraph;
+      appendTable(): Table;
+      appendTable(cells: String[][]): Table;
+      appendTable(table: Table): Table;
+      clear(): HeaderSection;
+      copy(): HeaderSection;
+      editAsText(): Text;
+      findElement(elementType: ElementType): RangeElement;
+      findElement(elementType: ElementType, from: RangeElement): RangeElement;
+      findText(searchPattern: string): RangeElement;
+      findText(searchPattern: string, from: RangeElement): RangeElement;
+      getAttributes(): Object;
+      getChild(childIndex: Integer): Element;
+      getChildIndex(child: Element): Integer;
+      getImages(): InlineImage[];
+      getListItems(): ListItem[];
+      getNumChildren(): Integer;
+      getParagraphs(): Paragraph[];
+      getParent(): ContainerElement;
+      getTables(): Table[];
+      getText(): string;
+      getTextAlignment(): TextAlignment;
+      getType(): ElementType;
+      insertHorizontalRule(childIndex: Integer): HorizontalRule;
+      insertImage(childIndex: Integer, image: Base.BlobSource): InlineImage;
+      insertImage(childIndex: Integer, image: InlineImage): InlineImage;
+      insertListItem(childIndex: Integer, listItem: ListItem): ListItem;
+      insertListItem(childIndex: Integer, text: string): ListItem;
+      insertParagraph(childIndex: Integer, paragraph: Paragraph): Paragraph;
+      insertParagraph(childIndex: Integer, text: string): Paragraph;
+      insertTable(childIndex: Integer): Table;
+      insertTable(childIndex: Integer, cells: String[][]): Table;
+      insertTable(childIndex: Integer, table: Table): Table;
+      removeChild(child: Element): HeaderSection;
+      removeFromParent(): HeaderSection;
+      replaceText(searchPattern: string, replacement: string): Element;
+      setAttributes(attributes: Object): HeaderSection;
+      setText(text: string): HeaderSection;
+      setTextAlignment(textAlignment: TextAlignment): HeaderSection;
+      getFootnotes(): Footnote[];
+      getLinkUrl(): string;
+      getNextSibling(): Element;
+      getPreviousSibling(): Element;
+      isAtDocumentEnd(): boolean;
+      setLinkUrl(url: string): HeaderSection;
+    }
+
+    /**
+     * An enumeration of the supported horizontal alignment types.
+     * 
+     * Use the HorizontalAlignment enumeration to manipulate the
+     *  alignment of Paragraph contents.
+     * 
+     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     
+     *      // Insert a paragraph and a table at the start of document.
+     *      var par1 = body.insertParagraph(0, "Center");
+     *      var table = body.insertTable(1, [['Left', 'Right']]);
+     *      var par2 = table.getCell(0, 0).getChild(0).asParagraph();
+     *      var par3 = table.getCell(0, 0).getChild(0).asParagraph();
+     *     
+     *      // Center align the first paragraph.
+     *      par1.setAlignment(DocumentApp.HorizontalAlignment.CENTER);
+     *     
+     *      // Left align the first cell.
+     *      par2.setAlignment(DocumentApp.HorizontalAlignment.LEFT);
+     *     
+     *      // Right align the second cell.
+     *      par3.setAlignment(DocumentApp.HorizontalAlignment.RIGHT);
+     */
+    export enum HorizontalAlignment { LEFT, CENTER, RIGHT, JUSTIFY }
+
+    /**
+     * An element representing an horizontal rule. A HorizontalRule can be contained within a
+     *  ListItem or Paragraph, but cannot itself contain any other element. For more
+     *  information on document structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface HorizontalRule {
+      copy(): HorizontalRule;
+      getAttributes(): Object;
+      getNextSibling(): Element;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getType(): ElementType;
+      isAtDocumentEnd(): boolean;
+      removeFromParent(): HorizontalRule;
+      setAttributes(attributes: Object): HorizontalRule;
+    }
+
+    /**
+     * An element representing an embedded drawing. An InlineDrawing can be contained within a
+     *  ListItem or Paragraph, unless the ListItem or Paragraph is within
+     *  a FootnoteSection. An InlineDrawing cannot itself contain any other element. For
+     *  more information on document structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface InlineDrawing {
+      copy(): InlineDrawing;
+      getAttributes(): Object;
+      getNextSibling(): Element;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getType(): ElementType;
+      isAtDocumentEnd(): boolean;
+      merge(): InlineDrawing;
+      removeFromParent(): InlineDrawing;
+      setAttributes(attributes: Object): InlineDrawing;
+    }
+
+    /**
+     * An element representing an embedded image. An InlineImage can be contained within a
+     *  ListItem or Paragraph, unless the ListItem or Paragraph is within
+     *  a FootnoteSection. An InlineImage cannot itself contain any other element. For
+     *  more information on document structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface InlineImage {
+      copy(): InlineImage;
+      getAs(contentType: string): Base.Blob;
+      getAttributes(): Object;
+      getBlob(): Base.Blob;
+      getHeight(): Integer;
+      getLinkUrl(): string;
+      getNextSibling(): Element;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getType(): ElementType;
+      getWidth(): Integer;
+      isAtDocumentEnd(): boolean;
+      merge(): InlineImage;
+      removeFromParent(): InlineImage;
+      setAttributes(attributes: Object): InlineImage;
+      setHeight(height: Integer): InlineImage;
+      setLinkUrl(url: string): InlineImage;
+      setWidth(width: Integer): InlineImage;
+    }
+
+    /**
+     * An element representing a list item. A ListItem is a Paragraph that is
+     *  associated with a list ID. A ListItem may contain Equation, Footnote,
+     *  HorizontalRule, InlineDrawing, InlineImage, PageBreak, and
+     *  Text elements. For more information on document structure, see the
+     *  guide to extending Google Docs.
+     * 
+     * ListItems may not contain new-line characters. New-line characters ("\n") are
+     *  converted to line-break characters ("\r").
+     * 
+     * ListItems with the same list ID belong to the same list and are numbered accordingly.
+     *  The ListItems for a given list are not required to be adjacent in the document or even
+     *  have the same parent element. Two items belonging to the same list may exist anywhere in the
+     *  document while maintaining consecutive numbering, as the following example illustrates:
+     * 
+     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     
+     *      // Append a new list item to the body.
+     *      var item1 = body.appendListItem('Item 1');
+     *     
+     *      // Log the new list item's list ID.
+     *      Logger.log(item1.getListId());
+     *     
+     *      // Append a table after the list item.
+     *      body.appendTable([
+     *        ['Cell 1', 'Cell 2']
+     *      ]);
+     *     
+     *      // Append a second list item with the same list ID. The two items are treated as the same list,
+     *      // despite not being consecutive.
+     *      var item2 = body.appendListItem('Item 2');
+     *      item2.setListId(item1);
+     */
+    export interface ListItem {
+      appendHorizontalRule(): HorizontalRule;
+      appendInlineImage(image: Base.BlobSource): InlineImage;
+      appendInlineImage(image: InlineImage): InlineImage;
+      appendPageBreak(): PageBreak;
+      appendPageBreak(pageBreak: PageBreak): PageBreak;
+      appendText(text: string): Text;
+      appendText(text: Text): Text;
+      clear(): ListItem;
+      copy(): ListItem;
+      editAsText(): Text;
+      findElement(elementType: ElementType): RangeElement;
+      findElement(elementType: ElementType, from: RangeElement): RangeElement;
+      findText(searchPattern: string): RangeElement;
+      findText(searchPattern: string, from: RangeElement): RangeElement;
+      getAlignment(): HorizontalAlignment;
+      getAttributes(): Object;
+      getChild(childIndex: Integer): Element;
+      getChildIndex(child: Element): Integer;
+      getGlyphType(): GlyphType;
+      getHeading(): ParagraphHeading;
+      getIndentEnd(): Number;
+      getIndentFirstLine(): Number;
+      getIndentStart(): Number;
+      getLineSpacing(): Number;
+      getLinkUrl(): string;
+      getListId(): string;
+      getNestingLevel(): Integer;
+      getNextSibling(): Element;
+      getNumChildren(): Integer;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getSpacingAfter(): Number;
+      getSpacingBefore(): Number;
+      getText(): string;
+      getTextAlignment(): TextAlignment;
+      getType(): ElementType;
+      insertHorizontalRule(childIndex: Integer): HorizontalRule;
+      insertInlineImage(childIndex: Integer, image: Base.BlobSource): InlineImage;
+      insertInlineImage(childIndex: Integer, image: InlineImage): InlineImage;
+      insertPageBreak(childIndex: Integer): PageBreak;
+      insertPageBreak(childIndex: Integer, pageBreak: PageBreak): PageBreak;
+      insertText(childIndex: Integer, text: string): Text;
+      insertText(childIndex: Integer, text: Text): Text;
+      isAtDocumentEnd(): boolean;
+      isLeftToRight(): boolean;
+      merge(): ListItem;
+      removeChild(child: Element): ListItem;
+      removeFromParent(): ListItem;
+      replaceText(searchPattern: string, replacement: string): Element;
+      setAlignment(alignment: HorizontalAlignment): ListItem;
+      setAttributes(attributes: Object): ListItem;
+      setGlyphType(glyphType: GlyphType): ListItem;
+      setHeading(heading: ParagraphHeading): ListItem;
+      setIndentEnd(indentEnd: Number): ListItem;
+      setIndentFirstLine(indentFirstLine: Number): ListItem;
+      setIndentStart(indentStart: Number): ListItem;
+      setLeftToRight(leftToRight: boolean): ListItem;
+      setLineSpacing(multiplier: Number): ListItem;
+      setLinkUrl(url: string): ListItem;
+      setListId(listItem: ListItem): ListItem;
+      setNestingLevel(nestingLevel: Integer): ListItem;
+      setSpacingAfter(spacingAfter: Number): ListItem;
+      setSpacingBefore(spacingBefore: Number): ListItem;
+      setText(text: string): void;
+      setTextAlignment(textAlignment: TextAlignment): ListItem;
+    }
+
+    /**
+     * A Range that has a name and ID to allow later retrieval. Names are not
+     *  necessarily unique; several different ranges in the same document may share the same name, much
+     *  like a class in HTML. By contrast, IDs are unique within the document, like an ID in HTML. Once a
+     *  NamedRange has been added to a document, it cannot be modified, only removed.
+     * 
+     * A NamedRange can be accessed by any script that accesses the document. To avoid
+     *  unintended conflicts between scripts, consider prefixing range names with a unique string.
+     * 
+     *      // Create a named range that includes every table in the document.
+     *      var doc = DocumentApp.getActiveDocument();
+     *      var rangeBuilder = doc.newRange();
+     *      var tables = doc.getBody().getTables();
+     *      for (var i = 0; i < tables.length; i++) {
+     *        rangeBuilder.addElement(tables[i]);
+     *      }
+     *      doc.addNamedRange('myUniquePrefix-tables', rangeBuilder.build());
+     */
+    export interface NamedRange {
+      getId(): string;
+      getName(): string;
+      getRange(): Range;
+      remove(): void;
+    }
+
+    /**
+     * An element representing a page break. A PageBreak can be contained within a
+     *  ListItem or Paragraph, unless the ListItem or Paragraph is within
+     *  a Table, HeaderSection, FooterSection, or FootnoteSection. A
+     *  PageBreak cannot itself contain any other element. For more information on document
+     *  structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface PageBreak {
+      copy(): PageBreak;
+      getAttributes(): Object;
+      getNextSibling(): Element;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getType(): ElementType;
+      isAtDocumentEnd(): boolean;
+      removeFromParent(): PageBreak;
+      setAttributes(attributes: Object): PageBreak;
+    }
+
+    /**
+     * An element representing a paragraph. A Paragraph may contain Equation,
+     *  Footnote, HorizontalRule, InlineDrawing, InlineImage,
+     *  PageBreak, and Text elements. For more information on document structure, see the
+     *  guide to extending Google Docs.
+     * 
+     * Paragraphs may not contain new-line characters. New-line characters ("\n") are
+     *  converted to line-break characters ("\r").
+     * 
+     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     
+     *      // Append a document header paragraph.
+     *      var header = body.appendParagraph("A Document");
+     *      header.setHeading(DocumentApp.ParagraphHeading.HEADING1);
+     *     
+     *      // Append a section header paragraph.
+     *      var section = body.appendParagraph("Section 1");
+     *      section.setHeading(DocumentApp.ParagraphHeading.HEADING2);
+     *     
+     *      // Append a regular paragraph.
+     *      body.appendParagraph("This is a typical paragraph.");
+     */
+    export interface Paragraph {
+      appendHorizontalRule(): HorizontalRule;
+      appendInlineImage(image: Base.BlobSource): InlineImage;
+      appendInlineImage(image: InlineImage): InlineImage;
+      appendPageBreak(): PageBreak;
+      appendPageBreak(pageBreak: PageBreak): PageBreak;
+      appendText(text: string): Text;
+      appendText(text: Text): Text;
+      clear(): Paragraph;
+      copy(): Paragraph;
+      editAsText(): Text;
+      findElement(elementType: ElementType): RangeElement;
+      findElement(elementType: ElementType, from: RangeElement): RangeElement;
+      findText(searchPattern: string): RangeElement;
+      findText(searchPattern: string, from: RangeElement): RangeElement;
+      getAlignment(): HorizontalAlignment;
+      getAttributes(): Object;
+      getChild(childIndex: Integer): Element;
+      getChildIndex(child: Element): Integer;
+      getHeading(): ParagraphHeading;
+      getIndentEnd(): Number;
+      getIndentFirstLine(): Number;
+      getIndentStart(): Number;
+      getLineSpacing(): Number;
+      getLinkUrl(): string;
+      getNextSibling(): Element;
+      getNumChildren(): Integer;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getSpacingAfter(): Number;
+      getSpacingBefore(): Number;
+      getText(): string;
+      getTextAlignment(): TextAlignment;
+      getType(): ElementType;
+      insertHorizontalRule(childIndex: Integer): HorizontalRule;
+      insertInlineImage(childIndex: Integer, image: Base.BlobSource): InlineImage;
+      insertInlineImage(childIndex: Integer, image: InlineImage): InlineImage;
+      insertPageBreak(childIndex: Integer): PageBreak;
+      insertPageBreak(childIndex: Integer, pageBreak: PageBreak): PageBreak;
+      insertText(childIndex: Integer, text: string): Text;
+      insertText(childIndex: Integer, text: Text): Text;
+      isAtDocumentEnd(): boolean;
+      isLeftToRight(): boolean;
+      merge(): Paragraph;
+      removeChild(child: Element): Paragraph;
+      removeFromParent(): Paragraph;
+      replaceText(searchPattern: string, replacement: string): Element;
+      setAlignment(alignment: HorizontalAlignment): Paragraph;
+      setAttributes(attributes: Object): Paragraph;
+      setHeading(heading: ParagraphHeading): Paragraph;
+      setIndentEnd(indentEnd: Number): Paragraph;
+      setIndentFirstLine(indentFirstLine: Number): Paragraph;
+      setIndentStart(indentStart: Number): Paragraph;
+      setLeftToRight(leftToRight: boolean): Paragraph;
+      setLineSpacing(multiplier: Number): Paragraph;
+      setLinkUrl(url: string): Paragraph;
+      setSpacingAfter(spacingAfter: Number): Paragraph;
+      setSpacingBefore(spacingBefore: Number): Paragraph;
+      setText(text: string): void;
+      setTextAlignment(textAlignment: TextAlignment): Paragraph;
+    }
+
+    /**
+     * An enumeration of the standard paragraph headings.
+     * 
+     * Use the ParagraphHeading enumeration to configure
+     *  the heading style for ParagraphElement.
+     * 
+     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     
+     *      // Append a paragraph, with heading 1.
+     *      var par1 = body.appendParagraph("Title");
+     *      par1.setHeading(DocumentApp.ParagraphHeading.HEADING1);
+     *     
+     *      // Append a paragraph, with heading 2.
+     *      var par2 = body.appendParagraph("SubTitle");
+     *      par2.setHeading(DocumentApp.ParagraphHeading.HEADING2);
+     *     
+     *      // Append a paragraph, with normal heading.
+     *      var par3 = body.appendParagraph("Text");
+     *      par3.setHeading(DocumentApp.ParagraphHeading.NORMAL);
+     */
+    export enum ParagraphHeading { NORMAL, HEADING1, HEADING2, HEADING3, HEADING4, HEADING5, HEADING6, TITLE, SUBTITLE }
+
+    /**
+     * A reference to a location in the document, relative to a specific element. The user's cursor is
+     *  represented as a Position, among other uses. Scripts can only access the cursor of the
+     *  user who is running the script, and only if the script is
+     *  bound to the document.
+     * 
+     *      // Insert some text at the cursor position and make it bold.
+     *      var cursor = DocumentApp.getActiveDocument().getCursor();
+     *      if (cursor) {
+     *        // Attempt to insert text at the cursor position. If the insertion returns null, the cursor's
+     *        // containing element doesn't allow insertions, so show the user an error message.
+     *        var element = cursor.insertText('ಠ‿ಠ');
+     *        if (element) {
+     *          element.setBold(true);
+     *        } else {
+     *          DocumentApp.getUi().alert('Cannot insert text here.');
+     *        }
+     *      } else {
+     *        DocumentApp.getUi().alert('Cannot find a cursor.');
+     *      }
+     */
+    export interface Position {
+      getElement(): Element;
+      getOffset(): Integer;
+      getSurroundingText(): Text;
+      getSurroundingTextOffset(): Integer;
+      insertBookmark(): Bookmark;
+      insertInlineImage(image: Base.BlobSource): InlineImage;
+      insertText(text: string): Text;
+    }
+
+    /**
+     * A range of elements in a document. The user's selection is represented as a
+     *  Range, among other uses. Scripts can only access the selection of the user who is running
+     *  the script, and only if the script is
+     *  bound to the document.
+     * 
+     *      // Bold all selected text.
+     *      var selection = DocumentApp.getActiveDocument().getSelection();
+     *      if (selection) {
+     *        var elements = selection.getRangeElements();
+     *        for (var i = 0; i < elements.length; i++) {
+     *          var element = elements[i];
+     *     
+     *          // Only modify elements that can be edited as text; skip images and other non-text elements.
+     *          if (element.getElement().editAsText) {
+     *            var text = element.getElement().editAsText();
+     *     
+     *            // Bold the selected part of the element, or the full element if it's completely selected.
+     *            if (element.isPartial()) {
+     *              text.setBold(element.getStartOffset(), element.getEndOffsetInclusive(), true);
+     *            } else {
+     *              text.setBold(true);
+     *            }
+     *          }
+     *        }
+     *      }
+     */
+    export interface Range {
+      getRangeElements(): RangeElement[];
+      getSelectedElements(): RangeElement[];
+    }
+
+    /**
+     * A builder used to construct Range objects from document elements.
+     * 
+     *      // Change the user's selection to a range that includes every table in the document.
+     *      var doc = DocumentApp.getActiveDocument();
+     *      var rangeBuilder = doc.newRange();
+     *      var tables = doc.getBody().getTables();
+     *      for (var i = 0; i < tables.length; i++) {
+     *        rangeBuilder.addElement(tables[i]);
+     *      }
+     *      doc.setSelection(rangeBuilder.build());
+     */
+    export interface RangeBuilder {
+      addElement(element: Element): RangeBuilder;
+      addElement(textElement: Text, startOffset: Integer, endOffsetInclusive: Integer): RangeBuilder;
+      addElementsBetween(startElement: Element, endElementInclusive: Element): RangeBuilder;
+      addElementsBetween(startTextElement: Text, startOffset: Integer, endTextElementInclusive: Text, endOffsetInclusive: Integer): RangeBuilder;
+      addRange(range: Range): RangeBuilder;
+      build(): Range;
+      getRangeElements(): RangeElement[];
+      getSelectedElements(): RangeElement[];
+    }
+
+    /**
+     * A wrapper around an Element with a possible start and end offset. These offsets allow a
+     *  range of characters within a Text
+     *  element to be represented in search results, document selections, and named ranges.
+     */
+    export interface RangeElement {
+      getElement(): Element;
+      getEndOffsetInclusive(): Integer;
+      getStartOffset(): Integer;
+      isPartial(): boolean;
+    }
+
+    /**
+     * An element representing a table. A Table may only contain TableRow elements. For
+     *  more information on document structure, see the
+     *  guide to extending Google Docs.
+     * 
+     * When creating a Table that contains a large number of rows or cells, consider building
+     *  it from a string array, as shown in the following example.
+     * 
+     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     
+     *      // Create a two-dimensional array containing the cell contents.
+     *      var cells = [
+     *        ['Row 1, Cell 1', 'Row 1, Cell 2'],
+     *        ['Row 2, Cell 1', 'Row 2, Cell 2']
+     *      ];
+     *     
+     *      // Build a table from the array.
+     *      body.appendTable(cells);
+     */
+    export interface Table {
+      appendTableRow(): TableRow;
+      appendTableRow(tableRow: TableRow): TableRow;
+      clear(): Table;
+      copy(): Table;
+      editAsText(): Text;
+      findElement(elementType: ElementType): RangeElement;
+      findElement(elementType: ElementType, from: RangeElement): RangeElement;
+      findText(searchPattern: string): RangeElement;
+      findText(searchPattern: string, from: RangeElement): RangeElement;
+      getAttributes(): Object;
+      getBorderColor(): string;
+      getBorderWidth(): Number;
+      getCell(rowIndex: Integer, cellIndex: Integer): TableCell;
+      getChild(childIndex: Integer): Element;
+      getChildIndex(child: Element): Integer;
+      getColumnWidth(columnIndex: Integer): Number;
+      getLinkUrl(): string;
+      getNextSibling(): Element;
+      getNumChildren(): Integer;
+      getNumRows(): Integer;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getRow(rowIndex: Integer): TableRow;
+      getText(): string;
+      getTextAlignment(): TextAlignment;
+      getType(): ElementType;
+      insertTableRow(childIndex: Integer): TableRow;
+      insertTableRow(childIndex: Integer, tableRow: TableRow): TableRow;
+      isAtDocumentEnd(): boolean;
+      removeChild(child: Element): Table;
+      removeFromParent(): Table;
+      removeRow(rowIndex: Integer): TableRow;
+      replaceText(searchPattern: string, replacement: string): Element;
+      setAttributes(attributes: Object): Table;
+      setBorderColor(color: string): Table;
+      setBorderWidth(width: Number): Table;
+      setColumnWidth(columnIndex: Integer, width: Number): Table;
+      setLinkUrl(url: string): Table;
+      setTextAlignment(textAlignment: TextAlignment): Table;
+    }
+
+    /**
+     * An element representing a table cell. A TableCell is always contained within a
+     *  TableRow and may contain ListItem, Paragraph, or Table elements.
+     *  For more information on document structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface TableCell {
+      appendHorizontalRule(): HorizontalRule;
+      appendImage(image: Base.BlobSource): InlineImage;
+      appendImage(image: InlineImage): InlineImage;
+      appendListItem(listItem: ListItem): ListItem;
+      appendListItem(text: string): ListItem;
+      appendParagraph(paragraph: Paragraph): Paragraph;
+      appendParagraph(text: string): Paragraph;
+      appendTable(): Table;
+      appendTable(cells: String[][]): Table;
+      appendTable(table: Table): Table;
+      clear(): TableCell;
+      copy(): TableCell;
+      editAsText(): Text;
+      findElement(elementType: ElementType): RangeElement;
+      findElement(elementType: ElementType, from: RangeElement): RangeElement;
+      findText(searchPattern: string): RangeElement;
+      findText(searchPattern: string, from: RangeElement): RangeElement;
+      getAttributes(): Object;
+      getBackgroundColor(): string;
+      getChild(childIndex: Integer): Element;
+      getChildIndex(child: Element): Integer;
+      getLinkUrl(): string;
+      getNextSibling(): Element;
+      getNumChildren(): Integer;
+      getPaddingBottom(): Number;
+      getPaddingLeft(): Number;
+      getPaddingRight(): Number;
+      getPaddingTop(): Number;
+      getParent(): ContainerElement;
+      getParentRow(): TableRow;
+      getParentTable(): Table;
+      getPreviousSibling(): Element;
+      getText(): string;
+      getTextAlignment(): TextAlignment;
+      getType(): ElementType;
+      getVerticalAlignment(): VerticalAlignment;
+      getWidth(): Number;
+      insertHorizontalRule(childIndex: Integer): HorizontalRule;
+      insertImage(childIndex: Integer, image: Base.BlobSource): InlineImage;
+      insertImage(childIndex: Integer, image: InlineImage): InlineImage;
+      insertListItem(childIndex: Integer, listItem: ListItem): ListItem;
+      insertListItem(childIndex: Integer, text: string): ListItem;
+      insertParagraph(childIndex: Integer, paragraph: Paragraph): Paragraph;
+      insertParagraph(childIndex: Integer, text: string): Paragraph;
+      insertTable(childIndex: Integer): Table;
+      insertTable(childIndex: Integer, cells: String[][]): Table;
+      insertTable(childIndex: Integer, table: Table): Table;
+      isAtDocumentEnd(): boolean;
+      merge(): TableCell;
+      removeChild(child: Element): TableCell;
+      removeFromParent(): TableCell;
+      replaceText(searchPattern: string, replacement: string): Element;
+      setAttributes(attributes: Object): TableCell;
+      setBackgroundColor(color: string): TableCell;
+      setLinkUrl(url: string): TableCell;
+      setPaddingBottom(paddingBottom: Number): TableCell;
+      setPaddingLeft(paddingLeft: Number): TableCell;
+      setPaddingRight(paddingTop: Number): TableCell;
+      setPaddingTop(paddingTop: Number): TableCell;
+      setText(text: string): TableCell;
+      setTextAlignment(textAlignment: TextAlignment): TableCell;
+      setVerticalAlignment(alignment: VerticalAlignment): TableCell;
+      setWidth(width: Number): TableCell;
+    }
+
+    /**
+     * An element containing a table of contents. A TableOfContents may contain
+     *  ListItem, Paragraph, and Table elements, although the contents of a
+     *  TableOfContents are usually generated automatically by Google Docs. For more information
+     *  on document structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface TableOfContents {
+      clear(): TableOfContents;
+      copy(): TableOfContents;
+      editAsText(): Text;
+      findElement(elementType: ElementType): RangeElement;
+      findElement(elementType: ElementType, from: RangeElement): RangeElement;
+      findText(searchPattern: string): RangeElement;
+      findText(searchPattern: string, from: RangeElement): RangeElement;
+      getAttributes(): Object;
+      getChild(childIndex: Integer): Element;
+      getChildIndex(child: Element): Integer;
+      getLinkUrl(): string;
+      getNextSibling(): Element;
+      getNumChildren(): Integer;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getText(): string;
+      getTextAlignment(): TextAlignment;
+      getType(): ElementType;
+      isAtDocumentEnd(): boolean;
+      removeFromParent(): TableOfContents;
+      replaceText(searchPattern: string, replacement: string): Element;
+      setAttributes(attributes: Object): TableOfContents;
+      setLinkUrl(url: string): TableOfContents;
+      setTextAlignment(textAlignment: TextAlignment): TableOfContents;
+    }
+
+    /**
+     * An element representing a table row. A TableRow is always contained within a
+     *  Table and may only contain TableCell elements. For more information on document
+     *  structure, see the
+     *  guide to extending Google Docs.
+     */
+    export interface TableRow {
+      appendTableCell(): TableCell;
+      appendTableCell(textContents: string): TableCell;
+      appendTableCell(tableCell: TableCell): TableCell;
+      clear(): TableRow;
+      copy(): TableRow;
+      editAsText(): Text;
+      findElement(elementType: ElementType): RangeElement;
+      findElement(elementType: ElementType, from: RangeElement): RangeElement;
+      findText(searchPattern: string): RangeElement;
+      findText(searchPattern: string, from: RangeElement): RangeElement;
+      getAttributes(): Object;
+      getCell(cellIndex: Integer): TableCell;
+      getChild(childIndex: Integer): Element;
+      getChildIndex(child: Element): Integer;
+      getLinkUrl(): string;
+      getMinimumHeight(): Integer;
+      getNextSibling(): Element;
+      getNumCells(): Integer;
+      getNumChildren(): Integer;
+      getParent(): ContainerElement;
+      getParentTable(): Table;
+      getPreviousSibling(): Element;
+      getText(): string;
+      getTextAlignment(): TextAlignment;
+      getType(): ElementType;
+      insertTableCell(childIndex: Integer): TableCell;
+      insertTableCell(childIndex: Integer, textContents: string): TableCell;
+      insertTableCell(childIndex: Integer, tableCell: TableCell): TableCell;
+      isAtDocumentEnd(): boolean;
+      merge(): TableRow;
+      removeCell(cellIndex: Integer): TableCell;
+      removeChild(child: Element): TableRow;
+      removeFromParent(): TableRow;
+      replaceText(searchPattern: string, replacement: string): Element;
+      setAttributes(attributes: Object): TableRow;
+      setLinkUrl(url: string): TableRow;
+      setMinimumHeight(minHeight: Integer): TableRow;
+      setTextAlignment(textAlignment: TextAlignment): TableRow;
+    }
+
+    /**
+     * An element representing a rich text region. All text in a
+     *  Document is contained within Text
+     *  elements.  A Text element can be contained within an Equation,
+     *  EquationFunction, ListItem, or Paragraph, but cannot itself contain any
+     *  other element. For more information on document structure, see the
+     *  guide to extending Google Docs.
+     * 
+     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     
+     *      // Use editAsText to obtain a single text element containing
+     *      // all the characters in the document.
+     *      var text = body.editAsText();
+     *     
+     *      // Insert text at the beginning of the document.
+     *      text.insertText(0, 'Inserted text.\n');
+     *     
+     *      // Insert text at the end of the document.
+     *      text.appendText('\nAppended text.');
+     *     
+     *      // Make the first half of the document blue.
+     *      text.setForegroundColor(0, text.getText().length / 2, '#00FFFF');
+     */
+    export interface Text {
+      appendText(text: string): Text;
+      copy(): Text;
+      deleteText(startOffset: Integer, endOffsetInclusive: Integer): Text;
+      editAsText(): Text;
+      findText(searchPattern: string): RangeElement;
+      findText(searchPattern: string, from: RangeElement): RangeElement;
+      getAttributes(): Object;
+      getAttributes(offset: Integer): Object;
+      getBackgroundColor(): string;
+      getBackgroundColor(offset: Integer): string;
+      getFontFamily(): string;
+      getFontFamily(offset: Integer): string;
+      getFontSize(): Integer;
+      getFontSize(offset: Integer): Integer;
+      getForegroundColor(): string;
+      getForegroundColor(offset: Integer): string;
+      getLinkUrl(): string;
+      getLinkUrl(offset: Integer): string;
+      getNextSibling(): Element;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getText(): string;
+      getTextAlignment(): TextAlignment;
+      getTextAlignment(offset: Integer): TextAlignment;
+      getTextAttributeIndices(): Integer[];
+      getType(): ElementType;
+      insertText(offset: Integer, text: string): Text;
+      isAtDocumentEnd(): boolean;
+      isBold(): boolean;
+      isBold(offset: Integer): boolean;
+      isItalic(): boolean;
+      isItalic(offset: Integer): boolean;
+      isStrikethrough(): boolean;
+      isStrikethrough(offset: Integer): boolean;
+      isUnderline(): boolean;
+      isUnderline(offset: Integer): boolean;
+      merge(): Text;
+      removeFromParent(): Text;
+      replaceText(searchPattern: string, replacement: string): Element;
+      setAttributes(startOffset: Integer, endOffsetInclusive: Integer, attributes: Object): Text;
+      setAttributes(attributes: Object): Text;
+      setBackgroundColor(startOffset: Integer, endOffsetInclusive: Integer, color: string): Text;
+      setBackgroundColor(color: string): Text;
+      setBold(bold: boolean): Text;
+      setBold(startOffset: Integer, endOffsetInclusive: Integer, bold: boolean): Text;
+      setFontFamily(startOffset: Integer, endOffsetInclusive: Integer, fontFamilyName: string): Text;
+      setFontFamily(fontFamilyName: string): Text;
+      setFontSize(size: Integer): Text;
+      setFontSize(startOffset: Integer, endOffsetInclusive: Integer, size: Integer): Text;
+      setForegroundColor(startOffset: Integer, endOffsetInclusive: Integer, color: string): Text;
+      setForegroundColor(color: string): Text;
+      setItalic(italic: boolean): Text;
+      setItalic(startOffset: Integer, endOffsetInclusive: Integer, italic: boolean): Text;
+      setLinkUrl(startOffset: Integer, endOffsetInclusive: Integer, url: string): Text;
+      setLinkUrl(url: string): Text;
+      setStrikethrough(strikethrough: boolean): Text;
+      setStrikethrough(startOffset: Integer, endOffsetInclusive: Integer, strikethrough: boolean): Text;
+      setText(text: string): Text;
+      setTextAlignment(startOffset: Integer, endOffsetInclusive: Integer, textAlignment: TextAlignment): Text;
+      setTextAlignment(textAlignment: TextAlignment): Text;
+      setUnderline(underline: boolean): Text;
+      setUnderline(startOffset: Integer, endOffsetInclusive: Integer, underline: boolean): Text;
+    }
+
+    /**
+     * An enumeration of the type of text alignments.
+     * 
+     *      // Make the first character in the first paragraph be superscript.
+     *      var text = DocumentApp.getActiveDocument().getBody().getParagraphs()[0].editAsText();
+     *      text.setTextAlignment(0, 0, DocumentApp.TextAlignment.SUPERSCRIPT);
+     */
+    export enum TextAlignment { NORMAL, SUPERSCRIPT, SUBSCRIPT }
+
+    /**
+     * An element representing a region that is unknown or cannot be affected by a script, such as a
+     *  page number.
+     */
+    export interface UnsupportedElement {
+      copy(): UnsupportedElement;
+      getAttributes(): Object;
+      getNextSibling(): Element;
+      getParent(): ContainerElement;
+      getPreviousSibling(): Element;
+      getType(): ElementType;
+      isAtDocumentEnd(): boolean;
+      merge(): UnsupportedElement;
+      removeFromParent(): UnsupportedElement;
+      setAttributes(attributes: Object): UnsupportedElement;
+    }
+
+    /**
+     * An enumeration of the supported vertical alignment types.
+     * 
+     * Use the VerticalAlignment enumeration to set the vertical
+     *  alignment of table cells.
+     * 
+     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     
+     *      // Append table containing two cells.
+     *      var table = body.appendTable([['Top', 'Center', 'Bottom']]);
+     *     
+     *      // Align the first cell's contents to the top.
+     *      table.getCell(0, 0).setVerticalAlignment(DocumentApp.VerticalAlignment.TOP);
+     *     
+     *      // Align the second cell's contents to the center.
+     *      table.getCell(0, 1).setVerticalAlignment(DocumentApp.VerticalAlignment.CENTER);
+     *     
+     *      // Align the third cell's contents to the bottom.
+     *      table.getCell(0, 2).setVerticalAlignment(DocumentApp.VerticalAlignment.BOTTOM);
+     */
+    export enum VerticalAlignment { BOTTOM, CENTER, TOP }
+
+  }
+}
+
+declare var DocumentApp: GoogleAppsScript.Document.DocumentApp;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.drive.d.ts b/google-apps-script/google-apps-script.drive.d.ts
new file mode 100644
index 000000000..92eddd655
--- /dev/null
+++ b/google-apps-script/google-apps-script.drive.d.ts
@@ -0,0 +1,266 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Drive {
+    /**
+     * An enum representing classes of users who can access a file or folder, besides any individual
+     *  users who have been explicitly given access. These properties can be accessed from
+     *  DriveApp.Access.
+     * 
+     *      // Creates a folder that anyone on the Internet can read from and write to. (Domain
+     *      // administrators can prohibit this setting for users of Google Apps for Business, Google Apps
+     *      // for Education, or Google Apps for Your Domain.)
+     *      var folder = DriveApp.createFolder('Shared Folder');
+     *      folder.setSharing(DriveApp.Access.ANYONE, DriveApp.Permission.EDIT);
+     */
+    export enum Access { ANYONE, ANYONE_WITH_LINK, DOMAIN, DOMAIN_WITH_LINK, PRIVATE }
+
+    /**
+     * Allows scripts to create, find, and modify files and folders in Google Drive.
+     * 
+     *      // Log the name of every file in the user's Drive.
+     *      var files = DriveApp.getFiles();
+     *      while (files.hasNext()) {
+     *        var file = files.next();
+     *        Logger.log(file.getName());
+     *      }
+     */
+    export interface DriveApp {
+      Access: Access
+      Permission: Permission
+      addFile(child: File): Folder;
+      addFolder(child: Folder): Folder;
+      continueFileIterator(continuationToken: string): FileIterator;
+      continueFolderIterator(continuationToken: string): FolderIterator;
+      createFile(blob: Base.BlobSource): File;
+      createFile(name: string, content: string): File;
+      createFile(name: string, content: string, mimeType: string): File;
+      createFolder(name: string): Folder;
+      getFileById(id: string): File;
+      getFiles(): FileIterator;
+      getFilesByName(name: string): FileIterator;
+      getFilesByType(mimeType: string): FileIterator;
+      getFolderById(id: string): Folder;
+      getFolders(): FolderIterator;
+      getFoldersByName(name: string): FolderIterator;
+      getRootFolder(): Folder;
+      getStorageLimit(): Integer;
+      getStorageUsed(): Integer;
+      getTrashedFiles(): FileIterator;
+      getTrashedFolders(): FolderIterator;
+      removeFile(child: File): Folder;
+      removeFolder(child: Folder): Folder;
+      searchFiles(params: string): FileIterator;
+      searchFolders(params: string): FolderIterator;
+    }
+
+    /**
+     * A file in Google Drive. Files can be accessed or created from DriveApp.
+     * 
+     *      // Trash every untitled spreadsheet that hasn't been updated in a week.
+     *      var files = DriveApp.getFilesByName('Untitled spreadsheet');
+     *      while (files.hasNext()) {
+     *        var file = files.next();
+     *        if (new Date() - file.getLastUpdated() > 7 * 24 * 60 * 60 * 1000) {
+     *          file.setTrashed(true);
+     *        }
+     *      }
+     */
+    export interface File {
+      addCommenter(emailAddress: string): File;
+      addCommenter(user: Base.User): File;
+      addCommenters(emailAddresses: String[]): File;
+      addEditor(emailAddress: string): File;
+      addEditor(user: Base.User): File;
+      addEditors(emailAddresses: String[]): File;
+      addViewer(emailAddress: string): File;
+      addViewer(user: Base.User): File;
+      addViewers(emailAddresses: String[]): File;
+      getAccess(email: string): Permission;
+      getAccess(user: Base.User): Permission;
+      getAs(contentType: string): Base.Blob;
+      getBlob(): Base.Blob;
+      getDateCreated(): Date;
+      getDescription(): string;
+      getDownloadUrl(): string;
+      getEditors(): User[];
+      getId(): string;
+      getLastUpdated(): Date;
+      getMimeType(): string;
+      getName(): string;
+      getOwner(): User;
+      getParents(): FolderIterator;
+      getSharingAccess(): Access;
+      getSharingPermission(): Permission;
+      getSize(): Integer;
+      getThumbnail(): Base.Blob;
+      getUrl(): string;
+      getViewers(): User[];
+      isShareableByEditors(): boolean;
+      isStarred(): boolean;
+      isTrashed(): boolean;
+      makeCopy(): File;
+      makeCopy(destination: Folder): File;
+      makeCopy(name: string): File;
+      makeCopy(name: string, destination: Folder): File;
+      removeCommenter(emailAddress: string): File;
+      removeCommenter(user: Base.User): File;
+      removeEditor(emailAddress: string): File;
+      removeEditor(user: Base.User): File;
+      removeViewer(emailAddress: string): File;
+      removeViewer(user: Base.User): File;
+      revokePermissions(user: string): File;
+      revokePermissions(user: Base.User): File;
+      setContent(content: string): File;
+      setDescription(description: string): File;
+      setName(name: string): File;
+      setOwner(emailAddress: string): File;
+      setOwner(user: Base.User): File;
+      setShareableByEditors(shareable: boolean): File;
+      setSharing(accessType: Access, permissionType: Permission): File;
+      setStarred(starred: boolean): File;
+      setTrashed(trashed: boolean): File;
+    }
+
+    /**
+     * An iterator that allows scripts to iterate over a potentially large collection of files. File
+     *  iterators can be acccessed from DriveApp or a Folder.
+     * 
+     *      // Log the name of every file in the user's Drive.
+     *      var files = DriveApp.getFiles();
+     *      while (files.hasNext()) {
+     *        var file = files.next();
+     *        Logger.log(file.getName());
+     *      }
+     */
+    export interface FileIterator {
+      getContinuationToken(): string;
+      hasNext(): boolean;
+      next(): File;
+    }
+
+    /**
+     * A folder in Google Drive. Folders can be accessed or created from DriveApp.
+     * 
+     *      // Log the name of every folder in the user's Drive.
+     *      var folders = DriveApp.getFolders();
+     *      while (folders.hasNext()) {
+     *        var folder = folders.next();
+     *        Logger.log(folder.getName());
+     *      }
+     */
+    export interface Folder {
+      addEditor(emailAddress: string): Folder;
+      addEditor(user: Base.User): Folder;
+      addEditors(emailAddresses: String[]): Folder;
+      addFile(child: File): Folder;
+      addFolder(child: Folder): Folder;
+      addViewer(emailAddress: string): Folder;
+      addViewer(user: Base.User): Folder;
+      addViewers(emailAddresses: String[]): Folder;
+      createFile(blob: Base.BlobSource): File;
+      createFile(name: string, content: string): File;
+      createFile(name: string, content: string, mimeType: string): File;
+      createFolder(name: string): Folder;
+      getAccess(email: string): Permission;
+      getAccess(user: Base.User): Permission;
+      getDateCreated(): Date;
+      getDescription(): string;
+      getEditors(): User[];
+      getFiles(): FileIterator;
+      getFilesByName(name: string): FileIterator;
+      getFilesByType(mimeType: string): FileIterator;
+      getFolders(): FolderIterator;
+      getFoldersByName(name: string): FolderIterator;
+      getId(): string;
+      getLastUpdated(): Date;
+      getName(): string;
+      getOwner(): User;
+      getParents(): FolderIterator;
+      getSharingAccess(): Access;
+      getSharingPermission(): Permission;
+      getSize(): Integer;
+      getUrl(): string;
+      getViewers(): User[];
+      isShareableByEditors(): boolean;
+      isStarred(): boolean;
+      isTrashed(): boolean;
+      removeEditor(emailAddress: string): Folder;
+      removeEditor(user: Base.User): Folder;
+      removeFile(child: File): Folder;
+      removeFolder(child: Folder): Folder;
+      removeViewer(emailAddress: string): Folder;
+      removeViewer(user: Base.User): Folder;
+      revokePermissions(user: string): Folder;
+      revokePermissions(user: Base.User): Folder;
+      searchFiles(params: string): FileIterator;
+      searchFolders(params: string): FolderIterator;
+      setDescription(description: string): Folder;
+      setName(name: string): Folder;
+      setOwner(emailAddress: string): Folder;
+      setOwner(user: Base.User): Folder;
+      setShareableByEditors(shareable: boolean): Folder;
+      setSharing(accessType: Access, permissionType: Permission): Folder;
+      setStarred(starred: boolean): Folder;
+      setTrashed(trashed: boolean): Folder;
+    }
+
+    /**
+     * An object that allows scripts to iterate over a potentially large collection of folders. Folder
+     *  iterators can be acccessed from DriveApp, a File, or a Folder.
+     * 
+     *      // Log the name of every folder in the user's Drive.
+     *      var folders = DriveApp.getFolders();
+     *      while (folders.hasNext()) {
+     *        var folder = folders.next();
+     *        Logger.log(folder.getName());
+     *      }
+     */
+    export interface FolderIterator {
+      getContinuationToken(): string;
+      hasNext(): boolean;
+      next(): Folder;
+    }
+
+    /**
+     * An enum representing the permissions granted to users who can access a file or folder, besides
+     *  any individual users who have been explicitly given access. These properties can be accessed from
+     *  DriveApp.Permission.
+     * 
+     *      // Creates a folder that anyone on the Internet can read from and write to. (Domain
+     *      // administrators can prohibit this setting for users of Google Apps for Business, Google Apps
+     *      // for Education, or Google Apps for Your Domain.)
+     *      var folder = DriveApp.createFolder('Shared Folder');
+     *      folder.setSharing(DriveApp.Access.ANYONE, DriveApp.Permission.EDIT);
+     */
+    export enum Permission { VIEW, EDIT, COMMENT, OWNER, NONE }
+
+    /**
+     * A user associated with a file in Google Drive. Users can be accessed from
+     *  File.getEditors(), Folder.getViewers(), and other methods.
+     * 
+     *      // Log the email address of all users who have edit access to a file.
+     *      var file = DriveApp.getFileById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var editors = file.getEditors();
+     *      for (var i = 0; i < editors.length; i++) {
+     *        Logger.log(editors[i].getEmail());
+     *      }
+     */
+    export interface User {
+      getDomain(): string;
+      getEmail(): string;
+      getName(): string;
+      getPhotoUrl(): string;
+      getUserLoginId(): string;
+    }
+
+  }
+}
+
+declare var DriveApp: GoogleAppsScript.Drive.DriveApp;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.forms.d.ts b/google-apps-script/google-apps-script.forms.d.ts
new file mode 100644
index 000000000..3f20c78b5
--- /dev/null
+++ b/google-apps-script/google-apps-script.forms.d.ts
@@ -0,0 +1,754 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Forms {
+    /**
+     * An enum representing the supported types of image alignment. Alignment types can be accessed from
+     *  FormApp.Alignment.
+     * 
+     *      // Open a form by ID and add a new image item with alignment
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var img = UrlFetchApp.fetch('https://www.google.com/images/srpr/logo4w.png');
+     *      form.addImageItem()
+     *          .setImage(img)
+     *          .setAlignment(FormApp.Alignment.CENTER);
+     */
+    export enum Alignment { LEFT, CENTER, RIGHT }
+
+    /**
+     * A question item that allows the respondent to select one or more checkboxes, as well as an
+     *  optional "other" field. Items can be accessed or created from a Form.
+     * 
+     *      // Open a form by ID and add a new checkbox item.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var item = form.addCheckboxItem();
+     *      item.setTitle('What condiments would you like on your hot dog?')
+     *          .setChoices([
+     *                item.createChoice('Ketchup'),
+     *                item.createChoice('Mustard'),
+     *                item.createChoice('Relish')
+     *          ])
+     *          .showOtherOption(true);
+     */
+    export interface CheckboxItem {
+      createChoice(value: string): Choice;
+      createResponse(responses: String[]): ItemResponse;
+      duplicate(): CheckboxItem;
+      getChoices(): Choice[];
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getTitle(): string;
+      getType(): ItemType;
+      hasOtherOption(): boolean;
+      isRequired(): boolean;
+      setChoiceValues(values: String[]): CheckboxItem;
+      setChoices(choices: Choice[]): CheckboxItem;
+      setHelpText(text: string): CheckboxItem;
+      setRequired(enabled: boolean): CheckboxItem;
+      setTitle(title: string): CheckboxItem;
+      showOtherOption(enabled: boolean): CheckboxItem;
+    }
+
+    /**
+     * A single choice associated with a type of Item that supports choices, like
+     *  CheckboxItem, ListItem, or MultipleChoiceItem.
+     * 
+     *      // Create a new form and add a multiple-choice item.
+     *      var form = FormApp.create('Form Name');
+     *      var item = form.addMultipleChoiceItem();
+     *      item.setTitle('Do you prefer cats or dogs?')
+     *          .setChoices([
+     *              item.createChoice('Cats', FormApp.PageNavigationType.CONTINUE),
+     *              item.createChoice('Dogs', FormApp.PageNavigationType.RESTART)
+     *          ]);
+     *     
+     *      // Add another page because navigation has no effect on the last page.
+     *      form.addPageBreakItem().setTitle('You chose well!');
+     *     
+     *      // Log the navigation types that each choice results in.
+     *      var choices = item.getChoices();
+     *      for (var i = 0; i < choices.length; i++) {
+     *      Logger.log('If the respondent chooses "%s", the form will %s.',
+     *                 choices[i].getValue(),
+     *                 choices[i].getPageNavigationType());
+     *      }
+     */
+    export interface Choice {
+      getGotoPage(): PageBreakItem;
+      getPageNavigationType(): PageNavigationType;
+      getValue(): string;
+    }
+
+    /**
+     * A question item that allows the respondent to indicate a date. Items can be accessed or created
+     *  from a Form.
+     * 
+     *      // Open a form by ID and add a new date item.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var item = form.addDateItem();
+     *      item.setTitle('When were you born?');
+     */
+    export interface DateItem {
+      createResponse(response: Date): ItemResponse;
+      duplicate(): DateItem;
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getTitle(): string;
+      getType(): ItemType;
+      includesYear(): boolean;
+      isRequired(): boolean;
+      setHelpText(text: string): DateItem;
+      setIncludesYear(enableYear: boolean): DateItem;
+      setRequired(enabled: boolean): DateItem;
+      setTitle(title: string): DateItem;
+    }
+
+    /**
+     * A question item that allows the respondent to indicate a date and time. Items can be accessed or
+     *  created from a Form.
+     * 
+     *      // Open a form by ID and add a new date-time item.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var item = form.addDateTimeItem();
+     *      item.setTitle('When do you want to meet?');
+     */
+    export interface DateTimeItem {
+      createResponse(response: Date): ItemResponse;
+      duplicate(): DateTimeItem;
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getTitle(): string;
+      getType(): ItemType;
+      includesYear(): boolean;
+      isRequired(): boolean;
+      setHelpText(text: string): DateTimeItem;
+      setIncludesYear(enableYear: boolean): DateTimeItem;
+      setRequired(enabled: boolean): DateTimeItem;
+      setTitle(title: string): DateTimeItem;
+    }
+
+    /**
+     * An enum representing the supported types of form-response destinations. All forms, including
+     *  those that do not have a destination set explicitly,
+     *  save
+     *  a copy of responses in the form's response store. Destination types can be accessed from
+     *  FormApp.DestinationType.
+     * 
+     *      // Open a form by ID and create a new spreadsheet.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var ss = SpreadsheetApp.create('Spreadsheet Name');
+     *     
+     *      // Update the form's response destination.
+     *      form.setDestination(FormApp.DestinationType.SPREADSHEET, ss.getId());
+     */
+    export enum DestinationType { SPREADSHEET }
+
+    /**
+     * A question item that allows the respondent to indicate a length of time. Items can be accessed or
+     *  created from a Form.
+     * 
+     *      // Open a form by ID and add a new duration item.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var item = form.addDurationItem();
+     *      item.setTitle('How long can you hold your breath?');
+     */
+    export interface DurationItem {
+      createResponse(hours: Integer, minutes: Integer, seconds: Integer): ItemResponse;
+      duplicate(): DurationItem;
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getTitle(): string;
+      getType(): ItemType;
+      isRequired(): boolean;
+      setHelpText(text: string): DurationItem;
+      setRequired(enabled: boolean): DurationItem;
+      setTitle(title: string): DurationItem;
+    }
+
+    /**
+     * A form that contains overall properties (such as title, settings, and where responses are stored)
+     *  and items (which includes question items like checkboxes and layout items like page breaks).
+     *  Forms can be accessed or created from FormApp.
+     * 
+     *      // Open a form by ID and create a new spreadsheet.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var ss = SpreadsheetApp.create('Spreadsheet Name');
+     *     
+     *      // Update form properties via chaining.
+     *      form.setTitle('Form Name')
+     *          .setDescription('Description of form')
+     *          .setConfirmationMessage('Thanks for responding!')
+     *          .setAllowResponseEdits(true)
+     *          .setAcceptingResponses(false);
+     *     
+     *      // Update the form's response destination.
+     *      form.setDestination(FormApp.DestinationType.SPREADSHEET, ss.getId());
+     */
+    export interface Form {
+      addCheckboxItem(): CheckboxItem;
+      addDateItem(): DateItem;
+      addDateTimeItem(): DateTimeItem;
+      addDurationItem(): DurationItem;
+      addEditor(emailAddress: string): Form;
+      addEditor(user: Base.User): Form;
+      addEditors(emailAddresses: String[]): Form;
+      addGridItem(): GridItem;
+      addImageItem(): ImageItem;
+      addListItem(): ListItem;
+      addMultipleChoiceItem(): MultipleChoiceItem;
+      addPageBreakItem(): PageBreakItem;
+      addParagraphTextItem(): ParagraphTextItem;
+      addScaleItem(): ScaleItem;
+      addSectionHeaderItem(): SectionHeaderItem;
+      addTextItem(): TextItem;
+      addTimeItem(): TimeItem;
+      addVideoItem(): VideoItem;
+      canEditResponse(): boolean;
+      collectsEmail(): boolean;
+      createResponse(): FormResponse;
+      deleteAllResponses(): Form;
+      deleteItem(index: Integer): void;
+      deleteItem(item: Item): void;
+      getConfirmationMessage(): string;
+      getCustomClosedFormMessage(): string;
+      getDescription(): string;
+      getDestinationId(): string;
+      getDestinationType(): DestinationType;
+      getEditUrl(): string;
+      getEditors(): Base.User[];
+      getId(): string;
+      getItemById(id: Integer): Item;
+      getItems(): Item[];
+      getItems(itemType: ItemType): Item[];
+      getPublishedUrl(): string;
+      getResponse(responseId: string): FormResponse;
+      getResponses(): FormResponse[];
+      getResponses(timestamp: Date): FormResponse[];
+      getShuffleQuestions(): boolean;
+      getSummaryUrl(): string;
+      getTitle(): string;
+      hasLimitOneResponsePerUser(): boolean;
+      hasProgressBar(): boolean;
+      hasRespondAgainLink(): boolean;
+      isAcceptingResponses(): boolean;
+      isPublishingSummary(): boolean;
+      moveItem(from: Integer, to: Integer): Item;
+      moveItem(item: Item, toIndex: Integer): Item;
+      removeDestination(): Form;
+      removeEditor(emailAddress: string): Form;
+      removeEditor(user: Base.User): Form;
+      requiresLogin(): boolean;
+      setAcceptingResponses(enabled: boolean): Form;
+      setAllowResponseEdits(enabled: boolean): Form;
+      setCollectEmail(collect: boolean): Form;
+      setConfirmationMessage(message: string): Form;
+      setCustomClosedFormMessage(message: string): Form;
+      setDescription(description: string): Form;
+      setDestination(type: DestinationType, id: string): Form;
+      setLimitOneResponsePerUser(enabled: boolean): Form;
+      setProgressBar(enabled: boolean): Form;
+      setPublishingSummary(enabled: boolean): Form;
+      setRequireLogin(requireLogin: boolean): Form;
+      setShowLinkToRespondAgain(enabled: boolean): Form;
+      setShuffleQuestions(shuffle: boolean): Form;
+      setTitle(title: string): Form;
+      shortenFormUrl(url: string): string;
+    }
+
+    /**
+     * Allows a script to open existing Forms or create new ones.
+     * 
+     *      // Open a form by ID.
+     *      var existingForm = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     
+     *      // Create and open a form.
+     *      var newForm = FormApp.create('Form Name');
+     */
+    export interface FormApp {
+      Alignment: Alignment
+      DestinationType: DestinationType
+      ItemType: ItemType
+      PageNavigationType: PageNavigationType
+      create(title: string): Form;
+      getActiveForm(): Form;
+      getUi(): Base.Ui;
+      openById(id: string): Form;
+      openByUrl(url: string): Form;
+    }
+
+    /**
+     * A response to the form as a whole. Form responses have three main uses: they contain the answers
+     *  submitted by a respondent (see getItemResponses(), they can be used to programmatically
+     *  respond to the form (see withItemResponse(response) and submit()), and they
+     *  can be used as a template to create a URL for the form with pre-filled answers. Form responses
+     *  can be created or accessed from a Form.
+     * 
+     *      // Open a form by ID and log the responses to each question.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var formResponses = form.getResponses();
+     *      for (var i = 0; i < formResponses.length; i++) {
+     *        var formResponse = formResponses[i];
+     *        var itemResponses = formResponse.getItemResponses();
+     *        for (var j = 0; j < itemResponses.length; j++) {
+     *          var itemResponse = itemResponses[j];
+     *          Logger.log('Response #%s to the question "%s" was "%s"',
+     *              (i + 1).toString(),
+     *              itemResponse.getItem().getTitle(),
+     *              itemResponse.getResponse());
+     *        }
+     *      }
+     */
+    export interface FormResponse {
+      getEditResponseUrl(): string;
+      getId(): string;
+      getItemResponses(): ItemResponse[];
+      getRespondentEmail(): string;
+      getResponseForItem(item: Item): ItemResponse;
+      getTimestamp(): Date;
+      submit(): FormResponse;
+      toPrefilledUrl(): string;
+      withItemResponse(response: ItemResponse): FormResponse;
+    }
+
+    /**
+     * A question item, presented as a grid of columns and rows, that allows the respondent to select
+     *  one choice per row from a sequence of radio buttons. Items can be accessed or created from a
+     *  Form.
+     * 
+     *      // Open a form by ID and add a new grid item.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var item = form.addGridItem();
+     *      item.setTitle('Rate your interests')
+     *          .setRows(['Cars', 'Computers', 'Celebrities'])
+     *          .setColumns(['Boring', 'So-so', 'Interesting']);
+     */
+    export interface GridItem {
+      createResponse(responses: String[]): ItemResponse;
+      duplicate(): GridItem;
+      getColumns(): String[];
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getRows(): String[];
+      getTitle(): string;
+      getType(): ItemType;
+      isRequired(): boolean;
+      setColumns(columns: String[]): GridItem;
+      setHelpText(text: string): GridItem;
+      setRequired(enabled: boolean): GridItem;
+      setRows(rows: String[]): GridItem;
+      setTitle(title: string): GridItem;
+    }
+
+    /**
+     * A layout item that displays an image. Items can be accessed or created from a Form.
+     * 
+     *      // Open a form by ID and add a new image item
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var img = UrlFetchApp.fetch('https://www.google.com/images/srpr/logo4w.png');
+     *      form.addImageItem()
+     *          .setTitle('Google')
+     *          .setHelpText('Google Logo') // The help text is the image description
+     *          .setImage(img);
+     */
+    export interface ImageItem {
+      duplicate(): ImageItem;
+      getAlignment(): Alignment;
+      getHelpText(): string;
+      getId(): Integer;
+      getImage(): Base.Blob;
+      getIndex(): Integer;
+      getTitle(): string;
+      getType(): ItemType;
+      getWidth(): Integer;
+      setAlignment(alignment: Alignment): ImageItem;
+      setHelpText(text: string): ImageItem;
+      setImage(image: Base.BlobSource): ImageItem;
+      setTitle(title: string): ImageItem;
+      setWidth(width: Integer): ImageItem;
+    }
+
+    /**
+     * A generic form item that contains properties common to all items, such as title and help text.
+     *  Items can be accessed or created from a Form.
+     * 
+     *  To operate on type-specific properties, use getType() to check the item's
+     *  ItemType, then cast the item to the
+     *  appropriate class using a method like asCheckboxItem().
+     * 
+     *      // Create a new form and add a text item.
+     *      var form = FormApp.create('Form Name');
+     *      form.addTextItem();
+     *     
+     *      // Access the text item as a generic item.
+     *      var items = form.getItems();
+     *      var item = items[0];
+     *     
+     *      // Cast the generic item to the text-item class.
+     *      if (item.getType() == 'TEXT') {
+     *        var textItem = item.asTextItem();
+     *        textItem.setRequired(false);
+     *      }
+     */
+    export interface Item {
+      asCheckboxItem(): CheckboxItem;
+      asDateItem(): DateItem;
+      asDateTimeItem(): DateTimeItem;
+      asDurationItem(): DurationItem;
+      asGridItem(): GridItem;
+      asImageItem(): ImageItem;
+      asListItem(): ListItem;
+      asMultipleChoiceItem(): MultipleChoiceItem;
+      asPageBreakItem(): PageBreakItem;
+      asParagraphTextItem(): ParagraphTextItem;
+      asScaleItem(): ScaleItem;
+      asSectionHeaderItem(): SectionHeaderItem;
+      asTextItem(): TextItem;
+      asTimeItem(): TimeItem;
+      asVideoItem(): VideoItem;
+      duplicate(): Item;
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getTitle(): string;
+      getType(): ItemType;
+      setHelpText(text: string): Item;
+      setTitle(title: string): Item;
+    }
+
+    /**
+     * A response to one question item within a form. Item responses can be accessed from
+     *  FormResponse and created from any Item that asks the respondent to answer a
+     *  question.
+     * 
+     *      // Open a form by ID and log the responses to each question.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var formResponses = form.getResponses();
+     *      for (var i = 0; i < formResponses.length; i++) {
+     *        var formResponse = formResponses[i];
+     *        var itemResponses = formResponse.getItemResponses();
+     *        for (var j = 0; j < itemResponses.length; j++) {
+     *          var itemResponse = itemResponses[j];
+     *          Logger.log('Response #%s to the question "%s" was "%s"',
+     *              (i + 1).toString(),
+     *              itemResponse.getItem().getTitle(),
+     *              itemResponse.getResponse());
+     *        }
+     *      }
+     */
+    export interface ItemResponse {
+      getItem(): Item;
+      getResponse(): Object;
+    }
+
+    /**
+     * An enum representing the supported types of form items. Item types can be accessed from
+     *  FormApp.ItemType.
+     * 
+     *      // Open a form by ID and add a new section header.
+     *      var form = FormApp.create('Form Name');
+     *      var item = form.addSectionHeaderItem();
+     *      item.setTitle('Title of new section');
+     *     
+     *      // Check the item type.
+     *      if (item.getType() == FormApp.ItemType.SECTION_HEADER) {
+     *        item.setHelpText('Description of new section.');
+     *      }
+     */
+    export enum ItemType { CHECKBOX, DATE, DATETIME, DURATION, GRID, IMAGE, LIST, MULTIPLE_CHOICE, PAGE_BREAK, PARAGRAPH_TEXT, SCALE, SECTION_HEADER, TEXT, TIME }
+
+    /**
+     * A question item that allows the respondent to select one choice from a drop-down list. Items can
+     *  be accessed or created from a Form.
+     * 
+     *      // Open a form by ID and add a new list item.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var item = form.addListItem();
+     *      item.setTitle('Do you prefer cats or dogs?')
+     *          .setChoices([
+     *              item.createChoice('Cats'),
+     *              item.createChoice('Dogs')
+     *          ]);
+     */
+    export interface ListItem {
+      createChoice(value: string): Choice;
+      createChoice(value: string, navigationItem: PageBreakItem): Choice;
+      createChoice(value: string, navigationType: PageNavigationType): Choice;
+      createResponse(response: string): ItemResponse;
+      duplicate(): ListItem;
+      getChoices(): Choice[];
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getTitle(): string;
+      getType(): ItemType;
+      isRequired(): boolean;
+      setChoiceValues(values: String[]): ListItem;
+      setChoices(choices: Choice[]): ListItem;
+      setHelpText(text: string): ListItem;
+      setRequired(enabled: boolean): ListItem;
+      setTitle(title: string): ListItem;
+    }
+
+    /**
+     * A question item that allows the respondent to select one choice from a list of radio buttons or
+     *  an optional "other" field. Items can be accessed or created from a Form.
+     * 
+     *      // Open a form by ID and add a new multiple choice item.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var item = form.addMultipleChoiceItem();
+     *      item.setTitle('Do you prefer cats or dogs?')
+     *          .setChoices([
+     *              item.createChoice('Cats'),
+     *              item.createChoice('Dogs')
+     *           ])
+     *          .showOtherOption(true);
+     */
+    export interface MultipleChoiceItem {
+      createChoice(value: string): Choice;
+      createChoice(value: string, navigationItem: PageBreakItem): Choice;
+      createChoice(value: string, navigationType: PageNavigationType): Choice;
+      createResponse(response: string): ItemResponse;
+      duplicate(): MultipleChoiceItem;
+      getChoices(): Choice[];
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getTitle(): string;
+      getType(): ItemType;
+      hasOtherOption(): boolean;
+      isRequired(): boolean;
+      setChoiceValues(values: String[]): MultipleChoiceItem;
+      setChoices(choices: Choice[]): MultipleChoiceItem;
+      setHelpText(text: string): MultipleChoiceItem;
+      setRequired(enabled: boolean): MultipleChoiceItem;
+      setTitle(title: string): MultipleChoiceItem;
+      showOtherOption(enabled: boolean): MultipleChoiceItem;
+    }
+
+    /**
+     * A layout item that marks the start of a page. Items can be accessed or
+     *  created from a Form.
+     * 
+     *      // Create a form and add three page-break items.
+     *      var form = FormApp.create('Form Name');
+     *      var pageTwo = form.addPageBreakItem().setTitle('Page Two');
+     *      var pageThree = form.addPageBreakItem().setTitle('Page Three');
+     *     
+     *      // Make the first two pages navigate elsewhere upon completion. 
+     *      pageTwo.setGoToPage(pageThree); // At end of page one (start of page two), jump to page three
+     *      pageThree.setGoToPage(FormApp.PageNavigationType.RESTART); // At end of page two, restart form
+     */
+    export interface PageBreakItem {
+      duplicate(): PageBreakItem;
+      getGoToPage(): PageBreakItem;
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getPageNavigationType(): PageNavigationType;
+      getTitle(): string;
+      getType(): ItemType;
+      setGoToPage(goToPageItem: PageBreakItem): PageBreakItem;
+      setGoToPage(navigationType: PageNavigationType): PageBreakItem;
+      setHelpText(text: string): PageBreakItem;
+      setTitle(title: string): PageBreakItem;
+    }
+
+    /**
+     * An enum representing the supported types of page navigation. Page navigation types can be
+     *  accessed from FormApp.PageNavigationType.
+     * 
+     * The page navigation occurs after the respondent completes a page that contains the option, and
+     *  only if the respondent chose that option. If the respondent chose multiple options with
+     *  page-navigation instructions on the same page, only the last navigation option has any effect.
+     *  Page navigation also has no effect on the last page of a form.
+     * Choices that use page navigation cannot be combined in the same item with choices that do not
+     *  use page navigation.
+     * 
+     *      // Create a form and add a new multiple-choice item and a page-break item.
+     *      var form = FormApp.create('Form Name');
+     *      var item = form.addMultipleChoiceItem();
+     *      var pageBreak = form.addPageBreakItem();
+     *     
+     *      // Set some choices with go-to-page logic.
+     *      var rightChoice = item.createChoice('Vanilla', FormApp.PageNavigationType.SUBMIT);
+     *      var wrongChoice = item.createChoice('Chocolate', FormApp.PageNavigationType.RESTART);
+     *     
+     *      // For GO_TO_PAGE, just pass in the page break item. For CONTINUE (normally the default), pass in
+     *      // CONTINUE explicitly because page navigation cannot be mixed with non-navigation choices.
+     *      var iffyChoice = item.createChoice('Peanut', pageBreak);
+     *      var otherChoice = item.createChoice('Strawberry', FormApp.PageNavigationType.CONTINUE);
+     *      item.setChoices([rightChoice, wrongChoice, iffyChoice, otherChoice]);
+     */
+    export enum PageNavigationType { CONTINUE, GO_TO_PAGE, RESTART, SUBMIT }
+
+    /**
+     * A question item that allows the respondent to enter a block of text. Items can be accessed or
+     *  created from a Form.
+     * 
+     *      // Open a form by ID and add a new paragraph text item.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var item = form.addParagraphTextItem();
+     *      item.setTitle('What is your address?');
+     */
+    export interface ParagraphTextItem {
+      createResponse(response: string): ItemResponse;
+      duplicate(): ParagraphTextItem;
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getTitle(): string;
+      getType(): ItemType;
+      isRequired(): boolean;
+      setHelpText(text: string): ParagraphTextItem;
+      setRequired(enabled: boolean): ParagraphTextItem;
+      setTitle(title: string): ParagraphTextItem;
+    }
+
+    /**
+     * A question item that allows the respondent to choose one option from a numbered sequence of radio
+     *  buttons. Items can be accessed or created from a Form.
+     * 
+     *      // Open a form by ID and add a new scale item.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var item = form.addScaleItem();
+     *      item.setTitle('Pick a number between 1 and 10')
+     *          .setBounds(1, 10);
+     */
+    export interface ScaleItem {
+      createResponse(response: Integer): ItemResponse;
+      duplicate(): ScaleItem;
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getLeftLabel(): string;
+      getLowerBound(): Integer;
+      getRightLabel(): string;
+      getTitle(): string;
+      getType(): ItemType;
+      getUpperBound(): Integer;
+      isRequired(): boolean;
+      setBounds(lower: Integer, upper: Integer): ScaleItem;
+      setHelpText(text: string): ScaleItem;
+      setLabels(lower: string, upper: string): ScaleItem;
+      setRequired(enabled: boolean): ScaleItem;
+      setTitle(title: string): ScaleItem;
+    }
+
+    /**
+     * A layout item that visually indicates the start of a section. Items can be accessed or created
+     *  from a Form.
+     * 
+     *      // Open a form by ID and add a new section header.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var item = form.addSectionHeaderItem();
+     *      item.setTitle('Title of new section');
+     */
+    export interface SectionHeaderItem {
+      duplicate(): SectionHeaderItem;
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getTitle(): string;
+      getType(): ItemType;
+      setHelpText(text: string): SectionHeaderItem;
+      setTitle(title: string): SectionHeaderItem;
+    }
+
+    /**
+     * A question item that allows the respondent to enter a single line of text. Items can be accessed
+     *  or created from a Form.
+     * 
+     *      // Open a form by ID and add a new text item.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var item = form.addTextItem();
+     *      item.setTitle('What is your name?');
+     */
+    export interface TextItem {
+      createResponse(response: string): ItemResponse;
+      duplicate(): TextItem;
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getTitle(): string;
+      getType(): ItemType;
+      isRequired(): boolean;
+      setHelpText(text: string): TextItem;
+      setRequired(enabled: boolean): TextItem;
+      setTitle(title: string): TextItem;
+    }
+
+    /**
+     * A question item that allows the respondent to indicate a time of day. Items can be accessed or
+     *  created from a Form.
+     * 
+     *      // Open a form by ID and add a new time item.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var item = form.addTimeItem();
+     *      item.setTitle('What time do you usually wake up in the morning?');
+     */
+    export interface TimeItem {
+      createResponse(hour: Integer, minute: Integer): ItemResponse;
+      duplicate(): TimeItem;
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getTitle(): string;
+      getType(): ItemType;
+      isRequired(): boolean;
+      setHelpText(text: string): TimeItem;
+      setRequired(enabled: boolean): TimeItem;
+      setTitle(title: string): TimeItem;
+    }
+
+    /**
+     * A layout item that displays a video. Items can be accessed or created from a Form.
+     * 
+     *      // Open a form by ID and add three new video items, using a long URL,
+     *      // a short URL, and a video ID.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      form.addVideoItem()
+     *          .setTitle('Video Title')
+     *          .setHelpText('Video Caption')
+     *          .setVideoUrl('www.youtube.com/watch?v=1234abcdxyz');
+     *     
+     *      form.addVideoItem()
+     *          .setTitle('Video Title')
+     *          .setHelpText('Video Caption')
+     *          .setVideoUrl('youtu.be/1234abcdxyz');
+     *     
+     *      form.addVideoItem()
+     *          .setTitle('Video Title')
+     *          .setHelpText('Video Caption')
+     *          .setVideoUrl('1234abcdxyz');
+     */
+    export interface VideoItem {
+      duplicate(): VideoItem;
+      getAlignment(): Alignment;
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getTitle(): string;
+      getType(): ItemType;
+      getWidth(): Integer;
+      setAlignment(alignment: Alignment): VideoItem;
+      setHelpText(text: string): VideoItem;
+      setTitle(title: string): VideoItem;
+      setVideoUrl(youtubeUrl: string): VideoItem;
+      setWidth(width: Integer): VideoItem;
+    }
+
+  }
+}
+
+declare var FormApp: GoogleAppsScript.Forms.FormApp;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.gmail.d.ts b/google-apps-script/google-apps-script.gmail.d.ts
new file mode 100644
index 000000000..a276c3e29
--- /dev/null
+++ b/google-apps-script/google-apps-script.gmail.d.ts
@@ -0,0 +1,205 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Gmail {
+    /**
+     * Provides access to Gmail threads, messages, and labels.
+     */
+    export interface GmailApp {
+      createLabel(name: string): GmailLabel;
+      deleteLabel(label: GmailLabel): GmailApp;
+      getAliases(): String[];
+      getChatThreads(): GmailThread[];
+      getChatThreads(start: Integer, max: Integer): GmailThread[];
+      getDraftMessages(): GmailMessage[];
+      getInboxThreads(): GmailThread[];
+      getInboxThreads(start: Integer, max: Integer): GmailThread[];
+      getInboxUnreadCount(): Integer;
+      getMessageById(id: string): GmailMessage;
+      getMessagesForThread(thread: GmailThread): GmailMessage[];
+      getMessagesForThreads(threads: GmailThread[]): GmailMessage[][];
+      getPriorityInboxThreads(): GmailThread[];
+      getPriorityInboxThreads(start: Integer, max: Integer): GmailThread[];
+      getPriorityInboxUnreadCount(): Integer;
+      getSpamThreads(): GmailThread[];
+      getSpamThreads(start: Integer, max: Integer): GmailThread[];
+      getSpamUnreadCount(): Integer;
+      getStarredThreads(): GmailThread[];
+      getStarredThreads(start: Integer, max: Integer): GmailThread[];
+      getStarredUnreadCount(): Integer;
+      getThreadById(id: string): GmailThread;
+      getTrashThreads(): GmailThread[];
+      getTrashThreads(start: Integer, max: Integer): GmailThread[];
+      getUserLabelByName(name: string): GmailLabel;
+      getUserLabels(): GmailLabel[];
+      markMessageRead(message: GmailMessage): GmailApp;
+      markMessageUnread(message: GmailMessage): GmailApp;
+      markMessagesRead(messages: GmailMessage[]): GmailApp;
+      markMessagesUnread(messages: GmailMessage[]): GmailApp;
+      markThreadImportant(thread: GmailThread): GmailApp;
+      markThreadRead(thread: GmailThread): GmailApp;
+      markThreadUnimportant(thread: GmailThread): GmailApp;
+      markThreadUnread(thread: GmailThread): GmailApp;
+      markThreadsImportant(threads: GmailThread[]): GmailApp;
+      markThreadsRead(threads: GmailThread[]): GmailApp;
+      markThreadsUnimportant(threads: GmailThread[]): GmailApp;
+      markThreadsUnread(threads: GmailThread[]): GmailApp;
+      moveMessageToTrash(message: GmailMessage): GmailApp;
+      moveMessagesToTrash(messages: GmailMessage[]): GmailApp;
+      moveThreadToArchive(thread: GmailThread): GmailApp;
+      moveThreadToInbox(thread: GmailThread): GmailApp;
+      moveThreadToSpam(thread: GmailThread): GmailApp;
+      moveThreadToTrash(thread: GmailThread): GmailApp;
+      moveThreadsToArchive(threads: GmailThread[]): GmailApp;
+      moveThreadsToInbox(threads: GmailThread[]): GmailApp;
+      moveThreadsToSpam(threads: GmailThread[]): GmailApp;
+      moveThreadsToTrash(threads: GmailThread[]): GmailApp;
+      refreshMessage(message: GmailMessage): GmailApp;
+      refreshMessages(messages: GmailMessage[]): GmailApp;
+      refreshThread(thread: GmailThread): GmailApp;
+      refreshThreads(threads: GmailThread[]): GmailApp;
+      search(query: string): GmailThread[];
+      search(query: string, start: Integer, max: Integer): GmailThread[];
+      sendEmail(recipient: string, subject: string, body: string): GmailApp;
+      sendEmail(recipient: string, subject: string, body: string, options: Object): GmailApp;
+      starMessage(message: GmailMessage): GmailApp;
+      starMessages(messages: GmailMessage[]): GmailApp;
+      unstarMessage(message: GmailMessage): GmailApp;
+      unstarMessages(messages: GmailMessage[]): GmailApp;
+    }
+
+    /**
+     * An attachment from Gmail. This is a regular
+     *  Blob except that it has an extra
+     *  getSize() method that is faster than calling getBytes().length and does
+     *  not count against the Gmail read quota.
+     * 
+     *      // Logs information about any attachments in the first 100 inbox threads.
+     *      var threads = GmailApp.getInboxThreads(0, 100);
+     *      var msgs = GmailApp.getMessagesForThreads(threads);
+     *      for (var i = 0 ; i < msgs.length; i++) {
+     *        for (var j = 0; j < msgs[i].length; j++) {
+     *          var attachments = msgs[i][j].getAttachments();
+     *          for (var k = 0; k < attachments.length; k++) {
+     *            Logger.log('Message "%s" contains the attachment "%s" (%s bytes)',
+     *                       msgs[i][j].getSubject(), attachments[k].getName(), attachments[k].getSize());
+     *          }
+     *        }
+     *      }
+     */
+    export interface GmailAttachment {
+      copyBlob(): Base.Blob;
+      getAs(contentType: string): Base.Blob;
+      getBytes(): Byte[];
+      getContentType(): string;
+      getDataAsString(): string;
+      getDataAsString(charset: string): string;
+      getName(): string;
+      getSize(): Integer;
+      isGoogleType(): boolean;
+      setBytes(data: Byte[]): Base.Blob;
+      setContentType(contentType: string): Base.Blob;
+      setContentTypeFromExtension(): Base.Blob;
+      setDataFromString(string: string): Base.Blob;
+      setDataFromString(string: string, charset: string): Base.Blob;
+      setName(name: string): Base.Blob;
+      getAllBlobs(): Base.Blob[];
+    }
+
+    /**
+     * A user-created label in a user's Gmail account.
+     */
+    export interface GmailLabel {
+      addToThread(thread: GmailThread): GmailLabel;
+      addToThreads(threads: GmailThread[]): GmailLabel;
+      deleteLabel(): void;
+      getName(): string;
+      getThreads(): GmailThread[];
+      getThreads(start: Integer, max: Integer): GmailThread[];
+      getUnreadCount(): Integer;
+      removeFromThread(thread: GmailThread): GmailLabel;
+      removeFromThreads(threads: GmailThread[]): GmailLabel;
+    }
+
+    /**
+     * A message in a user's Gmail account.
+     */
+    export interface GmailMessage {
+      forward(recipient: string): GmailMessage;
+      forward(recipient: string, options: Object): GmailMessage;
+      getAttachments(): GmailAttachment[];
+      getBcc(): string;
+      getBody(): string;
+      getCc(): string;
+      getDate(): Date;
+      getFrom(): string;
+      getId(): string;
+      getPlainBody(): string;
+      getRawContent(): string;
+      getReplyTo(): string;
+      getSubject(): string;
+      getThread(): GmailThread;
+      getTo(): string;
+      isDraft(): boolean;
+      isInChats(): boolean;
+      isInInbox(): boolean;
+      isInTrash(): boolean;
+      isStarred(): boolean;
+      isUnread(): boolean;
+      markRead(): GmailMessage;
+      markUnread(): GmailMessage;
+      moveToTrash(): GmailMessage;
+      refresh(): GmailMessage;
+      reply(body: string): GmailMessage;
+      reply(body: string, options: Object): GmailMessage;
+      replyAll(body: string): GmailMessage;
+      replyAll(body: string, options: Object): GmailMessage;
+      star(): GmailMessage;
+      unstar(): GmailMessage;
+    }
+
+    /**
+     * A thread in a user's Gmail account.
+     */
+    export interface GmailThread {
+      addLabel(label: GmailLabel): GmailThread;
+      getFirstMessageSubject(): string;
+      getId(): string;
+      getLabels(): GmailLabel[];
+      getLastMessageDate(): Date;
+      getMessageCount(): Integer;
+      getMessages(): GmailMessage[];
+      getPermalink(): string;
+      hasStarredMessages(): boolean;
+      isImportant(): boolean;
+      isInChats(): boolean;
+      isInInbox(): boolean;
+      isInSpam(): boolean;
+      isInTrash(): boolean;
+      isUnread(): boolean;
+      markImportant(): GmailThread;
+      markRead(): GmailThread;
+      markUnimportant(): GmailThread;
+      markUnread(): GmailThread;
+      moveToArchive(): GmailThread;
+      moveToInbox(): GmailThread;
+      moveToSpam(): GmailThread;
+      moveToTrash(): GmailThread;
+      refresh(): GmailThread;
+      removeLabel(label: GmailLabel): GmailThread;
+      reply(body: string): GmailThread;
+      reply(body: string, options: Object): GmailThread;
+      replyAll(body: string): GmailThread;
+      replyAll(body: string, options: Object): GmailThread;
+    }
+
+  }
+}
+
+declare var GmailApp: GoogleAppsScript.Gmail.GmailApp;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.groups.d.ts b/google-apps-script/google-apps-script.groups.d.ts
new file mode 100644
index 000000000..7a8113339
--- /dev/null
+++ b/google-apps-script/google-apps-script.groups.d.ts
@@ -0,0 +1,67 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Groups {
+    /**
+     * A group object whose members and those members' roles within the group
+     *  can be queried.
+     * 
+     *  Here's an example which shows the members of a group. Before running it,
+     *  replace the email address of the group with that of one on your domain.
+     * 
+     *        function listGroupMembers() {
+     *          var group = GroupsApp.getGroupByEmail("example@googlegroups.com");
+     *          var s = group.getEmail() + ': ';
+     *          var users = group.getUsers();
+     *          for (var i = 0; i < users.length; i++) {
+     *            var user = users[i];
+     *            s = s + user.getEmail() + ", ";
+     *          }
+     *          Logger.log(s);
+     *        }
+     */
+    export interface Group {
+      getEmail(): string;
+      getRole(email: string): Role;
+      getRole(user: Base.User): Role;
+      getUsers(): Base.User[];
+      hasUser(email: string): boolean;
+      hasUser(user: Base.User): boolean;
+    }
+
+    /**
+     * This class provides access to Google Groups information. It can be used to
+     *  query information such as a group's email address, or the list of groups in
+     *  which the user is a direct member.
+     * 
+     *  Here's an example that shows how many groups the current user is a member of:
+     * 
+     *        var groups = GroupsApp.getGroups();
+     *        Logger.log('You belong to ' + groups.length + ' groups.');
+     */
+    export interface GroupsApp {
+      Role: Role
+      getGroupByEmail(email: string): Group;
+      getGroups(): Group[];
+    }
+
+    /**
+     * Possible roles of a user within a group, such as owner or ordinary member.
+     *  Users subscribed to a group have exactly one role within the context of that
+     *  group.
+     * See also
+     * 
+     * Group.getRole(email)
+     */
+    export enum Role { OWNER, MANAGER, MEMBER, INVITED, PENDING }
+
+  }
+}
+
+declare var GroupsApp: GoogleAppsScript.Groups.GroupsApp;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.html.d.ts b/google-apps-script/google-apps-script.html.d.ts
new file mode 100644
index 000000000..6cd16cdbd
--- /dev/null
+++ b/google-apps-script/google-apps-script.html.d.ts
@@ -0,0 +1,108 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+
+declare module GoogleAppsScript {
+  export module HTML {
+    /**
+     * An HtmlOutput object that can be served from a script. Due to security considerations,
+     *  scripts cannot directly return HTML to a browser. Instead, they must sanitize it so that it
+     *  cannot perform malicious actions. You can return sanitized HTML like this:
+     * 
+     *      function doGet() {
+     *        return HtmlService.createHtmlOutput('<b>Hello, world!</b>');
+     *      }
+     * 
+     * HtmlOutput
+     * Google Caja
+     * guide to restrictions in HTML service
+     */
+    export interface HtmlOutput {
+      append(addedContent: string): HtmlOutput;
+      appendUntrusted(addedContent: string): HtmlOutput;
+      asTemplate(): HtmlTemplate;
+      clear(): HtmlOutput;
+      getAs(contentType: string): Base.Blob;
+      getBlob(): Base.Blob;
+      getContent(): string;
+      getHeight(): Integer;
+      getTitle(): string;
+      getWidth(): Integer;
+      setContent(content: string): HtmlOutput;
+      setHeight(height: Integer): HtmlOutput;
+      setSandboxMode(mode: SandboxMode): HtmlOutput;
+      setTitle(title: string): HtmlOutput;
+      setWidth(width: Integer): HtmlOutput;
+    }
+
+    /**
+     * Service for returning HTML and other text content from a script.
+     * 
+     * Due to security considerations, scripts cannot directly return content to a browser. Instead,
+     *  they must sanitize the HTML so that it cannot perform malicious actions. See the description of
+     *  HtmlOutput for what limitations this implies on what can be returned.
+     */
+    export interface HtmlService {
+      SandboxMode: SandboxMode
+      createHtmlOutput(): HtmlOutput;
+      createHtmlOutput(blob: Base.BlobSource): HtmlOutput;
+      createHtmlOutput(html: string): HtmlOutput;
+      createHtmlOutputFromFile(filename: string): HtmlOutput;
+      createTemplate(blob: Base.BlobSource): HtmlTemplate;
+      createTemplate(html: string): HtmlTemplate;
+      createTemplateFromFile(filename: string): HtmlTemplate;
+      getUserAgent(): string;
+    }
+
+    /**
+     * A template object for dynamically constructing HTML. For more information, see the
+     *  guide to templates.
+     */
+    export interface HtmlTemplate {
+      evaluate(): HtmlOutput;
+      getCode(): string;
+      getCodeWithComments(): string;
+      getRawContent(): string;
+    }
+
+    /**
+     * An enum representing the sandbox modes that can be used for client-side HtmlService
+     *  scripts. These values can be accessed from HtmlService.SandboxMode, and set by calling
+     *  HtmlOutput.setSandboxMode(mode).
+     * 
+     * To protect users from being served malicious HTML or JavaScript, client-side code served from
+     *  HTML service executes in a security sandbox that imposes restrictions on the code. The method
+     *  HtmlOutput.setSandboxMode(mode) allows script authors to choose between
+     *  different versions of the sandbox. For more information, see the
+     *  guide to restrictions in HTML service.
+     * If a script does not set a sandbox mode, Apps Script uses NATIVE mode as the default.
+     *  Prior to February 2014, the default was EMULATED. The default is subject to change.
+     * The IFRAME mode imposes many fewer restrictions than the other sandbox modes and runs
+     *  fastest, but does not work at all in certain older browsers, including Internet Explorer 9. By
+     *  contrast, EMULATED mode is more likely to work in
+     *  older browsers that do not support ECMAScript 5 strict
+     *  mode, most notably Internet Explorer 9. NATIVE mode is the middle ground. If
+     *  NATIVE mode is set but not supported in the user's browser, the sandbox mode falls back
+     *  to EMULATED mode for that user.
+     * 
+     *      // Serve HTML with a defined sandbox mode (in Apps Script server-side code).
+     *      var output = HtmlService.createHtmlOutput('<b>Hello, world!</b>');
+     *      output.setSandboxMode(HtmlService.SandboxMode.IFRAME);
+     * 
+     * google.script.sandbox.mode
+     * 
+     *      <!-- Read the sandbox mode (in a client-side script). -->
+     *      <script>
+     *        alert(google.script.sandbox.mode);
+     *      </script>
+     */
+    export enum SandboxMode { EMULATED, IFRAME, NATIVE }
+
+  }
+}
+
+declare var HtmlService: GoogleAppsScript.HTML.HtmlService;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.jdbc.d.ts b/google-apps-script/google-apps-script.jdbc.d.ts
new file mode 100644
index 000000000..d4a90b8ba
--- /dev/null
+++ b/google-apps-script/google-apps-script.jdbc.d.ts
@@ -0,0 +1,902 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+
+declare module GoogleAppsScript {
+  export module JDBC {
+    /**
+     * The JDBC service allows scripts to connect to Google Cloud SQL, MySQL,
+     *  Microsoft SQL Server, and Oracle databases. For more information, see the
+     *  guide to JDBC.
+     */
+    export interface Jdbc {
+      getCloudSqlConnection(url: string): JdbcConnection;
+      getCloudSqlConnection(url: string, info: Object): JdbcConnection;
+      getCloudSqlConnection(url: string, userName: string, password: string): JdbcConnection;
+      getConnection(url: string): JdbcConnection;
+      getConnection(url: string, info: Object): JdbcConnection;
+      getConnection(url: string, userName: string, password: string): JdbcConnection;
+      newDate(milliseconds: Integer): JdbcDate;
+      newTime(milliseconds: Integer): JdbcTime;
+      newTimestamp(milliseconds: Integer): JdbcTimestamp;
+      parseDate(date: string): JdbcDate;
+      parseTime(time: string): JdbcTime;
+      parseTimestamp(timestamp: string): JdbcTimestamp;
+    }
+
+    /**
+     * A JDBC Array. For documentation of this class, see java.sql.Array.
+     */
+    export interface JdbcArray {
+      free(): void;
+      getArray(): Object;
+      getArray(index: Integer, count: Integer): Object;
+      getBaseType(): Integer;
+      getBaseTypeName(): string;
+      getResultSet(): JdbcResultSet;
+      getResultSet(index: Integer, count: Integer): JdbcResultSet;
+    }
+
+    /**
+     * A JDBC Blob. For documentation of this class, see java.sql.Blob.
+     */
+    export interface JdbcBlob {
+      free(): void;
+      getAppsScriptBlob(): Base.Blob;
+      getAs(contentType: string): Base.Blob;
+      getBytes(position: Integer, length: Integer): Byte[];
+      length(): Integer;
+      position(pattern: Byte[], start: Integer): Integer;
+      position(pattern: JdbcBlob, start: Integer): Integer;
+      setBytes(position: Integer, blobSource: Base.BlobSource): Integer;
+      setBytes(position: Integer, blobSource: Base.BlobSource, offset: Integer, length: Integer): Integer;
+      setBytes(position: Integer, bytes: Byte[]): Integer;
+      setBytes(position: Integer, bytes: Byte[], offset: Integer, length: Integer): Integer;
+      truncate(length: Integer): void;
+    }
+
+    /**
+     * A JDBC CallableStatement. For documentation of this class, see
+     *  java.sql.CallableStatement.
+     * See also
+     * 
+     *  CallableStatement
+     */
+    export interface JdbcCallableStatement {
+      addBatch(): void;
+      addBatch(sql: string): void;
+      cancel(): void;
+      clearBatch(): void;
+      clearParameters(): void;
+      clearWarnings(): void;
+      close(): void;
+      execute(): boolean;
+      execute(sql: string): boolean;
+      execute(sql: string, autoGeneratedKeys: Integer, sql_: string, columnIndexes: Integer[]): boolean;
+      execute(sql: string, autoGeneratedKeys: Integer, sql_: string, columnIndexes: Integer[]): boolean;
+      execute(sql: string, columnNames: String[]): boolean;
+      executeBatch(): Integer[];
+      executeQuery(): JdbcResultSet;
+      executeQuery(sql: string): JdbcResultSet;
+      executeUpdate(): Integer;
+      executeUpdate(sql: string): Integer;
+      executeUpdate(sql: string, autoGeneratedKeys: Integer, sql_: string, columnIndexes: Integer[]): Integer;
+      executeUpdate(sql: string, autoGeneratedKeys: Integer, sql_: string, columnIndexes: Integer[]): Integer;
+      executeUpdate(sql: string, columnNames: String[]): Integer;
+      getArray(parameterIndex: Integer): JdbcArray;
+      getArray(parameterName: string): JdbcArray;
+      getBigDecimal(parameterIndex: Integer): BigNumber;
+      getBigDecimal(parameterName: string): BigNumber;
+      getBlob(parameterIndex: Integer): JdbcBlob;
+      getBlob(parameterName: string): JdbcBlob;
+      getBoolean(parameterIndex: Integer): boolean;
+      getBoolean(parameterName: string): boolean;
+      getByte(parameterIndex: Integer): Byte;
+      getByte(parameterName: string): Byte;
+      getBytes(parameterIndex: Integer): Byte[];
+      getBytes(parameterName: string): Byte[];
+      getClob(parameterIndex: Integer): JdbcClob;
+      getClob(parameterName: string): JdbcClob;
+      getConnection(): JdbcConnection;
+      getDate(parameterIndex: Integer): JdbcDate;
+      getDate(parameterIndex: Integer, timeZone: string): JdbcDate;
+      getDate(parameterName: string): JdbcDate;
+      getDate(parameterName: string, timeZone: string): JdbcDate;
+      getDouble(parameterIndex: Integer): Number;
+      getDouble(parameterName: string): Number;
+      getFetchDirection(): Integer;
+      getFetchSize(): Integer;
+      getFloat(parameterIndex: Integer): Number;
+      getFloat(parameterName: string): Number;
+      getGeneratedKeys(): JdbcResultSet;
+      getInt(parameterIndex: Integer): Integer;
+      getInt(parameterName: string): Integer;
+      getLong(parameterIndex: Integer): Integer;
+      getLong(parameterName: string): Integer;
+      getMaxFieldSize(): Integer;
+      getMaxRows(): Integer;
+      getMetaData(): JdbcResultSetMetaData;
+      getMoreResults(): boolean;
+      getMoreResults(current: Integer): boolean;
+      getNClob(parameterIndex: Integer): JdbcClob;
+      getNClob(parameterName: string): JdbcClob;
+      getNString(parameterIndex: Integer): string;
+      getNString(parameterName: string): string;
+      getObject(parameterIndex: Integer): Object;
+      getObject(parameterName: string): Object;
+      getParameterMetaData(): JdbcParameterMetaData;
+      getQueryTimeout(): Integer;
+      getRef(parameterIndex: Integer): JdbcRef;
+      getRef(parameterName: string): JdbcRef;
+      getResultSet(): JdbcResultSet;
+      getResultSetConcurrency(): Integer;
+      getResultSetHoldability(): Integer;
+      getResultSetType(): Integer;
+      getRowId(parameterIndex: Integer): JdbcRowId;
+      getRowId(parameterName: string): JdbcRowId;
+      getSQLXML(parameterIndex: Integer): JdbcSQLXML;
+      getSQLXML(parameterName: string): JdbcSQLXML;
+      getShort(parameterIndex: Integer): Integer;
+      getShort(parameterName: string): Integer;
+      getString(parameterIndex: Integer): string;
+      getString(parameterName: string): string;
+      getTime(parameterIndex: Integer): JdbcTime;
+      getTime(parameterIndex: Integer, timeZone: string): JdbcTime;
+      getTime(parameterName: string): JdbcTime;
+      getTime(parameterName: string, timeZone: string): JdbcTime;
+      getTimestamp(parameterIndex: Integer): JdbcTimestamp;
+      getTimestamp(parameterIndex: Integer, timeZone: string): JdbcTimestamp;
+      getTimestamp(parameterName: string): JdbcTimestamp;
+      getTimestamp(parameterName: string, timeZone: string): JdbcTimestamp;
+      getURL(parameterIndex: Integer): string;
+      getURL(parameterName: string): string;
+      getUpdateCount(): Integer;
+      getWarnings(): String[];
+      isClosed(): boolean;
+      isPoolable(): boolean;
+      registerOutParameter(parameterIndex: Integer, sqlType: Integer): void;
+      registerOutParameter(parameterIndex: Integer, sqlType: Integer, scale: Integer): void;
+      registerOutParameter(parameterIndex: Integer, sqlType: Integer, typeName: string): void;
+      registerOutParameter(parameterName: string, sqlType: Integer): void;
+      registerOutParameter(parameterName: string, sqlType: Integer, scale: Integer): void;
+      registerOutParameter(parameterName: string, sqlType: Integer, typeName: string): void;
+      setArray(parameterIndex: Integer, x: JdbcArray): void;
+      setBigDecimal(parameterIndex: Integer, x: BigNumber): void;
+      setBigDecimal(parameterName: string, x: BigNumber): void;
+      setBlob(parameterIndex: Integer, x: JdbcBlob): void;
+      setBlob(parameterName: string, x: JdbcBlob): void;
+      setBoolean(parameterIndex: Integer, x: boolean): void;
+      setBoolean(parameterName: string, x: boolean): void;
+      setByte(parameterIndex: Integer, x: Byte): void;
+      setByte(parameterName: string, x: Byte): void;
+      setBytes(parameterIndex: Integer, x: Byte[]): void;
+      setBytes(parameterName: string, x: Byte[]): void;
+      setClob(parameterIndex: Integer, x: JdbcClob): void;
+      setClob(parameterName: string, x: JdbcClob): void;
+      setCursorName(name: string): void;
+      setDate(parameterIndex: Integer, x: JdbcDate): void;
+      setDate(parameterIndex: Integer, x: JdbcDate, timeZone: string): void;
+      setDate(parameterName: string, x: JdbcDate): void;
+      setDate(parameterName: string, x: JdbcDate, timeZone: string): void;
+      setDouble(parameterIndex: Integer, x: Number): void;
+      setDouble(parameterName: string, x: Number): void;
+      setEscapeProcessing(enable: boolean): void;
+      setFetchDirection(direction: Integer): void;
+      setFetchSize(rows: Integer): void;
+      setFloat(parameterIndex: Integer, x: Number): void;
+      setFloat(parameterName: string, x: Number): void;
+      setInt(parameterIndex: Integer, x: Integer): void;
+      setInt(parameterName: string, x: Integer): void;
+      setLong(parameterIndex: Integer, x: Integer): void;
+      setLong(parameterName: string, x: Integer): void;
+      setMaxFieldSize(max: Integer): void;
+      setMaxRows(max: Integer): void;
+      setNClob(parameterIndex: Integer, x: JdbcClob): void;
+      setNClob(parameterName: string, value: JdbcClob): void;
+      setNString(parameterIndex: Integer, x: string): void;
+      setNString(parameterName: string, value: string): void;
+      setNull(parameterIndex: Integer, sqlType: Integer): void;
+      setNull(parameterIndex: Integer, sqlType: Integer, typeName: string): void;
+      setNull(parameterName: string, sqlType: Integer): void;
+      setNull(parameterName: string, sqlType: Integer, typeName: string): void;
+      setObject(index: Integer, x: Object): void;
+      setObject(parameterIndex: Integer, x: Object, targetSqlType: Integer): void;
+      setObject(parameterIndex: Integer, x: Object, targetSqlType: Integer, scaleOrLength: Integer): void;
+      setObject(parameterName: string, x: Object): void;
+      setObject(parameterName: string, x: Object, targetSqlType: Integer): void;
+      setObject(parameterName: string, x: Object, targetSqlType: Integer, scale: Integer): void;
+      setPoolable(poolable: boolean): void;
+      setQueryTimeout(seconds: Integer): void;
+      setRef(parameterIndex: Integer, x: JdbcRef): void;
+      setRowId(parameterIndex: Integer, x: JdbcRowId): void;
+      setRowId(parameterName: string, x: JdbcRowId): void;
+      setSQLXML(parameterIndex: Integer, x: JdbcSQLXML): void;
+      setSQLXML(parameterName: string, xmlObject: JdbcSQLXML): void;
+      setShort(parameterIndex: Integer, x: Integer): void;
+      setShort(parameterName: string, x: Integer): void;
+      setString(parameterIndex: Integer, x: string): void;
+      setString(parameterName: string, x: string): void;
+      setTime(parameterIndex: Integer, x: JdbcTime): void;
+      setTime(parameterIndex: Integer, x: JdbcTime, timeZone: string): void;
+      setTime(parameterName: string, x: JdbcTime): void;
+      setTime(parameterName: string, x: JdbcTime, timeZone: string): void;
+      setTimestamp(parameterIndex: Integer, x: JdbcTimestamp): void;
+      setTimestamp(parameterIndex: Integer, x: JdbcTimestamp, timeZone: string): void;
+      setTimestamp(parameterName: string, x: JdbcTimestamp): void;
+      setTimestamp(parameterName: string, x: JdbcTimestamp, timeZone: string): void;
+      setURL(parameterIndex: Integer, x: string): void;
+      setURL(parameterName: string, val: string): void;
+      wasNull(): boolean;
+    }
+
+    /**
+     * A JDBC Clob. For documentation of this class, see java.sql.Clob.
+     */
+    export interface JdbcClob {
+      free(): void;
+      getAppsScriptBlob(): Base.Blob;
+      getAs(contentType: string): Base.Blob;
+      getSubString(position: Integer, length: Integer): string;
+      length(): Integer;
+      position(search: JdbcClob, start: Integer): Integer;
+      position(search: string, start: Integer): Integer;
+      setString(position: Integer, blobSource: Base.BlobSource): Integer;
+      setString(position: Integer, blobSource: Base.BlobSource, offset: Integer, len: Integer): Integer;
+      setString(position: Integer, value: string): Integer;
+      setString(position: Integer, value: string, offset: Integer, len: Integer): Integer;
+      truncate(length: Integer): void;
+    }
+
+    /**
+     * A JDBC Connection. For documentation of this class, see java.sql.Connection.
+     */
+    export interface JdbcConnection {
+      clearWarnings(): void;
+      close(): void;
+      commit(): void;
+      createArrayOf(typeName: string, elements: Object[]): JdbcArray;
+      createBlob(): JdbcBlob;
+      createClob(): JdbcClob;
+      createNClob(): JdbcClob;
+      createSQLXML(): JdbcSQLXML;
+      createStatement(): JdbcStatement;
+      createStatement(resultSetType: Integer, resultSetConcurrency: Integer): JdbcStatement;
+      createStatement(resultSetType: Integer, resultSetConcurrency: Integer, resultSetHoldability: Integer): JdbcStatement;
+      createStruct(typeName: string, attributes: Object[]): JdbcStruct;
+      getAutoCommit(): boolean;
+      getCatalog(): string;
+      getHoldability(): Integer;
+      getMetaData(): JdbcDatabaseMetaData;
+      getTransactionIsolation(): Integer;
+      getWarnings(): String[];
+      isClosed(): boolean;
+      isReadOnly(): boolean;
+      isValid(timeout: Integer): boolean;
+      nativeSQL(sql: string): string;
+      prepareCall(sql: string): JdbcCallableStatement;
+      prepareCall(sql: string, resultSetType: Integer, resultSetConcurrency: Integer): JdbcCallableStatement;
+      prepareCall(sql: string, resultSetType: Integer, resultSetConcurrency: Integer, resultSetHoldability: Integer): JdbcCallableStatement;
+      prepareStatement(sql: string): JdbcPreparedStatement;
+      prepareStatement(sql: string, autoGeneratedKeys: Integer): JdbcPreparedStatement;
+      prepareStatement(sql: string, resultSetType: Integer, resultSetConcurrency: Integer): JdbcPreparedStatement;
+      prepareStatement(sql: string, resultSetType: Integer, resultSetConcurrency: Integer, resultSetHoldability: Integer): JdbcPreparedStatement;
+      prepareStatementByIndex(sql: string, indices: Integer[]): JdbcPreparedStatement;
+      prepareStatementByName(sql: string, columnNames: String[]): JdbcPreparedStatement;
+      releaseSavepoint(savepoint: JdbcSavepoint): void;
+      rollback(): void;
+      rollback(savepoint: JdbcSavepoint): void;
+      setAutoCommit(autoCommit: boolean): void;
+      setCatalog(catalog: string): void;
+      setHoldability(holdability: Integer): void;
+      setReadOnly(readOnly: boolean): void;
+      setSavepoint(): JdbcSavepoint;
+      setSavepoint(name: string): JdbcSavepoint;
+      setTransactionIsolation(level: Integer): void;
+    }
+
+    /**
+     * A JDBC DatabaseMetaData. For documentation of this class, see
+     *  java.sql.DatabaseMetaData.
+     */
+    export interface JdbcDatabaseMetaData {
+      allProceduresAreCallable(): boolean;
+      allTablesAreSelectable(): boolean;
+      autoCommitFailureClosesAllResultSets(): boolean;
+      dataDefinitionCausesTransactionCommit(): boolean;
+      dataDefinitionIgnoredInTransactions(): boolean;
+      deletesAreDetected(type: Integer): boolean;
+      doesMaxRowSizeIncludeBlobs(): boolean;
+      getAttributes(catalog: string, schemaPattern: string, typeNamePattern: string, attributeNamePattern: string): JdbcResultSet;
+      getBestRowIdentifier(catalog: string, schema: string, table: string, scope: Integer, nullable: boolean): JdbcResultSet;
+      getCatalogSeparator(): string;
+      getCatalogTerm(): string;
+      getCatalogs(): JdbcResultSet;
+      getClientInfoProperties(): JdbcResultSet;
+      getColumnPrivileges(catalog: string, schema: string, table: string, columnNamePattern: string): JdbcResultSet;
+      getColumns(catalog: string, schemaPattern: string, tableNamePattern: string, columnNamePattern: string): JdbcResultSet;
+      getConnection(): JdbcConnection;
+      getCrossReference(parentCatalog: string, parentSchema: string, parentTable: string, foreignCatalog: string, foreignSchema: string, foreignTable: string): JdbcResultSet;
+      getDatabaseMajorVersion(): Integer;
+      getDatabaseMinorVersion(): Integer;
+      getDatabaseProductName(): string;
+      getDatabaseProductVersion(): string;
+      getDefaultTransactionIsolation(): Integer;
+      getDriverMajorVersion(): Integer;
+      getDriverMinorVersion(): Integer;
+      getDriverName(): string;
+      getDriverVersion(): string;
+      getExportedKeys(catalog: string, schema: string, table: string): JdbcResultSet;
+      getExtraNameCharacters(): string;
+      getFunctionColumns(catalog: string, schemaPattern: string, functionNamePattern: string, columnNamePattern: string): JdbcResultSet;
+      getFunctions(catalog: string, schemaPattern: string, functionNamePattern: string): JdbcResultSet;
+      getIdentifierQuoteString(): string;
+      getImportedKeys(catalog: string, schema: string, table: string): JdbcResultSet;
+      getIndexInfo(catalog: string, schema: string, table: string, unique: boolean, approximate: boolean): JdbcResultSet;
+      getJDBCMajorVersion(): Integer;
+      getJDBCMinorVersion(): Integer;
+      getMaxBinaryLiteralLength(): Integer;
+      getMaxCatalogNameLength(): Integer;
+      getMaxCharLiteralLength(): Integer;
+      getMaxColumnNameLength(): Integer;
+      getMaxColumnsInGroupBy(): Integer;
+      getMaxColumnsInIndex(): Integer;
+      getMaxColumnsInOrderBy(): Integer;
+      getMaxColumnsInSelect(): Integer;
+      getMaxColumnsInTable(): Integer;
+      getMaxConnections(): Integer;
+      getMaxCursorNameLength(): Integer;
+      getMaxIndexLength(): Integer;
+      getMaxProcedureNameLength(): Integer;
+      getMaxRowSize(): Integer;
+      getMaxSchemaNameLength(): Integer;
+      getMaxStatementLength(): Integer;
+      getMaxStatements(): Integer;
+      getMaxTableNameLength(): Integer;
+      getMaxTablesInSelect(): Integer;
+      getMaxUserNameLength(): Integer;
+      getNumericFunctions(): string;
+      getPrimaryKeys(catalog: string, schema: string, table: string): JdbcResultSet;
+      getProcedureColumns(catalog: string, schemaPattern: string, procedureNamePattern: string, columnNamePattern: string): JdbcResultSet;
+      getProcedureTerm(): string;
+      getProcedures(catalog: string, schemaPattern: string, procedureNamePattern: string): JdbcResultSet;
+      getResultSetHoldability(): Integer;
+      getRowIdLifetime(): Integer;
+      getSQLKeywords(): string;
+      getSQLStateType(): Integer;
+      getSchemaTerm(): string;
+      getSchemas(): JdbcResultSet;
+      getSchemas(catalog: string, schemaPattern: string): JdbcResultSet;
+      getSearchStringEscape(): string;
+      getStringFunctions(): string;
+      getSuperTables(catalog: string, schemaPattern: string, tableNamePattern: string): JdbcResultSet;
+      getSuperTypes(catalog: string, schemaPattern: string, typeNamePattern: string): JdbcResultSet;
+      getSystemFunctions(): string;
+      getTablePrivileges(catalog: string, schemaPattern: string, tableNamePattern: string): JdbcResultSet;
+      getTableTypes(): JdbcResultSet;
+      getTables(catalog: string, schemaPattern: string, tableNamePattern: string, types: String[]): JdbcResultSet;
+      getTimeDateFunctions(): string;
+      getTypeInfo(): JdbcResultSet;
+      getUDTs(catalog: string, schemaPattern: string, typeNamePattern: string, types: Integer[]): JdbcResultSet;
+      getURL(): string;
+      getUserName(): string;
+      getVersionColumns(catalog: string, schema: string, table: string): JdbcResultSet;
+      insertsAreDetected(type: Integer): boolean;
+      isCatalogAtStart(): boolean;
+      isReadOnly(): boolean;
+      locatorsUpdateCopy(): boolean;
+      nullPlusNonNullIsNull(): boolean;
+      nullsAreSortedAtEnd(): boolean;
+      nullsAreSortedAtStart(): boolean;
+      nullsAreSortedHigh(): boolean;
+      nullsAreSortedLow(): boolean;
+      othersDeletesAreVisible(type: Integer): boolean;
+      othersInsertsAreVisible(type: Integer): boolean;
+      othersUpdatesAreVisible(type: Integer): boolean;
+      ownDeletesAreVisible(type: Integer): boolean;
+      ownInsertsAreVisible(type: Integer): boolean;
+      ownUpdatesAreVisible(type: Integer): boolean;
+      storesLowerCaseIdentifiers(): boolean;
+      storesLowerCaseQuotedIdentifiers(): boolean;
+      storesMixedCaseIdentifiers(): boolean;
+      storesMixedCaseQuotedIdentifiers(): boolean;
+      storesUpperCaseIdentifiers(): boolean;
+      storesUpperCaseQuotedIdentifiers(): boolean;
+      supportsANSI92EntryLevelSQL(): boolean;
+      supportsANSI92FullSQL(): boolean;
+      supportsANSI92IntermediateSQL(): boolean;
+      supportsAlterTableWithAddColumn(): boolean;
+      supportsAlterTableWithDropColumn(): boolean;
+      supportsBatchUpdates(): boolean;
+      supportsCatalogsInDataManipulation(): boolean;
+      supportsCatalogsInIndexDefinitions(): boolean;
+      supportsCatalogsInPrivilegeDefinitions(): boolean;
+      supportsCatalogsInProcedureCalls(): boolean;
+      supportsCatalogsInTableDefinitions(): boolean;
+      supportsColumnAliasing(): boolean;
+      supportsConvert(): boolean;
+      supportsConvert(fromType: Integer, toType: Integer): boolean;
+      supportsCoreSQLGrammar(): boolean;
+      supportsCorrelatedSubqueries(): boolean;
+      supportsDataDefinitionAndDataManipulationTransactions(): boolean;
+      supportsDataManipulationTransactionsOnly(): boolean;
+      supportsDifferentTableCorrelationNames(): boolean;
+      supportsExpressionsInOrderBy(): boolean;
+      supportsExtendedSQLGrammar(): boolean;
+      supportsFullOuterJoins(): boolean;
+      supportsGetGeneratedKeys(): boolean;
+      supportsGroupBy(): boolean;
+      supportsGroupByBeyondSelect(): boolean;
+      supportsGroupByUnrelated(): boolean;
+      supportsIntegrityEnhancementFacility(): boolean;
+      supportsLikeEscapeClause(): boolean;
+      supportsLimitedOuterJoins(): boolean;
+      supportsMinimumSQLGrammar(): boolean;
+      supportsMixedCaseIdentifiers(): boolean;
+      supportsMixedCaseQuotedIdentifiers(): boolean;
+      supportsMultipleOpenResults(): boolean;
+      supportsMultipleResultSets(): boolean;
+      supportsMultipleTransactions(): boolean;
+      supportsNamedParameters(): boolean;
+      supportsNonNullableColumns(): boolean;
+      supportsOpenCursorsAcrossCommit(): boolean;
+      supportsOpenCursorsAcrossRollback(): boolean;
+      supportsOpenStatementsAcrossCommit(): boolean;
+      supportsOpenStatementsAcrossRollback(): boolean;
+      supportsOrderByUnrelated(): boolean;
+      supportsOuterJoins(): boolean;
+      supportsPositionedDelete(): boolean;
+      supportsPositionedUpdate(): boolean;
+      supportsResultSetConcurrency(type: Integer, concurrency: Integer): boolean;
+      supportsResultSetHoldability(holdability: Integer): boolean;
+      supportsResultSetType(type: Integer): boolean;
+      supportsSavepoints(): boolean;
+      supportsSchemasInDataManipulation(): boolean;
+      supportsSchemasInIndexDefinitions(): boolean;
+      supportsSchemasInPrivilegeDefinitions(): boolean;
+      supportsSchemasInProcedureCalls(): boolean;
+      supportsSchemasInTableDefinitions(): boolean;
+      supportsSelectForUpdate(): boolean;
+      supportsStatementPooling(): boolean;
+      supportsStoredFunctionsUsingCallSyntax(): boolean;
+      supportsStoredProcedures(): boolean;
+      supportsSubqueriesInComparisons(): boolean;
+      supportsSubqueriesInExists(): boolean;
+      supportsSubqueriesInIns(): boolean;
+      supportsSubqueriesInQuantifieds(): boolean;
+      supportsTableCorrelationNames(): boolean;
+      supportsTransactionIsolationLevel(level: Integer): boolean;
+      supportsTransactions(): boolean;
+      supportsUnion(): boolean;
+      supportsUnionAll(): boolean;
+      updatesAreDetected(type: Integer): boolean;
+      usesLocalFilePerTable(): boolean;
+      usesLocalFiles(): boolean;
+    }
+
+    /**
+     * A JDBC Date. For documentation of this class, see java.sql.Date.
+     */
+    export interface JdbcDate {
+      after(when: JdbcDate): boolean;
+      before(when: JdbcDate): boolean;
+      getDate(): Integer;
+      getMonth(): Integer;
+      getTime(): Integer;
+      getYear(): Integer;
+      setDate(date: Integer): void;
+      setMonth(month: Integer): void;
+      setTime(milliseconds: Integer): void;
+      setYear(year: Integer): void;
+    }
+
+    /**
+     * A JDBC ParameterMetaData. For documentation of this class, see
+     *  java.sql.ParameterMetaData.
+     */
+    export interface JdbcParameterMetaData {
+      getParameterClassName(param: Integer): string;
+      getParameterCount(): Integer;
+      getParameterMode(param: Integer): Integer;
+      getParameterType(param: Integer): Integer;
+      getParameterTypeName(param: Integer): string;
+      getPrecision(param: Integer): Integer;
+      getScale(param: Integer): Integer;
+      isNullable(param: Integer): Integer;
+      isSigned(param: Integer): boolean;
+    }
+
+    /**
+     * A JDBC PreparedStatement. For documentation of this class, see
+     *  java.sql.PreparedStatement.
+     */
+    export interface JdbcPreparedStatement {
+      addBatch(): void;
+      addBatch(sql: string): void;
+      cancel(): void;
+      clearBatch(): void;
+      clearParameters(): void;
+      clearWarnings(): void;
+      close(): void;
+      execute(): boolean;
+      execute(sql: string): boolean;
+      execute(sql: string, autoGeneratedKeys: Integer, sql_: string, columnIndexes: Integer[]): boolean;
+      execute(sql: string, autoGeneratedKeys: Integer, sql_: string, columnIndexes: Integer[]): boolean;
+      execute(sql: string, columnNames: String[]): boolean;
+      executeBatch(): Integer[];
+      executeQuery(): JdbcResultSet;
+      executeQuery(sql: string): JdbcResultSet;
+      executeUpdate(): Integer;
+      executeUpdate(sql: string): Integer;
+      executeUpdate(sql: string, autoGeneratedKeys: Integer, sql_: string, columnIndexes: Integer[]): Integer;
+      executeUpdate(sql: string, autoGeneratedKeys: Integer, sql_: string, columnIndexes: Integer[]): Integer;
+      executeUpdate(sql: string, columnNames: String[]): Integer;
+      getConnection(): JdbcConnection;
+      getFetchDirection(): Integer;
+      getFetchSize(): Integer;
+      getGeneratedKeys(): JdbcResultSet;
+      getMaxFieldSize(): Integer;
+      getMaxRows(): Integer;
+      getMetaData(): JdbcResultSetMetaData;
+      getMoreResults(): boolean;
+      getMoreResults(current: Integer): boolean;
+      getParameterMetaData(): JdbcParameterMetaData;
+      getQueryTimeout(): Integer;
+      getResultSet(): JdbcResultSet;
+      getResultSetConcurrency(): Integer;
+      getResultSetHoldability(): Integer;
+      getResultSetType(): Integer;
+      getUpdateCount(): Integer;
+      getWarnings(): String[];
+      isClosed(): boolean;
+      isPoolable(): boolean;
+      setArray(parameterIndex: Integer, x: JdbcArray): void;
+      setBigDecimal(parameterIndex: Integer, x: BigNumber): void;
+      setBlob(parameterIndex: Integer, x: JdbcBlob): void;
+      setBoolean(parameterIndex: Integer, x: boolean): void;
+      setByte(parameterIndex: Integer, x: Byte): void;
+      setBytes(parameterIndex: Integer, x: Byte[]): void;
+      setClob(parameterIndex: Integer, x: JdbcClob): void;
+      setCursorName(name: string): void;
+      setDate(parameterIndex: Integer, x: JdbcDate): void;
+      setDate(parameterIndex: Integer, x: JdbcDate, timeZone: string): void;
+      setDouble(parameterIndex: Integer, x: Number): void;
+      setEscapeProcessing(enable: boolean): void;
+      setFetchDirection(direction: Integer): void;
+      setFetchSize(rows: Integer): void;
+      setFloat(parameterIndex: Integer, x: Number): void;
+      setInt(parameterIndex: Integer, x: Integer): void;
+      setLong(parameterIndex: Integer, x: Integer): void;
+      setMaxFieldSize(max: Integer): void;
+      setMaxRows(max: Integer): void;
+      setNClob(parameterIndex: Integer, x: JdbcClob): void;
+      setNString(parameterIndex: Integer, x: string): void;
+      setNull(parameterIndex: Integer, sqlType: Integer): void;
+      setNull(parameterIndex: Integer, sqlType: Integer, typeName: string): void;
+      setObject(index: Integer, x: Object): void;
+      setObject(parameterIndex: Integer, x: Object, targetSqlType: Integer): void;
+      setObject(parameterIndex: Integer, x: Object, targetSqlType: Integer, scaleOrLength: Integer): void;
+      setPoolable(poolable: boolean): void;
+      setQueryTimeout(seconds: Integer): void;
+      setRef(parameterIndex: Integer, x: JdbcRef): void;
+      setRowId(parameterIndex: Integer, x: JdbcRowId): void;
+      setSQLXML(parameterIndex: Integer, x: JdbcSQLXML): void;
+      setShort(parameterIndex: Integer, x: Integer): void;
+      setString(parameterIndex: Integer, x: string): void;
+      setTime(parameterIndex: Integer, x: JdbcTime): void;
+      setTime(parameterIndex: Integer, x: JdbcTime, timeZone: string): void;
+      setTimestamp(parameterIndex: Integer, x: JdbcTimestamp): void;
+      setTimestamp(parameterIndex: Integer, x: JdbcTimestamp, timeZone: string): void;
+      setURL(parameterIndex: Integer, x: string): void;
+    }
+
+    /**
+     * A JDBC Ref. For documentation of this class, see java.sql.Ref.
+     */
+    export interface JdbcRef {
+      getBaseTypeName(): string;
+      getObject(): Object;
+      setObject(object: Object): void;
+    }
+
+    /**
+     * A JDBC ResultSet. For documentation of this class, see java.sql.ResultSet.
+     */
+    export interface JdbcResultSet {
+      absolute(row: Integer): boolean;
+      afterLast(): void;
+      beforeFirst(): void;
+      cancelRowUpdates(): void;
+      clearWarnings(): void;
+      close(): void;
+      deleteRow(): void;
+      findColumn(columnLabel: string): Integer;
+      first(): boolean;
+      getArray(columnIndex: Integer): JdbcArray;
+      getArray(columnLabel: string): JdbcArray;
+      getBigDecimal(columnIndex: Integer): BigNumber;
+      getBigDecimal(columnLabel: string): BigNumber;
+      getBlob(columnIndex: Integer): JdbcBlob;
+      getBlob(columnLabel: string): JdbcBlob;
+      getBoolean(columnIndex: Integer): boolean;
+      getBoolean(columnLabel: string): boolean;
+      getByte(columnIndex: Integer): Byte;
+      getByte(columnLabel: string): Byte;
+      getBytes(columnIndex: Integer): Byte[];
+      getBytes(columnLabel: string): Byte[];
+      getClob(columnIndex: Integer): JdbcClob;
+      getClob(columnLabel: string): JdbcClob;
+      getConcurrency(): Integer;
+      getCursorName(): string;
+      getDate(columnIndex: Integer): JdbcDate;
+      getDate(columnIndex: Integer, timeZone: string): JdbcDate;
+      getDate(columnLabel: string): JdbcDate;
+      getDate(columnLabel: string, timeZone: string): JdbcDate;
+      getDouble(columnIndex: Integer): Number;
+      getDouble(columnLabel: string): Number;
+      getFetchDirection(): Integer;
+      getFetchSize(): Integer;
+      getFloat(columnIndex: Integer): Number;
+      getFloat(columnLabel: string): Number;
+      getHoldability(): Integer;
+      getInt(columnIndex: Integer): Integer;
+      getInt(columnLabel: string): Integer;
+      getLong(columnIndex: Integer): Integer;
+      getLong(columnLabel: string): Integer;
+      getMetaData(): JdbcResultSetMetaData;
+      getNClob(columnIndex: Integer): JdbcClob;
+      getNClob(columnLabel: string): JdbcClob;
+      getNString(columnIndex: Integer): string;
+      getNString(columnLabel: string): string;
+      getObject(columnIndex: Integer): Object;
+      getObject(columnLabel: string): Object;
+      getRef(columnIndex: Integer): JdbcRef;
+      getRef(columnLabel: string): JdbcRef;
+      getRow(): Integer;
+      getRowId(columnIndex: Integer): JdbcRowId;
+      getRowId(columnLabel: string): JdbcRowId;
+      getSQLXML(columnIndex: Integer): JdbcSQLXML;
+      getSQLXML(columnLabel: string): JdbcSQLXML;
+      getShort(columnIndex: Integer): Integer;
+      getShort(columnLabel: string): Integer;
+      getStatement(): JdbcStatement;
+      getString(columnIndex: Integer): string;
+      getString(columnLabel: string): string;
+      getTime(columnIndex: Integer): JdbcTime;
+      getTime(columnIndex: Integer, timeZone: string): JdbcTime;
+      getTime(columnLabel: string): JdbcTime;
+      getTime(columnLabel: string, timeZone: string): JdbcTime;
+      getTimestamp(columnIndex: Integer): JdbcTimestamp;
+      getTimestamp(columnIndex: Integer, timeZone: string): JdbcTimestamp;
+      getTimestamp(columnLabel: string): JdbcTimestamp;
+      getTimestamp(columnLabel: string, timeZone: string): JdbcTimestamp;
+      getType(): Integer;
+      getURL(columnIndex: Integer): string;
+      getURL(columnLabel: string): string;
+      getWarnings(): String[];
+      insertRow(): void;
+      isAfterLast(): boolean;
+      isBeforeFirst(): boolean;
+      isClosed(): boolean;
+      isFirst(): boolean;
+      isLast(): boolean;
+      last(): boolean;
+      moveToCurrentRow(): void;
+      moveToInsertRow(): void;
+      next(): boolean;
+      previous(): boolean;
+      refreshRow(): void;
+      relative(rows: Integer): boolean;
+      rowDeleted(): boolean;
+      rowInserted(): boolean;
+      rowUpdated(): boolean;
+      setFetchDirection(direction: Integer): void;
+      setFetchSize(rows: Integer): void;
+      updateArray(columnIndex: Integer, x: JdbcArray): void;
+      updateArray(columnLabel: string, x: JdbcArray): void;
+      updateBigDecimal(columnIndex: Integer, x: BigNumber): void;
+      updateBigDecimal(columnLabel: string, x: BigNumber): void;
+      updateBlob(columnIndex: Integer, x: JdbcBlob): void;
+      updateBlob(columnLabel: string, x: JdbcBlob): void;
+      updateBoolean(columnIndex: Integer, x: boolean): void;
+      updateBoolean(columnLabel: string, x: boolean): void;
+      updateByte(columnIndex: Integer, x: Byte): void;
+      updateByte(columnLabel: string, x: Byte): void;
+      updateBytes(columnIndex: Integer, x: Byte[]): void;
+      updateBytes(columnLabel: string, x: Byte[]): void;
+      updateClob(columnIndex: Integer, x: JdbcClob): void;
+      updateClob(columnLabel: string, x: JdbcClob): void;
+      updateDate(columnIndex: Integer, x: JdbcDate): void;
+      updateDate(columnLabel: string, x: JdbcDate): void;
+      updateDouble(columnIndex: Integer, x: Number): void;
+      updateDouble(columnLabel: string, x: Number): void;
+      updateFloat(columnIndex: Integer, x: Number): void;
+      updateFloat(columnLabel: string, x: Number): void;
+      updateInt(columnIndex: Integer, x: Integer): void;
+      updateInt(columnLabel: string, x: Integer): void;
+      updateLong(columnIndex: Integer, x: Integer): void;
+      updateLong(columnLabel: string, x: Integer): void;
+      updateNClob(columnIndex: Integer, x: JdbcClob): void;
+      updateNClob(columnLabel: string, x: JdbcClob): void;
+      updateNString(columnIndex: Integer, x: string): void;
+      updateNString(columnLabel: string, x: string): void;
+      updateNull(columnIndex: Integer): void;
+      updateNull(columnLabel: string): void;
+      updateObject(columnIndex: Integer, x: Object): void;
+      updateObject(columnIndex: Integer, x: Object, scaleOrLength: Integer): void;
+      updateObject(columnLabel: string, x: Object): void;
+      updateObject(columnLabel: string, x: Object, scaleOrLength: Integer): void;
+      updateRef(columnIndex: Integer, x: JdbcRef): void;
+      updateRef(columnLabel: string, x: JdbcRef): void;
+      updateRow(): void;
+      updateRowId(columnIndex: Integer, x: JdbcRowId): void;
+      updateRowId(columnLabel: string, x: JdbcRowId): void;
+      updateSQLXML(columnIndex: Integer, x: JdbcSQLXML): void;
+      updateSQLXML(columnLabel: string, x: JdbcSQLXML): void;
+      updateShort(columnIndex: Integer, x: Integer): void;
+      updateShort(columnLabel: string, x: Integer): void;
+      updateString(columnIndex: Integer, x: string): void;
+      updateString(columnLabel: string, x: string): void;
+      updateTime(columnIndex: Integer, x: JdbcTime): void;
+      updateTime(columnLabel: string, x: JdbcTime): void;
+      updateTimestamp(columnIndex: Integer, x: JdbcTimestamp): void;
+      updateTimestamp(columnLabel: string, x: JdbcTimestamp): void;
+      wasNull(): boolean;
+    }
+
+    /**
+     * A JDBC ResultSetMetaData. For documentation of this class, see
+     *  java.sql.ResultSetMetaData.
+     */
+    export interface JdbcResultSetMetaData {
+      getCatalogName(column: Integer): string;
+      getColumnClassName(column: Integer): string;
+      getColumnCount(): Integer;
+      getColumnDisplaySize(column: Integer): Integer;
+      getColumnLabel(column: Integer): string;
+      getColumnName(column: Integer): string;
+      getColumnType(column: Integer): Integer;
+      getColumnTypeName(column: Integer): string;
+      getPrecision(column: Integer): Integer;
+      getScale(column: Integer): Integer;
+      getSchemaName(column: Integer): string;
+      getTableName(column: Integer): string;
+      isAutoIncrement(column: Integer): boolean;
+      isCaseSensitive(column: Integer): boolean;
+      isCurrency(column: Integer): boolean;
+      isDefinitelyWritable(column: Integer): boolean;
+      isNullable(column: Integer): Integer;
+      isReadOnly(column: Integer): boolean;
+      isSearchable(column: Integer): boolean;
+      isSigned(column: Integer): boolean;
+      isWritable(column: Integer): boolean;
+    }
+
+    /**
+     * A JDBC RowId. For documentation of this class, see java.sql.RowId.
+     */
+    export interface JdbcRowId {
+      getBytes(): Byte[];
+    }
+
+    /**
+     * A JDBC SQLXML. For documentation of this class, see java.sql.SQLXML.
+     */
+    export interface JdbcSQLXML {
+      free(): void;
+      getString(): string;
+      setString(value: string): void;
+    }
+
+    /**
+     * A JDBC Savepoint. For documentation of this class, see java.sql.Savepoint.
+     * See also
+     * 
+     * Savepoint
+     */
+    export interface JdbcSavepoint {
+      getSavepointId(): Integer;
+      getSavepointName(): string;
+    }
+
+    /**
+     * A JDBC Statement. For documentation of this class, see java.sql.Statement.
+     */
+    export interface JdbcStatement {
+      addBatch(sql: string): void;
+      cancel(): void;
+      clearBatch(): void;
+      clearWarnings(): void;
+      close(): void;
+      execute(sql: string): boolean;
+      execute(sql: string, autoGeneratedKeys: Integer, sql_: string, columnIndexes: Integer[]): boolean;
+      execute(sql: string, autoGeneratedKeys: Integer, sql_: string, columnIndexes: Integer[]): boolean;
+      execute(sql: string, columnNames: String[]): boolean;
+      executeBatch(): Integer[];
+      executeQuery(sql: string): JdbcResultSet;
+      executeUpdate(sql: string): Integer;
+      executeUpdate(sql: string, autoGeneratedKeys: Integer, sql_: string, columnIndexes: Integer[]): Integer;
+      executeUpdate(sql: string, autoGeneratedKeys: Integer, sql_: string, columnIndexes: Integer[]): Integer;
+      executeUpdate(sql: string, columnNames: String[]): Integer;
+      getConnection(): JdbcConnection;
+      getFetchDirection(): Integer;
+      getFetchSize(): Integer;
+      getGeneratedKeys(): JdbcResultSet;
+      getMaxFieldSize(): Integer;
+      getMaxRows(): Integer;
+      getMoreResults(): boolean;
+      getMoreResults(current: Integer): boolean;
+      getQueryTimeout(): Integer;
+      getResultSet(): JdbcResultSet;
+      getResultSetConcurrency(): Integer;
+      getResultSetHoldability(): Integer;
+      getResultSetType(): Integer;
+      getUpdateCount(): Integer;
+      getWarnings(): String[];
+      isClosed(): boolean;
+      isPoolable(): boolean;
+      setCursorName(name: string): void;
+      setEscapeProcessing(enable: boolean): void;
+      setFetchDirection(direction: Integer): void;
+      setFetchSize(rows: Integer): void;
+      setMaxFieldSize(max: Integer): void;
+      setMaxRows(max: Integer): void;
+      setPoolable(poolable: boolean): void;
+      setQueryTimeout(seconds: Integer): void;
+    }
+
+    /**
+     * A JDBC Struct. For documentation of this class, see java.sql.Struct.
+     */
+    export interface JdbcStruct {
+      getAttributes(): Object[];
+      getSQLTypeName(): string;
+    }
+
+    /**
+     * A JDBC Time. For documentation of this class, see java.sql.Time.
+     */
+    export interface JdbcTime {
+      after(when: JdbcTime): boolean;
+      before(when: JdbcTime): boolean;
+      getHours(): Integer;
+      getMinutes(): Integer;
+      getSeconds(): Integer;
+      getTime(): Integer;
+      setHours(hours: Integer): void;
+      setMinutes(minutes: Integer): void;
+      setSeconds(seconds: Integer): void;
+      setTime(milliseconds: Integer): void;
+    }
+
+    /**
+     * A JDBC Timestamp. For documentation of this class, see java.sql.Timestamp.
+     */
+    export interface JdbcTimestamp {
+      after(when: JdbcTimestamp): boolean;
+      before(when: JdbcTimestamp): boolean;
+      getDate(): Integer;
+      getHours(): Integer;
+      getMinutes(): Integer;
+      getMonth(): Integer;
+      getNanos(): Integer;
+      getSeconds(): Integer;
+      getTime(): Integer;
+      getYear(): Integer;
+      setDate(date: Integer): void;
+      setHours(hours: Integer): void;
+      setMinutes(minutes: Integer): void;
+      setMonth(month: Integer): void;
+      setNanos(nanoseconds: Integer): void;
+      setSeconds(seconds: Integer): void;
+      setTime(milliseconds: Integer): void;
+      setYear(year: Integer): void;
+    }
+
+  }
+}
+
+declare var Jdbc: GoogleAppsScript.JDBC.Jdbc;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.language.d.ts b/google-apps-script/google-apps-script.language.d.ts
new file mode 100644
index 000000000..2e5f19ad7
--- /dev/null
+++ b/google-apps-script/google-apps-script.language.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Language {
+    /**
+     * The Language service provides scripts a way to compute automatic translations of text.
+     * 
+     *      // The code below will write "Esta es una prueba" to the log.
+     *      var spanish = LanguageApp.translate('This is a test', 'en', 'es');
+     *      Logger.log(spanish);
+     */
+    export interface LanguageApp {
+      translate(text: string, sourceLanguage: string, targetLanguage: string): string;
+      translate(text: string, sourceLanguage: string, targetLanguage: string, advancedArgs: Object): string;
+    }
+
+  }
+}
+
+declare var LanguageApp: GoogleAppsScript.Language.LanguageApp;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.lock.d.ts b/google-apps-script/google-apps-script.lock.d.ts
new file mode 100644
index 000000000..c0689e5df
--- /dev/null
+++ b/google-apps-script/google-apps-script.lock.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Lock {
+    /**
+     * A representation of a mutual-exclusion lock.
+     * 
+     *  This class allows scripts to make sure that only one instance of the script is executing a given
+     *  section of code at a time. This is particularly useful for callbacks and triggers, where a user
+     *  action may cause changes to a shared resource and you want to ensure that aren't collisions.
+     * 
+     *  The following examples shows how to use a lock in a form submit handler.
+     * 
+     *      // Generates a unique ticket number for every form submission.
+     *      function onFormSubmit(e) {
+     *        var targetCell = e.range.offset(0, e.range.getNumColumns(), 1, 1);
+     *     
+     *        // Get a script lock, because we're about to modify a shared resource.
+     *        var lock = LockService.getScriptLock();
+     *        // Wait for up to 30 seconds for other processes to finish.
+     *        lock.waitLock(30000);
+     *     
+     *        var ticketNumber = Number(ScriptProperties.getProperty('lastTicketNumber')) + 1;
+     *        ScriptProperties.setProperty('lastTicketNumber', ticketNumber);
+     *     
+     *        // Release the lock so that other processes can continue.
+     *        lock.releaseLock();
+     *     
+     *        targetCell.setValue(ticketNumber);
+     *      }
+     * 
+     * lastTicketNumber
+     * ScriptProperties
+     */
+    export interface Lock {
+      hasLock(): boolean;
+      releaseLock(): void;
+      tryLock(timeoutInMillis: Integer): boolean;
+      waitLock(timeoutInMillis: Integer): void;
+    }
+
+    /**
+     * Prevents concurrent access to sections of code. This can be useful when you have multiple users
+     *  or processes modifying a shared resource and want to prevent collisions.
+     */
+    export interface LockService {
+      getDocumentLock(): Lock;
+      getScriptLock(): Lock;
+      getUserLock(): Lock;
+    }
+
+  }
+}
+
+declare var LockService: GoogleAppsScript.Lock.LockService;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.mail.d.ts b/google-apps-script/google-apps-script.mail.d.ts
new file mode 100644
index 000000000..473c7d17a
--- /dev/null
+++ b/google-apps-script/google-apps-script.mail.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Mail {
+    /**
+     * Sends email.
+     * 
+     * This service allows users to send emails with complete control over the
+     *  content of the email. Unlike GmailApp, MailApp's sole purpose is sending email. MailApp cannot
+     *  access a user's Gmail inbox.
+     * 
+     * Changes to scripts written using GmailApp are more likely to trigger a re-authorization
+     *  request from a user than MailApp scripts.
+     */
+    export interface MailApp {
+      getRemainingDailyQuota(): Integer;
+      sendEmail(message: Object): void;
+      sendEmail(recipient: string, subject: string, body: string): void;
+      sendEmail(recipient: string, subject: string, body: string, options: Object): void;
+      sendEmail(to: string, replyTo: string, subject: string, body: string): void;
+    }
+
+  }
+}
+
+declare var MailApp: GoogleAppsScript.Mail.MailApp;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.maps.d.ts b/google-apps-script/google-apps-script.maps.d.ts
new file mode 100644
index 000000000..6a5c45c8c
--- /dev/null
+++ b/google-apps-script/google-apps-script.maps.d.ts
@@ -0,0 +1,319 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Maps {
+    /**
+     * An enum representing the types of restrictions to avoid when finding directions.
+     */
+    export enum Avoid { TOLLS, HIGHWAYS }
+
+    /**
+     * An enum representing the named colors available to use in map images.
+     */
+    export enum Color { BLACK, BROWN, GREEN, PURPLE, YELLOW, BLUE, GRAY, ORANGE, RED, WHITE }
+
+    /**
+     * Allows for the retrieval of directions between locations.
+     *  
+     *  The example below shows how you can use this class to get the directions from Times Square to
+     *  Central Park, stopping first at Lincoln Center, plot the locations and path on a map,
+     *  and send the map in an email.
+     * 
+     *      // Get the directions.
+     *      var directions = Maps.newDirectionFinder()
+     *          .setOrigin('Times Square, New York, NY')
+     *          .addWaypoint('Lincoln Center, New York, NY')
+     *          .setDestination('Central Park, New York, NY')
+     *          .setMode(Maps.DirectionFinder.Mode.DRIVING)
+     *          .getDirections();
+     *      var route = directions.routes[0];
+     *     
+     *      // Set up marker styles.
+     *      var markerSize = Maps.StaticMap.MarkerSize.MID;
+     *      var markerColor = Maps.StaticMap.Color.GREEN
+     *      var markerLetterCode = 'A'.charCodeAt();
+     *     
+     *      // Add markers to the map.
+     *      var map = Maps.newStaticMap();
+     *      for (var i = 0; i < route.legs.length; i++) {
+     *        var leg = route.legs[i];
+     *        if (i == 0) {
+     *          // Add a marker for the start location of the first leg only.
+     *          map.setMarkerStyle(markerSize, markerColor, String.fromCharCode(markerLetterCode));
+     *          map.addMarker(leg.start_location.lat, leg.start_location.lng);
+     *          markerLetterCode++;
+     *        }
+     *        map.setMarkerStyle(markerSize, markerColor, String.fromCharCode(markerLetterCode));
+     *        map.addMarker(leg.end_location.lat, leg.end_location.lng);
+     *        markerLetterCode++;
+     *      }
+     *     
+     *      // Add a path for the entire route.
+     *      map.addPath(route.overview_polyline.points);
+     *     
+     *      // Send the map in an email.
+     *      var toAddress = Session.getActiveUser().getEmail();
+     *      MailApp.sendEmail(toAddress, 'Directions', 'Please open: ' + map.getMapUrl(), {
+     *        htmlBody: 'See below.<br/><img src="cid:mapImage">',
+     *        inlineImages: {
+     *          mapImage: Utilities.newBlob(map.getMapImage(), 'image/png')
+     *        }
+     *      });
+     * 
+     * See also
+     * 
+     * Google Directions API
+     */
+    export interface DirectionFinder {
+      addWaypoint(latitude: Number, longitude: Number): DirectionFinder;
+      addWaypoint(address: string): DirectionFinder;
+      clearWaypoints(): DirectionFinder;
+      getDirections(): Object;
+      setAlternatives(useAlternatives: boolean): DirectionFinder;
+      setArrive(time: Date): DirectionFinder;
+      setAvoid(avoid: string): DirectionFinder;
+      setDepart(time: Date): DirectionFinder;
+      setDestination(latitude: Number, longitude: Number): DirectionFinder;
+      setDestination(address: string): DirectionFinder;
+      setLanguage(language: string): DirectionFinder;
+      setMode(mode: string): DirectionFinder;
+      setOptimizeWaypoints(optimizeOrder: boolean): DirectionFinder;
+      setOrigin(latitude: Number, longitude: Number): DirectionFinder;
+      setOrigin(address: string): DirectionFinder;
+      setRegion(region: string): DirectionFinder;
+    }
+
+    /**
+     * A collection of enums used by DirectionFinder.
+     */
+    export interface DirectionFinderEnums {
+      Avoid: Avoid
+      Mode: Mode
+    }
+
+    /**
+     * Allows for the sampling of elevations at particular locations.
+     *  
+     *  The example below shows how you can use this class to determine the highest point along the route
+     *  from Denver to Grand Junction in Colorado, plot it on a map, and save the map to Google Drive.
+     * 
+     *      // Get directions from Denver to Grand Junction.
+     *      var directions = Maps.newDirectionFinder()
+     *          .setOrigin('Denver, CO')
+     *          .setDestination('Grand Junction, CO')
+     *          .setMode(Maps.DirectionFinder.Mode.DRIVING)
+     *          .getDirections();
+     *      var route = directions.routes[0];
+     *     
+     *      // Get elevation samples along the route.
+     *      var numberOfSamples = 30;
+     *      var response = Maps.newElevationSampler()
+     *          .samplePath(route.overview_polyline.points, numberOfSamples)
+     *     
+     *      // Determine highest point.
+     *      var maxElevation = Number.MIN_VALUE;
+     *      var highestPoint = null;
+     *      for (var i = 0; i < response.results.length; i++) {
+     *        var sample = response.results[i];
+     *        if (sample.elevation > maxElevation) {
+     *          maxElevation = sample.elevation;
+     *          highestPoint = sample.location;
+     *        }
+     *      }
+     *     
+     *      // Add the path and marker to a map.
+     *      var map = Maps.newStaticMap()
+     *          .addPath(route.overview_polyline.points)
+     *          .addMarker(highestPoint.lat, highestPoint.lng);
+     *     
+     *      // Save the map to your drive
+     *      DocsList.createFile(Utilities.newBlob(map.getMapImage(), 'image/png', 'map.png'));
+     * 
+     * See also
+     * 
+     * Google Elevation API
+     */
+    export interface ElevationSampler {
+      sampleLocation(latitude: Number, longitude: Number): Object;
+      sampleLocations(points: Number[]): Object;
+      sampleLocations(encodedPolyline: string): Object;
+      samplePath(points: Number[], numSamples: Integer): Object;
+      samplePath(encodedPolyline: string, numSamples: Integer): Object;
+    }
+
+    /**
+     * An enum representing the format of the map image.
+     * See also
+     * 
+     * Google Static Maps API
+     */
+    export enum Format { PNG, PNG8, PNG32, GIF, JPG, JPG_BASELINE }
+
+    /**
+     * Allows for the conversion between an address and geographical coordinates.
+     *  
+     *  The example below shows how you can use this class find the top nine matches for the location
+     *  "Main St" in Colorado, add them to a map, and then embed it in a new Google Doc.
+     * 
+     *      // Find the best matches for "Main St" in Colorado.
+     *      var response = Maps.newGeocoder()
+     *          // The latitudes and longitudes of southwest and northeast corners of Colorado, respectively.
+     *          .setBounds(36.998166, -109.045486, 41.001666,-102.052002)
+     *          .geocode('Main St');
+     *     
+     *      // Create a Google Doc and map.
+     *      var doc = DocumentApp.create('My Map');
+     *      var map = Maps.newStaticMap();
+     *     
+     *      // Add each result to the map and doc.
+     *      for (var i = 0; i < response.results.length && i < 9; i++) {
+     *        var result = response.results[i];
+     *        map.setMarkerStyle(null, null, i + 1);
+     *        map.addMarker(result.geometry.location.lat, result.geometry.location.lng);
+     *        doc.appendListItem(result.formatted_address);
+     *      }
+     *     
+     *      // Add the finished map to the doc.
+     *      doc.appendImage(Utilities.newBlob(map.getMapImage(), 'image/png'));
+     * 
+     * See also
+     * 
+     * Google Geocoding API
+     */
+    export interface Geocoder {
+      geocode(address: string): Object;
+      reverseGeocode(latitude: Number, longitude: Number): Object;
+      reverseGeocode(swLatitude: Number, swLongitude: Number, neLatitude: Number, neLongitude: Number): Object;
+      setBounds(swLatitude: Number, swLongitude: Number, neLatitude: Number, neLongitude: Number): Geocoder;
+      setLanguage(language: string): Geocoder;
+      setRegion(region: string): Geocoder;
+    }
+
+    /**
+     * Allows for direction finding, geocoding, elevation sampling and the creation of static map
+     *  images.
+     */
+    export interface Maps {
+      DirectionFinder: DirectionFinderEnums
+      StaticMap: StaticMapEnums
+      decodePolyline(polyline: string): Number[];
+      encodePolyline(points: Number[]): string;
+      newDirectionFinder(): DirectionFinder;
+      newElevationSampler(): ElevationSampler;
+      newGeocoder(): Geocoder;
+      newStaticMap(): StaticMap;
+      setAuthentication(clientId: string, signingKey: string): void;
+    }
+
+    /**
+     * An enum representing the size of a marker added to a map.
+     * See also
+     * 
+     * Google Static Maps API
+     */
+    export enum MarkerSize { TINY, MID, SMALL }
+
+    /**
+     * An enum representing the mode of travel to use when finding directions.
+     */
+    export enum Mode { DRIVING, WALKING, BICYCLING, TRANSIT }
+
+    /**
+     * Allows for the creation and decoration of static map images.
+     *  
+     *  The example below shows how you can use this class to create a map of New York City's Theatre
+     *  District, including nearby train stations, and display it in a simple web app.
+     * 
+     *      function doGet(event) {
+     *        // Create a map centered on Times Square.
+     *        var map = Maps.newStaticMap()
+     *            .setSize(600, 600)
+     *            .setCenter('Times Square, New York, NY');
+     *     
+     *        // Add markers for the nearbye train stations.
+     *        map.setMarkerStyle(Maps.StaticMap.MarkerSize.MID, Maps.StaticMap.Color.RED, 'T');
+     *        map.addMarker('Grand Central Station, New York, NY');
+     *        map.addMarker('Penn Station, New York, NY');
+     *     
+     *        // Show the boundaries of the Theatre District.
+     *        var corners = [
+     *          '8th Ave & 53rd St, New York, NY',
+     *          '6th Ave & 53rd St, New York, NY',
+     *          '6th Ave & 40th St, New York, NY',
+     *          '8th Ave & 40th St, New York, NY'
+     *        ];
+     *        map.setPathStyle(4, Maps.StaticMap.Color.BLACK, Maps.StaticMap.Color.BLUE);
+     *        map.beginPath();
+     *        for (var i = 0; i < corners.length; i++) {
+     *          map.addAddress(corners[i]);
+     *        }
+     *     
+     *        // Create the user interface and add the map image.
+     *        var app = UiApp.createApplication().setTitle('NYC Theatre District');
+     *        app.add(app.createImage(map.getMapUrl()));
+     *        return app;
+     *      }
+     * 
+     * See also
+     * 
+     * Google Static Maps API
+     */
+    export interface StaticMap {
+      addAddress(address: string): StaticMap;
+      addMarker(latitude: Number, longitude: Number): StaticMap;
+      addMarker(address: string): StaticMap;
+      addPath(points: Number[]): StaticMap;
+      addPath(polyline: string): StaticMap;
+      addPoint(latitude: Number, longitude: Number): StaticMap;
+      addVisible(latitude: Number, longitude: Number): StaticMap;
+      addVisible(address: string): StaticMap;
+      beginPath(): StaticMap;
+      clearMarkers(): StaticMap;
+      clearPaths(): StaticMap;
+      clearVisibles(): StaticMap;
+      endPath(): StaticMap;
+      getAs(contentType: string): Base.Blob;
+      getBlob(): Base.Blob;
+      getMapImage(): Byte[];
+      getMapUrl(): string;
+      setCenter(latitude: Number, longitude: Number): StaticMap;
+      setCenter(address: string): StaticMap;
+      setCustomMarkerStyle(imageUrl: string, useShadow: boolean): StaticMap;
+      setFormat(format: string): StaticMap;
+      setLanguage(language: string): StaticMap;
+      setMapType(mapType: string): StaticMap;
+      setMarkerStyle(size: string, color: string, label: string): StaticMap;
+      setMobile(useMobileTiles: boolean): StaticMap;
+      setPathStyle(weight: Integer, color: string, fillColor: string): StaticMap;
+      setSize(width: Integer, height: Integer): StaticMap;
+      setZoom(zoom: Integer): StaticMap;
+    }
+
+    /**
+     * A collection of enums used by StaticMap.
+     */
+    export interface StaticMapEnums {
+      Color: Color
+      Format: Format
+      MarkerSize: MarkerSize
+      Type: Type
+    }
+
+    /**
+     * An enum representing the type of map to render.
+     * See also
+     * 
+     * Google Static Maps API
+     */
+    export enum Type { ROADMAP, SATELLITE, TERRAIN, HYBRID }
+
+  }
+}
+
+declare var Maps: GoogleAppsScript.Maps.Maps;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.optimization.d.ts b/google-apps-script/google-apps-script.optimization.d.ts
new file mode 100644
index 000000000..f4371eef1
--- /dev/null
+++ b/google-apps-script/google-apps-script.optimization.d.ts
@@ -0,0 +1,228 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Optimization {
+    /**
+     * Object storing a linear constraint of the form lowerBound ≤ Sum(a(i) x(i)) ≤ upperBound
+     *  where lowerBound and upperBound are constants, a(i) are constant
+     *  coefficients and x(i) are variables (unknowns).
+     * 
+     *  The example below creates one variable x with values between 0 and 5 and
+     *  creates the constraint 0 ≤ 2 * x ≤ 5. This is done by first creating a constraint with
+     *  the lower bound 5 and upper bound 5. Then the coefficient for variable x
+     *  in this constraint is set to 2.
+     * 
+     *       var engine = LinearOptimizationService.createEngine();
+     *       // Create a variable so we can add it to the constraint
+     *       engine.addVariable('x', 0, 5);
+     *       // Create a linear constraint with the bounds 0 and 10
+     *       var constraint = engine.addConstraint(0, 10);
+     *       // Set the coefficient of the variable in the constraint. The constraint is now:
+     *       // 0 <= 2 * x <= 5
+     *       constraint.setCoefficient('x', 2);
+     */
+    export interface LinearOptimizationConstraint {
+      setCoefficient(variableName: string, coefficient: Number): LinearOptimizationConstraint;
+    }
+
+    /**
+     * The engine used to model and solve a linear program. The example below solves the following
+     *  linear program:
+     * 
+     *  Two variables, x and y:
+     *  
+     * 0 ≤ x ≤ 10
+     * 
+     * 0 ≤ y ≤ 5
+     * 
+     *  Constraints:
+     *  
+     * 0 ≤ 2 * x + 5 * y ≤ 10
+     * 
+     * 0 ≤ 10 * x + 3 * y ≤ 20
+     * 
+     *  Objective:
+     *  Maximize x + y
+     * 
+     *      var engine = LinearOptimizationService.createEngine();
+     *     
+     *      // Add variables, constraints and define the objective with addVariable(), addConstraint(), etc
+     *      // Add two variables, 0 <= x <= 10 and 0 <= y <= 5
+     *      engine.addVariable('x', 0, 10);
+     *      engine.addVariable('y', 0, 5);
+     *     
+     *      // Create the constraint: 0 <= 2 * x + 5 * y <= 10
+     *      var constraint = engine.addConstraint(0, 10);
+     *      constraint.setCoefficient('x', 2);
+     *      constraint.setCoefficient('y', 5);
+     *     
+     *      // Create the constraint: 0 <= 10 * x + 3 * y <= 20
+     *      var constraint = engine.addConstraint(0, 20);
+     *      constraint.setCoefficient('x', 10);
+     *      constraint.setCoefficient('y', 3);
+     *     
+     *      // Set the objective to be x + y
+     *      engine.setObjectiveCoefficient('x', 1);
+     *      engine.setObjectiveCoefficient('y', 1);
+     *     
+     *      // Engine should maximize the objective
+     *      engine.setMaximization();
+     *     
+     *      // Solve the linear program
+     *      var solution = engine.solve();
+     *      if (!solution.isValid()) {
+     *        Logger.log('No solution ' + solution.getStatus());
+     *      } else {
+     *        Logger.log('Value of x: ' + solution.getVariableValue('x'));
+     *        Logger.log('Value of y: ' + solution.getVariableValue('y'));
+     *      }
+     */
+    export interface LinearOptimizationEngine {
+      addConstraint(lowerBound: Number, upperBound: Number): LinearOptimizationConstraint;
+      addVariable(name: string, lowerBound: Number, upperBound: Number): LinearOptimizationEngine;
+      addVariable(name: string, lowerBound: Number, upperBound: Number, type: VariableType): LinearOptimizationEngine;
+      setMaximization(): LinearOptimizationEngine;
+      setMinimization(): LinearOptimizationEngine;
+      setObjectiveCoefficient(variableName: string, coefficient: Number): LinearOptimizationEngine;
+      solve(): LinearOptimizationSolution;
+      solve(seconds: Number): LinearOptimizationSolution;
+    }
+
+    /**
+     * The linear optimization service, used to model and solve linear and mixed-integer linear
+     *  programs. The example below solves the following linear program:
+     * 
+     *  Two variables, x and y:
+     *  
+     * 0 ≤ x ≤ 10
+     * 
+     * 0 ≤ y ≤ 5
+     * 
+     *  Constraints:
+     *  
+     * 0 ≤ 2 * x + 5 * y ≤ 10
+     * 
+     * 0 ≤ 10 * x + 3 * y ≤ 20
+     * 
+     *  Objective:
+     *  Maximize x + y
+     * 
+     *      var engine = LinearOptimizationService.createEngine();
+     *     
+     *      // Add variables, constraints and define the objective using addVariable(), addConstraint(), etc.
+     *      // Add two variables, 0 <= x <= 10 and 0 <= y <= 5
+     *      engine.addVariable('x', 0, 10);
+     *      engine.addVariable('y', 0, 5);
+     *     
+     *      // Create the constraint: 0 <= 2 * x + 5 * y <= 10
+     *      var constraint = engine.addConstraint(0, 10);
+     *      constraint.setCoefficient('x', 2);
+     *      constraint.setCoefficient('y', 5);
+     *     
+     *      // Create the constraint: 0 <= 10 * x + 3 * y <= 20
+     *      var constraint = engine.addConstraint(0, 20);
+     *      constraint.setCoefficient('x', 10);
+     *      constraint.setCoefficient('y', 3);
+     *     
+     *      // Set the objective to be x + y
+     *      engine.setObjectiveCoefficient('x', 1);
+     *      engine.setObjectiveCoefficient('y', 1);
+     *     
+     *      // Engine should maximize the objective.
+     *      engine.setMaximization();
+     *     
+     *      // Solve the linear program
+     *      var solution = engine.solve();
+     *      if (!solution.isValid()) {
+     *        Logger.log('No solution ' + solution.getStatus());
+     *      } else {
+     *        Logger.log('Value of x: ' + solution.getVariableValue('x'));
+     *        Logger.log('Value of y: ' + solution.getVariableValue('y'));
+     *      }
+     */
+    export interface LinearOptimizationService {
+      Status: Status
+      VariableType: VariableType
+      createEngine(): LinearOptimizationEngine;
+    }
+
+    /**
+     * The solution of a linear program. The example below solves the following linear program:
+     * 
+     *  Two variables, x and y:
+     *  
+     * 0 ≤ x ≤ 10
+     * 
+     * 0 ≤ y ≤ 5
+     * 
+     *  Constraints:
+     *  
+     * 0 ≤ 2 * x + 5 * y ≤ 10
+     * 
+     * 0 ≤ 10 * x + 3 * y ≤ 20
+     * 
+     *  Objective:
+     *  Maximize x + y
+     * 
+     *      var engine = LinearOptimizationService.createEngine();
+     *     
+     *      // Add variables, constraints and define the objective with addVariable(), addConstraint(), etc.
+     *      // Add two variables, 0 <= x <= 10 and 0 <= y <= 5
+     *      engine.addVariable('x', 0, 10);
+     *      engine.addVariable('y', 0, 5);
+     *     
+     *      // Create the constraint: 0 <= 2 * x + 5 * y <= 10
+     *      var constraint = engine.addConstraint(0, 10);
+     *      constraint.setCoefficient('x', 2);
+     *      constraint.setCoefficient('y', 5);
+     *     
+     *      // Create the constraint: 0 <= 10 * x + 3 * y <= 20
+     *      var constraint = engine.addConstraint(0, 20);
+     *      constraint.setCoefficient('x', 10);
+     *      constraint.setCoefficient('y', 3);
+     *     
+     *      // Set the objective to be x + y
+     *      engine.setObjectiveCoefficient('x', 1);
+     *      engine.setObjectiveCoefficient('y', 1);
+     *     
+     *      // Engine should maximize the objective
+     *      engine.setMaximization();
+     *     
+     *      // Solve the linear program
+     *      var solution = engine.solve();
+     *      if (!solution.isValid()) {
+     *        Logger.log('No solution ' + solution.getStatus());
+     *      } else {
+     *        Logger.log('Objective  value: ' + solution.getObjectiveValue());
+     *        Logger.log('Value of x: ' + solution.getVariableValue('x'));
+     *        Logger.log('Value of y: ' + solution.getVariableValue('y'));
+     *      }
+     */
+    export interface LinearOptimizationSolution {
+      getObjectiveValue(): Number;
+      getStatus(): Status;
+      getVariableValue(variableName: string): Number;
+      isValid(): boolean;
+    }
+
+    /**
+     * Status of the solution. Before solving a problem the status will be NOT_SOLVED;
+     *  afterwards it will take any of the other values depending if it successfully found a solution and
+     *  if the solution is optimal.
+     */
+    export enum Status { OPTIMAL, FEASIBLE, INFEASIBLE, UNBOUNDED, ABNORMAL, MODEL_INVALID, NOT_SOLVED }
+
+    /**
+     * Type of variables created by the engine.
+     */
+    export enum VariableType { INTEGER, CONTINUOUS }
+
+  }
+}
+
+declare var LinearOptimizationService: GoogleAppsScript.Optimization.LinearOptimizationService;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.properties.d.ts b/google-apps-script/google-apps-script.properties.d.ts
new file mode 100644
index 000000000..8bd5ecc28
--- /dev/null
+++ b/google-apps-script/google-apps-script.properties.d.ts
@@ -0,0 +1,91 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Properties {
+    /**
+     * The properties object acts as the interface to access user, document, or script properties.
+     *  The specific property type depends on which of the three methods of
+     *  PropertiesService the script called:
+     *  PropertiesService.getDocumentProperties(),
+     *  PropertiesService.getUserProperties(), or
+     *  PropertiesService.getScriptProperties(). Properties cannot be shared between scripts. For
+     *  more information about property types, see the
+     *  guide to the Properties service.
+     */
+    export interface Properties {
+      deleteAllProperties(): Properties;
+      deleteProperty(key: string): Properties;
+      getKeys(): String[];
+      getProperties(): Object;
+      getProperty(key: string): string;
+      setProperties(properties: Object): Properties;
+      setProperties(properties: Object, deleteAllOthers: boolean): Properties;
+      setProperty(key: string, value: string): Properties;
+    }
+
+    /**
+     * Allows scripts to store simple data in key-value pairs scoped to one script, one user of a
+     *  script, or one document in which an add-on is used. Properties cannot be shared between scripts.
+     *  For more information about when to use each type of property, see the 
+     *  guide to the Properties service.
+     * 
+     *      // Sets three properties of different types.
+     *      var documentProperties = PropertiesService.getDocumentProperties();
+     *      var scriptProperties = PropertiesService.getScriptProperties();
+     *      var userProperties = PropertiesService.getUserProperties();
+     *     
+     *      documentProperties.setProperty('DAYS_TO_FETCH', '5');
+     *      scriptProperties.setProperty('SERVER_URL', 'http://www.example.com/MyWeatherService/');
+     *      userProperties.setProperty('DISPLAY_UNITS', 'metric');
+     */
+    export interface PropertiesService {
+      getDocumentProperties(): Properties;
+      getScriptProperties(): Properties;
+      getUserProperties(): Properties;
+    }
+
+    /**
+     * 
+     * Deprecated. This class is deprecated and should not be used in new scripts.
+     * Script Properties are key-value pairs stored by a script in a persistent store. Script Properties
+     *  are scoped per script, regardless of which user runs the script.
+     */
+    export interface ScriptProperties {
+      deleteAllProperties(): ScriptProperties;
+      deleteProperty(key: string): ScriptProperties;
+      getKeys(): String[];
+      getProperties(): Object;
+      getProperty(key: string): string;
+      setProperties(properties: Object): ScriptProperties;
+      setProperties(properties: Object, deleteAllOthers: boolean): ScriptProperties;
+      setProperty(key: string, value: string): ScriptProperties;
+    }
+
+    /**
+     * 
+     * Deprecated. This class is deprecated and should not be used in new scripts.
+     * User Properties are key-value pairs unique to a user. User Properties are scoped per user; any
+     *  script running under the identity of a user can access User Properties for that user only.
+     */
+    export interface UserProperties {
+      deleteAllProperties(): UserProperties;
+      deleteProperty(key: string): UserProperties;
+      getKeys(): String[];
+      getProperties(): Object;
+      getProperty(key: string): string;
+      setProperties(properties: Object): UserProperties;
+      setProperties(properties: Object, deleteAllOthers: boolean): UserProperties;
+      setProperty(key: string, value: string): UserProperties;
+    }
+
+  }
+}
+
+declare var PropertiesService: GoogleAppsScript.Properties.PropertiesService;
+declare var ScriptProperties: GoogleAppsScript.Properties.ScriptProperties;
+declare var UserProperties: GoogleAppsScript.Properties.UserProperties;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.script.d.ts b/google-apps-script/google-apps-script.script.d.ts
new file mode 100644
index 000000000..9cc52d80f
--- /dev/null
+++ b/google-apps-script/google-apps-script.script.d.ts
@@ -0,0 +1,215 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+/// <reference path="google-apps-script.document.d.ts" />
+/// <reference path="google-apps-script.forms.d.ts" />
+/// <reference path="google-apps-script.spreadsheet.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Script {
+    /**
+     * An enumeration that identifies which categories of authorized services Apps Script
+     *  is able to execute through a triggered function. These values are exposed in
+     *  triggered functions as the authMode
+     *  property of the event parameter, e. For
+     *  more information, see the
+     *  guide to the authorization lifecycle for add-ons.
+     * 
+     *      function onOpen(e) {
+     *        var menu = SpreadsheetApp.getUi().createAddonMenu();
+     *        if (e && e.authMode == ScriptApp.AuthMode.NONE) {
+     *          // Add a normal menu item (works in all authorization modes).
+     *          menu.addItem('Start workflow', 'startWorkflow');
+     *        } else {
+     *          // Add a menu item based on properties (doesn't work in AuthMode.NONE).
+     *          var properties = PropertiesService.getDocumentProperties();
+     *          var workflowStarted = properties.getProperty('workflowStarted');
+     *          if (workflowStarted) {
+     *            menu.addItem('Check workflow status', 'checkWorkflow');
+     *          } else {
+     *            menu.addItem('Start workflow', 'startWorkflow');
+     *          }
+     *          // Record analytics.
+     *          UrlFetchApp.fetch('http://www.example.com/analytics?event=open');
+     *        }
+     *        menu.addToUi();
+     *      }
+     */
+    export enum AuthMode { NONE, CUSTOM_FUNCTION, LIMITED, FULL }
+
+    /**
+     * An object used to determine whether the user needs to authorize this script to use
+     *  one or more services, and to provide the URL for an authorization dialog. If the script
+     *  is published as an add-on that uses
+     *  installable triggers, this information
+     *  can be used to control access to sections of code for which the user lacks the necessary
+     *  authorization. Alternately, the add-on can ask the user to open the URL for the
+     *  authorization dialog to resolve the problem.
+     * 
+     * This object is returned by
+     *  ScriptApp.getAuthorizationInfo(authMode). In almost all cases,
+     *  scripts should call
+     *  ScriptApp.getAuthorizationInfo(ScriptApp.AuthMode.FULL), since no other
+     *  authorization mode requires that users grant authorization.
+     */
+    export interface AuthorizationInfo {
+      getAuthorizationStatus(): AuthorizationStatus;
+      getAuthorizationUrl(): string;
+    }
+
+    /**
+     * An enumeration denoting the authorization status of a script.
+     */
+    export enum AuthorizationStatus { REQUIRED, NOT_REQUIRED }
+
+    /**
+     * A builder for clock triggers.
+     */
+    export interface ClockTriggerBuilder {
+      after(durationMilliseconds: Integer): ClockTriggerBuilder;
+      at(date: Date): ClockTriggerBuilder;
+      atDate(year: Integer, month: Integer, day: Integer): ClockTriggerBuilder;
+      atHour(hour: Integer): ClockTriggerBuilder;
+      create(): Trigger;
+      everyDays(n: Integer): ClockTriggerBuilder;
+      everyHours(n: Integer): ClockTriggerBuilder;
+      everyMinutes(n: Integer): ClockTriggerBuilder;
+      everyWeeks(n: Integer): ClockTriggerBuilder;
+      inTimezone(timezone: string): ClockTriggerBuilder;
+      nearMinute(minute: Integer): ClockTriggerBuilder;
+      onMonthDay(day: Integer): ClockTriggerBuilder;
+      onWeekDay(day: Base.Weekday): ClockTriggerBuilder;
+    }
+
+    /**
+     * A builder for document triggers.
+     */
+    export interface DocumentTriggerBuilder {
+      create(): Trigger;
+      onOpen(): DocumentTriggerBuilder;
+    }
+
+    /**
+     * An enumeration denoting the type of triggered event.
+     */
+    export enum EventType { CLOCK, ON_OPEN, ON_EDIT, ON_FORM_SUBMIT, ON_CHANGE }
+
+    /**
+     * A builder for form triggers.
+     */
+    export interface FormTriggerBuilder {
+      create(): Trigger;
+      onFormSubmit(): FormTriggerBuilder;
+      onOpen(): FormTriggerBuilder;
+    }
+
+    /**
+     * An enumeration that indicates how the script came to be installed as an add-on for the
+     *  current user.
+     */
+    export enum InstallationSource { APPS_MARKETPLACE_DOMAIN_ADD_ON, NONE, WEB_STORE_ADD_ON }
+
+    /**
+     * Access and manipulate script publishing and triggers. This class allows users to create script
+     *  triggers and control publishing the script as a service.
+     */
+    export interface ScriptApp {
+      AuthMode: AuthMode
+      AuthorizationStatus: AuthorizationStatus
+      EventType: EventType
+      InstallationSource: InstallationSource
+      TriggerSource: TriggerSource
+      WeekDay: Base.Weekday
+      deleteTrigger(trigger: Trigger): void;
+      getAuthorizationInfo(authMode: AuthMode): AuthorizationInfo;
+      getInstallationSource(): InstallationSource;
+      getOAuthToken(): string;
+      getProjectKey(): string;
+      getProjectTriggers(): Trigger[];
+      getService(): Service;
+      getUserTriggers(document: Document.Document): Trigger[];
+      getUserTriggers(form: Forms.Form): Trigger[];
+      getUserTriggers(spreadsheet: Spreadsheet.Spreadsheet): Trigger[];
+      invalidateAuth(): void;
+      newStateToken(): StateTokenBuilder;
+      newTrigger(functionName: string): TriggerBuilder;
+      getScriptTriggers(): Trigger[];
+    }
+
+    /**
+     * 
+     */
+    export enum Service { MYSELF, DOMAIN, ALL }
+
+    /**
+     * Builder for spreadsheet triggers.
+     */
+    export interface SpreadsheetTriggerBuilder {
+      create(): Trigger;
+      onChange(): SpreadsheetTriggerBuilder;
+      onEdit(): SpreadsheetTriggerBuilder;
+      onFormSubmit(): SpreadsheetTriggerBuilder;
+      onOpen(): SpreadsheetTriggerBuilder;
+    }
+
+    /**
+     * Allows scripts to create state tokens that can be used in callback APIs (like OAuth flows).
+     * 
+     *      // Reusable function to generate a callback URL, assuming the script has been published as a
+     *      // web app (necessary to obtain the URL programmatically). If the script has not been published
+     *      // as a web app, set `var url` in the first line to the URL of your script project (which
+     *      // cannot be obtained programmatically).
+     *      function getCallbackURL(callbackFunction){
+     *        var url = ScriptApp.getService().getUrl();      // Ends in /exec (for a web app)
+     *        url = url.slice(0, -4) + 'usercallback?state='; // Change /exec to /usercallback
+     *        var stateToken = ScriptApp.newStateToken()
+     *            .withMethod(callbackFunction)
+     *            .withTimeout(120)
+     *            .createToken();
+     *        return url + stateToken;
+     *      }
+     */
+    export interface StateTokenBuilder {
+      createToken(): string;
+      withArgument(name: string, value: string): StateTokenBuilder;
+      withMethod(method: string): StateTokenBuilder;
+      withTimeout(seconds: Integer): StateTokenBuilder;
+    }
+
+    /**
+     * A script trigger.
+     */
+    export interface Trigger {
+      getEventType(): EventType;
+      getHandlerFunction(): string;
+      getTriggerSource(): TriggerSource;
+      getTriggerSourceId(): string;
+      getUniqueId(): string;
+    }
+
+    /**
+     * A generic builder for script triggers.
+     */
+    export interface TriggerBuilder {
+      forDocument(document: Document.Document): DocumentTriggerBuilder;
+      forDocument(key: string): DocumentTriggerBuilder;
+      forForm(form: Forms.Form): FormTriggerBuilder;
+      forForm(key: string): FormTriggerBuilder;
+      forSpreadsheet(sheet: Spreadsheet.Spreadsheet): SpreadsheetTriggerBuilder;
+      forSpreadsheet(key: string): SpreadsheetTriggerBuilder;
+      timeBased(): ClockTriggerBuilder;
+    }
+
+    /**
+     * An enumeration denoting the source of the event that causes the trigger to fire.
+     */
+    export enum TriggerSource { SPREADSHEETS, CLOCK, FORMS, DOCUMENTS }
+
+  }
+}
+
+declare var ScriptApp: GoogleAppsScript.Script.ScriptApp;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.sites.d.ts b/google-apps-script/google-apps-script.sites.d.ts
new file mode 100644
index 000000000..aa5f9444f
--- /dev/null
+++ b/google-apps-script/google-apps-script.sites.d.ts
@@ -0,0 +1,241 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Sites {
+    /**
+     * A Sites Attachment such as a file attached to a page.
+     * 
+     *  Note that an Attachment is a Blob and can be used anywhere Blob input is expected.
+     * 
+     *      var filesPage = SitesApp.getSite('example.com', 'mysite').getChildByName("files");
+     *      var attachments = filesPage.getAttachments();
+     *     
+     *      // DocsList.createFile accepts a blob input. Since an Attachment is just a blob, we can
+     *      // just pass it directly to that method
+     *      var file = DocsList.createFile(attachments[0]);
+     */
+    export interface Attachment {
+      deleteAttachment(): void;
+      getAs(contentType: string): Base.Blob;
+      getAttachmentType(): AttachmentType;
+      getBlob(): Base.Blob;
+      getContentType(): string;
+      getDatePublished(): Date;
+      getDescription(): string;
+      getLastUpdated(): Date;
+      getParent(): Page;
+      getTitle(): string;
+      getUrl(): string;
+      setContentType(contentType: string): Attachment;
+      setDescription(description: string): Attachment;
+      setFrom(blob: Base.BlobSource): Attachment;
+      setParent(parent: Page): Attachment;
+      setTitle(title: string): Attachment;
+      setUrl(url: string): Attachment;
+    }
+
+    /**
+     * A typesafe enum for sites attachment type.
+     */
+    export enum AttachmentType { WEB, HOSTED }
+
+    /**
+     * A Sites Column - a column from a Sites List page.
+     */
+    export interface Column {
+      deleteColumn(): void;
+      getName(): string;
+      getParent(): Page;
+      setName(name: string): Column;
+    }
+
+    /**
+     * A Comment attached to any Sites page.
+     */
+    export interface Comment {
+      deleteComment(): void;
+      getAuthorEmail(): string;
+      getAuthorName(): string;
+      getContent(): string;
+      getDatePublished(): Date;
+      getLastUpdated(): Date;
+      getParent(): Page;
+      setContent(content: string): Comment;
+      setParent(parent: Page): Comment;
+    }
+
+    /**
+     * A Sites ListItem - a list element from a Sites List page.
+     */
+    export interface ListItem {
+      deleteListItem(): void;
+      getDatePublished(): Date;
+      getLastUpdated(): Date;
+      getParent(): Page;
+      getValueByIndex(index: Integer): string;
+      getValueByName(name: string): string;
+      setParent(parent: Page): ListItem;
+      setValueByIndex(index: Integer, value: string): ListItem;
+      setValueByName(name: string, value: string): ListItem;
+    }
+
+    /**
+     * A Page on a Google Site.
+     */
+    export interface Page {
+      addColumn(name: string): Column;
+      addHostedAttachment(blob: Base.BlobSource): Attachment;
+      addHostedAttachment(blob: Base.BlobSource, description: string): Attachment;
+      addListItem(values: String[]): ListItem;
+      addWebAttachment(title: string, description: string, url: string): Attachment;
+      createAnnouncement(title: string, html: string): Page;
+      createAnnouncement(title: string, html: string, asDraft: boolean): Page;
+      createAnnouncementsPage(title: string, name: string, html: string): Page;
+      createFileCabinetPage(title: string, name: string, html: string): Page;
+      createListPage(title: string, name: string, html: string, columnNames: String[]): Page;
+      createPageFromTemplate(title: string, name: string, template: Page): Page;
+      createWebPage(title: string, name: string, html: string): Page;
+      deletePage(): void;
+      getAllDescendants(): Page[];
+      getAllDescendants(options: Object): Page[];
+      getAnnouncements(): Page[];
+      getAnnouncements(optOptions: Object): Page[];
+      getAttachments(): Attachment[];
+      getAttachments(optOptions: Object): Attachment[];
+      getAuthors(): String[];
+      getChildByName(name: string): Page;
+      getChildren(): Page[];
+      getChildren(options: Object): Page[];
+      getColumns(): Column[];
+      getComments(): Comment[];
+      getComments(optOptions: Object): Comment[];
+      getDatePublished(): Date;
+      getHtmlContent(): string;
+      getIsDraft(): boolean;
+      getLastEdited(): Date;
+      getLastUpdated(): Date;
+      getListItems(): ListItem[];
+      getListItems(optOptions: Object): ListItem[];
+      getName(): string;
+      getPageType(): PageType;
+      getParent(): Page;
+      getTextContent(): string;
+      getTitle(): string;
+      getUrl(): string;
+      isDeleted(): boolean;
+      isTemplate(): boolean;
+      publishAsTemplate(name: string): Page;
+      search(query: string): Page[];
+      search(query: string, options: Object): Page[];
+      setHtmlContent(html: string): Page;
+      setIsDraft(draft: boolean): Page;
+      setName(name: string): Page;
+      setParent(parent: Page): Page;
+      setTitle(title: string): Page;
+      addComment(content: string): Comment;
+      getPageName(): string;
+      getSelfLink(): string;
+    }
+
+    /**
+     * A typesafe enum for sites page type.
+     */
+    export enum PageType { WEB_PAGE, LIST_PAGE, ANNOUNCEMENT, ANNOUNCEMENTS_PAGE, FILE_CABINET_PAGE }
+
+    /**
+     * An object representing a Google Site.
+     */
+    export interface Site {
+      addEditor(emailAddress: string): Site;
+      addEditor(user: Base.User): Site;
+      addEditors(emailAddresses: String[]): Site;
+      addOwner(email: string): Site;
+      addOwner(user: Base.User): Site;
+      addViewer(emailAddress: string): Site;
+      addViewer(user: Base.User): Site;
+      addViewers(emailAddresses: String[]): Site;
+      createAnnouncementsPage(title: string, name: string, html: string): Page;
+      createFileCabinetPage(title: string, name: string, html: string): Page;
+      createListPage(title: string, name: string, html: string, columnNames: String[]): Page;
+      createPageFromTemplate(title: string, name: string, template: Page): Page;
+      createWebPage(title: string, name: string, html: string): Page;
+      getAllDescendants(): Page[];
+      getAllDescendants(options: Object): Page[];
+      getChildByName(name: string): Page;
+      getChildren(): Page[];
+      getChildren(options: Object): Page[];
+      getEditors(): Base.User[];
+      getName(): string;
+      getOwners(): Base.User[];
+      getSummary(): string;
+      getTemplates(): Page[];
+      getTheme(): string;
+      getTitle(): string;
+      getUrl(): string;
+      getViewers(): Base.User[];
+      removeEditor(emailAddress: string): Site;
+      removeEditor(user: Base.User): Site;
+      removeOwner(email: string): Site;
+      removeOwner(user: Base.User): Site;
+      removeViewer(emailAddress: string): Site;
+      removeViewer(user: Base.User): Site;
+      search(query: string): Page[];
+      search(query: string, options: Object): Page[];
+      setSummary(summary: string): Site;
+      setTheme(theme: string): Site;
+      setTitle(title: string): Site;
+      addCollaborator(email: string): Site;
+      addCollaborator(user: Base.User): Site;
+      createAnnouncement(title: string, html: string, parent: Page): Page;
+      createComment(inReplyTo: string, html: string, parent: Page): Comment;
+      createListItem(html: string, columnNames: String[], values: String[], parent: Page): ListItem;
+      createWebAttachment(title: string, url: string, parent: Page): Attachment;
+      deleteSite(): void;
+      getAnnouncements(): Page[];
+      getAnnouncementsPages(): Page[];
+      getAttachments(): Attachment[];
+      getCollaborators(): Base.User[];
+      getComments(): Comment[];
+      getFileCabinetPages(): Page[];
+      getListItems(): ListItem[];
+      getListPages(): Page[];
+      getSelfLink(): string;
+      getSiteName(): string;
+      getWebAttachments(): Attachment[];
+      getWebPages(): Page[];
+      removeCollaborator(email: string): Site;
+      removeCollaborator(user: Base.User): Site;
+    }
+
+    /**
+     * Create and access Google Sites.
+     */
+    export interface SitesApp {
+      AttachmentType: AttachmentType
+      PageType: PageType
+      copySite(domain: string, name: string, title: string, summary: string, site: Site): Site;
+      createSite(domain: string, name: string, title: string, summary: string): Site;
+      getActivePage(): Page;
+      getActiveSite(): Site;
+      getAllSites(domain: string): Site[];
+      getAllSites(domain: string, start: Integer, max: Integer): Site[];
+      getPageByUrl(url: string): Page;
+      getSite(name: string): Site;
+      getSite(domain: string, name: string): Site;
+      getSiteByUrl(url: string): Site;
+      getSites(): Site[];
+      getSites(start: Integer, max: Integer): Site[];
+      getSites(domain: string): Site[];
+      getSites(domain: string, start: Integer, max: Integer): Site[];
+    }
+
+  }
+}
+
+declare var SitesApp: GoogleAppsScript.Sites.SitesApp;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.spreadsheet.d.ts b/google-apps-script/google-apps-script.spreadsheet.d.ts
new file mode 100644
index 000000000..aad5225d9
--- /dev/null
+++ b/google-apps-script/google-apps-script.spreadsheet.d.ts
@@ -0,0 +1,918 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.charts.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+/// <reference path="google-apps-script.drive.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Spreadsheet {
+    /**
+     * The chart's position within a sheet.  Can be updated using the EmbeddedChart.modify()
+     *  function.
+     * 
+     *      chart = chart.modify().setPosition(5, 5, 0, 0).build();
+     *      sheet.updateChart(chart);
+     */
+    export interface ContainerInfo {
+      getAnchorColumn(): Integer;
+      getAnchorRow(): Integer;
+      getOffsetX(): Integer;
+      getOffsetY(): Integer;
+    }
+
+    /**
+     * This class allows users to access existing data-validation rules. To create a new rule, see
+     *  SpreadsheetApp.newDataValidation(), DataValidationBuilder, and
+     *  Range.setDataValidation(rule).
+     * 
+     *      // Log information about the data-validation rule for cell A1.
+     *      var cell = SpreadsheetApp.getActive().getRange('A1');
+     *      var rule = cell.getDataValidation();
+     *      if (rule != null) {
+     *        var criteria = rule.getCriteriaType();
+     *        var args = rule.getCriteriaValues();
+     *        Logger.log('The data-validation rule is %s %s', criteria, args);
+     *      } else {
+     *        Logger.log('The cell does not have a data-validation rule.')
+     *      }
+     */
+    export interface DataValidation {
+      copy(): DataValidationBuilder;
+      getAllowInvalid(): boolean;
+      getCriteriaType(): DataValidationCriteria;
+      getCriteriaValues(): Object[];
+      getHelpText(): string;
+    }
+
+    /**
+     * Builder for data-validation rules.
+     * 
+     *      // Set the data validation for cell A1 to require a value from B1:B10.
+     *      var cell = SpreadsheetApp.getActive().getRange('A1');
+     *      var range = SpreadsheetApp.getActive().getRange('B1:B10');
+     *      var rule = SpreadsheetApp.newDataValidation().requireValueInRange(range).build();
+     *      cell.setDataValidation(rule);
+     */
+    export interface DataValidationBuilder {
+      build(): DataValidation;
+      copy(): DataValidationBuilder;
+      getAllowInvalid(): boolean;
+      getCriteriaType(): DataValidationCriteria;
+      getCriteriaValues(): Object[];
+      getHelpText(): string;
+      requireDate(): DataValidationBuilder;
+      requireDateAfter(date: Date): DataValidationBuilder;
+      requireDateBefore(date: Date): DataValidationBuilder;
+      requireDateBetween(start: Date, end: Date): DataValidationBuilder;
+      requireDateEqualTo(date: Date): DataValidationBuilder;
+      requireDateNotBetween(start: Date, end: Date): DataValidationBuilder;
+      requireDateOnOrAfter(date: Date): DataValidationBuilder;
+      requireDateOnOrBefore(date: Date): DataValidationBuilder;
+      requireFormulaSatisfied(formula: string): DataValidationBuilder;
+      requireNumberBetween(start: Number, end: Number): DataValidationBuilder;
+      requireNumberEqualTo(number: Number): DataValidationBuilder;
+      requireNumberGreaterThan(number: Number): DataValidationBuilder;
+      requireNumberGreaterThanOrEqualTo(number: Number): DataValidationBuilder;
+      requireNumberLessThan(number: Number): DataValidationBuilder;
+      requireNumberLessThanOrEqualTo(number: Number): DataValidationBuilder;
+      requireNumberNotBetween(start: Number, end: Number): DataValidationBuilder;
+      requireNumberNotEqualTo(number: Number): DataValidationBuilder;
+      requireTextContains(text: string): DataValidationBuilder;
+      requireTextDoesNotContain(text: string): DataValidationBuilder;
+      requireTextEqualTo(text: string): DataValidationBuilder;
+      requireTextIsEmail(): DataValidationBuilder;
+      requireTextIsUrl(): DataValidationBuilder;
+      requireValueInList(values: String[]): DataValidationBuilder;
+      requireValueInList(values: String[], showDropdown: boolean): DataValidationBuilder;
+      requireValueInRange(range: Range): DataValidationBuilder;
+      requireValueInRange(range: Range, showDropdown: boolean): DataValidationBuilder;
+      setAllowInvalid(allowInvalidData: boolean): DataValidationBuilder;
+      setHelpText(helpText: string): DataValidationBuilder;
+      withCriteria(criteria: DataValidationCriteria, args: Object[]): DataValidationBuilder;
+    }
+
+    /**
+     * An enumeration representing the data-validation criteria that can be set on a range.
+     * 
+     *      // Change existing data-validation rules that require a date in 2013 to require a date in 2014.
+     *      var oldDates = [new Date('1/1/2013'), new Date('12/31/2013')];
+     *      var newDates = [new Date('1/1/2014'), new Date('12/31/2014')];
+     *      var sheet = SpreadsheetApp.getActiveSheet();
+     *      var range = sheet.getRange(1, 1, sheet.getMaxRows(), sheet.getMaxColumns());
+     *      var rules = range.getDataValidations();
+     *     
+     *      for (var i = 0; i < rules.length; i++) {
+     *        for (var j = 0; j < rules[i].length; j++) {
+     *          var rule = rules[i][j];
+     *     
+     *          if (rule != null) {
+     *            var criteria = rule.getCriteriaType();
+     *            var args = rule.getCriteriaValues();
+     *      
+     *            if (criteria == SpreadsheetApp.DataValidationCriteria.DATE_BETWEEN
+     *                && args[0].getTime() == oldDates[0].getTime()
+     *                && args[1].getTime() == oldDates[1].getTime()) {
+     *              // Create a builder from the existing rule, then change the dates.
+     *              rules[i][j] = rule.copy().withCriteria(criteria, newDates).build();
+     *            }
+     *          }
+     *        }
+     *      }
+     *      range.setDataValidations(rules);
+     */
+    export enum DataValidationCriteria { DATE_AFTER, DATE_BEFORE, DATE_BETWEEN, DATE_EQUAL_TO, DATE_IS_VALID_DATE, DATE_NOT_BETWEEN, DATE_ON_OR_AFTER, DATE_ON_OR_BEFORE, NUMBER_BETWEEN, NUMBER_EQUAL_TO, NUMBER_GREATER_THAN, NUMBER_GREATER_THAN_OR_EQUAL_TO, NUMBER_LESS_THAN, NUMBER_LESS_THAN_OR_EQUAL_TO, NUMBER_NOT_BETWEEN, NUMBER_NOT_EQUAL_TO, TEXT_CONTAINS, TEXT_DOES_NOT_CONTAIN, TEXT_EQUAL_TO, TEXT_IS_VALID_EMAIL, TEXT_IS_VALID_URL, VALUE_IN_LIST, VALUE_IN_RANGE, CUSTOM_FORMULA }
+
+    /**
+     * Builder for area charts. For more details, see the Gviz 
+     *  documentation.
+     */
+    export interface EmbeddedAreaChartBuilder {
+      addRange(range: Range): EmbeddedChartBuilder;
+      asAreaChart(): EmbeddedAreaChartBuilder;
+      asBarChart(): EmbeddedBarChartBuilder;
+      asColumnChart(): EmbeddedColumnChartBuilder;
+      asLineChart(): EmbeddedLineChartBuilder;
+      asPieChart(): EmbeddedPieChartBuilder;
+      asScatterChart(): EmbeddedScatterChartBuilder;
+      asTableChart(): EmbeddedTableChartBuilder;
+      build(): EmbeddedChart;
+      getChartType(): Charts.ChartType;
+      getContainer(): ContainerInfo;
+      getRanges(): Range[];
+      removeRange(range: Range): EmbeddedChartBuilder;
+      reverseCategories(): EmbeddedAreaChartBuilder;
+      setBackgroundColor(cssValue: string): EmbeddedAreaChartBuilder;
+      setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
+      setColors(cssValues: String[]): EmbeddedAreaChartBuilder;
+      setLegendPosition(position: Charts.Position): EmbeddedAreaChartBuilder;
+      setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedAreaChartBuilder;
+      setOption(option: string, value: Object): EmbeddedChartBuilder;
+      setPointStyle(style: Charts.PointStyle): EmbeddedAreaChartBuilder;
+      setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
+      setRange(start: Number, end: Number): EmbeddedAreaChartBuilder;
+      setStacked(): EmbeddedAreaChartBuilder;
+      setTitle(chartTitle: string): EmbeddedAreaChartBuilder;
+      setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedAreaChartBuilder;
+      setXAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedAreaChartBuilder;
+      setXAxisTitle(title: string): EmbeddedAreaChartBuilder;
+      setXAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedAreaChartBuilder;
+      setYAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedAreaChartBuilder;
+      setYAxisTitle(title: string): EmbeddedAreaChartBuilder;
+      setYAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedAreaChartBuilder;
+      useLogScale(): EmbeddedAreaChartBuilder;
+    }
+
+    /**
+     * Builder for bar charts. For more details, see the Gviz 
+     *  documentation.
+     */
+    export interface EmbeddedBarChartBuilder {
+      addRange(range: Range): EmbeddedChartBuilder;
+      asAreaChart(): EmbeddedAreaChartBuilder;
+      asBarChart(): EmbeddedBarChartBuilder;
+      asColumnChart(): EmbeddedColumnChartBuilder;
+      asLineChart(): EmbeddedLineChartBuilder;
+      asPieChart(): EmbeddedPieChartBuilder;
+      asScatterChart(): EmbeddedScatterChartBuilder;
+      asTableChart(): EmbeddedTableChartBuilder;
+      build(): EmbeddedChart;
+      getChartType(): Charts.ChartType;
+      getContainer(): ContainerInfo;
+      getRanges(): Range[];
+      removeRange(range: Range): EmbeddedChartBuilder;
+      reverseCategories(): EmbeddedBarChartBuilder;
+      reverseDirection(): EmbeddedBarChartBuilder;
+      setBackgroundColor(cssValue: string): EmbeddedBarChartBuilder;
+      setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
+      setColors(cssValues: String[]): EmbeddedBarChartBuilder;
+      setLegendPosition(position: Charts.Position): EmbeddedBarChartBuilder;
+      setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedBarChartBuilder;
+      setOption(option: string, value: Object): EmbeddedChartBuilder;
+      setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
+      setRange(start: Number, end: Number): EmbeddedBarChartBuilder;
+      setStacked(): EmbeddedBarChartBuilder;
+      setTitle(chartTitle: string): EmbeddedBarChartBuilder;
+      setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedBarChartBuilder;
+      setXAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedBarChartBuilder;
+      setXAxisTitle(title: string): EmbeddedBarChartBuilder;
+      setXAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedBarChartBuilder;
+      setYAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedBarChartBuilder;
+      setYAxisTitle(title: string): EmbeddedBarChartBuilder;
+      setYAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedBarChartBuilder;
+      useLogScale(): EmbeddedBarChartBuilder;
+    }
+
+    /**
+     * Represents a chart that has been embedded into a Spreadsheet.
+     * 
+     * This example shows how to modify an existing chart:
+     * 
+     *      var sheet = SpreadsheetApp.getActiveSheet();
+     *      var range = sheet.getRange("A2:B8")
+     *      var chart = sheet.getCharts()[0];
+     *      chart = chart.modify()
+     *          .addRange(range)
+     *          .setOption('title', 'Updated!')
+     *          .setOption('animation.duration', 500)
+     *          .setPosition(2,2,0,0)
+     *          .build();
+     *      sheet.updateChart(chart);
+     * 
+     * This example shows how to create a new chart:
+     * 
+     *      function newChart(range, sheet) {
+     *        var sheet = SpreadsheetApp.getActiveSheet();
+     *        var chartBuilder = sheet.newChart();
+     *        chartBuilder.addRange(range)
+     *            .setChartType(Charts.ChartType.LINE)
+     *            .setOption('title', 'My Line Chart!');
+     *        sheet.insertChart(chartBuilder.build());
+     *      }
+     */
+    export interface EmbeddedChart {
+      getAs(contentType: string): Base.Blob;
+      getBlob(): Base.Blob;
+      getContainerInfo(): ContainerInfo;
+      getId(): string;
+      getOptions(): Charts.ChartOptions;
+      getRanges(): Range[];
+      getType(): string;
+      modify(): EmbeddedChartBuilder;
+      setId(id: string): Charts.Chart;
+    }
+
+    /**
+     * This builder allows you to edit an EmbeddedChart. Make sure to call
+     *  sheet.updateChart(builder.build()) to save your changes.
+     * 
+     *      var sheet = SpreadsheetApp.getActiveSheet();
+     *      var range = sheet.getRange("A1:B8");
+     *      var chart = sheet.getCharts()[0];
+     *      chart = chart.modify()
+     *          .addRange(range)
+     *          .setOption('title', 'Updated!')
+     *          .setOption('animation.duration', 500)
+     *          .setPosition(2,2,0,0)
+     *          .build();
+     *      sheet.updateChart(chart);
+     */
+    export interface EmbeddedChartBuilder {
+      addRange(range: Range): EmbeddedChartBuilder;
+      asAreaChart(): EmbeddedAreaChartBuilder;
+      asBarChart(): EmbeddedBarChartBuilder;
+      asColumnChart(): EmbeddedColumnChartBuilder;
+      asLineChart(): EmbeddedLineChartBuilder;
+      asPieChart(): EmbeddedPieChartBuilder;
+      asScatterChart(): EmbeddedScatterChartBuilder;
+      asTableChart(): EmbeddedTableChartBuilder;
+      build(): EmbeddedChart;
+      getChartType(): Charts.ChartType;
+      getContainer(): ContainerInfo;
+      getRanges(): Range[];
+      removeRange(range: Range): EmbeddedChartBuilder;
+      setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
+      setOption(option: string, value: Object): EmbeddedChartBuilder;
+      setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
+    }
+
+    /**
+     * Builder for column charts. For more details, see the Gviz 
+     *  documentation.
+     */
+    export interface EmbeddedColumnChartBuilder {
+      addRange(range: Range): EmbeddedChartBuilder;
+      asAreaChart(): EmbeddedAreaChartBuilder;
+      asBarChart(): EmbeddedBarChartBuilder;
+      asColumnChart(): EmbeddedColumnChartBuilder;
+      asLineChart(): EmbeddedLineChartBuilder;
+      asPieChart(): EmbeddedPieChartBuilder;
+      asScatterChart(): EmbeddedScatterChartBuilder;
+      asTableChart(): EmbeddedTableChartBuilder;
+      build(): EmbeddedChart;
+      getChartType(): Charts.ChartType;
+      getContainer(): ContainerInfo;
+      getRanges(): Range[];
+      removeRange(range: Range): EmbeddedChartBuilder;
+      reverseCategories(): EmbeddedColumnChartBuilder;
+      setBackgroundColor(cssValue: string): EmbeddedColumnChartBuilder;
+      setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
+      setColors(cssValues: String[]): EmbeddedColumnChartBuilder;
+      setLegendPosition(position: Charts.Position): EmbeddedColumnChartBuilder;
+      setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedColumnChartBuilder;
+      setOption(option: string, value: Object): EmbeddedChartBuilder;
+      setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
+      setRange(start: Number, end: Number): EmbeddedColumnChartBuilder;
+      setStacked(): EmbeddedColumnChartBuilder;
+      setTitle(chartTitle: string): EmbeddedColumnChartBuilder;
+      setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedColumnChartBuilder;
+      setXAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedColumnChartBuilder;
+      setXAxisTitle(title: string): EmbeddedColumnChartBuilder;
+      setXAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedColumnChartBuilder;
+      setYAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedColumnChartBuilder;
+      setYAxisTitle(title: string): EmbeddedColumnChartBuilder;
+      setYAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedColumnChartBuilder;
+      useLogScale(): EmbeddedColumnChartBuilder;
+    }
+
+    /**
+     * Builder for line charts. For more details, see the Gviz 
+     *  documentation.
+     */
+    export interface EmbeddedLineChartBuilder {
+      addRange(range: Range): EmbeddedChartBuilder;
+      asAreaChart(): EmbeddedAreaChartBuilder;
+      asBarChart(): EmbeddedBarChartBuilder;
+      asColumnChart(): EmbeddedColumnChartBuilder;
+      asLineChart(): EmbeddedLineChartBuilder;
+      asPieChart(): EmbeddedPieChartBuilder;
+      asScatterChart(): EmbeddedScatterChartBuilder;
+      asTableChart(): EmbeddedTableChartBuilder;
+      build(): EmbeddedChart;
+      getChartType(): Charts.ChartType;
+      getContainer(): ContainerInfo;
+      getRanges(): Range[];
+      removeRange(range: Range): EmbeddedChartBuilder;
+      reverseCategories(): EmbeddedLineChartBuilder;
+      setBackgroundColor(cssValue: string): EmbeddedLineChartBuilder;
+      setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
+      setColors(cssValues: String[]): EmbeddedLineChartBuilder;
+      setCurveStyle(style: Charts.CurveStyle): EmbeddedLineChartBuilder;
+      setLegendPosition(position: Charts.Position): EmbeddedLineChartBuilder;
+      setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedLineChartBuilder;
+      setOption(option: string, value: Object): EmbeddedChartBuilder;
+      setPointStyle(style: Charts.PointStyle): EmbeddedLineChartBuilder;
+      setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
+      setRange(start: Number, end: Number): EmbeddedLineChartBuilder;
+      setTitle(chartTitle: string): EmbeddedLineChartBuilder;
+      setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedLineChartBuilder;
+      setXAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedLineChartBuilder;
+      setXAxisTitle(title: string): EmbeddedLineChartBuilder;
+      setXAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedLineChartBuilder;
+      setYAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedLineChartBuilder;
+      setYAxisTitle(title: string): EmbeddedLineChartBuilder;
+      setYAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedLineChartBuilder;
+      useLogScale(): EmbeddedLineChartBuilder;
+    }
+
+    /**
+     * Builder for pie charts. For more details, see the Gviz 
+     *  documentation.
+     */
+    export interface EmbeddedPieChartBuilder {
+      addRange(range: Range): EmbeddedChartBuilder;
+      asAreaChart(): EmbeddedAreaChartBuilder;
+      asBarChart(): EmbeddedBarChartBuilder;
+      asColumnChart(): EmbeddedColumnChartBuilder;
+      asLineChart(): EmbeddedLineChartBuilder;
+      asPieChart(): EmbeddedPieChartBuilder;
+      asScatterChart(): EmbeddedScatterChartBuilder;
+      asTableChart(): EmbeddedTableChartBuilder;
+      build(): EmbeddedChart;
+      getChartType(): Charts.ChartType;
+      getContainer(): ContainerInfo;
+      getRanges(): Range[];
+      removeRange(range: Range): EmbeddedChartBuilder;
+      reverseCategories(): EmbeddedPieChartBuilder;
+      set3D(): EmbeddedPieChartBuilder;
+      setBackgroundColor(cssValue: string): EmbeddedPieChartBuilder;
+      setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
+      setColors(cssValues: String[]): EmbeddedPieChartBuilder;
+      setLegendPosition(position: Charts.Position): EmbeddedPieChartBuilder;
+      setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedPieChartBuilder;
+      setOption(option: string, value: Object): EmbeddedChartBuilder;
+      setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
+      setTitle(chartTitle: string): EmbeddedPieChartBuilder;
+      setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedPieChartBuilder;
+    }
+
+    /**
+     * Builder for scatter charts. For more details, see the Gviz 
+     *  documentation.
+     */
+    export interface EmbeddedScatterChartBuilder {
+      addRange(range: Range): EmbeddedChartBuilder;
+      asAreaChart(): EmbeddedAreaChartBuilder;
+      asBarChart(): EmbeddedBarChartBuilder;
+      asColumnChart(): EmbeddedColumnChartBuilder;
+      asLineChart(): EmbeddedLineChartBuilder;
+      asPieChart(): EmbeddedPieChartBuilder;
+      asScatterChart(): EmbeddedScatterChartBuilder;
+      asTableChart(): EmbeddedTableChartBuilder;
+      build(): EmbeddedChart;
+      getChartType(): Charts.ChartType;
+      getContainer(): ContainerInfo;
+      getRanges(): Range[];
+      removeRange(range: Range): EmbeddedChartBuilder;
+      setBackgroundColor(cssValue: string): EmbeddedScatterChartBuilder;
+      setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
+      setColors(cssValues: String[]): EmbeddedScatterChartBuilder;
+      setLegendPosition(position: Charts.Position): EmbeddedScatterChartBuilder;
+      setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedScatterChartBuilder;
+      setOption(option: string, value: Object): EmbeddedChartBuilder;
+      setPointStyle(style: Charts.PointStyle): EmbeddedScatterChartBuilder;
+      setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
+      setTitle(chartTitle: string): EmbeddedScatterChartBuilder;
+      setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedScatterChartBuilder;
+      setXAxisLogScale(): EmbeddedScatterChartBuilder;
+      setXAxisRange(start: Number, end: Number): EmbeddedScatterChartBuilder;
+      setXAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedScatterChartBuilder;
+      setXAxisTitle(title: string): EmbeddedScatterChartBuilder;
+      setXAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedScatterChartBuilder;
+      setYAxisLogScale(): EmbeddedScatterChartBuilder;
+      setYAxisRange(start: Number, end: Number): EmbeddedScatterChartBuilder;
+      setYAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedScatterChartBuilder;
+      setYAxisTitle(title: string): EmbeddedScatterChartBuilder;
+      setYAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedScatterChartBuilder;
+    }
+
+    /**
+     * Builder for table charts. For more details, see the Gviz 
+     *  documentation.
+     */
+    export interface EmbeddedTableChartBuilder {
+      addRange(range: Range): EmbeddedChartBuilder;
+      asAreaChart(): EmbeddedAreaChartBuilder;
+      asBarChart(): EmbeddedBarChartBuilder;
+      asColumnChart(): EmbeddedColumnChartBuilder;
+      asLineChart(): EmbeddedLineChartBuilder;
+      asPieChart(): EmbeddedPieChartBuilder;
+      asScatterChart(): EmbeddedScatterChartBuilder;
+      asTableChart(): EmbeddedTableChartBuilder;
+      build(): EmbeddedChart;
+      enablePaging(enablePaging: boolean): EmbeddedTableChartBuilder;
+      enablePaging(pageSize: Integer): EmbeddedTableChartBuilder;
+      enablePaging(pageSize: Integer, startPage: Integer): EmbeddedTableChartBuilder;
+      enableRtlTable(rtlEnabled: boolean): EmbeddedTableChartBuilder;
+      enableSorting(enableSorting: boolean): EmbeddedTableChartBuilder;
+      getChartType(): Charts.ChartType;
+      getContainer(): ContainerInfo;
+      getRanges(): Range[];
+      removeRange(range: Range): EmbeddedChartBuilder;
+      setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
+      setFirstRowNumber(number: Integer): EmbeddedTableChartBuilder;
+      setInitialSortingAscending(column: Integer): EmbeddedTableChartBuilder;
+      setInitialSortingDescending(column: Integer): EmbeddedTableChartBuilder;
+      setOption(option: string, value: Object): EmbeddedChartBuilder;
+      setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
+      showRowNumberColumn(showRowNumber: boolean): EmbeddedTableChartBuilder;
+      useAlternatingRowStyle(alternate: boolean): EmbeddedTableChartBuilder;
+    }
+
+    /**
+     * 
+     * Deprecated. For spreadsheets created in the newer version of Google Sheets, use the more powerful
+     *      Protection class instead. Although this class is deprecated, it will remain
+     *      available for compatibility with the older version of Sheets.
+     * Access and modify protected sheets in the older version of Google Sheets.
+     */
+    export interface PageProtection {
+      addUser(email: string): void;
+      getUsers(): String[];
+      isProtected(): boolean;
+      removeUser(user: string): void;
+      setProtected(protection: boolean): void;
+    }
+
+    /**
+     * Access and modify protected ranges and sheets. A protected range can protect either a static
+     *  range of cells or a named range. A protected sheet may include unprotected regions. For
+     *  spreadsheets created with the older version of Google Sheets, use the PageProtection
+     *  class instead.
+     * 
+     *      // Protect range A1:B10, then remove all other users from the list of editors.
+     *      var ss = SpreadsheetApp.getActive();
+     *      var range = ss.getRange('A1:B10');
+     *      var protection = range.protect().setDescription('Sample protected range');
+     *     
+     *      // Ensure the current user is an editor before removing others. Otherwise, if the user's edit
+     *      // permission comes from a group, the script will throw an exception upon removing the group.
+     *      var me = Session.getEffectiveUser();
+     *      protection.addEditor(me);
+     *      protection.removeEditors(protection.getEditors());
+     *      if (protection.canDomainEdit()) {
+     *        protection.setDomainEdit(false);
+     *      }
+     * 
+     *      // Remove all range protections in the spreadsheet that the user has permission to edit.
+     *      var ss = SpreadsheetApp.getActive();
+     *      var protections = ss.getProtections(SpreadsheetApp.ProtectionType.RANGE);
+     *      for (var i = 0; i < protections.length; i++) {
+     *        var protection = protections[i];
+     *        if (protection.canEdit()) {
+     *          protection.remove();
+     *        }
+     *      }
+     * 
+     *      // Protect the active sheet, then remove all other users from the list of editors.
+     *      var sheet = SpreadsheetApp.getActiveSheet();
+     *      var protection = sheet.protect().setDescription('Sample protected sheet');
+     *     
+     *      // Ensure the current user is an editor before removing others. Otherwise, if the user's edit
+     *      // permission comes from a group, the script will throw an exception upon removing the group.
+     *      var me = Session.getEffectiveUser();
+     *      protection.addEditor(me);
+     *      protection.removeEditors(protection.getEditors());
+     *      if (protection.canDomainEdit()) {
+     *        protection.setDomainEdit(false);
+     *      }
+     */
+    export interface Protection {
+      addEditor(emailAddress: string): Protection;
+      addEditor(user: Base.User): Protection;
+      addEditors(emailAddresses: String[]): Protection;
+      canDomainEdit(): boolean;
+      canEdit(): boolean;
+      getDescription(): string;
+      getEditors(): Base.User[];
+      getProtectionType(): ProtectionType;
+      getRange(): Range;
+      getRangeName(): string;
+      getUnprotectedRanges(): Range[];
+      isWarningOnly(): boolean;
+      remove(): void;
+      removeEditor(emailAddress: string): Protection;
+      removeEditor(user: Base.User): Protection;
+      removeEditors(emailAddresses: String[]): Protection;
+      setDescription(description: string): Protection;
+      setDomainEdit(editable: boolean): Protection;
+      setRange(range: Range): Protection;
+      setRangeName(rangeName: string): Protection;
+      setUnprotectedRanges(ranges: Range[]): Protection;
+      setWarningOnly(warningOnly: boolean): Protection;
+    }
+
+    /**
+     * An enumeration representing the parts of a spreadsheet that can be protected from edits.
+     * 
+     *      // Remove all range protections in the spreadsheet that the user has permission to edit.
+     *      var ss = SpreadsheetApp.getActive();
+     *      var protections = ss.getProtections(SpreadsheetApp.ProtectionType.RANGE);
+     *      for (var i = 0; i < protections.length; i++) {
+     *        var protection = protections[i];
+     *        if (protection.canEdit()) {
+     *          protection.remove();
+     *        }
+     *      }
+     * 
+     *      // Removes sheet protection from the active sheet, if the user has permission to edit it.
+     *      var sheet = SpreadsheetApp.getActiveSheet();
+     *      var protection = sheet.getProtections(SpreadsheetApp.ProtectionType.SHEET)[0];
+     *      if (protection && protection.canEdit()) {
+     *        protection.remove();
+     *      }
+     */
+    export enum ProtectionType { RANGE, SHEET }
+
+    /**
+     * Access and modify spreadsheet ranges.
+     * 
+     *  This class allows users to access and modify ranges in Google Sheets. A range can be
+     *  a single cell in a sheet or a range of cells in a sheet.
+     */
+    export interface Range {
+      activate(): Range;
+      breakApart(): Range;
+      canEdit(): boolean;
+      clear(): Range;
+      clear(options: Object): Range;
+      clearContent(): Range;
+      clearDataValidations(): Range;
+      clearFormat(): Range;
+      clearNote(): Range;
+      copyFormatToRange(gridId: Integer, column: Integer, columnEnd: Integer, row: Integer, rowEnd: Integer): void;
+      copyFormatToRange(sheet: Sheet, column: Integer, columnEnd: Integer, row: Integer, rowEnd: Integer): void;
+      copyTo(destination: Range): void;
+      copyTo(destination: Range, options: Object): void;
+      copyValuesToRange(gridId: Integer, column: Integer, columnEnd: Integer, row: Integer, rowEnd: Integer): void;
+      copyValuesToRange(sheet: Sheet, column: Integer, columnEnd: Integer, row: Integer, rowEnd: Integer): void;
+      getA1Notation(): string;
+      getBackground(): string;
+      getBackgrounds(): String[][];
+      getCell(row: Integer, column: Integer): Range;
+      getColumn(): Integer;
+      getDataSourceUrl(): string;
+      getDataTable(): Charts.DataTable;
+      getDataTable(firstRowIsHeader: boolean): Charts.DataTable;
+      getDataValidation(): DataValidation;
+      getDataValidations(): DataValidation[][];
+      getFontColor(): string;
+      getFontColors(): String[][];
+      getFontFamilies(): String[][];
+      getFontFamily(): string;
+      getFontLine(): string;
+      getFontLines(): String[][];
+      getFontSize(): Integer;
+      getFontSizes(): Integer[][];
+      getFontStyle(): string;
+      getFontStyles(): String[][];
+      getFontWeight(): string;
+      getFontWeights(): String[][];
+      getFormula(): string;
+      getFormulaR1C1(): string;
+      getFormulas(): String[][];
+      getFormulasR1C1(): String[][];
+      getGridId(): Integer;
+      getHeight(): Integer;
+      getHorizontalAlignment(): string;
+      getHorizontalAlignments(): String[][];
+      getLastColumn(): Integer;
+      getLastRow(): Integer;
+      getNote(): string;
+      getNotes(): String[][];
+      getNumColumns(): Integer;
+      getNumRows(): Integer;
+      getNumberFormat(): string;
+      getNumberFormats(): String[][];
+      getRow(): Integer;
+      getRowIndex(): Integer;
+      getSheet(): Sheet;
+      getValue(): Object;
+      getValues(): Object[][];
+      getVerticalAlignment(): string;
+      getVerticalAlignments(): String[][];
+      getWidth(): Integer;
+      getWrap(): boolean;
+      getWraps(): Boolean[][];
+      isBlank(): boolean;
+      isEndColumnBounded(): boolean;
+      isEndRowBounded(): boolean;
+      isStartColumnBounded(): boolean;
+      isStartRowBounded(): boolean;
+      merge(): Range;
+      mergeAcross(): Range;
+      mergeVertically(): Range;
+      moveTo(target: Range): void;
+      offset(rowOffset: Integer, columnOffset: Integer): Range;
+      offset(rowOffset: Integer, columnOffset: Integer, numRows: Integer): Range;
+      offset(rowOffset: Integer, columnOffset: Integer, numRows: Integer, numColumns: Integer): Range;
+      protect(): Protection;
+      setBackground(color: string): Range;
+      setBackgroundRGB(red: Integer, green: Integer, blue: Integer): Range;
+      setBackgrounds(color: String[][]): Range;
+      setBorder(top: boolean, left: boolean, bottom: boolean, right: boolean, vertical: boolean, horizontal: boolean): Range;
+      setDataValidation(rule: DataValidation): Range;
+      setDataValidations(rules: DataValidation[][]): Range;
+      setFontColor(color: string): Range;
+      setFontColors(colors: Object[][]): Range;
+      setFontFamilies(fontFamilies: Object[][]): Range;
+      setFontFamily(fontFamily: string): Range;
+      setFontLine(fontLine: string): Range;
+      setFontLines(fontLines: Object[][]): Range;
+      setFontSize(size: Integer): Range;
+      setFontSizes(sizes: Object[][]): Range;
+      setFontStyle(fontStyle: string): Range;
+      setFontStyles(fontStyles: Object[][]): Range;
+      setFontWeight(fontWeight: string): Range;
+      setFontWeights(fontWeights: Object[][]): Range;
+      setFormula(formula: string): Range;
+      setFormulaR1C1(formula: string): Range;
+      setFormulas(formulas: String[][]): Range;
+      setFormulasR1C1(formulas: String[][]): Range;
+      setHorizontalAlignment(alignment: string): Range;
+      setHorizontalAlignments(alignments: Object[][]): Range;
+      setNote(note: string): Range;
+      setNotes(notes: Object[][]): Range;
+      setNumberFormat(numberFormat: string): Range;
+      setNumberFormats(numberFormats: Object[][]): Range;
+      setValue(value: Object): Range;
+      setValues(values: Object[][]): Range;
+      setVerticalAlignment(alignment: string): Range;
+      setVerticalAlignments(alignments: Object[][]): Range;
+      setWrap(isWrapEnabled: boolean): Range;
+      setWraps(isWrapEnabled: Object[][]): Range;
+      sort(sortSpecObj: Object): Range;
+    }
+
+    /**
+     * Access and modify spreadsheet sheets. Common operations
+     *  are renaming a sheet and accessing range objects from the sheet.
+     */
+    export interface Sheet {
+      activate(): Sheet;
+      appendRow(rowContents: Object[]): Sheet;
+      autoResizeColumn(columnPosition: Integer): Sheet;
+      clear(): Sheet;
+      clear(options: Object): Sheet;
+      clearContents(): Sheet;
+      clearFormats(): Sheet;
+      clearNotes(): Sheet;
+      copyTo(spreadsheet: Spreadsheet): Sheet;
+      deleteColumn(columnPosition: Integer): Sheet;
+      deleteColumns(columnPosition: Integer, howMany: Integer): void;
+      deleteRow(rowPosition: Integer): Sheet;
+      deleteRows(rowPosition: Integer, howMany: Integer): void;
+      getActiveCell(): Range;
+      getActiveRange(): Range;
+      getCharts(): EmbeddedChart[];
+      getColumnWidth(columnPosition: Integer): Integer;
+      getDataRange(): Range;
+      getFrozenColumns(): Integer;
+      getFrozenRows(): Integer;
+      getIndex(): Integer;
+      getLastColumn(): Integer;
+      getLastRow(): Integer;
+      getMaxColumns(): Integer;
+      getMaxRows(): Integer;
+      getName(): string;
+      getParent(): Spreadsheet;
+      getProtections(type: ProtectionType): Protection[];
+      getRange(row: Integer, column: Integer): Range;
+      getRange(row: Integer, column: Integer, numRows: Integer): Range;
+      getRange(row: Integer, column: Integer, numRows: Integer, numColumns: Integer): Range;
+      getRange(a1Notation: string): Range;
+      getRowHeight(rowPosition: Integer): Integer;
+      getSheetId(): Integer;
+      getSheetName(): string;
+      getSheetValues(startRow: Integer, startColumn: Integer, numRows: Integer, numColumns: Integer): Object[][];
+      hideColumn(column: Range): void;
+      hideColumns(columnIndex: Integer): void;
+      hideColumns(columnIndex: Integer, numColumns: Integer): void;
+      hideRow(row: Range): void;
+      hideRows(rowIndex: Integer): void;
+      hideRows(rowIndex: Integer, numRows: Integer): void;
+      hideSheet(): Sheet;
+      insertChart(chart: EmbeddedChart): void;
+      insertColumnAfter(afterPosition: Integer): Sheet;
+      insertColumnBefore(beforePosition: Integer): Sheet;
+      insertColumns(columnIndex: Integer): void;
+      insertColumns(columnIndex: Integer, numColumns: Integer): void;
+      insertColumnsAfter(afterPosition: Integer, howMany: Integer): Sheet;
+      insertColumnsBefore(beforePosition: Integer, howMany: Integer): Sheet;
+      insertImage(blob: Base.Blob, column: Integer, row: Integer): void;
+      insertImage(blob: Base.Blob, column: Integer, row: Integer, offsetX: Integer, offsetY: Integer): void;
+      insertImage(url: string, column: Integer, row: Integer): void;
+      insertImage(url: string, column: Integer, row: Integer, offsetX: Integer, offsetY: Integer): void;
+      insertRowAfter(afterPosition: Integer): Sheet;
+      insertRowBefore(beforePosition: Integer): Sheet;
+      insertRows(rowIndex: Integer): void;
+      insertRows(rowIndex: Integer, numRows: Integer): void;
+      insertRowsAfter(afterPosition: Integer, howMany: Integer): Sheet;
+      insertRowsBefore(beforePosition: Integer, howMany: Integer): Sheet;
+      isSheetHidden(): boolean;
+      newChart(): EmbeddedChartBuilder;
+      protect(): Protection;
+      removeChart(chart: EmbeddedChart): void;
+      setActiveRange(range: Range): Range;
+      setActiveSelection(range: Range): Range;
+      setActiveSelection(a1Notation: string): Range;
+      setColumnWidth(columnPosition: Integer, width: Integer): Sheet;
+      setFrozenColumns(columns: Integer): void;
+      setFrozenRows(rows: Integer): void;
+      setName(name: string): Sheet;
+      setRowHeight(rowPosition: Integer, height: Integer): Sheet;
+      showColumns(columnIndex: Integer): void;
+      showColumns(columnIndex: Integer, numColumns: Integer): void;
+      showRows(rowIndex: Integer): void;
+      showRows(rowIndex: Integer, numRows: Integer): void;
+      showSheet(): Sheet;
+      sort(columnPosition: Integer): Sheet;
+      sort(columnPosition: Integer, ascending: boolean): Sheet;
+      unhideColumn(column: Range): void;
+      unhideRow(row: Range): void;
+      updateChart(chart: EmbeddedChart): void;
+      getSheetProtection(): PageProtection;
+      setSheetProtection(permissions: PageProtection): void;
+    }
+
+    /**
+     * This class allows users to access and modify Google Sheets files. Common operations are adding
+     *  new sheets and adding collaborators.
+     */
+    export interface Spreadsheet {
+      addEditor(emailAddress: string): Spreadsheet;
+      addEditor(user: Base.User): Spreadsheet;
+      addEditors(emailAddresses: String[]): Spreadsheet;
+      addMenu(name: string, subMenus: Object[]): void;
+      addViewer(emailAddress: string): Spreadsheet;
+      addViewer(user: Base.User): Spreadsheet;
+      addViewers(emailAddresses: String[]): Spreadsheet;
+      appendRow(rowContents: Object[]): Sheet;
+      autoResizeColumn(columnPosition: Integer): Sheet;
+      copy(name: string): Spreadsheet;
+      deleteActiveSheet(): Sheet;
+      deleteColumn(columnPosition: Integer): Sheet;
+      deleteColumns(columnPosition: Integer, howMany: Integer): void;
+      deleteRow(rowPosition: Integer): Sheet;
+      deleteRows(rowPosition: Integer, howMany: Integer): void;
+      deleteSheet(sheet: Sheet): void;
+      duplicateActiveSheet(): Sheet;
+      getActiveCell(): Range;
+      getActiveRange(): Range;
+      getActiveSheet(): Sheet;
+      getAs(contentType: string): Base.Blob;
+      getBlob(): Base.Blob;
+      getColumnWidth(columnPosition: Integer): Integer;
+      getDataRange(): Range;
+      getEditors(): Base.User[];
+      getFormUrl(): string;
+      getFrozenColumns(): Integer;
+      getFrozenRows(): Integer;
+      getId(): string;
+      getLastColumn(): Integer;
+      getLastRow(): Integer;
+      getName(): string;
+      getNumSheets(): Integer;
+      getOwner(): Base.User;
+      getProtections(type: ProtectionType): Protection[];
+      getRange(a1Notation: string): Range;
+      getRangeByName(name: string): Range;
+      getRowHeight(rowPosition: Integer): Integer;
+      getSheetByName(name: string): Sheet;
+      getSheetId(): Integer;
+      getSheetName(): string;
+      getSheetValues(startRow: Integer, startColumn: Integer, numRows: Integer, numColumns: Integer): Object[][];
+      getSheets(): Sheet[];
+      getSpreadsheetLocale(): string;
+      getSpreadsheetTimeZone(): string;
+      getUrl(): string;
+      getViewers(): Base.User[];
+      hideColumn(column: Range): void;
+      hideRow(row: Range): void;
+      insertColumnAfter(afterPosition: Integer): Sheet;
+      insertColumnBefore(beforePosition: Integer): Sheet;
+      insertColumnsAfter(afterPosition: Integer, howMany: Integer): Sheet;
+      insertColumnsBefore(beforePosition: Integer, howMany: Integer): Sheet;
+      insertImage(blob: Base.Blob, column: Integer, row: Integer): void;
+      insertImage(blob: Base.Blob, column: Integer, row: Integer, offsetX: Integer, offsetY: Integer): void;
+      insertImage(url: string, column: Integer, row: Integer): void;
+      insertImage(url: string, column: Integer, row: Integer, offsetX: Integer, offsetY: Integer): void;
+      insertRowAfter(afterPosition: Integer): Sheet;
+      insertRowBefore(beforePosition: Integer): Sheet;
+      insertRowsAfter(afterPosition: Integer, howMany: Integer): Sheet;
+      insertRowsBefore(beforePosition: Integer, howMany: Integer): Sheet;
+      insertSheet(): Sheet;
+      insertSheet(sheetIndex: Integer): Sheet;
+      insertSheet(sheetIndex: Integer, options: Object): Sheet;
+      insertSheet(options: Object): Sheet;
+      insertSheet(sheetName: string): Sheet;
+      insertSheet(sheetName: string, sheetIndex: Integer): Sheet;
+      insertSheet(sheetName: string, sheetIndex: Integer, options: Object): Sheet;
+      insertSheet(sheetName: string, options: Object): Sheet;
+      moveActiveSheet(pos: Integer): void;
+      removeEditor(emailAddress: string): Spreadsheet;
+      removeEditor(user: Base.User): Spreadsheet;
+      removeMenu(name: string): void;
+      removeNamedRange(name: string): void;
+      removeViewer(emailAddress: string): Spreadsheet;
+      removeViewer(user: Base.User): Spreadsheet;
+      rename(newName: string): void;
+      renameActiveSheet(newName: string): void;
+      setActiveRange(range: Range): Range;
+      setActiveSelection(range: Range): Range;
+      setActiveSelection(a1Notation: string): Range;
+      setActiveSheet(sheet: Sheet): Sheet;
+      setColumnWidth(columnPosition: Integer, width: Integer): Sheet;
+      setFrozenColumns(columns: Integer): void;
+      setFrozenRows(rows: Integer): void;
+      setNamedRange(name: string, range: Range): void;
+      setRowHeight(rowPosition: Integer, height: Integer): Sheet;
+      setSpreadsheetLocale(locale: string): void;
+      setSpreadsheetTimeZone(timezone: string): void;
+      show(userInterface: Object): void;
+      sort(columnPosition: Integer): Sheet;
+      sort(columnPosition: Integer, ascending: boolean): Sheet;
+      toast(msg: string): void;
+      toast(msg: string, title: string): void;
+      toast(msg: string, title: string, timeoutSeconds: Number): void;
+      unhideColumn(column: Range): void;
+      unhideRow(row: Range): void;
+      updateMenu(name: string, subMenus: Object[]): void;
+      getSheetProtection(): PageProtection;
+      isAnonymousView(): boolean;
+      isAnonymousWrite(): boolean;
+      setAnonymousAccess(anonymousReadAllowed: boolean, anonymousWriteAllowed: boolean): void;
+      setSheetProtection(permissions: PageProtection): void;
+    }
+
+    /**
+     * This class allows users to open Google Sheets files and to create new ones. This class is
+     *  the parent class for the Spreadsheet service.
+     */
+    export interface SpreadsheetApp {
+      DataValidationCriteria: DataValidationCriteria
+      ProtectionType: ProtectionType
+      create(name: string): Spreadsheet;
+      create(name: string, rows: Integer, columns: Integer): Spreadsheet;
+      flush(): void;
+      getActive(): Spreadsheet;
+      getActiveRange(): Range;
+      getActiveSheet(): Sheet;
+      getActiveSpreadsheet(): Spreadsheet;
+      getUi(): Base.Ui;
+      newDataValidation(): DataValidationBuilder;
+      open(file: Drive.File): Spreadsheet;
+      openById(id: string): Spreadsheet;
+      openByUrl(url: string): Spreadsheet;
+      setActiveRange(range: Range): Range;
+      setActiveSheet(sheet: Sheet): Sheet;
+      setActiveSpreadsheet(newActiveSpreadsheet: Spreadsheet): void;
+    }
+
+  }
+}
+
+declare var SpreadsheetApp: GoogleAppsScript.Spreadsheet.SpreadsheetApp;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.types.d.ts b/google-apps-script/google-apps-script.types.d.ts
new file mode 100644
index 000000000..5204a8a2a
--- /dev/null
+++ b/google-apps-script/google-apps-script.types.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module GoogleAppsScript {
+  type BigNumber = any;
+  type Byte = number;
+  type Integer = number;
+  type Char = string;
+  type JdbcSQL_XML = any;
+}
diff --git a/google-apps-script/google-apps-script.ui.d.ts b/google-apps-script/google-apps-script.ui.d.ts
new file mode 100644
index 000000000..00dabefd0
--- /dev/null
+++ b/google-apps-script/google-apps-script.ui.d.ts
@@ -0,0 +1,3628 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+
+declare module GoogleAppsScript {
+  export module UI {
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * An absolute panel positions all of its children absolutely, allowing them to overlap.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var button = app.createButton("a button");
+     *        var panel = app.createAbsolutePanel();
+     *        // add a widget at position (10, 20)
+     *        panel.add(button, 10, 20);
+     *        app.add(panel);
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the AbsolutePanel documentation here.
+     */
+    export interface AbsolutePanel {
+      add(widget: Widget): AbsolutePanel;
+      add(widget: Widget, left: Integer, top: Integer): AbsolutePanel;
+      addStyleDependentName(styleName: string): AbsolutePanel;
+      addStyleName(styleName: string): AbsolutePanel;
+      clear(): AbsolutePanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      remove(index: Integer): AbsolutePanel;
+      remove(widget: Widget): AbsolutePanel;
+      setHeight(height: string): AbsolutePanel;
+      setId(id: string): AbsolutePanel;
+      setLayoutData(layout: Object): AbsolutePanel;
+      setPixelSize(width: Integer, height: Integer): AbsolutePanel;
+      setSize(width: string, height: string): AbsolutePanel;
+      setStyleAttribute(attribute: string, value: string): AbsolutePanel;
+      setStyleAttributes(attributes: Object): AbsolutePanel;
+      setStyleName(styleName: string): AbsolutePanel;
+      setStylePrimaryName(styleName: string): AbsolutePanel;
+      setTag(tag: string): AbsolutePanel;
+      setTitle(title: string): AbsolutePanel;
+      setVisible(visible: boolean): AbsolutePanel;
+      setWidgetPosition(widget: Widget, left: Integer, top: Integer): AbsolutePanel;
+      setWidth(width: string): AbsolutePanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A widget that represents a simple <a> element. That is, a hyperlink to a different page.
+     * 
+     *  By design, these hyperlinks always open in a new page. Links that reload the current page are
+     *  not allowed.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        // Creates a link to your favorite search engine.
+     *        var anchor = app.createAnchor("a link", "http://www.google.com");
+     *        app.add(anchor);
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the Anchor documentation here.
+     */
+    export interface Anchor {
+      addBlurHandler(handler: Handler): Anchor;
+      addClickHandler(handler: Handler): Anchor;
+      addFocusHandler(handler: Handler): Anchor;
+      addKeyDownHandler(handler: Handler): Anchor;
+      addKeyPressHandler(handler: Handler): Anchor;
+      addKeyUpHandler(handler: Handler): Anchor;
+      addMouseDownHandler(handler: Handler): Anchor;
+      addMouseMoveHandler(handler: Handler): Anchor;
+      addMouseOutHandler(handler: Handler): Anchor;
+      addMouseOverHandler(handler: Handler): Anchor;
+      addMouseUpHandler(handler: Handler): Anchor;
+      addMouseWheelHandler(handler: Handler): Anchor;
+      addStyleDependentName(styleName: string): Anchor;
+      addStyleName(styleName: string): Anchor;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): Anchor;
+      setDirection(direction: Component): Anchor;
+      setEnabled(enabled: boolean): Anchor;
+      setFocus(focus: boolean): Anchor;
+      setHTML(html: string): Anchor;
+      setHeight(height: string): Anchor;
+      setHorizontalAlignment(horizontalAlignment: HorizontalAlignment): Anchor;
+      setHref(href: string): Anchor;
+      setId(id: string): Anchor;
+      setLayoutData(layout: Object): Anchor;
+      setName(name: string): Anchor;
+      setPixelSize(width: Integer, height: Integer): Anchor;
+      setSize(width: string, height: string): Anchor;
+      setStyleAttribute(attribute: string, value: string): Anchor;
+      setStyleAttributes(attributes: Object): Anchor;
+      setStyleName(styleName: string): Anchor;
+      setStylePrimaryName(styleName: string): Anchor;
+      setTabIndex(index: Integer): Anchor;
+      setTag(tag: string): Anchor;
+      setTarget(target: string): Anchor;
+      setText(text: string): Anchor;
+      setTitle(title: string): Anchor;
+      setVisible(visible: boolean): Anchor;
+      setWidth(width: string): Anchor;
+      setWordWrap(wordWrap: boolean): Anchor;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A standard push-button widget.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        // create a button and give it a click handler
+     *        var button = app.createButton("click me!").setId("button");
+     *        button.addClickHandler(app.createServerHandler("handlerFunction"));
+     *        app.add(button);
+     *        return app;
+     *      }
+     *     
+     *      function handlerFunction(eventInfo) {
+     *        var app = UiApp.getActiveApplication();
+     *        app.getElementById("button").setText("I was clicked!");
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the Button documentation here.
+     */
+    export interface Button {
+      addBlurHandler(handler: Handler): Button;
+      addClickHandler(handler: Handler): Button;
+      addFocusHandler(handler: Handler): Button;
+      addKeyDownHandler(handler: Handler): Button;
+      addKeyPressHandler(handler: Handler): Button;
+      addKeyUpHandler(handler: Handler): Button;
+      addMouseDownHandler(handler: Handler): Button;
+      addMouseMoveHandler(handler: Handler): Button;
+      addMouseOutHandler(handler: Handler): Button;
+      addMouseOverHandler(handler: Handler): Button;
+      addMouseUpHandler(handler: Handler): Button;
+      addMouseWheelHandler(handler: Handler): Button;
+      addStyleDependentName(styleName: string): Button;
+      addStyleName(styleName: string): Button;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): Button;
+      setEnabled(enabled: boolean): Button;
+      setFocus(focus: boolean): Button;
+      setHTML(html: string): Button;
+      setHeight(height: string): Button;
+      setId(id: string): Button;
+      setLayoutData(layout: Object): Button;
+      setPixelSize(width: Integer, height: Integer): Button;
+      setSize(width: string, height: string): Button;
+      setStyleAttribute(attribute: string, value: string): Button;
+      setStyleAttributes(attributes: Object): Button;
+      setStyleName(styleName: string): Button;
+      setStylePrimaryName(styleName: string): Button;
+      setTabIndex(index: Integer): Button;
+      setTag(tag: string): Button;
+      setText(text: string): Button;
+      setTitle(title: string): Button;
+      setVisible(visible: boolean): Button;
+      setWidth(width: string): Button;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A panel that wraps its contents in a border with a caption that appears in the upper left
+     *  corner of the border. This is an implementation of the fieldset HTML element.
+     * 
+     *  Note that this panel can contain at most one direct child widget. To add more children, make the
+     *  child of this panel a different panel that can contain more than one child.
+     * 
+     *  Note also that the placement of the caption in a caption panel will vary slightly from browser to
+     *  browser, so this widget is not a good choice when precise cross-browser layout is needed.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var panel = app.createCaptionPanel("my caption!");
+     *        panel.add(app.createButton("a button inside..."));
+     *        app.add(panel);
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the CaptionPanel documentation here.
+     */
+    export interface CaptionPanel {
+      add(widget: Widget): CaptionPanel;
+      addStyleDependentName(styleName: string): CaptionPanel;
+      addStyleName(styleName: string): CaptionPanel;
+      clear(): CaptionPanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setCaptionText(text: string): CaptionPanel;
+      setContentWidget(widget: Widget): CaptionPanel;
+      setHeight(height: string): CaptionPanel;
+      setId(id: string): CaptionPanel;
+      setLayoutData(layout: Object): CaptionPanel;
+      setPixelSize(width: Integer, height: Integer): CaptionPanel;
+      setSize(width: string, height: string): CaptionPanel;
+      setStyleAttribute(attribute: string, value: string): CaptionPanel;
+      setStyleAttributes(attributes: Object): CaptionPanel;
+      setStyleName(styleName: string): CaptionPanel;
+      setStylePrimaryName(styleName: string): CaptionPanel;
+      setTag(tag: string): CaptionPanel;
+      setText(text: string): CaptionPanel;
+      setTitle(title: string): CaptionPanel;
+      setVisible(visible: boolean): CaptionPanel;
+      setWidget(widget: Widget): CaptionPanel;
+      setWidth(width: string): CaptionPanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A standard check box widget.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var handler = app.createServerHandler("change");
+     *        var check = app.createCheckBox("click me").addValueChangeHandler(handler);
+     *        app.add(check);
+     *        return app;
+     *      }
+     *     
+     *      function change() {
+     *        var app = UiApp.getActiveApplication();
+     *        app.add(app.createLabel("The value changed!"));
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the CheckBox documentation here.
+     */
+    export interface CheckBox {
+      addBlurHandler(handler: Handler): CheckBox;
+      addClickHandler(handler: Handler): CheckBox;
+      addFocusHandler(handler: Handler): CheckBox;
+      addKeyDownHandler(handler: Handler): CheckBox;
+      addKeyPressHandler(handler: Handler): CheckBox;
+      addKeyUpHandler(handler: Handler): CheckBox;
+      addMouseDownHandler(handler: Handler): CheckBox;
+      addMouseMoveHandler(handler: Handler): CheckBox;
+      addMouseOutHandler(handler: Handler): CheckBox;
+      addMouseOverHandler(handler: Handler): CheckBox;
+      addMouseUpHandler(handler: Handler): CheckBox;
+      addMouseWheelHandler(handler: Handler): CheckBox;
+      addStyleDependentName(styleName: string): CheckBox;
+      addStyleName(styleName: string): CheckBox;
+      addValueChangeHandler(handler: Handler): CheckBox;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): CheckBox;
+      setEnabled(enabled: boolean): CheckBox;
+      setFocus(focus: boolean): CheckBox;
+      setFormValue(formValue: string): CheckBox;
+      setHTML(html: string): CheckBox;
+      setHeight(height: string): CheckBox;
+      setId(id: string): CheckBox;
+      setLayoutData(layout: Object): CheckBox;
+      setName(name: string): CheckBox;
+      setPixelSize(width: Integer, height: Integer): CheckBox;
+      setSize(width: string, height: string): CheckBox;
+      setStyleAttribute(attribute: string, value: string): CheckBox;
+      setStyleAttributes(attributes: Object): CheckBox;
+      setStyleName(styleName: string): CheckBox;
+      setStylePrimaryName(styleName: string): CheckBox;
+      setTabIndex(index: Integer): CheckBox;
+      setTag(tag: string): CheckBox;
+      setText(text: string): CheckBox;
+      setTitle(title: string): CheckBox;
+      setValue(value: boolean): CheckBox;
+      setValue(value: boolean, fireEvents: boolean): CheckBox;
+      setVisible(visible: boolean): CheckBox;
+      setWidth(width: string): CheckBox;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * An event handler that runs in the user's browser without needing a call back to the server.
+     *  These will, in general, run much faster than ServerHandlers but they are also more
+     *  limited in what they can do.
+     * 
+     *  Any method that accepts a "Handler" parameter can accept a ClientHandler.
+     * 
+     *  If you set validators on a ClientHandler, they will be checked before the handler performs its
+     *  actions. The actions will only be performed if the validators succeed.
+     * 
+     *  If you have multiple ClientHandlers for the same event on the same widget, they will perform
+     *  their actions in the order that they were added.
+     * 
+     *  An example of using client handlers:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var button = app.createButton("Say Hello");
+     *     
+     *        // Create a label with the "Hello World!" text and hide it for now
+     *        var label = app.createLabel("Hello World!").setVisible(false);
+     *     
+     *        // Create a new handler that does not require the server.
+     *        // We give the handler two actions to perform on different targets.
+     *        // The first action disables the widget that invokes the handler
+     *        // and the second displays the label.
+     *        var handler = app.createClientHandler()
+     *          .forEventSource().setEnabled(false)
+     *          .forTargets(label).setVisible(true);
+     *     
+     *        // Add our new handler to be invoked when the button is clicked
+     *        button.addClickHandler(handler);
+     *     
+     *        app.add(button);
+     *        app.add(label);
+     *        return app;
+     *      }
+     */
+    export interface ClientHandler {
+      forEventSource(): ClientHandler;
+      forTargets(...widgets: Object[]): ClientHandler;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setEnabled(enabled: boolean): ClientHandler;
+      setHTML(html: string): ClientHandler;
+      setId(id: string): ClientHandler;
+      setStyleAttribute(row: Integer, column: Integer, attribute: string, value: string): ClientHandler;
+      setStyleAttribute(attribute: string, value: string): ClientHandler;
+      setStyleAttributes(row: Integer, column: Integer, attributes: Object): ClientHandler;
+      setStyleAttributes(attributes: Object): ClientHandler;
+      setTag(tag: string): ClientHandler;
+      setText(text: string): ClientHandler;
+      setValue(value: boolean): ClientHandler;
+      setVisible(visible: boolean): ClientHandler;
+      validateEmail(widget: Widget): ClientHandler;
+      validateInteger(widget: Widget): ClientHandler;
+      validateLength(widget: Widget, min: Integer, max: Integer): ClientHandler;
+      validateMatches(widget: Widget, pattern: string): ClientHandler;
+      validateMatches(widget: Widget, pattern: string, flags: string): ClientHandler;
+      validateNotEmail(widget: Widget): ClientHandler;
+      validateNotInteger(widget: Widget): ClientHandler;
+      validateNotLength(widget: Widget, min: Integer, max: Integer): ClientHandler;
+      validateNotMatches(widget: Widget, pattern: string): ClientHandler;
+      validateNotMatches(widget: Widget, pattern: string, flags: string): ClientHandler;
+      validateNotNumber(widget: Widget): ClientHandler;
+      validateNotOptions(widget: Widget, options: String[]): ClientHandler;
+      validateNotRange(widget: Widget, min: Number, max: Number): ClientHandler;
+      validateNotSum(widgets: Widget[], sum: Integer): ClientHandler;
+      validateNumber(widget: Widget): ClientHandler;
+      validateOptions(widget: Widget, options: String[]): ClientHandler;
+      validateRange(widget: Widget, min: Number, max: Number): ClientHandler;
+      validateSum(widgets: Widget[], sum: Integer): ClientHandler;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A generic component object.
+     * Implementing classes
+     * 
+     * NameBrief description
+     * 
+     * AbsolutePanelAn absolute panel positions all of its children absolutely, allowing them to overlap.
+     * 
+     * AnchorA widget that represents a simple <a> element.
+     * 
+     * ButtonA standard push-button widget.
+     * 
+     * CaptionPanelA panel that wraps its contents in a border with a caption that appears in the upper left
+     *  corner of the border.
+     * 
+     * ChartA Chart object, which can be embedded into documents, UI elements, or used as a static image.
+     * 
+     * CheckBoxA standard check box widget.
+     * 
+     * ClientHandlerAn event handler that runs in the user's browser without needing a call back to the server.
+     * 
+     * ControlA user interface control object, that drives the data displayed by a DashboardPanel.
+     * 
+     * DashboardPanelA dashboard is a visual structure that enables the organization and management
+     *  of multiple charts that share the same underlying data.
+     * 
+     * DateBoxA text box that shows a DatePicker when the user focuses on it.
+     * 
+     * DatePickerA date picker widget.
+     * 
+     * DecoratedStackPanelA StackPanel that wraps each item in a 2x3 grid (six box), which allows users to add
+     *  rounded corners.
+     * 
+     * DecoratedTabBarA TabBar that wraps each tab in a 2x3 grid (six box), which allows users to add rounded corners.
+     * 
+     * DecoratedTabPanelA TabPanel that uses a DecoratedTabBar with rounded corners.
+     * 
+     * DecoratorPanelA SimplePanel that wraps its contents in stylized boxes, which can be used to add rounded
+     *  corners to a Widget.
+     * 
+     * DialogBoxA form of popup that has a caption area at the top and can be dragged by the
+     *  user.
+     * 
+     * DocsListDialogA "file-open" dialog for Google Drive.
+     * 
+     * EmbeddedChartRepresents a chart that has been embedded into a Spreadsheet.
+     * 
+     * FileUploadA widget that wraps the HTML <input type='file'> element.
+     * 
+     * FlexTableA flexible table that creates cells on demand.
+     * 
+     * FlowPanelA panel that formats its child widgets using the default HTML layout behavior.
+     * 
+     * FocusPanelA simple panel that makes its contents focusable, and adds the ability to catch mouse and
+     *  keyboard events.
+     * 
+     * FormPanelA panel that wraps its contents in an HTML <FORM> element.
+     * 
+     * GridA rectangular grid that can contain text, html, or a child widget within its cells.
+     * 
+     * HTMLA widget that contains arbitrary text, which is interpreted as HTML.
+     * 
+     * HandlerBase interface for client and server handlers.
+     * 
+     * HiddenRepresents a hidden field for storing data in the user's browser that can be passed back to a
+     *  handler as a "callback element".
+     * 
+     * HorizontalPanelA panel that lays all of its widgets out in a single horizontal column.
+     * 
+     * ImageA widget that displays the image at a given URL.
+     * 
+     * InlineLabelA widget that contains arbitrary text, not interpreted as HTML.
+     * 
+     * LabelA widget that contains arbitrary text, not interpreted as HTML.
+     * 
+     * ListBoxA widget that presents a list of choices to the user, either as a list box or
+     *  as a drop-down list.
+     * 
+     * MenuBarA standard menu bar widget.
+     * 
+     * MenuItemAn entry in a MenuBar.
+     * 
+     * MenuItemSeparatorA separator that can be placed in a MenuBar.
+     * 
+     * PasswordTextBoxA text box that visually masks its input to prevent eavesdropping.
+     * 
+     * PopupPanelA panel that can "pop up" over other widgets.
+     * 
+     * PushButtonA normal push button with custom styling.
+     * 
+     * RadioButtonA mutually-exclusive selection radio button widget.
+     * 
+     * ResetButtonA standard push-button widget which will automatically reset its enclosing FormPanel if
+     *  any.
+     * 
+     * ScrollPanelA panel that wraps its contents in a scrollable element.
+     * 
+     * ServerHandlerAn event handler that runs on the server.
+     * 
+     * SimpleCheckBoxA simple checkbox widget, with no label.
+     * 
+     * SimplePanelA panel that can contain only one widget.
+     * 
+     * SimpleRadioButtonA simple radio button widget, with no label.
+     * 
+     * SplitLayoutPanelA panel that adds user-positioned splitters between each of its child widgets.
+     * 
+     * StackPanelA panel that stacks its children vertically, displaying only one at a time,
+     *  with a header for each child which the user can click to display.
+     * 
+     * SubmitButtonA standard push-button widget which will automatically submit its enclosing FormPanel if
+     *  any.
+     * 
+     * SuggestBoxA SuggestBox is a text box or text area which displays a
+     *  pre-configured set of selections that match the user's input.
+     * 
+     * TabBarA horizontal bar of folder-style tabs, most commonly used as part of a TabPanel.
+     * 
+     * TabPanelA panel that represents a tabbed set of pages, each of which contains another
+     *  widget.
+     * 
+     * TextAreaA text box that allows multiple lines of text to be entered.
+     * 
+     * TextBoxA standard single-line text box.
+     * 
+     * ToggleButtonA ToggleButton is a stylish stateful button which allows the
+     *  user to toggle between up and down states.
+     * 
+     * TreeA standard hierarchical tree widget.
+     * 
+     * TreeItemAn item that can be contained within a Tree.
+     * 
+     * VerticalPanelA panel that lays all of its widgets out in a single vertical column.
+     * 
+     * WidgetBase interface for UiApp widgets.
+     */
+    export interface Component {
+      getId(): string;
+      getType(): string;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A text box that shows a DatePicker when the user focuses on it.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var handler = app.createServerHandler("change");
+     *        var dateBox = app.createDateBox().addValueChangeHandler(handler).setId("datebox");
+     *        app.add(dateBox);
+     *        return app;
+     *      }
+     *     
+     *      function change(eventInfo) {
+     *        var app = UiApp.getActiveApplication();
+     *        app.add(app.createLabel("The value of the date box changed to " +
+     *            eventInfo.parameter.datebox));
+     *         return app;
+     *       }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the DateBox documentation here.
+     */
+    export interface DateBox {
+      addStyleDependentName(styleName: string): DateBox;
+      addStyleName(styleName: string): DateBox;
+      addValueChangeHandler(handler: Handler): DateBox;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      hideDatePicker(): DateBox;
+      setAccessKey(accessKey: Char): DateBox;
+      setEnabled(enabled: boolean): DateBox;
+      setFireEventsForInvalid(fireEvents: boolean): DateBox;
+      setFocus(focus: boolean): DateBox;
+      setFormat(dateTimeFormat: DateTimeFormat): DateBox;
+      setHeight(height: string): DateBox;
+      setId(id: string): DateBox;
+      setLayoutData(layout: Object): DateBox;
+      setName(name: string): DateBox;
+      setPixelSize(width: Integer, height: Integer): DateBox;
+      setSize(width: string, height: string): DateBox;
+      setStyleAttribute(attribute: string, value: string): DateBox;
+      setStyleAttributes(attributes: Object): DateBox;
+      setStyleName(styleName: string): DateBox;
+      setStylePrimaryName(styleName: string): DateBox;
+      setTabIndex(index: Integer): DateBox;
+      setTag(tag: string): DateBox;
+      setTitle(title: string): DateBox;
+      setValue(date: Date): DateBox;
+      setVisible(visible: boolean): DateBox;
+      setWidth(width: string): DateBox;
+      showDatePicker(): DateBox;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A date picker widget.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var handler = app.createServerHandler("change");
+     *        var picker = app.createDatePicker().addValueChangeHandler(handler).setId("picker");
+     *        app.add(picker);
+     *        return app;
+     *      }
+     *     
+     *      function change(eventInfo) {
+     *        var app = UiApp.getActiveApplication();
+     *        app.add(app.createLabel("The value of the date picker changed to " +
+     *            eventInfo.parameter.picker));
+     *         return app;
+     *       }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the DatePicker documentation here.
+     */
+    export interface DatePicker {
+      addStyleDependentName(styleName: string): DatePicker;
+      addStyleName(styleName: string): DatePicker;
+      addValueChangeHandler(handler: Handler): DatePicker;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setCurrentMonth(date: Date): DatePicker;
+      setHeight(height: string): DatePicker;
+      setId(id: string): DatePicker;
+      setLayoutData(layout: Object): DatePicker;
+      setName(name: string): DatePicker;
+      setPixelSize(width: Integer, height: Integer): DatePicker;
+      setSize(width: string, height: string): DatePicker;
+      setStyleAttribute(attribute: string, value: string): DatePicker;
+      setStyleAttributes(attributes: Object): DatePicker;
+      setStyleName(styleName: string): DatePicker;
+      setStylePrimaryName(styleName: string): DatePicker;
+      setTag(tag: string): DatePicker;
+      setTitle(title: string): DatePicker;
+      setValue(date: Date): DatePicker;
+      setVisible(visible: boolean): DatePicker;
+      setWidth(width: string): DatePicker;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * Date and time format constants for widgets such as
+     *  DateBox.
+     * 
+     *  These correspond to the predefined constants from the Google Web Toolkit. You can read
+     *  more about these constants 
+     *  here.
+     */
+    export enum DateTimeFormat { ISO_8601, RFC_2822, DATE_FULL, DATE_LONG, DATE_MEDIUM, DATE_SHORT, TIME_FULL, TIME_LONG, TIME_MEDIUM, TIME_SHORT, DATE_TIME_FULL, DATE_TIME_LONG, DATE_TIME_MEDIUM, DATE_TIME_SHORT, DAY, HOUR_MINUTE, HOUR_MINUTE_SECOND, HOUR24_MINUTE, HOUR24_MINUTE_SECOND, MINUTE_SECOND, MONTH, MONTH_ABBR, MONTH_ABBR_DAY, MONTH_DAY, MONTH_NUM_DAY, MONTH_WEEKDAY_DAY, YEAR, YEAR_MONTH, YEAR_MONTH_ABBR, YEAR_MONTH_ABBR_DAY, YEAR_MONTH_DAY, YEAR_MONTH_NUM, YEAR_MONTH_NUM_DAY, YEAR_MONTH_WEEKDAY_DAY, YEAR_QUARTER, YEAR_QUARTER_ABBR }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A StackPanel that wraps each item in a 2x3 grid (six box), which allows users to add
+     *  rounded corners.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the DecoratedStackPanel documentation here.
+     */
+    export interface DecoratedStackPanel {
+      add(widget: Widget): DecoratedStackPanel;
+      add(widget: Widget, text: string): DecoratedStackPanel;
+      add(widget: Widget, text: string, asHtml: boolean): DecoratedStackPanel;
+      addStyleDependentName(styleName: string): DecoratedStackPanel;
+      addStyleName(styleName: string): DecoratedStackPanel;
+      clear(): DecoratedStackPanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      remove(index: Integer): DecoratedStackPanel;
+      remove(widget: Widget): DecoratedStackPanel;
+      setHeight(height: string): DecoratedStackPanel;
+      setId(id: string): DecoratedStackPanel;
+      setLayoutData(layout: Object): DecoratedStackPanel;
+      setPixelSize(width: Integer, height: Integer): DecoratedStackPanel;
+      setSize(width: string, height: string): DecoratedStackPanel;
+      setStackText(index: Integer, text: string): DecoratedStackPanel;
+      setStackText(index: Integer, text: string, asHtml: boolean): DecoratedStackPanel;
+      setStyleAttribute(attribute: string, value: string): DecoratedStackPanel;
+      setStyleAttributes(attributes: Object): DecoratedStackPanel;
+      setStyleName(styleName: string): DecoratedStackPanel;
+      setStylePrimaryName(styleName: string): DecoratedStackPanel;
+      setTag(tag: string): DecoratedStackPanel;
+      setTitle(title: string): DecoratedStackPanel;
+      setVisible(visible: boolean): DecoratedStackPanel;
+      setWidth(width: string): DecoratedStackPanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A TabBar that wraps each tab in a 2x3 grid (six box), which allows users to add rounded corners.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the DecoratedTabBar documentation here.
+     */
+    export interface DecoratedTabBar {
+      addBeforeSelectionHandler(handler: Handler): DecoratedTabBar;
+      addSelectionHandler(handler: Handler): DecoratedTabBar;
+      addStyleDependentName(styleName: string): DecoratedTabBar;
+      addStyleName(styleName: string): DecoratedTabBar;
+      addTab(title: string): DecoratedTabBar;
+      addTab(title: string, asHtml: boolean): DecoratedTabBar;
+      addTab(widget: Widget): DecoratedTabBar;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      selectTab(index: Integer): DecoratedTabBar;
+      setHeight(height: string): DecoratedTabBar;
+      setId(id: string): DecoratedTabBar;
+      setLayoutData(layout: Object): DecoratedTabBar;
+      setPixelSize(width: Integer, height: Integer): DecoratedTabBar;
+      setSize(width: string, height: string): DecoratedTabBar;
+      setStyleAttribute(attribute: string, value: string): DecoratedTabBar;
+      setStyleAttributes(attributes: Object): DecoratedTabBar;
+      setStyleName(styleName: string): DecoratedTabBar;
+      setStylePrimaryName(styleName: string): DecoratedTabBar;
+      setTabEnabled(index: Integer, enabled: boolean): DecoratedTabBar;
+      setTabText(index: Integer, text: string): DecoratedTabBar;
+      setTag(tag: string): DecoratedTabBar;
+      setTitle(title: string): DecoratedTabBar;
+      setVisible(visible: boolean): DecoratedTabBar;
+      setWidth(width: string): DecoratedTabBar;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A TabPanel that uses a DecoratedTabBar with rounded corners.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the DecoratedTabPanel documentation here.
+     */
+    export interface DecoratedTabPanel {
+      add(widget: Widget): DecoratedTabPanel;
+      add(widget: Widget, text: string): DecoratedTabPanel;
+      add(widget: Widget, text: string, asHtml: boolean): DecoratedTabPanel;
+      add(widget: Widget, tabWidget: Widget): DecoratedTabPanel;
+      addBeforeSelectionHandler(handler: Handler): DecoratedTabPanel;
+      addSelectionHandler(handler: Handler): DecoratedTabPanel;
+      addStyleDependentName(styleName: string): DecoratedTabPanel;
+      addStyleName(styleName: string): DecoratedTabPanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      selectTab(index: Integer): DecoratedTabPanel;
+      setAnimationEnabled(animationEnabled: boolean): DecoratedTabPanel;
+      setHeight(height: string): DecoratedTabPanel;
+      setId(id: string): DecoratedTabPanel;
+      setLayoutData(layout: Object): DecoratedTabPanel;
+      setPixelSize(width: Integer, height: Integer): DecoratedTabPanel;
+      setSize(width: string, height: string): DecoratedTabPanel;
+      setStyleAttribute(attribute: string, value: string): DecoratedTabPanel;
+      setStyleAttributes(attributes: Object): DecoratedTabPanel;
+      setStyleName(styleName: string): DecoratedTabPanel;
+      setStylePrimaryName(styleName: string): DecoratedTabPanel;
+      setTag(tag: string): DecoratedTabPanel;
+      setTitle(title: string): DecoratedTabPanel;
+      setVisible(visible: boolean): DecoratedTabPanel;
+      setWidth(width: string): DecoratedTabPanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A SimplePanel that wraps its contents in stylized boxes, which can be used to add rounded
+     *  corners to a Widget.
+     * 
+     *  Note that this panel can contain at most one direct child widget. To add more children, make the
+     *  child of this panel a different panel that can contain more than one child.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the DecoratorPanel documentation here.
+     */
+    export interface DecoratorPanel {
+      add(widget: Widget): DecoratorPanel;
+      addStyleDependentName(styleName: string): DecoratorPanel;
+      addStyleName(styleName: string): DecoratorPanel;
+      clear(): DecoratorPanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setHeight(height: string): DecoratorPanel;
+      setId(id: string): DecoratorPanel;
+      setLayoutData(layout: Object): DecoratorPanel;
+      setPixelSize(width: Integer, height: Integer): DecoratorPanel;
+      setSize(width: string, height: string): DecoratorPanel;
+      setStyleAttribute(attribute: string, value: string): DecoratorPanel;
+      setStyleAttributes(attributes: Object): DecoratorPanel;
+      setStyleName(styleName: string): DecoratorPanel;
+      setStylePrimaryName(styleName: string): DecoratorPanel;
+      setTag(tag: string): DecoratorPanel;
+      setTitle(title: string): DecoratorPanel;
+      setVisible(visible: boolean): DecoratorPanel;
+      setWidget(widget: Widget): DecoratorPanel;
+      setWidth(width: string): DecoratorPanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A form of popup that has a caption area at the top and can be dragged by the
+     *  user. Unlike a PopupPanel, calls to setWidth(width) and
+     *  setHeight(height) will set the width and height of the dialog box
+     *  itself, even if a widget has not been added as yet.
+     * 
+     *  In general it's not recommended to add this panel as a child of another widget or of the app
+     *  as that will make it behave like any other inline panel and not act as a popup. Instead, create
+     *  the popup and then use its show() and hide() methods to show and hide it. See
+     *  the example below.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the DialogBox documentation here.
+     * 
+     *  Here is an example showing how to use the dialog box widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        // Create a dialog box.
+     *        var dialog = app.createDialogBox();
+     *        // Set the position and dimensions.
+     *        dialog.setPopupPosition(100, 100).setSize(500, 500);
+     *        // Show the dialog. Note that it does not have to be "added" to the UiInstance.
+     *        dialog.show();
+     *        return app;
+     *      }
+     */
+    export interface DialogBox {
+      add(widget: Widget): DialogBox;
+      addAutoHidePartner(partner: Component): DialogBox;
+      addCloseHandler(handler: Handler): DialogBox;
+      addStyleDependentName(styleName: string): DialogBox;
+      addStyleName(styleName: string): DialogBox;
+      clear(): DialogBox;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      hide(): DialogBox;
+      setAnimationEnabled(animationEnabled: boolean): DialogBox;
+      setAutoHideEnabled(enabled: boolean): DialogBox;
+      setGlassEnabled(enabled: boolean): DialogBox;
+      setGlassStyleName(styleName: string): DialogBox;
+      setHTML(html: string): DialogBox;
+      setHeight(height: string): DialogBox;
+      setId(id: string): DialogBox;
+      setLayoutData(layout: Object): DialogBox;
+      setModal(modal: boolean): DialogBox;
+      setPixelSize(width: Integer, height: Integer): DialogBox;
+      setPopupPosition(left: Integer, top: Integer): DialogBox;
+      setPopupPositionAndShow(a: Component): DialogBox;
+      setPreviewingAllNativeEvents(previewing: boolean): DialogBox;
+      setSize(width: string, height: string): DialogBox;
+      setStyleAttribute(attribute: string, value: string): DialogBox;
+      setStyleAttributes(attributes: Object): DialogBox;
+      setStyleName(styleName: string): DialogBox;
+      setStylePrimaryName(styleName: string): DialogBox;
+      setTag(tag: string): DialogBox;
+      setText(text: string): DialogBox;
+      setTitle(title: string): DialogBox;
+      setVisible(visible: boolean): DialogBox;
+      setWidget(widget: Widget): DialogBox;
+      setWidth(width: string): DialogBox;
+      show(): DialogBox;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A "file-open" dialog for Google Drive. Unlike most UiApp objects, DocsListDialog
+     *  should not be added to the UiInstance. The
+     *  example below shows how to display a DocsListDialog in the
+     *  new version of Google Sheets.
+     * 
+     * Note that HTML service offers a similar but superior
+     *  feature, Google Picker. In almost all
+     *  cases, using Google Picker is preferable.
+     * 
+     *      function onOpen() {
+     *        SpreadsheetApp.getUi() // Or DocumentApp or FormApp.
+     *            .createMenu('Custom Menu')
+     *            .addItem('Select file', 'showDialog')
+     *            .addToUi();
+     *      }
+     *     
+     *      function showDialog() {
+     *        // Dummy call to DriveApp to ensure the OAuth dialog requests Google Drive scope, so that the
+     *        // getOAuthToken() call below returns a token with the necessary permissions.
+     *        DriveApp.getRootFolder();
+     *     
+     *        var app = UiApp.createApplication()
+     *            .setWidth(570)
+     *            .setHeight(352);
+     *     
+     *        var serverHandler = app.createServerHandler('pickerHandler');
+     *     
+     *        app.createDocsListDialog()
+     *           .addCloseHandler(serverHandler)
+     *           .addSelectionHandler(serverHandler)
+     *           .setOAuthToken(ScriptApp.getOAuthToken())
+     *           .showDocsPicker();
+     *     
+     *        SpreadsheetApp.getUi() // Or DocumentApp or FormApp.
+     *           .showModalDialog(app,' ');
+     *      }
+     *     
+     *      function pickerHandler(e) {
+     *        var action = e.parameter.eventType;
+     *        var app = UiApp.getActiveApplication();
+     *     
+     *        if (action == 'selection') {
+     *          var doc = e.parameter.items[0];
+     *          var id = doc.id;
+     *          var name = doc.name;
+     *          var url = doc.url;
+     *          app.add(app.createLabel('You picked '));
+     *          app.add(app.createAnchor(name, url));
+     *          app.add(app.createLabel('(ID: ' + id + ').'));
+     *        } else if (action == 'close') {
+     *          app.add(app.createLabel('You clicked "Cancel".'));
+     *        }
+     *      
+     *        return app;
+     *      }
+     */
+    export interface DocsListDialog {
+      addCloseHandler(handler: Handler): DocsListDialog;
+      addSelectionHandler(handler: Handler): DocsListDialog;
+      addView(fileType: FileType): DocsListDialog;
+      getId(): string;
+      getType(): string;
+      setDialogTitle(title: string): DocsListDialog;
+      setHeight(height: Integer): DocsListDialog;
+      setInitialView(fileType: FileType): DocsListDialog;
+      setMultiSelectEnabled(multiSelectEnabled: boolean): DocsListDialog;
+      setOAuthToken(oAuthToken: string): DocsListDialog;
+      setWidth(width: Integer): DocsListDialog;
+      showDocsPicker(): DocsListDialog;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * File type constants for the
+     *  DocsListDialog.
+     */
+    export enum FileType { ALL, ALL_DOCS, DRAWINGS, DOCUMENTS, SPREADSHEETS, FOLDERS, RECENTLY_PICKED, PRESENTATIONS, FORMS, PHOTOS, PHOTO_ALBUMS, PDFS }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A widget that wraps the HTML <input type='file'> element. This widget
+     *  must be used within a FormPanel.
+     * 
+     *  The result of a FileUpload is a "Blob" which can we used in various other functions. Below is an
+     *  example of how to use FileUpload.
+     * 
+     *      function doGet(e) {
+     *     
+     *      var app = UiApp.createApplication().setTitle("Upload CSV to Sheet");
+     *        var formContent = app.createVerticalPanel();
+     *        formContent.add(app.createFileUpload().setName('thefile'));
+     *        formContent.add(app.createSubmitButton());
+     *        var form = app.createFormPanel();
+     *        form.add(formContent);
+     *        app.add(form);
+     *        return app;
+     *      }
+     *     
+     *      function doPost(e) {
+     *        // data returned is a blob for FileUpload widget
+     *        var fileBlob = e.parameter.thefile;
+     *        var doc = DocsList.createFile(fileBlob);
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the FileUpload documentation here.
+     */
+    export interface FileUpload {
+      addChangeHandler(handler: Handler): FileUpload;
+      addStyleDependentName(styleName: string): FileUpload;
+      addStyleName(styleName: string): FileUpload;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setEnabled(enabled: boolean): FileUpload;
+      setHeight(height: string): FileUpload;
+      setId(id: string): FileUpload;
+      setLayoutData(layout: Object): FileUpload;
+      setName(name: string): FileUpload;
+      setPixelSize(width: Integer, height: Integer): FileUpload;
+      setSize(width: string, height: string): FileUpload;
+      setStyleAttribute(attribute: string, value: string): FileUpload;
+      setStyleAttributes(attributes: Object): FileUpload;
+      setStyleName(styleName: string): FileUpload;
+      setStylePrimaryName(styleName: string): FileUpload;
+      setTag(tag: string): FileUpload;
+      setTitle(title: string): FileUpload;
+      setVisible(visible: boolean): FileUpload;
+      setWidth(width: string): FileUpload;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A flexible table that creates cells on demand. It can be jagged (that is,
+     *  each row can contain a different number of cells) and individual cells can be
+     *  set to span multiple rows or columns.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        app.add(app.createFlexTable()
+     *          .insertRow(0).insertRow(0).insertRow(0)
+     *          .insertCell(0, 0)
+     *          .insertCell(0, 1)
+     *          .insertCell(0, 2)
+     *          .insertCell(1, 0)
+     *          .insertCell(1, 1)
+     *          .insertCell(2, 0)
+     *          .setBorderWidth(5).setCellPadding(10).setCellSpacing(10));
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the FlexTable documentation here.
+     */
+    export interface FlexTable {
+      addCell(row: Integer): FlexTable;
+      addClickHandler(handler: Handler): FlexTable;
+      addStyleDependentName(styleName: string): FlexTable;
+      addStyleName(styleName: string): FlexTable;
+      clear(): FlexTable;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      insertCell(beforeRow: Integer, beforeColumn: Integer): FlexTable;
+      insertRow(beforeRow: Integer): FlexTable;
+      removeCell(row: Integer, column: Integer): FlexTable;
+      removeCells(row: Integer, column: Integer, num: Integer): FlexTable;
+      removeRow(row: Integer): FlexTable;
+      setBorderWidth(width: Integer): FlexTable;
+      setCellPadding(padding: Integer): FlexTable;
+      setCellSpacing(spacing: Integer): FlexTable;
+      setColumnStyleAttribute(column: Integer, attribute: string, value: string): FlexTable;
+      setColumnStyleAttributes(column: Integer, attributes: Object): FlexTable;
+      setHeight(height: string): FlexTable;
+      setId(id: string): FlexTable;
+      setLayoutData(layout: Object): FlexTable;
+      setPixelSize(width: Integer, height: Integer): FlexTable;
+      setRowStyleAttribute(row: Integer, attribute: string, value: string): FlexTable;
+      setRowStyleAttributes(row: Integer, attributes: Object): FlexTable;
+      setSize(width: string, height: string): FlexTable;
+      setStyleAttribute(row: Integer, column: Integer, attribute: string, value: string): FlexTable;
+      setStyleAttribute(attribute: string, value: string): FlexTable;
+      setStyleAttributes(row: Integer, column: Integer, attributes: Object): FlexTable;
+      setStyleAttributes(attributes: Object): FlexTable;
+      setStyleName(styleName: string): FlexTable;
+      setStylePrimaryName(styleName: string): FlexTable;
+      setTag(tag: string): FlexTable;
+      setText(row: Integer, column: Integer, text: string): FlexTable;
+      setTitle(title: string): FlexTable;
+      setVisible(visible: boolean): FlexTable;
+      setWidget(row: Integer, column: Integer, widget: Widget): FlexTable;
+      setWidth(width: string): FlexTable;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A panel that formats its child widgets using the default HTML layout behavior.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var panel = app.createFlowPanel();
+     *        panel.add(app.createButton("button 1"));
+     *        panel.add(app.createButton("button 2"));
+     *        app.add(panel);
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the FlowPanel documentation here.
+     */
+    export interface FlowPanel {
+      add(widget: Widget): FlowPanel;
+      addStyleDependentName(styleName: string): FlowPanel;
+      addStyleName(styleName: string): FlowPanel;
+      clear(): FlowPanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      insert(widget: Widget, beforeIndex: Integer): FlowPanel;
+      remove(index: Integer): FlowPanel;
+      remove(widget: Widget): FlowPanel;
+      setHeight(height: string): FlowPanel;
+      setId(id: string): FlowPanel;
+      setLayoutData(layout: Object): FlowPanel;
+      setPixelSize(width: Integer, height: Integer): FlowPanel;
+      setSize(width: string, height: string): FlowPanel;
+      setStyleAttribute(attribute: string, value: string): FlowPanel;
+      setStyleAttributes(attributes: Object): FlowPanel;
+      setStyleName(styleName: string): FlowPanel;
+      setStylePrimaryName(styleName: string): FlowPanel;
+      setTag(tag: string): FlowPanel;
+      setTitle(title: string): FlowPanel;
+      setVisible(visible: boolean): FlowPanel;
+      setWidth(width: string): FlowPanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A simple panel that makes its contents focusable, and adds the ability to catch mouse and
+     *  keyboard events.
+     * 
+     *  Note that this panel can contain at most one direct child widget. To add more children, make the
+     *  child of this panel a different panel that can contain more than one child.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var focus = app.createFocusPanel();
+     *        var flow = app.createFlowPanel();
+     *        flow.add(app.createButton("button 1"));
+     *        flow.add(app.createButton("button 2"));
+     *        focus.add(flow);
+     *        app.add(focus);
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the FocusPanel documentation here.
+     */
+    export interface FocusPanel {
+      add(widget: Widget): FocusPanel;
+      addBlurHandler(handler: Handler): FocusPanel;
+      addClickHandler(handler: Handler): FocusPanel;
+      addFocusHandler(handler: Handler): FocusPanel;
+      addKeyDownHandler(handler: Handler): FocusPanel;
+      addKeyPressHandler(handler: Handler): FocusPanel;
+      addKeyUpHandler(handler: Handler): FocusPanel;
+      addMouseDownHandler(handler: Handler): FocusPanel;
+      addMouseMoveHandler(handler: Handler): FocusPanel;
+      addMouseOutHandler(handler: Handler): FocusPanel;
+      addMouseOverHandler(handler: Handler): FocusPanel;
+      addMouseUpHandler(handler: Handler): FocusPanel;
+      addMouseWheelHandler(handler: Handler): FocusPanel;
+      addStyleDependentName(styleName: string): FocusPanel;
+      addStyleName(styleName: string): FocusPanel;
+      clear(): FocusPanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): FocusPanel;
+      setFocus(focus: boolean): FocusPanel;
+      setHeight(height: string): FocusPanel;
+      setId(id: string): FocusPanel;
+      setLayoutData(layout: Object): FocusPanel;
+      setPixelSize(width: Integer, height: Integer): FocusPanel;
+      setSize(width: string, height: string): FocusPanel;
+      setStyleAttribute(attribute: string, value: string): FocusPanel;
+      setStyleAttributes(attributes: Object): FocusPanel;
+      setStyleName(styleName: string): FocusPanel;
+      setStylePrimaryName(styleName: string): FocusPanel;
+      setTabIndex(index: Integer): FocusPanel;
+      setTag(tag: string): FocusPanel;
+      setTitle(title: string): FocusPanel;
+      setVisible(visible: boolean): FocusPanel;
+      setWidget(widget: Widget): FocusPanel;
+      setWidth(width: string): FocusPanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A panel that wraps its contents in an HTML <FORM> element.
+     * 
+     *  This panel can be used with a SubmitButton to post form values to the server. All
+     *  children of this panel (direct, or even children of sub-panels) that have a setName function
+     *  and have been given a name will have their values sent to the server when the form is submitted.
+     *  The submit can be handled in the special "doPost" function, as shown in the example.
+     * 
+     *  Note that this panel can contain at most one direct child widget. To add more children, make the
+     *  child of this panel a different panel that can contain more than one child.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var form = app.createFormPanel();
+     *        var flow = app.createFlowPanel();
+     *        flow.add(app.createTextBox().setName("textBox"));
+     *        flow.add(app.createListBox().setName("listBox").addItem("option 1").addItem("option 2"));
+     *        flow.add(app.createSubmitButton("Submit"));
+     *        form.add(flow);
+     *        app.add(form);
+     *        return app;
+     *      }
+     *     
+     *      function doPost(eventInfo) {
+     *        var app = UiApp.getActiveApplication();
+     *        app.add(app.createLabel("Form submitted. The text box's value was '" +
+     *            eventInfo.parameter.textBox +
+     *            "' and the list box's value was '" +
+     *            eventInfo.parameter.listBox + "'"));
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the FormPanel documentation here.
+     */
+    export interface FormPanel {
+      add(widget: Widget): FormPanel;
+      addStyleDependentName(styleName: string): FormPanel;
+      addStyleName(styleName: string): FormPanel;
+      addSubmitCompleteHandler(handler: Handler): FormPanel;
+      addSubmitHandler(handler: Handler): FormPanel;
+      clear(): FormPanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAction(action: string): FormPanel;
+      setEncoding(encoding: string): FormPanel;
+      setHeight(height: string): FormPanel;
+      setId(id: string): FormPanel;
+      setLayoutData(layout: Object): FormPanel;
+      setMethod(method: string): FormPanel;
+      setPixelSize(width: Integer, height: Integer): FormPanel;
+      setSize(width: string, height: string): FormPanel;
+      setStyleAttribute(attribute: string, value: string): FormPanel;
+      setStyleAttributes(attributes: Object): FormPanel;
+      setStyleName(styleName: string): FormPanel;
+      setStylePrimaryName(styleName: string): FormPanel;
+      setTag(tag: string): FormPanel;
+      setTitle(title: string): FormPanel;
+      setVisible(visible: boolean): FormPanel;
+      setWidget(widget: Widget): FormPanel;
+      setWidth(width: string): FormPanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A rectangular grid that can contain text, html, or a child widget within its cells. It must be
+     *  resized explicitly to the desired number of rows and columns.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        app.add(app.createGrid(3, 3)
+     *            .setBorderWidth(1)
+     *            .setCellSpacing(10)
+     *            .setCellPadding(10)
+     *            .setText(0, 0, "X")
+     *            .setText(1, 1, "X")
+     *            .setText(2, 2, "X")
+     *            .setText(0, 1, "O")
+     *            .setText(0, 2, "O")
+     *            .setStyleAttribute(0, 0, "color", "red")
+     *            .setStyleAttribute(1, 1, "color", "red")
+     *            .setStyleAttribute(2, 2, "color", "red")
+     *            .setStyleAttribute(0, 1, "color", "blue")
+     *            .setStyleAttribute(0, 2, "color", "blue"));
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the Grid documentation here.
+     */
+    export interface Grid {
+      addClickHandler(handler: Handler): Grid;
+      addStyleDependentName(styleName: string): Grid;
+      addStyleName(styleName: string): Grid;
+      clear(): Grid;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      resize(rows: Integer, columns: Integer): Grid;
+      setBorderWidth(width: Integer): Grid;
+      setCellPadding(padding: Integer): Grid;
+      setCellSpacing(spacing: Integer): Grid;
+      setColumnStyleAttribute(column: Integer, attribute: string, value: string): Grid;
+      setColumnStyleAttributes(column: Integer, attributes: Object): Grid;
+      setHeight(height: string): Grid;
+      setId(id: string): Grid;
+      setLayoutData(layout: Object): Grid;
+      setPixelSize(width: Integer, height: Integer): Grid;
+      setRowStyleAttribute(row: Integer, attribute: string, value: string): Grid;
+      setRowStyleAttributes(row: Integer, attributes: Object): Grid;
+      setSize(width: string, height: string): Grid;
+      setStyleAttribute(row: Integer, column: Integer, attribute: string, value: string): Grid;
+      setStyleAttribute(attribute: string, value: string): Grid;
+      setStyleAttributes(row: Integer, column: Integer, attributes: Object): Grid;
+      setStyleAttributes(attributes: Object): Grid;
+      setStyleName(styleName: string): Grid;
+      setStylePrimaryName(styleName: string): Grid;
+      setTag(tag: string): Grid;
+      setText(row: Integer, column: Integer, text: string): Grid;
+      setTitle(title: string): Grid;
+      setVisible(visible: boolean): Grid;
+      setWidget(row: Integer, column: Integer, widget: Widget): Grid;
+      setWidth(width: string): Grid;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A widget that contains arbitrary text, which is interpreted as HTML.
+     * 
+     *  Only basic HTML markup such as bold, italic, etc. are allowed; in particular, scripts will be
+     *  stripped out completely.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        app.add(app.createHTML("<b>Hello World!</b>"));
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the HTML documentation here.
+     */
+    export interface HTML {
+      addClickHandler(handler: Handler): HTML;
+      addMouseDownHandler(handler: Handler): HTML;
+      addMouseMoveHandler(handler: Handler): HTML;
+      addMouseOutHandler(handler: Handler): HTML;
+      addMouseOverHandler(handler: Handler): HTML;
+      addMouseUpHandler(handler: Handler): HTML;
+      addMouseWheelHandler(handler: Handler): HTML;
+      addStyleDependentName(styleName: string): HTML;
+      addStyleName(styleName: string): HTML;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setDirection(direction: Component): HTML;
+      setHTML(html: string): HTML;
+      setHeight(height: string): HTML;
+      setHorizontalAlignment(horizontalAlignment: HorizontalAlignment): HTML;
+      setId(id: string): HTML;
+      setLayoutData(layout: Object): HTML;
+      setPixelSize(width: Integer, height: Integer): HTML;
+      setSize(width: string, height: string): HTML;
+      setStyleAttribute(attribute: string, value: string): HTML;
+      setStyleAttributes(attributes: Object): HTML;
+      setStyleName(styleName: string): HTML;
+      setStylePrimaryName(styleName: string): HTML;
+      setTag(tag: string): HTML;
+      setText(text: string): HTML;
+      setTitle(title: string): HTML;
+      setVisible(visible: boolean): HTML;
+      setWidth(width: string): HTML;
+      setWordWrap(wordWrap: boolean): HTML;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * Base interface for client and server handlers.
+     * Implementing classes
+     * 
+     * NameBrief description
+     * 
+     * ClientHandlerAn event handler that runs in the user's browser without needing a call back to the server.
+     * 
+     * ServerHandlerAn event handler that runs on the server.
+     */
+    export interface Handler {
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setId(id: string): Handler;
+      setTag(tag: string): Handler;
+      validateEmail(widget: Widget): Handler;
+      validateInteger(widget: Widget): Handler;
+      validateLength(widget: Widget, min: Integer, max: Integer): Handler;
+      validateMatches(widget: Widget, pattern: string): Handler;
+      validateMatches(widget: Widget, pattern: string, flags: string): Handler;
+      validateNotEmail(widget: Widget): Handler;
+      validateNotInteger(widget: Widget): Handler;
+      validateNotLength(widget: Widget, min: Integer, max: Integer): Handler;
+      validateNotMatches(widget: Widget, pattern: string): Handler;
+      validateNotMatches(widget: Widget, pattern: string, flags: string): Handler;
+      validateNotNumber(widget: Widget): Handler;
+      validateNotOptions(widget: Widget, options: String[]): Handler;
+      validateNotRange(widget: Widget, min: Number, max: Number): Handler;
+      validateNotSum(widgets: Widget[], sum: Integer): Handler;
+      validateNumber(widget: Widget): Handler;
+      validateOptions(widget: Widget, options: String[]): Handler;
+      validateRange(widget: Widget, min: Number, max: Number): Handler;
+      validateSum(widgets: Widget[], sum: Integer): Handler;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * Represents a hidden field for storing data in the user's browser that can be passed back to a
+     *  handler as a "callback element".
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        // Note that the name "appState" for callbacks, and the id "hidden" for
+     *        // getting a reference to the widget, are not required to be the same.
+     *        var hidden = app.createHidden("appState", "0").setId("hidden");
+     *        app.add(hidden);
+     *        var handler = app.createServerHandler("click").addCallbackElement(hidden);
+     *        app.add(app.createButton("click me!", handler));
+     *        app.add(app.createLabel("clicked 0 times").setId("label"));
+     *        return app;
+     *      }
+     *     
+     *      function click(eventInfo) {
+     *        var app = UiApp.createApplication();
+     *        // We have the value of the hidden field because it was a callback element.
+     *        var numClicks = Number(eventInfo.parameter.appState);
+     *        numClicks++;
+     *        // Just store the number as a string. We could actually store arbitrarily complex data
+     *        // here using JSON.stringify() to turn a JavaScript object into a string to store, and
+     *        // JSON.parse() to turn the string back into an object.
+     *        app.getElementById("hidden").setValue(String(numClicks));
+     *        app.getElementById("label").setText("clicked " + numClicks + " times");
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the Hidden documentation here.
+     */
+    export interface Hidden {
+      addStyleDependentName(styleName: string): Hidden;
+      addStyleName(styleName: string): Hidden;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setDefaultValue(value: string): Hidden;
+      setHeight(height: string): Hidden;
+      setID(id: string): Hidden;
+      setId(id: string): Hidden;
+      setLayoutData(layout: Object): Hidden;
+      setName(name: string): Hidden;
+      setPixelSize(width: Integer, height: Integer): Hidden;
+      setSize(width: string, height: string): Hidden;
+      setStyleAttribute(attribute: string, value: string): Hidden;
+      setStyleAttributes(attributes: Object): Hidden;
+      setStyleName(styleName: string): Hidden;
+      setStylePrimaryName(styleName: string): Hidden;
+      setTag(tag: string): Hidden;
+      setTitle(title: string): Hidden;
+      setValue(value: string): Hidden;
+      setVisible(visible: boolean): Hidden;
+      setWidth(width: string): Hidden;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * Horizontal alignment constants to use with setHorizontalAlignment methods in UiApp.
+     */
+    export enum HorizontalAlignment { LEFT, RIGHT, CENTER, DEFAULT, JUSTIFY, LOCALE_START, LOCALE_END }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A panel that lays all of its widgets out in a single horizontal column.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var panel = app.createHorizontalPanel();
+     *        panel.add(app.createButton("button 1"));
+     *        panel.add(app.createButton("button 2"));
+     *        app.add(panel);
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the HorizontalPanel documentation here.
+     */
+    export interface HorizontalPanel {
+      add(widget: Widget): HorizontalPanel;
+      addStyleDependentName(styleName: string): HorizontalPanel;
+      addStyleName(styleName: string): HorizontalPanel;
+      clear(): HorizontalPanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      remove(index: Integer): HorizontalPanel;
+      remove(widget: Widget): HorizontalPanel;
+      setBorderWidth(width: Integer): HorizontalPanel;
+      setCellHeight(widget: Widget, height: string): HorizontalPanel;
+      setCellHorizontalAlignment(widget: Widget, horizontalAlignment: HorizontalAlignment): HorizontalPanel;
+      setCellVerticalAlignment(widget: Widget, verticalAlignment: VerticalAlignment): HorizontalPanel;
+      setCellWidth(widget: Widget, width: string): HorizontalPanel;
+      setHeight(height: string): HorizontalPanel;
+      setHorizontalAlignment(horizontalAlignment: HorizontalAlignment): HorizontalPanel;
+      setId(id: string): HorizontalPanel;
+      setLayoutData(layout: Object): HorizontalPanel;
+      setPixelSize(width: Integer, height: Integer): HorizontalPanel;
+      setSize(width: string, height: string): HorizontalPanel;
+      setSpacing(spacing: Integer): HorizontalPanel;
+      setStyleAttribute(attribute: string, value: string): HorizontalPanel;
+      setStyleAttributes(attributes: Object): HorizontalPanel;
+      setStyleName(styleName: string): HorizontalPanel;
+      setStylePrimaryName(styleName: string): HorizontalPanel;
+      setTag(tag: string): HorizontalPanel;
+      setTitle(title: string): HorizontalPanel;
+      setVerticalAlignment(verticalAlignment: VerticalAlignment): HorizontalPanel;
+      setVisible(visible: boolean): HorizontalPanel;
+      setWidth(width: string): HorizontalPanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A widget that displays the image at a given URL.
+     *  
+     *  The image can be in 'unclipped' mode (the default) or 'clipped' mode.
+     *  In clipped mode, a viewport is overlaid on top of the image so that a subset of the image will be
+     *  displayed. In unclipped mode, there is no viewport - the entire image will be
+     *  visible. Whether an image is in clipped or unclipped mode depends on how the
+     *  image is constructed, and how it is transformed after construction. Methods
+     *  will operate differently depending on the mode that the image is in. These
+     *  differences are detailed in the documentation for each method.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        // The very first Google Doodle!
+     *        app.add(app.createImage("http://www.google.com/logos/googleburn.jpg"));
+     *        // Just the man in the middle
+     *        app.add(app.createImage("http://www.google.com/logos/googleburn.jpg", 118, 0, 50, 106));
+     *        return app;
+     *      }
+     * 
+     *  Due to browser-specific HTML constructions needed to achieve the clipping effect, certain CSS
+     *  attributes, such as padding and background, may not work as expected when an image is in clipped
+     *  mode. These limitations can usually be easily worked around by encapsulating the image in a
+     *  container widget that can itself be styled.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the Image documentation here.
+     */
+    export interface Image {
+      addClickHandler(handler: Handler): Image;
+      addErrorHandler(handler: Handler): Image;
+      addLoadHandler(handler: Handler): Image;
+      addMouseDownHandler(handler: Handler): Image;
+      addMouseMoveHandler(handler: Handler): Image;
+      addMouseOutHandler(handler: Handler): Image;
+      addMouseOverHandler(handler: Handler): Image;
+      addMouseUpHandler(handler: Handler): Image;
+      addMouseWheelHandler(handler: Handler): Image;
+      addStyleDependentName(styleName: string): Image;
+      addStyleName(styleName: string): Image;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setHeight(height: string): Image;
+      setId(id: string): Image;
+      setLayoutData(layout: Object): Image;
+      setPixelSize(width: Integer, height: Integer): Image;
+      setResource(resource: Component): Image;
+      setSize(width: string, height: string): Image;
+      setStyleAttribute(attribute: string, value: string): Image;
+      setStyleAttributes(attributes: Object): Image;
+      setStyleName(styleName: string): Image;
+      setStylePrimaryName(styleName: string): Image;
+      setTag(tag: string): Image;
+      setTitle(title: string): Image;
+      setUrl(url: string): Image;
+      setUrlAndVisibleRect(url: string, left: Integer, top: Integer, width: Integer, height: Integer): Image;
+      setVisible(visible: boolean): Image;
+      setVisibleRect(left: Integer, top: Integer, width: Integer, height: Integer): Image;
+      setWidth(width: string): Image;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A widget that contains arbitrary text, not interpreted as HTML.
+     * 
+     *  This widget uses a <span> element, causing it to be displayed with inline layout.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the InlineLabel documentation here.
+     */
+    export interface InlineLabel {
+      addClickHandler(handler: Handler): InlineLabel;
+      addMouseDownHandler(handler: Handler): InlineLabel;
+      addMouseMoveHandler(handler: Handler): InlineLabel;
+      addMouseOutHandler(handler: Handler): InlineLabel;
+      addMouseOverHandler(handler: Handler): InlineLabel;
+      addMouseUpHandler(handler: Handler): InlineLabel;
+      addMouseWheelHandler(handler: Handler): InlineLabel;
+      addStyleDependentName(styleName: string): InlineLabel;
+      addStyleName(styleName: string): InlineLabel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setDirection(direction: Component): InlineLabel;
+      setHeight(height: string): InlineLabel;
+      setHorizontalAlignment(horizontalAlignment: HorizontalAlignment): InlineLabel;
+      setId(id: string): InlineLabel;
+      setLayoutData(layout: Object): InlineLabel;
+      setPixelSize(width: Integer, height: Integer): InlineLabel;
+      setSize(width: string, height: string): InlineLabel;
+      setStyleAttribute(attribute: string, value: string): InlineLabel;
+      setStyleAttributes(attributes: Object): InlineLabel;
+      setStyleName(styleName: string): InlineLabel;
+      setStylePrimaryName(styleName: string): InlineLabel;
+      setTag(tag: string): InlineLabel;
+      setText(text: string): InlineLabel;
+      setTitle(title: string): InlineLabel;
+      setVisible(visible: boolean): InlineLabel;
+      setWidth(width: string): InlineLabel;
+      setWordWrap(wordWrap: boolean): InlineLabel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A widget that contains arbitrary text, not interpreted as HTML.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        app.add(app.createLabel("Hello World!"));
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the Label documentation here.
+     */
+    export interface Label {
+      addClickHandler(handler: Handler): Label;
+      addMouseDownHandler(handler: Handler): Label;
+      addMouseMoveHandler(handler: Handler): Label;
+      addMouseOutHandler(handler: Handler): Label;
+      addMouseOverHandler(handler: Handler): Label;
+      addMouseUpHandler(handler: Handler): Label;
+      addMouseWheelHandler(handler: Handler): Label;
+      addStyleDependentName(styleName: string): Label;
+      addStyleName(styleName: string): Label;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setDirection(direction: Component): Label;
+      setHeight(height: string): Label;
+      setHorizontalAlignment(horizontalAlignment: HorizontalAlignment): Label;
+      setId(id: string): Label;
+      setLayoutData(layout: Object): Label;
+      setPixelSize(width: Integer, height: Integer): Label;
+      setSize(width: string, height: string): Label;
+      setStyleAttribute(attribute: string, value: string): Label;
+      setStyleAttributes(attributes: Object): Label;
+      setStyleName(styleName: string): Label;
+      setStylePrimaryName(styleName: string): Label;
+      setTag(tag: string): Label;
+      setText(text: string): Label;
+      setTitle(title: string): Label;
+      setVisible(visible: boolean): Label;
+      setWidth(width: string): Label;
+      setWordWrap(wordWrap: boolean): Label;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A widget that presents a list of choices to the user, either as a list box or
+     *  as a drop-down list.
+     * 
+     *  Here is an example usage, which should be executed from within a spreadsheet bound script.
+     * 
+     *      // execute this in a spreadsheet
+     *      function show() {
+     *        var doc = SpreadsheetApp.getActiveSpreadsheet();
+     *        var app = UiApp.createApplication().setTitle('My Application');
+     *        var panel = app.createVerticalPanel();
+     *        var lb = app.createListBox(true).setId('myId').setName('myLbName');
+     *     
+     *        // add items to ListBox
+     *        lb.setVisibleItemCount(3);
+     *        lb.addItem('first');
+     *        lb.addItem('second');
+     *        lb.addItem('third');
+     *        lb.addItem('fourth');
+     *        lb.addItem('fifth');
+     *        lb.addItem('sixth');
+     *     
+     *        panel.add(lb);
+     *        var button = app.createButton('press me');
+     *        var handler = app.createServerClickHandler('click').addCallbackElement(panel);
+     *        button.addClickHandler(handler);
+     *        panel.add(button);
+     *        app.add(panel);
+     *        doc.show(app);
+     *      }
+     * 
+     *      function click(eventInfo) {
+     *        var app = UiApp.getActiveApplication();
+     *        // get values of ListBox
+     *        var value = eventInfo.parameter.myLbName;
+     *        // multi select box returns a comma separated string
+     *        var n = value.split(',');
+     *     
+     *        var doc = SpreadsheetApp.getActiveSpreadsheet();
+     *        doc.getRange('a1').setValue(value);
+     *        doc.getRange('b1').setValue('there are ' + n.length + ' items selected');
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the ListBox documentation here.
+     */
+    export interface ListBox {
+      addBlurHandler(handler: Handler): ListBox;
+      addChangeHandler(handler: Handler): ListBox;
+      addClickHandler(handler: Handler): ListBox;
+      addFocusHandler(handler: Handler): ListBox;
+      addItem(text: string): ListBox;
+      addItem(text: string, value: string): ListBox;
+      addKeyDownHandler(handler: Handler): ListBox;
+      addKeyPressHandler(handler: Handler): ListBox;
+      addKeyUpHandler(handler: Handler): ListBox;
+      addMouseDownHandler(handler: Handler): ListBox;
+      addMouseMoveHandler(handler: Handler): ListBox;
+      addMouseOutHandler(handler: Handler): ListBox;
+      addMouseOverHandler(handler: Handler): ListBox;
+      addMouseUpHandler(handler: Handler): ListBox;
+      addMouseWheelHandler(handler: Handler): ListBox;
+      addStyleDependentName(styleName: string): ListBox;
+      addStyleName(styleName: string): ListBox;
+      clear(): ListBox;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      removeItem(index: Integer): ListBox;
+      setAccessKey(accessKey: Char): ListBox;
+      setEnabled(enabled: boolean): ListBox;
+      setFocus(focus: boolean): ListBox;
+      setHeight(height: string): ListBox;
+      setId(id: string): ListBox;
+      setItemSelected(index: Integer, selected: boolean): ListBox;
+      setItemText(index: Integer, text: string): ListBox;
+      setLayoutData(layout: Object): ListBox;
+      setName(name: string): ListBox;
+      setPixelSize(width: Integer, height: Integer): ListBox;
+      setSelectedIndex(index: Integer): ListBox;
+      setSize(width: string, height: string): ListBox;
+      setStyleAttribute(attribute: string, value: string): ListBox;
+      setStyleAttributes(attributes: Object): ListBox;
+      setStyleName(styleName: string): ListBox;
+      setStylePrimaryName(styleName: string): ListBox;
+      setTabIndex(index: Integer): ListBox;
+      setTag(tag: string): ListBox;
+      setTitle(title: string): ListBox;
+      setValue(index: Integer, value: string): ListBox;
+      setVisible(visible: boolean): ListBox;
+      setVisibleItemCount(count: Integer): ListBox;
+      setWidth(width: string): ListBox;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A standard menu bar widget.
+     * 
+     *  A menu bar can contain any number of menu items,
+     *  each of which can either fire an event handler or open a cascaded menu bar.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the MenuBar documentation here.
+     */
+    export interface MenuBar {
+      addCloseHandler(handler: Handler): MenuBar;
+      addItem(item: MenuItem): MenuBar;
+      addItem(text: string, asHtml: boolean, command: Handler): MenuBar;
+      addItem(text: string, asHtml: boolean, subMenu: MenuBar): MenuBar;
+      addItem(text: string, command: Handler): MenuBar;
+      addItem(text: string, subMenu: MenuBar): MenuBar;
+      addSeparator(): MenuBar;
+      addSeparator(separator: MenuItemSeparator): MenuBar;
+      addStyleDependentName(styleName: string): MenuBar;
+      addStyleName(styleName: string): MenuBar;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAnimationEnabled(animationEnabled: boolean): MenuBar;
+      setAutoOpen(autoOpen: boolean): MenuBar;
+      setHeight(height: string): MenuBar;
+      setId(id: string): MenuBar;
+      setLayoutData(layout: Object): MenuBar;
+      setPixelSize(width: Integer, height: Integer): MenuBar;
+      setSize(width: string, height: string): MenuBar;
+      setStyleAttribute(attribute: string, value: string): MenuBar;
+      setStyleAttributes(attributes: Object): MenuBar;
+      setStyleName(styleName: string): MenuBar;
+      setStylePrimaryName(styleName: string): MenuBar;
+      setTag(tag: string): MenuBar;
+      setTitle(title: string): MenuBar;
+      setVisible(visible: boolean): MenuBar;
+      setWidth(width: string): MenuBar;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * An entry in a MenuBar.
+     * 
+     *  Menu items can either fire an event handler when they are clicked, or open a cascading sub-menu.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the MenuItem documentation here.
+     */
+    export interface MenuItem {
+      addStyleDependentName(styleName: string): MenuItem;
+      addStyleName(styleName: string): MenuItem;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setCommand(handler: Handler): MenuItem;
+      setHTML(html: string): MenuItem;
+      setHeight(height: string): MenuItem;
+      setId(id: string): MenuItem;
+      setPixelSize(width: Integer, height: Integer): MenuItem;
+      setSize(width: string, height: string): MenuItem;
+      setStyleAttribute(attribute: string, value: string): MenuItem;
+      setStyleAttributes(attributes: Object): MenuItem;
+      setStyleName(styleName: string): MenuItem;
+      setStylePrimaryName(styleName: string): MenuItem;
+      setSubMenu(subMenu: MenuBar): MenuItem;
+      setTag(tag: string): MenuItem;
+      setText(text: string): MenuItem;
+      setTitle(title: string): MenuItem;
+      setVisible(visible: boolean): MenuItem;
+      setWidth(width: string): MenuItem;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A separator that can be placed in a MenuBar.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the MenuItemSeparator documentation here.
+     */
+    export interface MenuItemSeparator {
+      addStyleDependentName(styleName: string): MenuItemSeparator;
+      addStyleName(styleName: string): MenuItemSeparator;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setHeight(height: string): MenuItemSeparator;
+      setId(id: string): MenuItemSeparator;
+      setPixelSize(width: Integer, height: Integer): MenuItemSeparator;
+      setSize(width: string, height: string): MenuItemSeparator;
+      setStyleAttribute(attribute: string, value: string): MenuItemSeparator;
+      setStyleAttributes(attributes: Object): MenuItemSeparator;
+      setStyleName(styleName: string): MenuItemSeparator;
+      setStylePrimaryName(styleName: string): MenuItemSeparator;
+      setTag(tag: string): MenuItemSeparator;
+      setTitle(title: string): MenuItemSeparator;
+      setVisible(visible: boolean): MenuItemSeparator;
+      setWidth(width: string): MenuItemSeparator;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A text box that visually masks its input to prevent eavesdropping.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var text = app.createPasswordTextBox().setName("text");
+     *        var handler = app.createServerHandler("test").addCallbackElement(text);
+     *        app.add(text);
+     *        app.add(app.createButton("Test", handler));
+     *        app.add(app.createLabel("0 characters").setId("label"));
+     *        return app;
+     *      }
+     *     
+     *      function test(eventInfo) {
+     *        var app = UiApp.createApplication();
+     *        // Because the text box was named "text" and added as a callback element to the
+     *        // button's click event, we have its value available in eventInfo.parameter.text.
+     *        var pass = eventInfo.parameter.text;
+     *        var isStrong =
+     *            pass.length >= 10 && /[A-Z]/.test(pass) && /[a-z]/.test(pass) && /[0-9]/.test(pass);
+     *        var label = app.getElementById("label");
+     *        if (isStrong) {
+     *          label.setText("Strong! Well, not really, but this is just an example.")
+     *              .setStyleAttribute("color", "green");
+     *        } else {
+     *          label.setText("Weak! Use at least 10 characters, with uppercase, lowercase, and digits")
+     *              .setStyleAttribute("color", "red");
+     *        }
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the PasswordTextBox documentation here.
+     */
+    export interface PasswordTextBox {
+      addBlurHandler(handler: Handler): PasswordTextBox;
+      addChangeHandler(handler: Handler): PasswordTextBox;
+      addClickHandler(handler: Handler): PasswordTextBox;
+      addFocusHandler(handler: Handler): PasswordTextBox;
+      addKeyDownHandler(handler: Handler): PasswordTextBox;
+      addKeyPressHandler(handler: Handler): PasswordTextBox;
+      addKeyUpHandler(handler: Handler): PasswordTextBox;
+      addMouseDownHandler(handler: Handler): PasswordTextBox;
+      addMouseMoveHandler(handler: Handler): PasswordTextBox;
+      addMouseOutHandler(handler: Handler): PasswordTextBox;
+      addMouseOverHandler(handler: Handler): PasswordTextBox;
+      addMouseUpHandler(handler: Handler): PasswordTextBox;
+      addMouseWheelHandler(handler: Handler): PasswordTextBox;
+      addStyleDependentName(styleName: string): PasswordTextBox;
+      addStyleName(styleName: string): PasswordTextBox;
+      addValueChangeHandler(handler: Handler): PasswordTextBox;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): PasswordTextBox;
+      setCursorPos(position: Integer): PasswordTextBox;
+      setDirection(direction: Component): PasswordTextBox;
+      setEnabled(enabled: boolean): PasswordTextBox;
+      setFocus(focus: boolean): PasswordTextBox;
+      setHeight(height: string): PasswordTextBox;
+      setId(id: string): PasswordTextBox;
+      setLayoutData(layout: Object): PasswordTextBox;
+      setMaxLength(length: Integer): PasswordTextBox;
+      setName(name: string): PasswordTextBox;
+      setPixelSize(width: Integer, height: Integer): PasswordTextBox;
+      setReadOnly(readOnly: boolean): PasswordTextBox;
+      setSelectionRange(position: Integer, length: Integer): PasswordTextBox;
+      setSize(width: string, height: string): PasswordTextBox;
+      setStyleAttribute(attribute: string, value: string): PasswordTextBox;
+      setStyleAttributes(attributes: Object): PasswordTextBox;
+      setStyleName(styleName: string): PasswordTextBox;
+      setStylePrimaryName(styleName: string): PasswordTextBox;
+      setTabIndex(index: Integer): PasswordTextBox;
+      setTag(tag: string): PasswordTextBox;
+      setText(text: string): PasswordTextBox;
+      setTextAlignment(textAlign: Component): PasswordTextBox;
+      setTitle(title: string): PasswordTextBox;
+      setValue(value: string): PasswordTextBox;
+      setValue(value: string, fireEvents: boolean): PasswordTextBox;
+      setVisible(visible: boolean): PasswordTextBox;
+      setVisibleLength(length: Integer): PasswordTextBox;
+      setWidth(width: string): PasswordTextBox;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A panel that can "pop up" over other widgets. It overlays the browser's
+     *  client area (and any previously-created popups).
+     * 
+     *  In general it's not recommended to add this panel as a child of another widget or of the app
+     *  as that will make it behave like any other inline panel and not act as a popup. Instead, create
+     *  the popup and then use its show() and hide() methods to show and hide it. See
+     *  the example below.
+     * 
+     *  To make the popup stay at a fixed location rather than scrolling with the page, try setting the
+     *  'position', 'fixed' style on it with setStyleAttribute(attribute, value).
+     * 
+     *  Note that this panel can contain at most one direct child widget. To add more children, make the
+     *  child of this panel a different panel that can contain more than one child.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the PopupPanel documentation here.
+     * 
+     *  Here is an example showing how to use the popup panel widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        // Create a popup panel and set it to be modal.
+     *        var popupPanel = app.createPopupPanel(false, true);
+     *        // Add a button to the panel and set the dimensions and position.
+     *        popupPanel.add(app.createButton()).setWidth("100px").setHeight("100px")
+     *            .setPopupPosition(100, 100);
+     *        // Show the panel. Note that it does not have to be "added" to the UiInstance.
+     *        popupPanel.show();
+     *        return app;
+     *      }
+     */
+    export interface PopupPanel {
+      add(widget: Widget): PopupPanel;
+      addAutoHidePartner(partner: Component): PopupPanel;
+      addCloseHandler(handler: Handler): PopupPanel;
+      addStyleDependentName(styleName: string): PopupPanel;
+      addStyleName(styleName: string): PopupPanel;
+      clear(): PopupPanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      hide(): PopupPanel;
+      setAnimationEnabled(animationEnabled: boolean): PopupPanel;
+      setAutoHideEnabled(enabled: boolean): PopupPanel;
+      setGlassEnabled(enabled: boolean): PopupPanel;
+      setGlassStyleName(styleName: string): PopupPanel;
+      setHeight(height: string): PopupPanel;
+      setId(id: string): PopupPanel;
+      setLayoutData(layout: Object): PopupPanel;
+      setModal(modal: boolean): PopupPanel;
+      setPixelSize(width: Integer, height: Integer): PopupPanel;
+      setPopupPosition(left: Integer, top: Integer): PopupPanel;
+      setPopupPositionAndShow(a: Component): PopupPanel;
+      setPreviewingAllNativeEvents(previewing: boolean): PopupPanel;
+      setSize(width: string, height: string): PopupPanel;
+      setStyleAttribute(attribute: string, value: string): PopupPanel;
+      setStyleAttributes(attributes: Object): PopupPanel;
+      setStyleName(styleName: string): PopupPanel;
+      setStylePrimaryName(styleName: string): PopupPanel;
+      setTag(tag: string): PopupPanel;
+      setTitle(title: string): PopupPanel;
+      setVisible(visible: boolean): PopupPanel;
+      setWidget(widget: Widget): PopupPanel;
+      setWidth(width: string): PopupPanel;
+      show(): PopupPanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A normal push button with custom styling.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        // create a button and give it a click handler
+     *        var button = app.createPushButton().setText("click me!").setId("button");
+     *        button.addClickHandler(app.createServerHandler("handlerFunction"));
+     *        app.add(button);
+     *        return app;
+     *      }
+     *     
+     *      function handlerFunction(eventInfo) {
+     *        var app = UiApp.getActiveApplication();
+     *        app.add(app.createLabel("The button was clicked!"));
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the PushButton documentation here.
+     */
+    export interface PushButton {
+      addBlurHandler(handler: Handler): PushButton;
+      addClickHandler(handler: Handler): PushButton;
+      addFocusHandler(handler: Handler): PushButton;
+      addKeyDownHandler(handler: Handler): PushButton;
+      addKeyPressHandler(handler: Handler): PushButton;
+      addKeyUpHandler(handler: Handler): PushButton;
+      addMouseDownHandler(handler: Handler): PushButton;
+      addMouseMoveHandler(handler: Handler): PushButton;
+      addMouseOutHandler(handler: Handler): PushButton;
+      addMouseOverHandler(handler: Handler): PushButton;
+      addMouseUpHandler(handler: Handler): PushButton;
+      addMouseWheelHandler(handler: Handler): PushButton;
+      addStyleDependentName(styleName: string): PushButton;
+      addStyleName(styleName: string): PushButton;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): PushButton;
+      setEnabled(enabled: boolean): PushButton;
+      setFocus(focus: boolean): PushButton;
+      setHTML(html: string): PushButton;
+      setHeight(height: string): PushButton;
+      setId(id: string): PushButton;
+      setLayoutData(layout: Object): PushButton;
+      setPixelSize(width: Integer, height: Integer): PushButton;
+      setSize(width: string, height: string): PushButton;
+      setStyleAttribute(attribute: string, value: string): PushButton;
+      setStyleAttributes(attributes: Object): PushButton;
+      setStyleName(styleName: string): PushButton;
+      setStylePrimaryName(styleName: string): PushButton;
+      setTabIndex(index: Integer): PushButton;
+      setTag(tag: string): PushButton;
+      setText(text: string): PushButton;
+      setTitle(title: string): PushButton;
+      setVisible(visible: boolean): PushButton;
+      setWidth(width: string): PushButton;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A mutually-exclusive selection radio button widget.
+     * 
+     *  This widget fires
+     *  click events when the radio button is clicked, and value change events when the
+     *  button becomes checked. Note, however, that browser limitations prevent
+     *  value change events from being sent when the radio button is cleared as a side
+     *  effect of another in the group being clicked.
+     * 
+     *  RadioButtons are grouped according to the following rules:
+     * 
+     * In the absence of a FormPanel, RadioButtons with the same name are part of the same
+     *  group.
+     *  
+     * Within a FormPanel, all unnamed RadioButtons are part of the same group.
+     *  
+     * Within a FormPanel, all RadioButtons with the same name are part of the same group - but
+     *      not part of the same group as RadioButtons with the same name outside of the
+     *      FormPanel.
+     * 
+     *  Note that radio button selections within a group do not propagate to server handlers created with
+     *  UiInstance#createServerHandler(). Instead, to capture values on the server, use
+     *  doPost() or separate handlers for each RadioButton.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the RadioButton documentation here.
+     */
+    export interface RadioButton {
+      addBlurHandler(handler: Handler): RadioButton;
+      addClickHandler(handler: Handler): RadioButton;
+      addFocusHandler(handler: Handler): RadioButton;
+      addKeyDownHandler(handler: Handler): RadioButton;
+      addKeyPressHandler(handler: Handler): RadioButton;
+      addKeyUpHandler(handler: Handler): RadioButton;
+      addMouseDownHandler(handler: Handler): RadioButton;
+      addMouseMoveHandler(handler: Handler): RadioButton;
+      addMouseOutHandler(handler: Handler): RadioButton;
+      addMouseOverHandler(handler: Handler): RadioButton;
+      addMouseUpHandler(handler: Handler): RadioButton;
+      addMouseWheelHandler(handler: Handler): RadioButton;
+      addStyleDependentName(styleName: string): RadioButton;
+      addStyleName(styleName: string): RadioButton;
+      addValueChangeHandler(handler: Handler): RadioButton;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): RadioButton;
+      setEnabled(enabled: boolean): RadioButton;
+      setFocus(focus: boolean): RadioButton;
+      setFormValue(formValue: string): RadioButton;
+      setHTML(html: string): RadioButton;
+      setHeight(height: string): RadioButton;
+      setId(id: string): RadioButton;
+      setLayoutData(layout: Object): RadioButton;
+      setName(name: string): RadioButton;
+      setPixelSize(width: Integer, height: Integer): RadioButton;
+      setSize(width: string, height: string): RadioButton;
+      setStyleAttribute(attribute: string, value: string): RadioButton;
+      setStyleAttributes(attributes: Object): RadioButton;
+      setStyleName(styleName: string): RadioButton;
+      setStylePrimaryName(styleName: string): RadioButton;
+      setTabIndex(index: Integer): RadioButton;
+      setTag(tag: string): RadioButton;
+      setText(text: string): RadioButton;
+      setTitle(title: string): RadioButton;
+      setValue(value: boolean): RadioButton;
+      setValue(value: boolean, fireEvents: boolean): RadioButton;
+      setVisible(visible: boolean): RadioButton;
+      setWidth(width: string): RadioButton;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A standard push-button widget which will automatically reset its enclosing FormPanel if
+     *  any.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var panel = app.createFlowPanel();
+     *        panel.add(app.createTextBox().setText("some text"));
+     *        panel.add(app.createResetButton("reset the textbox"));
+     *        var form = app.createFormPanel();
+     *        form.add(panel);
+     *        app.add(form);
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the ResetButton documentation here.
+     */
+    export interface ResetButton {
+      addBlurHandler(handler: Handler): ResetButton;
+      addClickHandler(handler: Handler): ResetButton;
+      addFocusHandler(handler: Handler): ResetButton;
+      addKeyDownHandler(handler: Handler): ResetButton;
+      addKeyPressHandler(handler: Handler): ResetButton;
+      addKeyUpHandler(handler: Handler): ResetButton;
+      addMouseDownHandler(handler: Handler): ResetButton;
+      addMouseMoveHandler(handler: Handler): ResetButton;
+      addMouseOutHandler(handler: Handler): ResetButton;
+      addMouseOverHandler(handler: Handler): ResetButton;
+      addMouseUpHandler(handler: Handler): ResetButton;
+      addMouseWheelHandler(handler: Handler): ResetButton;
+      addStyleDependentName(styleName: string): ResetButton;
+      addStyleName(styleName: string): ResetButton;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): ResetButton;
+      setEnabled(enabled: boolean): ResetButton;
+      setFocus(focus: boolean): ResetButton;
+      setHTML(html: string): ResetButton;
+      setHeight(height: string): ResetButton;
+      setId(id: string): ResetButton;
+      setLayoutData(layout: Object): ResetButton;
+      setPixelSize(width: Integer, height: Integer): ResetButton;
+      setSize(width: string, height: string): ResetButton;
+      setStyleAttribute(attribute: string, value: string): ResetButton;
+      setStyleAttributes(attributes: Object): ResetButton;
+      setStyleName(styleName: string): ResetButton;
+      setStylePrimaryName(styleName: string): ResetButton;
+      setTabIndex(index: Integer): ResetButton;
+      setTag(tag: string): ResetButton;
+      setText(text: string): ResetButton;
+      setTitle(title: string): ResetButton;
+      setVisible(visible: boolean): ResetButton;
+      setWidth(width: string): ResetButton;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A panel that wraps its contents in a scrollable element.
+     * 
+     *  Note that this panel can contain at most one direct child widget. To add more children, make the
+     *  child of this panel a different panel that can contain more than one child.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        // Create some long content.
+     *        var vertical = app.createVerticalPanel();
+     *        for (var i = 0; i < 100; ++i) {
+     *          vertical.add(app.createButton("button " + i));
+     *        }
+     *        var scroll = app.createScrollPanel().setPixelSize(100, 100);
+     *        scroll.add(vertical);
+     *        app.add(scroll);
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the ScrollPanel documentation here.
+     */
+    export interface ScrollPanel {
+      add(widget: Widget): ScrollPanel;
+      addScrollHandler(handler: Handler): ScrollPanel;
+      addStyleDependentName(styleName: string): ScrollPanel;
+      addStyleName(styleName: string): ScrollPanel;
+      clear(): ScrollPanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAlwaysShowScrollBars(alwaysShow: boolean): ScrollPanel;
+      setHeight(height: string): ScrollPanel;
+      setHorizontalScrollPosition(position: Integer): ScrollPanel;
+      setId(id: string): ScrollPanel;
+      setLayoutData(layout: Object): ScrollPanel;
+      setPixelSize(width: Integer, height: Integer): ScrollPanel;
+      setScrollPosition(position: Integer): ScrollPanel;
+      setSize(width: string, height: string): ScrollPanel;
+      setStyleAttribute(attribute: string, value: string): ScrollPanel;
+      setStyleAttributes(attributes: Object): ScrollPanel;
+      setStyleName(styleName: string): ScrollPanel;
+      setStylePrimaryName(styleName: string): ScrollPanel;
+      setTag(tag: string): ScrollPanel;
+      setTitle(title: string): ScrollPanel;
+      setVisible(visible: boolean): ScrollPanel;
+      setWidget(widget: Widget): ScrollPanel;
+      setWidth(width: string): ScrollPanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * An event handler that runs on the server. These will, in general, run much slower than
+     *  ClientHandlers but they are not limited in what they can do.
+     * 
+     *  Any method that accepts a "Handler" parameter can accept a ServerHandler.
+     * 
+     *  When a ServerHandler is invoked, the function it refers to is called on the Apps Script server in
+     *  a "fresh" script. This means that no variable values will have survived from previous handlers or
+     *  from the initial script that loaded the app. Global variables in the script will be re-evaluated,
+     *  which means that it's a bad idea to do anything slow (like opening a Spreadsheet or fetching a
+     *  Calendar) in a global variable.
+     * 
+     *  If you need to save state on the server, you can try using ScriptProperties or UserProperties.
+     *  You can also add a Hidden field to your app storing the information you want to save
+     *  and pass it back explicitly to handlers as a "callback element."
+     * 
+     *  If you set validators on a ServerHandler, they will be checked before the handler calls the
+     *  server. The server will only be called if the validators succeed.
+     * 
+     *  If you have multiple ServerHandlers for the same event on the same widget, they will be called
+     *  simultaneously.
+     */
+    export interface ServerHandler {
+      addCallbackElement(widget: Widget): ServerHandler;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setCallbackFunction(functionToInvoke: string): ServerHandler;
+      setId(id: string): ServerHandler;
+      setTag(tag: string): ServerHandler;
+      validateEmail(widget: Widget): ServerHandler;
+      validateInteger(widget: Widget): ServerHandler;
+      validateLength(widget: Widget, min: Integer, max: Integer): ServerHandler;
+      validateMatches(widget: Widget, pattern: string): ServerHandler;
+      validateMatches(widget: Widget, pattern: string, flags: string): ServerHandler;
+      validateNotEmail(widget: Widget): ServerHandler;
+      validateNotInteger(widget: Widget): ServerHandler;
+      validateNotLength(widget: Widget, min: Integer, max: Integer): ServerHandler;
+      validateNotMatches(widget: Widget, pattern: string): ServerHandler;
+      validateNotMatches(widget: Widget, pattern: string, flags: string): ServerHandler;
+      validateNotNumber(widget: Widget): ServerHandler;
+      validateNotOptions(widget: Widget, options: String[]): ServerHandler;
+      validateNotRange(widget: Widget, min: Number, max: Number): ServerHandler;
+      validateNotSum(widgets: Widget[], sum: Integer): ServerHandler;
+      validateNumber(widget: Widget): ServerHandler;
+      validateOptions(widget: Widget, options: String[]): ServerHandler;
+      validateRange(widget: Widget, min: Number, max: Number): ServerHandler;
+      validateSum(widgets: Widget[], sum: Integer): ServerHandler;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A simple checkbox widget, with no label.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the SimpleCheckBox documentation here.
+     */
+    export interface SimpleCheckBox {
+      addBlurHandler(handler: Handler): SimpleCheckBox;
+      addClickHandler(handler: Handler): SimpleCheckBox;
+      addFocusHandler(handler: Handler): SimpleCheckBox;
+      addKeyDownHandler(handler: Handler): SimpleCheckBox;
+      addKeyPressHandler(handler: Handler): SimpleCheckBox;
+      addKeyUpHandler(handler: Handler): SimpleCheckBox;
+      addMouseDownHandler(handler: Handler): SimpleCheckBox;
+      addMouseMoveHandler(handler: Handler): SimpleCheckBox;
+      addMouseOutHandler(handler: Handler): SimpleCheckBox;
+      addMouseOverHandler(handler: Handler): SimpleCheckBox;
+      addMouseUpHandler(handler: Handler): SimpleCheckBox;
+      addMouseWheelHandler(handler: Handler): SimpleCheckBox;
+      addStyleDependentName(styleName: string): SimpleCheckBox;
+      addStyleName(styleName: string): SimpleCheckBox;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): SimpleCheckBox;
+      setChecked(checked: boolean): SimpleCheckBox;
+      setEnabled(enabled: boolean): SimpleCheckBox;
+      setFocus(focus: boolean): SimpleCheckBox;
+      setHeight(height: string): SimpleCheckBox;
+      setId(id: string): SimpleCheckBox;
+      setLayoutData(layout: Object): SimpleCheckBox;
+      setName(name: string): SimpleCheckBox;
+      setPixelSize(width: Integer, height: Integer): SimpleCheckBox;
+      setSize(width: string, height: string): SimpleCheckBox;
+      setStyleAttribute(attribute: string, value: string): SimpleCheckBox;
+      setStyleAttributes(attributes: Object): SimpleCheckBox;
+      setStyleName(styleName: string): SimpleCheckBox;
+      setStylePrimaryName(styleName: string): SimpleCheckBox;
+      setTabIndex(index: Integer): SimpleCheckBox;
+      setTag(tag: string): SimpleCheckBox;
+      setTitle(title: string): SimpleCheckBox;
+      setVisible(visible: boolean): SimpleCheckBox;
+      setWidth(width: string): SimpleCheckBox;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A panel that can contain only one widget.
+     * 
+     *  This panel is useful for adding styling effects to the child widget. To add more children, make
+     *  the child of this panel a different panel that can contain more than one child.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var simple = app.createSimplePanel();
+     *        var flow = app.createFlowPanel();
+     *        flow.add(app.createButton("button 1"));
+     *        flow.add(app.createButton("button 2"));
+     *        simple.add(flow);
+     *        app.add(simple);
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the SimplePanel documentation here.
+     */
+    export interface SimplePanel {
+      add(widget: Widget): SimplePanel;
+      addStyleDependentName(styleName: string): SimplePanel;
+      addStyleName(styleName: string): SimplePanel;
+      clear(): SimplePanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setHeight(height: string): SimplePanel;
+      setId(id: string): SimplePanel;
+      setLayoutData(layout: Object): SimplePanel;
+      setPixelSize(width: Integer, height: Integer): SimplePanel;
+      setSize(width: string, height: string): SimplePanel;
+      setStyleAttribute(attribute: string, value: string): SimplePanel;
+      setStyleAttributes(attributes: Object): SimplePanel;
+      setStyleName(styleName: string): SimplePanel;
+      setStylePrimaryName(styleName: string): SimplePanel;
+      setTag(tag: string): SimplePanel;
+      setTitle(title: string): SimplePanel;
+      setVisible(visible: boolean): SimplePanel;
+      setWidget(widget: Widget): SimplePanel;
+      setWidth(width: string): SimplePanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A simple radio button widget, with no label.
+     * 
+     *  SimpleRadioButtons are grouped according to the same rules as RadioButtons.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the SimpleRadioButton documentation here.
+     */
+    export interface SimpleRadioButton {
+      addBlurHandler(handler: Handler): SimpleRadioButton;
+      addClickHandler(handler: Handler): SimpleRadioButton;
+      addFocusHandler(handler: Handler): SimpleRadioButton;
+      addKeyDownHandler(handler: Handler): SimpleRadioButton;
+      addKeyPressHandler(handler: Handler): SimpleRadioButton;
+      addKeyUpHandler(handler: Handler): SimpleRadioButton;
+      addMouseDownHandler(handler: Handler): SimpleRadioButton;
+      addMouseMoveHandler(handler: Handler): SimpleRadioButton;
+      addMouseOutHandler(handler: Handler): SimpleRadioButton;
+      addMouseOverHandler(handler: Handler): SimpleRadioButton;
+      addMouseUpHandler(handler: Handler): SimpleRadioButton;
+      addMouseWheelHandler(handler: Handler): SimpleRadioButton;
+      addStyleDependentName(styleName: string): SimpleRadioButton;
+      addStyleName(styleName: string): SimpleRadioButton;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): SimpleRadioButton;
+      setChecked(checked: boolean): SimpleRadioButton;
+      setEnabled(enabled: boolean): SimpleRadioButton;
+      setFocus(focus: boolean): SimpleRadioButton;
+      setHeight(height: string): SimpleRadioButton;
+      setId(id: string): SimpleRadioButton;
+      setLayoutData(layout: Object): SimpleRadioButton;
+      setName(name: string): SimpleRadioButton;
+      setPixelSize(width: Integer, height: Integer): SimpleRadioButton;
+      setSize(width: string, height: string): SimpleRadioButton;
+      setStyleAttribute(attribute: string, value: string): SimpleRadioButton;
+      setStyleAttributes(attributes: Object): SimpleRadioButton;
+      setStyleName(styleName: string): SimpleRadioButton;
+      setStylePrimaryName(styleName: string): SimpleRadioButton;
+      setTabIndex(index: Integer): SimpleRadioButton;
+      setTag(tag: string): SimpleRadioButton;
+      setTitle(title: string): SimpleRadioButton;
+      setVisible(visible: boolean): SimpleRadioButton;
+      setWidth(width: string): SimpleRadioButton;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A panel that adds user-positioned splitters between each of its child widgets.
+     * 
+     *  This panel is similar to a DockLayoutPanel, but each pair of child widgets has a splitter
+     *  between them that the user can drag.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the SplitLayoutPanel documentation here.
+     */
+    export interface SplitLayoutPanel {
+      add(widget: Widget): SplitLayoutPanel;
+      addEast(widget: Widget, width: Number): SplitLayoutPanel;
+      addNorth(widget: Widget, height: Number): SplitLayoutPanel;
+      addSouth(widget: Widget, height: Number): SplitLayoutPanel;
+      addStyleDependentName(styleName: string): SplitLayoutPanel;
+      addStyleName(styleName: string): SplitLayoutPanel;
+      addWest(widget: Widget, width: Number): SplitLayoutPanel;
+      clear(): SplitLayoutPanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      remove(index: Integer): SplitLayoutPanel;
+      remove(widget: Widget): SplitLayoutPanel;
+      setHeight(height: string): SplitLayoutPanel;
+      setId(id: string): SplitLayoutPanel;
+      setLayoutData(layout: Object): SplitLayoutPanel;
+      setPixelSize(width: Integer, height: Integer): SplitLayoutPanel;
+      setSize(width: string, height: string): SplitLayoutPanel;
+      setStyleAttribute(attribute: string, value: string): SplitLayoutPanel;
+      setStyleAttributes(attributes: Object): SplitLayoutPanel;
+      setStyleName(styleName: string): SplitLayoutPanel;
+      setStylePrimaryName(styleName: string): SplitLayoutPanel;
+      setTag(tag: string): SplitLayoutPanel;
+      setTitle(title: string): SplitLayoutPanel;
+      setVisible(visible: boolean): SplitLayoutPanel;
+      setWidgetMinSize(widget: Widget, minSize: Integer): SplitLayoutPanel;
+      setWidth(width: string): SplitLayoutPanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A panel that stacks its children vertically, displaying only one at a time,
+     *  with a header for each child which the user can click to display.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the StackPanel documentation here.
+     */
+    export interface StackPanel {
+      add(widget: Widget): StackPanel;
+      add(widget: Widget, text: string): StackPanel;
+      add(widget: Widget, text: string, asHtml: boolean): StackPanel;
+      addStyleDependentName(styleName: string): StackPanel;
+      addStyleName(styleName: string): StackPanel;
+      clear(): StackPanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      remove(index: Integer): StackPanel;
+      remove(widget: Widget): StackPanel;
+      setHeight(height: string): StackPanel;
+      setId(id: string): StackPanel;
+      setLayoutData(layout: Object): StackPanel;
+      setPixelSize(width: Integer, height: Integer): StackPanel;
+      setSize(width: string, height: string): StackPanel;
+      setStackText(index: Integer, text: string): StackPanel;
+      setStackText(index: Integer, text: string, asHtml: boolean): StackPanel;
+      setStyleAttribute(attribute: string, value: string): StackPanel;
+      setStyleAttributes(attributes: Object): StackPanel;
+      setStyleName(styleName: string): StackPanel;
+      setStylePrimaryName(styleName: string): StackPanel;
+      setTag(tag: string): StackPanel;
+      setTitle(title: string): StackPanel;
+      setVisible(visible: boolean): StackPanel;
+      setWidth(width: string): StackPanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A standard push-button widget which will automatically submit its enclosing FormPanel if
+     *  any.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var form = app.createFormPanel();
+     *        var flow = app.createFlowPanel();
+     *        flow.add(app.createTextBox().setName("textBox"));
+     *        flow.add(app.createSubmitButton("Submit"));
+     *        form.add(flow);
+     *        app.add(form);
+     *        return app;
+     *      }
+     *     
+     *      function doPost(eventInfo) {
+     *        var app = UiApp.getActiveApplication();
+     *        app.add(app.createLabel("Form submitted. The text box's value was '" +
+     *            eventInfo.parameter.textBox + "'"));
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the SubmitButton documentation here.
+     */
+    export interface SubmitButton {
+      addBlurHandler(handler: Handler): SubmitButton;
+      addClickHandler(handler: Handler): SubmitButton;
+      addFocusHandler(handler: Handler): SubmitButton;
+      addKeyDownHandler(handler: Handler): SubmitButton;
+      addKeyPressHandler(handler: Handler): SubmitButton;
+      addKeyUpHandler(handler: Handler): SubmitButton;
+      addMouseDownHandler(handler: Handler): SubmitButton;
+      addMouseMoveHandler(handler: Handler): SubmitButton;
+      addMouseOutHandler(handler: Handler): SubmitButton;
+      addMouseOverHandler(handler: Handler): SubmitButton;
+      addMouseUpHandler(handler: Handler): SubmitButton;
+      addMouseWheelHandler(handler: Handler): SubmitButton;
+      addStyleDependentName(styleName: string): SubmitButton;
+      addStyleName(styleName: string): SubmitButton;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): SubmitButton;
+      setEnabled(enabled: boolean): SubmitButton;
+      setFocus(focus: boolean): SubmitButton;
+      setHTML(html: string): SubmitButton;
+      setHeight(height: string): SubmitButton;
+      setId(id: string): SubmitButton;
+      setLayoutData(layout: Object): SubmitButton;
+      setPixelSize(width: Integer, height: Integer): SubmitButton;
+      setSize(width: string, height: string): SubmitButton;
+      setStyleAttribute(attribute: string, value: string): SubmitButton;
+      setStyleAttributes(attributes: Object): SubmitButton;
+      setStyleName(styleName: string): SubmitButton;
+      setStylePrimaryName(styleName: string): SubmitButton;
+      setTabIndex(index: Integer): SubmitButton;
+      setTag(tag: string): SubmitButton;
+      setText(text: string): SubmitButton;
+      setTitle(title: string): SubmitButton;
+      setVisible(visible: boolean): SubmitButton;
+      setWidth(width: string): SubmitButton;
+    }
+
+    /**
+     * 
+     * Deprecated. This class is deprecated and should not be used in new scripts.
+     * A SuggestBox is a text box or text area which displays a
+     *  pre-configured set of selections that match the user's input.
+     * 
+     *  This widget is not currently functional.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the SuggestBox documentation here.
+     */
+    export interface SuggestBox {
+      addKeyDownHandler(handler: Handler): SuggestBox;
+      addKeyPressHandler(handler: Handler): SuggestBox;
+      addKeyUpHandler(handler: Handler): SuggestBox;
+      addSelectionHandler(handler: Handler): SuggestBox;
+      addStyleDependentName(styleName: string): SuggestBox;
+      addStyleName(styleName: string): SuggestBox;
+      addValueChangeHandler(handler: Handler): SuggestBox;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): SuggestBox;
+      setAnimationEnabled(animationEnabled: boolean): SuggestBox;
+      setAutoSelectEnabled(autoSelectEnabled: boolean): SuggestBox;
+      setFocus(focus: boolean): SuggestBox;
+      setHeight(height: string): SuggestBox;
+      setId(id: string): SuggestBox;
+      setLayoutData(layout: Object): SuggestBox;
+      setLimit(limit: Integer): SuggestBox;
+      setPixelSize(width: Integer, height: Integer): SuggestBox;
+      setPopupStyleName(styleName: string): SuggestBox;
+      setSize(width: string, height: string): SuggestBox;
+      setStyleAttribute(attribute: string, value: string): SuggestBox;
+      setStyleAttributes(attributes: Object): SuggestBox;
+      setStyleName(styleName: string): SuggestBox;
+      setStylePrimaryName(styleName: string): SuggestBox;
+      setTabIndex(index: Integer): SuggestBox;
+      setTag(tag: string): SuggestBox;
+      setText(text: string): SuggestBox;
+      setTitle(title: string): SuggestBox;
+      setValue(value: string): SuggestBox;
+      setValue(value: string, fireEvents: boolean): SuggestBox;
+      setVisible(visible: boolean): SuggestBox;
+      setWidth(width: string): SuggestBox;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A horizontal bar of folder-style tabs, most commonly used as part of a TabPanel.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the TabBar documentation here.
+     */
+    export interface TabBar {
+      addBeforeSelectionHandler(handler: Handler): TabBar;
+      addSelectionHandler(handler: Handler): TabBar;
+      addStyleDependentName(styleName: string): TabBar;
+      addStyleName(styleName: string): TabBar;
+      addTab(title: string): TabBar;
+      addTab(title: string, asHtml: boolean): TabBar;
+      addTab(widget: Widget): TabBar;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      selectTab(index: Integer): TabBar;
+      setHeight(height: string): TabBar;
+      setId(id: string): TabBar;
+      setLayoutData(layout: Object): TabBar;
+      setPixelSize(width: Integer, height: Integer): TabBar;
+      setSize(width: string, height: string): TabBar;
+      setStyleAttribute(attribute: string, value: string): TabBar;
+      setStyleAttributes(attributes: Object): TabBar;
+      setStyleName(styleName: string): TabBar;
+      setStylePrimaryName(styleName: string): TabBar;
+      setTabEnabled(index: Integer, enabled: boolean): TabBar;
+      setTabText(index: Integer, text: string): TabBar;
+      setTag(tag: string): TabBar;
+      setTitle(title: string): TabBar;
+      setVisible(visible: boolean): TabBar;
+      setWidth(width: string): TabBar;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A panel that represents a tabbed set of pages, each of which contains another
+     *  widget. Its child widgets are shown as the user selects the various tabs
+     *  associated with them.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the TabPanel documentation here.
+     */
+    export interface TabPanel {
+      add(widget: Widget): TabPanel;
+      add(widget: Widget, text: string): TabPanel;
+      add(widget: Widget, text: string, asHtml: boolean): TabPanel;
+      add(widget: Widget, tabWidget: Widget): TabPanel;
+      addBeforeSelectionHandler(handler: Handler): TabPanel;
+      addSelectionHandler(handler: Handler): TabPanel;
+      addStyleDependentName(styleName: string): TabPanel;
+      addStyleName(styleName: string): TabPanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      selectTab(index: Integer): TabPanel;
+      setAnimationEnabled(animationEnabled: boolean): TabPanel;
+      setHeight(height: string): TabPanel;
+      setId(id: string): TabPanel;
+      setLayoutData(layout: Object): TabPanel;
+      setPixelSize(width: Integer, height: Integer): TabPanel;
+      setSize(width: string, height: string): TabPanel;
+      setStyleAttribute(attribute: string, value: string): TabPanel;
+      setStyleAttributes(attributes: Object): TabPanel;
+      setStyleName(styleName: string): TabPanel;
+      setStylePrimaryName(styleName: string): TabPanel;
+      setTag(tag: string): TabPanel;
+      setTitle(title: string): TabPanel;
+      setVisible(visible: boolean): TabPanel;
+      setWidth(width: string): TabPanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A text box that allows multiple lines of text to be entered.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var text = app.createTextArea().setName("text");
+     *        var handler = app.createServerHandler("count").addCallbackElement(text);
+     *        app.add(text);
+     *        app.add(app.createButton("Count", handler));
+     *        app.add(app.createLabel("0 characters").setId("label"));
+     *        return app;
+     *      }
+     *     
+     *      function count(eventInfo) {
+     *        var app = UiApp.createApplication();
+     *        // Because the text area was named "text" and added as a callback element to the
+     *        // button's click event, we have its value available in eventInfo.parameter.text.
+     *        app.getElementById("label").setText(eventInfo.parameter.text.length + " characters");
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the TextArea documentation here.
+     */
+    export interface TextArea {
+      addBlurHandler(handler: Handler): TextArea;
+      addChangeHandler(handler: Handler): TextArea;
+      addClickHandler(handler: Handler): TextArea;
+      addFocusHandler(handler: Handler): TextArea;
+      addKeyDownHandler(handler: Handler): TextArea;
+      addKeyPressHandler(handler: Handler): TextArea;
+      addKeyUpHandler(handler: Handler): TextArea;
+      addMouseDownHandler(handler: Handler): TextArea;
+      addMouseMoveHandler(handler: Handler): TextArea;
+      addMouseOutHandler(handler: Handler): TextArea;
+      addMouseOverHandler(handler: Handler): TextArea;
+      addMouseUpHandler(handler: Handler): TextArea;
+      addMouseWheelHandler(handler: Handler): TextArea;
+      addStyleDependentName(styleName: string): TextArea;
+      addStyleName(styleName: string): TextArea;
+      addValueChangeHandler(handler: Handler): TextArea;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): TextArea;
+      setCharacterWidth(width: Integer): TextArea;
+      setCursorPos(position: Integer): TextArea;
+      setDirection(direction: Component): TextArea;
+      setEnabled(enabled: boolean): TextArea;
+      setFocus(focus: boolean): TextArea;
+      setHeight(height: string): TextArea;
+      setId(id: string): TextArea;
+      setLayoutData(layout: Object): TextArea;
+      setName(name: string): TextArea;
+      setPixelSize(width: Integer, height: Integer): TextArea;
+      setReadOnly(readOnly: boolean): TextArea;
+      setSelectionRange(position: Integer, length: Integer): TextArea;
+      setSize(width: string, height: string): TextArea;
+      setStyleAttribute(attribute: string, value: string): TextArea;
+      setStyleAttributes(attributes: Object): TextArea;
+      setStyleName(styleName: string): TextArea;
+      setStylePrimaryName(styleName: string): TextArea;
+      setTabIndex(index: Integer): TextArea;
+      setTag(tag: string): TextArea;
+      setText(text: string): TextArea;
+      setTextAlignment(textAlign: Component): TextArea;
+      setTitle(title: string): TextArea;
+      setValue(value: string): TextArea;
+      setValue(value: string, fireEvents: boolean): TextArea;
+      setVisible(visible: boolean): TextArea;
+      setVisibleLines(lines: Integer): TextArea;
+      setWidth(width: string): TextArea;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A standard single-line text box.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var text = app.createTextBox().setName("text");
+     *        var handler = app.createServerHandler("count").addCallbackElement(text);
+     *        app.add(text);
+     *        app.add(app.createButton("Count", handler));
+     *        app.add(app.createLabel("0 characters").setId("label"));
+     *        return app;
+     *      }
+     *     
+     *      function count(eventInfo) {
+     *        var app = UiApp.createApplication();
+     *        // Because the text box was named "text" and added as a callback element to the
+     *        // button's click event, we have its value available in eventInfo.parameter.text.
+     *        app.getElementById("label").setText(eventInfo.parameter.text.length + " characters");
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the TextBox documentation here.
+     */
+    export interface TextBox {
+      addBlurHandler(handler: Handler): TextBox;
+      addChangeHandler(handler: Handler): TextBox;
+      addClickHandler(handler: Handler): TextBox;
+      addFocusHandler(handler: Handler): TextBox;
+      addKeyDownHandler(handler: Handler): TextBox;
+      addKeyPressHandler(handler: Handler): TextBox;
+      addKeyUpHandler(handler: Handler): TextBox;
+      addMouseDownHandler(handler: Handler): TextBox;
+      addMouseMoveHandler(handler: Handler): TextBox;
+      addMouseOutHandler(handler: Handler): TextBox;
+      addMouseOverHandler(handler: Handler): TextBox;
+      addMouseUpHandler(handler: Handler): TextBox;
+      addMouseWheelHandler(handler: Handler): TextBox;
+      addStyleDependentName(styleName: string): TextBox;
+      addStyleName(styleName: string): TextBox;
+      addValueChangeHandler(handler: Handler): TextBox;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): TextBox;
+      setCursorPos(position: Integer): TextBox;
+      setDirection(direction: Component): TextBox;
+      setEnabled(enabled: boolean): TextBox;
+      setFocus(focus: boolean): TextBox;
+      setHeight(height: string): TextBox;
+      setId(id: string): TextBox;
+      setLayoutData(layout: Object): TextBox;
+      setMaxLength(length: Integer): TextBox;
+      setName(name: string): TextBox;
+      setPixelSize(width: Integer, height: Integer): TextBox;
+      setReadOnly(readOnly: boolean): TextBox;
+      setSelectionRange(position: Integer, length: Integer): TextBox;
+      setSize(width: string, height: string): TextBox;
+      setStyleAttribute(attribute: string, value: string): TextBox;
+      setStyleAttributes(attributes: Object): TextBox;
+      setStyleName(styleName: string): TextBox;
+      setStylePrimaryName(styleName: string): TextBox;
+      setTabIndex(index: Integer): TextBox;
+      setTag(tag: string): TextBox;
+      setText(text: string): TextBox;
+      setTextAlignment(textAlign: Component): TextBox;
+      setTitle(title: string): TextBox;
+      setValue(value: string): TextBox;
+      setValue(value: string, fireEvents: boolean): TextBox;
+      setVisible(visible: boolean): TextBox;
+      setVisibleLength(length: Integer): TextBox;
+      setWidth(width: string): TextBox;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A ToggleButton is a stylish stateful button which allows the
+     *  user to toggle between up and down states.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the ToggleButton documentation here.
+     */
+    export interface ToggleButton {
+      addBlurHandler(handler: Handler): ToggleButton;
+      addClickHandler(handler: Handler): ToggleButton;
+      addFocusHandler(handler: Handler): ToggleButton;
+      addKeyDownHandler(handler: Handler): ToggleButton;
+      addKeyPressHandler(handler: Handler): ToggleButton;
+      addKeyUpHandler(handler: Handler): ToggleButton;
+      addMouseDownHandler(handler: Handler): ToggleButton;
+      addMouseMoveHandler(handler: Handler): ToggleButton;
+      addMouseOutHandler(handler: Handler): ToggleButton;
+      addMouseOverHandler(handler: Handler): ToggleButton;
+      addMouseUpHandler(handler: Handler): ToggleButton;
+      addMouseWheelHandler(handler: Handler): ToggleButton;
+      addStyleDependentName(styleName: string): ToggleButton;
+      addStyleName(styleName: string): ToggleButton;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): ToggleButton;
+      setDown(down: boolean): ToggleButton;
+      setEnabled(enabled: boolean): ToggleButton;
+      setFocus(focus: boolean): ToggleButton;
+      setHTML(html: string): ToggleButton;
+      setHeight(height: string): ToggleButton;
+      setId(id: string): ToggleButton;
+      setLayoutData(layout: Object): ToggleButton;
+      setPixelSize(width: Integer, height: Integer): ToggleButton;
+      setSize(width: string, height: string): ToggleButton;
+      setStyleAttribute(attribute: string, value: string): ToggleButton;
+      setStyleAttributes(attributes: Object): ToggleButton;
+      setStyleName(styleName: string): ToggleButton;
+      setStylePrimaryName(styleName: string): ToggleButton;
+      setTabIndex(index: Integer): ToggleButton;
+      setTag(tag: string): ToggleButton;
+      setText(text: string): ToggleButton;
+      setTitle(title: string): ToggleButton;
+      setVisible(visible: boolean): ToggleButton;
+      setWidth(width: string): ToggleButton;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A standard hierarchical tree widget. The tree contains a hierarchy of
+     *  TreeItems that the user can open, close, and select.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the Tree documentation here.
+     */
+    export interface Tree {
+      add(widget: Widget): Tree;
+      addBlurHandler(handler: Handler): Tree;
+      addCloseHandler(handler: Handler): Tree;
+      addFocusHandler(handler: Handler): Tree;
+      addItem(text: string): Tree;
+      addItem(item: TreeItem): Tree;
+      addItem(widget: Widget): Tree;
+      addKeyDownHandler(handler: Handler): Tree;
+      addKeyPressHandler(handler: Handler): Tree;
+      addKeyUpHandler(handler: Handler): Tree;
+      addMouseDownHandler(handler: Handler): Tree;
+      addMouseMoveHandler(handler: Handler): Tree;
+      addMouseOutHandler(handler: Handler): Tree;
+      addMouseOverHandler(handler: Handler): Tree;
+      addMouseUpHandler(handler: Handler): Tree;
+      addMouseWheelHandler(handler: Handler): Tree;
+      addOpenHandler(handler: Handler): Tree;
+      addSelectionHandler(handler: Handler): Tree;
+      addStyleDependentName(styleName: string): Tree;
+      addStyleName(styleName: string): Tree;
+      clear(): Tree;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setAccessKey(accessKey: Char): Tree;
+      setAnimationEnabled(animationEnabled: boolean): Tree;
+      setFocus(focus: boolean): Tree;
+      setHeight(height: string): Tree;
+      setId(id: string): Tree;
+      setLayoutData(layout: Object): Tree;
+      setPixelSize(width: Integer, height: Integer): Tree;
+      setSelectedItem(item: TreeItem): Tree;
+      setSelectedItem(item: TreeItem, fireEvents: boolean): Tree;
+      setSize(width: string, height: string): Tree;
+      setStyleAttribute(attribute: string, value: string): Tree;
+      setStyleAttributes(attributes: Object): Tree;
+      setStyleName(styleName: string): Tree;
+      setStylePrimaryName(styleName: string): Tree;
+      setTabIndex(index: Integer): Tree;
+      setTag(tag: string): Tree;
+      setTitle(title: string): Tree;
+      setVisible(visible: boolean): Tree;
+      setWidth(width: string): Tree;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * An item that can be contained within a Tree.
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the TreeItem documentation here.
+     */
+    export interface TreeItem {
+      addItem(text: string): TreeItem;
+      addItem(item: TreeItem): TreeItem;
+      addItem(widget: Widget): TreeItem;
+      addStyleDependentName(styleName: string): TreeItem;
+      addStyleName(styleName: string): TreeItem;
+      clear(): TreeItem;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      setHTML(html: string): TreeItem;
+      setHeight(height: string): TreeItem;
+      setId(id: string): TreeItem;
+      setPixelSize(width: Integer, height: Integer): TreeItem;
+      setSelected(selected: boolean): TreeItem;
+      setSize(width: string, height: string): TreeItem;
+      setState(open: boolean): TreeItem;
+      setState(open: boolean, fireEvents: boolean): TreeItem;
+      setStyleAttribute(attribute: string, value: string): TreeItem;
+      setStyleAttributes(attributes: Object): TreeItem;
+      setStyleName(styleName: string): TreeItem;
+      setStylePrimaryName(styleName: string): TreeItem;
+      setTag(tag: string): TreeItem;
+      setText(text: string): TreeItem;
+      setTitle(title: string): TreeItem;
+      setUserObject(a: Object): TreeItem;
+      setVisible(visible: boolean): TreeItem;
+      setWidget(widget: Widget): TreeItem;
+      setWidth(width: string): TreeItem;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * Create user interfaces for use inside Google Apps or as standalone services.
+     */
+    export interface UiApp {
+      DateTimeFormat: DateTimeFormat
+      FileType: FileType
+      HorizontalAlignment: HorizontalAlignment
+      VerticalAlignment: VerticalAlignment
+      createApplication(): UiInstance;
+      getActiveApplication(): UiInstance;
+      getUserAgent(): string;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A representation of a user interface.
+     * 
+     *  You can use this to create a new user interface or manipulate an existing one.
+     */
+    export interface UiInstance {
+      add(child: Widget): UiInstance;
+      close(): UiInstance;
+      createAbsolutePanel(): AbsolutePanel;
+      createAnchor(text: string, asHtml: boolean, href: string): Anchor;
+      createAnchor(text: string, href: string): Anchor;
+      createButton(): Button;
+      createButton(html: string): Button;
+      createButton(html: string, clickHandler: Handler): Button;
+      createCaptionPanel(): CaptionPanel;
+      createCaptionPanel(caption: string): CaptionPanel;
+      createCaptionPanel(caption: string, asHtml: boolean): CaptionPanel;
+      createCheckBox(): CheckBox;
+      createCheckBox(label: string): CheckBox;
+      createCheckBox(label: string, asHtml: boolean): CheckBox;
+      createClientHandler(): ClientHandler;
+      createDateBox(): DateBox;
+      createDatePicker(): DatePicker;
+      createDecoratedStackPanel(): DecoratedStackPanel;
+      createDecoratedTabBar(): DecoratedTabBar;
+      createDecoratedTabPanel(): DecoratedTabPanel;
+      createDecoratorPanel(): DecoratorPanel;
+      createDialogBox(): DialogBox;
+      createDialogBox(autoHide: boolean): DialogBox;
+      createDialogBox(autoHide: boolean, modal: boolean): DialogBox;
+      createDocsListDialog(): DocsListDialog;
+      createFileUpload(): FileUpload;
+      createFlexTable(): FlexTable;
+      createFlowPanel(): FlowPanel;
+      createFocusPanel(): FocusPanel;
+      createFocusPanel(child: Widget): FocusPanel;
+      createFormPanel(): FormPanel;
+      createGrid(): Grid;
+      createGrid(rows: Integer, columns: Integer): Grid;
+      createHTML(): HTML;
+      createHTML(html: string): HTML;
+      createHTML(html: string, wordWrap: boolean): HTML;
+      createHidden(): Hidden;
+      createHidden(name: string): Hidden;
+      createHidden(name: string, value: string): Hidden;
+      createHorizontalPanel(): HorizontalPanel;
+      createImage(): Image;
+      createImage(url: string): Image;
+      createImage(url: string, left: Integer, top: Integer, width: Integer, height: Integer): Image;
+      createInlineLabel(): InlineLabel;
+      createInlineLabel(text: string): InlineLabel;
+      createLabel(): Label;
+      createLabel(text: string): Label;
+      createLabel(text: string, wordWrap: boolean): Label;
+      createListBox(): ListBox;
+      createListBox(isMultipleSelect: boolean): ListBox;
+      createMenuBar(): MenuBar;
+      createMenuBar(vertical: boolean): MenuBar;
+      createMenuItem(text: string, asHtml: boolean, command: Handler): MenuItem;
+      createMenuItem(text: string, command: Handler): MenuItem;
+      createMenuItemSeparator(): MenuItemSeparator;
+      createPasswordTextBox(): PasswordTextBox;
+      createPopupPanel(): PopupPanel;
+      createPopupPanel(autoHide: boolean): PopupPanel;
+      createPopupPanel(autoHide: boolean, modal: boolean): PopupPanel;
+      createPushButton(): PushButton;
+      createPushButton(upText: string): PushButton;
+      createPushButton(upText: string, clickHandler: Handler): PushButton;
+      createPushButton(upText: string, downText: string): PushButton;
+      createPushButton(upText: string, downText: string, clickHandler: Handler): PushButton;
+      createRadioButton(name: string): RadioButton;
+      createRadioButton(name: string, label: string): RadioButton;
+      createRadioButton(name: string, label: string, asHtml: boolean): RadioButton;
+      createResetButton(): ResetButton;
+      createResetButton(html: string): ResetButton;
+      createResetButton(html: string, clickHandler: Handler): ResetButton;
+      createScrollPanel(): ScrollPanel;
+      createScrollPanel(child: Widget): ScrollPanel;
+      createServerBlurHandler(): ServerHandler;
+      createServerBlurHandler(functionName: string): ServerHandler;
+      createServerChangeHandler(): ServerHandler;
+      createServerChangeHandler(functionName: string): ServerHandler;
+      createServerClickHandler(): ServerHandler;
+      createServerClickHandler(functionName: string): ServerHandler;
+      createServerCloseHandler(): ServerHandler;
+      createServerCloseHandler(functionName: string): ServerHandler;
+      createServerCommand(): ServerHandler;
+      createServerCommand(functionName: string): ServerHandler;
+      createServerErrorHandler(): ServerHandler;
+      createServerErrorHandler(functionName: string): ServerHandler;
+      createServerFocusHandler(): ServerHandler;
+      createServerFocusHandler(functionName: string): ServerHandler;
+      createServerHandler(): ServerHandler;
+      createServerHandler(functionName: string): ServerHandler;
+      createServerInitializeHandler(): ServerHandler;
+      createServerInitializeHandler(functionName: string): ServerHandler;
+      createServerKeyHandler(): ServerHandler;
+      createServerKeyHandler(functionName: string): ServerHandler;
+      createServerLoadHandler(): ServerHandler;
+      createServerLoadHandler(functionName: string): ServerHandler;
+      createServerMouseHandler(): ServerHandler;
+      createServerMouseHandler(functionName: string): ServerHandler;
+      createServerScrollHandler(): ServerHandler;
+      createServerScrollHandler(functionName: string): ServerHandler;
+      createServerSelectionHandler(): ServerHandler;
+      createServerSelectionHandler(functionName: string): ServerHandler;
+      createServerSubmitHandler(): ServerHandler;
+      createServerSubmitHandler(functionName: string): ServerHandler;
+      createServerValueChangeHandler(): ServerHandler;
+      createServerValueChangeHandler(functionName: string): ServerHandler;
+      createSimpleCheckBox(): SimpleCheckBox;
+      createSimplePanel(): SimplePanel;
+      createSimpleRadioButton(name: string): SimpleRadioButton;
+      createSplitLayoutPanel(): SplitLayoutPanel;
+      createStackPanel(): StackPanel;
+      createSubmitButton(): SubmitButton;
+      createSubmitButton(html: string): SubmitButton;
+      createSuggestBox(): SuggestBox;
+      createTabBar(): TabBar;
+      createTabPanel(): TabPanel;
+      createTextArea(): TextArea;
+      createTextBox(): TextBox;
+      createToggleButton(): ToggleButton;
+      createToggleButton(upText: string): ToggleButton;
+      createToggleButton(upText: string, clickHandler: Handler): ToggleButton;
+      createToggleButton(upText: string, downText: string): ToggleButton;
+      createTree(): Tree;
+      createTreeItem(): TreeItem;
+      createTreeItem(text: string): TreeItem;
+      createTreeItem(child: Widget): TreeItem;
+      createVerticalPanel(): VerticalPanel;
+      getElementById(id: string): Component;
+      getId(): string;
+      isStandardsMode(): boolean;
+      loadComponent(componentName: string): Component;
+      loadComponent(componentName: string, optAdvancedArgs: Object): Component;
+      remove(index: Integer): UiInstance;
+      remove(widget: Widget): UiInstance;
+      setHeight(height: Integer): UiInstance;
+      setStandardsMode(standardsMode: boolean): UiInstance;
+      setStyleAttribute(attribute: string, value: string): UiInstance;
+      setTitle(title: string): UiInstance;
+      setWidth(width: Integer): UiInstance;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * Vertical alignment constants to use with setVerticalAlignment methods in UiApp.
+     */
+    export enum VerticalAlignment { TOP, MIDDLE, BOTTOM }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * A panel that lays all of its widgets out in a single vertical column.
+     * 
+     *  Here is an example of how to use this widget:
+     * 
+     *      function doGet() {
+     *        var app = UiApp.createApplication();
+     *        var panel = app.createVerticalPanel();
+     *        panel.add(app.createButton("button 1"));
+     *        panel.add(app.createButton("button 2"));
+     *        app.add(panel);
+     *        return app;
+     *      }
+     * 
+     *  Internally, UiApp widgets are built on top of the 
+     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
+     *  directly. You can find the VerticalPanel documentation
+     *  here.
+     */
+    export interface VerticalPanel {
+      add(widget: Widget): VerticalPanel;
+      addStyleDependentName(styleName: string): VerticalPanel;
+      addStyleName(styleName: string): VerticalPanel;
+      clear(): VerticalPanel;
+      getId(): string;
+      getTag(): string;
+      getType(): string;
+      remove(index: Integer): VerticalPanel;
+      remove(widget: Widget): VerticalPanel;
+      setBorderWidth(width: Integer): VerticalPanel;
+      setCellHeight(widget: Widget, height: string): VerticalPanel;
+      setCellHorizontalAlignment(widget: Widget, horizontalAlignment: HorizontalAlignment): VerticalPanel;
+      setCellVerticalAlignment(widget: Widget, verticalAlignment: VerticalAlignment): VerticalPanel;
+      setCellWidth(widget: Widget, width: string): VerticalPanel;
+      setHeight(height: string): VerticalPanel;
+      setHorizontalAlignment(horizontalAlignment: HorizontalAlignment): VerticalPanel;
+      setId(id: string): VerticalPanel;
+      setLayoutData(layout: Object): VerticalPanel;
+      setPixelSize(width: Integer, height: Integer): VerticalPanel;
+      setSize(width: string, height: string): VerticalPanel;
+      setSpacing(spacing: Integer): VerticalPanel;
+      setStyleAttribute(attribute: string, value: string): VerticalPanel;
+      setStyleAttributes(attributes: Object): VerticalPanel;
+      setStyleName(styleName: string): VerticalPanel;
+      setStylePrimaryName(styleName: string): VerticalPanel;
+      setTag(tag: string): VerticalPanel;
+      setTitle(title: string): VerticalPanel;
+      setVerticalAlignment(verticalAlignment: VerticalAlignment): VerticalPanel;
+      setVisible(visible: boolean): VerticalPanel;
+      setWidth(width: string): VerticalPanel;
+    }
+
+    /**
+     * 
+     * Deprecated. The UI service was
+     *      
+     *      deprecated on December 11, 2014. To create user interfaces, use the
+     *      HTML service instead.
+     * Base interface for UiApp widgets.
+     * Implementing classes
+     * 
+     * NameBrief description
+     * 
+     * AbsolutePanelAn absolute panel positions all of its children absolutely, allowing them to overlap.
+     * 
+     * AnchorA widget that represents a simple <a> element.
+     * 
+     * ButtonA standard push-button widget.
+     * 
+     * CaptionPanelA panel that wraps its contents in a border with a caption that appears in the upper left
+     *  corner of the border.
+     * 
+     * ChartA Chart object, which can be embedded into documents, UI elements, or used as a static image.
+     * 
+     * CheckBoxA standard check box widget.
+     * 
+     * ControlA user interface control object, that drives the data displayed by a DashboardPanel.
+     * 
+     * DashboardPanelA dashboard is a visual structure that enables the organization and management
+     *  of multiple charts that share the same underlying data.
+     * 
+     * DateBoxA text box that shows a DatePicker when the user focuses on it.
+     * 
+     * DatePickerA date picker widget.
+     * 
+     * DecoratedStackPanelA StackPanel that wraps each item in a 2x3 grid (six box), which allows users to add
+     *  rounded corners.
+     * 
+     * DecoratedTabBarA TabBar that wraps each tab in a 2x3 grid (six box), which allows users to add rounded corners.
+     * 
+     * DecoratedTabPanelA TabPanel that uses a DecoratedTabBar with rounded corners.
+     * 
+     * DecoratorPanelA SimplePanel that wraps its contents in stylized boxes, which can be used to add rounded
+     *  corners to a Widget.
+     * 
+     * DialogBoxA form of popup that has a caption area at the top and can be dragged by the
+     *  user.
+     * 
+     * EmbeddedChartRepresents a chart that has been embedded into a Spreadsheet.
+     * 
+     * FileUploadA widget that wraps the HTML <input type='file'> element.
+     * 
+     * FlexTableA flexible table that creates cells on demand.
+     * 
+     * FlowPanelA panel that formats its child widgets using the default HTML layout behavior.
+     * 
+     * FocusPanelA simple panel that makes its contents focusable, and adds the ability to catch mouse and
+     *  keyboard events.
+     * 
+     * FormPanelA panel that wraps its contents in an HTML <FORM> element.
+     * 
+     * GridA rectangular grid that can contain text, html, or a child widget within its cells.
+     * 
+     * HTMLA widget that contains arbitrary text, which is interpreted as HTML.
+     * 
+     * HiddenRepresents a hidden field for storing data in the user's browser that can be passed back to a
+     *  handler as a "callback element".
+     * 
+     * HorizontalPanelA panel that lays all of its widgets out in a single horizontal column.
+     * 
+     * ImageA widget that displays the image at a given URL.
+     * 
+     * InlineLabelA widget that contains arbitrary text, not interpreted as HTML.
+     * 
+     * LabelA widget that contains arbitrary text, not interpreted as HTML.
+     * 
+     * ListBoxA widget that presents a list of choices to the user, either as a list box or
+     *  as a drop-down list.
+     * 
+     * MenuBarA standard menu bar widget.
+     * 
+     * PasswordTextBoxA text box that visually masks its input to prevent eavesdropping.
+     * 
+     * PopupPanelA panel that can "pop up" over other widgets.
+     * 
+     * PushButtonA normal push button with custom styling.
+     * 
+     * RadioButtonA mutually-exclusive selection radio button widget.
+     * 
+     * ResetButtonA standard push-button widget which will automatically reset its enclosing FormPanel if
+     *  any.
+     * 
+     * ScrollPanelA panel that wraps its contents in a scrollable element.
+     * 
+     * SimpleCheckBoxA simple checkbox widget, with no label.
+     * 
+     * SimplePanelA panel that can contain only one widget.
+     * 
+     * SimpleRadioButtonA simple radio button widget, with no label.
+     * 
+     * SplitLayoutPanelA panel that adds user-positioned splitters between each of its child widgets.
+     * 
+     * StackPanelA panel that stacks its children vertically, displaying only one at a time,
+     *  with a header for each child which the user can click to display.
+     * 
+     * SubmitButtonA standard push-button widget which will automatically submit its enclosing FormPanel if
+     *  any.
+     * 
+     * SuggestBoxA SuggestBox is a text box or text area which displays a
+     *  pre-configured set of selections that match the user's input.
+     * 
+     * TabBarA horizontal bar of folder-style tabs, most commonly used as part of a TabPanel.
+     * 
+     * TabPanelA panel that represents a tabbed set of pages, each of which contains another
+     *  widget.
+     * 
+     * TextAreaA text box that allows multiple lines of text to be entered.
+     * 
+     * TextBoxA standard single-line text box.
+     * 
+     * ToggleButtonA ToggleButton is a stylish stateful button which allows the
+     *  user to toggle between up and down states.
+     * 
+     * TreeA standard hierarchical tree widget.
+     * 
+     * VerticalPanelA panel that lays all of its widgets out in a single vertical column.
+     */
+    export interface Widget {
+      getId(): string;
+      getType(): string;
+    }
+
+  }
+}
+
+declare var UiApp: GoogleAppsScript.UI.UiApp;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.url-fetch.d.ts b/google-apps-script/google-apps-script.url-fetch.d.ts
new file mode 100644
index 000000000..3e30b9809
--- /dev/null
+++ b/google-apps-script/google-apps-script.url-fetch.d.ts
@@ -0,0 +1,77 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+
+declare module GoogleAppsScript {
+  export module URL_Fetch {
+    /**
+     * This class allows users to access specific information on HTTP responses.
+     * See also
+     * 
+     * UrlFetchApp
+     */
+    export interface HTTPResponse {
+      getAllHeaders(): Object;
+      getAs(contentType: string): Base.Blob;
+      getBlob(): Base.Blob;
+      getContent(): Byte[];
+      getContentText(): string;
+      getContentText(charset: string): string;
+      getHeaders(): Object;
+      getResponseCode(): Integer;
+    }
+
+    /**
+     * 
+     * Deprecated. This class is deprecated and should not be used in new scripts.
+     * Represents configuration settings for an OAuth-enabled remote service.
+     * See also
+     * 
+     * UrlFetchApp
+     */
+    export interface OAuthConfig {
+      getAccessTokenUrl(): string;
+      getAuthorizationUrl(): string;
+      getMethod(): string;
+      getParamLocation(): string;
+      getRequestTokenUrl(): string;
+      getServiceName(): string;
+      setAccessTokenUrl(url: string): void;
+      setAuthorizationUrl(url: string): void;
+      setConsumerKey(consumerKey: string): void;
+      setConsumerSecret(consumerSecret: string): void;
+      setMethod(method: string): void;
+      setParamLocation(location: string): void;
+      setRequestTokenUrl(url: string): void;
+    }
+
+    /**
+     * Fetch resources and communicate with other hosts over the Internet.
+     * 
+     *  This service allows scripts to communicate with other applications or access other resources on
+     *  the web by fetching URLs. A script can use the URL Fetch service to issue HTTP and HTTPS requests
+     *  and receive responses. The URL Fetch service uses Google's network infrastructure for efficiency
+     *  and scaling purposes.
+     * See also
+     * 
+     * OAuthConfig
+     * 
+     * HTTPResponse
+     */
+    export interface UrlFetchApp {
+      fetch(url: string): HTTPResponse;
+      fetch(url: string, params: Object): HTTPResponse;
+      getRequest(url: string): Object;
+      getRequest(url: string, params: Object): Object;
+      addOAuthService(serviceName: string): OAuthConfig;
+      removeOAuthService(serviceName: string): void;
+    }
+
+  }
+}
+
+declare var UrlFetchApp: GoogleAppsScript.URL_Fetch.UrlFetchApp;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.utilities.d.ts b/google-apps-script/google-apps-script.utilities.d.ts
new file mode 100644
index 000000000..17d46a91c
--- /dev/null
+++ b/google-apps-script/google-apps-script.utilities.d.ts
@@ -0,0 +1,76 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+
+declare module GoogleAppsScript {
+  export module Utilities {
+    /**
+     * A typesafe enum for character sets.
+     */
+    export enum Charset { US_ASCII, UTF_8 }
+
+    /**
+     * Selector of Digest algorithm
+     */
+    export enum DigestAlgorithm { MD2, MD5, SHA_1, SHA_256, SHA_384, SHA_512 }
+
+    /**
+     * Selector of MAC algorithm
+     */
+    export enum MacAlgorithm { HMAC_MD5, HMAC_SHA_1, HMAC_SHA_256, HMAC_SHA_384, HMAC_SHA_512 }
+
+    /**
+     * This service provides utilities for string encoding/decoding, date formatting, JSON manipulation,
+     *  and other miscellaneous tasks.
+     */
+    export interface Utilities {
+      Charset: Charset
+      DigestAlgorithm: DigestAlgorithm
+      MacAlgorithm: MacAlgorithm
+      base64Decode(encoded: string): Byte[];
+      base64Decode(encoded: string, charset: Charset): Byte[];
+      base64DecodeWebSafe(encoded: string): Byte[];
+      base64DecodeWebSafe(encoded: string, charset: Charset): Byte[];
+      base64Encode(data: Byte[]): string;
+      base64Encode(data: string): string;
+      base64Encode(data: string, charset: Charset): string;
+      base64EncodeWebSafe(data: Byte[]): string;
+      base64EncodeWebSafe(data: string): string;
+      base64EncodeWebSafe(data: string, charset: Charset): string;
+      computeDigest(algorithm: DigestAlgorithm, value: string): Byte[];
+      computeDigest(algorithm: DigestAlgorithm, value: string, charset: Charset): Byte[];
+      computeHmacSha256Signature(value: string, key: string): Byte[];
+      computeHmacSha256Signature(value: string, key: string, charset: Charset): Byte[];
+      computeHmacSignature(algorithm: MacAlgorithm, value: string, key: string): Byte[];
+      computeHmacSignature(algorithm: MacAlgorithm, value: string, key: string, charset: Charset): Byte[];
+      computeRsaSha256Signature(value: string, key: string): Byte[];
+      computeRsaSha256Signature(value: string, key: string, charset: Charset): Byte[];
+      formatDate(date: Date, timeZone: string, format: string): string;
+      formatString(template: string, ...args: Object[]): string;
+      newBlob(data: Byte[]): Base.Blob;
+      newBlob(data: Byte[], contentType: string): Base.Blob;
+      newBlob(data: Byte[], contentType: string, name: string): Base.Blob;
+      newBlob(data: string): Base.Blob;
+      newBlob(data: string, contentType: string): Base.Blob;
+      newBlob(data: string, contentType: string, name: string): Base.Blob;
+      parseCsv(csv: string): String[][];
+      parseCsv(csv: string, delimiter: Char): String[][];
+      sleep(milliseconds: Integer): void;
+      unzip(blob: Base.BlobSource): Base.Blob[];
+      zip(blobs: Base.BlobSource[]): Base.Blob;
+      zip(blobs: Base.BlobSource[], name: string): Base.Blob;
+      jsonParse(jsonString: string): Object;
+      jsonStringify(obj: Object): string;
+    }
+
+  }
+}
+
+declare var Charset: GoogleAppsScript.Utilities.Charset;
+declare var DigestAlgorithm: GoogleAppsScript.Utilities.DigestAlgorithm;
+declare var MacAlgorithm: GoogleAppsScript.Utilities.MacAlgorithm;
+declare var Utilities: GoogleAppsScript.Utilities.Utilities;
\ No newline at end of file
diff --git a/google-apps-script/google-apps-script.xml-service.d.ts b/google-apps-script/google-apps-script.xml-service.d.ts
new file mode 100644
index 000000000..075c6a47e
--- /dev/null
+++ b/google-apps-script/google-apps-script.xml-service.d.ts
@@ -0,0 +1,347 @@
+// Type definitions for Google Apps Script 2015-11-12
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+
+declare module GoogleAppsScript {
+  export module XML_Service {
+    /**
+     * A representation of an XML attribute.
+     * 
+     *      // Reads the first and last name of each person and adds a new attribute with the full name.
+     *      var xml = '<roster>'
+     *          + '<person first="John" last="Doe"/>'
+     *          + '<person first="Mary" last="Smith"/>'
+     *          + '</roster>';
+     *      var document = XmlService.parse(xml);
+     *      var people = document.getRootElement().getChildren('person');
+     *      for (var i = 0; i < people.length; i++) {
+     *        var person = people[i];
+     *        var firstName = person.getAttribute('first').getValue();
+     *        var lastName = person.getAttribute('last').getValue();
+     *        person.setAttribute('full', firstName + ' ' + lastName);
+     *      }
+     *      xml = XmlService.getPrettyFormat().format(document);
+     *      Logger.log(xml);
+     */
+    export interface Attribute {
+      getName(): string;
+      getNamespace(): Namespace;
+      getValue(): string;
+      setName(name: string): Attribute;
+      setNamespace(namespace: Namespace): Attribute;
+      setValue(value: string): Attribute;
+    }
+
+    /**
+     * A representation of an XML CDATASection node.
+     * 
+     *      // Create and log an XML document that shows how special characters like '<', '>', and '&' are 
+     *      // stored in a CDATASection node as compared to in a Text node.
+     *      var illegalCharacters = '<em>The Amazing Adventures of Kavalier & Clay</em>';
+     *      var cdata = XmlService.createCdata(illegalCharacters);
+     *      var text = XmlService.createText(illegalCharacters);
+     *      var root = XmlService.createElement('root').addContent(cdata).addContent(text);
+     *      var document = XmlService.createDocument(root);
+     *      var xml = XmlService.getPrettyFormat().format(document);
+     *      Logger.log(xml);
+     */
+    export interface Cdata {
+      append(text: string): Text;
+      detach(): Content;
+      getParentElement(): Element;
+      getText(): string;
+      getValue(): string;
+      setText(text: string): Text;
+    }
+
+    /**
+     * A representation of an XML Comment node.
+     */
+    export interface Comment {
+      detach(): Content;
+      getParentElement(): Element;
+      getText(): string;
+      getValue(): string;
+      setText(text: string): Comment;
+    }
+
+    /**
+     * A representation of a generic XML node.
+     * Implementing classes
+     * 
+     * NameBrief description
+     * 
+     * CdataA representation of an XML CDATASection node.
+     * 
+     * CommentA representation of an XML Comment node.
+     * 
+     * DocTypeA representation of an XML DocumentType node.
+     * 
+     * ElementA representation of an XML Element node.
+     * 
+     * EntityRefA representation of an XML EntityReference node.
+     * 
+     * ProcessingInstructionA representation of an XML ProcessingInstruction node.
+     * 
+     * TextA representation of an XML Text node.
+     */
+    export interface Content {
+      asCdata(): Cdata;
+      asComment(): Comment;
+      asDocType(): DocType;
+      asElement(): Element;
+      asEntityRef(): EntityRef;
+      asProcessingInstruction(): ProcessingInstruction;
+      asText(): Text;
+      detach(): Content;
+      getParentElement(): Element;
+      getType(): ContentType;
+      getValue(): string;
+    }
+
+    /**
+     * An enumeration representing the types of XML content nodes.
+     */
+    export enum ContentType { CDATA, COMMENT, DOCTYPE, ELEMENT, ENTITYREF, PROCESSINGINSTRUCTION, TEXT }
+
+    /**
+     * A representation of an XML DocumentType node.
+     */
+    export interface DocType {
+      detach(): Content;
+      getElementName(): string;
+      getInternalSubset(): string;
+      getParentElement(): Element;
+      getPublicId(): string;
+      getSystemId(): string;
+      getValue(): string;
+      setElementName(name: string): DocType;
+      setInternalSubset(data: string): DocType;
+      setPublicId(id: string): DocType;
+      setSystemId(id: string): DocType;
+    }
+
+    /**
+     * A representation of an XML document.
+     */
+    export interface Document {
+      addContent(content: Content): Document;
+      addContent(index: Integer, content: Content): Document;
+      cloneContent(): Content[];
+      detachRootElement(): Element;
+      getAllContent(): Content[];
+      getContent(index: Integer): Content;
+      getContentSize(): Integer;
+      getDescendants(): Content[];
+      getDocType(): DocType;
+      getRootElement(): Element;
+      hasRootElement(): boolean;
+      removeContent(): Content[];
+      removeContent(content: Content): boolean;
+      removeContent(index: Integer): Content;
+      setDocType(docType: DocType): Document;
+      setRootElement(element: Element): Document;
+    }
+
+    /**
+     * A representation of an XML Element node.
+     * 
+     *      // Adds up the values listed in a sample XML document and adds a new element with the total.
+     *      var xml = '<things>'
+     *          + '<plates>12</plates>'
+     *          + '<bowls>18</bowls>'
+     *          + '<cups>25</cups>'
+     *          + '</things>';
+     *      var document = XmlService.parse(xml);
+     *      var root = document.getRootElement();
+     *      var items = root.getChildren();
+     *      var total = 0;
+     *      for (var i = 0; i < items.length; i++) {
+     *        total += Number(items[i].getText());
+     *      }
+     *      var totalElement = XmlService.createElement('total').setText(total);
+     *      root.addContent(totalElement);
+     *      xml = XmlService.getPrettyFormat().format(document);
+     *      Logger.log(xml);
+     */
+    export interface Element {
+      addContent(content: Content): Element;
+      addContent(index: Integer, content: Content): Element;
+      cloneContent(): Content[];
+      detach(): Content;
+      getAllContent(): Content[];
+      getAttribute(name: string): Attribute;
+      getAttribute(name: string, namespace: Namespace): Attribute;
+      getAttributes(): Attribute[];
+      getChild(name: string): Element;
+      getChild(name: string, namespace: Namespace): Element;
+      getChildText(name: string): string;
+      getChildText(name: string, namespace: Namespace): string;
+      getChildren(): Element[];
+      getChildren(name: string): Element[];
+      getChildren(name: string, namespace: Namespace): Element[];
+      getContent(index: Integer): Content;
+      getContentSize(): Integer;
+      getDescendants(): Content[];
+      getDocument(): Document;
+      getName(): string;
+      getNamespace(): Namespace;
+      getNamespace(prefix: string): Namespace;
+      getParentElement(): Element;
+      getQualifiedName(): string;
+      getText(): string;
+      getValue(): string;
+      isAncestorOf(other: Element): boolean;
+      isRootElement(): boolean;
+      removeAttribute(attribute: Attribute): boolean;
+      removeAttribute(attributeName: string): boolean;
+      removeAttribute(attributeName: string, namespace: Namespace): boolean;
+      removeContent(): Content[];
+      removeContent(content: Content): boolean;
+      removeContent(index: Integer): Content;
+      setAttribute(attribute: Attribute): Element;
+      setAttribute(name: string, value: string): Element;
+      setAttribute(name: string, value: string, namespace: Namespace): Element;
+      setName(name: string): Element;
+      setNamespace(namespace: Namespace): Element;
+      setText(text: string): Element;
+    }
+
+    /**
+     * A representation of an XML EntityReference node.
+     */
+    export interface EntityRef {
+      detach(): Content;
+      getName(): string;
+      getParentElement(): Element;
+      getPublicId(): string;
+      getSystemId(): string;
+      getValue(): string;
+      setName(name: string): EntityRef;
+      setPublicId(id: string): EntityRef;
+      setSystemId(id: string): EntityRef;
+    }
+
+    /**
+     * A formatter for outputting an XML document, with three pre-defined formats that can be further
+     *  customized.
+     * 
+     *      // Log an XML document with specified formatting options.
+     *      var xml = '<root><a><b>Text!</b><b>More text!</b></a></root>';
+     *      var document = XmlService.parse(xml);
+     *      var output = XmlService.getCompactFormat()
+     *          .setLineSeparator('\n')
+     *          .setEncoding('UTF-8')
+     *          .setIndent('   ')
+     *          .format(document);
+     *      Logger.log(output);
+     */
+    export interface Format {
+      format(document: Document): string;
+      format(element: Element): string;
+      setEncoding(encoding: string): Format;
+      setIndent(indent: string): Format;
+      setLineSeparator(separator: string): Format;
+      setOmitDeclaration(omitDeclaration: boolean): Format;
+      setOmitEncoding(omitEncoding: boolean): Format;
+    }
+
+    /**
+     * A representation of an XML namespace.
+     */
+    export interface Namespace {
+      getPrefix(): string;
+      getURI(): string;
+    }
+
+    /**
+     * A representation of an XML ProcessingInstruction node.
+     */
+    export interface ProcessingInstruction {
+      detach(): Content;
+      getData(): string;
+      getParentElement(): Element;
+      getTarget(): string;
+      getValue(): string;
+    }
+
+    /**
+     * A representation of an XML Text node.
+     */
+    export interface Text {
+      append(text: string): Text;
+      detach(): Content;
+      getParentElement(): Element;
+      getText(): string;
+      getValue(): string;
+      setText(text: string): Text;
+    }
+
+    /**
+     * This service allows scripts to parse, navigate, and programmatically create XML documents.
+     * 
+     *      // Log the title and labels for the first page of blog posts on the Google Apps Developer blog.
+     *      function parseXml() {
+     *        var url = 'http://googleappsdeveloper.blogspot.com/atom.xml';
+     *        var xml = UrlFetchApp.fetch(url).getContentText();
+     *        var document = XmlService.parse(xml);
+     *        var root = document.getRootElement();
+     *        var atom = XmlService.getNamespace('http://www.w3.org/2005/Atom');
+     *      
+     *        var entries = document.getRootElement().getChildren('entry', atom);
+     *        for (var i = 0; i < entries.length; i++) {
+     *          var title = entries[i].getChild('title', atom).getText();
+     *          var categoryElements = entries[i].getChildren('category', atom);
+     *          var labels = [];
+     *          for (var j = 0; j < categoryElements.length; j++) {
+     *            labels.push(categoryElements[j].getAttribute('term').getValue());
+     *          }
+     *          Logger.log('%s (%s)', title, labels.join(', '));
+     *        }
+     *      }
+     *      
+     *      // Create and log an XML representation of the threads in your Gmail inbox.
+     *      function createXml() {
+     *        var root = XmlService.createElement('threads');
+     *        var threads = GmailApp.getInboxThreads();
+     *        for (var i = 0; i < threads.length; i++) {
+     *          var child = XmlService.createElement('thread')
+     *              .setAttribute('messageCount', threads[i].getMessageCount())
+     *              .setAttribute('isUnread', threads[i].isUnread())
+     *              .setText(threads[i].getFirstMessageSubject());
+     *          root.addContent(child);
+     *        }
+     *        var document = XmlService.createDocument(root);
+     *        var xml = XmlService.getPrettyFormat().format(document);
+     *        Logger.log(xml);
+     *      }
+     */
+    export interface XmlService {
+      ContentTypes: ContentType
+      createCdata(text: string): Cdata;
+      createComment(text: string): Comment;
+      createDocType(elementName: string): DocType;
+      createDocType(elementName: string, systemId: string): DocType;
+      createDocType(elementName: string, publicId: string, systemId: string): DocType;
+      createDocument(): Document;
+      createDocument(rootElement: Element): Document;
+      createElement(name: string): Element;
+      createElement(name: string, namespace: Namespace): Element;
+      createText(text: string): Text;
+      getCompactFormat(): Format;
+      getNamespace(uri: string): Namespace;
+      getNamespace(prefix: string, uri: string): Namespace;
+      getNoNamespace(): Namespace;
+      getPrettyFormat(): Format;
+      getRawFormat(): Format;
+      getXmlNamespace(): Namespace;
+      parse(xml: string): Document;
+    }
+
+  }
+}
+
+declare var XmlService: GoogleAppsScript.XML_Service.XmlService;
\ No newline at end of file
diff --git a/google-drive-realtime-api/google-drive-realtime-api.d.ts b/google-drive-realtime-api/google-drive-realtime-api.d.ts
index 95f239a34..8d549355d 100644
--- a/google-drive-realtime-api/google-drive-realtime-api.d.ts
+++ b/google-drive-realtime-api/google-drive-realtime-api.d.ts
@@ -483,6 +483,36 @@ declare module gapi.drive.realtime {
 		saveAs(fileId:string)	: void;
 
 	}
+
+	// INCOMPLETE
+	// https://developers.google.com/google-apps/realtime/reference/gapi.drive.realtime.Error
+	export class Error { }
+
+	// Complete
+	// Opens the debugger application on the current page. The debugger shows all realtime documents that the
+	// page has loaded and is able to view, edit and debug all aspects of each realtime document.
+	export function debug() : void;
+
+	/* Creates a new file with fake network communications. This file will not talk to the server and will only
+	   exist in memory for as long as the browser session persists.
+	   https://developers.google.com/google-apps/realtime/reference/gapi.drive.realtime#.newInMemoryDocument
+	 @Param opt_onLoaded {function(non-null gapi.drive.realtime.Document)}
+	 A callback that will be called when the realtime document is ready. The created or opened realtime document
+	 object will be passed to this function.
+
+	 @Param opt_initializerFn {function(non-null gapi.drive.realtime.Model)}
+	 An optional initialization function that will be called before onLoaded only the first time that the document
+	 is loaded. The document's gapi.drive.realtime.Model object will be passed to this function.
+
+	 @Param opt_errorFn {function(non-null gapi.drive.realtime.Error)}
+	 An optional error handling function that will be called if an error occurs while the document is being
+	 loaded or edited. A gapi.drive.realtime.Error object describing the error will be passed to this function.
+	*/
+	export function newInMemoryDocument(
+		opt_onLoaded? : (d:Document) => void,
+		opt_initializerFn? : (m:Model) => void,
+		opt_errorFn? : (e:gapi.drive.realtime.Error) => void
+	) : Document;
 }
 
 
diff --git a/googlemaps/google.maps.d.ts b/googlemaps/google.maps.d.ts
index b951a966a..3ac35b048 100644
--- a/googlemaps/google.maps.d.ts
+++ b/googlemaps/google.maps.d.ts
@@ -849,7 +849,7 @@ declare module google.maps {
         formatted_address: string;
         geometry: GeocoderGeometry;
         partial_match: boolean;
-        postcode_localities: string[]        
+        postcode_localities: string[];        
         types: string[];
     }
 
@@ -1338,6 +1338,7 @@ declare module google.maps {
         lightness?: number;
         saturation?: number;
         visibility?: string;
+        weight?: number;
     }
 
     /***** Layers *****/
@@ -1821,7 +1822,7 @@ declare module google.maps {
             matched_substrings: PredictionSubstring[];
             place_id: string;
             terms: PredictionTerm[];
-            types: string[]
+            types: string[];
         }
         
         export interface PredictionTerm {
diff --git a/graham_scan/graham_scan-tests.ts b/graham_scan/graham_scan-tests.ts
new file mode 100644
index 000000000..4317db851
--- /dev/null
+++ b/graham_scan/graham_scan-tests.ts
@@ -0,0 +1,12 @@
+/// <reference path="graham_scan.d.ts" />
+
+// Based on the README.MD
+
+//Create a new instance.
+var convexHull = new ConvexHullGrahamScan();
+
+//add points (needs to be done for each point, a foreach loop on the input array can be used.)
+convexHull.addPoint(1, 2);
+
+//getHull() returns the array of points that make up the convex hull.
+var hullPoints = convexHull.getHull();
diff --git a/graham_scan/graham_scan.d.ts b/graham_scan/graham_scan.d.ts
new file mode 100644
index 000000000..617df2e7e
--- /dev/null
+++ b/graham_scan/graham_scan.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for graham_scan v1.0.2
+// Project: https://github.com/brian3kb/graham_scan_js
+// Definitions by: Harm Berntsen <https://github.com/hberntsen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+declare class ConvexHullGrahamScan {
+    addPoint(x: number, y: number): void;
+    getHull(): {x: number, y: number}[];
+}
diff --git a/gruntjs/gruntjs.d.ts b/gruntjs/gruntjs.d.ts
index e503cb572..a3a3a67e5 100644
--- a/gruntjs/gruntjs.d.ts
+++ b/gruntjs/gruntjs.d.ts
@@ -1172,7 +1172,7 @@ declare module grunt {
             /**
              * The command to execute. It should be in the system path.
              */
-            cmd: string
+            cmd?: string
 
             /**
              * If specified, the same grunt bin that is currently running will be
diff --git a/gulp-babel/gulp-babel-tests.ts b/gulp-babel/gulp-babel-tests.ts
new file mode 100644
index 000000000..e5daf3617
--- /dev/null
+++ b/gulp-babel/gulp-babel-tests.ts
@@ -0,0 +1,7 @@
+/// <reference path="../node/node.d.ts" />
+/// <reference path="./gulp-babel.d.ts" />
+
+import babel = require('gulp-babel');
+
+var x: NodeJS.ReadWriteStream = babel();
+var x: NodeJS.ReadWriteStream = babel({});
diff --git a/gulp-babel/gulp-babel.d.ts b/gulp-babel/gulp-babel.d.ts
new file mode 100644
index 000000000..98d33881c
--- /dev/null
+++ b/gulp-babel/gulp-babel.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for gulp-babel 6.1.0
+// Project: https://github.com/babel/gulp-babel
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module 'gulp-babel' {
+	function babel(options?: {
+		filename?: string,
+		filenameRelative?: string,
+		presets?: string[],
+		plugins?: string[],
+		highlightCode?: boolean,
+		only?: string | string[],
+		ignore?: string | string[],
+		auxiliaryCommentBefore?: any,
+		auxiliaryCommentAfter?: any,
+		sourceMaps?: any,
+		inputSourceMap?: any,
+		sourceMapTarget?: any,
+		sourceFileName?: any,
+		sourceRoot?: any,
+		moduleRoot?: any,
+		moduleIds?: any,
+		moduleId?: any,
+		getModuleId?: any,
+		resolveModuleSource?: any,
+		keepModuleIdExtesions?: boolean,
+		code?: boolean,
+		ast?: boolean,
+		compact?: any,
+		comments?: boolean,
+		shouldPrintComment?: any,
+		env?: any,
+		retainLines?: boolean
+	}): NodeJS.ReadWriteStream;
+
+	export = babel;
+}
diff --git a/gulp-rev-replace/gulp-rev-replace-tests.ts b/gulp-rev-replace/gulp-rev-replace-tests.ts
index 57515c9ac..e7c5d9c18 100644
--- a/gulp-rev-replace/gulp-rev-replace-tests.ts
+++ b/gulp-rev-replace/gulp-rev-replace-tests.ts
@@ -9,13 +9,9 @@ import rev = require('gulp-rev');
 import useref = require('gulp-useref');
 
 gulp.task("index", () => {
-    var userefAssets = useref.assets();
-
     return gulp.src("src/index.html")
-        .pipe(userefAssets)      // Concatenate with gulp-useref
+        .pipe(useref())             // Concatenate with gulp-useref
         .pipe(rev())                // Rename the concatenated files
-        .pipe(userefAssets.restore())
-        .pipe(useref())
         .pipe(revReplace())         // Substitute in new filenames
         .pipe(gulp.dest('public'));
 });
diff --git a/gulp-rev/gulp-rev.d.ts b/gulp-rev/gulp-rev.d.ts
index 6cd432b0d..e04a765b7 100644
--- a/gulp-rev/gulp-rev.d.ts
+++ b/gulp-rev/gulp-rev.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for gulp-csso v5.0.1
+// Type definitions for gulp-rev v5.0.1
 // Project: https://github.com/sindresorhus/gulp-rev
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
diff --git a/gulp-tslint/gulp-tslint-tests.ts b/gulp-tslint/gulp-tslint-tests.ts
index fd4b1fe88..8658f103f 100644
--- a/gulp-tslint/gulp-tslint-tests.ts
+++ b/gulp-tslint/gulp-tslint-tests.ts
@@ -1,17 +1,36 @@
-/// <reference path="./gulp-tslint.d.ts"/>
+/// <reference path="gulp-tslint.d.ts"/>
 /// <reference path="../gulp/gulp.d.ts"/>
 /// <reference path="../vinyl/vinyl.d.ts"/>
-import gulp = require("gulp");
-import tslint = require("gulp-tslint");
-import vinyl = require("vinyl");
+
+import * as gulp from 'gulp';
+import * as tslint from 'gulp-tslint';
+import vinyl = require('vinyl');
+
+// Taken from gulp-tslint README https://github.com/panuhorsmalahti/gulp-tslint/blob/master/README.md
 
 gulp.task('tslint', function(){
-    gulp.src('source.ts')
+    return gulp.src('source.ts')
         .pipe(tslint())
         .pipe(tslint.report('verbose'));
 });
 
-/* Output is in the following form:
+gulp.task('invalid-noemit', function(){
+    return gulp.src('input.ts')
+        .pipe(tslint())
+        .pipe(tslint.report('prose', {
+          emitError: false
+        }));
+});
+
+gulp.task('invalid-noemit', function(){
+    return gulp.src('input.ts')
+        .pipe(tslint())
+        .pipe(tslint.report('prose', {
+          summarizeFailureOutput: true
+        }));
+});
+
+/* output is in the following form:
  * [{
  *   "name": "invalid.ts",
  *   "failure": "missing whitespace",
@@ -21,41 +40,55 @@ gulp.task('tslint', function(){
  *   "ruleName": "one-line"
  * }]
  */
-var testReporter = function (output: tslint.Output[], file: vinyl, options: tslint.Options) {
+const testReporter: tslint.Reporter = function (output, file, options) {
     // file is a reference to the vinyl File object
     console.log("Found " + output.length + " errors in " + file.path);
-    // options is a reference to the reporter options, e.g. options.emitError
+    // options is a reference to the reporter options, e.g. including the emitError boolean
 };
 
 gulp.task('invalid-custom', function(){
-    gulp.src('invalid.ts')
+    return gulp.src('input.ts')
         .pipe(tslint())
         .pipe(tslint.report(testReporter));
 });
 
-gulp.task('invalid-custom', function () {
-    gulp.src('invalid.ts')
-        .pipe(tslint())
-        .pipe(tslint.report(testReporter, { emitError: false }));
-});
-
 gulp.task('tslint-json', function(){
-    gulp.src('invalid.ts')
+    return gulp.src('input.ts')
         .pipe(tslint({
             configuration: {
-                rules: {
-                    "class-name": true
-                    // ...
-                }
+              rules: {
+                "class-name": true,
+                // ...
+              }
             }
         }))
         .pipe(tslint.report('prose'));;
 });
 
-gulp.task("lint", () => {
-      return gulp.src(["gulpfile.ts", "{src,test}/**/*.ts"])
-          .pipe(tslint())
-          .pipe(tslint.report("verbose", {
-              emitError: true
-          }));
+gulp.task('tslint', function(){
+    return gulp.src(['input.ts',])
+        .pipe(tslint())
+        .pipe(tslint.report('prose', {
+            reportLimit: 2
+        }));
 });
+
+
+gulp.task('tslint', function(){
+    return gulp.src(['input.ts',])
+        .pipe(tslint({
+            tslint: require('tslint')
+        }));
+});
+
+const tslintOptions: tslint.Options = {
+    configuration: {},
+    rulesDirectory: null,
+    tslint: null
+};
+
+const reportOptions: tslint.ReportOptions = {
+    emitError: true,
+    reportLimit: 0,
+    summarizeFailureOutput: false
+};
diff --git a/gulp-tslint/gulp-tslint.d.ts b/gulp-tslint/gulp-tslint.d.ts
index 99b990277..75c32718b 100644
--- a/gulp-tslint/gulp-tslint.d.ts
+++ b/gulp-tslint/gulp-tslint.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for gulp-tslint
+// Type definitions for gulp-tslint 3.6.0
 // Project: https://github.com/panuhorsmalahti/gulp-tslint
 // Definitions by: Asana <https://asana.com>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -9,13 +9,23 @@
 declare module "gulp-tslint" {
     import vinyl = require("vinyl");
 
-    function GulpTsLint(opts?: GulpTsLint.Options): NodeJS.ReadWriteStream;
+    namespace gulpTsLint {
+        interface GulpTsLint {
+            (options?: Options): NodeJS.ReadWriteStream;
+            report(reporter?: Reporter, options?: ReportOptions): NodeJS.ReadWriteStream;
+            report(options?: ReportOptions): NodeJS.ReadWriteStream;
+        }
 
-    module GulpTsLint {
         interface Options {
-            configuration?: {};
-            rulesDirectory?: string;
-            emitError?: boolean;
+            configuration?: {},
+            rulesDirectory?: string,
+            tslint?: GulpTsLint
+        }
+
+        interface ReportOptions {
+            emitError?: boolean,
+            reportLimit?: number,
+            summarizeFailureOutput?: boolean
         }
 
         interface Position {
@@ -32,12 +42,9 @@ declare module "gulp-tslint" {
             ruleName: string;
         }
 
-        type Reporter = string|((output: Output[], file: vinyl, options: Options) => any);
-        export function report(reporter?: Reporter, options?: Options): NodeJS.ReadWriteStream;
-        export function report(options?: Options): NodeJS.ReadWriteStream;
-
+        type Reporter = string|((output: Output[], file: vinyl, options: ReportOptions) => any);
     }
 
-    export = GulpTsLint;
+    var gulpTsLint: gulpTsLint.GulpTsLint;
+    export = gulpTsLint;
 }
-
diff --git a/gulp-typescript/gulp-typescript-tests.ts b/gulp-typescript/gulp-typescript-tests.ts
index 3dd743188..5abd5a152 100644
--- a/gulp-typescript/gulp-typescript-tests.ts
+++ b/gulp-typescript/gulp-typescript-tests.ts
@@ -54,3 +54,9 @@ gulp.task('scripts', function () {
     return gulp.src('lib/*.ts')
         .pipe(typescript(tsProject, undefined, typescript.reporter.fullReporter()));
 });
+
+gulp.task('default', function () {
+    return gulp.src('src/**/*.ts')
+        .pipe(typescript())
+        .pipe(gulp.dest('built/local'));
+});
diff --git a/gulp-typescript/gulp-typescript.d.ts b/gulp-typescript/gulp-typescript.d.ts
index 7b16d0a5a..84d4b5d9c 100644
--- a/gulp-typescript/gulp-typescript.d.ts
+++ b/gulp-typescript/gulp-typescript.d.ts
@@ -6,11 +6,11 @@
 /// <reference path="../node/node.d.ts"/>
 
 declare module "gulp-typescript" {
-    function GulpTypescript(params: GulpTypescript.Params, filters?: GulpTypescript.FilterSettings, reporter?: GulpTypescript.Reporter): GulpTypescript.CompilationStream;
+    function GulpTypescript(params?: GulpTypescript.Params, filters?: GulpTypescript.FilterSettings, reporter?: GulpTypescript.Reporter): GulpTypescript.CompilationStream;
 
     module GulpTypescript {
-        export function createProject(params: Params): Project;
-        export function createProject(file: string, params: Params): Project;
+        export function createProject(params?: Params): Project;
+        export function createProject(file: string, params?: Params): Project;
         export function filter(filters: FilterSettings): CompilationStream;
         interface Params {
             declarationFiles?: boolean;
diff --git a/gulp-uglify/gulp-uglify.d.ts b/gulp-uglify/gulp-uglify.d.ts
index 840b5110b..05eb937ed 100644
--- a/gulp-uglify/gulp-uglify.d.ts
+++ b/gulp-uglify/gulp-uglify.d.ts
@@ -170,6 +170,6 @@ declare module "gulp-uglify" {
          */
         comments_before: string[];
     }
-
+    namespace GulpUglify {}
     export = GulpUglify;
-}
\ No newline at end of file
+}
diff --git a/gulp-useref/gulp-useref-tests.ts b/gulp-useref/gulp-useref-tests.ts
index 95c35662d..6af7aaab8 100644
--- a/gulp-useref/gulp-useref-tests.ts
+++ b/gulp-useref/gulp-useref-tests.ts
@@ -1,15 +1,76 @@
 /// <reference path="gulp-useref.d.ts" />
 /// <reference path="../gulp/gulp.d.ts" />
+/// <reference path="../gulp-if/gulp-if.d.ts" />
+/// <reference path="../gulp-uglify/gulp-uglify.d.ts" />
+/// <reference path="../gulp-minify-css/gulp-minify-css.d.ts" />
+/// <reference path="../gulp-sourcemaps/gulp-sourcemaps.d.ts" />
+/// <reference path="../lazypipe/lazypipe.d.ts" />
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../gulp-typescript/gulp-typescript.d.ts" />
 
-import gulp = require('gulp');
-import useref = require('gulp-useref');
-
-gulp.task('default', () => {
-    var assets = useref.assets();
+import * as gulp from 'gulp';
+import * as useref from 'gulp-useref';
 
+// Usage
+gulp.task('default', function () {
     return gulp.src('app/*.html')
-        .pipe(assets)
-        .pipe(assets.restore())
         .pipe(useref())
         .pipe(gulp.dest('dist'));
 });
+
+gulp.task('default', function () {
+    return gulp.src('app/*.html')
+        .pipe(useref({ searchPath: '.tmp' }))
+        .pipe(gulp.dest('dist'));
+});
+
+import * as gulpif from 'gulp-if';
+import uglify = require('gulp-uglify');
+import minifyCss = require('gulp-minify-css');
+
+gulp.task('html', function () {
+    return gulp.src('app/*.html')
+        .pipe(useref())
+        .pipe(gulpif('*.js', uglify()))
+        .pipe(gulpif('*.css', minifyCss()))
+        .pipe(gulp.dest('dist'));
+});
+
+
+// Transform Streams
+import * as sourcemaps from 'gulp-sourcemaps';
+import lazypipe = require('lazypipe');
+
+gulp.task('default', function () {
+    return gulp.src('index.html')
+        .pipe(useref({}, lazypipe().pipe(sourcemaps.init, { loadMaps: true })()))
+        .pipe(sourcemaps.write('maps'))
+        .pipe(gulp.dest('dist'));
+});
+
+
+// options.additionalStreams
+import * as ts from 'gulp-typescript';
+
+// create stream of virtual files
+var tsStream = gulp.src('src/**/*.ts')
+        .pipe(ts());
+
+gulp.task('default', function () {
+    // use gulp-useref normally
+    return gulp.src('src/index.html')
+        .pipe(useref({ additionalStreams: [tsStream] }))
+        .pipe(gulp.dest('dist'));
+});
+
+
+// options.transformPath
+gulp.task('default', function () {
+    return gulp.src('app/*.html')
+        .pipe(useref({
+            transformPath: function(filePath) {
+                return filePath.replace('/rootpath','')
+            }
+        }))
+        .pipe(gulp.dest('dist'));
+});
diff --git a/gulp-useref/gulp-useref.d.ts b/gulp-useref/gulp-useref.d.ts
index b1628aa5f..86011015c 100644
--- a/gulp-useref/gulp-useref.d.ts
+++ b/gulp-useref/gulp-useref.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for gulp-useref v1.2.0
+// Type definitions for gulp-useref v3.0.0
 // Project: https://github.com/jonkemp/gulp-useref
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -6,20 +6,19 @@
 /// <reference path="../node/node.d.ts" />
 
 declare module 'gulp-useref' {
-    interface IAssetsOptions {
+    interface Options {
         searchPath?: string | string[];
+        base?: string;
+        noAssets?: boolean;
         noconcat?: boolean;
+        additionalStreams?: Array<NodeJS.ReadWriteStream>;
+        transformPath?: (filePath: string) => void;
     }
 
-    interface IAssetsStream extends NodeJS.ReadWriteStream {
-        restore(): NodeJS.ReadWriteStream;
+    interface Useref {
+        (options?: Options, ...transformStreams: NodeJS.ReadWriteStream[]): NodeJS.ReadWriteStream;
     }
 
-    interface IUseref {
-        (options?: any): NodeJS.ReadWriteStream;
-        assets(options?: IAssetsOptions): IAssetsStream;
-    }
-
-    var useref: IUseref;
+    var useref: Useref;
     export = useref;
 }
diff --git a/hapi/hapi.d.ts b/hapi/hapi.d.ts
index 7f2fab90e..b31c24b16 100644
--- a/hapi/hapi.d.ts
+++ b/hapi/hapi.d.ts
@@ -7,10 +7,6 @@
 
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../bluebird/bluebird.d.ts" />
-
-
-
 
 declare module "hapi" {
 	import http = require("http");
@@ -21,6 +17,17 @@ declare module "hapi" {
 		[key: string]: T;
 	}
 
+	interface IThenable<R> {
+		then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => U | IThenable<U>): IThenable<U>;
+		then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => void): IThenable<U>;
+	}
+
+	interface IPromise<R> extends IThenable<R> {
+		then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => U | IThenable<U>): IPromise<U>;
+		then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => void): IPromise<U>;
+		catch<U>(onRejected?: (error: any) => U | IThenable<U>): IPromise<U>;
+	}
+
 	/** Boom Module for errors. https://github.com/hapijs/boom
 	*  boom provides a set of utilities for returning HTTP errors. Each utility returns a Boom error response object (instance of Error) which includes the following properties:  */
 	export interface IBoom extends Error {
@@ -234,12 +241,12 @@ declare module "hapi" {
 	When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
 	export interface IReply {
 		<T>(err: Error,
-		result?: string|number|boolean|Buffer|stream.Stream | Promise<T> | T,
+		result?: string|number|boolean|Buffer|stream.Stream | IPromise<T> | T,
 		/**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
 		credentialData?: any
 		): IBoom;
 		/**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
-		<T>(result: string|number|boolean|Buffer|stream.Stream | Promise<T> | T): Response;
+		<T>(result: string|number|boolean|Buffer|stream.Stream | IPromise<T> | T): Response;
 
 		/** Returns control back to the framework without setting a response. If called in the handler, the response defaults to an empty payload with status code 200.
 		  * The data argument is only used for passing back authentication data and is ignored elsewhere. */
@@ -897,22 +904,32 @@ declare module "hapi" {
 
 
 	export interface IServerInject {
-		(options: {
+		(options: string | {
 			/**  the request HTTP method (e.g. 'POST'). Defaults to 'GET'.*/
 			method: string;
 			/** the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.*/
 			url: string;
 			/** an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default Shot headers.*/
-			headers: IDictionary<string>;
-			/**- an optional string or buffer containing the request payload (object must be manually converted to a string first). Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.*/
-			payload: string|Buffer;
-			/**an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.*/
-			credentials: any;
+			headers?: IDictionary<string>;
+			/** n optional string, buffer or object containing the request payload. In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.*/
+			payload?: string|{}|Buffer;
+			/** an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.*/
+			credentials?: any;
+			/** an optional artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.*/
+			artifacts?: any;
+			/** sets the initial value of request.app*/
+			app?: any;
+			/** sets the initial value of request.plugins*/
+			plugins?: any;
+			/** allows access to routes with config.isInternal set to true. Defaults to false.*/
+			allowInternals?: boolean;
+			/** sets the remote address for the incoming connection.*/
+			remoteAddress?: boolean;
 			/**object with options used to simulate client request stream conditions for testing:
 			error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
 			close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
 			end - if false, does not end the stream. Defaults to true.*/
-			simulate: {
+			simulate?: {
 				error: boolean;
 				close: boolean;
 				end: boolean;
diff --git a/helmet/helmet-tests.ts b/helmet/helmet-tests.ts
new file mode 100644
index 000000000..d2509a022
--- /dev/null
+++ b/helmet/helmet-tests.ts
@@ -0,0 +1,62 @@
+/// <reference path="helmet.d.ts" />
+
+import express = require("express")
+import helmet = require("helmet");
+
+var app = express();
+
+/**
+ * @summary Test for {@see helmet}.
+ */
+function helmetTest() {
+    app.use(helmet());
+}
+
+/**
+ * @summary Test for {@see helmet#xssFilter} function.
+ */
+function contentSecurityPolicyTest() {
+    app.use(helmet.xssFilter());
+    app.use(helmet.xssFilter({ setOnOldIE: true }));
+}
+
+/**
+ * @summary Test for {@see helmet#frameguard} function.
+ */
+function frameguardTest() {
+    app.use(helmet.frameguard());
+    app.use(helmet.frameguard("sameorigin"));
+}
+
+/**
+ * @summary Test for {@see helmet#hsts} function.
+ */
+function hstsTest() {
+    app.use(helmet.hsts());
+    app.use(helmet.hsts({ maxAge: 7776000000 }));
+}
+
+/**
+ * @summary Test for {@see helmet#ieNoOpen} function.
+ */
+function ieNoOpenTest() {
+    app.use(helmet.ieNoOpen());
+}
+
+/**
+ * @summary Test for {@see helmet#noSniff} function.
+ */
+function noSniffTest() {
+    app.use(helmet.noSniff());
+}
+
+/**
+ * @summary Test for {@see helmet#publicKeyPins} function.
+ */
+function publicKeyPinsTest() {
+    app.use(helmet.publicKeyPins({
+        sha256s: ["AbCdEf123=", "ZyXwVu456="],
+        includeSubdomains: true,
+        reportUri: "http://example.com"
+    }));
+}
diff --git a/helmet/helmet.d.ts b/helmet/helmet.d.ts
new file mode 100644
index 000000000..35d9bf3ae
--- /dev/null
+++ b/helmet/helmet.d.ts
@@ -0,0 +1,77 @@
+// Type definitions for helmet
+// Project: https://github.com/helmetjs/helmet
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../express/express.d.ts" />
+
+declare module "helmet" {
+    import express = require("express");
+
+    /**
+     * @summary Interface for helmet class.
+     * @interface
+     */
+    interface Helmet {
+        /**
+         * @summary Constructor.
+         * @return {RequestHandler} The Request handler.
+         */
+        ():express.RequestHandler;
+
+        /**
+         * @summary Prevent clickjacking.
+         * @param {string} header The header.
+         * @return {RequestHandler} The Request handler.
+         */
+        frameguard(header ?: string):express.RequestHandler;
+
+        /**
+         * @summary Hide "X-Powered-By" header.
+         * @param {Object} options The options.
+         * @return {RequestHandler} The Request handler.
+         */
+        hidePoweredBy(options ?: Object):express.RequestHandler;
+
+        /**
+         * @summary Adds the "Strict-Transport-Security" header.
+         * @param {Object} options The options.
+         * @return {RequestHandler} The Request handler.
+         */
+        hsts(options ?: Object):express.RequestHandler;
+
+        /**
+         * @summary Add the "X-Download-Options" header.
+         * @return {RequestHandler} The Request handler.
+         */
+        ieNoOpen():express.RequestHandler;
+
+        /**
+         * @summary Add the "Cache-Control" and "Pragma" headers to stop caching.
+         * @return {RequestHandler} The Request handler.
+         */
+        noCache(options ?: Object):express.RequestHandler;
+
+        /**
+         * @summary Adds the "X-Content-Type-Options" header.
+         * @return {RequestHandler} The Request handler.
+         */
+        noSniff():express.RequestHandler;
+
+        /**
+         * @summary Adds the "Public-Key-Pins" header.
+         * @return {RequestHandler} The Request handler.
+         */
+        publicKeyPins(options ?: Object):express.RequestHandler;
+
+        /**
+         * @summary Prevent Cross-site scripting attacks.
+         * @return {RequestHandler} The Request handler.
+         * @param {Object} options The options.
+         */
+        xssFilter(options ?: Object):express.RequestHandler;
+    }
+
+    var helmet: Helmet;
+    export = helmet;
+}
diff --git a/highcharts/highcharts-tests.ts b/highcharts/highcharts-tests.ts
index bfcbc9137..33c3c9e75 100644
--- a/highcharts/highcharts-tests.ts
+++ b/highcharts/highcharts-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="highcharts.d.ts" />
+/// <reference path="highcharts.d.ts" />
 /// <reference path="../jquery/jquery.d.ts" />
 
 function originalTests() {
diff --git a/highcharts/highcharts.d.ts b/highcharts/highcharts.d.ts
index c7ce6a2d4..e86d4b86c 100644
--- a/highcharts/highcharts.d.ts
+++ b/highcharts/highcharts.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Damiano Gambarotto <http://github.com/damianog>, Dan Lewi Harkestad <http://github.com/baltie>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-/// <reference path='../jquery/jquery.d.ts' />
-
 interface HighchartsPosition {
     align?: string;
     verticalAlign?: string;
@@ -1306,7 +1304,7 @@ interface HighchartsChartOptions3dFrame {
      * @default 'transparent'
      * @since 4.0
      */
-    color?: string | HighchartsGradient,
+    color?: string | HighchartsGradient;
     /**
      * Thickness of the panel.
      * @default 1
diff --git a/highcharts/highstock-tests.ts b/highcharts/highstock-tests.ts
index fac6fa676..5e7013f96 100644
--- a/highcharts/highstock-tests.ts
+++ b/highcharts/highstock-tests.ts
@@ -1,4 +1,5 @@
-/// <reference path="highstock.d.ts" /> 
+/// <reference path="highstock.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
 
 var someData = [1, 2, 3, 4, 5, 6, 7, 8, 9];
 
@@ -46,7 +47,7 @@ $(function () {
             inputBoxHeight: 18,
             inputStyle: {
                 color: '#039',
-                fontWeight: 'bold'                
+                fontWeight: 'bold'
             },
             labelStyle: {
                 color: 'silver',
@@ -61,4 +62,3 @@ $(function () {
         }]
     });
 });
-
diff --git a/highcharts/highstock.d.ts b/highcharts/highstock.d.ts
index f5133c54a..a4560099b 100644
--- a/highcharts/highstock.d.ts
+++ b/highcharts/highstock.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Highstock 2.1.5
+// Type definitions for Highstock 2.1.5
 // Project: http://www.highcharts.com/
 // Definitions by: David Deutsch <http://github.com/DavidKDeutsch>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
diff --git a/html-to-text/h2t-test.html b/html-to-text/h2t-test.html
new file mode 100644
index 000000000..1a3cafdf6
--- /dev/null
+++ b/html-to-text/h2t-test.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8'>
+    <script>
+      function myFunction {
+      document.getElementById("demo").innerHTML = "Hello JavaScript!";
+      }
+    </script>
+  </head>
+  <body>
+    <p>
+      <b>bold</b>
+    </p>
+    <p>
+      <i>italic</i>
+    </p>
+  </body>
+</html>
+
+    
diff --git a/html-to-text/html-to-text-tests.ts b/html-to-text/html-to-text-tests.ts
new file mode 100644
index 000000000..e49739aa1
--- /dev/null
+++ b/html-to-text/html-to-text-tests.ts
@@ -0,0 +1,29 @@
+/// <reference path="html-to-text.d.ts" />
+
+import * as htmlToText from 'html-to-text';
+
+let htmlOptions: HtmlToTextOptions = {
+    wordwrap: null,
+    tables: true,
+    hideLinkHrefIfSameAsText: true,
+    ignoreImage: true
+};
+
+
+function callback(err: string, result: string) {
+    console.log(`callback called with result ${result}`);
+}
+
+console.log("Processing file with default options");
+htmlToText.fromFile("h2t-test.html", callback);
+
+console.log("Processing file with custom options");
+htmlToText.fromFile("h2t-test.html", htmlOptions, callback);
+
+let htmlString = "<p><b>bold</b></p><p><i>italic</i></p>";
+console.log("Processing string with default options");
+console.log(htmlToText.fromString(htmlString));
+
+console.log("Processing string with custom options");
+console.log(htmlToText.fromString(htmlString, htmlOptions));
+
diff --git a/html-to-text/html-to-text.d.ts b/html-to-text/html-to-text.d.ts
new file mode 100644
index 000000000..ce02e4bfe
--- /dev/null
+++ b/html-to-text/html-to-text.d.ts
@@ -0,0 +1,84 @@
+// Type definitions for html-to-text v1.4.0
+// Project: https://github.com/werk85/node-html-to-text
+// Definitions by: Eryk Warren <https://github.com/erykwarren/>
+// Definitions: https://github.com/DefinitelyTyped/html-to-text
+
+interface HtmlToTextStatic {
+    /**
+     * Convert html content of file to text
+     *
+     * @param file String with the path of the html file to convert
+     * @param options Hash of options
+     * @param callback Function with signature function(err, result) called when the conversion is completed
+     *
+     */
+    fromFile(file: string, options: HtmlToTextOptions, callback: Function): void;
+    
+    /**
+     * Convert html content of file to text with the default options.
+     *
+     * @param file String with the path of the html file to convert
+     * @param callback Function with signature function(err, result) called when the conversion is completed
+     *
+     */
+    fromFile(file: string, callback: Function): void;
+    
+    /**
+     * Convert html string to text
+     *
+     * @param file String with the path of the html file to convert
+     * @param options Hash of options
+     *
+     * @return String with the converted text.
+     */
+    fromString(str: string, options?: HtmlToTextOptions): string;
+}
+
+interface HtmlToTextOptions {
+    /**
+     * Defines after how many chars a line break should follow in p elements.
+     * Set to null or false to disable word-wrapping. Default: 80
+     */
+    wordwrap?: number;
+
+    /**
+     *  Allows to select certain tables by the class or id attribute from the HTML
+     *  document. This is necessary because the majority of HTML E-Mails uses a
+     *  table based layout. Prefix your table selectors with an . for the class
+     *  and with a # for the id attribute. All other tables are ignored.
+     *   You can assign true to this attribute to select all tables. Default: []     
+     */
+    tables?: Array<string> | boolean;
+
+    /**
+     *  By default links are translated the following
+     *      <a href='link'>text</a> => becomes => text [link].
+     *  If this option is set to true and link and text are the same,
+     *  [link] will be hidden and only text visible.
+     */
+    hideLinkHrefIfSameAsText?: boolean;
+
+    /**
+     *  Allows you to specify the server host for href attributes, where the links start at the root (/).
+     *  For example, linkHrefBaseUrl = 'http://asdf.com' and <a href='/dir/subdir'>...</a>
+     *  the link in the text will be http://asdf.com/dir/subdir.
+     *  Keep in mind that linkHrefBaseUrl shouldn't end with a /.
+     */
+    linkHrefBaseUrl?: string;
+
+    /**
+     *  Ignore all document links if true.
+     */
+    ignoreHref?: boolean;
+
+    /**
+     *  Ignore all document images if true.
+     */
+    ignoreImage?: boolean;
+}
+
+declare module "html-to-text" {
+    export = htmlToText;
+}
+
+declare var htmlToText: HtmlToTextStatic;
diff --git a/inherits/inherits-tests.ts b/inherits/inherits-tests.ts
new file mode 100644
index 000000000..7d05a7b0b
--- /dev/null
+++ b/inherits/inherits-tests.ts
@@ -0,0 +1,7 @@
+/// <reference path="./inherits.d.ts" />
+
+import inherits = require('inherits');
+
+let any: any;
+
+inherits(any, any);
diff --git a/inherits/inherits.d.ts b/inherits/inherits.d.ts
new file mode 100644
index 000000000..3028ddc00
--- /dev/null
+++ b/inherits/inherits.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for inherits
+// Project: https://github.com/isaacs/inherits
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "inherits" {
+	import {inherits} from "util";
+	export = inherits;
+}
diff --git a/intro.js/intro.js-tests.ts b/intro.js/intro.js-tests.ts
new file mode 100644
index 000000000..b8e8126ae
--- /dev/null
+++ b/intro.js/intro.js-tests.ts
@@ -0,0 +1,54 @@
+/// <reference path="intro.js.d.ts" />
+
+var intro = introJs();
+
+intro.setOption('doneLabel', 'Next page');
+intro.setOptions({
+    steps: [
+        {
+            intro: "Hello world!"
+        },
+        {
+            element: document.querySelector('#step1') as HTMLElement,
+            intro  : "This is a tooltip."
+        },
+        {
+            element : document.querySelectorAll('#step2')[0] as HTMLElement,
+            intro   : "Ok, wasn't that fun?",
+            position: 'right'
+        },
+        {
+            element : '#step3',
+            intro   : 'More features, more fun.',
+            position: 'left'
+        },
+        {
+            element : '#step4',
+            intro   : "Another step.",
+            position: 'bottom'
+        },
+        {
+            element: '#step5',
+            intro  : 'Get it, use it.'
+        }
+    ]
+});
+
+intro.start()
+    .nextStep()
+    .previousStep()
+    .goToStep(2)
+    .exit()
+    .refresh()
+    .onbeforechange(function (element) {
+        element.getAttribute('class');
+    })
+    .onafterchange(function (element) {
+        element.getAttribute('class');
+    })
+    .onchange(function () {
+        alert('Changed');
+    })
+    .oncomplete(function () {
+        alert('Done');
+    });
diff --git a/intro.js/intro.js.d.ts b/intro.js/intro.js.d.ts
new file mode 100644
index 000000000..15a73f517
--- /dev/null
+++ b/intro.js/intro.js.d.ts
@@ -0,0 +1,70 @@
+// Type definitions for intro.js 1.0.0
+// Project: https://github.com/usablica/intro.js
+// Definitions by: Maxime Fabre <https://github.com/anahkiasen/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module IntroJs {
+    enum Positions {
+        top,
+        left,
+        right,
+        bottom
+    }
+
+    interface Step {
+        intro: string;
+        element?: string|HTMLElement;
+        position?: string|Positions;
+    }
+
+    interface Options {
+        nextLabel?: string;
+        prevLabel?: string;
+        skipLabel?: string;
+        doneLabel?: string;
+        tooltipPosition?: string;
+        tooltipClass?: string;
+        highlightClass?: string;
+        exitOnEsc?: boolean;
+        exitOnOverlayClick?: boolean;
+        showStepNumbers?: boolean;
+        keyboardNavigation?: boolean;
+        showButtons?: boolean;
+        showBullets?: boolean;
+        showProgress?: boolean;
+        scrollToElement?: boolean;
+        overlayOpacity?: number;
+        positionPrecedence?: string[];
+        disableInteraction?: boolean;
+        steps: Step[];
+    }
+
+    interface IntroJs {
+        start(): IntroJs;
+        exit(): IntroJs;
+
+        goToStep(step: number): IntroJs;
+        nextStep(): IntroJs;
+        previousStep(): IntroJs;
+
+        refresh(): IntroJs;
+
+        setOption(option: string, value: string|number): IntroJs;
+        setOptions(options: Options): IntroJs;
+
+        onexit(callback: Function): IntroJs;
+        onbeforechange(callback: (element: HTMLElement) => any): IntroJs;
+        onafterchange(callback: (element: HTMLElement) => any): IntroJs;
+        onchange(callback: Function): IntroJs;
+        oncomplete(callback: Function): IntroJs;
+    }
+
+    interface Factory {
+        (element?: string): IntroJs;
+    }
+}
+
+declare var introJs: IntroJs.Factory;
+declare module 'intro.js' {
+    export = IntroJs;
+}
diff --git a/ionic/ionic-tests.ts b/ionic/ionic-tests.ts
index ee8647b08..c68846715 100644
--- a/ionic/ionic-tests.ts
+++ b/ionic/ionic-tests.ts
@@ -84,13 +84,19 @@ class IonicTestController {
 
     private testActionSheet(): void {
         var closeActionSheetFn: ()=>void = this.$ionicActionSheet.show({
-            buttons: [],
+            buttons: [{ text: 'A button' }],
             titleText: "titleText",
             cancelText: "cancelText",
             destructiveText: "destructiveText",
             cancel: ()=>{ console.log("cancel"); },
-            buttonClicked: ()=>{ console.log("buttonClicked"); },
-            destructiveButtonClicked: ()=>{ console.log("destructiveButtonClicked"); },
+            buttonClicked: (index)=>{ 
+                console.log("buttonClicked");
+                return index === 0;
+            },
+            destructiveButtonClicked: ()=>{
+                console.log("destructiveButtonClicked");
+                return false;
+            },
             cancelOnStateChange: true,
             cssClass: "cssClass"
         });
@@ -249,7 +255,7 @@ class IonicTestController {
             okType: "okType",
             cancelText: "Cancel",
             cancelType: "cancelType"
-        }).then(() => console.log("popover shown"))
+        }).then((result) => console.log(result === true ? "confirmed": "cancelled"))
         this.$ionicPopup.confirm({
             title: "title",
             subTitle: "subTitle",
diff --git a/ionic/ionic.d.ts b/ionic/ionic.d.ts
index 688a253ed..bb009df51 100644
--- a/ionic/ionic.d.ts
+++ b/ionic/ionic.d.ts
@@ -102,14 +102,17 @@ declare module ionic {
         interface IonicActionSheetService {
             show(options: IonicActionSheetOptions): ()=>void;
         }
+        interface IonicActionSheetButton {
+            text: string;
+        }
         interface IonicActionSheetOptions {
-            buttons?: Array<any>;
+            buttons?: Array<IonicActionSheetButton>;
             titleText?: string;
             cancelText?: string;
             destructiveText?: string;
             cancel?: ()=>any;
-            buttonClicked?: (index: any)=>any;
-            destructiveButtonClicked?: ()=>any;
+            buttonClicked?: (index: number)=>boolean;
+            destructiveButtonClicked?: ()=>boolean;
             cancelOnStateChange?: boolean;
             cssClass?: string;
         }
@@ -246,10 +249,13 @@ declare module ionic {
         interface IonicPopupService {
             show(options: IonicPopupFullOptions): IonicPopupPromise;
             alert(options: IonicPopupAlertOptions): IonicPopupPromise;
-            confirm(options: IonicPopupConfirmOptions): IonicPopupPromise;
+            confirm(options: IonicPopupConfirmOptions): IonicPopupConfirmPromise;
             prompt(options: IonicPopupPromptOptions): IonicPopupPromise;
         }
 
+        interface IonicPopupConfirmPromise extends ng.IPromise<boolean> {
+            close(value?: boolean): void;
+        }
         interface IonicPopupPromise extends ng.IPromise<any> {
             close(value?: any): any;
         }
diff --git a/jake/jake.d.ts b/jake/jake.d.ts
index 1812b818b..95614374c 100644
--- a/jake/jake.d.ts
+++ b/jake/jake.d.ts
@@ -40,6 +40,16 @@ declare function fail(...err:any[]): void;
  */
 declare function file(name:string, prereqs?:string[], action?:()=>void, opts?:jake.FileTaskOptions): jake.FileTask;
 
+/**
+ * Creates Jake FileTask from regex patterns
+ * @name name/pattern of the Task
+ * @param source calculated from the name pattern
+ * @param prereqs Prerequisites to be run before this task
+ * @param action The action to perform for this task
+ * @param opts Perform this task asynchronously. If you flag a task with this option, you must call the global `complete` method inside the task's action, for execution to proceed to the next task.
+ */
+declare function rule(pattern: RegExp, source: string | { (name: string): string; }, prereqs?: string[], action?: () => void, opts?: jake.TaskOptions): void;
+
 /**
  * Creates a namespace which allows logical grouping of tasks, and prevents name-collisions with task-names. Namespaces can be nested inside of other namespaces.
  * @param name The name of the namespace
@@ -185,6 +195,11 @@ declare module jake{
 		 * @default false
 		 */
 		async?: boolean;
+		
+		/**
+		 * number of parllel async tasks
+		*/
+		parallelLimit?: number;
 	}
 
 	/**
diff --git a/jasmine-expect/jasmine-expect-tests.ts b/jasmine-expect/jasmine-expect-tests.ts
new file mode 100644
index 000000000..ec54269f4
--- /dev/null
+++ b/jasmine-expect/jasmine-expect-tests.ts
@@ -0,0 +1,1994 @@
+/// <reference path="../jasmine/jasmine.d.ts" />
+/// <reference path="jasmine-expect.d.ts" />
+
+// Taken directly from the test directory of the original repo
+
+declare var describeWhenNotArray: (arr: string) => void;
+declare var describeToBeArrayOfX: (arr: string, descriptor: {}) => void;
+declare var describeToHaveArrayX: (arr: string, descriptor: () => void) => void;
+declare var describeToHaveX: (arr: string, descriptor: () => void) => void;
+declare var describeToHaveBooleanX: (arr: string, descriptor: () => void) => void;
+declare var badReference: { someValue: any };
+var _undefined: any = undefined;
+
+describe('toBeAfter', function() {
+  describe('when invoked', function() {
+    describe('when value is a Date', function() {
+      describe('when date occurs after another', function() {
+        it('should confirm', function() {
+          expect(new Date('2013-01-01T01:00:00.000Z')).toBeAfter(new Date('2013-01-01T00:00:00.000Z'));
+        });
+      });
+      describe('when date does NOT occur after another', function() {
+        it('should deny', function() {
+          expect(new Date('2013-01-01T00:00:00.000Z')).not.toBeAfter(new Date('2013-01-01T01:00:00.000Z'));
+        });
+      });
+    });
+  });
+});
+
+
+describe('toBeArray', function() {
+  describe('when invoked', function() {
+    describe('when subject is a true Array', function() {
+      it('should confirm', function() {
+        expect([]).toBeArray();
+        expect(new Array()).toBeArray();
+      });
+    });
+    describeWhenNotArray('toBeArray');
+  });
+});
+
+
+describe('toBeArrayOfBooleans', function() {
+  describeToBeArrayOfX('toBeArrayOfBooleans', {
+    type: 'Boolean',
+    whenValid: function() {
+      expect([true]).toBeArrayOfBooleans();
+      expect([new Boolean(true)]).toBeArrayOfBooleans();
+      expect([new Boolean(false)]).toBeArrayOfBooleans();
+      expect([false, true]).toBeArrayOfBooleans();
+    },
+    whenInvalid: function() {
+      expect([null]).not.toBeArrayOfBooleans();
+    },
+    whenMixed: function() {
+      expect([null, false]).not.toBeArrayOfBooleans();
+      expect([null, true]).not.toBeArrayOfBooleans();
+    }
+  });
+});
+
+
+describe('toBeArrayOfNumbers', function() {
+  describeToBeArrayOfX('toBeArrayOfNumbers', {
+    type: 'Number',
+    whenValid: function() {
+      expect([1]).toBeArrayOfNumbers();
+      expect([new Number(1)]).toBeArrayOfNumbers();
+      expect([new Number(0)]).toBeArrayOfNumbers();
+      expect([0, 1]).toBeArrayOfNumbers();
+    },
+    whenInvalid: function() {
+      expect([null]).not.toBeArrayOfNumbers();
+    },
+    whenMixed: function() {
+      expect([null, 0]).not.toBeArrayOfNumbers();
+    }
+  });
+});
+
+describe('toBeArrayOfObjects', function() {
+  describeToBeArrayOfX('toBeArrayOfObjects', {
+    type: 'Object',
+    whenValid: function() {
+      expect([{}, {}]).toBeArrayOfObjects();
+    },
+    whenInvalid: function() {
+      expect([null]).not.toBeArrayOfObjects();
+      expect(['Object']).not.toBeArrayOfObjects();
+      expect(['[object Object]']).not.toBeArrayOfObjects();
+    },
+    whenMixed: function() {
+      expect([null, {}]).not.toBeArrayOfObjects();
+    }
+  });
+});
+
+describe('toBeArrayOfSize', function() {
+  describe('when invoked', function() {
+    describe('when subject is a true Array', function() {
+      describe('when subject has the expected number of members', function() {
+        it('should confirm', function() {
+          expect([]).toBeArrayOfSize(0);
+          expect([null]).toBeArrayOfSize(1);
+          expect([false, false]).toBeArrayOfSize(2);
+          expect([_undefined, _undefined]).toBeArrayOfSize(2);
+        });
+      });
+      describe('when subject has an unexpected number of members', function() {
+        it('should deny', function() {
+          expect([]).not.toBeArrayOfSize(1);
+          expect([null]).not.toBeArrayOfSize(0);
+          expect([true, true]).not.toBeArrayOfSize(1);
+        });
+      });
+    });
+    describeWhenNotArray('toBeArrayOfSize');
+  });
+});
+
+
+describe('toBeArrayOfStrings', function() {
+  describeToBeArrayOfX('toBeArrayOfStrings', {
+    type: 'String',
+    whenValid: function() {
+      expect(['truthy']).toBeArrayOfStrings();
+      expect([new String('truthy')]).toBeArrayOfStrings();
+      expect([new String('')]).toBeArrayOfStrings();
+      expect(['', 'truthy']).toBeArrayOfStrings();
+    },
+    whenInvalid: function() {
+      expect([null]).not.toBeArrayOfStrings();
+    },
+    whenMixed: function() {
+      expect([null, '']).not.toBeArrayOfStrings();
+    }
+  });
+});
+
+describe('toBeBefore', function() {
+  describe('when invoked', function() {
+    describe('when value is a Date', function() {
+      describe('when date occurs before another', function() {
+        it('should confirm', function() {
+          expect(new Date('2013-01-01T00:00:00.000Z')).toBeBefore(new Date('2013-01-01T01:00:00.000Z'));
+        });
+      });
+      describe('when date does NOT occur before another', function() {
+        it('should deny', function() {
+          expect(new Date('2013-01-01T01:00:00.000Z')).not.toBeBefore(new Date('2013-01-01T00:00:00.000Z'));
+        });
+      });
+    });
+  });
+});
+
+
+describe('toBeBoolean', function() {
+  describe('when invoked', function() {
+    describe('when subject not only truthy or falsy, but a boolean', function() {
+      it('should confirm', function() {
+        expect(true).toBeBoolean();
+        expect(false).toBeBoolean();
+        expect(new Boolean(true)).toBeBoolean();
+        expect(new Boolean(false)).toBeBoolean();
+      });
+    });
+    describe('when subject is truthy or falsy', function() {
+      it('should deny', function() {
+        expect(1).not.toBeBoolean();
+        expect(0).not.toBeBoolean();
+      });
+    });
+  });
+});
+
+describe('toBeCalculable', function() {
+  describe('when invoked', function() {
+    describe('when subject CAN be coerced to be used in mathematical operations', function() {
+      it('should confirm', function() {
+        expect('1').toBeCalculable();
+        expect('').toBeCalculable();
+        expect(null).toBeCalculable();
+      });
+    });
+    describe('when subject can NOT be coerced by JavaScript to be used in mathematical operations', function() {
+      it('should deny', function() {
+        expect({}).not.toBeCalculable();
+        expect(NaN).not.toBeCalculable();
+      });
+    });
+  });
+});
+
+describe('toBeDate', function() {
+  describe('when invoked', function() {
+    describe('when value is an instance of Date', function() {
+      it('should confirm', function() {
+        expect(new Date()).toBeDate();
+      });
+    });
+    describe('when value is NOT an instance of Date', function() {
+      it('should deny', function() {
+        expect(null).not.toBeDate();
+      });
+    });
+  });
+});
+
+describe('toBeEmptyArray', function() {
+  describe('when invoked', function() {
+    describe('when subject is a true Array', function() {
+      describe('when subject has members', function() {
+        it('should confirm', function() {
+          expect([]).toBeEmptyArray();
+        });
+      });
+      describe('when subject has no members', function() {
+        it('should deny', function() {
+          expect([null]).not.toBeEmptyArray();
+          expect(['']).not.toBeEmptyArray();
+          expect([1]).not.toBeEmptyArray();
+          expect([true]).not.toBeEmptyArray();
+          expect([false]).not.toBeEmptyArray();
+        });
+      });
+    });
+    describeWhenNotArray('toBeEmptyArray');
+  });
+});
+
+describe('toBeEmptyObject', function() {
+  beforeEach(function() {
+    this.Foo = function() { };
+  });
+  describe('when invoked', function() {
+    describe('when subject IS an Object with no instance members', function() {
+      beforeEach(function() {
+        this.Foo.prototype = {
+          b: 2
+        };
+      });
+      it('should confirm', function() {
+        expect(new this.Foo()).toBeEmptyObject();
+        expect({}).toBeEmptyObject();
+      });
+    });
+    describe('when subject is NOT an Object with no instance members', function() {
+      it('should deny', function() {
+        expect({
+          a: 1
+        }).not.toBeEmptyObject();
+        expect(null).not.toBeNonEmptyObject();
+      });
+    });
+  });
+});
+
+describe('toBeEmptyString', function() {
+  describe('when invoked', function() {
+    describe('when subject IS a string with no characters', function() {
+      it('should confirm', function() {
+        expect('').toBeEmptyString();
+      });
+    });
+    describe('when subject is NOT a string with no characters', function() {
+      it('should deny', function() {
+        expect(' ').not.toBeEmptyString();
+      });
+    });
+  });
+});
+
+describe('toBeEvenNumber', function() {
+  describe('when invoked', function() {
+    describe('when subject IS an even number', function() {
+      it('should confirm', function() {
+        expect(2).toBeEvenNumber();
+      });
+    });
+    describe('when subject is NOT an even number', function() {
+      it('should deny', function() {
+        expect(1).not.toBeEvenNumber();
+        expect(NaN).not.toBeEvenNumber();
+      });
+    });
+  });
+});
+
+
+describe('toBeFalse', function() {
+  describe('when invoked', function() {
+    describe('when subject is not only falsy, but a boolean false', function() {
+      it('should confirm', function() {
+        expect(false).toBeFalse();
+        expect(new Boolean(false)).toBeFalse();
+      });
+    });
+    describe('when subject is falsy', function() {
+      it('should deny', function() {
+        expect(1).not.toBeFalse();
+      });
+    });
+  });
+});
+
+describe('toBeFunction', function() {
+  describe('when invoked', function() {
+    describe('when subject IS a function', function() {
+      it('should confirm', function() {
+        expect(function() { }).toBeFunction();
+      });
+    });
+    describe('when subject is NOT a function', function() {
+      it('should deny', function() {
+        expect(/regexp/).not.toBeFunction();
+      });
+    });
+  });
+});
+
+describe('toBeHtmlString', function() {
+  describe('when invoked', function() {
+    describe('when subject IS a string of HTML markup', function() {
+      beforeEach(function() {
+        this.ngMultiLine = '';
+        this.ngMultiLine += '<a data-ng-href="//www.google.com" data-ng-click="launchApp($event)" target="_blank" class="ng-binding" href="//www.google.com">';
+        this.ngMultiLine += '\n';
+        this.ngMultiLine += '  Watch with Google TV';
+        this.ngMultiLine += '\n';
+        this.ngMultiLine += '</a>';
+        this.ngMultiLine += '\n';
+      });
+      it('should confirm', function() {
+        expect('<element>text</element>').toBeHtmlString();
+        expect('<a data-ng-href="//foo.com" data-ng-click="bar($event)">baz</a>').toBeHtmlString();
+        expect('<div ng-if="foo > bar || bar < foo && baz == bar"></div>').toBeHtmlString();
+        expect('<li ng-if="foo > bar || bar < foo && baz == bar">').toBeHtmlString();
+        expect(this.ngMultiLine).toBeHtmlString();
+      });
+    });
+    describe('when subject is NOT a string of HTML markup', function() {
+      it('should deny', function() {
+        expect('div').not.toBeHtmlString();
+        expect(null).not.toBeHtmlString();
+      });
+    });
+  });
+});
+
+describe('toBeIso8601', function() {
+  describe('when invoked', function() {
+    describe('when value is a Date String conforming to the ISO 8601 standard', function() {
+      describe('when specified date is valid', function() {
+        it('should confirm', function() {
+          expect('2013-07-08T07:29:15.863Z').toBeIso8601();
+          expect('2013-07-08T07:29:15.863').toBeIso8601();
+          expect('2013-07-08T07:29:15').toBeIso8601();
+          expect('2013-07-08T07:29').toBeIso8601();
+          expect('2013-07-08').toBeIso8601();
+        });
+      });
+      describe('when specified date is NOT valid', function() {
+        it('should deny', function() {
+          expect('2013-99-12T00:00:00.000Z').not.toBeIso8601();
+          expect('2013-12-99T00:00:00.000Z').not.toBeIso8601();
+          expect('2013-01-01T99:00:00.000Z').not.toBeIso8601();
+          expect('2013-01-01T99:99:00.000Z').not.toBeIso8601();
+          expect('2013-01-01T00:00:99.000Z').not.toBeIso8601();
+        });
+      });
+    });
+    describe('when value is a String NOT conforming to the ISO 8601 standard', function() {
+      it('should deny', function() {
+        expect('2013-07-08T07:29:15.').not.toBeIso8601();
+        expect('2013-07-08T07:29:').not.toBeIso8601();
+        expect('2013-07-08T07:2').not.toBeIso8601();
+        expect('2013-07-08T07:').not.toBeIso8601();
+        expect('2013-07-08T07').not.toBeIso8601();
+        expect('2013-07-08T').not.toBeIso8601();
+        expect('2013-07-0').not.toBeIso8601();
+        expect('2013-07-').not.toBeIso8601();
+        expect('2013-07').not.toBeIso8601();
+        expect('2013-0').not.toBeIso8601();
+        expect('2013-').not.toBeIso8601();
+        expect('2013').not.toBeIso8601();
+        expect('201').not.toBeIso8601();
+        expect('20').not.toBeIso8601();
+        expect('2').not.toBeIso8601();
+        expect('').not.toBeIso8601();
+      });
+    });
+  });
+});
+var _undefined;
+
+describe('toBeJsonString', function() {
+  describe('when invoked', function() {
+    describe('when subject IS a string of parseable JSON', function() {
+      it('should confirm', function() {
+        expect('{}').toBeJsonString();
+        expect('[]').toBeJsonString();
+        expect('[1]').toBeJsonString();
+      });
+    });
+    describe('when subject is NOT a string of parseable JSON', function() {
+      it('should deny', function() {
+        expect('[1,]').not.toBeJsonString();
+        expect('<>').not.toBeJsonString();
+        expect(null).not.toBeJsonString();
+        expect('').not.toBeJsonString();
+        expect(_undefined).not.toBeJsonString();
+      });
+    });
+  });
+});
+
+describe('toBeLongerThan', function() {
+  describe('when invoked', function() {
+    describe('when the subject and comparison ARE both strings', function() {
+      describe('when the subject IS longer than the comparision string', function() {
+        it('should confirm', function() {
+          expect('abc').toBeLongerThan('ab');
+          expect('a').toBeLongerThan('');
+        });
+      });
+      describe('when the subject is NOT longer than the comparision string', function() {
+        it('should deny', function() {
+          expect('ab').not.toBeLongerThan('abc');
+          expect('').not.toBeLongerThan('a');
+        });
+      });
+    });
+    describe('when the subject and comparison are NOT both strings', function() {
+      it('should deny (we are asserting the relative lengths of two strings)', function() {
+        expect('truthy').not.toBeLongerThan(_undefined);
+        expect(_undefined).not.toBeLongerThan('truthy');
+        expect('').not.toBeLongerThan(_undefined);
+        expect(_undefined).not.toBeLongerThan('');
+      });
+    });
+  });
+});
+
+describe('toBeNonEmptyArray', function() {
+  describe('when invoked', function() {
+    describe('when subject is a true Array', function() {
+      describe('when subject has members', function() {
+        it('should confirm', function() {
+          expect([null]).toBeNonEmptyArray();
+          expect([_undefined]).toBeNonEmptyArray();
+          expect(['']).toBeNonEmptyArray();
+        });
+      });
+      describe('when subject has no members', function() {
+        it('should deny', function() {
+          expect([]).not.toBeNonEmptyArray();
+        });
+      });
+    });
+    describeWhenNotArray('toBeNonEmptyArray');
+  });
+});
+
+describe('toBeNonEmptyObject', function() {
+  beforeEach(function() {
+    this.Foo = function() { };
+  });
+  describe('when invoked', function() {
+    describe('when subject IS an Object with at least one instance member', function() {
+      it('should confirm', function() {
+        expect({
+          a: 1
+        }).toBeNonEmptyObject();
+      });
+    });
+    describe('when subject is NOT an Object with at least one instance member', function() {
+      beforeEach(function() {
+        this.Foo.prototype = {
+          b: 2
+        };
+      });
+      it('should deny', function() {
+        expect(new this.Foo()).not.toBeNonEmptyObject();
+        expect({}).not.toBeNonEmptyObject();
+        expect(null).not.toBeNonEmptyObject();
+      });
+    });
+  });
+});
+
+describe('toBeNonEmptyString', function() {
+  describe('when invoked', function() {
+    describe('when subject IS a string with at least one character', function() {
+      it('should confirm', function() {
+        expect(' ').toBeNonEmptyString();
+      });
+    });
+    describe('when subject is NOT a string with at least one character', function() {
+      it('should deny', function() {
+        expect('').not.toBeNonEmptyString();
+        expect(null).not.toBeNonEmptyString();
+      });
+    });
+  });
+});
+
+describe('toBeNumber', function() {
+  describe('when invoked', function() {
+    describe('when subject IS a number', function() {
+      it('should confirm', function() {
+        expect(1).toBeNumber();
+        expect(1.11).toBeNumber();
+        expect(1e3).toBeNumber();
+        expect(0.11).toBeNumber();
+        expect(-11).toBeNumber();
+      });
+    });
+    describe('when subject is NOT a number', function() {
+      it('should deny', function() {
+        expect('1').not.toBeNumber();
+        expect(NaN).not.toBeNumber();
+      });
+    });
+  });
+});
+
+
+describe('toBeObject', function() {
+  beforeEach(function() {
+    this.Foo = function() { };
+  });
+  describe('when invoked', function() {
+    describe('when subject IS an Object', function() {
+      it('should confirm', function() {
+        expect(new Object()).toBeObject();
+        expect(new this.Foo()).toBeObject();
+        expect({}).toBeObject();
+      });
+    });
+    describe('when subject is NOT an Object', function() {
+      it('should deny', function() {
+        expect(null).not.toBeObject();
+        expect(123).not.toBeObject();
+        expect('[object Object]').not.toBeObject();
+      });
+    });
+  });
+});
+
+describe('toBeOddNumber', function() {
+  describe('when invoked', function() {
+    describe('when subject IS an odd number', function() {
+      it('should confirm', function() {
+        expect(1).toBeOddNumber();
+      });
+    });
+    describe('when subject is NOT an odd number', function() {
+      it('should deny', function() {
+        expect(2).not.toBeOddNumber();
+        expect(NaN).not.toBeOddNumber();
+      });
+    });
+  });
+});
+var _undefined;
+
+describe('toBeSameLengthAs', function() {
+  describe('when invoked', function() {
+    describe('when the subject and comparison ARE both strings', function() {
+      describe('when the subject IS the same length as the comparision string', function() {
+        it('should confirm', function() {
+          expect('ab').toBeSameLengthAs('ab');
+        });
+      });
+      describe('when the subject is NOT the same length as the comparision string', function() {
+        it('should deny', function() {
+          expect('abc').not.toBeSameLengthAs('ab');
+          expect('a').not.toBeSameLengthAs('');
+          expect('').not.toBeSameLengthAs('a');
+        });
+      });
+    });
+    describe('when the subject and comparison are NOT both strings', function() {
+      it('should deny (we are asserting the relative lengths of two strings)', function() {
+        expect('truthy').not.toBeSameLengthAs(_undefined);
+        expect(_undefined).not.toBeSameLengthAs('truthy');
+        expect('').not.toBeSameLengthAs(_undefined);
+        expect(_undefined).not.toBeSameLengthAs('');
+      });
+    });
+  });
+});
+var _undefined;
+
+describe('toBeShorterThan', function() {
+  describe('when invoked', function() {
+    describe('when the subject and comparison ARE both strings', function() {
+      describe('when the subject IS shorter than the comparision string', function() {
+        it('should confirm', function() {
+          expect('ab').toBeShorterThan('abc');
+          expect('').toBeShorterThan('a');
+        });
+      });
+      describe('when the subject is NOT shorter than the comparision string', function() {
+        it('should deny', function() {
+          expect('abc').not.toBeShorterThan('ab');
+          expect('a').not.toBeShorterThan('');
+        });
+      });
+    });
+    describe('when the subject and comparison are NOT both strings', function() {
+      it('should deny (we are asserting the relative lengths of two strings)', function() {
+        expect('truthy').not.toBeShorterThan(_undefined);
+        expect(_undefined).not.toBeShorterThan('truthy');
+        expect('').not.toBeShorterThan(_undefined);
+        expect(_undefined).not.toBeShorterThan('');
+      });
+    });
+  });
+});
+
+describe('toBeString', function() {
+  describe('when invoked', function() {
+    describe('when subject IS a string of any length', function() {
+      it('should confirm', function() {
+        expect('').toBeString();
+        expect(' ').toBeString();
+      });
+    });
+    describe('when subject is NOT a string of any length', function() {
+      it('should deny', function() {
+        expect(null).not.toBeString();
+      });
+    });
+  });
+});
+
+
+describe('toBeTrue', function() {
+  describe('when invoked', function() {
+    describe('when subject is not only truthy, but a boolean true', function() {
+      it('should confirm', function() {
+        expect(true).toBeTrue();
+        expect(new Boolean(true)).toBeTrue();
+      });
+    });
+    describe('when subject is truthy', function() {
+      it('should deny', function() {
+        expect(1).not.toBeTrue();
+      });
+    });
+  });
+});
+
+describe('toBeWhitespace', function() {
+  describe('when invoked', function() {
+    describe('when subject IS a string containing only tabs, spaces, returns etc', function() {
+      it('should confirm', function() {
+        expect(' ').toBeWhitespace();
+        expect('').toBeWhitespace();
+      });
+    });
+    describe('when subject is NOT a string containing only tabs, spaces, returns etc', function() {
+      it('should deny', function() {
+        expect('has-no-whitespace').not.toBeWhitespace();
+        expect('has whitespace').not.toBeWhitespace();
+        expect(null).not.toBeWhitespace();
+      });
+    });
+  });
+});
+
+describe('toBeWholeNumber', function() {
+  describe('when invoked', function() {
+    describe('when subject IS a number with no positive decimal places', function() {
+      it('should confirm', function() {
+        expect(1).toBeWholeNumber();
+        expect(0).toBeWholeNumber();
+        expect(0.0).toBeWholeNumber();
+      });
+    });
+    describe('when subject is NOT a number with no positive decimal places', function() {
+      it('should deny', function() {
+        expect(NaN).not.toBeWholeNumber();
+        expect(1.1).not.toBeWholeNumber();
+        expect(0.1).not.toBeWholeNumber();
+      });
+    });
+  });
+});
+
+describe('toBeWithinRange', function() {
+  describe('when invoked', function() {
+    describe('when subject IS a number >= floor and <= ceiling', function() {
+      it('should confirm', function() {
+        expect(0).toBeWithinRange(0, 2);
+        expect(1).toBeWithinRange(0, 2);
+        expect(2).toBeWithinRange(0, 2);
+      });
+    });
+    describe('when subject is NOT a number >= floor and <= ceiling', function() {
+      it('should deny', function() {
+        expect(-3).not.toBeWithinRange(0, 2);
+        expect(-2).not.toBeWithinRange(0, 2);
+        expect(-1).not.toBeWithinRange(0, 2);
+        expect(3).not.toBeWithinRange(0, 2);
+        expect(NaN).not.toBeWithinRange(0, 2);
+      });
+    });
+  });
+});
+var _undefined;
+
+describe('toEndWith', function() {
+  describe('when invoked', function() {
+    describe('when subject is NOT an undefined or empty string', function() {
+      describe('when subject is a string whose trailing characters match the expected string', function() {
+        it('should confirm', function() {
+          expect('jamie').toEndWith('mie');
+        });
+      });
+      describe('when subject is a string whose trailing characters DO NOT match the expected string', function() {
+        it('should deny', function() {
+          expect('jamie ').not.toEndWith('mie');
+          expect('jamiE').not.toEndWith('mie');
+        });
+      });
+    });
+    describe('when subject IS an undefined or empty string', function() {
+      it('should deny', function() {
+        expect('').not.toEndWith('');
+        expect(_undefined).not.toEndWith('');
+        expect(_undefined).not.toEndWith('undefined');
+        expect('undefined').not.toEndWith(_undefined);
+      });
+    });
+  });
+});
+
+describe('toHaveArray', function() {
+  describeToHaveArrayX('toHaveArray', function() {
+    it('should confirm', function() {
+      expect({
+        memberName: []
+      }).toHaveArray('memberName');
+      expect({
+        memberName: [1, 2, 3]
+      }).toHaveArray('memberName');
+    });
+  });
+});
+
+
+describe('toHaveArrayOfBooleans', function() {
+  describeToHaveArrayX('toHaveArrayOfBooleans', function() {
+    describe('when named Array is empty', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: []
+        }).toHaveArrayOfBooleans('memberName');
+      });
+    });
+    describe('when named Array has items', function() {
+      describe('when all items are booleans', function() {
+        it('should confirm', function() {
+          expect({
+            memberName: [true]
+          }).toHaveArrayOfBooleans('memberName');
+          expect({
+            memberName: [new Boolean(true)]
+          }).toHaveArrayOfBooleans('memberName');
+          expect({
+            memberName: [new Boolean(false)]
+          }).toHaveArrayOfBooleans('memberName');
+          expect({
+            memberName: [false, true]
+          }).toHaveArrayOfBooleans('memberName');
+        });
+      });
+      describe('when any item is not a boolean', function() {
+        it('should deny', function() {
+          expect({
+            memberName: [null]
+          }).not.toHaveArrayOfBooleans('memberName');
+          expect({
+            memberName: [null, false]
+          }).not.toHaveArrayOfBooleans('memberName');
+        });
+      });
+    });
+  });
+});
+
+
+describe('toHaveArrayOfNumbers', function() {
+  describeToHaveArrayX('toHaveArrayOfNumbers', function() {
+    describe('when named Array is empty', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: []
+        }).toHaveArrayOfNumbers('memberName');
+      });
+    });
+    describe('when named Array has items', function() {
+      describe('when all items are numbers', function() {
+        it('should confirm', function() {
+          expect({
+            memberName: [1]
+          }).toHaveArrayOfNumbers('memberName');
+          expect({
+            memberName: [new Number(1)]
+          }).toHaveArrayOfNumbers('memberName');
+          expect({
+            memberName: [new Number(0)]
+          }).toHaveArrayOfNumbers('memberName');
+          expect({
+            memberName: [0, 1]
+          }).toHaveArrayOfNumbers('memberName');
+        });
+      });
+      describe('when any item is not a number', function() {
+        it('should deny', function() {
+          expect({
+            memberName: [null]
+          }).not.toHaveArrayOfNumbers('memberName');
+          expect({
+            memberName: [null, 0]
+          }).not.toHaveArrayOfNumbers('memberName');
+        });
+      });
+    });
+  });
+});
+
+describe('toHaveArrayOfObjects', function() {
+  describeToHaveArrayX('toHaveArrayOfObjects', function() {
+    describe('when named Array is empty', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: []
+        }).toHaveArrayOfObjects('memberName');
+      });
+    });
+    describe('when named Array has items', function() {
+      describe('when all items are objects', function() {
+        it('should confirm', function() {
+          expect({
+            memberName: [{}]
+          }).toHaveArrayOfObjects('memberName');
+          expect({
+            memberName: [{}, {}]
+          }).toHaveArrayOfObjects('memberName');
+        });
+      });
+      describe('when any item is not an object', function() {
+        it('should deny', function() {
+          expect({
+            memberName: [null]
+          }).not.toHaveArrayOfObjects('memberName');
+          expect({
+            memberName: [null, {}]
+          }).not.toHaveArrayOfObjects('memberName');
+        });
+      });
+    });
+  });
+});
+
+describe('toHaveArrayOfSize', function() {
+  describeToHaveArrayX('toHaveArrayOfSize', function() {
+    describe('when number of expected items does not match', function() {
+      it('should deny', function() {
+        expect({
+          memberName: ''
+        }).not.toHaveArrayOfSize('memberName');
+        expect({
+          memberName: ['bar']
+        }).not.toHaveArrayOfSize('memberName', 0);
+      });
+    });
+    describe('when number of expected items does match', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: []
+        }).toHaveArrayOfSize('memberName', 0);
+        expect({
+          memberName: ['bar']
+        }).toHaveArrayOfSize('memberName', 1);
+        expect({
+          memberName: ['bar', 'baz']
+        }).toHaveArrayOfSize('memberName', 2);
+      });
+    });
+  });
+});
+
+
+describe('toHaveArrayOfStrings', function() {
+  describeToHaveArrayX('toHaveArrayOfStrings', function() {
+    describe('when named Array is empty', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: []
+        }).toHaveArrayOfStrings('memberName');
+      });
+    });
+    describe('when named Array has items', function() {
+      describe('when all items are strings', function() {
+        it('should confirm', function() {
+          expect({
+            memberName: ['truthy']
+          }).toHaveArrayOfStrings('memberName');
+          expect({
+            memberName: [new String('truthy')]
+          }).toHaveArrayOfStrings('memberName');
+          expect({
+            memberName: [new String('')]
+          }).toHaveArrayOfStrings('memberName');
+          expect({
+            memberName: ['', 'truthy']
+          }).toHaveArrayOfStrings('memberName');
+        });
+      });
+      describe('when any item is not a string', function() {
+        it('should deny', function() {
+          expect({
+            memberName: [null]
+          }).not.toHaveArrayOfStrings('memberName');
+          expect({
+            memberName: [null, '']
+          }).not.toHaveArrayOfStrings('memberName');
+        });
+      });
+    });
+  });
+});
+
+
+describe('toHaveBoolean', function() {
+  describeToHaveBooleanX('toHaveBoolean', function() {
+    describe('when primitive', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: true
+        }).toHaveBoolean('memberName');
+        expect({
+          memberName: false
+        }).toHaveBoolean('memberName');
+      });
+    });
+    describe('when Boolean object', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: new Boolean(true)
+        }).toHaveBoolean('memberName');
+        expect({
+          memberName: new Boolean(false)
+        }).toHaveBoolean('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveCalculable', function() {
+  describeToHaveX('toHaveCalculable', function() {
+    describe('when subject CAN be coerced to be used in mathematical operations', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: '1'
+        }).toHaveCalculable('memberName');
+        expect({
+          memberName: ''
+        }).toHaveCalculable('memberName');
+        expect({
+          memberName: null
+        }).toHaveCalculable('memberName');
+      });
+    });
+    describe('when subject can NOT be coerced by JavaScript to be used in mathematical operations', function() {
+      it('should deny', function() {
+        expect({
+          memberName: {}
+        }).not.toHaveCalculable('memberName');
+        expect({
+          memberName: NaN
+        }).not.toHaveCalculable('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveDate', function() {
+  var mockDate: any;
+  beforeEach(function() {
+    mockDate = {
+      any: new Date(),
+      early: new Date('2013-01-01T00:00:00.000Z'),
+      late: new Date('2013-01-01T01:00:00.000Z')
+    };
+  });
+  describeToHaveX('toHaveDate', function() {
+    describe('when member is an instance of Date', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: mockDate.any
+        }).toHaveDate('memberName');
+      });
+    });
+    describe('when member is NOT an instance of Date', function() {
+      it('should deny', function() {
+        expect({
+          memberName: null
+        }).not.toHaveDate('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveDateAfter', function() {
+  var mockDate: any;
+  beforeEach(function() {
+    mockDate = {
+      any: new Date(),
+      early: new Date('2013-01-01T00:00:00.000Z'),
+      late: new Date('2013-01-01T01:00:00.000Z')
+    };
+  });
+  describeToHaveX('toHaveDateAfter', function() {
+    describe('when member is an instance of Date', function() {
+      describe('when date occurs before another', function() {
+        it('should confirm', function() {
+          expect({
+            memberName: mockDate.late
+          }).toHaveDateAfter('memberName', mockDate.early);
+        });
+      });
+      describe('when date does NOT occur before another', function() {
+        it('should deny', function() {
+          expect({
+            memberName: mockDate.early
+          }).not.toHaveDateAfter('memberName', mockDate.late);
+        });
+      });
+    });
+    describe('when member is NOT an instance of Date', function() {
+      it('should deny', function() {
+        expect({
+          memberName: null
+        }).not.toHaveDateAfter('memberName', mockDate.any);
+      });
+    });
+  });
+});
+
+describeToHaveX('toHaveDateBefore', function() {
+  var mockDate: any;
+  beforeEach(function() {
+    mockDate = {
+      any: new Date(),
+      early: new Date('2013-01-01T00:00:00.000Z'),
+      late: new Date('2013-01-01T01:00:00.000Z')
+    };
+  });
+  describe('when member is an instance of Date', function() {
+    describe('when date occurs before another', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: mockDate.early
+        }).toHaveDateBefore('memberName', mockDate.late);
+      });
+    });
+    describe('when date does NOT occur before another', function() {
+      it('should deny', function() {
+        expect({
+          memberName: mockDate.late
+        }).not.toHaveDateBefore('memberName', mockDate.early);
+      });
+    });
+  });
+  describe('when member is NOT an instance of Date', function() {
+    it('should deny', function() {
+      expect({
+        memberName: null
+      }).not.toHaveDateBefore('memberName', mockDate.any);
+    });
+  });
+});
+
+describe('toHaveEmptyArray', function() {
+  describeToHaveArrayX('toHaveEmptyArray', function() {
+    describe('when named array has members', function() {
+      it('should deny', function() {
+        expect({
+          memberName: [1, 2, 3]
+        }).not.toHaveEmptyArray('memberName');
+        expect({
+          memberName: ''
+        }).not.toHaveEmptyArray('memberName');
+      });
+    });
+    describe('when named array has no members', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: []
+        }).toHaveEmptyArray('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveEmptyObject', function() {
+  beforeEach(function() {
+    this.Foo = function() { };
+  });
+  describeToHaveX('toHaveEmptyObject', function() {
+    describe('when subject IS an Object with no instance members', function() {
+      beforeEach(function() {
+        this.Foo.prototype = {
+          b: 2
+        };
+      });
+      it('should confirm', function() {
+        expect({
+          memberName: new this.Foo()
+        }).toHaveEmptyObject('memberName');
+        expect({
+          memberName: {}
+        }).toHaveEmptyObject('memberName');
+      });
+    });
+    describe('when subject is NOT an Object with no instance members', function() {
+      it('should deny', function() {
+        expect({
+          memberName: {
+            a: 1
+          }
+        }).not.toHaveEmptyObject('memberName');
+        expect({
+          memberName: null
+        }).not.toHaveNonEmptyObject('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveEmptyString', function() {
+  describeToHaveX('toHaveEmptyString', function() {
+    describe('when subject IS a string with no characters', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: ''
+        }).toHaveEmptyString('memberName');
+      });
+    });
+    describe('when subject is NOT a string with no characters', function() {
+      it('should deny', function() {
+        expect({
+          memberName: ' '
+        }).not.toHaveEmptyString('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveEvenNumber', function() {
+  describeToHaveX('toHaveEvenNumber', function() {
+    describe('when subject IS an even number', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: 2
+        }).toHaveEvenNumber('memberName');
+      });
+    });
+    describe('when subject is NOT an even number', function() {
+      it('should deny', function() {
+        expect({
+          memberName: 1
+        }).not.toHaveEvenNumber('memberName');
+        expect({
+          memberName: NaN
+        }).not.toHaveEvenNumber('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveFalse', function() {
+  describeToHaveBooleanX('toHaveFalse', function() {
+    describe('when primitive', function() {
+      describe('when true', function() {
+        it('should deny', function() {
+          expect({
+            memberName: true
+          }).not.toHaveFalse('memberName');
+        });
+      });
+      describe('when false', function() {
+        it('should confirm', function() {
+          expect({
+            memberName: false
+          }).toHaveFalse('memberName');
+        });
+      });
+    });
+    describe('when Boolean object', function() {
+      describe('when true', function() {
+        it('should deny', function() {
+          expect({
+            memberName: new Boolean(true)
+          }).not.toHaveFalse('memberName');
+        });
+      });
+      describe('when false', function() {
+        it('should confirm', function() {
+          expect({
+            memberName: new Boolean(false)
+          }).toHaveFalse('memberName');
+        });
+      });
+    });
+  });
+});
+
+describe('toHaveHtmlString', function() {
+  describeToHaveX('toHaveHtmlString', function() {
+    describe('when subject IS a string of HTML markup', function() {
+      beforeEach(function() {
+        this.ngMultiLine = '';
+        this.ngMultiLine += '<a data-ng-href="//www.google.com" data-ng-click="launchApp($event)" target="_blank" class="ng-binding" href="//www.google.com">';
+        this.ngMultiLine += '\n';
+        this.ngMultiLine += '  Watch with Google TV';
+        this.ngMultiLine += '\n';
+        this.ngMultiLine += '</a>';
+        this.ngMultiLine += '\n';
+      });
+      it('should confirm', function() {
+        expect({
+          memberName: '<element>text</element>'
+        }).toHaveHtmlString('memberName');
+        expect({
+          memberName: '<a data-ng-href="//foo.com" data-ng-click="bar($event)">baz</a>'
+        }).toHaveHtmlString('memberName');
+        expect({
+          memberName: '<div ng-if="foo > bar || bar < foo && baz == bar"></div>'
+        }).toHaveHtmlString('memberName');
+        expect({
+          memberName: '<li ng-if="foo > bar || bar < foo && baz == bar">'
+        }).toHaveHtmlString('memberName');
+        expect({
+          memberName: this.ngMultiLine
+        }).toHaveHtmlString('memberName');
+      });
+    });
+    describe('when subject is NOT a string of HTML markup', function() {
+      it('should deny', function() {
+        expect({
+          memberName: 'div'
+        }).not.toHaveHtmlString('memberName');
+        expect({
+          memberName: null
+        }).not.toHaveHtmlString('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveIso8601', function() {
+  describeToHaveX('toHaveIso8601', function() {
+    describe('when member is a Date String conforming to the ISO 8601 standard',
+      function() {
+        describe('when specified date is valid', function() {
+          it('should confirm', function() {
+            expect({
+              memberName: '2013-07-08T07:29:15.863Z'
+            }).toHaveIso8601('memberName');
+            expect({
+              memberName: '2013-07-08T07:29:15.863'
+            }).toHaveIso8601('memberName');
+            expect({
+              memberName: '2013-07-08T07:29:15'
+            }).toHaveIso8601('memberName');
+            expect({
+              memberName: '2013-07-08T07:29'
+            }).toHaveIso8601('memberName');
+            expect({
+              memberName: '2013-07-08'
+            }).toHaveIso8601('memberName');
+          });
+        });
+        describe('when specified date is NOT valid', function() {
+          it('should deny', function() {
+            expect({
+              memberName: '2013-99-12T00:00:00.000Z'
+            }).not.toHaveIso8601('memberName');
+            expect({
+              memberName: '2013-12-99T00:00:00.000Z'
+            }).not.toHaveIso8601('memberName');
+            expect({
+              memberName: '2013-01-01T99:00:00.000Z'
+            }).not.toHaveIso8601('memberName');
+            expect({
+              memberName: '2013-01-01T99:99:00.000Z'
+            }).not.toHaveIso8601('memberName');
+            expect({
+              memberName: '2013-01-01T00:00:99.000Z'
+            }).not.toHaveIso8601('memberName');
+          });
+        });
+      });
+    describe('when member is a String NOT conforming to the ISO 8601 standard',
+      function() {
+        it('should deny', function() {
+          expect({
+            memberName: '2013-07-08T07:29:15.'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: '2013-07-08T07:29:'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: '2013-07-08T07:2'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: '2013-07-08T07:'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: '2013-07-08T07'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: '2013-07-08T'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: '2013-07-0'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: '2013-07-'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: '2013-07'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: '2013-0'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: '2013-'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: '2013'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: '201'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: '20'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: '2'
+          }).not.toHaveIso8601('memberName');
+          expect({
+            memberName: ''
+          }).not.toHaveIso8601('memberName');
+        });
+      });
+  });
+});
+
+describe('toHaveJsonString', function() {
+  describeToHaveX('toHaveJsonString', function() {
+    describe('when subject IS a string of parseable JSON', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: '{}'
+        }).toHaveJsonString('memberName');
+        expect({
+          memberName: '[]'
+        }).toHaveJsonString('memberName');
+        expect({
+          memberName: '[1]'
+        }).toHaveJsonString('memberName');
+      });
+    });
+    describe('when subject is NOT a string of parseable JSON', function() {
+      it('should deny', function() {
+        expect({
+          memberName: '[1,]'
+        }).not.toHaveJsonString('memberName');
+        expect({
+          memberName: '<>'
+        }).not.toHaveJsonString('memberName');
+        expect({
+          memberName: null
+        }).not.toHaveJsonString('memberName');
+        expect({
+          memberName: ''
+        }).not.toHaveJsonString('memberName');
+        expect({
+          memberName: _undefined
+        }).not.toHaveJsonString('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveMember', function() {
+  describeToHaveX('toHaveMember', function() { });
+});
+
+describe('toHaveMethod', function() {
+  describeToHaveX('toHaveMethod', function() {
+    describe('when subject IS a function', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: function() { }
+        }).toHaveMethod('memberName');
+      });
+    });
+    describe('when subject is NOT a function', function() {
+      it('should deny', function() {
+        expect({
+          memberName: /regexp/
+        }).not.toHaveMethod('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveNonEmptyArray', function() {
+  describeToHaveArrayX('toHaveNonEmptyArray', function() {
+    describe('when named array has no members', function() {
+      it('should deny', function() {
+        expect({
+          memberName: []
+        }).not.toHaveNonEmptyArray('memberName');
+      });
+    });
+    describe('when named array has members', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: [1, 2, 3]
+        }).toHaveNonEmptyArray('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveNonEmptyObject', function() {
+  describeToHaveX('toHaveNonEmptyObject', function() {
+    beforeEach(function() {
+      this.Foo = function() { };
+    });
+    describe('when subject IS an Object with at least one instance member', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: {
+            a: 1
+          }
+        }).toHaveNonEmptyObject('memberName');
+      });
+    });
+    describe('when subject is NOT an Object with at least one instance member', function() {
+      beforeEach(function() {
+        this.Foo.prototype = {
+          b: 2
+        };
+      });
+      it('should deny', function() {
+        expect({
+          memberName: new this.Foo()
+        }).not.toHaveNonEmptyObject('memberName');
+        expect({
+          memberName: {}
+        }).not.toHaveNonEmptyObject('memberName');
+        expect({
+          memberName: null
+        }).not.toHaveNonEmptyObject('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveNonEmptyString', function() {
+  describeToHaveX('toHaveNonEmptyString', function() {
+    describe('when subject IS a string with at least one character', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: ' '
+        }).toHaveNonEmptyString('memberName');
+      });
+    });
+    describe('when subject is NOT a string with at least one character', function() {
+      it('should deny', function() {
+        expect({
+          memberName: ''
+        }).not.toHaveNonEmptyString('memberName');
+        expect({
+          memberName: null
+        }).not.toHaveNonEmptyString('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveNumber', function() {
+  describeToHaveX('toHaveNumber', function() {
+    describe('when subject IS a number', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: 1
+        }).toHaveNumber('memberName');
+        expect({
+          memberName: 1.11
+        }).toHaveNumber('memberName');
+        expect({
+          memberName: 1e3
+        }).toHaveNumber('memberName');
+        expect({
+          memberName: 0.11
+        }).toHaveNumber('memberName');
+        expect({
+          memberName: -11
+        }).toHaveNumber('memberName');
+      });
+    });
+    describe('when subject is NOT a number', function() {
+      it('should deny', function() {
+        expect({
+          memberName: '1'
+        }).not.toHaveNumber('memberName');
+        expect({
+          memberName: NaN
+        }).not.toHaveNumber('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveNumberWithinRange', function() {
+  describeToHaveX('toHaveNumberWithinRange', function() {
+    describe('when subject IS a number >= floor and <= ceiling', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: 0
+        }).toHaveNumberWithinRange('memberName', 0, 2);
+        expect({
+          memberName: 1
+        }).toHaveNumberWithinRange('memberName', 0, 2);
+        expect({
+          memberName: 2
+        }).toHaveNumberWithinRange('memberName', 0, 2);
+      });
+    });
+    describe('when subject is NOT a number >= floor and <= ceiling', function() {
+      it('should deny', function() {
+        expect({
+          memberName: -3
+        }).not.toHaveNumberWithinRange('memberName', 0, 2);
+        expect({
+          memberName: -2
+        }).not.toHaveNumberWithinRange('memberName', 0, 2);
+        expect({
+          memberName: -1
+        }).not.toHaveNumberWithinRange('memberName', 0, 2);
+        expect({
+          memberName: 3
+        }).not.toHaveNumberWithinRange('memberName', 0, 2);
+        expect({
+          memberName: NaN
+        }).not.toHaveNumberWithinRange('memberName', 0, 2);
+      });
+    });
+  });
+});
+
+describe('toHaveObject', function() {
+  describeToHaveX('toHaveObject', function() {
+    beforeEach(function() {
+      this.Foo = function() { };
+    });
+    describe('when subject IS an Object', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: new Object()
+        }).toHaveObject('memberName');
+        expect({
+          memberName: new this.Foo()
+        }).toHaveObject('memberName');
+        expect({
+          memberName: {}
+        }).toHaveObject('memberName');
+      });
+    });
+    describe('when subject is NOT an Object', function() {
+      it('should deny', function() {
+        expect({
+          memberName: null
+        }).not.toHaveObject('memberName');
+        expect({
+          memberName: 123
+        }).not.toHaveObject('memberName');
+        expect({
+          memberName: '[object Object]'
+        }).not.toHaveObject('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveOddNumber', function() {
+  describeToHaveX('toHaveOddNumber', function() {
+    describe('when subject IS an odd number', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: 1
+        }).toHaveOddNumber('memberName');
+      });
+    });
+    describe('when subject is NOT an odd number', function() {
+      it('should deny', function() {
+        expect({
+          memberName: 2
+        }).not.toHaveOddNumber('memberName');
+        expect({
+          memberName: NaN
+        }).not.toHaveOddNumber('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveString', function() {
+  describeToHaveX('toHaveString', function() {
+    describe('when subject IS a string of any length', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: ''
+        }).toHaveString('memberName');
+        expect({
+          memberName: ' '
+        }).toHaveString('memberName');
+      });
+    });
+    describe('when subject is NOT a string of any length', function() {
+      it('should deny', function() {
+        expect({
+          memberName: null
+        }).not.toHaveString('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveStringLongerThan', function() {
+  describeToHaveX('toHaveStringLongerThan', function() {
+    describe('when the subject and comparison ARE both strings', function() {
+      describe('when the subject IS longer than the comparision string', function() {
+        it('should confirm', function() {
+          expect({
+            memberName: 'abc'
+          }).toHaveStringLongerThan('memberName', 'ab');
+          expect({
+            memberName: 'a'
+          }).toHaveStringLongerThan('memberName', '');
+        });
+      });
+      describe('when the subject is NOT longer than the comparision string', function() {
+        it('should deny', function() {
+          expect({
+            memberName: 'ab'
+          }).not.toHaveStringLongerThan('memberName', 'abc');
+          expect({
+            memberName: ''
+          }).not.toHaveStringLongerThan('memberName', 'a');
+        });
+      });
+    });
+    describe('when the subject and comparison are NOT both strings', function() {
+      it('should deny (we are asserting the relative lengths of two strings)', function() {
+        expect({
+          memberName: 'truthy'
+        }).not.toHaveStringLongerThan('memberName', _undefined);
+        expect({
+          memberName: _undefined
+        }).not.toHaveStringLongerThan('memberName', 'truthy');
+        expect({
+          memberName: ''
+        }).not.toHaveStringLongerThan('memberName', _undefined);
+        expect({
+          memberName: _undefined
+        }).not.toHaveStringLongerThan('memberName', '');
+      });
+    });
+  });
+});
+
+describe('toHaveStringSameLengthAs', function() {
+  describeToHaveX('toHaveStringSameLengthAs', function() {
+    describe('when the subject and comparison ARE both strings', function() {
+      describe('when the subject IS the same length as the comparision string', function() {
+        it('should confirm', function() {
+          expect({
+            memberName: 'ab'
+          }).toHaveStringSameLengthAs('memberName', 'ab');
+        });
+      });
+      describe('when the subject is NOT the same length as the comparision string', function() {
+        it('should deny', function() {
+          expect({
+            memberName: 'abc'
+          }).not.toHaveStringSameLengthAs('memberName', 'ab');
+          expect({
+            memberName: 'a'
+          }).not.toHaveStringSameLengthAs('memberName', '');
+          expect({
+            memberName: ''
+          }).not.toHaveStringSameLengthAs('memberName', 'a');
+        });
+      });
+    });
+    describe('when the subject and comparison are NOT both strings', function() {
+      it('should deny (we are asserting the relative lengths of two strings)', function() {
+        expect({
+          memberName: 'truthy'
+        }).not.toHaveStringSameLengthAs('memberName', _undefined);
+        expect({
+          memberName: _undefined
+        }).not.toHaveStringSameLengthAs('memberName', 'truthy');
+        expect({
+          memberName: ''
+        }).not.toHaveStringSameLengthAs('memberName', _undefined);
+        expect({
+          memberName: _undefined
+        }).not.toHaveStringSameLengthAs('memberName', '');
+      });
+    });
+  });
+});
+
+describe('toHaveStringShorterThan', function() {
+  describeToHaveX('toHaveStringShorterThan', function() {
+    describe('when the subject and comparison ARE both strings', function() {
+      describe('when the subject IS shorter than the comparision string', function() {
+        it('should confirm', function() {
+          expect({
+            memberName: 'ab'
+          }).toHaveStringShorterThan('memberName', 'abc');
+          expect({
+            memberName: ''
+          }).toHaveStringShorterThan('memberName', 'a');
+        });
+      });
+      describe('when the subject is NOT shorter than the comparision string', function() {
+        it('should deny', function() {
+          expect({
+            memberName: 'abc'
+          }).not.toHaveStringShorterThan('memberName', 'ab');
+          expect({
+            memberName: 'a'
+          }).not.toHaveStringShorterThan('memberName', '');
+        });
+      });
+    });
+    describe('when the subject and comparison are NOT both strings', function() {
+      it('should deny (we are asserting the relative lengths of two strings)', function() {
+        expect({
+          memberName: 'truthy'
+        }).not.toHaveStringShorterThan('memberName', _undefined);
+        expect({
+          memberName: _undefined
+        }).not.toHaveStringShorterThan('memberName', 'truthy');
+        expect({
+          memberName: ''
+        }).not.toHaveStringShorterThan('memberName', _undefined);
+        expect({
+          memberName: _undefined
+        }).not.toHaveStringShorterThan('memberName', '');
+      });
+    });
+  });
+});
+
+
+describe('toHaveTrue', function() {
+  describeToHaveBooleanX('toHaveTrue', function() {
+    describe('when primitive', function() {
+      describe('when true', function() {
+        it('should confirm', function() {
+          expect({
+            memberName: true
+          }).toHaveTrue('memberName');
+        });
+      });
+      describe('when false', function() {
+        it('should deny', function() {
+          expect({
+            memberName: false
+          }).not.toHaveTrue('memberName');
+        });
+      });
+    });
+    describe('when Boolean object', function() {
+      describe('when true', function() {
+        it('should confirm', function() {
+          expect({
+            memberName: new Boolean(true)
+          }).toHaveTrue('memberName');
+        });
+      });
+      describe('when false', function() {
+        it('should deny', function() {
+          expect({
+            memberName: new Boolean(false)
+          }).not.toHaveTrue('memberName');
+        });
+      });
+    });
+  });
+});
+
+describe('toHaveWhitespaceString', function() {
+  describeToHaveX('toHaveWhitespaceString', function() {
+    describe('when subject IS a string containing only tabs, spaces, returns etc', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: ' '
+        }).toHaveWhitespaceString('memberName');
+        expect({
+          memberName: ''
+        }).toHaveWhitespaceString('memberName');
+      });
+    });
+    describe('when subject is NOT a string containing only tabs, spaces, returns etc', function() {
+      it('should deny', function() {
+        expect({
+          memberName: 'has-no-whitespace'
+        }).not.toHaveWhitespaceString('memberName');
+        expect({
+          memberName: 'has whitespace'
+        }).not.toHaveWhitespaceString('memberName');
+        expect({
+          memberName: null
+        }).not.toHaveWhitespaceString('memberName');
+      });
+    });
+  });
+});
+
+describe('toHaveWholeNumber', function() {
+  describeToHaveX('toHaveWholeNumber', function() {
+    describe('when subject IS a number with no positive decimal places', function() {
+      it('should confirm', function() {
+        expect({
+          memberName: 1
+        }).toHaveWholeNumber('memberName');
+        expect({
+          memberName: 0
+        }).toHaveWholeNumber('memberName');
+        expect({
+          memberName: 0.0
+        }).toHaveWholeNumber('memberName');
+      });
+    });
+    describe('when subject is NOT a number with no positive decimal places', function() {
+      it('should deny', function() {
+        expect({
+          memberName: NaN
+        }).not.toHaveWholeNumber('memberName');
+        expect({
+          memberName: 1.1
+        }).not.toHaveWholeNumber('memberName');
+        expect({
+          memberName: 0.1
+        }).not.toHaveWholeNumber('memberName');
+      });
+    });
+  });
+});
+
+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() {
+      describe('when subject is a string whose leading characters match the expected string', function() {
+        it('should confirm', function() {
+          expect('jamie').toStartWith('jam');
+        });
+      });
+      describe('when subject is a string whose leading characters DO NOT match the expected string', function() {
+        it('should deny', function() {
+          expect(' jamie').not.toStartWith('jam');
+          expect('Jamie').not.toStartWith('jam');
+        });
+      });
+    });
+    describe('when subject IS an undefined or empty string', function() {
+      it('should deny', function() {
+        expect('').not.toStartWith('');
+        expect(_undefined).not.toStartWith('');
+        expect(_undefined).not.toStartWith('undefined');
+        expect('undefined').not.toStartWith(_undefined);
+      });
+    });
+  });
+});
+
+
+describe('toThrowAnyError', function() {
+  describe('when supplied a function', function() {
+    describe('when function errors when invoked', function() {
+      beforeEach(function() {
+        this.throwError = function() {
+          throw new Error('wut?');
+        };
+        this.badReference = function() {
+          return badReference.someValue;
+        };
+      });
+      it('should confirm', function() {
+        expect(this.throwError).toThrowAnyError();
+        expect(this.badReference).toThrowAnyError();
+      });
+    });
+    describe('when function does NOT error when invoked', function() {
+      beforeEach(function() {
+        this.noErrors = function() { };
+      });
+      it('should deny', function() {
+        expect(this.noErrors).not.toThrowAnyError();
+      });
+    });
+  });
+});
+
+
+describe('toThrowErrorOfType', function() {
+  describe('when supplied a function', function() {
+    describe('when function errors when invoked', function() {
+      beforeEach(function() {
+        this.throwError = function() {
+          throw new Error('wut?');
+        };
+        this.badReference = function() {
+          return badReference.someValue;
+        };
+      });
+      describe('when the error is of the expected type', function() {
+        it('should confirm', function() {
+          expect(this.throwError).toThrowErrorOfType('Error');
+          expect(this.badReference).toThrowErrorOfType('ReferenceError');
+        });
+      });
+      describe('when the error is NOT of the expected type', function() {
+        it('should confirm', function() {
+          expect(this.throwError).not.toThrowErrorOfType('ReferenceError');
+          expect(this.badReference).not.toThrowErrorOfType('Error');
+        });
+      });
+    });
+  });
+});
diff --git a/jasmine-expect/jasmine-expect.d.ts b/jasmine-expect/jasmine-expect.d.ts
new file mode 100644
index 000000000..fe6238078
--- /dev/null
+++ b/jasmine-expect/jasmine-expect.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for jasmine-expect 2.0.0-beta2
+// Project: https://github.com/JamieMason/Jasmine-Matchers
+// Definitions by: UserPixel <https://github.com/UserPixel>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jasmine/jasmine.d.ts" />
+
+declare module 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;
+
+    toEndWith(subString: string): 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;
+
+    toImplement(api: {}): boolean;
+
+    toStartWith(subString: string): boolean;
+
+    toThrowAnyError(): boolean;
+    toThrowErrorOfType(type: string): boolean;
+  }
+}
diff --git a/jasmine-matchers/jasmine-matchers-tests.ts b/jasmine-matchers/jasmine-matchers-tests.ts
index d1cbc0f90..f281b4a83 100644
--- a/jasmine-matchers/jasmine-matchers-tests.ts
+++ b/jasmine-matchers/jasmine-matchers-tests.ts
@@ -27,8 +27,8 @@ describe('toBeArray', function () {
         });
         it('should pass for [1,"",{}]', function () {
             expect([
-                1, 
-                "", 
+                1,
+                "",
                 {
                 }
             ]).toBeArray();
@@ -115,13 +115,13 @@ describe('toBeOneOf', function () {
     describe('matches', function () {
         it('should find "a" in ["a", "b"]', function () {
             expect('a').toBeOneOf([
-                'a', 
+                'a',
                 'b'
             ]);
         });
         it('should find "uxebu" in ["company", "uxebu"]', function () {
             expect('uxebu').toBeOneOf([
-                'company', 
+                'company',
                 'uxebu'
             ]);
         });
@@ -129,30 +129,30 @@ describe('toBeOneOf', function () {
     describe('non-matches', function () {
         it('should not find "" in [" ", "0"]', function () {
             expect('').not.toBeOneOf([
-                ' ', 
+                ' ',
                 '0'
             ]);
         });
         it('should not find "a" in ["b", "c"]', function () {
             expect('a').not.toBeOneOf([
-                'b', 
+                'b',
                 'c'
             ]);
         });
     });
 });
 describe('toBeCloseToOneOf', function () {
-    function oneDigitOff(actual, expected) {
+    function oneDigitOff(actual: any, expected: any) {
         var actualInt = parseInt(actual, 10);
         return actualInt - 1 <= expected && actualInt + 1 >= expected;
     }
-    function tenPercentOff(actual, expected) {
+    function tenPercentOff(actual: any, expected: any) {
         return expected * 0.9 <= actual && expected * 1.1 >= actual;
     }
-    function oneDigitOrTenPercentOff(actual, expected) {
+    function oneDigitOrTenPercentOff(actual: any, expected: any) {
         return oneDigitOff(actual, expected) || tenPercentOff(actual, expected);
     }
-    function twoDecimalsOff(actual, expected) {
+    function twoDecimalsOff(actual: any, expected: any) {
         var lower = ((expected * 100) - 2) / 100;
         var upper = ((expected * 100) + 2) / 100;
         return lower <= actual && upper >= actual;
@@ -160,25 +160,25 @@ describe('toBeCloseToOneOf', function () {
     describe('matches', function () {
         it('should say 7 is close to one of [8, 9]', function () {
             expect(7).toBeCloseToOneOf([
-                8, 
+                8,
                 9
             ], oneDigitOff);
         });
         it('should say 2 is 10% off of one of [2.2, 1.0]', function () {
             expect(2).toBeCloseToOneOf([
-                2.2, 
+                2.2,
                 1.0
             ], tenPercentOff);
         });
         it('should say 7 is close to one of [8, 9]', function () {
             expect(7).toBeCloseToOneOf([
-                8, 
+                8,
                 9
             ], oneDigitOrTenPercentOff);
         });
         it('should say 1.345 two decimals off of [1.325, 1.365]', function () {
             expect(1.345).toBeCloseToOneOf([
-                1.325, 
+                1.325,
                 1.365
             ], twoDecimalsOff);
         });
@@ -186,26 +186,26 @@ describe('toBeCloseToOneOf', function () {
     describe('non-matches', function () {
         it('should say 7 is NOT one off of [9, 10, 11]', function () {
             expect(7).not.toBeCloseToOneOf([
-                9, 
-                10, 
+                9,
+                10,
                 11
             ], oneDigitOff);
         });
         it('should say 1 is close to one of [8, 9]', function () {
             expect(1).not.toBeCloseToOneOf([
-                8, 
+                8,
                 9
             ], oneDigitOrTenPercentOff);
         });
         it('should say 1.9 is NOT 10% off of one of [2.2, 1.0]', function () {
             expect(1.9).not.toBeCloseToOneOf([
-                2.2, 
+                2.2,
                 1.0
             ], tenPercentOff);
         });
         it('should say 1.345 two decimals off of [1.325, 1.365]', function () {
             expect(1.304).not.toBeCloseToOneOf([
-                1.325, 
+                1.325,
                 1.365
             ], twoDecimalsOff);
         });
@@ -216,7 +216,7 @@ describe('toContainOnce', function () {
     describe('matches', function () {
         it('should work for arrays', function () {
             expect([
-                1, 
+                1,
                 2
             ]).toContainOnce(1);
         });
@@ -227,7 +227,7 @@ describe('toContainOnce', function () {
     describe('non-matches', function () {
         it('should work for arrays', function () {
             expect([
-                1, 
+                1,
                 2
             ]).not.toContainOnce(3);
         });
@@ -257,7 +257,7 @@ describe('toHaveLength', function () {
 describe('toHaveProperties', function () {
     describe('matches', function () {
         it('should work for `{x:0, y:undefined}`', function () {
-            var obj = {
+            var obj: any = {
                 x: 0,
                 y: undefined
             };
@@ -268,7 +268,7 @@ describe('toHaveProperties', function () {
 describe('toHavePropertiesWithValues', function () {
     describe('matches', function () {
         it('should work with a reference object', function () {
-            function C() {
+            var C: any = function C() {
                 this.x = 0;
             }
             C.prototype.y = 'arbitrary';
@@ -283,7 +283,7 @@ describe('toHavePropertiesWithValues', function () {
 describe('toHaveOwnProperties', function () {
     describe('matches', function () {
         it('should work for `{x:0, y:undefined}`', function () {
-            var obj = {
+            var obj: any = {
                 x: 0,
                 y: undefined
             };
@@ -322,14 +322,14 @@ describe('toHaveBeenCalledXTimes', function () {
 describe('toExactlyHaveProperties', function () {
     describe('matches', function () {
         it('should work for `{x:0, y:undefined}`', function () {
-            var obj = {
+            var obj: any = {
                 x: 0,
                 y: undefined
             };
             expect(obj).toExactlyHaveProperties('x', 'y');
         });
         it('should work in any order', function () {
-            var obj = {
+            var obj: any = {
                 x: 0,
                 y: undefined
             };
@@ -338,14 +338,14 @@ describe('toExactlyHaveProperties', function () {
     });
     describe('non-matches', function () {
         it('should work for too many properties', function () {
-            var obj = {
+            var obj: any = {
                 x: 0,
                 y: undefined
             };
             expect(obj).not.toExactlyHaveProperties('x');
         });
         it('should work for missing properties', function () {
-            var obj = {
+            var obj: any = {
                 x: 0,
                 y: undefined
             };
@@ -375,17 +375,17 @@ describe('toEndWith', function () {
         describe('matches', function () {
             it('should work for string', function () {
                 expect([
-                    '1', 
+                    '1',
                     '2'
                 ]).toEndWith('2');
             });
             it('should work for array', function () {
                 expect([
-                    3, 
-                    4, 
+                    3,
+                    4,
                     5
                 ]).toEndWith([
-                    4, 
+                    4,
                     5
                 ]);
             });
@@ -393,17 +393,17 @@ describe('toEndWith', function () {
         describe('non-matches', function () {
             it('should work for string', function () {
                 expect([
-                    '1', 
+                    '1',
                     '2'
                 ]).not.toEndWith('3');
             });
             it('should work for array', function () {
                 expect([
-                    3, 
-                    4, 
+                    3,
+                    4,
                     5
                 ]).not.toEndWith([
-                    3, 
+                    3,
                     4
                 ]);
             });
@@ -419,8 +419,8 @@ describe('toEachEndWith', function () {
         });
         it('should work for array with multiple elements', function () {
             expect([
-                'one', 
-                'zwee', 
+                'one',
+                'zwee',
                 'three'
             ]).toEachEndWith('e');
         });
@@ -433,8 +433,8 @@ describe('toEachEndWith', function () {
         });
         it('should work for array with multiple elements', function () {
             expect([
-                'one', 
-                'zwei', 
+                'one',
+                'zwei',
                 'three'
             ]).not.toEachEndWith('e');
         });
@@ -449,8 +449,8 @@ describe('toSomeEndWith', function () {
         });
         it('should work for array with multiple elements', function () {
             expect([
-                'one', 
-                'zwee', 
+                'one',
+                'zwee',
                 'three'
             ]).toSomeEndWith('ee');
         });
@@ -463,8 +463,8 @@ describe('toSomeEndWith', function () {
         });
         it('should work for array with multiple elements', function () {
             expect([
-                'one', 
-                'zwei', 
+                'one',
+                'zwei',
                 'three'
             ]).not.toSomeEndWith('a');
         });
@@ -491,17 +491,17 @@ describe('toStartWith', function () {
         describe('matches', function () {
             it('should work for string', function () {
                 expect([
-                    '1', 
+                    '1',
                     '2'
                 ]).toStartWith('1');
             });
             it('should work for array', function () {
                 expect([
-                    3, 
-                    4, 
+                    3,
+                    4,
                     5
                 ]).toStartWith([
-                    3, 
+                    3,
                     4
                 ]);
             });
@@ -509,17 +509,17 @@ describe('toStartWith', function () {
         describe('non-matches', function () {
             it('should work for string', function () {
                 expect([
-                    '1', 
+                    '1',
                     '2'
                 ]).not.toStartWith('3');
             });
             it('should work for array', function () {
                 expect([
-                    3, 
-                    4, 
+                    3,
+                    4,
                     5
                 ]).not.toStartWith([
-                    4, 
+                    4,
                     5
                 ]);
             });
@@ -535,8 +535,8 @@ describe('toEachStartWith', function () {
         });
         it('should work for array with multiple elements', function () {
             expect([
-                'one', 
-                'onetwo', 
+                'one',
+                'onetwo',
                 'onethree'
             ]).toEachStartWith('o');
         });
@@ -549,8 +549,8 @@ describe('toEachStartWith', function () {
         });
         it('should work for array with multiple elements', function () {
             expect([
-                'one', 
-                'two', 
+                'one',
+                'two',
                 'onethree'
             ]).not.toEachStartWith('o');
         });
@@ -565,8 +565,8 @@ describe('toSomeStartWith', function () {
         });
         it('should work for array with multiple elements', function () {
             expect([
-                'one', 
-                'onetwo', 
+                'one',
+                'onetwo',
                 'three'
             ]).toSomeStartWith('one');
         });
@@ -579,8 +579,8 @@ describe('toSomeStartWith', function () {
         });
         it('should work for array with multiple elements', function () {
             expect([
-                'one', 
-                'two', 
+                'one',
+                'two',
                 'onethree'
             ]).not.toSomeStartWith('a');
         });
@@ -610,19 +610,19 @@ describe('toStartWithEither', function () {
         describe('matches', function () {
             it('should work for string', function () {
                 expect([
-                    '1', 
+                    '1',
                     '2'
                 ]).toStartWithEither('1', '2');
             });
             it('should work for array', function () {
                 expect([
-                    3, 
-                    4, 
+                    3,
+                    4,
                     5
                 ]).toStartWithEither([
                     4
                 ], [
-                    3, 
+                    3,
                     4
                 ]);
             });
@@ -630,20 +630,20 @@ describe('toStartWithEither', function () {
         describe('non-matches', function () {
             it('should work for string', function () {
                 expect([
-                    '1', 
+                    '1',
                     '2'
                 ]).not.toStartWithEither('3');
             });
             it('should work for array', function () {
                 expect([
-                    3, 
-                    4, 
+                    3,
+                    4,
                     5
                 ]).not.toStartWithEither([
-                    5, 
+                    5,
                     6
                 ], [
-                    4, 
+                    4,
                     5
                 ]);
             });
diff --git a/jasmine-matchers/jasmine-matchers-tests.ts.tscparams b/jasmine-matchers/jasmine-matchers-tests.ts.tscparams
deleted file mode 100644
index d3f5a12fa..000000000
--- a/jasmine-matchers/jasmine-matchers-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.colorbox/jquery.colorbox.d.ts b/jquery.colorbox/jquery.colorbox.d.ts
index e13b0bbd5..cc34635a7 100644
--- a/jquery.colorbox/jquery.colorbox.d.ts
+++ b/jquery.colorbox/jquery.colorbox.d.ts
@@ -106,6 +106,10 @@ interface ColorboxSettings {
     */
     close?: string;
     /**
+    * Set to false to remove the close button.
+    */
+    closeButton?: boolean;
+    /**
     * Error message given when ajax content for a given URL cannot be loaded.
     */
     xhrError?: string;
diff --git a/jquery.gridster/gridster-tests.ts b/jquery.gridster/gridster-tests.ts
index 3672c9555..99edbb9a8 100644
--- a/jquery.gridster/gridster-tests.ts
+++ b/jquery.gridster/gridster-tests.ts
@@ -13,10 +13,67 @@ var options: GridsterOptions = {
 			x: wgd.row,
 			y: wgd.col
 		};
-	}
+	},
+	widget_base_dimensions: [100, 100]
 };
 
 var gridster: Gridster = $('.gridster ul').gridster(options).data('gridster');
 gridster.add_widget('<li class="new">The HTML of the widget...</li>', 2, 1);
 gridster.remove_widget($('gridster li').eq(3).get(0));
 var json = gridster.serialize<SerializeData>();
+
+var coords: GridsterCoords = gridster.get_highest_occupied_cell();
+var position = coords.col + coords.row;
+
+options.widget_base_dimensions = [100, 200];
+gridster.resize_widget_dimensions(options);
+
+gridster.set_widget_min_size(0, [1, 2]);
+
+function noOptions() {
+	var grid: Gridster = $('.gridster ul').gridster().data('gridster')
+}
+
+function widgetSelectorHTMLElements() {
+	var opts: GridsterOptions = {
+		widget_selector: $('.gridster ul li').get()
+	};
+
+	var grid: Gridster = $('.gridster ul').gridster(opts).data('gridster')
+}
+
+function widgetSelectorString() {
+	var opts: GridsterOptions = {
+		widget_selector: '.gridster ul li'
+	};
+
+	var grid: Gridster = $('.gridster ul').gridster(opts).data('gridster')
+} 
+
+function withNamespace() {
+	var grid: Gridster = $('.gridster ul').gridster({
+		namespace: 'custom-gridster'
+	}).data('gridster')
+} 
+
+function withStylesheet() {
+	var grid: Gridster = $('.gridster ul').gridster({
+		autogenerate_stylesheet: false
+	}).data('gridster')
+}
+
+function withResize() {
+	var grid: Gridster = $('.gridster ul').gridster({
+		resize: {
+			enabled: true,
+		    axes: ['both'],
+		    handle_append_to: 'li .handle-container',
+		    handle_class: '.handle',
+		    max_size: [5, 5],
+		    min_size: [1, 1],
+		    resize: (event: Event, ui: GridsterUi, $el: JQuery) => {},
+		    start: (event: Event, ui: { helper: JQuery; }, $el: JQuery) => {},
+		    stop: (event: Event, ui: { helper: JQuery; }, $el: JQuery) => {},
+		}
+	}).data('gridster')
+}
diff --git a/jquery.gridster/gridster.d.ts b/jquery.gridster/gridster.d.ts
index e003f0ebc..89448b4c3 100644
--- a/jquery.gridster/gridster.d.ts
+++ b/jquery.gridster/gridster.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jQuery.gridster 0.1.0
+// Type definitions for jQuery.gridster 0.5.6
 // Project: https://github.com/jbaldwin/gridster
 // Definitions by: Josh Baldwin <https://github.com/jbaldwin>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -32,13 +32,26 @@ OTHER DEALINGS IN THE SOFTWARE.
 /// <reference path="../jquery/jquery.d.ts"/>
 
 interface GridsterDraggable {
-	items: any;
-	distance: number;
-	limit: boolean;
-	offset_left: number;
-	drag: (event: Event, ui: GridsterUi) => void;
-	start: (event: Event, ui: { helper: JQuery; }) => void;
-	stop: (event: Event, ui: { helper: JQuery; }) => void;
+	items?: any;
+	distance?: number;
+	limit?: boolean;
+	offset_left?: number;
+	handle?: string;
+	drag?: (event: Event, ui: GridsterUi) => void;
+	start?: (event: Event, ui: { helper: JQuery; }) => void;
+	stop?: (event: Event, ui: { helper: JQuery; }) => void;
+}
+
+interface GridsterResizable {
+    enabled?: boolean;
+    axes?: string[];
+    handle_append_to?: string;
+    handle_class?: string;
+    max_size?: number[];
+    min_size?: number[];
+    resize?: (event: Event, ui: GridsterUi, $el: JQuery) => void;
+    start?: (event: Event, ui: { helper: JQuery; }, $el: JQuery) => void;
+    stop?: (event: Event, ui: { helper: JQuery; }, $el: JQuery) => void;
 }
 
 interface GridsterUi {
@@ -78,7 +91,7 @@ interface GridsterOptions {
 	* Type => HTMLElement[]
 	* Default = 'li'
 	**/
-	widget_selector?: any;
+	widget_selector?: string|HTMLElement[];
 
 	/**
 	* Margin between widgets.  The first index for the horizontal margin (left, right) and the second for the vertical margin (top, bottom).
@@ -154,6 +167,21 @@ interface GridsterOptions {
 	* An object with all options for Draggable class you want to overwrite.  @see GridsterDraggable or docs for more info.
 	**/
 	draggable?: GridsterDraggable;
+
+	/**
+	* A string to differentiate one gridster from another
+	**/
+	namespace?: string;
+
+    /**
+     * A boolean to specify if the stylesheet should be generated or not
+     **/
+    autogenerate_stylesheet?: boolean;
+
+    /**
+     * An object with all options for Resizable class you want to overwrite.  @see GridsterResizable or docs for more info.
+     **/
+    resize?: GridsterResizable;
 }
 
 interface JQuery {
@@ -189,6 +217,12 @@ interface Gridster {
 	**/
 	add_widget(html: JQuery, size_x?: number, size_y?: number, col?: number, row?: number): JQuery;
 
+    /**
+     * Get the highest occupied cell.
+     * @return Returns the farthest position {row: number, col: number} occupied in the grid.
+     **/
+    get_highest_occupied_cell(): GridsterCoords;
+
 	/**
 	* Change the size of a widget.
 	* @param $widget The jQuery wrapped HTMLElement that represents the widget is going to be resized.
@@ -199,6 +233,14 @@ interface Gridster {
 	**/
 	resize_widget($widget: JQuery, size_x?: number, size_y?: number, callback?: (size_x: number, size_y: number) => void): JQuery;
 
+
+    /**
+     * Resize all the widgets in the grid.
+     * @param options The options to use to resize the widgets.
+     * @return Returns the instance of the Gridster class.
+     **/
+    resize_widget_dimensions(options: GridsterOptions): Gridster;
+
 	/**
 	* Remove a widget from the grid.
 	* @param el The jQuery wrapped HTMLElement you want to remove.
@@ -223,6 +265,14 @@ interface Gridster {
 	**/
 	remove_widget(el: JQuery, callback: (el: HTMLElement) => void): Gridster;
 
+    /**
+     * Resize a widget in the grid.
+     * @param widget The index of the widget to be resized.
+     * @param size An array representing the size (x, y) to set on the widget.
+     * @return Returns the instance of the Gridster class.
+     **/
+    set_widget_min_size(widget: number, size: number[]): Gridster;
+
 	/**
 	* Returns a serialized array of the widgets in the grid.
 	* @param $widgets The collection of jQuery wrap ed HTMLElements you want to serialize.  If no argument is passed a l widgets will be serialized.
@@ -247,4 +297,10 @@ interface Gridster {
 	* @return Returns the instance of the Gridster class.
 	**/
 	disable(): Gridster;
+
+    /**
+    * Returns the options used to initialize the grid
+    * @return Returns the options used to initialize the grid
+    **/
+    options: GridsterOptions;
 }
diff --git a/jqueryui/jqueryui.d.ts b/jqueryui/jqueryui.d.ts
index a49a779e2..d9a33ed4f 100644
--- a/jqueryui/jqueryui.d.ts
+++ b/jqueryui/jqueryui.d.ts
@@ -590,6 +590,7 @@ declare module JQueryUI {
         resize?: ResizableEvent;
         start?: ResizableEvent;
         stop?: ResizableEvent;
+        create?: ResizableEvents;
     }
 
     interface Resizable extends Widget, ResizableOptions {
diff --git a/js-combinatorics/js-combinatorics-global-tests.ts b/js-combinatorics/js-combinatorics-global-tests.ts
new file mode 100644
index 000000000..e8591fbc2
--- /dev/null
+++ b/js-combinatorics/js-combinatorics-global-tests.ts
@@ -0,0 +1,99 @@
+/// <reference path="./js-combinatorics-global.d.ts" />
+
+const p:number = Combinatorics.P(1, 2);
+const c:number = Combinatorics.C(1, 2);
+const factorial:number = Combinatorics.factorial(5);
+const factoradic:number[] = Combinatorics.factoradic(5);
+
+const power = Combinatorics.power(["a", "b", "c"]);
+const nextPower:string[] = power.next();
+power.forEach((i:string[]) => console.log(i));
+const powersLengths:number[] = power.map((i:string[]) => i.length);
+const filteredPowers:string[][] = power.filter((i:string[]) => i.length > 0);
+const allPowers:string[][] = power.toArray();
+const powersCount = power.length;
+const nthPower:string[] = power.nth(3);
+
+const limitedCombination = Combinatorics.combination(["a", "b", "c"], 2);
+const combination = Combinatorics.combination(["a", "b", "c"]);
+const nextCombination:string[] = combination.next();
+combination.forEach((i:string[]) => console.log(i));
+const combinationsLengths:number[] = combination.map((i:string[]) => i.length);
+const filteredCombinations:string[][] = combination.filter((i:string[]) => i.length > 0);
+const allCombinations:string[][] = combination.toArray();
+const combinationsCount = combination.length;
+
+const limitedPermutation = Combinatorics.permutation(["a", "b", "c"], 2);
+const permutation = Combinatorics.permutation(["a", "b", "c"]);
+const nextPermutation:string[] = permutation.next();
+permutation.forEach((i:string[]) => console.log(i));
+const permutationsLengths:number[] = permutation.map((i:string[]) => i.length);
+const filteredPermutations:string[][] = permutation.filter((i:string[]) => i.length > 0);
+const allPermutations:string[][] = permutation.toArray();
+const permutationsCount = permutation.length;
+
+const permutationCombination = Combinatorics.permutationCombination(["a", "b", "c"]);
+const nextPermutationCombinations:string[] = permutationCombination.next();
+permutationCombination.forEach((i:string[]) => console.log(i));
+const permutationCombinationsLengths:number[] = permutationCombination.map((i:string[]) => i.length);
+const filteredPermutationCombinationss:string[][] = permutationCombination.filter((i:string[]) => i.length > 0);
+const allPermutationCombinationss:string[][] = permutationCombination.toArray();
+const permutationCombinationsCount = permutationCombination.length;
+
+const limitedBaseN = Combinatorics.baseN(["a", "b", "c"], 2);
+const baseN = Combinatorics.baseN(["a", "b", "c"]);
+const nextbaseN:string[] = baseN.next();
+baseN.forEach((i:string[]) => console.log(i));
+const baseNsLengths:number[] = baseN.map((i:string[]) => i.length);
+const filteredbaseNs:string[][] = baseN.filter((i:string[]) => i.length > 0);
+const allbaseNs:string[][] = baseN.toArray();
+const baseNsCount = baseN.length;
+const nthbaseN:string[] = baseN.nth(3);
+
+const cartesianProduct1 = Combinatorics.cartesianProduct(["a", "b", "c"]);
+const nextCartesianProduct1:[string] = cartesianProduct1.next();
+const nextCartesianProduct1Char = nextCartesianProduct1[0].substr(0, 1);
+cartesianProduct1.forEach((i:[string]) => console.log(i));
+const cartesianProduct1sLengths:number[] = cartesianProduct1.map((i:[string]) => i.length);
+const filteredCartesianProduct1s:[string][] = cartesianProduct1.filter((i:[string]) => i.length > 0);
+const allCartesianProduct1s:[string][] = cartesianProduct1.toArray();
+const cartesianProduct1sCount = cartesianProduct1.length;
+const nthCartesianProduct1:[string] = cartesianProduct1.nth(3);
+const cartesianProduct1ByCoords:[string] = cartesianProduct1.get(1);
+
+const cartesianProduct2 = Combinatorics.cartesianProduct(["a", "b", "c"], [1, 2, 3]);
+const nextCartesianProduct2:[string, number] = cartesianProduct2.next();
+const nextCartesianProduct2Char = nextCartesianProduct2[0].substr(0, 1);
+const nextCartesianProduct2Num = nextCartesianProduct2[1].toFixed(2);
+cartesianProduct2.forEach((i:[string, number]) => console.log(i));
+const cartesianProduct2sLengths:number[] = cartesianProduct2.map((i:[string, number]) => i.length);
+const filteredCartesianProduct2s:[string, number][] = cartesianProduct2.filter((i:[string, number]) => i.length > 0);
+const allCartesianProduct2s:[string, number][] = cartesianProduct2.toArray();
+const cartesianProduct2sCount = cartesianProduct2.length;
+const nthCartesianProduct2:[string, number] = cartesianProduct2.nth(3);
+const cartesianProduct2ByCoords:[string, number] = cartesianProduct2.get(1, 1);
+
+const cartesianProduct3 = Combinatorics.cartesianProduct(["a", "b", "c"], [1, 2, 3], [true, false]);
+const nextCartesianProduct3:[string, number, boolean] = cartesianProduct3.next();
+const nextCartesianProduct3Char = nextCartesianProduct3[0].substr(0, 1);
+const nextCartesianProduct3Num = nextCartesianProduct3[1].toFixed(2);
+const nextCartesianProduct4Cond = nextCartesianProduct3[2] === true;
+cartesianProduct3.forEach((i:[string, number, boolean]) => console.log(i));
+const cartesianProduct3sLengths:number[] = cartesianProduct3.map((i:[string, number, boolean]) => i.length);
+const filteredCartesianProduct3s:[string, number, boolean][] = cartesianProduct3.filter((i:[string, number, boolean]) => i.length > 0);
+const allCartesianProduct3s:[string, number, boolean][] = cartesianProduct3.toArray();
+const cartesianProduct3sCount = cartesianProduct3.length;
+const nthCartesianProduct3:[string, number, boolean] = cartesianProduct3.nth(3);
+const cartesianProduct3ByCoords:[string, number, boolean] = cartesianProduct3.get(1, 1);
+
+const cartesianProductAny = Combinatorics.cartesianProduct(["a", 1, true], [false, 2, "b"]);
+const nextCartesianProductAny:any[] = cartesianProductAny.next();
+cartesianProductAny.forEach((i:any[]) => console.log(i));
+const cartesianProductAnysLengths:number[] = cartesianProductAny.map((i:any[]) => i.length);
+const filteredCartesianProductAnys:any[][] = cartesianProductAny.filter((i:any[]) => i.length > 0);
+const allCartesianProductAnys:any[][] = cartesianProductAny.toArray();
+const cartesianProductAnysCount = cartesianProductAny.length;
+const nthCartesianProductAny:any[] = cartesianProductAny.nth(3);
+const cartesianProductAnyByCoords:any[] = cartesianProductAny.get(1, 1);
+
+const version:string = Combinatorics.VERSION;
diff --git a/js-combinatorics/js-combinatorics-global.d.ts b/js-combinatorics/js-combinatorics-global.d.ts
new file mode 100644
index 000000000..20c302981
--- /dev/null
+++ b/js-combinatorics/js-combinatorics-global.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for js-combinatorics v0.5.0 (global)
+// Project: https://github.com/dankogai/js-combinatorics
+// Definitions by: Vasya Aksyonov <https://github.com/outring>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="./js-combinatorics.d.ts" />
+
+import Combinatorics = __Combinatorics;
diff --git a/js-combinatorics/js-combinatorics-tests.ts b/js-combinatorics/js-combinatorics-tests.ts
new file mode 100644
index 000000000..08e04c374
--- /dev/null
+++ b/js-combinatorics/js-combinatorics-tests.ts
@@ -0,0 +1,95 @@
+/// <reference path="./js-combinatorics.d.ts" />
+
+import * as Combinatorics from "js-combinatorics";
+
+const p:number = Combinatorics.P(1, 2);
+const c:number = Combinatorics.C(1, 2);
+const factorial:number = Combinatorics.factorial(5);
+const factoradic:number[] = Combinatorics.factoradic(5);
+
+const power = Combinatorics.power(["a", "b", "c"]);
+const nextPower:string[] = power.next();
+power.forEach((i:string[]) => console.log(i));
+const powersLengths:number[] = power.map((i:string[]) => i.length);
+const filteredPowers:string[][] = power.filter((i:string[]) => i.length > 0);
+const allPowers:string[][] = power.toArray();
+const powersCount = power.length;
+const nthPower:string[] = power.nth(3);
+
+const limitedCombination = Combinatorics.combination(["a", "b", "c"], 2);
+const combination = Combinatorics.combination(["a", "b", "c"]);
+const nextCombination:string[] = combination.next();
+combination.forEach((i:string[]) => console.log(i));
+const combinationsLengths:number[] = combination.map((i:string[]) => i.length);
+const filteredCombinations:string[][] = combination.filter((i:string[]) => i.length > 0);
+const allCombinations:string[][] = combination.toArray();
+const combinationsCount = combination.length;
+
+const limitedPermutation = Combinatorics.permutation(["a", "b", "c"], 2);
+const permutation = Combinatorics.permutation(["a", "b", "c"]);
+const nextPermutation:string[] = permutation.next();
+permutation.forEach((i:string[]) => console.log(i));
+const permutationsLengths:number[] = permutation.map((i:string[]) => i.length);
+const filteredPermutations:string[][] = permutation.filter((i:string[]) => i.length > 0);
+const allPermutations:string[][] = permutation.toArray();
+const permutationsCount = permutation.length;
+
+const permutationCombination = Combinatorics.permutationCombination(["a", "b", "c"]);
+const nextPermutationCombinations:string[] = permutationCombination.next();
+permutationCombination.forEach((i:string[]) => console.log(i));
+const permutationCombinationsLengths:number[] = permutationCombination.map((i:string[]) => i.length);
+const filteredPermutationCombinationss:string[][] = permutationCombination.filter((i:string[]) => i.length > 0);
+const allPermutationCombinationss:string[][] = permutationCombination.toArray();
+const permutationCombinationsCount = permutationCombination.length;
+
+const limitedBaseN = Combinatorics.baseN(["a", "b", "c"], 2);
+const baseN = Combinatorics.baseN(["a", "b", "c"]);
+const nextbaseN:string[] = baseN.next();
+baseN.forEach((i:string[]) => console.log(i));
+const baseNsLengths:number[] = baseN.map((i:string[]) => i.length);
+const filteredbaseNs:string[][] = baseN.filter((i:string[]) => i.length > 0);
+const allbaseNs:string[][] = baseN.toArray();
+const baseNsCount = baseN.length;
+const nthbaseN:string[] = baseN.nth(3);
+
+const cartesianProduct1 = Combinatorics.cartesianProduct(["a", "b", "c"]);
+const nextCartesianProduct1:[string] = cartesianProduct1.next();
+cartesianProduct1.forEach((i:[string]) => console.log(i));
+const cartesianProduct1sLengths:number[] = cartesianProduct1.map((i:[string]) => i.length);
+const filteredCartesianProduct1s:[string][] = cartesianProduct1.filter((i:[string]) => i.length > 0);
+const allCartesianProduct1s:[string][] = cartesianProduct1.toArray();
+const cartesianProduct1sCount = cartesianProduct1.length;
+const nthCartesianProduct1:[string] = cartesianProduct1.nth(3);
+const cartesianProduct1ByCoords:[string] = cartesianProduct1.get(1);
+
+const cartesianProduct2 = Combinatorics.cartesianProduct(["a", "b", "c"], [1, 2, 3]);
+const nextCartesianProduct2:[string, number] = cartesianProduct2.next();
+cartesianProduct2.forEach((i:[string, number]) => console.log(i));
+const cartesianProduct2sLengths:number[] = cartesianProduct2.map((i:[string, number]) => i.length);
+const filteredCartesianProduct2s:[string, number][] = cartesianProduct2.filter((i:[string, number]) => i.length > 0);
+const allCartesianProduct2s:[string, number][] = cartesianProduct2.toArray();
+const cartesianProduct2sCount = cartesianProduct2.length;
+const nthCartesianProduct2:[string, number] = cartesianProduct2.nth(3);
+const cartesianProduct2ByCoords:[string, number] = cartesianProduct2.get(1, 1);
+
+const cartesianProduct3 = Combinatorics.cartesianProduct(["a", "b", "c"], [1, 2, 3], [true, false]);
+const nextCartesianProduct3:[string, number, boolean] = cartesianProduct3.next();
+cartesianProduct3.forEach((i:[string, number, boolean]) => console.log(i));
+const cartesianProduct3sLengths:number[] = cartesianProduct3.map((i:[string, number, boolean]) => i.length);
+const filteredCartesianProduct3s:[string, number, boolean][] = cartesianProduct3.filter((i:[string, number, boolean]) => i.length > 0);
+const allCartesianProduct3s:[string, number, boolean][] = cartesianProduct3.toArray();
+const cartesianProduct3sCount = cartesianProduct3.length;
+const nthCartesianProduct3:[string, number, boolean] = cartesianProduct3.nth(3);
+const cartesianProduct3ByCoords:[string, number, boolean] = cartesianProduct3.get(1, 1);
+
+const cartesianProductAny = Combinatorics.cartesianProduct(["a", 1, true], [false, 2, "b"]);
+const nextCartesianProductAny:any[] = cartesianProductAny.next();
+cartesianProductAny.forEach((i:any[]) => console.log(i));
+const cartesianProductAnysLengths:number[] = cartesianProductAny.map((i:any[]) => i.length);
+const filteredCartesianProductAnys:any[][] = cartesianProductAny.filter((i:any[]) => i.length > 0);
+const allCartesianProductAnys:any[][] = cartesianProductAny.toArray();
+const cartesianProductAnysCount = cartesianProductAny.length;
+const nthCartesianProductAny:any[] = cartesianProductAny.nth(3);
+const cartesianProductAnyByCoords:any[] = cartesianProductAny.get(1, 1);
+
+const version:string = Combinatorics.VERSION;
diff --git a/js-combinatorics/js-combinatorics.d.ts b/js-combinatorics/js-combinatorics.d.ts
new file mode 100644
index 000000000..270e98b64
--- /dev/null
+++ b/js-combinatorics/js-combinatorics.d.ts
@@ -0,0 +1,135 @@
+// Type definitions for js-combinatorics v0.5.0
+// Project: https://github.com/dankogai/js-combinatorics
+// Definitions by: Vasya Aksyonov <https://github.com/outring>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare namespace __Combinatorics {
+
+	interface IGenerator<T> {
+
+		/**
+		 * Returns the element or undefined if no more element is available.
+		 */
+		next():T;
+
+		/**
+		 * Applies the callback function for each element.
+		 */
+		forEach(f:(item:T) => void):void;
+
+		/**
+		 * All elements at once with function applied to each element.
+		 */
+		map<TResult>(f:(item:T) => TResult):TResult[];
+
+		/**
+		 * Returns an array with elements that passes the filter function.
+		 */
+		filter(predicate:(item:T) => boolean):T[];
+
+		/**
+		 * All elements at once.
+		 */
+		toArray():T[];
+
+		/**
+		 * Returns the number of elements to be generated which equals to generator.toArray().length
+		 * but it is precalculated without actually generating elements.
+		 * Handy when you prepare for large iteration.
+		 */
+		length:number;
+
+	}
+
+	interface IPredictableGenerator<T> extends IGenerator<T> {
+
+		/**
+		 * Returns the nth element (starting 0).
+		 */
+		nth(n:number):T;
+
+	}
+
+	interface ICartesianProductGenerator<T> extends IPredictableGenerator<T> {
+
+		/**
+		 * Arguments are coordinates in integer.
+		 * Arguments can be out of bounds but it returns undefined in such cases.
+		 */
+		get(...coordinates:number[]):T;
+
+	}
+
+	/**
+	 * Calculates m P n
+	 */
+	function P(m:number, n:number):number;
+
+	/**
+	 * Calculates m C n
+	 */
+	function C(m:number, n:number):number;
+
+	/**
+	 * Calculates n!
+	 */
+	function factorial(n:number):number;
+
+	/**
+	 * Returns the factoradic representation of n in array, in least significant order.
+	 * See http://en.wikipedia.org/wiki/Factorial_number_system
+	 */
+	function factoradic(n:number):number[];
+
+	/**
+	 * Generates the power set of array.
+	 */
+	function power<T>(a:T[]):IPredictableGenerator<T[]>;
+
+	/**
+	 * Generates the combination of array with n elements.
+	 * When n is ommited, the length of the array is used.
+	 */
+	function combination<T>(a:T[], n?:number):IGenerator<T[]>;
+
+	/**
+	 * Generates the permutation of array with n elements.
+	 * When n is ommited, the length of the array is used.
+	 */
+	function permutation<T>(a:T[], n?:number):IGenerator<T[]>;
+
+	/**
+	 * Generates the permutation of the combination of n.
+	 * Equivalent to permutation(combination(a)), but more efficient.
+	 */
+	function permutationCombination<T>(a:T[]):IGenerator<T[]>;
+
+	/**
+	 * Generates n-digit "numbers" where each digit is an element in array.
+	 * Note this "number" is in the least significant order.
+	 * When n is ommited, the length of the array is used.
+	 */
+	function baseN<T>(a:T[], n?:number):IPredictableGenerator<T[]>;
+
+	/**
+	 * Generates the cartesian product of the arrays. All arguments must be arrays with more than one element.
+	 */
+	function cartesianProduct<T1>(a1:T1[]):ICartesianProductGenerator<[T1]>;
+	function cartesianProduct<T1, T2>(a1:T1[], a2:T2[]):ICartesianProductGenerator<[T1, T2]>;
+	function cartesianProduct<T1, T2, T3>(a1:T1[], a2:T2[], a3:T3[]):ICartesianProductGenerator<[T1, T2, T3]>;
+	function cartesianProduct<T1, T2, T3, T4>(a1:T1[], a2:T2[], a3:T3[], a4:T4[]):ICartesianProductGenerator<[T1, T2, T3, T4]>;
+	function cartesianProduct<T1, T2, T3, T4, T5>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5]>;
+	function cartesianProduct<T1, T2, T3, T4, T5, T6>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6]>;
+	function cartesianProduct<T1, T2, T3, T4, T5, T6, T7>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[], a7:T7[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6, T7]>;
+	function cartesianProduct<T1, T2, T3, T4, T5, T6, T7, T8>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[], a7:T7[], a8:T8[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6, T7, T8]>;
+	function cartesianProduct<T1, T2, T3, T4, T5, T6, T7, T8, T9>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[], a7:T7[], a8:T8[], a9:T9[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
+	function cartesianProduct<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[], a7:T7[], a8:T8[], a9:T9[], a10:T10[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
+	function cartesianProduct(...a:any[][]):ICartesianProductGenerator<any[]>;
+
+	const VERSION:string;
+
+}
+
+declare module "js-combinatorics" {
+	export = __Combinatorics;
+}
diff --git a/js-data-angular/js-data-angular.d.ts b/js-data-angular/js-data-angular.d.ts
index 242c6d5ab..1fff95afb 100644
--- a/js-data-angular/js-data-angular.d.ts
+++ b/js-data-angular/js-data-angular.d.ts
@@ -13,16 +13,12 @@ declare module JSData {
     }
 
     interface DS {
-
-        bindAll<T>(resourceName:string, params:DSFilterParams, scope:ng.IScope, expr:string, cb?:(err:DSError, items:Array<T>)=>void):Function;
-
-        bindOne<T>(resourceName:string, id:string | number, scope:ng.IScope, expr:string, cb?:(err:DSError, item:T)=>void):Function;
+        bindAll<T>(resourceName:string, params:DSFilterParams, scope:ng.IScope, expr:string, cb?:(err:DSError, items:Array<T & DSInstanceShorthands<T>>)=>void):Function;
+        bindOne<T>(resourceName:string, id:string | number, scope:ng.IScope, expr:string, cb?:(err:DSError, item:T & DSInstanceShorthands<T>)=>void):Function;
     }
 
     interface DSResourceDefinition<T> {
-
-        bindAll<T>(params:DSFilterParams, scope:ng.IScope, expr:string, cb?:(err:DSError, items:Array<T>)=>void):Function;
-
-        bindOne<T>(id:string | number, scope:ng.IScope, expr:string, cb?:(err:DSError, item:T)=>void):Function;
+        bindAll(params:DSFilterParams, scope:ng.IScope, expr:string, cb?:(err:DSError, items:Array<T & DSInstanceShorthands<T>>)=>void):Function;
+        bindOne(id:string | number, scope:ng.IScope, expr:string, cb?:(err:DSError, item:T & DSInstanceShorthands<T>)=>void):Function;
     }
-}
\ No newline at end of file
+}
diff --git a/js-data-http/js-data-http-tests.ts b/js-data-http/js-data-http-tests.ts
index 00457d714..390e20aa9 100644
--- a/js-data-http/js-data-http-tests.ts
+++ b/js-data-http/js-data-http-tests.ts
@@ -28,7 +28,7 @@ ADocument.inject({ id: 5, author: 'John' });
 ADocument.inject({ id: 6, author: 'John' });
 
 // bypass the data store
-adapter.updateAll<{ id?: number; author: string; }>(ADocument, { author: 'Johnny' }, { author: 'John' }).then(function (documents) {
+adapter.updateAll(ADocument, { author: 'Johnny' }, { author: 'John' }).then(function (documents) {
     documents[0]; // { id: 5, author: 'Johnny' }
 
     // The updated documents have NOT been injected into the data store because we bypassed the data store
@@ -37,7 +37,7 @@ adapter.updateAll<{ id?: number; author: string; }>(ADocument, { author: 'Johnny
 });
 
 // Normally you would just go through the data store
-ADocument.updateAll<{ id?: number; author: string; }>({ author: 'Johnny' }, { author: 'John' }).then(function (documents) {
+ADocument.updateAll({ author: 'Johnny' }, { author: 'John' }).then(function (documents) {
     documents[0]; // { id: 5, author: 'Johnny' }
 
     // the updated documents have been injected into the data store
diff --git a/js-data-http/js-data-http.d.ts b/js-data-http/js-data-http.d.ts
index 295e7cc6f..5116f3972 100644
--- a/js-data-http/js-data-http.d.ts
+++ b/js-data-http/js-data-http.d.ts
@@ -6,7 +6,7 @@
 /// <reference path="../js-data/js-data.d.ts" />
 
 declare module JSData {
-    
+
     interface DSHttpAdapterOptions {
         serialize?: (resourceName:string, data:any)=>any;
         deserialize?: (resourceName:string, data:any)=>any;
@@ -37,4 +37,8 @@ declare module JSData {
     }
 }
 
-declare var DSHttpAdapter:JSData.DSHttpAdapter;
\ No newline at end of file
+declare var DSHttpAdapter:JSData.DSHttpAdapter;
+
+declare module 'js-data-http' {
+    export = DSHttpAdapter;
+}
diff --git a/js-data/js-data-node-tests.ts b/js-data/js-data-node-tests.ts
index a0b39a161..e1989bb20 100644
--- a/js-data/js-data-node-tests.ts
+++ b/js-data/js-data-node-tests.ts
@@ -1,17 +1,15 @@
-/// <reference path="js-data.d.ts" />
+/// <reference path="../js-data-http/js-data-http.d.ts" />
 
 import JSData = require('js-data');
-//TODO
-//import DSRedisAdapter = require('js-data-redis')
+import DSHttpAdapter = require('js-data-http')
 var store = new JSData.DS();
 
 // register and use http by default for async operations
-//TODO
-//store.registerAdapter('redis', new DSRedisAdapter(), {default: true});
+store.registerAdapter('redis', new DSHttpAdapter(), {default: true});
 
 // simplest model definition
 var User = store.defineResource('user');
 
 User.find(1).then(function (user: any) {
     user; // { id: 1, name: 'John' }
-});
\ No newline at end of file
+});
diff --git a/js-data/js-data-tests.ts b/js-data/js-data-tests.ts
index c6fe6d13b..91bac2987 100644
--- a/js-data/js-data-tests.ts
+++ b/js-data/js-data-tests.ts
@@ -11,7 +11,7 @@ interface IUser {
 }
 
 interface IUserWithMethod extends IUser {
-    fullName?: () => string;
+    fullName:()=>string;
 }
 
 interface IUserWithComputedProperty extends IUser {
@@ -20,10 +20,6 @@ interface IUserWithComputedProperty extends IUser {
 
 var store = new JSData.DS();
 
-// register and use http by default for async operations
-//TODO
-//store.registerAdapter('http', new DSHttpAdapter(), {default: true});
-
 // simplest model definition
 var User = store.defineResource<IUser>('user');
 
@@ -31,12 +27,12 @@ User.find(1).then(function (user:IUser) {
     user; // { id: 1, name: 'John' }
 });
 
-var user:IUser = User.createInstance<IUser>({name: 'John'});
+var user:IUser = User.createInstance({name: 'John'});
 
 var store = new JSData.DS();
-var User = store.defineResource('user');
-var user:IUser = User.inject<IUser>({id: 1, name: 'John'});
-var user2:IUser = User.inject<IUser>({id: 1, age: 30});
+var User2 = store.defineResource('user');
+var user:IUser = User2.inject({id: 1, name: 'John'});
+var user2:IUser = User2.inject({id: 1, age: 30});
 
 user; // User { id: 1, name: 'John', age: 30 }
 user2; // User { id: 1, name: 'John', age: 30 }
@@ -70,7 +66,7 @@ User.create({
 
 var store = new JSData.DS();
 
-var UserWithMethod = store.defineResource<IUserWithMethod>({
+var UserWithMethodResource = store.defineResource<IUserWithMethod>({
     name: 'user',
     methods: {
         fullName: function () {
@@ -79,7 +75,7 @@ var UserWithMethod = store.defineResource<IUserWithMethod>({
     }
 });
 
-var userWithMethod = UserWithMethod.createInstance<IUserWithMethod>({first: 'John', last: 'Anderson'});
+var userWithMethod = UserWithMethodResource.createInstance({first: 'John', last: 'Anderson'});
 
 userWithMethod.fullName(); // "John Anderson"
 
@@ -102,7 +98,7 @@ var UserWithComputedProperty = store.defineResource<IUserWithComputedProperty>({
     }
 });
 
-var userWithComputedProperty:IUserWithComputedProperty = UserWithComputedProperty.inject<IUserWithComputedProperty>({
+var userWithComputedProperty:IUserWithComputedProperty = UserWithComputedProperty.inject({
     id: 1,
     first: 'John',
     last: 'Anderson'
@@ -284,7 +280,7 @@ Post.filter({
     limit: PAGE_SIZE
 });
 
-var User = store.defineResource({
+var User3 = store.defineResource({
     name: 'user',
     relations: {
         hasMany: {
@@ -362,7 +358,7 @@ User.find(10).then(function (user:IUser) {
     user.comments; // undefined
     user.profile; // undefined
 
-    User.loadRelations(user, ['comment', 'profile']).then(function (user:IUser) {
+    User.loadRelations(user.id, ['comment', 'profile']).then(function (user:IUser) {
         user.comments; // array
         user.profile; // object
     });
@@ -403,24 +399,24 @@ OtherOtherComment.update(1, {content: 'stuff'}, {params: {postId: false}}); // P
 
 var store = new JSData.DS({
     // set the default
-    beforeCreate: function (resource, data, cb) {
+    beforeCreate: function (resource:JSData.DSResourceDefinition<any>, data:any, cb:(err:Error, returnData:any)=>void) {
         // do something general
         cb(null, data);
     }
 });
 
-var User = store.defineResource({
+var User4 = store.defineResource({
     name: 'user',
     // set just for this resource
-    beforeCreate: function (resource, data, cb) {
+    beforeCreate: function (resource:JSData.DSResourceDefinition<any>, data:any, cb:(err:Error, returnData:any)=>void) {
         // do something more specific to "users"
         cb(null, data);
     }
 });
 
-User.create({name: 'John'}, {
+User4.create({name: 'John'}, {
     // set just for this method call
-    beforeCreate: function (resource, data, cb) {
+    beforeCreate: function (resource:JSData.DSResourceDefinition<any>, data:any, cb:(err:Error, returnData:any)=>void) {
         // do something specific for this method call
         cb(null, data);
     }
@@ -521,4 +517,86 @@ var store = new JSData.DS();
 
 var myResourceDefinition = store.defineResource<MyResourceDefinition>('myResource');
 
-myResourceDefinition = store.definitions.myResource;
\ No newline at end of file
+myResourceDefinition = store.definitions.myResource;
+
+/**
+ * Custom action on datastore resource
+ */
+
+interface Resource {
+    someProp:string;
+}
+
+interface ActionsForResource {
+    myAction:JSData.DSActionFn;
+    myOtherAction:JSData.DSActionFn;
+}
+
+var myOtherAction:JSData.DSActionConfig = {
+    method: 'GET',
+    endpoint: 'goHere'
+};
+
+var customActionResource = store.defineResource<Resource, ActionsForResource>({
+    name: 'actionResource',
+    actions: {
+        myAction: {
+            method: 'POST'
+        },
+        myOtherAction: myOtherAction
+    }
+});
+
+customActionResource.myAction<number>(3).then((result)=>{
+
+    var theCustomResult:number = result;
+});
+
+customActionResource.myOtherAction<void>(2, {data:'blub'}).then(()=>{
+    // success
+});
+
+customActionResource.find(1).then((result)=>{
+
+    var aProperty = result.someProp;
+});
+
+/**
+ * Instance shorthands
+ */
+
+var customActionResourceInstance = customActionResource.get(1);
+
+customActionResourceInstance.DSCompute();
+customActionResourceInstance.DSChanges();
+customActionResourceInstance.DSChangeHistory();
+customActionResourceInstance.DSHasChanges();
+customActionResourceInstance.DSLastModified();
+customActionResourceInstance.DSLastSaved();
+customActionResourceInstance.DSPrevious();
+customActionResourceInstance.DSCreate();
+customActionResourceInstance.DSDestroy();
+customActionResourceInstance.DSLoadRelations('myRelation');
+customActionResourceInstance.DSRefresh();
+customActionResourceInstance.DSSave();
+customActionResourceInstance.DSUpdate();
+
+/**
+ * Events
+ */
+
+function myEvtHandler(definition:JSData.DSResourceDefinition<Resource>, item:Resource) {
+
+}
+
+store.on("DS.change", myEvtHandler);
+store.off("DS.change", myEvtHandler);
+store.emit("DS.change", customActionResource, customActionResourceInstance);
+
+customActionResource.on("DS.change", myEvtHandler);
+customActionResource.off("DS.change", myEvtHandler);
+customActionResource.emit("DS.change", customActionResource, customActionResourceInstance);
+
+customActionResourceInstance.on("DS.change", myEvtHandler);
+customActionResourceInstance.off("DS.change", myEvtHandler);
+customActionResourceInstance.emit("DS.change", customActionResource, customActionResourceInstance);
diff --git a/js-data/js-data.d.ts b/js-data/js-data.d.ts
index 604b70e6c..54b3a77b6 100644
--- a/js-data/js-data.d.ts
+++ b/js-data/js-data.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for JSData v1.5.4
+// Type definitions for JSData v2.8.0
 // Project: https://github.com/js-data/js-data
 // Definitions by: Stefan Steinhart <https://github.com/reppners>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -7,135 +7,66 @@
 // js-data module (js-data.js)
 ///////////////////////////////////////////////////////////////////////////////
 
-// defining what exists in JSData and how it looks
 declare module JSData {
 
     interface JSDataPromise<R> {
+        then<U>(onFulfilled?:(value:R) => U | JSDataPromise<U>, onRejected?:(error:any) => U | JSDataPromise<U>): JSDataPromise<U>;
 
-        then<U>(onFulfilled?: (value: R) => U | JSDataPromise<U>,  onRejected?: (error: any) => U | JSDataPromise<U>): JSDataPromise<U>;
-
-        catch<U>(onRejected?: (error: any) => U | JSDataPromise<U>): JSDataPromise<U>;
+        catch<U>(onRejected?:(error:any) => U | JSDataPromise<U>): JSDataPromise<U>;
 
         // enhanced with finally
         finally<U>(finallyCb?:() => U):JSDataPromise<U>;
     }
 
-    //TODO switch to class again when typescript supports open ended class declaration
-    interface DS {
-
-        new(config?:DSConfiguration):DS;
-
-        // rather undocumented
-        errors:DSErrors;
-
-        // those are objects containing the defined resources and adapters
-        definitions:any;
-        adapters:any;
-
-        defaults:DSConfiguration;
-
-        // async
-        create<T>(resourceName:string, attrs:Object, options?:DSConfiguration):JSDataPromise<T>;
-        destroy(resourceName:string, id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<any>;
-        destroyAll(resourceName:string, params?:DSFilterParams, options?:DSAdapterOperationConfiguration):JSDataPromise<any>;
-        find<T>(resourceName:string, id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<T>;
-        findAll<T>(resourceName:string, params?:DSFilterParams, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T>>;
-        loadRelations<T>(resourceName:string, idOrInstance:string | number | Object, relations:string | Array<string>, options?:DSAdapterOperationConfiguration):JSDataPromise<T>;
-        update<T>(resourceName:string, id:string | number, attrs:Object, options?:DSSaveConfiguration):JSDataPromise<T>;
-        updateAll<T>(resourceName:string, attrs:Object, params?:DSFilterParams, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T>>;
-        reap(resourceName:string, options?:DSConfiguration):JSDataPromise<any>;
-        refresh<T>(resourceName:string, id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<T>;
-        save<T>(resourceName:string, id:string | number, options?:DSSaveConfiguration):JSDataPromise<T>;
-
-        // sync
-        changeHistory(resourceName:string, id?:string | number):Array<Object>;
-        changes(resourceName:string, id:string | number):Object;
-        compute<T>(resourceName:string, idOrInstance:number | string | Object ):T;
-        createInstance<T>(resourceName:string, attrs?:T, options?:DSAdapterOperationConfiguration):T;
-        defineResource<T>(resourceNameOrDefinition:string | DSResourceDefinitionConfiguration):DSResourceDefinition<T>;
-        digest():void;
-        eject<T>(resourceName:string, id:string | number, options?:DSConfiguration):T;
-        ejectAll<T>(resourceName:string, params:DSFilterParams, options?:DSConfiguration):Array<T>;
-        filter<T>(resourceName:string, params:DSFilterParams, options?:DSConfiguration):Array<T>;
-        get<T>(resourceName:string, id:string | number, options?:DSConfiguration):T;
-        getAll<T>(resourceName:string, ids?:Array<string | number>):Array<T>;
-        hasChanges(resourceName:string, id:string | number):boolean;
-        inject<T>(resourceName:string, attrs:T, options?:DSConfiguration):T;
-        inject<T>(resourceName:string, items:Array<T>, options?:DSConfiguration):Array<T>;
-        is(resourceName:string, object:Object): boolean;
-        lastModified(resourceName:string, id?:string | number):number; // timestamp
-        lastSaved(resourceName:string, id?:string | number):number; // timestamp
-        link<T>(resourceName:string, id:string | number, relations?:Array<string>):T;
-        linkAll<T>(resourceName:string, params:DSFilterParams, relations?:Array<string>):T;
-        linkInverse<T>(resourceName:string, id:string | number, relations?:Array<string>):T;
-        previous<T>(resourceName:string, id:string | number):T;
-        unlinkInverse<T>(resourceName:string, id:string | number, relations?:Array<string>):T;
-
-        registerAdapter(adapterId:string, adapter:IDSAdapter, options?:{default: boolean}):void;
-    }
-
     interface DSConfiguration extends IDSResourceLifecycleEventHandlers {
         actions?: Object;
         allowSimpleWhere?: boolean;
         basePath?: string;
         bypassCache?: boolean;
         cacheResponse?: boolean;
+        clearEmptyQueries?:boolean;
+        debug?:boolean;
         defaultAdapter?: string;
-        defaultFilter?: (collection:Array<any>, resourceName:string, params:DSFilterParams, options:DSConfiguration)=>Array<any>;
+        defaultFilter?: (collection:Array<any>, resourceName:string, params:DSFilterArg, options:DSConfiguration)=>Array<any>;
+        defaultValues?:Object;
         eagerEject?: boolean;
-        // TODO enable when eagerInject in DS#create is implemented
-        //eagerInject?: boolean;
         endpoint?: string;
         error?: boolean | ((message?:any, ...optionalParams:any[])=> void);
         fallbackAdapters?: Array<string>;
         findAllFallbackAdapters?: Array<string>;
         findAllStrategy?: string;
-        findBelongsTo?: boolean;
         findFallbackAdapters?: Array<string>;
-        findHasOne?: boolean;
-        findHasMany?: boolean;
-        findInverseLinks?: boolean;
         findStrategy?: string
+        findStrictCache?:boolean;
         idAttribute?: string;
         ignoredChanges?: Array<RegExp | string>;
-        // TODO ignoreMissing is undocumented
-        //ignoreMissing: boolean;
+        ignoreMissing?: boolean;
+        instanceEvents?:boolean;
         keepChangeHistory?: boolean;
-        loadFromServer?: boolean;
-        log?: boolean | ((message?: any, ...optionalParams: any[])=> void);
+        linkRelations?:boolean;
+        log?: boolean | ((message?:any, ...optionalParams:any[])=> void);
         maxAge?: number;
         notify?: boolean;
+        omit?:Array<string|RegExp>;
+        onConflict?:string; // "merge"(default) or "replace"
         reapAction?: string;
         reapInterval?: number;
+        relationsEnumerable?:boolean;
         resetHistoryOnInject?: boolean;
+        returnMeta?:boolean;
+        scopes?:Object;
         strategy?: string;
         upsert?: boolean;
         useClass?: boolean;
         useFilter?: boolean;
-    }
-
-    interface DSAdapterOperationConfiguration extends DSConfiguration {
-        adapter?: string;
-        bypassCache?: boolean;
-        cacheResponse?: boolean;
-        findStrategy?: string;
-        findFallbackAdapters?: string[];
-        strategy?: string;
-        fallbackAdapters?: string[];
-
-        params: {
-            [paramName: string]: string | number | boolean;
-        };
-    }
-
-    interface DSSaveConfiguration extends DSAdapterOperationConfiguration {
-        changesOnly?: boolean;
+        watchChanges?:boolean;
     }
 
     interface DSResourceDefinitionConfiguration extends DSConfiguration {
-        name: string;
         computed?: any;
+        meta?:any;
         methods?: any;
+        name: string;
         relations?: {
             hasMany?: Object;
             hasOne?: Object;
@@ -143,46 +74,6 @@ declare module JSData {
         };
     }
 
-    interface DSResourceDefinition<T> extends DSResourceDefinitionConfiguration {
-
-        //async
-        create<T>(attrs:Object, options?:DSConfiguration):JSDataPromise<T>;
-        destroy(id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<any>;
-        destroyAll(params?:DSFilterParams, options?:DSAdapterOperationConfiguration):JSDataPromise<any>;
-        find<T>(id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<T>;
-        findAll<T>(params?:DSFilterParams, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T>>;
-        loadRelations<T>(idOrInstance:string | number | Object, relations:string | Array<string>, options?:DSAdapterOperationConfiguration):JSDataPromise<T>;
-        update<T>(id:string | number, attrs:Object, options?:DSSaveConfiguration):JSDataPromise<T>;
-        updateAll<T>(attrs:Object, params?:DSFilterParams & T, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T>>;
-        reap(resourceNametions?:DSConfiguration):JSDataPromise<any>;
-        refresh<T>(id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<T>;
-        save<T>(id:string | number, options?:DSSaveConfiguration):JSDataPromise<T>;
-
-        // sync
-        changeHistory(id?:string | number):Array<Object>;
-        changes(id:string | number):Object;
-        compute<T>(idOrInstance:number | string | Object ):T;
-        createInstance<T>(attrs?:T, options?:DSAdapterOperationConfiguration):T;
-        digest():void;
-        eject<T>(id:string | number, options?:DSConfiguration):T;
-        ejectAll<T>(params:DSFilterParams, options?:DSConfiguration):Array<T>;
-        filter<T>(params: DSFilterParams, options?: DSConfiguration): Array<T>;
-        filter<T>(params: DSFilterParamsForAllowSimpleWhere, options?: DSConfiguration): Array<T>;
-        get<T>(id:string | number, options?:DSConfiguration):T;
-        getAll<T>(ids?:Array<string | number>):Array<T>;
-        hasChanges(id:string | number):boolean;
-        inject<T>(attrs:T, options?:DSConfiguration):T;
-        inject<T>(items:Array<T>, options?:DSConfiguration):Array<T>;
-        is(object:Object): boolean;
-        lastModified(id?:string | number):number; // timestamp
-        lastSaved(id?:string | number):number; // timestamp
-        link<T>(id:string | number, relations?:Array<string>):T;
-        linkAll<T>(params:DSFilterParams, relations?:Array<string>):T;
-        linkInverse<T>(id:string | number, relations?:Array<string>):T;
-        previous<T>(id:string | number):T;
-        unlinkInverse<T>(id:string | number, relations?:Array<string>):T;
-    }
-
     interface DSFilterParams {
         where?: Object;
 
@@ -195,49 +86,194 @@ declare module JSData {
         sort?: string | Array<string> | Array<Array<string>>;
     }
 
-    interface DSFilterParamsForAllowSimpleWhere {
-        [key: string]: string | number;
+    type DSFilterArg = DSFilterParams | Object;
+
+    interface DSAdapterOperationConfiguration extends DSConfiguration {
+        adapter?: string;
+        params?: {
+            [paramName: string]: string | number | boolean;
+        };
     }
 
+    interface DSSaveConfiguration extends DSAdapterOperationConfiguration {
+        changesOnly?: boolean;
+    }
+
+    interface DSCollection<T> extends Array<T> {
+        fetch(params?:DSFilterArg, options?:DSConfiguration):JSDataPromise<Array<T & DSInstanceShorthands<T>>>;
+        params:DSFilterArg;
+        resourceName:string;
+    }
+
+    interface DSEvents {
+        on(name:string, handler:(...args:any[])=>void):void;
+        off(name:string, handler:(...args:any[])=>void):void;
+        emit(name:string, ...args:any[]):void;
+    }
+
+    interface DS extends DSEvents {
+        new(config?:DSConfiguration):DS;
+
+        // rather undocumented
+        errors:DSErrors;
+
+        // those are objects containing the defined resources and adapters
+        definitions:any;
+        adapters:any;
+
+        defaults:DSConfiguration;
+
+        changeHistory(resourceName:string, id:string | number):Array<Object>;
+        changes(resourceName:string, id:string | number, options?:{ignoredChanges:Array<string|RegExp>}):Object;
+        clear<T>():Array<T & DSInstanceShorthands<T>>;
+        compute<T>(resourceName:string, idOrInstance:number | string | T):T & DSInstanceShorthands<T>;
+        create<T>(resourceName:string, attrs:Object, options?:DSConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        createCollection<T>(resourceName:string, array?:Array<T>, params?:DSFilterArg, options?:DSConfiguration):DSCollection<T & DSInstanceShorthands<T>>;
+        createInstance<T>(resourceName:string, attrs?:Object, options?:DSConfiguration):T & DSInstanceShorthands<T>;
+        destroy(resourceName:string, id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<void>;
+        destroyAll(resourceName:string, params?:DSFilterArg, options?:DSAdapterOperationConfiguration):JSDataPromise<void>;
+        digest():void;
+        eject<T>(resourceName:string, id:string | number, options?:DSConfiguration):T & DSInstanceShorthands<T>;
+        ejectAll<T>(resourceName:string, params:DSFilterArg, options?:DSConfiguration):Array<T & DSInstanceShorthands<T>>;
+        filter<T>(resourceName:string, params:DSFilterArg, options?:DSConfiguration):Array<T & DSInstanceShorthands<T>>;
+        find<T>(resourceName:string, id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        findAll<T>(resourceName:string, params?:DSFilterArg, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T & DSInstanceShorthands<T>>>;
+        get<T>(resourceName:string, id:string | number):T & DSInstanceShorthands<T>;
+        getAll<T>(resourceName:string, ids?:Array<string | number>):Array<T & DSInstanceShorthands<T>>;
+        hasChanges(resourceName:string, id:string | number):boolean;
+        inject<TInject, U>(resourceName:string, attrs:TInject, options?:DSConfiguration):U & DSInstanceShorthands<U>;
+        inject<TInject, U>(resourceName:string, items:Array<TInject>, options?:DSConfiguration):Array<U & DSInstanceShorthands<U>>;
+        is(resourceName:string, object:Object): boolean;
+        lastModified(resourceName:string, id?:string | number):number; // timestamp
+        lastSaved(resourceName:string, id?:string | number):number; // timestamp
+        loadRelations<T>(resourceName:string, idOrInstance:string | number, relations:string | Array<string>, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        previous<T>(resourceName:string, id:string | number):T & DSInstanceShorthands<T>;
+        reap(resourceName:string):JSDataPromise<void>;
+        refresh<T>(resourceName:string, id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        refreshAll<T>(resourceName:string, params?:DSFilterArg, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T & DSInstanceShorthands<T>>>;
+        revert<T>(resourceName:string, id:string | number):T & DSInstanceShorthands<T>;
+        save<T>(resourceName:string, id:string | number, options?:DSSaveConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        update<T>(resourceName:string, id:string | number, attrs:Object, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        updateAll<T>(resourceName:string, attrs:Object, params?:DSFilterArg, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T & DSInstanceShorthands<T>>>;
+
+        defineResource<T>(resourceNameOrDefinition:string | DSResourceDefinitionConfiguration):DSResourceDefinition<T>;
+        defineResource<T, TActions>(resourceNameOrDefinition:string | DSResourceDefinitionConfiguration):DSResourceDefinition<T> & TActions;
+        registerAdapter(adapterId:string, adapter:IDSAdapter, options?:{default: boolean}):void;
+    }
+
+    interface DSResourceDefinition<T> extends DSResourceDefinitionConfiguration, DSEvents {
+        changeHistory(id:string | number):Array<Object>;
+        changes(id:string | number, options?:{ignoredChanges:Array<string|RegExp>}):Object;
+        clear():Array<T & DSInstanceShorthands<T>>;
+        compute(idOrInstance:number | string | T):T & DSInstanceShorthands<T>;
+        create(attrs:Object, options?:DSConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        createCollection(array?:Array<T>, params?:DSFilterArg, options?:DSConfiguration):DSCollection<T & DSInstanceShorthands<T>>;
+        createInstance(attrs?:Object, options?:DSConfiguration):T & DSInstanceShorthands<T>;
+        destroy(id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<void>;
+        destroyAll(params?:DSFilterArg, options?:DSAdapterOperationConfiguration):JSDataPromise<void>;
+        digest():void;
+        eject(id:string | number, options?:DSConfiguration):T & DSInstanceShorthands<T>;
+        ejectAll(params:DSFilterArg, options?:DSConfiguration):Array<T & DSInstanceShorthands<T>>;
+        filter(params:DSFilterArg, options?:DSConfiguration):Array<T & DSInstanceShorthands<T>>;
+        find(id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        findAll(params?:DSFilterArg, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T & DSInstanceShorthands<T>>>;
+        get(id:string | number):T & DSInstanceShorthands<T>;
+        getAll(ids?:Array<string | number>):Array<T & DSInstanceShorthands<T>>;
+        hasChanges(id:string | number):boolean;
+        inject<TInject>(attrs:TInject, options?:DSConfiguration):T & DSInstanceShorthands<T>;
+        inject<TInject>(items:Array<TInject>, options?:DSConfiguration):Array<T & DSInstanceShorthands<T>>;
+        is(object:Object): boolean;
+        lastModified(id?:string | number):number; // timestamp
+        lastSaved(id?:string | number):number; // timestamp
+        loadRelations(idOrInstance:string | number, relations:string | Array<string>, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        previous(id:string | number):T & DSInstanceShorthands<T>;
+        reap():JSDataPromise<void>;
+        refresh(id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        refreshAll(params?:DSFilterArg, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T & DSInstanceShorthands<T>>>;
+        revert(id:string | number):T & DSInstanceShorthands<T>;
+        save(id:string | number, options?:DSSaveConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        update(id:string | number, attrs:Object, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        updateAll(attrs:Object, params?:DSFilterArg, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T & DSInstanceShorthands<T>>>;
+    }
+
+    // cannot specify T at interface level because the interface is used as generic constraint itself which ends up being recursive
+    export interface DSInstanceShorthands<T> extends DSEvents {
+        DSCompute():void;
+        DSRefresh(options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        DSSave(options?:DSSaveConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        DSUpdate(options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        DSDestroy(options?:DSAdapterOperationConfiguration):JSDataPromise<void>;
+        DSCreate(options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        DSLoadRelations(relations:string | Array<string>, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        DSChangeHistory():Array<Object>;
+        DSChanges():Object;
+        DSHasChanges():boolean;
+        DSLastModified():number; // timestamp
+        DSLastSaved():number; // timestamp
+        DSPrevious():T & DSInstanceShorthands<T>;
+        DSRevert():T & DSInstanceShorthands<T>;
+    }
+
+    type DSSyncLifecycleHookHandler = (resource:DSResourceDefinition<any>, data:any) => void;
+    type DSAsyncLifecycleHookHandler = (resource:DSResourceDefinition<any>, data:any) => JSDataPromise<any>;
+    type DSAsyncLifecycleHookHandlerCb = (resource:DSResourceDefinition<any>, data:any, cb:(err:Error, data:any)=>void) => void
+
     interface IDSResourceLifecycleValidateEventHandlers {
-        beforeValidate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
-        validate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
-        afterValidate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
+        beforeValidate?: DSAsyncLifecycleHookHandler | DSAsyncLifecycleHookHandlerCb;
+        validate?: DSAsyncLifecycleHookHandler | DSAsyncLifecycleHookHandlerCb;
+        afterValidate?: DSAsyncLifecycleHookHandler | DSAsyncLifecycleHookHandlerCb;
     }
 
     interface IDSResourceLifecycleCreateEventHandlers {
-        beforeCreate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
-        afterCreate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
-    }
-
-    interface IDSResourceLifecycleCreateInstanceEventHandlers {
-        beforeCreateInstance?: (resourceName:string, data:any)=>void;
-        afterCreateInstance?: (resourceName:string, data:any)=>void;
+        beforeCreate?: DSAsyncLifecycleHookHandler | DSAsyncLifecycleHookHandlerCb;
+        afterCreate?: DSAsyncLifecycleHookHandler | DSAsyncLifecycleHookHandlerCb;
     }
 
     interface IDSResourceLifecycleUpdateEventHandlers {
-        beforeUpdate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
-        afterUpdate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
+        beforeUpdate?: DSAsyncLifecycleHookHandler | DSAsyncLifecycleHookHandlerCb;
+        afterUpdate?: DSAsyncLifecycleHookHandler | DSAsyncLifecycleHookHandlerCb;
     }
 
     interface IDSResourceLifecycleDestroyEventHandlers {
-        beforeDestroy?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
-        afterDestroy?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
+        beforeDestroy?: DSAsyncLifecycleHookHandler | DSAsyncLifecycleHookHandlerCb;
+        afterDestroy?: DSAsyncLifecycleHookHandler | DSAsyncLifecycleHookHandlerCb;
+    }
+
+    interface IDSResourceLifecycleCreateInstanceEventHandlers {
+        beforeCreateInstance?: DSSyncLifecycleHookHandler;
+        afterCreateInstance?: DSSyncLifecycleHookHandler;
     }
 
     interface IDSResourceLifecycleInjectEventHandlers {
-        beforeInject?: (resourceName:string, data:any)=>void;
-        afterInject?: (resourceName:string, data:any)=>void;
+        beforeInject?: DSSyncLifecycleHookHandler;
+        afterInject?: DSSyncLifecycleHookHandler;
     }
 
     interface IDSResourceLifecycleEjectEventHandlers {
-        beforeEject?: (resourceName:string, data:any)=>void;
-        afterEject?: (resourceName:string, data:any)=>void;
+        beforeEject?: DSSyncLifecycleHookHandler;
+        afterEject?: DSSyncLifecycleHookHandler;
     }
 
     interface IDSResourceLifecycleReapEventHandlers {
-        beforeReap?: (resourceName:string, data:any)=>void;
-        afterReap?: (resourceName:string, data:any)=>void;
+        beforeReap?: DSSyncLifecycleHookHandler;
+        afterReap?: DSSyncLifecycleHookHandler;
+    }
+
+    interface IDSResourceLifecycleFindEventHandlers {
+        afterFind?: DSAsyncLifecycleHookHandler | DSAsyncLifecycleHookHandlerCb;
+    }
+
+    interface IDSResourceLifecycleFindAllEventHandlers {
+        afterFindAll?: DSAsyncLifecycleHookHandler | DSAsyncLifecycleHookHandlerCb;
+    }
+
+    interface IDSResourceLifecycleLoadRelationsEventHandlers {
+        afterLoadRelations?: DSAsyncLifecycleHookHandler | DSAsyncLifecycleHookHandlerCb;
+    }
+
+    interface IDSResourceLifecycleCreateCollectionEventHandlers {
+        beforeCreateCollection?: DSSyncLifecycleHookHandler;
+        afterCreateCollection?: DSSyncLifecycleHookHandler;
     }
 
     interface IDSResourceLifecycleEventHandlers extends IDSResourceLifecycleCreateEventHandlers,
@@ -247,8 +283,11 @@ declare module JSData {
         IDSResourceLifecycleDestroyEventHandlers,
         IDSResourceLifecycleInjectEventHandlers,
         IDSResourceLifecycleEjectEventHandlers,
-        IDSResourceLifecycleReapEventHandlers {
-
+        IDSResourceLifecycleReapEventHandlers,
+        IDSResourceLifecycleFindEventHandlers,
+        IDSResourceLifecycleFindAllEventHandlers,
+        IDSResourceLifecycleLoadRelationsEventHandlers,
+        IDSResourceLifecycleCreateCollectionEventHandlers {
     }
 
     // errors
@@ -271,19 +310,31 @@ declare module JSData {
 
     // DSAdapter interface
     interface IDSAdapter {
-        create<T>(config:DSResourceDefinition<T>, attrs:Object, options?:DSConfiguration):JSDataPromise<T>;
+        create(config:DSResourceDefinition<any>, attrs:Object, options?:DSConfiguration):JSDataPromise<any>;
 
-        destroy<T>(config:DSResourceDefinition<T>, id:string | number, options?:DSConfiguration):JSDataPromise<any>;
+        destroy(config:DSResourceDefinition<any>, id:string | number, options?:DSConfiguration):JSDataPromise<void>;
+        destroyAll(config:DSResourceDefinition<any>, params:DSFilterArg, options?:DSConfiguration):JSDataPromise<void>;
 
-        destroyAll<T>(config:DSResourceDefinition<T>, params:DSFilterParams, options?:DSConfiguration):JSDataPromise<any>;
+        find(config:DSResourceDefinition<any>, id:string | number, options?:DSConfiguration):JSDataPromise<any>;
+        findAll(config:DSResourceDefinition<any>, params?:DSFilterArg, options?:DSConfiguration):JSDataPromise<any>;
 
-        find<T>(config:DSResourceDefinition<T>, id:string | number, options?:DSConfiguration):JSDataPromise<T>;
+        update(config:DSResourceDefinition<any>, id:string | number, attrs:Object, options?:DSConfiguration):JSDataPromise<any>;
+        updateAll(config:DSResourceDefinition<any>, attrs:Object, params?:DSFilterArg, options?:DSConfiguration):JSDataPromise<any>;
+    }
 
-        findAll<T>(config:DSResourceDefinition<T>, params?:DSFilterParams, options?:DSConfiguration):JSDataPromise<T>;
+    // Custom action config
+    interface DSActionConfig {
+        adapter?: string;
+        endpoint?: string;
+        pathname?: string;
+        method?: string;
+    }
 
-        update<T>(config:DSResourceDefinition<T>, id:string | number, attrs:Object, options?:DSConfiguration):JSDataPromise<T>;
-
-        updateAll<T>(config:DSResourceDefinition<T>, attrs:Object, params?:DSFilterParams & T, options?:DSConfiguration):JSDataPromise<T[]>;
+    // Custom action method definition
+    // options are passed to adapter.HTTP() method-call, js-data-http adapter by default uses AXIOS but can also be $http in case of angular
+    // or a custom adapter implementation. The adapter can be set via the DSActionConfig.
+    interface DSActionFn {
+        <T>(id:string | number, options?:Object):JSDataPromise<T>
     }
 }
 
@@ -295,6 +346,5 @@ declare var JSData:{
 
 //Support node require
 declare module 'js-data' {
-
     export = JSData;
 }
diff --git a/js-data/legacy/js-data-1.5.4-tests.ts b/js-data/legacy/js-data-1.5.4-tests.ts
new file mode 100644
index 000000000..076db194b
--- /dev/null
+++ b/js-data/legacy/js-data-1.5.4-tests.ts
@@ -0,0 +1,585 @@
+/// <reference path="js-data-1.5.4.d.ts" />
+
+interface IUser {
+    id?: number;
+    name?: string;
+    age?: number;
+    first?: string;
+    last?: string;
+    comments?:Array<any>;
+    profile?:any;
+}
+
+interface IUserWithMethod {
+    fullName:()=>string;
+}
+
+interface IUserWithComputedProperty extends IUser {
+    fullName?: string;
+}
+
+var store = new JSData.DS();
+
+// simplest model definition
+var User = store.defineResource<IUser>('user');
+
+User.find(1).then(function (user:IUser) {
+    user; // { id: 1, name: 'John' }
+});
+
+var user:IUser = User.createInstance({name: 'John'});
+
+var store = new JSData.DS();
+var User2 = store.defineResource('user');
+var user:IUser = User2.inject({id: 1, name: 'John'});
+var user2:IUser = User2.inject({id: 1, age: 30});
+
+user; // User { id: 1, name: 'John', age: 30 }
+user2; // User { id: 1, name: 'John', age: 30 }
+User.get(1); // User { id: 1, name: 'John', age: 30 }
+user === user2; // true
+user === User.get(1); // true
+user2 === User.get(1); // true
+
+var store = new JSData.DS({
+    // set a default lifecycle hook
+    afterCreate: function () {
+    }
+});
+
+var User = store.defineResource<IUser>({
+    name: 'user',
+    // override the hook for this resource
+    afterCreate: function () {
+    }
+});
+
+User.create({
+    name: 'john'
+}, {
+    // override the hook just for this method call
+    afterCreate: function () {
+    }
+}).then(()=> {
+
+});
+
+var store = new JSData.DS();
+
+var UserWithMethodResource = store.defineResource<IUserWithMethod>({
+    name: 'user',
+    methods: {
+        fullName: function () {
+            return this.first + ' ' + this.last;
+        }
+    }
+});
+
+var userWithMethod = UserWithMethodResource.createInstance({first: 'John', last: 'Anderson'});
+
+userWithMethod.fullName(); // "John Anderson"
+
+var store = new JSData.DS();
+
+var UserWithComputedProperty = store.defineResource<IUserWithComputedProperty>({
+    name: 'user',
+    computed: {
+        // each function's argument list defines the fields
+        // that the computed property depends on
+        fullName: ['first', 'last', function (first:string, last:string) {
+            return first + ' ' + last;
+        }],
+        // shortand, use the array syntax above if you want
+        // you computed properties to work after you've
+        // minified your code. Shorthand style won't work when minified
+        initials: function (first:string, last:string) {
+            return first.toUpperCase()[0] + '. ' + last.toUpperCase()[0] + '.';
+        }
+    }
+});
+
+var userWithComputedProperty:IUserWithComputedProperty = UserWithComputedProperty.inject({
+    id: 1,
+    first: 'John',
+    last: 'Anderson'
+});
+
+userWithComputedProperty.fullName; // "John Anderson"
+
+userWithComputedProperty.first = 'Fred';
+
+// js-data relies on dirty-checking, so the
+// computed property (probably) hasn't been updated yet
+userWithComputedProperty.fullName; // "John Anderson"
+
+// If your browser supports Object.observe this will have no effect
+// otherwise it will trigger the dirty-checking
+store.digest();
+
+userWithComputedProperty.fullName; // "Fred Anderson"
+
+interface IComment {
+    comments?: any;
+    profile?: any;
+}
+
+var aComment:JSData.DSResourceDefinition<IComment> = store.defineResource<IComment>('comment');
+
+// Get all comments where comment.userId == 5
+aComment.filter({
+    where: {
+        userId: {
+            '==': 5
+        }
+    }
+});
+
+// Get all comments where comment.userId == 5
+aComment.filter({
+    userId: 5
+});
+
+// Get all comments where comment.userId === 5
+aComment.filter({
+    where: {
+        userId: {
+            '===': 5
+        }
+    }
+});
+
+// Get all comments where comment.userId != 5
+aComment.filter({
+    where: {
+        userId: {
+            '!=': 5
+        }
+    }
+});
+
+// Get all comments where comment.userId !== 5
+aComment.filter({
+    where: {
+        userId: {
+            '!==': 5
+        }
+    }
+});
+
+// Get all users where user.age > 30
+User.filter({
+    where: {
+        age: {
+            '>': 30
+        }
+    }
+});
+
+// Get all users where user.age >= 30
+User.filter({
+    where: {
+        age: {
+            '>=': 30
+        }
+    }
+});
+
+// Get all users where user.age < 30
+User.filter({
+    where: {
+        age: {
+            '<': 30
+        }
+    }
+});
+
+// Get all users where user.name is in "John Anderson"
+User.filter({
+    where: {
+        name: {
+            'in': 'John Anderson'
+        }
+    }
+});
+
+// Get all users where user.role is in ["admin", "owner"]
+User.filter({
+    where: {
+        role: {
+            'in': ['admin', 'owner']
+        }
+    }
+});
+
+// Get all users where user.name is NOT in "John Anderson"
+User.filter({
+    where: {
+        name: {
+            'notIn': 'John Anderson'
+        }
+    }
+});
+
+// Get all users where user.role is NOT in ["admin", "owner"]
+User.filter({
+    where: {
+        role: {
+            'notIn': ['admin', 'owner']
+        }
+    }
+});
+
+// Get all users where user.name contains "John"
+User.filter({
+    where: {
+        name: {
+            'contains': 'John'
+        }
+    }
+});
+
+// Get all users where user.roles contains "admin"
+User.filter({
+    where: {
+        roles: {
+            'contains': 'admin'
+        }
+    }
+});
+
+// Sorts users by age in ascending order
+User.filter({
+    orderBy: 'age'
+});
+
+// Sorts users by age in descending order
+User.filter({
+    orderBy: ['age', 'DESC']
+});
+
+// Sorts users by age in descending order and then sort by name in ascending order to break a tie
+User.filter({
+    orderBy: [
+        ['age', 'DESC'],
+        ['name', 'ASC']
+    ]
+});
+
+var PAGE_SIZE = 20;
+var currentPage = 1;
+
+interface IPost {
+
+}
+
+var Post:JSData.DSResourceDefinition<IPost>;
+
+// Grab the first "page" of posts
+Post.filter({
+    offset: PAGE_SIZE * (currentPage - 1),
+    limit: PAGE_SIZE
+});
+
+var User3 = store.defineResource({
+    name: 'user',
+    relations: {
+        hasMany: {
+            comment: {
+                localField: 'comments',
+                foreignKey: 'userId'
+            }
+        },
+        hasOne: {
+            profile: {
+                localField: 'profile',
+                foreignKey: 'userId'
+            }
+        },
+        belongsTo: {
+            organization: {
+                localKey: 'organizationId',
+                localField: 'organization',
+
+                // if you add this to a belongsTo relation
+                // then js-data will attempt to use
+                // a nested url structure, e.g. /organization/15/user/4
+                parent: true
+            }
+        }
+    }
+});
+
+var Organization = store.defineResource({
+    name: 'organization',
+    relations: {
+        hasMany: {
+            // this is an example of multiple relations
+            // of the same type to the same resource
+            user: [
+                {
+                    localField: 'users',
+                    foreignKey: 'organizationId'
+                },
+                {
+                    localField: 'owners',
+                    foreignKey: 'organizationId'
+                }
+            ]
+        }
+    }
+});
+
+var Profile = store.defineResource({
+    name: 'profile',
+    relations: {
+        belongsTo: {
+            user: {
+                localField: 'user',
+                localKey: 'userId'
+            }
+        }
+    }
+});
+
+var OtherComment = store.defineResource<IComment>({
+    name: 'comment',
+    relations: {
+        belongsTo: {
+            user: {
+                localField: 'user',
+                localKey: 'userId'
+            }
+        }
+    }
+});
+
+User.find(10).then(function (user:IUser) {
+    // let's assume the server only returned the user
+    user.comments; // undefined
+    user.profile; // undefined
+
+    User.loadRelations(user, ['comment', 'profile']).then(function (user:IUser) {
+        user.comments; // array
+        user.profile; // object
+    });
+});
+
+var OtherOtherComment = store.defineResource<IComment>({
+    name: 'comment',
+    relations: {
+        belongsTo: {
+            post: {
+                parent: true,
+                localKey: 'postId',
+                localField: 'post'
+            }
+        }
+    }
+});
+
+// The comment isn't in the data store yet, so js-data wouldn't know
+// what the id of the parent "post" would be, so we pass it in manually
+OtherOtherComment.find(5, {params: {postId: 4}}); // GET /post/4/comment/5
+
+// vs
+
+var promise = OtherOtherComment.find(5); // GET /comment/5
+
+promise.then().catch().finally();
+
+OtherOtherComment.inject(<IComment>{id: 1, postId: 2});
+
+// We don't have to provide the parentKey here
+// because js-data found it in the comment
+OtherOtherComment.update(1, {content: 'stuff'}); // PUT /post/2/comment/1
+
+// If you don't want the nested for just one of the calls then
+// you can do the following:
+OtherOtherComment.update(1, {content: 'stuff'}, {params: {postId: false}}); // PUT /comment/1
+
+var store = new JSData.DS({
+    // set the default
+    beforeCreate: function (resource, data, cb) {
+        // do something general
+        cb(null, data);
+    }
+});
+
+var User4 = store.defineResource({
+    name: 'user',
+    // set just for this resource
+    beforeCreate: function (resource, data, cb) {
+        // do something more specific to "users"
+        cb(null, data);
+    }
+});
+
+User4.create({name: 'John'}, {
+    // set just for this method call
+    beforeCreate: function (resource, data, cb) {
+        // do something specific for this method call
+        cb(null, data);
+    }
+});
+
+module CustomAdapterTest {
+
+    class MyCustomAdapter implements JSData.IDSAdapter {
+
+        // All of the methods shown here must return a promise
+
+// "definition" is a resource defintion that would
+// be returned by DS#defineResource
+
+// "options" would be the options argument that
+// was passed into the DS method that is calling
+// the adapter method
+
+        create(definition:JSData.DSResourceDefinition<any>, attrs:Object, options:JSData.DSConfiguration):JSData.JSDataPromise<any> {
+            // Must resolve the promise with the created item
+
+            var promise:JSData.JSDataPromise<any>;
+            return promise;
+        }
+
+        find(definition:JSData.DSResourceDefinition<any>, id:any, options:JSData.DSConfiguration):JSData.JSDataPromise<any> {
+            // Must resolve the promise with the found item
+
+            var promise:JSData.JSDataPromise<any>;
+            return promise;
+        }
+
+        findAll(definition:JSData.DSResourceDefinition<any>, params:JSData.DSFilterParams, options:JSData.DSConfiguration):JSData.JSDataPromise<any> {
+            // Must resolve the promise with the found items
+
+            var promise:JSData.JSDataPromise<any>;
+            return promise;
+        }
+
+        update(definition:JSData.DSResourceDefinition<any>, id:any, attrs:Object, options:JSData.DSConfiguration):JSData.JSDataPromise<any> {
+            // Must resolve the promise with the updated items
+
+            var promise:JSData.JSDataPromise<any>;
+            return promise;
+        }
+
+        updateAll(definition:JSData.DSResourceDefinition<any>, attrs:Object, params:JSData.DSFilterParams, options:JSData.DSConfiguration):JSData.JSDataPromise<any> {
+            // Must resolve the promise with the updated items
+
+            var promise:JSData.JSDataPromise<any>;
+            return promise;
+        }
+
+        destroy(definition:JSData.DSResourceDefinition<any>, id:any, options:JSData.DSConfiguration):JSData.JSDataPromise<any> {
+            // Must return a promise
+
+            var promise:JSData.JSDataPromise<any>;
+            return promise;
+        }
+
+        destroyAll(definition:JSData.DSResourceDefinition<any>, params:JSData.DSFilterParams, options:JSData.DSConfiguration):JSData.JSDataPromise<any> {
+            // Must return a promise
+
+            var promise:JSData.JSDataPromise<any>;
+            return promise;
+        }
+    }
+
+    var store = new JSData.DS();
+    store.registerAdapter('mca', new MyCustomAdapter(), {default: true});
+    // the data store will now use your custom adapter by default
+}
+
+/**
+ * showing the use of open ended interface to realize typings
+ * on the Datastore.definitions object where all resource definitions
+ * are saved.
+ */
+
+interface MyCustomDataStore {
+
+    myResource: JSData.DSResourceDefinition<MyResourceDefinition>
+}
+
+interface MyResourceDefinition {
+
+}
+
+module JSData {
+
+    interface DS {
+
+        definitions: MyCustomDataStore;
+    }
+}
+
+var store = new JSData.DS();
+
+var myResourceDefinition = store.defineResource<MyResourceDefinition>('myResource');
+
+myResourceDefinition = store.definitions.myResource;
+
+/**
+ * Custom action on datastore resource
+ */
+
+interface Resource {
+    someProp:string;
+}
+
+interface ActionsForResource {
+    myAction:JSData.DSActionFn;
+    myOtherAction:JSData.DSActionFn;
+}
+
+var myOtherAction:JSData.DSActionConfig = {
+    method: 'GET',
+    endpoint: 'goHere'
+};
+
+var resourceWithCustomActions = store.defineResource<Resource, ActionsForResource>({
+    name: 'actionResource',
+    actions: {
+        myAction: {
+            method: 'POST'
+        },
+        myOtherAction: myOtherAction
+    }
+});
+
+resourceWithCustomActions.myAction<number>(3).then((result)=>{
+
+    var theCustomResult:number = result;
+});
+
+resourceWithCustomActions.myOtherAction<void>(2, {data:'blub'}).then(()=>{
+    // success
+});
+
+resourceWithCustomActions.find(1).then((result)=>{
+
+    var aProperty = result.someProp;
+});
+
+/**
+ * Instance shorthands
+ */
+
+var customActionResourceInstance = resourceWithCustomActions.get(1);
+
+customActionResourceInstance.DSCompute();
+customActionResourceInstance.DSChanges();
+customActionResourceInstance.DSChangeHistory();
+customActionResourceInstance.DSHasChanges();
+customActionResourceInstance.DSLastModified();
+customActionResourceInstance.DSLastSaved();
+customActionResourceInstance.DSPrevious();
+customActionResourceInstance.DSCreate();
+customActionResourceInstance.DSDestroy();
+customActionResourceInstance.DSLink();
+customActionResourceInstance.DSLinkInverse();
+customActionResourceInstance.DSLoadRelations('myRelation');
+customActionResourceInstance.DSRefresh();
+customActionResourceInstance.DSSave();
+customActionResourceInstance.DSUnlinkInverse();
+customActionResourceInstance.DSUpdate();
diff --git a/js-data/legacy/js-data-1.5.4.d.ts b/js-data/legacy/js-data-1.5.4.d.ts
new file mode 100644
index 000000000..0140d8139
--- /dev/null
+++ b/js-data/legacy/js-data-1.5.4.d.ts
@@ -0,0 +1,317 @@
+// Type definitions for JSData v1.5.4
+// Project: https://github.com/js-data/js-data
+// Definitions by: Stefan Steinhart <https://github.com/reppners>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///////////////////////////////////////////////////////////////////////////////
+// js-data module (js-data.js)
+///////////////////////////////////////////////////////////////////////////////
+
+// defining what exists in JSData and how it looks
+declare module JSData {
+
+    interface JSDataPromise<R> {
+        then<U>(onFulfilled?: (value: R) => U | JSDataPromise<U>,  onRejected?: (error: any) => U | JSDataPromise<U>): JSDataPromise<U>;
+        catch<U>(onRejected?: (error: any) => U | JSDataPromise<U>): JSDataPromise<U>;
+        // enhanced with finally
+        finally<U>(finallyCb?:() => U):JSDataPromise<U>;
+    }
+
+    interface DS {
+
+        new(config?:DSConfiguration):DS;
+
+        // rather undocumented
+        errors:DSErrors;
+
+        // those are objects containing the defined resources and adapters
+        definitions:any;
+        adapters:any;
+
+        defaults:DSConfiguration;
+
+        // async
+        create<T>(resourceName:string, attrs:Object, options?:DSConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        destroy(resourceName:string, id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<any>;
+        destroyAll(resourceName:string, params?:DSFilterArg, options?:DSAdapterOperationConfiguration):JSDataPromise<any>;
+        find<T>(resourceName:string, id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        findAll<T>(resourceName:string, params?:DSFilterArg, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T & DSInstanceShorthands<T>>>;
+        loadRelations<T>(resourceName:string, idOrInstance:string | number | Object, relations:string | Array<string>, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        update<T>(resourceName:string, id:string | number, attrs:Object, options?:DSSaveConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        updateAll<T>(resourceName:string, attrs:Object, params?:DSFilterArg, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T & DSInstanceShorthands<T>>>;
+        reap(resourceName:string, options?:DSConfiguration):JSDataPromise<any>;
+        refresh<T>(resourceName:string, id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        save<T>(resourceName:string, id:string | number, options?:DSSaveConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+
+        // sync
+        changeHistory(resourceName:string, id?:string | number):Array<Object>;
+        changes(resourceName:string, id:string | number):Object;
+        compute(resourceName:string, idOrInstance:number | string | Object ):void;
+        createInstance<T>(resourceName:string, attrs?:T, options?:DSAdapterOperationConfiguration):T & DSInstanceShorthands<T>;
+        digest():void;
+        eject<T>(resourceName:string, id:string | number, options?:DSConfiguration):T & DSInstanceShorthands<T>;
+        ejectAll<T>(resourceName:string, params:DSFilterArg, options?:DSConfiguration):Array<T & DSInstanceShorthands<T>>;
+        filter<T>(resourceName:string, params:DSFilterArg, options?:DSConfiguration):Array<T & DSInstanceShorthands<T>>;
+        get<T>(resourceName:string, id:string | number, options?:DSConfiguration):T & DSInstanceShorthands<T>;
+        getAll<T>(resourceName:string, ids?:Array<string | number>):Array<T & DSInstanceShorthands<T>>;
+        hasChanges(resourceName:string, id:string | number):boolean;
+        inject<T>(resourceName:string, item:T, options?:DSConfiguration):T & DSInstanceShorthands<T>;
+        inject<T>(resourceName:string, items:Array<T>, options?:DSConfiguration):Array<T & DSInstanceShorthands<T>>;
+        is(resourceName:string, object:Object): boolean;
+        lastModified(resourceName:string, id?:string | number):number; // timestamp
+        lastSaved(resourceName:string, id?:string | number):number; // timestamp
+        link<T>(resourceName:string, id:string | number, relations?:Array<string>):T & DSInstanceShorthands<T>;
+        linkAll<T>(resourceName:string, params:DSFilterArg, relations?:Array<string>):T & DSInstanceShorthands<T>;
+        linkInverse<T>(resourceName:string, id:string | number, relations?:Array<string>):T & DSInstanceShorthands<T>;
+        previous<T>(resourceName:string, id:string | number):T & DSInstanceShorthands<T>;
+        revert<T>(resourceName:string, id:string | number):T & DSInstanceShorthands<T>;
+        unlinkInverse<T>(resourceName:string, id:string | number, relations?:Array<string>):T & DSInstanceShorthands<T>;
+
+        defineResource<T>(resourceNameOrDefinition:string | DSResourceDefinitionConfiguration):DSResourceDefinition<T>;
+        defineResource<T, TActions>(resourceNameOrDefinition:string | DSResourceDefinitionConfiguration):DSResourceDefinition<T> & TActions;
+        registerAdapter(adapterId:string, adapter:IDSAdapter, options?:{default: boolean}):void;
+    }
+
+    interface DSConfiguration extends IDSResourceLifecycleEventHandlers {
+        actions?: Object;
+        allowSimpleWhere?: boolean;
+        basePath?: string;
+        bypassCache?: boolean;
+        cacheResponse?: boolean;
+        defaultAdapter?: string;
+        defaultFilter?: (collection:Array<any>, resourceName:string, params:DSFilterArg, options:DSConfiguration)=>Array<any>;
+        eagerEject?: boolean;
+        endpoint?: string;
+        error?: boolean | ((message?:any, ...optionalParams:any[])=> void);
+        fallbackAdapters?: Array<string>;
+        findAllFallbackAdapters?: Array<string>;
+        findAllStrategy?: string;
+        findBelongsTo?: boolean;
+        findFallbackAdapters?: Array<string>;
+        findHasOne?: boolean;
+        findHasMany?: boolean;
+        findInverseLinks?: boolean;
+        findStrategy?: string
+        idAttribute?: string;
+        ignoredChanges?: Array<RegExp | string>;
+        keepChangeHistory?: boolean;
+        loadFromServer?: boolean;
+        log?: boolean | ((message?: any, ...optionalParams: any[])=> void);
+        maxAge?: number;
+        notify?: boolean;
+        reapAction?: string;
+        reapInterval?: number;
+        resetHistoryOnInject?: boolean;
+        strategy?: string;
+        upsert?: boolean;
+        useClass?: boolean;
+        useFilter?: boolean;
+    }
+
+    interface DSAdapterOperationConfiguration extends DSConfiguration {
+        adapter?: string;
+        params?: {
+            [paramName: string]: string | number | boolean;
+        };
+    }
+
+    interface DSSaveConfiguration extends DSAdapterOperationConfiguration {
+        changesOnly?: boolean;
+    }
+
+    interface DSResourceDefinitionConfiguration extends DSConfiguration {
+        name: string;
+        computed?: any;
+        methods?: any;
+        relations?: {
+            hasMany?: Object;
+            hasOne?: Object;
+            belongsTo?: Object;
+        };
+    }
+
+    interface DSResourceDefinition<T> extends DSResourceDefinitionConfiguration {
+
+        //async
+        create<TInject>(attrs:TInject, options?:DSConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        destroy(id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<void>;
+        destroyAll(params?:DSFilterArg, options?:DSAdapterOperationConfiguration):JSDataPromise<void>;
+        find(id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        findAll(params?:DSFilterArg, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T & DSInstanceShorthands<T>>>;
+        loadRelations(idOrInstance:string | number | Object, relations:string | Array<string>, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        update(id:string | number, attrs:Object, options?:DSSaveConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        updateAll(attrs:Object, params?:DSFilterArg, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T & DSInstanceShorthands<T>>>;
+        reap(options?:DSConfiguration):JSDataPromise<void>;
+        refresh(id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        save(id:string | number, options?:DSSaveConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+
+        // sync
+        changeHistory(id?:string | number):Array<Object>;
+        changes(id:string | number):Object;
+        compute(idOrInstance:number | string | Object ):void;
+        createInstance<TInject>(attrs?:TInject, options?:DSAdapterOperationConfiguration):T & DSInstanceShorthands<T>;
+        digest():void;
+        eject(id:string | number, options?:DSConfiguration):T & DSInstanceShorthands<T>;
+        ejectAll(params:DSFilterArg, options?:DSConfiguration):Array<T & DSInstanceShorthands<T>>;
+        filter(params:DSFilterArg, options?:DSConfiguration):Array<T & DSInstanceShorthands<T>>;
+        get(id:string | number, options?:DSConfiguration):T & DSInstanceShorthands<T>;
+        getAll(ids?:Array<string | number>):Array<T & DSInstanceShorthands<T>>;
+        hasChanges(id:string | number):boolean;
+        inject(item:T, options?:DSConfiguration):T & DSInstanceShorthands<T>;
+        inject(items:Array<T>, options?:DSConfiguration):Array<T & DSInstanceShorthands<T>>;
+        is(object:Object): boolean;
+        lastModified(id?:string | number):number; // timestamp
+        lastSaved(id?:string | number):number; // timestamp
+        link(id:string | number, relations?:Array<string>):T & DSInstanceShorthands<T>;
+        linkAll(params:DSFilterArg, relations?:Array<string>):T & DSInstanceShorthands<T>;
+        linkInverse(id:string | number, relations?:Array<string>):T & DSInstanceShorthands<T>;
+        previous(id:string | number):T & DSInstanceShorthands<T>;
+        unlinkInverse(id:string | number, relations?:Array<string>):T & DSInstanceShorthands<T>;
+    }
+
+    export interface DSInstanceShorthands<T> {
+        DSCompute():void;
+        DSRefresh(options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        DSSave(options?:DSSaveConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        DSUpdate(options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        DSDestroy(options?:DSAdapterOperationConfiguration):JSDataPromise<void>;
+        DSCreate(options?:DSConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        DSLoadRelations(relations:string | Array<string>, options?:DSAdapterOperationConfiguration):JSDataPromise<T & DSInstanceShorthands<T>>;
+        DSChangeHistory():Array<Object>;
+        DSChanges():Object;
+        DSHasChanges():boolean;
+        DSLastModified():number; // timestamp
+        DSLastSaved():number; // timestamp
+        DSLink(relations?:Array<string>):T & DSInstanceShorthands<T>;
+        DSLinkInverse(relations?:Array<string>):T & DSInstanceShorthands<T>;
+        DSPrevious():T & DSInstanceShorthands<T>;
+        DSUnlinkInverse(relations?:Array<string>):T & DSInstanceShorthands<T>;
+    }
+
+    interface DSFilterParams {
+        where?: Object;
+
+        limit?: number;
+
+        skip?: number;
+        offset?: number;
+
+        orderBy?: string | Array<string> | Array<Array<string>>;
+        sort?: string | Array<string> | Array<Array<string>>;
+    }
+
+    type DSFilterArg = DSFilterParams | Object;
+
+    interface IDSResourceLifecycleValidateEventHandlers {
+        beforeValidate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
+        validate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
+        afterValidate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
+    }
+
+    interface IDSResourceLifecycleCreateEventHandlers {
+        beforeCreate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
+        afterCreate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
+    }
+
+    interface IDSResourceLifecycleCreateInstanceEventHandlers {
+        beforeCreateInstance?: (resourceName:string, data:any)=>void;
+        afterCreateInstance?: (resourceName:string, data:any)=>void;
+    }
+
+    interface IDSResourceLifecycleUpdateEventHandlers {
+        beforeUpdate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
+        afterUpdate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
+    }
+
+    interface IDSResourceLifecycleDestroyEventHandlers {
+        beforeDestroy?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
+        afterDestroy?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
+    }
+
+    interface IDSResourceLifecycleInjectEventHandlers {
+        beforeInject?: (resourceName:string, data:any)=>void;
+        afterInject?: (resourceName:string, data:any)=>void;
+    }
+
+    interface IDSResourceLifecycleEjectEventHandlers {
+        beforeEject?: (resourceName:string, data:any)=>void;
+        afterEject?: (resourceName:string, data:any)=>void;
+    }
+
+    interface IDSResourceLifecycleReapEventHandlers {
+        beforeReap?: (resourceName:string, data:any)=>void;
+        afterReap?: (resourceName:string, data:any)=>void;
+    }
+
+    interface IDSResourceLifecycleEventHandlers extends IDSResourceLifecycleCreateEventHandlers,
+        IDSResourceLifecycleCreateInstanceEventHandlers,
+        IDSResourceLifecycleValidateEventHandlers,
+        IDSResourceLifecycleUpdateEventHandlers,
+        IDSResourceLifecycleDestroyEventHandlers,
+        IDSResourceLifecycleInjectEventHandlers,
+        IDSResourceLifecycleEjectEventHandlers,
+        IDSResourceLifecycleReapEventHandlers {
+
+    }
+
+    // errors
+    interface DSErrors {
+
+        // types
+        IllegalArgumentError:DSError;
+        IA:DSError;
+        RuntimeError:DSError;
+        R:DSError;
+        NonexistentResourceError:DSError;
+        NER:DSError;
+    }
+
+    interface DSError extends Error {
+        new (message?:string):DSError;
+        message: string;
+        type: string;
+    }
+
+    // DSAdapter interface
+    interface IDSAdapter {
+        create<T>(config:DSResourceDefinition<T>, attrs:Object, options?:DSConfiguration):JSDataPromise<T>;
+
+        destroy<T>(config:DSResourceDefinition<T>, id:string | number, options?:DSConfiguration):JSDataPromise<any>;
+
+        destroyAll<T>(config:DSResourceDefinition<T>, params:DSFilterArg, options?:DSConfiguration):JSDataPromise<any>;
+
+        find<T>(config:DSResourceDefinition<T>, id:string | number, options?:DSConfiguration):JSDataPromise<T>;
+
+        findAll<T>(config:DSResourceDefinition<T>, params?:DSFilterArg, options?:DSConfiguration):JSDataPromise<T>;
+
+        update<T>(config:DSResourceDefinition<T>, id:string | number, attrs:Object, options?:DSConfiguration):JSDataPromise<T>;
+        updateAll<T>(config:DSResourceDefinition<T>, attrs:Object, params?:DSFilterArg, options?:DSConfiguration):JSDataPromise<T>;
+    }
+
+    // Custom action config
+    interface DSActionConfig {
+        adapter?: string;
+        endpoint?: string;
+        pathname?: string;
+        method?: string;
+    }
+
+    // Custom action method definition
+    // options are passed to adapter.HTTP() method-call, js-data-http adapter by default uses AXIOS but can also be $http in case of angular
+    // or a custom adapter implementation. The adapter can be set via the DSActionConfig.
+    interface DSActionFn {
+        <T>(id:string | number, options?:Object):JSDataPromise<T>
+    }
+}
+
+// declaring the existing global js object
+declare var JSData:{
+    DS: JSData.DS;
+    DSErrors: JSData.DSErrors;
+};
+
+//Support node require
+declare module 'js-data' {
+
+    export = JSData;
+}
diff --git a/js-data/legacy/js-data-node-1.5.4-tests.ts b/js-data/legacy/js-data-node-1.5.4-tests.ts
new file mode 100644
index 000000000..2a89031e7
--- /dev/null
+++ b/js-data/legacy/js-data-node-1.5.4-tests.ts
@@ -0,0 +1,11 @@
+/// <reference path="js-data-1.5.4.d.ts" />
+
+import JSData = require('js-data');
+var store = new JSData.DS();
+
+// simplest model definition
+var User = store.defineResource('user');
+
+User.find(1).then(function (user: any) {
+    user; // { id: 1, name: 'John' }
+});
diff --git a/jsnlog/jsnlog-tests.ts b/jsnlog/jsnlog-tests.ts
new file mode 100644
index 000000000..dfb32a6c8
--- /dev/null
+++ b/jsnlog/jsnlog-tests.ts
@@ -0,0 +1,80 @@
+/// <reference path="jsnlog.d.ts" />
+
+// ----------------------------------------------------------
+// JL
+
+var traceLevel: number = JL.getTraceLevel();
+var debugLevel: number = JL.getDebugLevel();
+var infoLevel: number = JL.getInfoLevel();
+var warnLevel: number = JL.getWarnLevel();
+var errorLevel: number = JL.getErrorLevel();
+var fatalLevel: number = JL.getFatalLevel();
+
+JL.setOptions({
+		enabled: true,
+		maxMessages: 5,
+		defaultAjaxUrl: '/jsnlog.logger',
+		clientIP: '0.0.0.0',
+		requestId: 'a reuest id',
+		defaultBeforeSend: null
+});
+
+// ----------------------------------------------------------
+// Ajax Appender
+
+var ajaxAppender1: JSNLog.JSNLogAjaxAppender = JL.createAjaxAppender('ajaxAppender');
+
+ajaxAppender1.setOptions({
+		level: 5000,
+		ipRegex: 'a regex',
+		userAgentRegex: 'a user agent string',
+		disallow: 'regex matching suppressed messages',
+		sendWithBufferLevel: 5000,
+		storeInBufferLevel: 2000,
+		bufferSize: 10,
+		batchSize: 2,
+		url: '/jsnlog.logger',
+		beforeSend: null
+});
+
+// ----------------------------------------------------------
+// Console Appender
+
+var consoleAppender1: JSNLog.JSNLogConsoleAppender = JL.createConsoleAppender('consoleAppender');
+
+consoleAppender1.setOptions({
+		level: 5000,
+		ipRegex: 'a regex',
+		userAgentRegex: 'a user agent string',
+		disallow: 'regex matching suppressed messages',
+		sendWithBufferLevel: 5000,
+		storeInBufferLevel: 2000,
+		bufferSize: 10,
+		batchSize: 2
+});
+
+
+// ----------------------------------------------------------
+// Loggers
+
+var logger1: JSNLog.JSNLogLogger = JL('mylogger');
+
+var exception = {};
+
+logger1.trace('log message').debug({ x: 1, y: 2});
+logger1.info(function() { return 5; });
+logger1.warn('log message');
+logger1.error('log message');
+logger1.fatal('log message');
+logger1.fatalException('log message', exception);
+logger1.log(4000, 'log message', exception);
+
+logger1.setOptions({
+		level: 5000,
+		ipRegex: 'a regex',
+		userAgentRegex: 'a user agent string',
+		disallow: 'regex matching suppressed messages',
+		appenders: [ ajaxAppender1, consoleAppender1 ],
+		onceOnly: [ 'regex1', 'regex2' ]
+});
+
diff --git a/jsnlog/jsnlog.d.ts b/jsnlog/jsnlog.d.ts
new file mode 100644
index 000000000..da9893fc7
--- /dev/null
+++ b/jsnlog/jsnlog.d.ts
@@ -0,0 +1,112 @@
+// Type definitions for JSNLog v2.11.0+
+// Project: https://github.com/mperdeck/jsnlog.js
+// Definitions by: Mattijs Perdeck <https://github.com/mperdeck>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// -------------------------------
+// Full documentation is at 
+// http://jsnlog.com
+// -------------------------------
+
+/**
+* Copyright 2015 Mattijs Perdeck.
+*
+* This project is licensed under the MIT license.
+* 
+* 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.
+*/
+
+// Declarations of all interfaces and ambient objects, except for JL itself.
+// Provides strong typing in both jsnlog.ts itself and in TypeScript programs that use 
+// JSNLog. 
+
+declare module JSNLog {
+
+	interface JSNLogOptions {
+		enabled?: boolean;
+		maxMessages?: number;
+		defaultAjaxUrl?: string;
+		clientIP?: string;
+		requestId?: string;
+		defaultBeforeSend?: (xhr: XMLHttpRequest) => void;
+	}
+
+	interface JSNLogFilterOptions {
+		level?: number;
+		ipRegex?: string;
+		userAgentRegex?: string;
+		disallow?: string;
+	}
+
+	interface JSNLogLoggerOptions extends JSNLogFilterOptions {
+		appenders?: JSNLogAppender[];
+		onceOnly?: string[];
+	}
+
+	// Base for all appender options types
+	interface JSNLogAppenderOptions extends JSNLogFilterOptions {
+		sendWithBufferLevel?: number;
+		storeInBufferLevel?: number;
+		bufferSize?: number;
+		batchSize?: number;
+	}
+
+	interface JSNLogAjaxAppenderOptions extends JSNLogAppenderOptions {
+		url?: string;
+		beforeSend?: (xhr: XMLHttpRequest) => void;
+	}
+
+	interface JSNLogLogger {
+		setOptions(options: JSNLogLoggerOptions): JSNLogLogger;
+
+		trace(logObject: any): JSNLogLogger;
+		debug(logObject: any): JSNLogLogger;
+		info(logObject: any): JSNLogLogger;
+		warn(logObject: any): JSNLogLogger;
+		error(logObject: any): JSNLogLogger;
+		fatal(logObject: any): JSNLogLogger;
+		fatalException(logObject: any, e: any): JSNLogLogger;
+		log(level: number, logObject: any, e?: any): JSNLogLogger;
+	}
+
+	interface JSNLogAppender {
+		setOptions(options: JSNLogAppenderOptions): JSNLogAppender;
+	}
+
+	interface JSNLogAjaxAppender extends JSNLogAppender {
+		setOptions(options: JSNLogAjaxAppenderOptions): JSNLogAjaxAppender;
+	}
+
+	interface JSNLogConsoleAppender extends JSNLogAppender {
+	}
+
+	interface JSNLogStatic {
+		(loggerName?: string): JSNLogLogger;
+
+		setOptions(options: JSNLogOptions): JSNLogStatic;
+		createAjaxAppender(appenderName: string): JSNLogAjaxAppender;
+		createConsoleAppender(appenderName: string): JSNLogConsoleAppender;
+
+		getTraceLevel(): number;
+		getDebugLevel(): number;
+		getInfoLevel(): number;
+		getWarnLevel(): number;
+		getErrorLevel(): number;
+		getFatalLevel(): number;
+	}
+}
+
+declare function __jsnlog_configure(jsnlog: JSNLog.JSNLogStatic): void;
+
+
+// Ambient declaration of the JL object itself
+
+declare var JL: JSNLog.JSNLogStatic;
+
+
+
+
diff --git a/jsnox/jsnox-tests.ts b/jsnox/jsnox-tests.ts
index e34d71b4a..33e58720e 100644
--- a/jsnox/jsnox-tests.ts
+++ b/jsnox/jsnox-tests.ts
@@ -19,7 +19,7 @@ var clickHandler: React.MouseEventHandler
 
 // Tests with spec string
 function spec_string () {
-    var result: React.HTMLComponent
+    var result: React.ReactHTMLElement
     
     // just spec string
     result = $('div')
diff --git a/jsnox/jsnox.d.ts b/jsnox/jsnox.d.ts
index dfb59e280..22291956d 100644
--- a/jsnox/jsnox.d.ts
+++ b/jsnox/jsnox.d.ts
@@ -31,7 +31,7 @@ declare module 'jsnox' {
          * @param children A single React node (string or ReactElement) or array of nodes.
          * Note that unlike with React itself, multiple children must be placed into an array. 
          */
-        (specString: string, children: React.ReactNode): React.HTMLComponent
+        <P>(specString: string, children: React.ReactNode): React.DOMElement<P>
 
         /**
          * Renders an HTML element from the given spec string, with optional props 
@@ -42,7 +42,7 @@ declare module 'jsnox' {
          * @param children A single React node (string or ReactElement) or array of nodes.
          * Note that unlike with React itself, multiple children must be placed into an array. 
          */
-        (specString: string, props?: React.HTMLAttributes, children?: React.ReactNode): React.HTMLComponent
+        <P>(specString: string, props?: React.HTMLAttributes, children?: React.ReactNode): React.DOMElement<P>
 
 
         /**
diff --git a/jsonwebtoken/jsonwebtoken-tests.ts b/jsonwebtoken/jsonwebtoken-tests.ts
index 52f116335..6aadaa82c 100644
--- a/jsonwebtoken/jsonwebtoken-tests.ts
+++ b/jsonwebtoken/jsonwebtoken-tests.ts
@@ -57,6 +57,18 @@ jwt.verify(token, cert, { audience: 'urn:foo', issuer: 'urn:issuer' }, function(
   // if issuer mismatch, err == invalid issuer
 });
 
+// verify algorithm
+cert = fs.readFileSync('public.pem');  // get public key
+jwt.verify(token, cert, { algorithms: ['RS256'] }, function(err, decoded) {
+  // if algorithm mismatch, err == invalid algorithm
+});
+
+// verify without expiration check
+cert = fs.readFileSync('public.pem');  // get public key
+jwt.verify(token, cert, { ignoreExpiration: true }, function(err, decoded) {
+  // if ignoreExpration == false and token is expired, err == expired token
+});
+
 /**
  * jwt.decode
  * https://github.com/auth0/node-jsonwebtoken#jwtdecodetoken
diff --git a/jsonwebtoken/jsonwebtoken.d.ts b/jsonwebtoken/jsonwebtoken.d.ts
index 205970f6a..b558df2e5 100644
--- a/jsonwebtoken/jsonwebtoken.d.ts
+++ b/jsonwebtoken/jsonwebtoken.d.ts
@@ -22,8 +22,13 @@ declare module "jsonwebtoken" {
          * - none:     No digital signature or MAC value included
          */
         algorithm?: string;
-        /** @member {number} - Lifetime for the token in minutes */
+        /** 
+         *@deprecated - see expiresIn
+         *@member {number} - Lifetime for the token in minutes 
+         */
         expiresInMinutes?: number;
+        /** @member {string} - Lifetime for the token expressed in a string describing a time span [rauchg/ms](https://github.com/rauchg/ms.js). Eg: `60`, `"2 days"`, `"10h"`, `"7d"` */
+        expiresIn?: string;
         audience?: string;
         subject?: string;
         issuer?: string;
@@ -31,8 +36,11 @@ declare module "jsonwebtoken" {
     }
 
     export interface VerifyOptions {
+        algorithms?: string[];
         audience?: string;
         issuer?: string;
+        ignoreExpiration?: boolean;
+        maxAge?: string;
     }
 
     export interface VerifyCallbak {
diff --git a/jsuri/jsuri.d.ts b/jsuri/jsuri.d.ts
index a50002140..c96d42092 100644
--- a/jsuri/jsuri.d.ts
+++ b/jsuri/jsuri.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for jsUri 1.3+
 // Project: https://github.com/derek-watson/jsUri
-// Definitions by: Chris Charabaruk <http://github.com/coldacid>
+// Definitions by: Chris Charabaruk <http://github.com/coldacid>, Florian Wagner <http://github.com/flqw>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 declare module jsuri {
@@ -135,5 +135,9 @@ declare module jsuri {
 declare type Uri = jsuri.Uri;
 
 declare module 'jsuri' {
-  export = Uri;
+  export = jsuri.Uri;
+}
+
+declare module 'jsUri' {
+  export = jsuri.Uri;
 }
diff --git a/jwt-decode/jwt-decode-tests.ts b/jwt-decode/jwt-decode-tests.ts
new file mode 100644
index 000000000..66d639b40
--- /dev/null
+++ b/jwt-decode/jwt-decode-tests.ts
@@ -0,0 +1,12 @@
+ /// <reference path="jwt-decode.d.ts" />
+import jwtDecode = require('jwt-decode');
+ 
+let token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJmb28iOiJiYXIiLCJleHAiOjEzOTMyODY4OTMsImlhdCI6MTM5MzI2ODg5M30.4-iaDojEVl0pJQMjrbM1EzUIfAZgsbK_kgnVyVxFSVo";
+
+interface TokenDto {
+  foo: string;
+  exp: number;
+  iat: number;
+}
+
+let decodedToken = jwtDecode(token) as TokenDto;
diff --git a/jwt-decode/jwt-decode.d.ts b/jwt-decode/jwt-decode.d.ts
new file mode 100644
index 000000000..67d7aac16
--- /dev/null
+++ b/jwt-decode/jwt-decode.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for jwt-decode v1.4.0
+// Project: https://github.com/auth0/jwt-decode
+// Definitions by: Giedrius Grabauskas <https://github.com/QuatroDevOfficial/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+declare module JwtDecode {
+    interface JwtDecodeStatic {
+        (token: string): any;
+    }
+}
+
+declare module 'jwt-decode' {
+    var jwtDecode: JwtDecode.JwtDecodeStatic;
+    export = jwtDecode;
+}
diff --git a/kendo-ui/kendo-ui-tests.ts b/kendo-ui/kendo-ui-tests.ts
index 3c8a9bc04..fba08a02e 100644
--- a/kendo-ui/kendo-ui-tests.ts
+++ b/kendo-ui/kendo-ui-tests.ts
@@ -1,2 +1,26 @@
 /// <reference path="../jquery/jquery.d.ts" />
 /// <reference path="kendo-ui.d.ts" />
+
+var is = {
+    string: (msg: string) => {
+        return true;
+    }
+}
+
+// TreeView
+$(() => {
+    var treeview = <kendo.ui.TreeView>$("#treeview").data("kendoTreeView");
+
+    is.string(treeview.text("#foo"));
+
+    treeview.text("#foo", "bar");
+});
+
+// Window
+$(() => {
+    var window = <kendo.ui.Window>$("#window").data("kendoWindow");
+
+    var dom = $("<em>Foo</em>");
+
+    window.content(dom);
+});
diff --git a/kendo-ui/kendo-ui.d.ts b/kendo-ui/kendo-ui.d.ts
index 0683ab238..5168cdb84 100644
--- a/kendo-ui/kendo-ui.d.ts
+++ b/kendo-ui/kendo-ui.d.ts
@@ -1,8 +1,10 @@
-// Type definitions for Kendo UI Professional v2015.1.609
+// Type definitions for Kendo UI Professional v2015.3.1111
 // Project: http://www.telerik.com/kendo-ui
 // Definitions by: Telerik <https://github.com/telerik/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
+/// <reference path="../jquery/jquery.d.ts" />
+
 declare module kendo {
     function culture(): {
         name: string;
@@ -87,7 +89,7 @@ declare module kendo {
         };
     };
 
-    var cultures: {[culture:string] : {
+    var cultures: {[culture: string] : {
         name?: string;
         calendar?: {
             AM: string[];
@@ -183,7 +185,7 @@ declare module kendo {
     function observable(data: any): kendo.data.ObservableObject;
     function observableHierarchy(array: any[]): kendo.data.ObservableArray;
 
-    function render(template:(data: any) => string, data: any[]): string;
+    function render(template: (data: any) => string, data: any[]): string;
     function template(template: string, options?: TemplateOptions): (data: any) => string;
 
     function guid(): string;
@@ -214,7 +216,7 @@ declare module kendo {
         F2: number;
         F10: number;
         F12: number;
-    }
+    };
 
     var support: {
         touch: boolean;
@@ -242,7 +244,7 @@ declare module kendo {
             opera: boolean;
             version: string;
         };
-    }
+    };
 
     interface TemplateOptions {
         paramName?: string;
@@ -268,6 +270,7 @@ declare module kendo {
         tagName?: string;
         wrap?: boolean;
         model?: Object;
+        evalTemplate?: boolean;
         init?: (e: ViewEvent) => void;
         show?: (e: ViewEvent) => void;
         hide?: (e: ViewEvent) => void;
@@ -275,21 +278,21 @@ declare module kendo {
 
     interface ViewEvent {
         sender: View;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     class View extends Observable {
         constructor(element: Element, options?: ViewOptions);
         constructor(element: string, options?: ViewOptions);
-        init(element: Element, options?: ViewOptions): void;
-        init(element: string, options?: ViewOptions): void;
-        render(container?: any): JQuery;
-        destroy(): void;
         element: JQuery;
         content: any;
         tagName: string;
         model: Object;
+        init(element: Element, options?: ViewOptions): void;
+        init(element: string, options?: ViewOptions): void;
+        render(container?: any): JQuery;
+        destroy(): void;
     }
 
     class ViewContainer extends Observable {
@@ -297,15 +300,15 @@ declare module kendo {
     }
 
     class Layout extends View {
-        showIn(selector: string, view: View): void;
         containers: { [selector: string]: ViewContainer; };
+        showIn(selector: string, view: View): void;
     }
 
     class History extends Observable {
-        start(options: Object): void;
-        stop(): void;
         current: string;
         root: string;
+        start(options: Object): void;
+        stop(): void;
         change(callback: Function): void;
         navigate(location: string, silent?: boolean): void;
     }
@@ -320,9 +323,9 @@ declare module kendo {
 
     interface RouterEvent {
         sender: Router;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
         url: string;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     class Route extends Class {
@@ -333,12 +336,13 @@ declare module kendo {
 
     class Router extends Observable {
         constructor(options?: RouterOptions);
+        routes: Route[];
         init(options?: RouterOptions): void;
         start(): void;
         destroy(): void;
         route(route: string, callback: Function): void;
         navigate(location: string, silent?: boolean): void;
-        routes: Route[];
+        replace(location: string, silent?: boolean): void;
     }
 
 }
@@ -457,8 +461,8 @@ declare module kendo.data {
         source: any;
         parents: any[];
         path: string;
-        dependencies: { [path: string]: boolean; };
         observable: boolean;
+        dependencies: { [path: string]: boolean; };
         constructor(parents: any[], path: string);
         change(e: Object): void;
         start(source: kendo.Observable): void;
@@ -491,17 +495,16 @@ declare module kendo.data {
 
     class Binder extends Class {
         static fn: Binder;
-        static extend(prototype: Object): Binder;
-
         element: any;
         bindings: Bindings;
+        options: BinderOptions;
         constructor(element: any, bindings: Bindings, options?: BinderOptions);
+        static extend(prototype: Object): Binder;
         init(element: any, bindings: Bindings, options?: BinderOptions): void;
         bind(binding: Binding, attribute: string): void;
         destroy(): void;
         refresh(): void;
         refresh(attribute: string): void;
-        options: BinderOptions;
     }
 
     interface BinderOptions {
@@ -509,32 +512,35 @@ declare module kendo.data {
 
     class ObservableObject extends Observable{
         constructor(value?: any);
+        uid: string;
         init(value?: any): void;
         get(name: string): any;
         parent(): ObservableObject;
         set(name: string, value: any): void;
         toJSON(): Object;
-        uid: string;
     }
 
     class Model extends ObservableObject {
+        static idField: string;
+        static fields: DataSourceSchemaModelFields;
+
         idField: string;
         _defaultId: any;
         fields: DataSourceSchemaModelFields;
         defaults: {
             [field: string]: any;
         };
-        constructor(data?: any);
-        init(data?: any):void;
-        accept(data?: any): void;
-        dirty: boolean;
         id: any;
-        editable(field: string): boolean;
-        isNew(): boolean;
-        static idField: string;
-        static fields: DataSourceSchemaModelFields;
+        dirty: boolean;
+
         static define(options: DataSourceSchemaModelWithFieldsObject): typeof Model;
         static define(options: DataSourceSchemaModelWithFieldsArray): typeof Model;
+
+        constructor(data?: any);
+        init(data?: any): void;
+        accept(data?: any): void;
+        editable(field: string): boolean;
+        isNew(): boolean;
     }
 
     interface SchedulerEventData {
@@ -552,8 +558,10 @@ declare module kendo.data {
     }
 
     class SchedulerEvent extends Model {
+        static idField: string;
+        static fields: DataSourceSchemaModelFields;
+
         constructor(data?: SchedulerEventData);
-        init(data?: SchedulerEventData): void;
 
         description: string;
         end: Date;
@@ -566,10 +574,11 @@ declare module kendo.data {
         recurrenceRule: string;
         recurrenceException: string;
         title: string;
-        static idField: string;
-        static fields: DataSourceSchemaModelFields;
+
         static define(options: DataSourceSchemaModelWithFieldsObject): typeof SchedulerEvent;
         static define(options: DataSourceSchemaModelWithFieldsArray): typeof SchedulerEvent;
+
+        init(data?: SchedulerEventData): void;
         clone(options: any, updateUid: boolean): SchedulerEvent;
         duration(): number;
         expand(start: Date, end: Date, zone: any): SchedulerEvent[];
@@ -583,19 +592,19 @@ declare module kendo.data {
     }
 
     class TreeListModel extends Model {
-        constructor(data?: any);
-        init(data?: any): void;
+        static idField: string;
+        static fields: DataSourceSchemaModelFields;
 
         id: any;
         parentId: any;
 
-        loaded(value: boolean): void;
-        loaded(): boolean;
-
-        static idField: string;
-        static fields: DataSourceSchemaModelFields;
         static define(options: DataSourceSchemaModelWithFieldsObject): typeof TreeListModel;
         static define(options: DataSourceSchemaModelWithFieldsArray): typeof TreeListModel;
+
+        constructor(data?: any);
+        init(data?: any): void;
+        loaded(value: boolean): void;
+        loaded(): boolean;
     }
 
     class TreeListDataSource extends DataSource {
@@ -619,36 +628,40 @@ declare module kendo.data {
     }
 
     class GanttTask extends Model {
-        constructor(data?: any);
-        init(data?: any): void;
-
-        id: any;
-		parentId: number;
-		orderId: number;
-		title: string;
-		start: Date;
-		end: Date;
-		percentComplete: number;
-		summary: boolean;
-		expanded: boolean;
         static idField: string;
         static fields: DataSourceSchemaModelFields;
+
+        id: any;
+        parentId: number;
+        orderId: number;
+        title: string;
+        start: Date;
+        end: Date;
+        percentComplete: number;
+        summary: boolean;
+        expanded: boolean;
+
         static define(options: DataSourceSchemaModelWithFieldsObject): typeof GanttTask;
         static define(options: DataSourceSchemaModelWithFieldsArray): typeof GanttTask;
+
+        constructor(data?: any);
+        init(data?: any): void;
     }
 
     class GanttDependency extends Model {
-        constructor(data?: any);
-        init(data?: any): void;
-
-        id: any;
-		predecessorId: number;
-		successorId: number;
-		type: number;
         static idField: string;
         static fields: DataSourceSchemaModelFields;
+
+        id: any;
+        predecessorId: number;
+        successorId: number;
+        type: number;
+
         static define(options: DataSourceSchemaModelWithFieldsObject): typeof GanttDependency;
         static define(options: DataSourceSchemaModelWithFieldsArray): typeof GanttDependency;
+
+        constructor(data?: any);
+        init(data?: any): void;
     }
 
     class Node extends Model {
@@ -836,13 +849,14 @@ declare module kendo.data {
     }
 
     interface DataSourceTransport {
-        parameterMap?(data: DataSourceTransportParameterMapData, type: string): any;
         create?: DataSourceTransportCreate;
         destroy?: DataSourceTransportDestroy;
         push?: Function;
         read?: DataSourceTransportRead;
         signalr?: DataSourceTransportSignalr;
         update?: DataSourceTransportUpdate;
+
+        parameterMap?(data: DataSourceTransportParameterMapData, type: string): any;
     }
 
     interface DataSourceTransportSignalrClient {
@@ -950,10 +964,11 @@ declare module kendo.data {
     }
 
     class ObservableArray extends Observable {
-        constructor(array: any[]);
-        init(array: any[]): void;
+        length: number;
         [index: number]: any;
 
+        constructor(array: any[]);
+        init(array: any[]): void;
         empty(): void;
         every(callback: (item: Object, index: number, source: ObservableArray) => boolean): boolean;
         filter(callback: (item: Object, index: number, source: ObservableArray) => boolean): any[];
@@ -961,7 +976,6 @@ declare module kendo.data {
         forEach(callback: (item: Object, index: number, source: ObservableArray) => void ): void;
         indexOf(item: any): number;
         join(separator: string): string;
-        length: number;
         map(callback: (item: Object, index: number, source: ObservableArray) => any): any[];
         parent(): ObservableObject;
         pop(): ObservableObject;
@@ -986,10 +1000,12 @@ declare module kendo.data {
     }
 
     class DataSource extends Observable{
+        options: DataSourceOptions;
+
+        static create(options?: DataSourceOptions): DataSource;
+
         constructor(options?: DataSourceOptions);
         init(options?: DataSourceOptions): void;
-        static create(options?: DataSourceOptions): DataSource;
-        options: DataSourceOptions;
         add(model: Object): kendo.data.Model;
         add(model: kendo.data.Model): kendo.data.Model;
         aggregate(val: any): void;
@@ -1020,6 +1036,12 @@ declare module kendo.data {
         page(page: number): void;
         pageSize(): number;
         pageSize(size: number): void;
+        pushCreate(model: Object): void;
+        pushCreate(models: any[]): void;
+        pushDestroy(model: Object): void;
+        pushDestroy(models: any[]): void;
+        pushUpdate(model: Object): void;
+        pushUpdate(models: any[]): void;
         query(options?: any): JQueryPromise<any>;
         read(data?: any): JQueryPromise<any>;
         remove(model: kendo.data.ObservableObject): void;
@@ -1077,7 +1099,7 @@ declare module kendo.data {
         dir?: string;
     }
 
-    interface DataSourceTransportCreate {
+    interface DataSourceTransportCreate extends JQueryAjaxSettings {
         cache?: boolean;
         contentType?: string;
         data?: any;
@@ -1086,7 +1108,7 @@ declare module kendo.data {
         url?: any;
     }
 
-    interface DataSourceTransportDestroy {
+    interface DataSourceTransportDestroy extends JQueryAjaxSettings {
         cache?: boolean;
         contentType?: string;
         data?: any;
@@ -1095,7 +1117,7 @@ declare module kendo.data {
         url?: any;
     }
 
-    interface DataSourceTransportRead {
+    interface DataSourceTransportRead extends JQueryAjaxSettings {
         cache?: boolean;
         contentType?: string;
         data?: any;
@@ -1104,7 +1126,7 @@ declare module kendo.data {
         url?: any;
     }
 
-    interface DataSourceTransportUpdate {
+    interface DataSourceTransportUpdate extends JQueryAjaxSettings {
         cache?: boolean;
         contentType?: string;
         data?: any;
@@ -1221,7 +1243,7 @@ declare module kendo.data {
 }
 
 declare module kendo.data.transports {
-    var odata : DataSourceTransport;
+    var odata: DataSourceTransport;
 }
 
 declare module kendo.ui {
@@ -1229,6 +1251,11 @@ declare module kendo.ui {
 
     class Widget extends Observable {
         static fn: Widget;
+
+        element: JQuery;
+        options: Object;
+        events: string[];
+
         static extend(prototype: Object): Widget;
 
         constructor(element: Element, options?: Object);
@@ -1238,11 +1265,8 @@ declare module kendo.ui {
         init(element: JQuery, options?: Object): void;
         init(selector: String, options?: Object): void;
         destroy(): void;
-        element: JQuery;
         setOptions(options: Object): void;
         resize(force?: boolean): void;
-        options: Object;
-        events: string[];
     }
 
     function plugin(widget: typeof kendo.ui.Widget, register?: typeof kendo.ui, prefix?: String): void;
@@ -1359,17 +1383,18 @@ declare module kendo.mobile {
     function init(element: Element): void;
 
     class Application extends Observable {
+        options: ApplicationOptions;
+        router: kendo.Router;
+        pane: kendo.mobile.ui.Pane;
+
         constructor(element?: any, options?: ApplicationOptions);
         init(element?: any, options?: ApplicationOptions): void;
-        options: ApplicationOptions;
         hideLoading(): void;
         navigate(url: string, transition?: string): void;
         replace(url: string, transition?: string): void;
         scroller(): kendo.mobile.ui.Scroller;
         showLoading(): void;
         view(): kendo.mobile.ui.View;
-        router: kendo.Router;
-        pane: kendo.mobile.ui.Pane;
     }
 
     interface ApplicationOptions {
@@ -1429,9 +1454,732 @@ declare module kendo.dataviz.map.layer {
     }
 }
 
+declare module kendo.drawing.pdf {
+    function saveAs(group: kendo.drawing.Group, fileName: string,
+                    proxyUrl?: string, callback?: Function): void;
+}
+
+declare module kendo.drawing {
+    class Arc extends kendo.drawing.Element {
+
+
+        options: ArcOptions;
+
+
+        constructor(geometry: kendo.geometry.Arc, options?: ArcOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        geometry(): kendo.geometry.Arc;
+        geometry(value: kendo.geometry.Arc): void;
+        fill(color: string, opacity?: number): kendo.drawing.Arc;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Arc;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface ArcOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface ArcEvent {
+        sender: Arc;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Circle extends kendo.drawing.Element {
+
+
+        options: CircleOptions;
+
+
+        constructor(geometry: kendo.geometry.Circle, options?: CircleOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        geometry(): kendo.geometry.Circle;
+        geometry(value: kendo.geometry.Circle): void;
+        fill(color: string, opacity?: number): kendo.drawing.Circle;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Circle;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface CircleOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface CircleEvent {
+        sender: Circle;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Element extends kendo.Class {
+
+
+        options: ElementOptions;
+
+
+        constructor(options?: ElementOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        opacity(): number;
+        opacity(opacity: number): void;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface ElementOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        opacity?: number;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface ElementEvent {
+        sender: Element;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    interface FillOptions  {
+
+
+
+        color: string;
+        opacity: number;
+
+
+
+
+    }
+
+
+
+    class Gradient extends kendo.Class {
+
+
+        options: GradientOptions;
+
+        stops: any;
+
+        constructor(options?: GradientOptions);
+
+
+        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
+        removeStop(stop: kendo.drawing.GradientStop): void;
+
+    }
+
+    interface GradientOptions {
+        name?: string;
+        stops?: any;
+    }
+    interface GradientEvent {
+        sender: Gradient;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class GradientStop extends kendo.Class {
+
+
+        options: GradientStopOptions;
+
+
+        constructor(options?: GradientStopOptions);
+
+
+
+    }
+
+    interface GradientStopOptions {
+        name?: string;
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+    interface GradientStopEvent {
+        sender: GradientStop;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Group extends kendo.drawing.Element {
+
+
+        options: GroupOptions;
+
+        children: any;
+
+        constructor(options?: GroupOptions);
+
+
+        append(element: kendo.drawing.Element): void;
+        clear(): void;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        insert(position: number, element: kendo.drawing.Element): void;
+        opacity(): number;
+        opacity(opacity: number): void;
+        remove(element: kendo.drawing.Element): void;
+        removeAt(index: number): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface GroupOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        opacity?: number;
+        pdf?: kendo.drawing.PDFOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface GroupEvent {
+        sender: Group;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Image extends kendo.drawing.Element {
+
+
+        options: ImageOptions;
+
+
+        constructor(src: string, rect: kendo.geometry.Rect);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        opacity(): number;
+        opacity(opacity: number): void;
+        src(): string;
+        src(value: string): void;
+        rect(): kendo.geometry.Rect;
+        rect(value: kendo.geometry.Rect): void;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface ImageOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        opacity?: number;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface ImageEvent {
+        sender: Image;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Layout extends kendo.drawing.Group {
+
+
+        options: LayoutOptions;
+
+
+        constructor(rect: kendo.geometry.Rect, options?: LayoutOptions);
+
+
+        rect(): kendo.geometry.Rect;
+        rect(rect: kendo.geometry.Rect): void;
+        reflow(): void;
+
+    }
+
+    interface LayoutOptions {
+        name?: string;
+        alignContent?: string;
+        alignItems?: string;
+        justifyContent?: string;
+        lineSpacing?: number;
+        spacing?: number;
+        orientation?: string;
+        wrap?: boolean;
+    }
+    interface LayoutEvent {
+        sender: Layout;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class LinearGradient extends kendo.drawing.Gradient {
+
+
+        options: LinearGradientOptions;
+
+        stops: any;
+
+        constructor(options?: LinearGradientOptions);
+
+
+        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
+        end(): kendo.geometry.Point;
+        end(end: any): void;
+        end(end: kendo.geometry.Point): void;
+        start(): kendo.geometry.Point;
+        start(start: any): void;
+        start(start: kendo.geometry.Point): void;
+        removeStop(stop: kendo.drawing.GradientStop): void;
+
+    }
+
+    interface LinearGradientOptions {
+        name?: string;
+        stops?: any;
+    }
+    interface LinearGradientEvent {
+        sender: LinearGradient;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class MultiPath extends kendo.drawing.Element {
+
+
+        options: MultiPathOptions;
+
+        paths: any;
+
+        constructor(options?: MultiPathOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        close(): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: any, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        fill(color: string, opacity?: number): kendo.drawing.MultiPath;
+        lineTo(x: number, y?: number): kendo.drawing.MultiPath;
+        lineTo(x: any, y?: number): kendo.drawing.MultiPath;
+        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
+        moveTo(x: number, y?: number): kendo.drawing.MultiPath;
+        moveTo(x: any, y?: number): kendo.drawing.MultiPath;
+        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.MultiPath;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface MultiPathOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface MultiPathEvent {
+        sender: MultiPath;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class OptionsStore extends kendo.Class {
+
+
+        options: OptionsStoreOptions;
+
+        observer: any;
+
+        constructor(options?: OptionsStoreOptions);
+
+
+        get(field: string): any;
+        set(field: string, value: any): void;
+
+    }
+
+    interface OptionsStoreOptions {
+        name?: string;
+    }
+    interface OptionsStoreEvent {
+        sender: OptionsStore;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    interface PDFOptions  {
+
+
+
+        creator: string;
+        date: Date;
+        keywords: string;
+        landscape: boolean;
+        margin: any;
+        paperSize: any;
+        subject: string;
+        title: string;
+
+
+
+
+    }
+
+
+
+    class Path extends kendo.drawing.Element {
+
+
+        options: PathOptions;
+
+        segments: any;
+
+        constructor(options?: PathOptions);
+
+        static fromPoints(points: any): kendo.drawing.Path;
+        static fromRect(rect: kendo.geometry.Rect): kendo.drawing.Path;
+        static parse(svgPath: string, options?: any): kendo.drawing.Path;
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        close(): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: any, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        fill(color: string, opacity?: number): kendo.drawing.Path;
+        lineTo(x: number, y?: number): kendo.drawing.Path;
+        lineTo(x: any, y?: number): kendo.drawing.Path;
+        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
+        moveTo(x: number, y?: number): kendo.drawing.Path;
+        moveTo(x: any, y?: number): kendo.drawing.Path;
+        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Path;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface PathOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface PathEvent {
+        sender: Path;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class RadialGradient extends kendo.drawing.Gradient {
+
+
+        options: RadialGradientOptions;
+
+        stops: any;
+
+        constructor(options?: RadialGradientOptions);
+
+
+        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
+        center(): kendo.geometry.Point;
+        center(center: any): void;
+        center(center: kendo.geometry.Point): void;
+        radius(): number;
+        radius(value: number): void;
+        removeStop(stop: kendo.drawing.GradientStop): void;
+
+    }
+
+    interface RadialGradientOptions {
+        name?: string;
+        center?: any|kendo.geometry.Point;
+        radius?: number;
+        stops?: any;
+    }
+    interface RadialGradientEvent {
+        sender: RadialGradient;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Rect extends kendo.drawing.Element {
+
+
+        options: RectOptions;
+
+
+        constructor(geometry: kendo.geometry.Rect, options?: RectOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        geometry(): kendo.geometry.Rect;
+        geometry(value: kendo.geometry.Rect): void;
+        fill(color: string, opacity?: number): kendo.drawing.Rect;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Rect;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface RectOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface RectEvent {
+        sender: Rect;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Segment extends kendo.Class {
+
+
+        options: SegmentOptions;
+
+
+        constructor(anchor: kendo.geometry.Point, controlIn: kendo.geometry.Point, controlOut: kendo.geometry.Point);
+
+
+        anchor(): kendo.geometry.Point;
+        anchor(value: kendo.geometry.Point): void;
+        controlIn(): kendo.geometry.Point;
+        controlIn(value: kendo.geometry.Point): void;
+        controlOut(): kendo.geometry.Point;
+        controlOut(value: kendo.geometry.Point): void;
+
+    }
+
+    interface SegmentOptions {
+        name?: string;
+    }
+    interface SegmentEvent {
+        sender: Segment;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    interface StrokeOptions  {
+
+
+
+        color: string;
+        dashType: string;
+        lineCap: string;
+        lineJoin: string;
+        opacity: number;
+        width: number;
+
+
+
+
+    }
+
+
+
+    class Surface extends kendo.Observable {
+
+
+        options: SurfaceOptions;
+
+
+        constructor(options?: SurfaceOptions);
+
+        static create(element: JQuery, options?: any): kendo.drawing.Surface;
+        static create(element: Element, options?: any): kendo.drawing.Surface;
+
+        clear(): void;
+        draw(element: kendo.drawing.Element): void;
+        eventTarget(e: any): kendo.drawing.Element;
+        resize(force?: boolean): void;
+
+    }
+
+    interface SurfaceOptions {
+        name?: string;
+        type?: string;
+        height?: string;
+        width?: string;
+        click?(e: SurfaceClickEvent): void;
+        mouseenter?(e: SurfaceMouseenterEvent): void;
+        mouseleave?(e: SurfaceMouseleaveEvent): void;
+    }
+    interface SurfaceEvent {
+        sender: Surface;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SurfaceClickEvent extends SurfaceEvent {
+        element?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+    interface SurfaceMouseenterEvent extends SurfaceEvent {
+        element?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+    interface SurfaceMouseleaveEvent extends SurfaceEvent {
+        element?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+
+    class Text extends kendo.drawing.Element {
+
+
+        options: TextOptions;
+
+
+        constructor(content: string, position: kendo.geometry.Point, options?: TextOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        content(): string;
+        content(value: string): void;
+        fill(color: string, opacity?: number): kendo.drawing.Text;
+        opacity(): number;
+        opacity(opacity: number): void;
+        position(): kendo.geometry.Point;
+        position(value: kendo.geometry.Point): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Text;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface TextOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        fill?: kendo.drawing.FillOptions;
+        font?: string;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface TextEvent {
+        sender: Text;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+}
 declare module kendo.geometry {
     class Arc extends Observable {
+
+
         options: ArcOptions;
+
+        anticlockwise: boolean;
+        center: kendo.geometry.Point;
+        endAngle: number;
+        radiusX: number;
+        radiusY: number;
+        startAngle: number;
+
+
+
         bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
         getAnticlockwise(): boolean;
         getCenter(): kendo.geometry.Point;
@@ -1446,12 +2194,7 @@ declare module kendo.geometry {
         setRadiusX(value: number): kendo.geometry.Arc;
         setRadiusY(value: number): kendo.geometry.Arc;
         setStartAngle(value: number): kendo.geometry.Arc;
-        anticlockwise: boolean;
-        center: kendo.geometry.Point;
-        endAngle: number;
-        radiusX: number;
-        radiusY: number;
-        startAngle: number;
+
     }
 
     interface ArcOptions {
@@ -1459,13 +2202,21 @@ declare module kendo.geometry {
     }
     interface ArcEvent {
         sender: Arc;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Circle extends Observable {
+
+
         options: CircleOptions;
+
+        center: kendo.geometry.Point;
+        radius: number;
+
+
+
         bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
         clone(): kendo.geometry.Circle;
         equals(other: kendo.geometry.Circle): boolean;
@@ -1475,8 +2226,7 @@ declare module kendo.geometry {
         setCenter(value: kendo.geometry.Point): kendo.geometry.Point;
         setCenter(value: any): kendo.geometry.Point;
         setRadius(value: number): kendo.geometry.Circle;
-        center: kendo.geometry.Point;
-        radius: number;
+
     }
 
     interface CircleOptions {
@@ -1484,29 +2234,36 @@ declare module kendo.geometry {
     }
     interface CircleEvent {
         sender: Circle;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Matrix extends Observable {
+
+
         options: MatrixOptions;
-        clone(): kendo.geometry.Matrix;
-        equals(other: kendo.geometry.Matrix): boolean;
-        round(digits: number): kendo.geometry.Matrix;
-        multiplyCopy(matrix: kendo.geometry.Matrix): kendo.geometry.Matrix;
-        toArray(digits: number): any;
-        toString(digits: number, separator: string): string;
-        static rotate(angle: number, x: number, y: number): kendo.geometry.Matrix;
-        static scale(scaleX: number, scaleY: number): kendo.geometry.Matrix;
-        static translate(x: number, y: number): kendo.geometry.Matrix;
-        static unit(): kendo.geometry.Matrix;
+
         a: number;
         b: number;
         c: number;
         d: number;
         e: number;
         f: number;
+
+
+        static rotate(angle: number, x: number, y: number): kendo.geometry.Matrix;
+        static scale(scaleX: number, scaleY: number): kendo.geometry.Matrix;
+        static translate(x: number, y: number): kendo.geometry.Matrix;
+        static unit(): kendo.geometry.Matrix;
+
+        clone(): kendo.geometry.Matrix;
+        equals(other: kendo.geometry.Matrix): boolean;
+        round(digits: number): kendo.geometry.Matrix;
+        multiplyCopy(matrix: kendo.geometry.Matrix): kendo.geometry.Matrix;
+        toArray(digits: number): any;
+        toString(digits: number, separator: string): string;
+
     }
 
     interface MatrixOptions {
@@ -1514,13 +2271,29 @@ declare module kendo.geometry {
     }
     interface MatrixEvent {
         sender: Matrix;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Point extends Observable {
+
+
         options: PointOptions;
+
+        x: number;
+        y: number;
+
+        constructor(x: number, y: number);
+
+        static create(x: number, y: number): kendo.geometry.Point;
+        static create(x: any, y: number): kendo.geometry.Point;
+        static create(x: kendo.geometry.Point, y: number): kendo.geometry.Point;
+        static min(): kendo.geometry.Point;
+        static max(): kendo.geometry.Point;
+        static minPoint(): kendo.geometry.Point;
+        static maxPoint(): kendo.geometry.Point;
+
         clone(): kendo.geometry.Point;
         distanceTo(point: kendo.geometry.Point): number;
         equals(other: kendo.geometry.Point): boolean;
@@ -1541,15 +2314,7 @@ declare module kendo.geometry {
         translate(dx: number, dy: number): kendo.geometry.Point;
         translateWith(vector: kendo.geometry.Point): kendo.geometry.Point;
         translateWith(vector: any): kendo.geometry.Point;
-        static create(x: number, y: number): kendo.geometry.Point;
-        static create(x: any, y: number): kendo.geometry.Point;
-        static create(x: kendo.geometry.Point, y: number): kendo.geometry.Point;
-        static min(): kendo.geometry.Point;
-        static max(): kendo.geometry.Point;
-        static minPoint(): kendo.geometry.Point;
-        static maxPoint(): kendo.geometry.Point;
-        x: number;
-        y: number;
+
     }
 
     interface PointOptions {
@@ -1557,14 +2322,24 @@ declare module kendo.geometry {
     }
     interface PointEvent {
         sender: Point;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Rect extends Observable {
-        constructor(origin: kendo.geometry.Point, size: kendo.geometry.Size);
+
+
         options: RectOptions;
+
+        origin: kendo.geometry.Point;
+        size: kendo.geometry.Size;
+
+        constructor(origin: kendo.geometry.Point, size: kendo.geometry.Size);
+
+        static fromPoints(pointA: kendo.geometry.Point, pointB: kendo.geometry.Point): kendo.geometry.Rect;
+        static union(rectA: kendo.geometry.Rect, rectB: kendo.geometry.Rect): kendo.geometry.Rect;
+
         bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
         bottomLeft(): kendo.geometry.Point;
         bottomRight(): kendo.geometry.Point;
@@ -1581,10 +2356,7 @@ declare module kendo.geometry {
         topLeft(): kendo.geometry.Point;
         topRight(): kendo.geometry.Point;
         width(): number;
-        static fromPoints(pointA: kendo.geometry.Point, pointB: kendo.geometry.Point): kendo.geometry.Rect;
-        static union(rectA: kendo.geometry.Rect, rectB: kendo.geometry.Rect): kendo.geometry.Rect;
-        origin: kendo.geometry.Point;
-        size: kendo.geometry.Size;
+
     }
 
     interface RectOptions {
@@ -1592,24 +2364,31 @@ declare module kendo.geometry {
     }
     interface RectEvent {
         sender: Rect;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Size extends Observable {
+
+
         options: SizeOptions;
+
+        width: number;
+        height: number;
+
+
+        static create(width: number, height: number): kendo.geometry.Size;
+        static create(width: any, height: number): kendo.geometry.Size;
+        static create(width: kendo.geometry.Size, height: number): kendo.geometry.Size;
+
         clone(): kendo.geometry.Size;
         equals(other: kendo.geometry.Size): boolean;
         getWidth(): number;
         getHeight(): number;
         setWidth(value: number): kendo.geometry.Size;
         setHeight(value: number): kendo.geometry.Size;
-        static create(width: number, height: number): kendo.geometry.Size;
-        static create(width: any, height: number): kendo.geometry.Size;
-        static create(width: kendo.geometry.Size, height: number): kendo.geometry.Size;
-        width: number;
-        height: number;
+
     }
 
     interface SizeOptions {
@@ -1617,13 +2396,19 @@ declare module kendo.geometry {
     }
     interface SizeEvent {
         sender: Size;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Transformation extends Observable {
+
+
         options: TransformationOptions;
+
+
+
+
         clone(): kendo.geometry.Transformation;
         equals(other: kendo.geometry.Transformation): boolean;
         matrix(): kendo.geometry.Matrix;
@@ -1632,6 +2417,7 @@ declare module kendo.geometry {
         rotate(angle: number, center: kendo.geometry.Point): kendo.geometry.Transformation;
         scale(scaleX: number, scaleY: number): kendo.geometry.Transformation;
         translate(x: number, y: number): kendo.geometry.Transformation;
+
     }
 
     interface TransformationOptions {
@@ -1639,544 +2425,31 @@ declare module kendo.geometry {
     }
     interface TransformationEvent {
         sender: Transformation;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
-    }
-
-
-}
-declare module kendo.drawing {
-    class Arc extends kendo.drawing.Element {
-        constructor(geometry: kendo.geometry.Arc, options?: ArcOptions);
-        options: ArcOptions;
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        geometry(): kendo.geometry.Arc;
-        geometry(value: kendo.geometry.Arc): void;
-        fill(color: string, opacity?: number): kendo.drawing.Arc;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Arc;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-    }
-
-    interface ArcOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface ArcEvent {
-        sender: Arc;
         isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class Circle extends kendo.drawing.Element {
-        constructor(geometry: kendo.geometry.Circle, options?: CircleOptions);
-        options: CircleOptions;
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        geometry(): kendo.geometry.Circle;
-        geometry(value: kendo.geometry.Circle): void;
-        fill(color: string, opacity?: number): kendo.drawing.Circle;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Circle;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-    }
-
-    interface CircleOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface CircleEvent {
-        sender: Circle;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class Element extends kendo.Class {
-        constructor(options?: ElementOptions);
-        options: ElementOptions;
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        opacity(): number;
-        opacity(opacity: number): void;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-    }
-
-    interface ElementOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        opacity?: number;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface ElementEvent {
-        sender: Element;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    interface FillOptions  {
-        color: string;
-        opacity: number;
-    }
-
-
-
-    class Gradient extends kendo.Class {
-        constructor(options?: GradientOptions);
-        options: GradientOptions;
-        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
-        removeStop(stop: kendo.drawing.GradientStop): void;
-        stops: any;
-    }
-
-    interface GradientOptions {
-        name?: string;
-        stops?: any;
-    }
-    interface GradientEvent {
-        sender: Gradient;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class GradientStop extends kendo.Class {
-        constructor(options?: GradientStopOptions);
-        options: GradientStopOptions;
-    }
-
-    interface GradientStopOptions {
-        name?: string;
-        offset?: number;
-        color?: string;
-        opacity?: number;
-    }
-    interface GradientStopEvent {
-        sender: GradientStop;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class Group extends kendo.drawing.Element {
-        constructor(options?: GroupOptions);
-        options: GroupOptions;
-        append(element: kendo.drawing.Element): void;
-        clear(): void;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        opacity(): number;
-        opacity(opacity: number): void;
-        remove(element: kendo.drawing.Element): void;
-        removeAt(index: number): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-        children: any;
-    }
-
-    interface GroupOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        opacity?: number;
-        pdf?: kendo.drawing.PDFOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface GroupEvent {
-        sender: Group;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class Image extends kendo.drawing.Element {
-        constructor(src: string, rect: kendo.geometry.Rect);
-        options: ImageOptions;
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        opacity(): number;
-        opacity(opacity: number): void;
-        src(): string;
-        src(value: string): void;
-        rect(): kendo.geometry.Rect;
-        rect(value: kendo.geometry.Rect): void;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-    }
-
-    interface ImageOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        opacity?: number;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface ImageEvent {
-        sender: Image;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class Layout extends kendo.drawing.Group {
-        constructor(rect: kendo.geometry.Rect, options?: LayoutOptions);
-        options: LayoutOptions;
-        rect(): kendo.geometry.Rect;
-        rect(rect: kendo.geometry.Rect): void;
-        reflow(): void;
-    }
-
-    interface LayoutOptions {
-        name?: string;
-        alignContent?: string;
-        alignItems?: string;
-        justifyContent?: string;
-        lineSpacing?: number;
-        spacing?: number;
-        orientation?: string;
-        wrap?: boolean;
-    }
-    interface LayoutEvent {
-        sender: Layout;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class LinearGradient extends kendo.drawing.Gradient {
-        constructor(options?: LinearGradientOptions);
-        options: LinearGradientOptions;
-        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
-        end(): kendo.geometry.Point;
-        end(end: any): void;
-        end(end: kendo.geometry.Point): void;
-        start(): kendo.geometry.Point;
-        start(start: any): void;
-        start(start: kendo.geometry.Point): void;
-        removeStop(stop: kendo.drawing.GradientStop): void;
-        stops: any;
-    }
-
-    interface LinearGradientOptions {
-        name?: string;
-        stops?: any;
-    }
-    interface LinearGradientEvent {
-        sender: LinearGradient;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class MultiPath extends kendo.drawing.Element {
-        constructor(options?: MultiPathOptions);
-        options: MultiPathOptions;
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        close(): kendo.drawing.MultiPath;
-        curveTo(controlOut: any, controlIn: any): kendo.drawing.MultiPath;
-        curveTo(controlOut: any, controlIn: kendo.geometry.Point): kendo.drawing.MultiPath;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: any): kendo.drawing.MultiPath;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point): kendo.drawing.MultiPath;
-        fill(color: string, opacity?: number): kendo.drawing.MultiPath;
-        lineTo(x: number, y?: number): kendo.drawing.MultiPath;
-        lineTo(x: any, y?: number): kendo.drawing.MultiPath;
-        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
-        moveTo(x: number, y?: number): kendo.drawing.MultiPath;
-        moveTo(x: any, y?: number): kendo.drawing.MultiPath;
-        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.MultiPath;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-        paths: any;
-    }
-
-    interface MultiPathOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface MultiPathEvent {
-        sender: MultiPath;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class OptionsStore extends kendo.Class {
-        constructor(options?: OptionsStoreOptions);
-        options: OptionsStoreOptions;
-        get(field: string): any;
-        set(field: string, value: any): void;
-        observer: any;
-    }
-
-    interface OptionsStoreOptions {
-        name?: string;
-    }
-    interface OptionsStoreEvent {
-        sender: OptionsStore;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    interface PDFOptions  {
-        creator: string;
-        date: Date;
-        keywords: string;
-        landscape: boolean;
-        margin: any;
-        paperSize: any;
-        subject: string;
-        title: string;
-    }
-
-
-
-    class Path extends kendo.drawing.Element {
-        constructor(options?: PathOptions);
-        options: PathOptions;
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        close(): kendo.drawing.Path;
-        curveTo(controlOut: any, controlIn: any): kendo.drawing.Path;
-        curveTo(controlOut: any, controlIn: kendo.geometry.Point): kendo.drawing.Path;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: any): kendo.drawing.Path;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point): kendo.drawing.Path;
-        fill(color: string, opacity?: number): kendo.drawing.Path;
-        lineTo(x: number, y?: number): kendo.drawing.Path;
-        lineTo(x: any, y?: number): kendo.drawing.Path;
-        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
-        moveTo(x: number, y?: number): kendo.drawing.Path;
-        moveTo(x: any, y?: number): kendo.drawing.Path;
-        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Path;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-        static fromPoints(points: any): kendo.drawing.Path;
-        static fromRect(rect: kendo.geometry.Rect): kendo.drawing.Path;
-        static parse(svgPath: string, options?: any): kendo.drawing.Path;
-        segments: any;
-    }
-
-    interface PathOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface PathEvent {
-        sender: Path;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class RadialGradient extends kendo.drawing.Gradient {
-        constructor(options?: RadialGradientOptions);
-        options: RadialGradientOptions;
-        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
-        center(): kendo.geometry.Point;
-        center(center: any): void;
-        center(center: kendo.geometry.Point): void;
-        radius(): number;
-        radius(value: number): void;
-        removeStop(stop: kendo.drawing.GradientStop): void;
-        stops: any;
-    }
-
-    interface RadialGradientOptions {
-        name?: string;
-        center?: any;
-        radius?: number;
-        stops?: any;
-    }
-    interface RadialGradientEvent {
-        sender: RadialGradient;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class Segment extends kendo.Class {
-        constructor(anchor: kendo.geometry.Point, controlIn: kendo.geometry.Point, controlOut: kendo.geometry.Point);
-        options: SegmentOptions;
-        anchor(): kendo.geometry.Point;
-        anchor(value: kendo.geometry.Point): void;
-        controlIn(): kendo.geometry.Point;
-        controlIn(value: kendo.geometry.Point): void;
-        controlOut(): kendo.geometry.Point;
-        controlOut(value: kendo.geometry.Point): void;
-    }
-
-    interface SegmentOptions {
-        name?: string;
-    }
-    interface SegmentEvent {
-        sender: Segment;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    interface StrokeOptions  {
-        color: string;
-        dashType: string;
-        lineCap: string;
-        lineJoin: string;
-        opacity: number;
-        width: number;
-    }
-
-
-
-    class Surface extends kendo.Observable {
-        constructor(options?: SurfaceOptions);
-        options: SurfaceOptions;
-        clear(): void;
-        draw(element: kendo.drawing.Element): void;
-        eventTarget(e: any): kendo.drawing.Element;
-        resize(force?: boolean): void;
-        static create(element: JQuery, options?: any): kendo.drawing.Surface;
-        static create(element: Element, options?: any): kendo.drawing.Surface;
-    }
-
-    interface SurfaceOptions {
-        name?: string;
-        type?: string;
-        height?: string;
-        width?: string;
-        click?(e: SurfaceClickEvent): void;
-        mouseenter?(e: SurfaceMouseenterEvent): void;
-        mouseleave?(e: SurfaceMouseleaveEvent): void;
-    }
-    interface SurfaceEvent {
-        sender: Surface;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-    interface SurfaceClickEvent extends SurfaceEvent {
-        element?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-    interface SurfaceMouseenterEvent extends SurfaceEvent {
-        element?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-    interface SurfaceMouseleaveEvent extends SurfaceEvent {
-        element?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-
-    class Text extends kendo.drawing.Element {
-        constructor(content: string, position: kendo.geometry.Point, options?: TextOptions);
-        options: TextOptions;
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        content(): string;
-        content(value: string): void;
-        fill(color: string, opacity?: number): kendo.drawing.Text;
-        opacity(): number;
-        opacity(opacity: number): void;
-        position(): kendo.geometry.Point;
-        position(value: kendo.geometry.Point): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Text;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-    }
-
-    interface TextOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        fill?: kendo.drawing.FillOptions;
-        font?: string;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface TextEvent {
-        sender: Text;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
     }
 
 
 }
 declare module kendo.ui {
     class AutoComplete extends kendo.ui.Widget {
+
         static fn: AutoComplete;
-        static extend(proto: Object): AutoComplete;
+
+        options: AutoCompleteOptions;
+
+        dataSource: kendo.data.DataSource;
+        list: JQuery;
+        ul: JQuery;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): AutoComplete;
+
         constructor(element: Element, options?: AutoCompleteOptions);
-        options: AutoCompleteOptions;
-        dataSource: kendo.data.DataSource;
+
+
         close(): void;
         dataItem(index: number): any;
         destroy(): void;
@@ -2192,8 +2465,7 @@ declare module kendo.ui {
         suggest(value: string): void;
         value(): string;
         value(value: string): void;
-        list: JQuery;
-        ul: JQuery;
+
     }
 
     interface AutoCompleteAnimationClose {
@@ -2219,22 +2491,23 @@ declare module kendo.ui {
     interface AutoCompleteOptions {
         name?: string;
         animation?: AutoCompleteAnimation;
-        dataSource?: any;
+        dataSource?: any|any|kendo.data.DataSource;
         dataTextField?: string;
         delay?: number;
         enable?: boolean;
         filter?: string;
-        fixedGroupTemplate?: any;
-        groupTemplate?: any;
+        fixedGroupTemplate?: string|Function;
+        groupTemplate?: string|Function;
         height?: number;
         highlightFirst?: boolean;
         ignoreCase?: boolean;
         minLength?: number;
         placeholder?: string;
+        popup?: any;
         separator?: string;
         suggest?: boolean;
-        headerTemplate?: any;
-        template?: any;
+        headerTemplate?: string|Function;
+        template?: string|Function;
         valuePrimitive?: boolean;
         virtual?: AutoCompleteVirtual;
         change?(e: AutoCompleteChangeEvent): void;
@@ -2246,8 +2519,8 @@ declare module kendo.ui {
     }
     interface AutoCompleteEvent {
         sender: AutoComplete;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface AutoCompleteChangeEvent extends AutoCompleteEvent {
@@ -2272,14 +2545,22 @@ declare module kendo.ui {
 
 
     class Button extends kendo.ui.Widget {
+
         static fn: Button;
-        static extend(proto: Object): Button;
+
+        options: ButtonOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Button;
+
         constructor(element: Element, options?: ButtonOptions);
-        options: ButtonOptions;
+
+
         enable(toggle: boolean): void;
+
     }
 
     interface ButtonOptions {
@@ -2292,8 +2573,8 @@ declare module kendo.ui {
     }
     interface ButtonEvent {
         sender: Button;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ButtonClickEvent extends ButtonEvent {
@@ -2302,13 +2583,20 @@ declare module kendo.ui {
 
 
     class Calendar extends kendo.ui.Widget {
+
         static fn: Calendar;
-        static extend(proto: Object): Calendar;
+
+        options: CalendarOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Calendar;
+
         constructor(element: Element, options?: CalendarOptions);
-        options: CalendarOptions;
+
+
         current(): Date;
         destroy(): void;
         max(): Date;
@@ -2326,6 +2614,7 @@ declare module kendo.ui {
         value(value: Date): void;
         value(value: string): void;
         view(): any;
+
     }
 
     interface CalendarMonth {
@@ -2338,7 +2627,7 @@ declare module kendo.ui {
         culture?: string;
         dates?: any;
         depth?: string;
-        footer?: any;
+        footer?: string|Function;
         format?: string;
         max?: Date;
         min?: Date;
@@ -2350,24 +2639,32 @@ declare module kendo.ui {
     }
     interface CalendarEvent {
         sender: Calendar;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class ColorPalette extends kendo.ui.Widget {
+
         static fn: ColorPalette;
-        static extend(proto: Object): ColorPalette;
+
+        options: ColorPaletteOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): ColorPalette;
+
         constructor(element: Element, options?: ColorPaletteOptions);
-        options: ColorPaletteOptions;
+
+
         value(): string;
         value(color?: string): void;
         color(): kendo.Color;
         color(color?: kendo.Color): void;
         enable(enable?: boolean): void;
+
     }
 
     interface ColorPaletteTileSize {
@@ -2377,7 +2674,7 @@ declare module kendo.ui {
 
     interface ColorPaletteOptions {
         name?: string;
-        palette?: any;
+        palette?: string|any;
         columns?: number;
         tileSize?: ColorPaletteTileSize;
         value?: string;
@@ -2385,19 +2682,26 @@ declare module kendo.ui {
     }
     interface ColorPaletteEvent {
         sender: ColorPalette;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class ColorPicker extends kendo.ui.Widget {
+
         static fn: ColorPicker;
-        static extend(proto: Object): ColorPicker;
+
+        options: ColorPickerOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): ColorPicker;
+
         constructor(element: Element, options?: ColorPickerOptions);
-        options: ColorPickerOptions;
+
+
         close(): void;
         open(): void;
         toggle(): void;
@@ -2406,6 +2710,7 @@ declare module kendo.ui {
         color(): kendo.Color;
         color(color?: kendo.Color): void;
         enable(enable?: boolean): void;
+
     }
 
     interface ColorPickerMessages {
@@ -2424,7 +2729,7 @@ declare module kendo.ui {
         columns?: number;
         tileSize?: ColorPickerTileSize;
         messages?: ColorPickerMessages;
-        palette?: any;
+        palette?: string|any;
         opacity?: boolean;
         preview?: boolean;
         toolIcon?: string;
@@ -2436,8 +2741,8 @@ declare module kendo.ui {
     }
     interface ColorPickerEvent {
         sender: ColorPicker;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ColorPickerChangeEvent extends ColorPickerEvent {
@@ -2450,14 +2755,24 @@ declare module kendo.ui {
 
 
     class ComboBox extends kendo.ui.Widget {
+
         static fn: ComboBox;
-        static extend(proto: Object): ComboBox;
+
+        options: ComboBoxOptions;
+
+        dataSource: kendo.data.DataSource;
+        input: JQuery;
+        list: JQuery;
+        ul: JQuery;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): ComboBox;
+
         constructor(element: Element, options?: ComboBoxOptions);
-        options: ComboBoxOptions;
-        dataSource: kendo.data.DataSource;
+
+
         close(): void;
         dataItem(index?: number): any;
         destroy(): void;
@@ -2478,9 +2793,7 @@ declare module kendo.ui {
         toggle(toggle: boolean): void;
         value(): string;
         value(value: string): void;
-        input: JQuery;
-        list: JQuery;
-        ul: JQuery;
+
     }
 
     interface ComboBoxAnimationClose {
@@ -2509,23 +2822,24 @@ declare module kendo.ui {
         autoBind?: boolean;
         cascadeFrom?: string;
         cascadeFromField?: string;
-        dataSource?: any;
+        dataSource?: any|any|kendo.data.DataSource;
         dataTextField?: string;
         dataValueField?: string;
         delay?: number;
         enable?: boolean;
         filter?: string;
-        fixedGroupTemplate?: any;
-        groupTemplate?: any;
+        fixedGroupTemplate?: string|Function;
+        groupTemplate?: string|Function;
         height?: number;
         highlightFirst?: boolean;
         ignoreCase?: string;
         index?: number;
         minLength?: number;
         placeholder?: string;
+        popup?: any;
         suggest?: boolean;
-        headerTemplate?: any;
-        template?: any;
+        headerTemplate?: string|Function;
+        template?: string|Function;
         text?: string;
         value?: string;
         valuePrimitive?: boolean;
@@ -2540,8 +2854,8 @@ declare module kendo.ui {
     }
     interface ComboBoxEvent {
         sender: ComboBox;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ComboBoxChangeEvent extends ComboBoxEvent {
@@ -2569,13 +2883,20 @@ declare module kendo.ui {
 
 
     class ContextMenu extends kendo.ui.Widget {
+
         static fn: ContextMenu;
-        static extend(proto: Object): ContextMenu;
+
+        options: ContextMenuOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): ContextMenu;
+
         constructor(element: Element, options?: ContextMenuOptions);
-        options: ContextMenuOptions;
+
+
         append(item: any, referenceItem: string): kendo.ui.ContextMenu;
         append(item: any, referenceItem: JQuery): kendo.ui.ContextMenu;
         close(element: Element): kendo.ui.ContextMenu;
@@ -2608,6 +2929,7 @@ declare module kendo.ui {
         remove(element: string): kendo.ui.ContextMenu;
         remove(element: Element): kendo.ui.ContextMenu;
         remove(element: JQuery): kendo.ui.ContextMenu;
+
     }
 
     interface ContextMenuAnimationClose {
@@ -2630,14 +2952,14 @@ declare module kendo.ui {
         alignToAnchor?: boolean;
         animation?: ContextMenuAnimation;
         closeOnClick?: boolean;
-        dataSource?: any;
+        dataSource?: any|any;
         direction?: string;
         filter?: string;
         hoverDelay?: number;
         orientation?: string;
         popupCollision?: string;
         showOn?: string;
-        target?: any;
+        target?: string|JQuery;
         close?(e: ContextMenuCloseEvent): void;
         open?(e: ContextMenuOpenEvent): void;
         activate?(e: ContextMenuActivateEvent): void;
@@ -2646,8 +2968,8 @@ declare module kendo.ui {
     }
     interface ContextMenuEvent {
         sender: ContextMenu;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ContextMenuCloseEvent extends ContextMenuEvent {
@@ -2684,13 +3006,20 @@ declare module kendo.ui {
 
 
     class DatePicker extends kendo.ui.Widget {
+
         static fn: DatePicker;
-        static extend(proto: Object): DatePicker;
+
+        options: DatePickerOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): DatePicker;
+
         constructor(element: Element, options?: DatePickerOptions);
-        options: DatePickerOptions;
+
+
         close(): void;
         destroy(): void;
         enable(enable: boolean): void;
@@ -2706,6 +3035,7 @@ declare module kendo.ui {
         value(): Date;
         value(value: Date): void;
         value(value: string): void;
+
     }
 
     interface DatePickerAnimationClose {
@@ -2735,7 +3065,7 @@ declare module kendo.ui {
         culture?: string;
         dates?: any;
         depth?: string;
-        footer?: any;
+        footer?: string|Function;
         format?: string;
         max?: Date;
         min?: Date;
@@ -2749,8 +3079,8 @@ declare module kendo.ui {
     }
     interface DatePickerEvent {
         sender: DatePicker;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface DatePickerChangeEvent extends DatePickerEvent {
@@ -2764,13 +3094,20 @@ declare module kendo.ui {
 
 
     class DateTimePicker extends kendo.ui.Widget {
+
         static fn: DateTimePicker;
-        static extend(proto: Object): DateTimePicker;
+
+        options: DateTimePickerOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): DateTimePicker;
+
         constructor(element: Element, options?: DateTimePickerOptions);
-        options: DateTimePickerOptions;
+
+
         close(view: string): void;
         destroy(): void;
         enable(enable: boolean): void;
@@ -2787,6 +3124,7 @@ declare module kendo.ui {
         value(): Date;
         value(value: Date): void;
         value(value: string): void;
+
     }
 
     interface DateTimePickerAnimationClose {
@@ -2832,8 +3170,8 @@ declare module kendo.ui {
     }
     interface DateTimePickerEvent {
         sender: DateTimePicker;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface DateTimePickerChangeEvent extends DateTimePickerEvent {
@@ -2849,14 +3187,25 @@ declare module kendo.ui {
 
 
     class DropDownList extends kendo.ui.Widget {
+
         static fn: DropDownList;
-        static extend(proto: Object): DropDownList;
+
+        options: DropDownListOptions;
+
+        dataSource: kendo.data.DataSource;
+        span: JQuery;
+        filterInput: JQuery;
+        list: JQuery;
+        ul: JQuery;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): DropDownList;
+
         constructor(element: Element, options?: DropDownListOptions);
-        options: DropDownListOptions;
-        dataSource: kendo.data.DataSource;
+
+
         close(): void;
         dataItem(index?: number): any;
         destroy(): void;
@@ -2876,10 +3225,7 @@ declare module kendo.ui {
         toggle(toggle: boolean): void;
         value(): string;
         value(value: string): void;
-        span: JQuery;
-        filterInput: JQuery;
-        list: JQuery;
-        ul: JQuery;
+
     }
 
     interface DropDownListAnimationClose {
@@ -2908,23 +3254,24 @@ declare module kendo.ui {
         autoBind?: boolean;
         cascadeFrom?: string;
         cascadeFromField?: string;
-        dataSource?: any;
+        dataSource?: any|any|kendo.data.DataSource;
         dataTextField?: string;
         dataValueField?: string;
         delay?: number;
         enable?: boolean;
         filter?: string;
-        fixedGroupTemplate?: any;
-        groupTemplate?: any;
+        fixedGroupTemplate?: string|Function;
+        groupTemplate?: string|Function;
         height?: number;
         ignoreCase?: string;
         index?: number;
         minLength?: number;
-        optionLabel?: any;
-        optionLabelTemplate?: any;
-        headerTemplate?: any;
-        template?: any;
-        valueTemplate?: any;
+        popup?: any;
+        optionLabel?: string|any;
+        optionLabelTemplate?: string|Function;
+        headerTemplate?: string|Function;
+        template?: string|Function;
+        valueTemplate?: string|Function;
         text?: string;
         value?: string;
         valuePrimitive?: boolean;
@@ -2939,8 +3286,8 @@ declare module kendo.ui {
     }
     interface DropDownListEvent {
         sender: DropDownList;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface DropDownListChangeEvent extends DropDownListEvent {
@@ -2968,13 +3315,21 @@ declare module kendo.ui {
 
 
     class Editor extends kendo.ui.Widget {
+
         static fn: Editor;
-        static extend(proto: Object): Editor;
+
+        options: EditorOptions;
+
+        body: Element;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Editor;
+
         constructor(element: Element, options?: EditorOptions);
-        options: EditorOptions;
+
+
         createRange(document?: Document): Range;
         destroy(): void;
         encodedValue(): void;
@@ -2991,7 +3346,7 @@ declare module kendo.ui {
         state(toolName: string): boolean;
         value(): string;
         value(value: string): void;
-        body: Element;
+
     }
 
     interface EditorFileBrowserMessages {
@@ -3038,32 +3393,32 @@ declare module kendo.ui {
 
     interface EditorFileBrowserTransportCreate {
         contentType?: string;
-        data?: any;
+        data?: any|string|Function;
         dataType?: string;
         type?: string;
-        url?: any;
+        url?: string|Function;
     }
 
     interface EditorFileBrowserTransportDestroy {
         contentType?: string;
-        data?: any;
+        data?: any|string|Function;
         dataType?: string;
         type?: string;
-        url?: any;
+        url?: string|Function;
     }
 
     interface EditorFileBrowserTransportRead {
         contentType?: string;
-        data?: any;
+        data?: any|string|Function;
         dataType?: string;
         type?: string;
-        url?: any;
+        url?: string|Function;
     }
 
     interface EditorFileBrowserTransport {
         read?: EditorFileBrowserTransportRead;
         uploadUrl?: string;
-        fileUrl?: any;
+        fileUrl?: string|Function;
         destroy?: EditorFileBrowserTransportDestroy;
         create?: EditorFileBrowserTransportCreate;
     }
@@ -3120,33 +3475,33 @@ declare module kendo.ui {
 
     interface EditorImageBrowserTransportCreate {
         contentType?: string;
-        data?: any;
+        data?: any|string|Function;
         dataType?: string;
         type?: string;
-        url?: any;
+        url?: string|Function;
     }
 
     interface EditorImageBrowserTransportDestroy {
         contentType?: string;
-        data?: any;
+        data?: any|string|Function;
         dataType?: string;
         type?: string;
-        url?: any;
+        url?: string|Function;
     }
 
     interface EditorImageBrowserTransportRead {
         contentType?: string;
-        data?: any;
+        data?: any|string|Function;
         dataType?: string;
         type?: string;
-        url?: any;
+        url?: string|Function;
     }
 
     interface EditorImageBrowserTransport {
         read?: EditorImageBrowserTransportRead;
-        thumbnailUrl?: any;
+        thumbnailUrl?: string|Function;
         uploadUrl?: string;
-        imageUrl?: any;
+        imageUrl?: string|Function;
         destroy?: EditorImageBrowserTransportDestroy;
         create?: EditorImageBrowserTransportCreate;
     }
@@ -3223,14 +3578,15 @@ declare module kendo.ui {
     }
 
     interface EditorPdfMargin {
-        bottom?: any;
-        left?: any;
-        right?: any;
-        top?: any;
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
     }
 
     interface EditorPdf {
         author?: string;
+        avoidLinks?: boolean|string;
         creator?: string;
         date?: Date;
         fileName?: string;
@@ -3238,7 +3594,7 @@ declare module kendo.ui {
         keywords?: string;
         landscape?: boolean;
         margin?: EditorPdfMargin;
-        paperSize?: any;
+        paperSize?: string|any;
         proxyURL?: string;
         proxyTarget?: string;
         subject?: string;
@@ -3246,8 +3602,10 @@ declare module kendo.ui {
     }
 
     interface EditorResizable {
+        content?: boolean;
         min?: number;
         max?: number;
+        toolbar?: boolean;
     }
 
     interface EditorSerialization {
@@ -3300,8 +3658,8 @@ declare module kendo.ui {
     }
     interface EditorEvent {
         sender: Editor;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface EditorExecuteEvent extends EditorEvent {
@@ -3319,19 +3677,27 @@ declare module kendo.ui {
 
 
     class FlatColorPicker extends kendo.ui.Widget {
+
         static fn: FlatColorPicker;
-        static extend(proto: Object): FlatColorPicker;
+
+        options: FlatColorPickerOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): FlatColorPicker;
+
         constructor(element: Element, options?: FlatColorPickerOptions);
-        options: FlatColorPickerOptions;
+
+
         focus(): void;
         value(): string;
         value(color?: string): void;
         color(): kendo.Color;
         color(color?: kendo.Color): void;
         enable(enable?: boolean): void;
+
     }
 
     interface FlatColorPickerMessages {
@@ -3351,8 +3717,8 @@ declare module kendo.ui {
     }
     interface FlatColorPickerEvent {
         sender: FlatColorPicker;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface FlatColorPickerChangeEvent extends FlatColorPickerEvent {
@@ -3361,14 +3727,22 @@ declare module kendo.ui {
 
 
     class Gantt extends kendo.ui.Widget {
+
         static fn: Gantt;
-        static extend(proto: Object): Gantt;
+
+        options: GanttOptions;
+
+        dataSource: kendo.data.DataSource;
+        dependencies: kendo.data.GanttDependencyDataSource;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Gantt;
+
         constructor(element: Element, options?: GanttOptions);
-        options: GanttOptions;
-        dataSource: kendo.data.DataSource;
+
+
         clearSelection(): void;
         dataItem(row: string): kendo.data.GanttTask;
         dataItem(row: Element): kendo.data.GanttTask;
@@ -3389,11 +3763,11 @@ declare module kendo.ui {
         setDependenciesDataSource(dataSource: kendo.data.GanttDependencyDataSource): void;
         view(): kendo.ui.GanttView;
         view(type?: string): void;
-        dependencies: kendo.data.GanttDependencyDataSource;
+
     }
 
     interface GanttAssignments {
-        dataSource?: any;
+        dataSource?: any|any|kendo.data.DataSource;
         dataResourceIdField?: string;
         dataTaskIdField?: string;
         dataValueField?: string;
@@ -3403,7 +3777,7 @@ declare module kendo.ui {
         field?: string;
         title?: string;
         format?: string;
-        width?: any;
+        width?: string|number;
         editable?: boolean;
         sortable?: boolean;
     }
@@ -3414,7 +3788,7 @@ declare module kendo.ui {
 
     interface GanttEditable {
         confirmation?: boolean;
-        template?: any;
+        template?: string|Function;
     }
 
     interface GanttMessagesActions {
@@ -3450,7 +3824,9 @@ declare module kendo.ui {
     interface GanttMessages {
         actions?: GanttMessagesActions;
         cancel?: string;
+        deleteDependencyConfirmation?: string;
         deleteDependencyWindowTitle?: string;
+        deleteTaskConfirmation?: string;
         deleteTaskWindowTitle?: string;
         destroy?: string;
         editor?: GanttMessagesEditor;
@@ -3459,14 +3835,15 @@ declare module kendo.ui {
     }
 
     interface GanttPdfMargin {
-        bottom?: any;
-        left?: any;
-        right?: any;
-        top?: any;
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
     }
 
     interface GanttPdf {
         author?: string;
+        avoidLinks?: boolean|string;
         creator?: string;
         date?: Date;
         fileName?: string;
@@ -3474,7 +3851,7 @@ declare module kendo.ui {
         keywords?: string;
         landscape?: boolean;
         margin?: GanttPdfMargin;
-        paperSize?: any;
+        paperSize?: string|any;
         proxyURL?: string;
         proxyTarget?: string;
         subject?: string;
@@ -3484,31 +3861,31 @@ declare module kendo.ui {
     interface GanttResources {
         dataFormatField?: string;
         dataColorField?: string;
-        dataSource?: any;
+        dataSource?: any|any|kendo.data.DataSource;
         dataTextField?: string;
         field?: string;
     }
 
     interface GanttToolbarItem {
         name?: string;
-        template?: any;
+        template?: string|Function;
         text?: string;
     }
 
     interface GanttTooltip {
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
     interface GanttView {
         type?: string;
         selected?: boolean;
-        slotSize?: any;
-        timeHeaderTemplate?: any;
-        dayHeaderTemplate?: any;
-        weekHeaderTemplate?: any;
-        monthHeaderTemplate?: any;
-        yearHeaderTemplate?: any;
+        slotSize?: number|string;
+        timeHeaderTemplate?: string|Function;
+        dayHeaderTemplate?: string|Function;
+        weekHeaderTemplate?: string|Function;
+        monthHeaderTemplate?: string|Function;
+        yearHeaderTemplate?: string|Function;
         resizeTooltipFormat?: string;
     }
 
@@ -3516,10 +3893,11 @@ declare module kendo.ui {
         name?: string;
         assignments?: GanttAssignments;
         autoBind?: boolean;
+        columnResizeHandleWidth?: number;
         columns?: GanttColumn[];
         currentTimeMarker?: GanttCurrentTimeMarker;
-        dataSource?: any;
-        dependencies?: any;
+        dataSource?: any|any|kendo.data.GanttDataSource;
+        dependencies?: any|any|kendo.data.GanttDependencyDataSource;
         editable?: GanttEditable;
         navigatable?: boolean;
         workDayStart?: Date;
@@ -3528,17 +3906,20 @@ declare module kendo.ui {
         workWeekEnd?: number;
         hourSpan?: number;
         snap?: boolean;
-        height?: any;
-        listWidth?: any;
+        height?: number|string;
+        listWidth?: string|number;
         messages?: GanttMessages;
         pdf?: GanttPdf;
+        resizable?: boolean;
         selectable?: boolean;
         showWorkDays?: boolean;
         showWorkHours?: boolean;
+        taskTemplate?: string|Function;
         toolbar?: GanttToolbarItem[];
         tooltip?: GanttTooltip;
         views?: GanttView[];
         resources?: GanttResources;
+        rowHeight?: number|string;
         dataBinding?(e: GanttDataBindingEvent): void;
         dataBound?(e: GanttDataBoundEvent): void;
         add?(e: GanttAddEvent): void;
@@ -3547,6 +3928,7 @@ declare module kendo.ui {
         cancel?(e: GanttCancelEvent): void;
         save?(e: GanttSaveEvent): void;
         change?(e: GanttChangeEvent): void;
+        columnResize?(e: GanttColumnResizeEvent): void;
         navigate?(e: GanttNavigateEvent): void;
         moveStart?(e: GanttMoveStartEvent): void;
         move?(e: GanttMoveEvent): void;
@@ -3558,8 +3940,8 @@ declare module kendo.ui {
     }
     interface GanttEvent {
         sender: Gantt;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface GanttDataBindingEvent extends GanttEvent {
@@ -3596,6 +3978,12 @@ declare module kendo.ui {
     interface GanttChangeEvent extends GanttEvent {
     }
 
+    interface GanttColumnResizeEvent extends GanttEvent {
+        column?: any;
+        newWidth?: number;
+        oldWidth?: number;
+    }
+
     interface GanttNavigateEvent extends GanttEvent {
         view?: string;
     }
@@ -3638,14 +4026,31 @@ declare module kendo.ui {
 
 
     class Grid extends kendo.ui.Widget {
+
         static fn: Grid;
-        static extend(proto: Object): Grid;
+
+        options: GridOptions;
+
+        dataSource: kendo.data.DataSource;
+        columns: GridColumn[];
+        footer: JQuery;
+        pager: kendo.ui.Pager;
+        table: JQuery;
+        tbody: JQuery;
+        thead: JQuery;
+        content: JQuery;
+        lockedHeader: JQuery;
+        lockedTable: JQuery;
+        lockedContent: JQuery;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Grid;
+
         constructor(element: Element, options?: GridOptions);
-        options: GridOptions;
-        dataSource: kendo.data.DataSource;
+
+
         addRow(): void;
         autoFitColumn(column: number): void;
         autoFitColumn(column: string): void;
@@ -3703,20 +4108,11 @@ declare module kendo.ui {
         showColumn(column: any): void;
         unlockColumn(column: number): void;
         unlockColumn(column: string): void;
-        columns: GridColumn[];
-        footer: JQuery;
-        pager: kendo.ui.Pager;
-        table: JQuery;
-        tbody: JQuery;
-        thead: JQuery;
-        content: JQuery;
-        lockedHeader: JQuery;
-        lockedTable: JQuery;
-        lockedContent: JQuery;
+
     }
 
     interface GridAllowCopy {
-        delimeter?: any;
+        delimeter?: string|any;
     }
 
     interface GridColumnMenuMessages {
@@ -3751,7 +4147,7 @@ declare module kendo.ui {
     }
 
     interface GridColumnFilterableCell {
-        dataSource?: any;
+        dataSource?: any|kendo.data.DataSource;
         dataTextField?: string;
         delay?: number;
         inputWidth?: number;
@@ -3766,10 +4162,10 @@ declare module kendo.ui {
     interface GridColumnFilterable {
         cell?: GridColumnFilterableCell;
         multi?: boolean;
-        dataSource?: any;
+        dataSource?: any|any|kendo.data.DataSource;
         checkAll?: boolean;
         itemTemplate?: Function;
-        ui?: any;
+        ui?: string|Function;
     }
 
     interface GridColumnSortable {
@@ -3784,33 +4180,33 @@ declare module kendo.ui {
         encoded?: boolean;
         field?: string;
         filterable?: GridColumnFilterable;
-        footerTemplate?: any;
+        footerTemplate?: string|Function;
         format?: string;
         groupable?: boolean;
-        groupHeaderTemplate?: any;
-        groupFooterTemplate?: any;
+        groupHeaderTemplate?: string|Function;
+        groupFooterTemplate?: string|Function;
         headerAttributes?: any;
-        headerTemplate?: any;
+        headerTemplate?: string|Function;
         hidden?: boolean;
         locked?: boolean;
         lockable?: boolean;
         minScreenWidth?: number;
         sortable?: GridColumnSortable;
-        template?: any;
+        template?: string|Function;
         title?: string;
-        width?: any;
+        width?: string|number;
         values?: any;
         menu?: boolean;
     }
 
     interface GridEditable {
-        confirmation?: any;
+        confirmation?: boolean|string|Function;
         cancelDelete?: string;
         confirmDelete?: string;
         createAt?: string;
         destroy?: boolean;
         mode?: string;
-        template?: any;
+        template?: string|Function;
         update?: boolean;
         window?: any;
     }
@@ -3907,6 +4303,11 @@ declare module kendo.ui {
 
     interface GridMessages {
         commands?: GridMessagesCommands;
+        noRecords?: string;
+    }
+
+    interface GridNoRecords {
+        template?: string|Function;
     }
 
     interface GridPageableMessages {
@@ -3929,22 +4330,23 @@ declare module kendo.ui {
         numeric?: boolean;
         buttonCount?: number;
         input?: boolean;
-        pageSizes?: any;
+        pageSizes?: boolean|any;
         refresh?: boolean;
         info?: boolean;
         messages?: GridPageableMessages;
     }
 
     interface GridPdfMargin {
-        bottom?: any;
-        left?: any;
-        right?: any;
-        top?: any;
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
     }
 
     interface GridPdf {
         allPages?: boolean;
         author?: string;
+        avoidLinks?: boolean|string;
         creator?: string;
         date?: Date;
         fileName?: string;
@@ -3952,7 +4354,7 @@ declare module kendo.ui {
         keywords?: string;
         landscape?: boolean;
         margin?: GridPdfMargin;
-        paperSize?: any;
+        paperSize?: string|any;
         proxyURL?: string;
         proxyTarget?: string;
         subject?: string;
@@ -3970,35 +4372,36 @@ declare module kendo.ui {
 
     interface GridToolbarItem {
         name?: string;
-        template?: any;
+        template?: string|Function;
         text?: string;
     }
 
     interface GridOptions {
         name?: string;
         allowCopy?: GridAllowCopy;
-        altRowTemplate?: any;
+        altRowTemplate?: string|Function;
         autoBind?: boolean;
         columnResizeHandleWidth?: number;
         columns?: GridColumn[];
         columnMenu?: GridColumnMenu;
-        dataSource?: any;
-        detailTemplate?: any;
+        dataSource?: any|any|kendo.data.DataSource;
+        detailTemplate?: string|Function;
         editable?: GridEditable;
         excel?: GridExcel;
         filterable?: GridFilterable;
         groupable?: GridGroupable;
-        height?: any;
+        height?: number|string;
         messages?: GridMessages;
-        mobile?: any;
+        mobile?: boolean|string;
         navigatable?: boolean;
+        noRecords?: GridNoRecords;
         pageable?: GridPageable;
         pdf?: GridPdf;
         reorderable?: boolean;
         resizable?: boolean;
-        rowTemplate?: any;
+        rowTemplate?: string|Function;
         scrollable?: GridScrollable;
-        selectable?: any;
+        selectable?: boolean|string;
         sortable?: GridSortable;
         toolbar?: GridToolbarItem[];
         cancel?(e: GridCancelEvent): void;
@@ -4022,11 +4425,12 @@ declare module kendo.ui {
         saveChanges?(e: GridSaveChangesEvent): void;
         columnLock?(e: GridColumnLockEvent): void;
         columnUnlock?(e: GridColumnUnlockEvent): void;
+        navigate?(e: GridNavigateEvent): void;
     }
     interface GridEvent {
         sender: Grid;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface GridCancelEvent extends GridEvent {
@@ -4129,16 +4533,27 @@ declare module kendo.ui {
         column?: any;
     }
 
+    interface GridNavigateEvent extends GridEvent {
+        element?: JQuery;
+    }
+
 
     class ListView extends kendo.ui.Widget {
+
         static fn: ListView;
-        static extend(proto: Object): ListView;
+
+        options: ListViewOptions;
+
+        dataSource: kendo.data.DataSource;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): ListView;
+
         constructor(element: Element, options?: ListViewOptions);
-        options: ListViewOptions;
-        dataSource: kendo.data.DataSource;
+
+
         add(): void;
         cancel(): void;
         clearSelection(): void;
@@ -4155,15 +4570,16 @@ declare module kendo.ui {
         select(items: JQuery): void;
         select(items: any): void;
         setDataSource(dataSource: kendo.data.DataSource): void;
+
     }
 
     interface ListViewOptions {
         name?: string;
         autoBind?: boolean;
-        dataSource?: any;
+        dataSource?: any|any|kendo.data.DataSource;
         editTemplate?: Function;
         navigatable?: boolean;
-        selectable?: any;
+        selectable?: boolean|string;
         template?: Function;
         altTemplate?: Function;
         cancel?(e: ListViewCancelEvent): void;
@@ -4176,8 +4592,8 @@ declare module kendo.ui {
     }
     interface ListViewEvent {
         sender: ListView;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ListViewCancelEvent extends ListViewEvent {
@@ -4202,19 +4618,27 @@ declare module kendo.ui {
 
 
     class MaskedTextBox extends kendo.ui.Widget {
+
         static fn: MaskedTextBox;
-        static extend(proto: Object): MaskedTextBox;
+
+        options: MaskedTextBoxOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): MaskedTextBox;
+
         constructor(element: Element, options?: MaskedTextBoxOptions);
-        options: MaskedTextBoxOptions;
+
+
         destroy(): void;
         enable(enable: boolean): void;
         readonly(readonly: boolean): void;
         raw(): string;
         value(): string;
         value(value: string): void;
+
     }
 
     interface MaskedTextBoxOptions {
@@ -4230,8 +4654,8 @@ declare module kendo.ui {
     }
     interface MaskedTextBoxEvent {
         sender: MaskedTextBox;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface MaskedTextBoxChangeEvent extends MaskedTextBoxEvent {
@@ -4239,13 +4663,20 @@ declare module kendo.ui {
 
 
     class Menu extends kendo.ui.Widget {
+
         static fn: Menu;
-        static extend(proto: Object): Menu;
+
+        options: MenuOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Menu;
+
         constructor(element: Element, options?: MenuOptions);
-        options: MenuOptions;
+
+
         append(item: any, referenceItem: string): kendo.ui.Menu;
         append(item: any, referenceItem: JQuery): kendo.ui.Menu;
         close(element: string): kendo.ui.Menu;
@@ -4279,6 +4710,7 @@ declare module kendo.ui {
         remove(element: string): kendo.ui.Menu;
         remove(element: Element): kendo.ui.Menu;
         remove(element: JQuery): kendo.ui.Menu;
+
     }
 
     interface MenuAnimationClose {
@@ -4300,7 +4732,7 @@ declare module kendo.ui {
         name?: string;
         animation?: MenuAnimation;
         closeOnClick?: boolean;
-        dataSource?: any;
+        dataSource?: any|any;
         direction?: string;
         hoverDelay?: number;
         openOnClick?: boolean;
@@ -4314,8 +4746,8 @@ declare module kendo.ui {
     }
     interface MenuEvent {
         sender: Menu;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface MenuCloseEvent extends MenuEvent {
@@ -4340,14 +4772,25 @@ declare module kendo.ui {
 
 
     class MultiSelect extends kendo.ui.Widget {
+
         static fn: MultiSelect;
-        static extend(proto: Object): MultiSelect;
+
+        options: MultiSelectOptions;
+
+        dataSource: kendo.data.DataSource;
+        input: JQuery;
+        list: JQuery;
+        ul: JQuery;
+        tagList: JQuery;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): MultiSelect;
+
         constructor(element: Element, options?: MultiSelectOptions);
-        options: MultiSelectOptions;
-        dataSource: kendo.data.DataSource;
+
+
         close(): void;
         dataItems(): any;
         destroy(): void;
@@ -4362,10 +4805,7 @@ declare module kendo.ui {
         value(): any;
         value(value: any): void;
         value(value: string): void;
-        input: JQuery;
-        list: JQuery;
-        ul: JQuery;
-        tagList: JQuery;
+
     }
 
     interface MultiSelectAnimationClose {
@@ -4393,23 +4833,25 @@ declare module kendo.ui {
         animation?: MultiSelectAnimation;
         autoBind?: boolean;
         autoClose?: boolean;
-        dataSource?: any;
+        dataSource?: any|any|kendo.data.DataSource;
         dataTextField?: string;
         dataValueField?: string;
         delay?: number;
         enable?: boolean;
         filter?: string;
-        fixedGroupTemplate?: any;
-        groupTemplate?: any;
+        fixedGroupTemplate?: string|Function;
+        groupTemplate?: string|Function;
         height?: number;
         highlightFirst?: boolean;
         ignoreCase?: string;
         minLength?: number;
         maxSelectedItems?: number;
         placeholder?: string;
-        headerTemplate?: any;
-        itemTemplate?: any;
+        popup?: any;
+        headerTemplate?: string|Function;
+        itemTemplate?: string|Function;
         tagTemplate?: string;
+        tagMode?: string;
         value?: any;
         valuePrimitive?: boolean;
         virtual?: MultiSelectVirtual;
@@ -4422,8 +4864,8 @@ declare module kendo.ui {
     }
     interface MultiSelectEvent {
         sender: MultiSelect;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface MultiSelectChangeEvent extends MultiSelectEvent {
@@ -4448,13 +4890,20 @@ declare module kendo.ui {
 
 
     class Notification extends kendo.ui.Widget {
+
         static fn: Notification;
-        static extend(proto: Object): Notification;
+
+        options: NotificationOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Notification;
+
         constructor(element: Element, options?: NotificationOptions);
-        options: NotificationOptions;
+
+
         error(data: any): void;
         error(data: string): void;
         error(data: Function): void;
@@ -4472,6 +4921,7 @@ declare module kendo.ui {
         warning(data: any): void;
         warning(data: string): void;
         warning(data: Function): void;
+
     }
 
     interface NotificationPosition {
@@ -4490,23 +4940,23 @@ declare module kendo.ui {
     interface NotificationOptions {
         name?: string;
         allowHideAfter?: number;
-        animation?: any;
-        appendTo?: any;
+        animation?: any|boolean;
+        appendTo?: string|JQuery;
         autoHideAfter?: number;
         button?: boolean;
-        height?: any;
+        height?: number|string;
         hideOnClick?: boolean;
         position?: NotificationPosition;
         stacking?: string;
         templates?: NotificationTemplate[];
-        width?: any;
+        width?: number|string;
         hide?(e: NotificationHideEvent): void;
         show?(e: NotificationShowEvent): void;
     }
     interface NotificationEvent {
         sender: Notification;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface NotificationHideEvent extends NotificationEvent {
@@ -4519,13 +4969,20 @@ declare module kendo.ui {
 
 
     class NumericTextBox extends kendo.ui.Widget {
+
         static fn: NumericTextBox;
-        static extend(proto: Object): NumericTextBox;
+
+        options: NumericTextBoxOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): NumericTextBox;
+
         constructor(element: Element, options?: NumericTextBoxOptions);
-        options: NumericTextBoxOptions;
+
+
         destroy(): void;
         enable(enable: boolean): void;
         readonly(readonly: boolean): void;
@@ -4542,6 +4999,7 @@ declare module kendo.ui {
         value(): number;
         value(value: number): void;
         value(value: string): void;
+
     }
 
     interface NumericTextBoxOptions {
@@ -4562,8 +5020,8 @@ declare module kendo.ui {
     }
     interface NumericTextBoxEvent {
         sender: NumericTextBox;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface NumericTextBoxChangeEvent extends NumericTextBoxEvent {
@@ -4574,24 +5032,33 @@ declare module kendo.ui {
 
 
     class Pager extends kendo.ui.Widget {
+
         static fn: Pager;
-        static extend(proto: Object): Pager;
+
+        options: PagerOptions;
+
+        dataSource: kendo.data.DataSource;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Pager;
+
         constructor(element: Element, options?: PagerOptions);
-        options: PagerOptions;
-        dataSource: kendo.data.DataSource;
+
+
         totalPages(): number;
         pageSize(): number;
-        page(page: boolean): number;
+        page(page: number): number;
         refresh(): void;
         destroy(): void;
+
     }
 
     interface PagerMessages {
         display?: string;
         empty?: string;
+        allPages?: string;
         page?: string;
         of?: string;
         itemsPerPage?: string;
@@ -4606,13 +5073,13 @@ declare module kendo.ui {
         name?: string;
         autoBind?: boolean;
         buttonCount?: number;
-        dataSource?: any;
+        dataSource?: any|kendo.data.DataSource;
         selectTemplate?: string;
         linkTemplate?: string;
         info?: boolean;
         input?: boolean;
         numeric?: boolean;
-        pageSizes?: any;
+        pageSizes?: boolean|any;
         previousNext?: boolean;
         refresh?: boolean;
         messages?: PagerMessages;
@@ -4620,8 +5087,8 @@ declare module kendo.ui {
     }
     interface PagerEvent {
         sender: Pager;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface PagerChangeEvent extends PagerEvent {
@@ -4629,13 +5096,20 @@ declare module kendo.ui {
 
 
     class PanelBar extends kendo.ui.Widget {
+
         static fn: PanelBar;
-        static extend(proto: Object): PanelBar;
+
+        options: PanelBarOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): PanelBar;
+
         constructor(element: Element, options?: PanelBarOptions);
-        options: PanelBarOptions;
+
+
         append(item: string, referenceItem: string): kendo.ui.PanelBar;
         append(item: string, referenceItem: Element): kendo.ui.PanelBar;
         append(item: string, referenceItem: JQuery): kendo.ui.PanelBar;
@@ -4693,6 +5167,7 @@ declare module kendo.ui {
         select(element?: string): void;
         select(element?: Element): void;
         select(element?: JQuery): void;
+
     }
 
     interface PanelBarAnimationCollapse {
@@ -4714,7 +5189,7 @@ declare module kendo.ui {
         name?: string;
         animation?: PanelBarAnimation;
         contentUrls?: any;
-        dataSource?: any;
+        dataSource?: any|any;
         expandMode?: string;
         activate?(e: PanelBarActivateEvent): void;
         collapse?(e: PanelBarCollapseEvent): void;
@@ -4725,8 +5200,8 @@ declare module kendo.ui {
     }
     interface PanelBarEvent {
         sender: PanelBar;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface PanelBarActivateEvent extends PanelBarEvent {
@@ -4757,17 +5232,25 @@ declare module kendo.ui {
 
 
     class PivotConfigurator extends kendo.ui.Widget {
+
         static fn: PivotConfigurator;
-        static extend(proto: Object): PivotConfigurator;
+
+        options: PivotConfiguratorOptions;
+
+        dataSource: kendo.data.DataSource;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): PivotConfigurator;
+
         constructor(element: Element, options?: PivotConfiguratorOptions);
-        options: PivotConfiguratorOptions;
-        dataSource: kendo.data.DataSource;
+
+
         destroy(): void;
         refresh(): void;
         setDataSource(dataSource: kendo.data.PivotDataSource): void;
+
     }
 
     interface PivotConfiguratorMessagesFieldMenuOperators {
@@ -4810,28 +5293,35 @@ declare module kendo.ui {
 
     interface PivotConfiguratorOptions {
         name?: string;
-        dataSource?: any;
+        dataSource?: any|kendo.data.PivotDataSource;
         filterable?: boolean;
         sortable?: PivotConfiguratorSortable;
-        height?: any;
+        height?: number|string;
         messages?: PivotConfiguratorMessages;
     }
     interface PivotConfiguratorEvent {
         sender: PivotConfigurator;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class PivotGrid extends kendo.ui.Widget {
+
         static fn: PivotGrid;
-        static extend(proto: Object): PivotGrid;
+
+        options: PivotGridOptions;
+
+        dataSource: kendo.data.DataSource;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): PivotGrid;
+
         constructor(element: Element, options?: PivotGridOptions);
-        options: PivotGridOptions;
-        dataSource: kendo.data.DataSource;
+
+
         cellInfo(columnIndex: number, rowIndex: number): any;
         cellInfoByElement(cell: string): any;
         cellInfoByElement(cell: Element): any;
@@ -4841,6 +5331,7 @@ declare module kendo.ui {
         setDataSource(dataSource: kendo.data.PivotDataSource): void;
         saveAsExcel(): void;
         saveAsPDF(): JQueryPromise<any>;
+
     }
 
     interface PivotGridExcel {
@@ -4881,14 +5372,15 @@ declare module kendo.ui {
     }
 
     interface PivotGridPdfMargin {
-        bottom?: any;
-        left?: any;
-        right?: any;
-        top?: any;
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
     }
 
     interface PivotGridPdf {
         author?: string;
+        avoidLinks?: boolean|string;
         creator?: string;
         date?: Date;
         fileName?: string;
@@ -4896,7 +5388,7 @@ declare module kendo.ui {
         keywords?: string;
         landscape?: boolean;
         margin?: PivotGridPdfMargin;
-        paperSize?: any;
+        paperSize?: string|any;
         proxyURL?: string;
         proxyTarget?: string;
         subject?: string;
@@ -4909,7 +5401,7 @@ declare module kendo.ui {
 
     interface PivotGridOptions {
         name?: string;
-        dataSource?: any;
+        dataSource?: any|kendo.data.PivotDataSource;
         autoBind?: boolean;
         reorderable?: boolean;
         excel?: PivotGridExcel;
@@ -4917,12 +5409,12 @@ declare module kendo.ui {
         filterable?: boolean;
         sortable?: PivotGridSortable;
         columnWidth?: number;
-        height?: any;
-        columnHeaderTemplate?: any;
-        dataCellTemplate?: any;
-        kpiStatusTemplate?: any;
-        kpiTrendTemplate?: any;
-        rowHeaderTemplate?: any;
+        height?: number|string;
+        columnHeaderTemplate?: string|Function;
+        dataCellTemplate?: string|Function;
+        kpiStatusTemplate?: string|Function;
+        kpiTrendTemplate?: string|Function;
+        rowHeaderTemplate?: string|Function;
         messages?: PivotGridMessages;
         dataBinding?(e: PivotGridDataBindingEvent): void;
         dataBound?(e: PivotGridDataBoundEvent): void;
@@ -4933,8 +5425,8 @@ declare module kendo.ui {
     }
     interface PivotGridEvent {
         sender: PivotGrid;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface PivotGridDataBindingEvent extends PivotGridEvent {
@@ -4963,19 +5455,96 @@ declare module kendo.ui {
     }
 
 
-    class ProgressBar extends kendo.ui.Widget {
-        static fn: ProgressBar;
-        static extend(proto: Object): ProgressBar;
+    class Popup extends kendo.ui.Widget {
+
+        static fn: Popup;
+
+        options: PopupOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
-        constructor(element: Element, options?: ProgressBarOptions);
+
+        static extend(proto: Object): Popup;
+
+        constructor(element: Element, options?: PopupOptions);
+
+
+        close(): void;
+        open(): void;
+        position(): void;
+        setOptions(options: any): void;
+        visible(): boolean;
+
+    }
+
+    interface PopupAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface PopupAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface PopupAnimation {
+        close?: PopupAnimationClose;
+        open?: PopupAnimationOpen;
+    }
+
+    interface PopupOptions {
+        name?: string;
+        animation?: PopupAnimation;
+        anchor?: string|JQuery;
+        appendTo?: string|JQuery;
+        origin?: string;
+        position?: string;
+        activate?(e: PopupActivateEvent): void;
+        close?(e: PopupCloseEvent): void;
+        deactivate?(e: PopupDeactivateEvent): void;
+        open?(e: PopupOpenEvent): void;
+    }
+    interface PopupEvent {
+        sender: Popup;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface PopupActivateEvent extends PopupEvent {
+    }
+
+    interface PopupCloseEvent extends PopupEvent {
+    }
+
+    interface PopupDeactivateEvent extends PopupEvent {
+    }
+
+    interface PopupOpenEvent extends PopupEvent {
+    }
+
+
+    class ProgressBar extends kendo.ui.Widget {
+
+        static fn: ProgressBar;
+
         options: ProgressBarOptions;
+
+        progressStatus: JQuery;
+        progressWrapper: JQuery;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): ProgressBar;
+
+        constructor(element: Element, options?: ProgressBarOptions);
+
+
         enable(enable: boolean): void;
         value(): number;
         value(value: number): void;
-        progressStatus: JQuery;
-        progressWrapper: JQuery;
+
     }
 
     interface ProgressBarAnimation {
@@ -4999,8 +5568,8 @@ declare module kendo.ui {
     }
     interface ProgressBarEvent {
         sender: ProgressBar;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ProgressBarChangeEvent extends ProgressBarEvent {
@@ -5013,18 +5582,26 @@ declare module kendo.ui {
 
 
     class RangeSlider extends kendo.ui.Widget {
+
         static fn: RangeSlider;
-        static extend(proto: Object): RangeSlider;
+
+        options: RangeSliderOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): RangeSlider;
+
         constructor(element: Element, options?: RangeSliderOptions);
-        options: RangeSliderOptions;
+
+
         destroy(): void;
         enable(enable: boolean): void;
         value(): any;
         value(selectionStart: number, selectionEnd: number): void;
         resize(): void;
+
     }
 
     interface RangeSliderTooltip {
@@ -5049,8 +5626,8 @@ declare module kendo.ui {
     }
     interface RangeSliderEvent {
         sender: RangeSlider;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface RangeSliderChangeEvent extends RangeSliderEvent {
@@ -5063,16 +5640,24 @@ declare module kendo.ui {
 
 
     class ResponsivePanel extends kendo.ui.Widget {
+
         static fn: ResponsivePanel;
-        static extend(proto: Object): ResponsivePanel;
+
+        options: ResponsivePanelOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): ResponsivePanel;
+
         constructor(element: Element, options?: ResponsivePanelOptions);
-        options: ResponsivePanelOptions;
+
+
         close(): void;
         destroy(): void;
         open(): void;
+
     }
 
     interface ResponsivePanelOptions {
@@ -5086,20 +5671,27 @@ declare module kendo.ui {
     }
     interface ResponsivePanelEvent {
         sender: ResponsivePanel;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Scheduler extends kendo.ui.Widget {
+
         static fn: Scheduler;
-        static extend(proto: Object): Scheduler;
+
+        options: SchedulerOptions;
+
+        dataSource: kendo.data.DataSource;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Scheduler;
+
         constructor(element: Element, options?: SchedulerOptions);
-        options: SchedulerOptions;
-        dataSource: kendo.data.DataSource;
+
+
         addEvent(data: any): void;
         cancelEvent(): void;
         data(): void;
@@ -5124,6 +5716,8 @@ declare module kendo.ui {
         slotByElement(element: JQuery): any;
         view(): kendo.ui.SchedulerView;
         view(type?: string): void;
+        viewName(): string;
+
     }
 
     interface SchedulerCurrentTimeMarker {
@@ -5132,19 +5726,19 @@ declare module kendo.ui {
     }
 
     interface SchedulerEditable {
-        confirmation?: any;
+        confirmation?: boolean|string;
         create?: boolean;
         destroy?: boolean;
         editRecurringMode?: string;
         move?: boolean;
         resize?: boolean;
-        template?: any;
+        template?: string|Function;
         update?: boolean;
         window?: any;
     }
 
     interface SchedulerFooter {
-        command?: any;
+        command?: string|boolean;
     }
 
     interface SchedulerGroup {
@@ -5152,6 +5746,10 @@ declare module kendo.ui {
         orientation?: string;
     }
 
+    interface SchedulerMessagesEditable {
+        confirmation?: string;
+    }
+
     interface SchedulerMessagesEditor {
         allDayEvent?: string;
         description?: string;
@@ -5269,6 +5867,7 @@ declare module kendo.ui {
         showWorkDay?: string;
         time?: string;
         today?: string;
+        editable?: SchedulerMessagesEditable;
         editor?: SchedulerMessagesEditor;
         recurrenceEditor?: SchedulerMessagesRecurrenceEditor;
         recurrenceMessages?: SchedulerMessagesRecurrenceMessages;
@@ -5276,14 +5875,15 @@ declare module kendo.ui {
     }
 
     interface SchedulerPdfMargin {
-        bottom?: any;
-        left?: any;
-        right?: any;
-        top?: any;
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
     }
 
     interface SchedulerPdf {
         author?: string;
+        avoidLinks?: boolean|string;
         creator?: string;
         date?: Date;
         fileName?: string;
@@ -5291,7 +5891,7 @@ declare module kendo.ui {
         keywords?: string;
         landscape?: boolean;
         margin?: SchedulerPdfMargin;
-        paperSize?: any;
+        paperSize?: string|any;
         proxyURL?: string;
         proxyTarget?: string;
         subject?: string;
@@ -5300,7 +5900,7 @@ declare module kendo.ui {
 
     interface SchedulerResource {
         dataColorField?: string;
-        dataSource?: any;
+        dataSource?: any|any|kendo.data.DataSource;
         dataTextField?: string;
         dataValueField?: string;
         field?: string;
@@ -5325,26 +5925,26 @@ declare module kendo.ui {
     }
 
     interface SchedulerView {
-        allDayEventTemplate?: any;
+        allDayEventTemplate?: string|Function;
         allDaySlot?: boolean;
-        allDaySlotTemplate?: any;
+        allDaySlotTemplate?: string|Function;
         columnWidth?: number;
-        dateHeaderTemplate?: any;
-        dayTemplate?: any;
+        dateHeaderTemplate?: string|Function;
+        dayTemplate?: string|Function;
         editable?: SchedulerViewEditable;
         endTime?: Date;
         eventHeight?: number;
-        eventTemplate?: any;
-        eventTimeTemplate?: any;
+        eventTemplate?: string|Function;
+        eventTimeTemplate?: string|Function;
         group?: SchedulerViewGroup;
         majorTick?: number;
-        majorTimeHeaderTemplate?: any;
+        majorTimeHeaderTemplate?: string|Function;
         minorTickCount?: number;
-        minorTimeHeaderTemplate?: any;
+        minorTimeHeaderTemplate?: string|Function;
         selected?: boolean;
         selectedDateFormat?: string;
         showWorkHours?: boolean;
-        slotTemplate?: any;
+        slotTemplate?: string|Function;
         startTime?: Date;
         title?: string;
         type?: string;
@@ -5362,27 +5962,27 @@ declare module kendo.ui {
 
     interface SchedulerOptions {
         name?: string;
-        allDayEventTemplate?: any;
+        allDayEventTemplate?: string|Function;
         allDaySlot?: boolean;
         autoBind?: boolean;
         currentTimeMarker?: SchedulerCurrentTimeMarker;
-        dataSource?: any;
+        dataSource?: any|any|kendo.data.SchedulerDataSource;
         date?: Date;
-        dateHeaderTemplate?: any;
+        dateHeaderTemplate?: string|Function;
         editable?: SchedulerEditable;
         endTime?: Date;
-        eventTemplate?: any;
+        eventTemplate?: string|Function;
         footer?: SchedulerFooter;
         group?: SchedulerGroup;
-        height?: any;
+        height?: number|string;
         majorTick?: number;
-        majorTimeHeaderTemplate?: any;
+        majorTimeHeaderTemplate?: string|Function;
         max?: Date;
         messages?: SchedulerMessages;
         min?: Date;
         minorTickCount?: number;
-        minorTimeHeaderTemplate?: any;
-        mobile?: any;
+        minorTimeHeaderTemplate?: string|Function;
+        mobile?: boolean|string;
         pdf?: SchedulerPdf;
         resources?: SchedulerResource[];
         selectable?: boolean;
@@ -5392,8 +5992,8 @@ declare module kendo.ui {
         timezone?: string;
         toolbar?: SchedulerToolbarItem[];
         views?: SchedulerView[];
-        groupHeaderTemplate?: any;
-        width?: any;
+        groupHeaderTemplate?: string|Function;
+        width?: number|string;
         workDayStart?: Date;
         workDayEnd?: Date;
         workWeekStart?: number;
@@ -5417,8 +6017,8 @@ declare module kendo.ui {
     }
     interface SchedulerEvent {
         sender: Scheduler;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface SchedulerAddEvent extends SchedulerEvent {
@@ -5501,18 +6101,26 @@ declare module kendo.ui {
 
 
     class Slider extends kendo.ui.Widget {
+
         static fn: Slider;
-        static extend(proto: Object): Slider;
+
+        options: SliderOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Slider;
+
         constructor(element: Element, options?: SliderOptions);
-        options: SliderOptions;
+
+
         destroy(): void;
         enable(enable: boolean): void;
         value(): number;
         value(value: number): void;
         resize(): void;
+
     }
 
     interface SliderTooltip {
@@ -5539,8 +6147,8 @@ declare module kendo.ui {
     }
     interface SliderEvent {
         sender: Slider;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface SliderChangeEvent extends SliderEvent {
@@ -5553,15 +6161,23 @@ declare module kendo.ui {
 
 
     class Sortable extends kendo.ui.Widget {
+
         static fn: Sortable;
-        static extend(proto: Object): Sortable;
+
+        options: SortableOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Sortable;
+
         constructor(element: Element, options?: SortableOptions);
-        options: SortableOptions;
+
+
         indexOf(element: JQuery): number;
         items(): JQuery;
+
     }
 
     interface SortableCursorOffset {
@@ -5572,17 +6188,18 @@ declare module kendo.ui {
     interface SortableOptions {
         name?: string;
         axis?: string;
-        container?: any;
+        autoScroll?: boolean;
+        container?: string|JQuery;
         connectWith?: string;
         cursor?: string;
         cursorOffset?: SortableCursorOffset;
         disabled?: string;
         filter?: string;
         handler?: string;
-        hint?: any;
+        hint?: Function|string|JQuery;
         holdToDrag?: boolean;
         ignore?: string;
-        placeholder?: any;
+        placeholder?: Function|string|JQuery;
         start?(e: SortableStartEvent): void;
         move?(e: SortableMoveEvent): void;
         end?(e: SortableEndEvent): void;
@@ -5591,8 +6208,8 @@ declare module kendo.ui {
     }
     interface SortableEvent {
         sender: Sortable;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface SortableStartEvent extends SortableEvent {
@@ -5629,13 +6246,20 @@ declare module kendo.ui {
 
 
     class Splitter extends kendo.ui.Widget {
+
         static fn: Splitter;
-        static extend(proto: Object): Splitter;
+
+        options: SplitterOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Splitter;
+
         constructor(element: Element, options?: SplitterOptions);
-        options: SplitterOptions;
+
+
         ajaxRequest(pane: string, url: string, data: any): void;
         ajaxRequest(pane: string, url: string, data: string): void;
         ajaxRequest(pane: Element, url: string, data: any): void;
@@ -5671,6 +6295,7 @@ declare module kendo.ui {
         toggle(pane: string, expand?: boolean): void;
         toggle(pane: Element, expand?: boolean): void;
         toggle(pane: JQuery, expand?: boolean): void;
+
     }
 
     interface SplitterPane {
@@ -5698,8 +6323,8 @@ declare module kendo.ui {
     }
     interface SplitterEvent {
         sender: Splitter;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface SplitterCollapseEvent extends SplitterEvent {
@@ -5720,14 +6345,206 @@ declare module kendo.ui {
     }
 
 
-    class TabStrip extends kendo.ui.Widget {
-        static fn: TabStrip;
-        static extend(proto: Object): TabStrip;
+    class Spreadsheet extends kendo.ui.Widget {
+
+        static fn: Spreadsheet;
+
+        options: SpreadsheetOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
-        constructor(element: Element, options?: TabStripOptions);
+
+        static extend(proto: Object): Spreadsheet;
+
+        constructor(element: Element, options?: SpreadsheetOptions);
+
+
+        activeSheet(): kendo.spreadsheet.Sheet;
+        activeSheet(sheet?: kendo.spreadsheet.Sheet): void;
+        sheets(): any;
+        saveAsExcel(): void;
+        sheetByName(name: string): kendo.spreadsheet.Sheet;
+        sheetIndex(sheet: kendo.spreadsheet.Sheet): number;
+        sheetByIndex(index: number): kendo.spreadsheet.Sheet;
+        insertSheet(options: any): kendo.spreadsheet.Sheet;
+        moveSheetToIndex(sheet: kendo.spreadsheet.Sheet, index: number): void;
+        removeSheet(sheet: kendo.spreadsheet.Sheet): void;
+        renameSheet(sheet: kendo.spreadsheet.Sheet, newSheetName: string): kendo.spreadsheet.Sheet;
+        toJSON(): any;
+        fromJSON(options: any): void;
+
+    }
+
+    interface SpreadsheetExcel {
+        fileName?: string;
+        forceProxy?: boolean;
+        proxyURL?: string;
+    }
+
+    interface SpreadsheetSheetColumn {
+        index?: number;
+        width?: number;
+    }
+
+    interface SpreadsheetSheetFilterColumnCriteriaItem {
+        operator?: string;
+        value?: string;
+    }
+
+    interface SpreadsheetSheetFilterColumn {
+        criteria?: SpreadsheetSheetFilterColumnCriteriaItem[];
+        filter?: string;
+        index?: number;
+        logic?: string;
+        type?: string;
+        value?: number|string|Date;
+        values?: any;
+    }
+
+    interface SpreadsheetSheetFilter {
+        columns?: SpreadsheetSheetFilterColumn[];
+        ref?: string;
+    }
+
+    interface SpreadsheetSheetRowCellBorderBottom {
+        color?: string;
+        size?: string;
+    }
+
+    interface SpreadsheetSheetRowCellBorderLeft {
+        color?: string;
+        size?: string;
+    }
+
+    interface SpreadsheetSheetRowCellBorderRight {
+        color?: string;
+        size?: string;
+    }
+
+    interface SpreadsheetSheetRowCellBorderTop {
+        color?: string;
+        size?: string;
+    }
+
+    interface SpreadsheetSheetRowCellValidation {
+        comparerType?: string;
+        dataType?: string;
+        from?: string;
+        to?: string;
+        allowNulls?: string;
+        messageTemplate?: string;
+        titleTemplate?: string;
+    }
+
+    interface SpreadsheetSheetRowCell {
+        background?: string;
+        borderBottom?: SpreadsheetSheetRowCellBorderBottom;
+        borderLeft?: SpreadsheetSheetRowCellBorderLeft;
+        borderTop?: SpreadsheetSheetRowCellBorderTop;
+        borderRight?: SpreadsheetSheetRowCellBorderRight;
+        color?: string;
+        fontFamily?: string;
+        fontSize?: number;
+        italic?: boolean;
+        bold?: boolean;
+        format?: string;
+        formula?: string;
+        index?: number;
+        textAlign?: string;
+        underline?: boolean;
+        value?: number|string|boolean|Date;
+        validation?: SpreadsheetSheetRowCellValidation;
+        verticalAlign?: string;
+        wrap?: boolean;
+    }
+
+    interface SpreadsheetSheetRow {
+        cells?: SpreadsheetSheetRowCell[];
+        height?: number;
+        index?: number;
+    }
+
+    interface SpreadsheetSheetSortColumn {
+        ascending?: boolean;
+        index?: number;
+    }
+
+    interface SpreadsheetSheetSort {
+        columns?: SpreadsheetSheetSortColumn[];
+        ref?: string;
+    }
+
+    interface SpreadsheetSheet {
+        activeCell?: string;
+        name?: string;
+        columns?: SpreadsheetSheetColumn[];
+        dataSource?: kendo.data.DataSource;
+        filter?: SpreadsheetSheetFilter;
+        frozenColumns?: number;
+        frozenRows?: number;
+        mergedCells?: any;
+        rows?: SpreadsheetSheetRow[];
+        selection?: string;
+        sort?: SpreadsheetSheetSort;
+    }
+
+    interface SpreadsheetInsertSheetOptions {
+        rows?: number;
+        columns?: number;
+        rowHeight?: number;
+        columnWidth?: number;
+        headerHeight?: number;
+        headerWidth?: number;
+        dataSource?: kendo.data.DataSource;
+    }
+
+    interface SpreadsheetOptions {
+        name?: string;
+        activeSheet?: string;
+        columnWidth?: number;
+        columns?: number;
+        headerHeight?: number;
+        headerWidth?: number;
+        excel?: SpreadsheetExcel;
+        rowHeight?: number;
+        rows?: number;
+        sheets?: SpreadsheetSheet[];
+        toolbar?: boolean;
+        render?(e: SpreadsheetRenderEvent): void;
+        excelExport?(e: SpreadsheetExcelExportEvent): void;
+    }
+    interface SpreadsheetEvent {
+        sender: Spreadsheet;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SpreadsheetRenderEvent extends SpreadsheetEvent {
+    }
+
+    interface SpreadsheetExcelExportEvent extends SpreadsheetEvent {
+        data?: any;
+        workbook?: kendo.ooxml.Workbook;
+    }
+
+
+    class TabStrip extends kendo.ui.Widget {
+
+        static fn: TabStrip;
+
         options: TabStripOptions;
+
+        tabGroup: JQuery;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): TabStrip;
+
+        constructor(element: Element, options?: TabStripOptions);
+
+
         activateTab(item: JQuery): void;
         append(tab: any): kendo.ui.TabStrip;
         contentElement(itemIndex: number): Element;
@@ -5770,7 +6587,7 @@ declare module kendo.ui {
         select(element: JQuery): void;
         select(element: number): void;
         setDataSource(): void;
-        tabGroup: JQuery;
+
     }
 
     interface TabStripAnimationClose {
@@ -5788,6 +6605,10 @@ declare module kendo.ui {
         open?: TabStripAnimationOpen;
     }
 
+    interface TabStripScrollable {
+        distance?: number;
+    }
+
     interface TabStripOptions {
         name?: string;
         animation?: TabStripAnimation;
@@ -5800,7 +6621,9 @@ declare module kendo.ui {
         dataTextField?: string;
         dataUrlField?: string;
         navigatable?: boolean;
+        scrollable?: TabStripScrollable;
         tabPosition?: string;
+        value?: string;
         activate?(e: TabStripActivateEvent): void;
         contentLoad?(e: TabStripContentLoadEvent): void;
         error?(e: TabStripErrorEvent): void;
@@ -5809,8 +6632,8 @@ declare module kendo.ui {
     }
     interface TabStripEvent {
         sender: TabStrip;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface TabStripActivateEvent extends TabStripEvent {
@@ -5840,13 +6663,20 @@ declare module kendo.ui {
 
 
     class TimePicker extends kendo.ui.Widget {
+
         static fn: TimePicker;
-        static extend(proto: Object): TimePicker;
+
+        options: TimePickerOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): TimePicker;
+
         constructor(element: Element, options?: TimePickerOptions);
-        options: TimePickerOptions;
+
+
         close(): void;
         destroy(): void;
         enable(enable: boolean): void;
@@ -5862,6 +6692,7 @@ declare module kendo.ui {
         value(): Date;
         value(value: Date): void;
         value(value: string): void;
+
     }
 
     interface TimePickerAnimationClose {
@@ -5896,8 +6727,8 @@ declare module kendo.ui {
     }
     interface TimePickerEvent {
         sender: TimePicker;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface TimePickerChangeEvent extends TimePickerEvent {
@@ -5911,23 +6742,37 @@ declare module kendo.ui {
 
 
     class ToolBar extends kendo.ui.Widget {
+
         static fn: ToolBar;
-        static extend(proto: Object): ToolBar;
+
+        options: ToolBarOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): ToolBar;
+
         constructor(element: Element, options?: ToolBarOptions);
-        options: ToolBarOptions;
+
+
         add(command: any): void;
         destroy(): void;
         enable(command: string, enable: boolean): void;
         enable(command: Element, enable: boolean): void;
         enable(command: JQuery, enable: boolean): void;
         getSelectedFromGroup(groupName: string): void;
+        hide(command: string): void;
+        hide(command: Element): void;
+        hide(command: JQuery): void;
         remove(command: string): void;
         remove(command: Element): void;
         remove(command: JQuery): void;
+        show(command: string): void;
+        show(command: Element): void;
+        show(command: JQuery): void;
         toggle(): void;
+
     }
 
     interface ToolBarItemButton {
@@ -5935,6 +6780,7 @@ declare module kendo.ui {
         click?: Function;
         enable?: boolean;
         group?: string;
+        hidden?: boolean;
         icon?: string;
         id?: string;
         imageUrl?: string;
@@ -5951,6 +6797,7 @@ declare module kendo.ui {
     interface ToolBarItemMenuButton {
         attributes?: any;
         enable?: boolean;
+        hidden?: boolean;
         icon?: string;
         id?: string;
         imageUrl?: string;
@@ -5965,18 +6812,19 @@ declare module kendo.ui {
         click?: Function;
         enable?: boolean;
         group?: string;
+        hidden?: boolean;
         icon?: string;
         id?: string;
         imageUrl?: string;
         menuButtons?: ToolBarItemMenuButton[];
         overflow?: string;
-        overflowTemplate?: any;
+        overflowTemplate?: string|Function;
         primary?: boolean;
         selected?: boolean;
         showIcon?: string;
         showText?: string;
         spriteCssClass?: string;
-        template?: any;
+        template?: string|Function;
         text?: string;
         togglable?: boolean;
         toggle?: Function;
@@ -5997,8 +6845,8 @@ declare module kendo.ui {
     }
     interface ToolBarEvent {
         sender: ToolBar;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ToolBarClickEvent extends ToolBarEvent {
@@ -6028,17 +6876,25 @@ declare module kendo.ui {
 
 
     class Tooltip extends kendo.ui.Widget {
+
         static fn: Tooltip;
-        static extend(proto: Object): Tooltip;
+
+        options: TooltipOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Tooltip;
+
         constructor(element: Element, options?: TooltipOptions);
-        options: TooltipOptions;
+
+
         show(element: JQuery): void;
         hide(): void;
         refresh(): void;
         target(): JQuery;
+
     }
 
     interface TooltipAnimationClose {
@@ -6081,8 +6937,8 @@ declare module kendo.ui {
     }
     interface TooltipEvent {
         sender: Tooltip;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface TooltipRequestStartEvent extends TooltipEvent {
@@ -6097,15 +6953,23 @@ declare module kendo.ui {
 
 
     class Touch extends kendo.ui.Widget {
+
         static fn: Touch;
-        static extend(proto: Object): Touch;
+
+        options: TouchOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Touch;
+
         constructor(element: Element, options?: TouchOptions);
-        options: TouchOptions;
+
+
         cancel(): void;
         destroy(): void;
+
     }
 
     interface TouchOptions {
@@ -6133,8 +6997,8 @@ declare module kendo.ui {
     }
     interface TouchEvent {
         sender: Touch;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface TouchTouchstartEvent extends TouchEvent {
@@ -6200,14 +7064,21 @@ declare module kendo.ui {
 
 
     class TreeList extends kendo.ui.Widget {
+
         static fn: TreeList;
-        static extend(proto: Object): TreeList;
+
+        options: TreeListOptions;
+
+        dataSource: kendo.data.DataSource;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): TreeList;
+
         constructor(element: Element, options?: TreeListOptions);
-        options: TreeListOptions;
-        dataSource: kendo.data.DataSource;
+
+
         addRow(parentRow: string): void;
         addRow(parentRow: Element): void;
         addRow(parentRow: JQuery): void;
@@ -6220,6 +7091,8 @@ declare module kendo.ui {
         destroy(): void;
         editRow(row: JQuery): void;
         expand(): void;
+        itemFor(model: kendo.data.TreeListModel): JQuery;
+        itemFor(model: any): JQuery;
         refresh(): void;
         removeRow(row: string): void;
         removeRow(row: Element): void;
@@ -6240,6 +7113,7 @@ declare module kendo.ui {
         unlockColumn(column: number): void;
         unlockColumn(column: string): void;
         reorderColumn(destIndex: number, column: any): void;
+
     }
 
     interface TreeListColumnMenuMessages {
@@ -6264,7 +7138,7 @@ declare module kendo.ui {
     }
 
     interface TreeListColumnFilterable {
-        ui?: any;
+        ui?: string|Function;
     }
 
     interface TreeListColumnSortable {
@@ -6278,14 +7152,15 @@ declare module kendo.ui {
         expandable?: boolean;
         field?: string;
         filterable?: TreeListColumnFilterable;
-        footerTemplate?: any;
+        footerTemplate?: string|Function;
         format?: string;
         headerAttributes?: any;
-        headerTemplate?: any;
+        headerTemplate?: string|Function;
+        minScreenWidth?: number;
         sortable?: TreeListColumnSortable;
-        template?: any;
+        template?: string|Function;
         title?: string;
-        width?: any;
+        width?: string|number;
         hidden?: boolean;
         menu?: boolean;
         locked?: boolean;
@@ -6294,7 +7169,8 @@ declare module kendo.ui {
 
     interface TreeListEditable {
         mode?: string;
-        template?: any;
+        move?: boolean;
+        template?: string|Function;
         window?: any;
     }
 
@@ -6343,14 +7219,15 @@ declare module kendo.ui {
     }
 
     interface TreeListPdfMargin {
-        bottom?: any;
-        left?: any;
-        right?: any;
-        top?: any;
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
     }
 
     interface TreeListPdf {
         author?: string;
+        avoidLinks?: boolean|string;
         creator?: string;
         date?: Date;
         fileName?: string;
@@ -6358,7 +7235,7 @@ declare module kendo.ui {
         keywords?: string;
         landscape?: boolean;
         margin?: TreeListPdfMargin;
-        paperSize?: any;
+        paperSize?: string|any;
         proxyURL?: string;
         proxyTarget?: string;
         subject?: string;
@@ -6382,15 +7259,15 @@ declare module kendo.ui {
         resizable?: boolean;
         reorderable?: boolean;
         columnMenu?: TreeListColumnMenu;
-        dataSource?: any;
+        dataSource?: any|any|kendo.data.TreeListDataSource;
         editable?: TreeListEditable;
         excel?: TreeListExcel;
         filterable?: TreeListFilterable;
-        height?: any;
+        height?: number|string;
         messages?: TreeListMessages;
         pdf?: TreeListPdf;
-        scrollable?: any;
-        selectable?: any;
+        scrollable?: boolean|any;
+        selectable?: boolean|string;
         sortable?: TreeListSortable;
         toolbar?: TreeListToolbarItem[];
         cancel?(e: TreeListCancelEvent): void;
@@ -6398,6 +7275,10 @@ declare module kendo.ui {
         collapse?(e: TreeListCollapseEvent): void;
         dataBinding?(e: TreeListDataBindingEvent): void;
         dataBound?(e: TreeListDataBoundEvent): void;
+        dragstart?(e: TreeListDragstartEvent): void;
+        drag?(e: TreeListDragEvent): void;
+        dragend?(e: TreeListDragendEvent): void;
+        drop?(e: TreeListDropEvent): void;
         edit?(e: TreeListEditEvent): void;
         excelExport?(e: TreeListExcelExportEvent): void;
         expand?(e: TreeListExpandEvent): void;
@@ -6408,14 +7289,15 @@ declare module kendo.ui {
         columnShow?(e: TreeListColumnShowEvent): void;
         columnHide?(e: TreeListColumnHideEvent): void;
         columnReorder?(e: TreeListColumnReorderEvent): void;
+        columnResize?(e: TreeListColumnResizeEvent): void;
         columnMenuInit?(e: TreeListColumnMenuInitEvent): void;
         columnLock?(e: TreeListColumnLockEvent): void;
         columnUnlock?(e: TreeListColumnUnlockEvent): void;
     }
     interface TreeListEvent {
         sender: TreeList;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface TreeListCancelEvent extends TreeListEvent {
@@ -6436,6 +7318,27 @@ declare module kendo.ui {
     interface TreeListDataBoundEvent extends TreeListEvent {
     }
 
+    interface TreeListDragstartEvent extends TreeListEvent {
+        source?: kendo.data.TreeListModel;
+    }
+
+    interface TreeListDragEvent extends TreeListEvent {
+        source?: kendo.data.TreeListModel;
+        target?: JQuery;
+    }
+
+    interface TreeListDragendEvent extends TreeListEvent {
+        source?: kendo.data.TreeListModel;
+        destination?: kendo.data.TreeListModel;
+    }
+
+    interface TreeListDropEvent extends TreeListEvent {
+        source?: kendo.data.TreeListModel;
+        destination?: kendo.data.TreeListModel;
+        valid?: boolean;
+        setValid?: boolean;
+    }
+
     interface TreeListEditEvent extends TreeListEvent {
         container?: JQuery;
         model?: kendo.data.TreeListModel;
@@ -6483,6 +7386,12 @@ declare module kendo.ui {
         oldIndex?: number;
     }
 
+    interface TreeListColumnResizeEvent extends TreeListEvent {
+        column?: any;
+        newWidth?: number;
+        oldWidth?: number;
+    }
+
     interface TreeListColumnMenuInitEvent extends TreeListEvent {
         container?: JQuery;
         field?: string;
@@ -6498,14 +7407,21 @@ declare module kendo.ui {
 
 
     class TreeView extends kendo.ui.Widget {
+
         static fn: TreeView;
-        static extend(proto: Object): TreeView;
+
+        options: TreeViewOptions;
+
+        dataSource: kendo.data.DataSource;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): TreeView;
+
         constructor(element: Element, options?: TreeViewOptions);
-        options: TreeViewOptions;
-        dataSource: kendo.data.DataSource;
+
+
         append(nodeData: any, parentNode?: JQuery, success?: Function): JQuery;
         append(nodeData: JQuery, parentNode?: JQuery, success?: Function): JQuery;
         collapse(nodes: JQuery): void;
@@ -6542,7 +7458,9 @@ declare module kendo.ui {
         select(node?: Element): void;
         select(node?: string): void;
         setDataSource(dataSource: kendo.data.HierarchicalDataSource): void;
-        text(): string;
+        text(node: JQuery): string;
+        text(node: Element): string;
+        text(node: string): string;
         text(node: JQuery, newText: string): void;
         text(node: Element, newText: string): void;
         text(node: string, newText: string): void;
@@ -6550,6 +7468,7 @@ declare module kendo.ui {
         toggle(node: Element): void;
         toggle(node: string): void;
         updateIndeterminate(node: JQuery): void;
+
     }
 
     interface TreeViewAnimationCollapse {
@@ -6570,7 +7489,7 @@ declare module kendo.ui {
     interface TreeViewCheckboxes {
         checkChildren?: boolean;
         name?: string;
-        template?: any;
+        template?: string|Function;
     }
 
     interface TreeViewMessages {
@@ -6583,16 +7502,17 @@ declare module kendo.ui {
         name?: string;
         animation?: TreeViewAnimation;
         autoBind?: boolean;
+        autoScroll?: boolean;
         checkboxes?: TreeViewCheckboxes;
         dataImageUrlField?: string;
-        dataSource?: any;
+        dataSource?: any|any|kendo.data.HierarchicalDataSource;
         dataSpriteCssClassField?: string;
-        dataTextField?: any;
+        dataTextField?: string|any;
         dataUrlField?: string;
         dragAndDrop?: boolean;
         loadOnDemand?: boolean;
         messages?: TreeViewMessages;
-        template?: any;
+        template?: string|Function;
         change?(e: TreeViewEvent): void;
         check?(e: TreeViewCheckEvent): void;
         collapse?(e: TreeViewCollapseEvent): void;
@@ -6607,8 +7527,8 @@ declare module kendo.ui {
     }
     interface TreeViewEvent {
         sender: TreeView;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface TreeViewCheckEvent extends TreeViewEvent {
@@ -6665,17 +7585,25 @@ declare module kendo.ui {
 
 
     class Upload extends kendo.ui.Widget {
+
         static fn: Upload;
-        static extend(proto: Object): Upload;
+
+        options: UploadOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Upload;
+
         constructor(element: Element, options?: UploadOptions);
-        options: UploadOptions;
+
+
         destroy(): void;
         disable(): void;
         enable(enable?: boolean): void;
         toggle(enable: boolean): void;
+
     }
 
     interface UploadAsync {
@@ -6717,7 +7645,7 @@ declare module kendo.ui {
         localization?: UploadLocalization;
         multiple?: boolean;
         showFileList?: boolean;
-        template?: any;
+        template?: string|Function;
         cancel?(e: UploadCancelEvent): void;
         complete?(e: UploadEvent): void;
         error?(e: UploadErrorEvent): void;
@@ -6729,44 +7657,44 @@ declare module kendo.ui {
     }
     interface UploadEvent {
         sender: Upload;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface UploadCancelEvent extends UploadEvent {
-        files?: any;
+        files?: UploadFile[];
     }
 
     interface UploadErrorEvent extends UploadEvent {
-        files?: any;
+        files?: UploadFile[];
         operation?: string;
         XMLHttpRequest?: any;
     }
 
     interface UploadProgressEvent extends UploadEvent {
-        files?: any;
+        files?: UploadFile[];
         percentComplete?: number;
     }
 
     interface UploadRemoveEvent extends UploadEvent {
-        files?: any;
+        files?: UploadFile[];
         data?: any;
     }
 
     interface UploadSelectEvent extends UploadEvent {
         e?: any;
-        files?: any;
+        files?: UploadFile[];
     }
 
     interface UploadSuccessEvent extends UploadEvent {
-        files?: any;
+        files?: UploadFile[];
         operation?: string;
-        response?: string;
+        response?: any;
         XMLHttpRequest?: any;
     }
 
     interface UploadUploadEvent extends UploadEvent {
-        files?: any;
+        files?: UploadFile[];
         data?: any;
         formData?: any;
         XMLHttpRequest?: any;
@@ -6774,18 +7702,26 @@ declare module kendo.ui {
 
 
     class Validator extends kendo.ui.Widget {
+
         static fn: Validator;
-        static extend(proto: Object): Validator;
+
+        options: ValidatorOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Validator;
+
         constructor(element: Element, options?: ValidatorOptions);
-        options: ValidatorOptions;
+
+
         errors(): any;
         hideMessages(): void;
         validate(): boolean;
         validateInput(input: Element): boolean;
         validateInput(input: JQuery): boolean;
+
     }
 
     interface ValidatorOptions {
@@ -6798,8 +7734,8 @@ declare module kendo.ui {
     }
     interface ValidatorEvent {
         sender: Validator;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ValidatorValidateEvent extends ValidatorEvent {
@@ -6807,17 +7743,25 @@ declare module kendo.ui {
 
 
     class Window extends kendo.ui.Widget {
+
         static fn: Window;
-        static extend(proto: Object): Window;
+
+        options: WindowOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Window;
+
         constructor(element: Element, options?: WindowOptions);
-        options: WindowOptions;
+
+
         center(): kendo.ui.Window;
         close(): kendo.ui.Window;
         content(): any;
         content(content?: string): void;
+        content(content?: JQuery): void;
         destroy(): void;
         maximize(): kendo.ui.Window;
         minimize(): kendo.ui.Window;
@@ -6831,6 +7775,7 @@ declare module kendo.ui {
         toFront(): kendo.ui.Window;
         toggleMaximization(): kendo.ui.Window;
         unpin(): void;
+
     }
 
     interface WindowAnimationClose {
@@ -6853,8 +7798,8 @@ declare module kendo.ui {
     }
 
     interface WindowPosition {
-        top?: any;
-        left?: any;
+        top?: number|string;
+        left?: number|string;
     }
 
     interface WindowRefreshOptions {
@@ -6869,7 +7814,7 @@ declare module kendo.ui {
         name?: string;
         actions?: any;
         animation?: WindowAnimation;
-        appendTo?: any;
+        appendTo?: any|string;
         autoFocus?: boolean;
         content?: WindowContent;
         draggable?: boolean;
@@ -6882,10 +7827,11 @@ declare module kendo.ui {
         pinned?: boolean;
         position?: WindowPosition;
         resizable?: boolean;
-        title?: any;
+        scrollable?: boolean;
+        title?: string|boolean;
         visible?: boolean;
-        width?: any;
-        height?: any;
+        width?: number|string;
+        height?: number|string;
         activate?(e: WindowEvent): void;
         close?(e: WindowCloseEvent): void;
         deactivate?(e: WindowEvent): void;
@@ -6898,8 +7844,8 @@ declare module kendo.ui {
     }
     interface WindowEvent {
         sender: Window;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface WindowCloseEvent extends WindowEvent {
@@ -6915,13 +7861,20 @@ declare module kendo.ui {
 }
 declare module kendo.dataviz.ui {
     class Barcode extends kendo.ui.Widget {
+
         static fn: Barcode;
-        static extend(proto: Object): Barcode;
+
+        options: BarcodeOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Barcode;
+
         constructor(element: Element, options?: BarcodeOptions);
-        options: BarcodeOptions;
+
+
         exportImage(options: any): JQueryPromise<any>;
         exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
         exportSVG(options: any): JQueryPromise<any>;
@@ -6932,6 +7885,7 @@ declare module kendo.dataviz.ui {
         value(): string;
         value(value: number): void;
         value(value: string): void;
+
     }
 
     interface BarcodeBorder {
@@ -6986,20 +7940,27 @@ declare module kendo.dataviz.ui {
     }
     interface BarcodeEvent {
         sender: Barcode;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Chart extends kendo.ui.Widget {
+
         static fn: Chart;
-        static extend(proto: Object): Chart;
+
+        options: ChartOptions;
+
+        dataSource: kendo.data.DataSource;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Chart;
+
         constructor(element: Element, options?: ChartOptions);
-        options: ChartOptions;
-        dataSource: kendo.data.DataSource;
+
+
         destroy(): void;
         exportImage(options: any): JQueryPromise<any>;
         exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
@@ -7014,6 +7975,7 @@ declare module kendo.dataviz.ui {
         svg(): string;
         imageDataURL(): string;
         toggleHighlight(show: boolean, options: any): void;
+
     }
 
     interface ChartCategoryAxisItemAutoBaseUnitSteps {
@@ -7046,7 +8008,7 @@ declare module kendo.dataviz.ui {
         font?: string;
         format?: string;
         padding?: ChartCategoryAxisItemCrosshairTooltipPadding;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -7086,6 +8048,11 @@ declare module kendo.dataviz.ui {
         top?: number;
     }
 
+    interface ChartCategoryAxisItemLabelsRotation {
+        align?: string;
+        angle?: number|string;
+    }
+
     interface ChartCategoryAxisItemLabels {
         background?: string;
         border?: ChartCategoryAxisItemLabelsBorder;
@@ -7097,10 +8064,10 @@ declare module kendo.dataviz.ui {
         margin?: ChartCategoryAxisItemLabelsMargin;
         mirror?: boolean;
         padding?: ChartCategoryAxisItemLabelsPadding;
-        rotation?: number;
+        rotation?: ChartCategoryAxisItemLabelsRotation;
         skip?: number;
         step?: number;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         visual?: Function;
     }
@@ -7172,7 +8139,7 @@ declare module kendo.dataviz.ui {
         border?: ChartCategoryAxisItemNotesDataItemLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -7218,7 +8185,7 @@ declare module kendo.dataviz.ui {
         border?: ChartCategoryAxisItemNotesLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -7296,7 +8263,7 @@ declare module kendo.dataviz.ui {
 
     interface ChartCategoryAxisItem {
         autoBaseUnitSteps?: ChartCategoryAxisItemAutoBaseUnitSteps;
-        axisCrossingValue?: any;
+        axisCrossingValue?: any|Date|any;
         background?: string;
         baseUnit?: string;
         baseUnitStep?: any;
@@ -7359,7 +8326,7 @@ declare module kendo.dataviz.ui {
     interface ChartLegendInactiveItemsLabels {
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
     }
 
     interface ChartLegendInactiveItems {
@@ -7367,6 +8334,7 @@ declare module kendo.dataviz.ui {
     }
 
     interface ChartLegendItem {
+        cursor?: string;
         visual?: Function;
     }
 
@@ -7389,7 +8357,7 @@ declare module kendo.dataviz.ui {
         font?: string;
         margin?: ChartLegendLabelsMargin;
         padding?: ChartLegendLabelsPadding;
-        template?: any;
+        template?: string|Function;
     }
 
     interface ChartLegendMargin {
@@ -7481,11 +8449,16 @@ declare module kendo.dataviz.ui {
         title?: ChartPaneTitle;
     }
 
+    interface ChartPannable {
+        key?: string;
+        lock?: string;
+    }
+
     interface ChartPdfMargin {
-        bottom?: any;
-        left?: any;
-        right?: any;
-        top?: any;
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
     }
 
     interface ChartPdf {
@@ -7497,7 +8470,7 @@ declare module kendo.dataviz.ui {
         keywords?: string;
         landscape?: boolean;
         margin?: ChartPdfMargin;
-        paperSize?: any;
+        paperSize?: string|any;
         proxyURL?: string;
         proxyTarget?: string;
         subject?: string;
@@ -7533,10 +8506,10 @@ declare module kendo.dataviz.ui {
     }
 
     interface ChartSeriesItemBorder {
-        color?: any;
-        dashType?: any;
-        opacity?: any;
-        width?: any;
+        color?: string|Function;
+        dashType?: string|Function;
+        opacity?: number|Function;
+        width?: number|Function;
     }
 
     interface ChartSeriesItemConnectors {
@@ -7551,26 +8524,26 @@ declare module kendo.dataviz.ui {
     }
 
     interface ChartSeriesItemErrorBars {
-        value?: any;
+        value?: string|number|any|Function;
         visual?: Function;
-        xValue?: any;
-        yValue?: any;
+        xValue?: string|number|any|Function;
+        yValue?: string|number|any|Function;
         endCaps?: boolean;
         color?: string;
         line?: ChartSeriesItemErrorBarsLine;
     }
 
     interface ChartSeriesItemExtremesBorder {
-        color?: any;
-        width?: any;
+        color?: string|Function;
+        width?: number|Function;
     }
 
     interface ChartSeriesItemExtremes {
-        background?: any;
+        background?: string|Function;
         border?: ChartSeriesItemExtremesBorder;
-        size?: any;
-        type?: any;
-        rotation?: any;
+        size?: number|Function;
+        type?: string|Function;
+        rotation?: number|Function;
     }
 
     interface ChartSeriesItemHighlightBorder {
@@ -7596,15 +8569,15 @@ declare module kendo.dataviz.ui {
     }
 
     interface ChartSeriesItemLabelsBorder {
-        color?: any;
-        dashType?: any;
-        width?: any;
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number|Function;
     }
 
     interface ChartSeriesItemLabelsFromBorder {
-        color?: any;
-        dashType?: any;
-        width?: any;
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number|Function;
     }
 
     interface ChartSeriesItemLabelsFromMargin {
@@ -7622,16 +8595,16 @@ declare module kendo.dataviz.ui {
     }
 
     interface ChartSeriesItemLabelsFrom {
-        background?: any;
+        background?: string|Function;
         border?: ChartSeriesItemLabelsFromBorder;
-        color?: any;
-        font?: any;
-        format?: any;
+        color?: string|Function;
+        font?: string|Function;
+        format?: string|Function;
         margin?: ChartSeriesItemLabelsFromMargin;
         padding?: ChartSeriesItemLabelsFromPadding;
-        position?: any;
-        template?: any;
-        visible?: any;
+        position?: string|Function;
+        template?: string|Function;
+        visible?: boolean|Function;
     }
 
     interface ChartSeriesItemLabelsMargin {
@@ -7649,9 +8622,9 @@ declare module kendo.dataviz.ui {
     }
 
     interface ChartSeriesItemLabelsToBorder {
-        color?: any;
-        dashType?: any;
-        width?: any;
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number|Function;
     }
 
     interface ChartSeriesItemLabelsToMargin {
@@ -7669,31 +8642,31 @@ declare module kendo.dataviz.ui {
     }
 
     interface ChartSeriesItemLabelsTo {
-        background?: any;
+        background?: string|Function;
         border?: ChartSeriesItemLabelsToBorder;
-        color?: any;
-        font?: any;
-        format?: any;
+        color?: string|Function;
+        font?: string|Function;
+        format?: string|Function;
         margin?: ChartSeriesItemLabelsToMargin;
         padding?: ChartSeriesItemLabelsToPadding;
-        position?: any;
-        template?: any;
-        visible?: any;
+        position?: string|Function;
+        template?: string|Function;
+        visible?: boolean|Function;
     }
 
     interface ChartSeriesItemLabels {
         align?: string;
-        background?: any;
+        background?: string|Function;
         border?: ChartSeriesItemLabelsBorder;
-        color?: any;
+        color?: string|Function;
         distance?: number;
-        font?: any;
-        format?: any;
+        font?: string|Function;
+        format?: string|Function;
         margin?: ChartSeriesItemLabelsMargin;
         padding?: ChartSeriesItemLabelsPadding;
-        position?: any;
-        template?: any;
-        visible?: any;
+        position?: string|Function;
+        template?: string|Function;
+        visible?: boolean|Function;
         visual?: Function;
         from?: ChartSeriesItemLabelsFrom;
         to?: ChartSeriesItemLabelsTo;
@@ -7714,18 +8687,18 @@ declare module kendo.dataviz.ui {
     }
 
     interface ChartSeriesItemMarkersBorder {
-        color?: any;
-        width?: any;
+        color?: string|Function;
+        width?: number|Function;
     }
 
     interface ChartSeriesItemMarkers {
-        background?: any;
+        background?: string|Function;
         border?: ChartSeriesItemMarkersBorder;
-        size?: any;
-        type?: any;
-        visible?: any;
+        size?: number|Function;
+        type?: string|Function;
+        visible?: boolean|Function;
         visual?: Function;
-        rotation?: any;
+        rotation?: number|Function;
     }
 
     interface ChartSeriesItemNegativeValues {
@@ -7757,7 +8730,7 @@ declare module kendo.dataviz.ui {
         border?: ChartSeriesItemNotesLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -7779,16 +8752,16 @@ declare module kendo.dataviz.ui {
     }
 
     interface ChartSeriesItemOutliersBorder {
-        color?: any;
-        width?: any;
+        color?: string|Function;
+        width?: number|Function;
     }
 
     interface ChartSeriesItemOutliers {
-        background?: any;
+        background?: string|Function;
         border?: ChartSeriesItemOutliersBorder;
-        size?: any;
-        type?: any;
-        rotation?: any;
+        size?: number|Function;
+        type?: string|Function;
+        rotation?: number|Function;
     }
 
     interface ChartSeriesItemOverlay {
@@ -7801,18 +8774,18 @@ declare module kendo.dataviz.ui {
     }
 
     interface ChartSeriesItemTargetBorder {
-        color?: any;
-        dashType?: any;
-        width?: any;
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number|Function;
     }
 
     interface ChartSeriesItemTargetLine {
-        width?: any;
+        width?: any|Function;
     }
 
     interface ChartSeriesItemTarget {
         border?: ChartSeriesItemTargetBorder;
-        color?: any;
+        color?: string|Function;
         line?: ChartSeriesItemTargetLine;
     }
 
@@ -7835,23 +8808,23 @@ declare module kendo.dataviz.ui {
         font?: string;
         format?: string;
         padding?: ChartSeriesItemTooltipPadding;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
     interface ChartSeriesItem {
-        aggregate?: any;
+        aggregate?: string|Function;
         axis?: string;
         border?: ChartSeriesItemBorder;
         categoryField?: string;
         closeField?: string;
-        color?: any;
+        color?: string|Function;
         colorField?: string;
         connectors?: ChartSeriesItemConnectors;
         currentField?: string;
         dashType?: string;
         data?: any;
-        downColor?: any;
+        downColor?: string|Function;
         downColorField?: string;
         segmentSpacing?: number;
         summaryField?: string;
@@ -7961,7 +8934,7 @@ declare module kendo.dataviz.ui {
         format?: string;
         margin?: ChartSeriesDefaultsLabelsFromMargin;
         padding?: ChartSeriesDefaultsLabelsFromPadding;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -8007,7 +8980,7 @@ declare module kendo.dataviz.ui {
         format?: string;
         margin?: ChartSeriesDefaultsLabelsToMargin;
         padding?: ChartSeriesDefaultsLabelsToPadding;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -8019,7 +8992,7 @@ declare module kendo.dataviz.ui {
         format?: string;
         margin?: ChartSeriesDefaultsLabelsMargin;
         padding?: ChartSeriesDefaultsLabelsPadding;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         visual?: Function;
         from?: ChartSeriesDefaultsLabelsFrom;
@@ -8050,7 +9023,7 @@ declare module kendo.dataviz.ui {
         border?: ChartSeriesDefaultsNotesLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -8097,7 +9070,7 @@ declare module kendo.dataviz.ui {
         font?: string;
         format?: string;
         padding?: ChartSeriesDefaultsTooltipPadding;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -8180,8 +9153,8 @@ declare module kendo.dataviz.ui {
         format?: string;
         padding?: ChartTooltipPadding;
         shared?: boolean;
-        sharedTemplate?: any;
-        template?: any;
+        sharedTemplate?: string|Function;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -8205,7 +9178,7 @@ declare module kendo.dataviz.ui {
         font?: string;
         format?: string;
         padding?: ChartValueAxisItemCrosshairTooltipPadding;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -8237,6 +9210,11 @@ declare module kendo.dataviz.ui {
         top?: number;
     }
 
+    interface ChartValueAxisItemLabelsRotation {
+        align?: string;
+        angle?: number|string;
+    }
+
     interface ChartValueAxisItemLabels {
         background?: string;
         border?: ChartValueAxisItemLabelsBorder;
@@ -8246,10 +9224,10 @@ declare module kendo.dataviz.ui {
         margin?: ChartValueAxisItemLabelsMargin;
         mirror?: boolean;
         padding?: ChartValueAxisItemLabelsPadding;
-        rotation?: number;
+        rotation?: ChartValueAxisItemLabelsRotation;
         skip?: number;
         step?: number;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         visual?: Function;
     }
@@ -8322,7 +9300,7 @@ declare module kendo.dataviz.ui {
         border?: ChartValueAxisItemNotesDataItemLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -8368,7 +9346,7 @@ declare module kendo.dataviz.ui {
         border?: ChartValueAxisItemNotesLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -8432,7 +9410,7 @@ declare module kendo.dataviz.ui {
     }
 
     interface ChartValueAxisItem {
-        axisCrossingValue?: any;
+        axisCrossingValue?: any|Date|any;
         background?: string;
         color?: string;
         crosshair?: ChartValueAxisItemCrosshair;
@@ -8446,7 +9424,7 @@ declare module kendo.dataviz.ui {
         majorTicks?: ChartValueAxisItemMajorTicks;
         minorTicks?: ChartValueAxisItemMinorTicks;
         minorUnit?: number;
-        name?: any;
+        name?: string;
         narrowRange?: boolean;
         pane?: string;
         plotBands?: ChartValueAxisItemPlotBand[];
@@ -8477,7 +9455,7 @@ declare module kendo.dataviz.ui {
         font?: string;
         format?: string;
         padding?: ChartXAxisItemCrosshairTooltipPadding;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -8517,6 +9495,11 @@ declare module kendo.dataviz.ui {
         top?: number;
     }
 
+    interface ChartXAxisItemLabelsRotation {
+        align?: string;
+        angle?: number|string;
+    }
+
     interface ChartXAxisItemLabels {
         background?: string;
         border?: ChartXAxisItemLabelsBorder;
@@ -8528,10 +9511,10 @@ declare module kendo.dataviz.ui {
         margin?: ChartXAxisItemLabelsMargin;
         mirror?: boolean;
         padding?: ChartXAxisItemLabelsPadding;
-        rotation?: number;
+        rotation?: ChartXAxisItemLabelsRotation;
         skip?: number;
         step?: number;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         visual?: Function;
     }
@@ -8603,7 +9586,7 @@ declare module kendo.dataviz.ui {
         border?: ChartXAxisItemNotesDataItemLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -8649,7 +9632,7 @@ declare module kendo.dataviz.ui {
         border?: ChartXAxisItemNotesLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -8713,7 +9696,7 @@ declare module kendo.dataviz.ui {
     }
 
     interface ChartXAxisItem {
-        axisCrossingValue?: any;
+        axisCrossingValue?: any|Date|any;
         background?: string;
         baseUnit?: string;
         color?: string;
@@ -8728,7 +9711,7 @@ declare module kendo.dataviz.ui {
         max?: any;
         min?: any;
         minorUnit?: number;
-        name?: any;
+        name?: string;
         narrowRange?: boolean;
         pane?: string;
         plotBands?: ChartXAxisItemPlotBand[];
@@ -8760,7 +9743,7 @@ declare module kendo.dataviz.ui {
         font?: string;
         format?: string;
         padding?: ChartYAxisItemCrosshairTooltipPadding;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -8800,6 +9783,11 @@ declare module kendo.dataviz.ui {
         top?: number;
     }
 
+    interface ChartYAxisItemLabelsRotation {
+        align?: string;
+        angle?: number;
+    }
+
     interface ChartYAxisItemLabels {
         background?: string;
         border?: ChartYAxisItemLabelsBorder;
@@ -8811,10 +9799,10 @@ declare module kendo.dataviz.ui {
         margin?: ChartYAxisItemLabelsMargin;
         mirror?: boolean;
         padding?: ChartYAxisItemLabelsPadding;
-        rotation?: number;
+        rotation?: ChartYAxisItemLabelsRotation;
         skip?: number;
         step?: number;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         visual?: Function;
     }
@@ -8886,7 +9874,7 @@ declare module kendo.dataviz.ui {
         border?: ChartYAxisItemNotesDataItemLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -8932,7 +9920,7 @@ declare module kendo.dataviz.ui {
         border?: ChartYAxisItemNotesLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -8996,7 +9984,7 @@ declare module kendo.dataviz.ui {
     }
 
     interface ChartYAxisItem {
-        axisCrossingValue?: any;
+        axisCrossingValue?: any|Date|any;
         background?: string;
         baseUnit?: string;
         color?: string;
@@ -9011,7 +9999,7 @@ declare module kendo.dataviz.ui {
         max?: any;
         min?: any;
         minorUnit?: number;
-        name?: any;
+        name?: string;
         narrowRange?: boolean;
         pane?: string;
         plotBands?: ChartYAxisItemPlotBand[];
@@ -9022,6 +10010,20 @@ declare module kendo.dataviz.ui {
         notes?: ChartYAxisItemNotes;
     }
 
+    interface ChartZoomableMousewheel {
+        lock?: string;
+    }
+
+    interface ChartZoomableSelection {
+        key?: string;
+        lock?: string;
+    }
+
+    interface ChartZoomable {
+        mousewheel?: ChartZoomableMousewheel;
+        selection?: ChartZoomableSelection;
+    }
+
     interface ChartExportImageOptions {
         width?: string;
         height?: string;
@@ -9037,14 +10039,14 @@ declare module kendo.dataviz.ui {
     }
 
     interface ChartSeriesClickEventSeries {
-        type?: any;
-        name?: any;
+        type?: string;
+        name?: string;
         data?: any;
     }
 
     interface ChartSeriesHoverEventSeries {
-        type?: any;
-        name?: any;
+        type?: string;
+        name?: string;
         data?: any;
     }
 
@@ -9054,9 +10056,10 @@ declare module kendo.dataviz.ui {
         axisDefaults?: any;
         categoryAxis?: ChartCategoryAxisItem[];
         chartArea?: ChartChartArea;
-        dataSource?: any;
+        dataSource?: any|any|kendo.data.DataSource;
         legend?: ChartLegend;
         panes?: ChartPane[];
+        pannable?: ChartPannable;
         pdf?: ChartPdf;
         plotArea?: ChartPlotArea;
         renderAs?: string;
@@ -9070,6 +10073,7 @@ declare module kendo.dataviz.ui {
         valueAxis?: ChartValueAxisItem[];
         xAxis?: ChartXAxisItem[];
         yAxis?: ChartYAxisItem[];
+        zoomable?: ChartZoomable;
         axisLabelClick?(e: ChartAxisLabelClickEvent): void;
         legendItemClick?(e: ChartLegendItemClickEvent): void;
         legendItemHover?(e: ChartLegendItemHoverEvent): void;
@@ -9092,8 +10096,8 @@ declare module kendo.dataviz.ui {
     }
     interface ChartEvent {
         sender: Chart;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ChartAxisLabelClickEvent extends ChartEvent {
@@ -9145,6 +10149,7 @@ declare module kendo.dataviz.ui {
         value?: any;
         series?: any;
         dataItem?: any;
+        visual?: any;
     }
 
     interface ChartNoteHoverEvent extends ChartEvent {
@@ -9153,6 +10158,7 @@ declare module kendo.dataviz.ui {
         value?: any;
         series?: any;
         dataItem?: any;
+        visual?: any;
     }
 
     interface ChartPlotAreaClickEvent extends ChartEvent {
@@ -9221,14 +10227,23 @@ declare module kendo.dataviz.ui {
 
 
     class Diagram extends kendo.ui.Widget {
+
         static fn: Diagram;
-        static extend(proto: Object): Diagram;
+
+        options: DiagramOptions;
+
+        dataSource: kendo.data.DataSource;
+        connections: DiagramConnection[];
+        shapes: DiagramShape[];
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Diagram;
+
         constructor(element: Element, options?: DiagramOptions);
-        options: DiagramOptions;
-        dataSource: kendo.data.DataSource;
+
+
         addConnection(connection: any, undoable: boolean): void;
         addShape(obj: any, undoable: boolean): kendo.dataviz.diagram.Shape;
         alignShapes(direction: string): void;
@@ -9281,11 +10296,13 @@ declare module kendo.dataviz.ui {
         viewToModel(point: any): any;
         viewport(): void;
         zoom(zoom: number, point: any): void;
+
     }
 
     interface DiagramConnectionDefaultsContent {
-        template?: any;
+        template?: string|Function;
         text?: string;
+        visual?: Function;
     }
 
     interface DiagramConnectionDefaultsEditableTool {
@@ -9293,6 +10310,8 @@ declare module kendo.dataviz.ui {
     }
 
     interface DiagramConnectionDefaultsEditable {
+        drag?: boolean;
+        remove?: boolean;
         tools?: DiagramConnectionDefaultsEditableTool[];
     }
 
@@ -9362,16 +10381,20 @@ declare module kendo.dataviz.ui {
         content?: DiagramConnectionDefaultsContent;
         editable?: DiagramConnectionDefaultsEditable;
         endCap?: DiagramConnectionDefaultsEndCap;
+        fromConnector?: string;
         hover?: DiagramConnectionDefaultsHover;
         selectable?: boolean;
         selection?: DiagramConnectionDefaultsSelection;
         startCap?: DiagramConnectionDefaultsStartCap;
         stroke?: DiagramConnectionDefaultsStroke;
+        toConnector?: string;
+        type?: string;
     }
 
     interface DiagramConnectionContent {
-        template?: any;
+        template?: string|Function;
         text?: string;
+        visual?: Function;
     }
 
     interface DiagramConnectionEditableTool {
@@ -9464,12 +10487,23 @@ declare module kendo.dataviz.ui {
         editable?: DiagramConnectionEditable;
         endCap?: DiagramConnectionEndCap;
         from?: DiagramConnectionFrom;
+        fromConnector?: string;
         hover?: DiagramConnectionHover;
         points?: DiagramConnectionPoint[];
         selection?: DiagramConnectionSelection;
         startCap?: DiagramConnectionStartCap;
         stroke?: DiagramConnectionStroke;
         to?: DiagramConnectionTo;
+        toConnector?: string;
+        type?: string;
+    }
+
+    interface DiagramEditableDragSnap {
+        size?: number;
+    }
+
+    interface DiagramEditableDrag {
+        snap?: DiagramEditableDragSnap;
     }
 
     interface DiagramEditableResizeHandlesFill {
@@ -9532,10 +10566,12 @@ declare module kendo.dataviz.ui {
     }
 
     interface DiagramEditable {
-        connectionTemplate?: any;
+        connectionTemplate?: string|Function;
+        drag?: DiagramEditableDrag;
+        remove?: boolean;
         resize?: DiagramEditableResize;
         rotate?: DiagramEditableRotate;
-        shapeTemplate?: any;
+        shapeTemplate?: string|Function;
         tools?: DiagramEditableTool[];
     }
 
@@ -9558,6 +10594,7 @@ declare module kendo.dataviz.ui {
         radialSeparation?: number;
         startRadialAngle?: number;
         subtype?: string;
+        tipOverTreeStartLevel?: number;
         type?: string;
         underneathHorizontalOffset?: number;
         underneathVerticalSeparation?: number;
@@ -9570,10 +10607,10 @@ declare module kendo.dataviz.ui {
     }
 
     interface DiagramPdfMargin {
-        bottom?: any;
-        left?: any;
-        right?: any;
-        top?: any;
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
     }
 
     interface DiagramPdf {
@@ -9585,7 +10622,7 @@ declare module kendo.dataviz.ui {
         keywords?: string;
         landscape?: boolean;
         margin?: DiagramPdfMargin;
-        paperSize?: any;
+        paperSize?: string|any;
         proxyURL?: string;
         proxyTarget?: string;
         subject?: string;
@@ -9613,7 +10650,7 @@ declare module kendo.dataviz.ui {
         color?: string;
         fontFamily?: string;
         fontSize?: number;
-        template?: any;
+        template?: string|Function;
         text?: string;
     }
 
@@ -9624,12 +10661,30 @@ declare module kendo.dataviz.ui {
 
     interface DiagramShapeDefaultsEditable {
         connect?: boolean;
+        drag?: boolean;
+        remove?: boolean;
         tools?: DiagramShapeDefaultsEditableTool[];
     }
 
+    interface DiagramShapeDefaultsFillGradientStop {
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramShapeDefaultsFillGradient {
+        type?: string;
+        center?: any;
+        radius?: number;
+        start?: any;
+        end?: any;
+        stops?: DiagramShapeDefaultsFillGradientStop[];
+    }
+
     interface DiagramShapeDefaultsFill {
         color?: string;
         opacity?: number;
+        gradient?: DiagramShapeDefaultsFillGradient;
     }
 
     interface DiagramShapeDefaultsHoverFill {
@@ -9683,7 +10738,7 @@ declare module kendo.dataviz.ui {
         color?: string;
         fontFamily?: string;
         fontSize?: number;
-        template?: any;
+        template?: string|Function;
         text?: string;
     }
 
@@ -9697,9 +10752,25 @@ declare module kendo.dataviz.ui {
         tools?: DiagramShapeEditableTool[];
     }
 
+    interface DiagramShapeFillGradientStop {
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramShapeFillGradient {
+        type?: string;
+        center?: any;
+        radius?: number;
+        start?: any;
+        end?: any;
+        stops?: DiagramShapeFillGradientStop[];
+    }
+
     interface DiagramShapeFill {
         color?: string;
         opacity?: number;
+        gradient?: DiagramShapeFillGradient;
     }
 
     interface DiagramShapeHoverFill {
@@ -9760,8 +10831,8 @@ declare module kendo.dataviz.ui {
         autoBind?: boolean;
         connectionDefaults?: DiagramConnectionDefaults;
         connections?: DiagramConnection[];
-        connectionsDataSource?: any;
-        dataSource?: any;
+        connectionsDataSource?: any|any|kendo.data.DataSource;
+        dataSource?: any|any|kendo.data.DataSource;
         editable?: DiagramEditable;
         layout?: DiagramLayout;
         pannable?: DiagramPannable;
@@ -9769,7 +10840,7 @@ declare module kendo.dataviz.ui {
         selectable?: DiagramSelectable;
         shapeDefaults?: DiagramShapeDefaults;
         shapes?: DiagramShape[];
-        template?: any;
+        template?: string|Function;
         zoom?: number;
         zoomMax?: number;
         zoomMin?: number;
@@ -9779,6 +10850,9 @@ declare module kendo.dataviz.ui {
         change?(e: DiagramChangeEvent): void;
         click?(e: DiagramClickEvent): void;
         dataBound?(e: DiagramDataBoundEvent): void;
+        drag?(e: DiagramDragEvent): void;
+        dragEnd?(e: DiagramDragEndEvent): void;
+        dragStart?(e: DiagramDragStartEvent): void;
         edit?(e: DiagramEditEvent): void;
         itemBoundsChange?(e: DiagramItemBoundsChangeEvent): void;
         itemRotate?(e: DiagramItemRotateEvent): void;
@@ -9793,8 +10867,8 @@ declare module kendo.dataviz.ui {
     }
     interface DiagramEvent {
         sender: Diagram;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface DiagramAddEvent extends DiagramEvent {
@@ -9815,12 +10889,28 @@ declare module kendo.dataviz.ui {
 
     interface DiagramClickEvent extends DiagramEvent {
         item?: any;
+        meta?: any;
         point?: kendo.dataviz.diagram.Point;
     }
 
     interface DiagramDataBoundEvent extends DiagramEvent {
     }
 
+    interface DiagramDragEvent extends DiagramEvent {
+        connections?: any;
+        shapes?: any;
+    }
+
+    interface DiagramDragEndEvent extends DiagramEvent {
+        connections?: any;
+        shapes?: any;
+    }
+
+    interface DiagramDragStartEvent extends DiagramEvent {
+        connections?: any;
+        shapes?: any;
+    }
+
     interface DiagramEditEvent extends DiagramEvent {
         container?: JQuery;
         connection?: kendo.data.Model;
@@ -9829,11 +10919,11 @@ declare module kendo.dataviz.ui {
 
     interface DiagramItemBoundsChangeEvent extends DiagramEvent {
         bounds?: kendo.dataviz.diagram.Rect;
-        item?: any;
+        item?: kendo.dataviz.diagram.Shape;
     }
 
     interface DiagramItemRotateEvent extends DiagramEvent {
-        item?: any;
+        item?: kendo.dataviz.diagram.Shape;
     }
 
     interface DiagramMouseEnterEvent extends DiagramEvent {
@@ -9845,6 +10935,7 @@ declare module kendo.dataviz.ui {
     }
 
     interface DiagramPanEvent extends DiagramEvent {
+        pan?: kendo.dataviz.diagram.Point;
     }
 
     interface DiagramRemoveEvent extends DiagramEvent {
@@ -9875,13 +10966,20 @@ declare module kendo.dataviz.ui {
 
 
     class LinearGauge extends kendo.ui.Widget {
+
         static fn: LinearGauge;
-        static extend(proto: Object): LinearGauge;
+
+        options: LinearGaugeOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): LinearGauge;
+
         constructor(element: Element, options?: LinearGaugeOptions);
-        options: LinearGaugeOptions;
+
+
         allValues(values: any): any;
         destroy(): void;
         exportImage(options: any): JQueryPromise<any>;
@@ -9892,6 +10990,7 @@ declare module kendo.dataviz.ui {
         svg(): void;
         imageDataURL(): string;
         value(): void;
+
     }
 
     interface LinearGaugeGaugeAreaBorder {
@@ -9900,11 +10999,18 @@ declare module kendo.dataviz.ui {
         width?: number;
     }
 
+    interface LinearGaugeGaugeAreaMargin {
+        top?: number;
+        bottom?: number;
+        left?: number;
+        right?: number;
+    }
+
     interface LinearGaugeGaugeArea {
         background?: any;
         border?: LinearGaugeGaugeAreaBorder;
         height?: number;
-        margin?: any;
+        margin?: LinearGaugeGaugeAreaMargin;
         width?: number;
     }
 
@@ -9931,7 +11037,7 @@ declare module kendo.dataviz.ui {
     interface LinearGaugePointerItem {
         border?: LinearGaugePointerItemBorder;
         color?: string;
-        margin?: any;
+        margin?: number|any;
         opacity?: number;
         shape?: string;
         size?: number;
@@ -9945,15 +11051,29 @@ declare module kendo.dataviz.ui {
         width?: number;
     }
 
+    interface LinearGaugeScaleLabelsMargin {
+        top?: number;
+        bottom?: number;
+        left?: number;
+        right?: number;
+    }
+
+    interface LinearGaugeScaleLabelsPadding {
+        top?: number;
+        bottom?: number;
+        left?: number;
+        right?: number;
+    }
+
     interface LinearGaugeScaleLabels {
         background?: string;
         border?: LinearGaugeScaleLabelsBorder;
         color?: string;
         font?: string;
         format?: string;
-        margin?: any;
-        padding?: any;
-        template?: any;
+        margin?: LinearGaugeScaleLabelsMargin;
+        padding?: LinearGaugeScaleLabelsPadding;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -10021,19 +11141,27 @@ declare module kendo.dataviz.ui {
     }
     interface LinearGaugeEvent {
         sender: LinearGauge;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Map extends kendo.ui.Widget {
+
         static fn: Map;
-        static extend(proto: Object): Map;
+
+        options: MapOptions;
+
+        layers: any;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Map;
+
         constructor(element: Element, options?: MapOptions);
-        options: MapOptions;
+
+
         center(): kendo.dataviz.map.Location;
         center(center: any): void;
         center(center: kendo.dataviz.map.Location): void;
@@ -10061,7 +11189,7 @@ declare module kendo.dataviz.ui {
         viewToLocation(point: kendo.geometry.Point, zoom: number): kendo.dataviz.map.Location;
         zoom(): number;
         zoom(level: number): void;
-        layers: any;
+
     }
 
     interface MapControlsAttribution {
@@ -10087,6 +11215,7 @@ declare module kendo.dataviz.ui {
         opacity?: number;
         key?: string;
         imagerySet?: string;
+        culture?: string;
     }
 
     interface MapLayerDefaultsBubbleStyleFill {
@@ -10112,7 +11241,7 @@ declare module kendo.dataviz.ui {
         maxSize?: number;
         minSize?: number;
         style?: MapLayerDefaultsBubbleStyle;
-        symbol?: any;
+        symbol?: string|Function;
     }
 
     interface MapLayerDefaultsMarkerTooltipAnimationClose {
@@ -10188,6 +11317,7 @@ declare module kendo.dataviz.ui {
         marker?: MapLayerDefaultsMarker;
         shape?: MapLayerDefaultsShape;
         bubble?: MapLayerDefaultsBubble;
+        tileSize?: number;
         tile?: MapLayerDefaultsTile;
         bing?: MapLayerDefaultsBing;
     }
@@ -10245,19 +11375,21 @@ declare module kendo.dataviz.ui {
     interface MapLayer {
         attribution?: string;
         autoBind?: boolean;
-        dataSource?: any;
-        extent?: any;
+        dataSource?: any|any|kendo.data.DataSource;
+        extent?: any|kendo.dataviz.map.Extent;
         key?: string;
         imagerySet?: string;
+        culture?: string;
         locationField?: string;
         shape?: string;
+        tileSize?: number;
         titleField?: string;
         tooltip?: MapLayerTooltip;
         maxSize?: number;
         minSize?: number;
         opacity?: number;
         subdomains?: any;
-        symbol?: any;
+        symbol?: string|Function;
         type?: string;
         style?: MapLayerStyle;
         urlTemplate?: string;
@@ -10337,7 +11469,7 @@ declare module kendo.dataviz.ui {
     }
 
     interface MapMarker {
-        location?: any;
+        location?: any|kendo.dataviz.map.Location;
         shape?: string;
         title?: string;
         tooltip?: MapMarkerTooltip;
@@ -10345,7 +11477,7 @@ declare module kendo.dataviz.ui {
 
     interface MapOptions {
         name?: string;
-        center?: any;
+        center?: any|kendo.dataviz.map.Location;
         controls?: MapControls;
         layerDefaults?: MapLayerDefaults;
         layers?: MapLayer[];
@@ -10375,8 +11507,8 @@ declare module kendo.dataviz.ui {
     }
     interface MapEvent {
         sender: Map;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface MapBeforeResetEvent extends MapEvent {
@@ -10451,13 +11583,20 @@ declare module kendo.dataviz.ui {
 
 
     class QRCode extends kendo.ui.Widget {
+
         static fn: QRCode;
-        static extend(proto: Object): QRCode;
+
+        options: QRCodeOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): QRCode;
+
         constructor(element: Element, options?: QRCodeOptions);
-        options: QRCodeOptions;
+
+
         destroy(): void;
         exportImage(options: any): JQueryPromise<any>;
         exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
@@ -10469,6 +11608,7 @@ declare module kendo.dataviz.ui {
         svg(): string;
         value(options: string): void;
         value(options: number): void;
+
     }
 
     interface QRCodeBorder {
@@ -10494,24 +11634,31 @@ declare module kendo.dataviz.ui {
         errorCorrection?: string;
         padding?: number;
         renderAs?: string;
-        size?: any;
-        value?: any;
+        size?: number|string;
+        value?: number|string;
     }
     interface QRCodeEvent {
         sender: QRCode;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class RadialGauge extends kendo.ui.Widget {
+
         static fn: RadialGauge;
-        static extend(proto: Object): RadialGauge;
+
+        options: RadialGaugeOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): RadialGauge;
+
         constructor(element: Element, options?: RadialGaugeOptions);
-        options: RadialGaugeOptions;
+
+
         allValues(values: any): any;
         destroy(): void;
         exportImage(options: any): JQueryPromise<any>;
@@ -10522,19 +11669,28 @@ declare module kendo.dataviz.ui {
         svg(): void;
         imageDataURL(): string;
         value(): void;
+
     }
 
     interface RadialGaugeGaugeAreaBorder {
         color?: string;
         dashType?: string;
+        opacity?: number;
         width?: number;
     }
 
+    interface RadialGaugeGaugeAreaMargin {
+        top?: number;
+        bottom?: number;
+        left?: number;
+        right?: number;
+    }
+
     interface RadialGaugeGaugeArea {
         background?: any;
         border?: RadialGaugeGaugeAreaBorder;
         height?: number;
-        margin?: any;
+        margin?: RadialGaugeGaugeAreaMargin;
         width?: number;
     }
 
@@ -10552,19 +11708,34 @@ declare module kendo.dataviz.ui {
     interface RadialGaugeScaleLabelsBorder {
         color?: string;
         dashType?: string;
+        opacity?: number;
         width?: number;
     }
 
+    interface RadialGaugeScaleLabelsMargin {
+        top?: number;
+        bottom?: number;
+        left?: number;
+        right?: number;
+    }
+
+    interface RadialGaugeScaleLabelsPadding {
+        top?: number;
+        bottom?: number;
+        left?: number;
+        right?: number;
+    }
+
     interface RadialGaugeScaleLabels {
         background?: string;
         border?: RadialGaugeScaleLabelsBorder;
         color?: string;
         font?: string;
         format?: string;
-        margin?: any;
-        padding?: any;
+        margin?: RadialGaugeScaleLabelsMargin;
+        padding?: RadialGaugeScaleLabelsPadding;
         position?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -10625,20 +11796,27 @@ declare module kendo.dataviz.ui {
     }
     interface RadialGaugeEvent {
         sender: RadialGauge;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Sparkline extends kendo.ui.Widget {
+
         static fn: Sparkline;
-        static extend(proto: Object): Sparkline;
+
+        options: SparklineOptions;
+
+        dataSource: kendo.data.DataSource;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Sparkline;
+
         constructor(element: Element, options?: SparklineOptions);
-        options: SparklineOptions;
-        dataSource: kendo.data.DataSource;
+
+
         destroy(): void;
         exportImage(options: any): JQueryPromise<any>;
         exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
@@ -10648,6 +11826,7 @@ declare module kendo.dataviz.ui {
         setOptions(options: any): void;
         svg(): string;
         imageDataURL(): string;
+
     }
 
     interface SparklineCategoryAxisItemCrosshairTooltipBorder {
@@ -10661,8 +11840,8 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        padding?: any;
-        template?: any;
+        padding?: number|any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -10687,13 +11866,13 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        margin?: any;
+        margin?: number|any;
         mirror?: boolean;
-        padding?: any;
+        padding?: number|any;
         rotation?: number;
         skip?: number;
         step?: number;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         culture?: string;
         dateFormats?: any;
@@ -10766,7 +11945,7 @@ declare module kendo.dataviz.ui {
         border?: SparklineCategoryAxisItemNotesDataItemLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -10812,7 +11991,7 @@ declare module kendo.dataviz.ui {
         border?: SparklineCategoryAxisItemNotesLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -10851,7 +12030,7 @@ declare module kendo.dataviz.ui {
         border?: SparklineCategoryAxisItemTitleBorder;
         color?: string;
         font?: string;
-        margin?: any;
+        margin?: number|any;
         position?: string;
         rotation?: number;
         text?: string;
@@ -10859,7 +12038,7 @@ declare module kendo.dataviz.ui {
     }
 
     interface SparklineCategoryAxisItem {
-        axisCrossingValue?: any;
+        axisCrossingValue?: any|Date|any;
         categories?: any;
         color?: string;
         field?: string;
@@ -10899,7 +12078,7 @@ declare module kendo.dataviz.ui {
         opacity?: number;
         border?: SparklineChartAreaBorder;
         height?: number;
-        margin?: any;
+        margin?: number|any;
         width?: number;
     }
 
@@ -10913,14 +12092,14 @@ declare module kendo.dataviz.ui {
         background?: string;
         opacity?: number;
         border?: SparklinePlotAreaBorder;
-        margin?: any;
+        margin?: number|any;
     }
 
     interface SparklineSeriesItemBorder {
-        color?: any;
-        dashType?: any;
-        opacity?: any;
-        width?: any;
+        color?: string|Function;
+        dashType?: string|Function;
+        opacity?: number|Function;
+        width?: number|Function;
     }
 
     interface SparklineSeriesItemConnectors {
@@ -10943,24 +12122,24 @@ declare module kendo.dataviz.ui {
     }
 
     interface SparklineSeriesItemLabelsBorder {
-        color?: any;
-        dashType?: any;
-        width?: any;
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number|Function;
     }
 
     interface SparklineSeriesItemLabels {
         align?: string;
-        background?: any;
+        background?: string|Function;
         border?: SparklineSeriesItemLabelsBorder;
-        color?: any;
+        color?: string|Function;
         distance?: number;
-        font?: any;
-        format?: any;
-        margin?: any;
-        padding?: any;
-        position?: any;
-        template?: any;
-        visible?: any;
+        font?: string|Function;
+        format?: string|Function;
+        margin?: number|any;
+        padding?: number|any;
+        position?: string|Function;
+        template?: string|Function;
+        visible?: boolean|Function;
     }
 
     interface SparklineSeriesItemLine {
@@ -10971,17 +12150,17 @@ declare module kendo.dataviz.ui {
     }
 
     interface SparklineSeriesItemMarkersBorder {
-        color?: any;
-        width?: any;
+        color?: string|Function;
+        width?: number|Function;
     }
 
     interface SparklineSeriesItemMarkers {
-        background?: any;
+        background?: string|Function;
         border?: SparklineSeriesItemMarkersBorder;
-        size?: any;
-        type?: any;
-        visible?: any;
-        rotation?: any;
+        size?: number|Function;
+        type?: string|Function;
+        visible?: boolean|Function;
+        rotation?: number|Function;
     }
 
     interface SparklineSeriesItemNotesIconBorder {
@@ -11008,7 +12187,7 @@ declare module kendo.dataviz.ui {
         border?: SparklineSeriesItemNotesLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -11038,18 +12217,18 @@ declare module kendo.dataviz.ui {
     }
 
     interface SparklineSeriesItemTargetBorder {
-        color?: any;
-        dashType?: any;
+        color?: string|Function;
+        dashType?: string|Function;
         width?: number;
     }
 
     interface SparklineSeriesItemTargetLine {
-        width?: any;
+        width?: any|Function;
     }
 
     interface SparklineSeriesItemTarget {
         line?: SparklineSeriesItemTargetLine;
-        color?: any;
+        color?: string|Function;
         border?: SparklineSeriesItemTargetBorder;
     }
 
@@ -11064,8 +12243,8 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        padding?: any;
-        template?: any;
+        padding?: number|any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -11079,11 +12258,11 @@ declare module kendo.dataviz.ui {
         field?: string;
         name?: string;
         highlight?: SparklineSeriesItemHighlight;
-        aggregate?: any;
+        aggregate?: string|Function;
         axis?: string;
         border?: SparklineSeriesItemBorder;
         categoryField?: string;
-        color?: any;
+        color?: string|Function;
         colorField?: string;
         connectors?: SparklineSeriesItemConnectors;
         gap?: number;
@@ -11125,9 +12304,9 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        margin?: any;
-        padding?: any;
-        template?: any;
+        margin?: number|any;
+        padding?: number|any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -11146,8 +12325,8 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        padding?: any;
-        template?: any;
+        padding?: number|any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -11178,8 +12357,8 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        padding?: any;
-        template?: any;
+        padding?: number|any;
+        template?: string|Function;
         visible?: boolean;
         shared?: boolean;
         sharedTemplate?: string;
@@ -11196,8 +12375,8 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        padding?: any;
-        template?: any;
+        padding?: number|any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -11222,13 +12401,13 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        margin?: any;
+        margin?: number|any;
         mirror?: boolean;
-        padding?: any;
+        padding?: number|any;
         rotation?: number;
         skip?: number;
         step?: number;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -11298,7 +12477,7 @@ declare module kendo.dataviz.ui {
         border?: SparklineValueAxisItemNotesDataItemLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -11344,7 +12523,7 @@ declare module kendo.dataviz.ui {
         border?: SparklineValueAxisItemNotesLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -11383,8 +12562,8 @@ declare module kendo.dataviz.ui {
         border?: SparklineValueAxisItemTitleBorder;
         color?: string;
         font?: string;
-        margin?: any;
-        padding?: any;
+        margin?: number|any;
+        padding?: number|any;
         position?: string;
         rotation?: number;
         text?: string;
@@ -11392,7 +12571,7 @@ declare module kendo.dataviz.ui {
     }
 
     interface SparklineValueAxisItem {
-        axisCrossingValue?: any;
+        axisCrossingValue?: any|Date|any;
         color?: string;
         labels?: SparklineValueAxisItemLabels;
         line?: SparklineValueAxisItemLine;
@@ -11424,14 +12603,14 @@ declare module kendo.dataviz.ui {
     }
 
     interface SparklineSeriesClickEventSeries {
-        type?: any;
-        name?: any;
+        type?: string;
+        name?: string;
         data?: any;
     }
 
     interface SparklineSeriesHoverEventSeries {
-        type?: any;
-        name?: any;
+        type?: string;
+        name?: string;
         data?: any;
     }
 
@@ -11468,8 +12647,8 @@ declare module kendo.dataviz.ui {
     }
     interface SparklineEvent {
         sender: Sparkline;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface SparklineAxisLabelClickEvent extends SparklineEvent {
@@ -11540,14 +12719,21 @@ declare module kendo.dataviz.ui {
 
 
     class StockChart extends kendo.ui.Widget {
+
         static fn: StockChart;
-        static extend(proto: Object): StockChart;
+
+        options: StockChartOptions;
+
+        dataSource: kendo.data.DataSource;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): StockChart;
+
         constructor(element: Element, options?: StockChartOptions);
-        options: StockChartOptions;
-        dataSource: kendo.data.DataSource;
+
+
         destroy(): void;
         exportImage(options: any): JQueryPromise<any>;
         exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
@@ -11558,6 +12744,7 @@ declare module kendo.dataviz.ui {
         setDataSource(dataSource: kendo.data.DataSource): void;
         svg(): string;
         imageDataURL(): string;
+
     }
 
     interface StockChartCategoryAxisItemAutoBaseUnitSteps {
@@ -11580,8 +12767,8 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        padding?: any;
-        template?: any;
+        padding?: number|any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -11606,13 +12793,13 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        margin?: any;
+        margin?: number|any;
         mirror?: boolean;
-        padding?: any;
+        padding?: number|any;
         rotation?: number;
         skip?: number;
         step?: number;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         culture?: string;
         dateFormats?: any;
@@ -11685,7 +12872,7 @@ declare module kendo.dataviz.ui {
         border?: StockChartCategoryAxisItemNotesDataItemLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -11731,7 +12918,7 @@ declare module kendo.dataviz.ui {
         border?: StockChartCategoryAxisItemNotesLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -11783,7 +12970,7 @@ declare module kendo.dataviz.ui {
         border?: StockChartCategoryAxisItemTitleBorder;
         color?: string;
         font?: string;
-        margin?: any;
+        margin?: number|any;
         position?: string;
         rotation?: number;
         text?: string;
@@ -11791,7 +12978,7 @@ declare module kendo.dataviz.ui {
     }
 
     interface StockChartCategoryAxisItem {
-        axisCrossingValue?: any;
+        axisCrossingValue?: any|Date|any;
         categories?: any;
         color?: string;
         field?: string;
@@ -11834,7 +13021,7 @@ declare module kendo.dataviz.ui {
         opacity?: number;
         border?: StockChartChartAreaBorder;
         height?: number;
-        margin?: any;
+        margin?: number|any;
         width?: number;
     }
 
@@ -11859,6 +13046,11 @@ declare module kendo.dataviz.ui {
         markers?: StockChartLegendInactiveItemsMarkers;
     }
 
+    interface StockChartLegendItem {
+        cursor?: string;
+        visual?: Function;
+    }
+
     interface StockChartLegendLabels {
         color?: string;
         font?: string;
@@ -11868,11 +13060,12 @@ declare module kendo.dataviz.ui {
     interface StockChartLegend {
         background?: string;
         border?: StockChartLegendBorder;
+        item?: StockChartLegendItem;
         labels?: StockChartLegendLabels;
-        margin?: any;
+        margin?: number|any;
         offsetX?: number;
         offsetY?: number;
-        padding?: any;
+        padding?: number|any;
         position?: string;
         reverse?: boolean;
         visible?: boolean;
@@ -11909,7 +13102,7 @@ declare module kendo.dataviz.ui {
         font?: string;
         format?: string;
         padding?: StockChartNavigatorCategoryAxisItemCrosshairTooltipPadding;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -11963,7 +13156,7 @@ declare module kendo.dataviz.ui {
         rotation?: number;
         skip?: number;
         step?: number;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -12034,7 +13227,7 @@ declare module kendo.dataviz.ui {
         border?: StockChartNavigatorCategoryAxisItemNotesDataItemLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -12080,7 +13273,7 @@ declare module kendo.dataviz.ui {
         border?: StockChartNavigatorCategoryAxisItemNotesLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -12143,7 +13336,7 @@ declare module kendo.dataviz.ui {
 
     interface StockChartNavigatorCategoryAxisItem {
         autoBaseUnitSteps?: StockChartNavigatorCategoryAxisItemAutoBaseUnitSteps;
-        axisCrossingValue?: any;
+        axisCrossingValue?: any|Date|any;
         background?: string;
         baseUnit?: string;
         baseUnitStep?: any;
@@ -12172,7 +13365,7 @@ declare module kendo.dataviz.ui {
 
     interface StockChartNavigatorHint {
         visible?: boolean;
-        template?: any;
+        template?: string|Function;
         format?: string;
     }
 
@@ -12273,10 +13466,10 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        margin?: any;
-        padding?: any;
+        margin?: number|any;
+        padding?: number|any;
         position?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -12294,7 +13487,7 @@ declare module kendo.dataviz.ui {
     interface StockChartNavigatorSeriesItemMarkers {
         background?: string;
         border?: StockChartNavigatorSeriesItemMarkersBorder;
-        rotation?: any;
+        rotation?: number|Function;
         size?: number;
         type?: string;
         visible?: boolean;
@@ -12320,8 +13513,8 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        padding?: any;
-        template?: any;
+        padding?: number|any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -12334,7 +13527,7 @@ declare module kendo.dataviz.ui {
         categoryField?: string;
         name?: string;
         highlight?: StockChartNavigatorSeriesItemHighlight;
-        aggregate?: any;
+        aggregate?: string|Function;
         axis?: string;
         border?: StockChartNavigatorSeriesItemBorder;
         closeField?: string;
@@ -12387,7 +13580,7 @@ declare module kendo.dataviz.ui {
         border?: StockChartPaneTitleBorder;
         color?: string;
         font?: string;
-        margin?: any;
+        margin?: number|any;
         position?: string;
         text?: string;
         visible?: boolean;
@@ -12395,8 +13588,8 @@ declare module kendo.dataviz.ui {
 
     interface StockChartPane {
         name?: string;
-        margin?: any;
-        padding?: any;
+        margin?: number|any;
+        padding?: number|any;
         background?: string;
         border?: StockChartPaneBorder;
         clip?: boolean;
@@ -12405,10 +13598,10 @@ declare module kendo.dataviz.ui {
     }
 
     interface StockChartPdfMargin {
-        bottom?: any;
-        left?: any;
-        right?: any;
-        top?: any;
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
     }
 
     interface StockChartPdf {
@@ -12420,7 +13613,7 @@ declare module kendo.dataviz.ui {
         keywords?: string;
         landscape?: boolean;
         margin?: StockChartPdfMargin;
-        paperSize?: any;
+        paperSize?: string|any;
         proxyURL?: string;
         proxyTarget?: string;
         subject?: string;
@@ -12437,14 +13630,14 @@ declare module kendo.dataviz.ui {
         background?: string;
         opacity?: number;
         border?: StockChartPlotAreaBorder;
-        margin?: any;
+        margin?: number|any;
     }
 
     interface StockChartSeriesItemBorder {
-        color?: any;
-        dashType?: any;
-        opacity?: any;
-        width?: any;
+        color?: string|Function;
+        dashType?: string|Function;
+        opacity?: number|Function;
+        width?: number|Function;
     }
 
     interface StockChartSeriesItemHighlightBorder {
@@ -12468,22 +13661,22 @@ declare module kendo.dataviz.ui {
     }
 
     interface StockChartSeriesItemLabelsBorder {
-        color?: any;
-        dashType?: any;
-        width?: any;
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number|Function;
     }
 
     interface StockChartSeriesItemLabels {
-        background?: any;
+        background?: string|Function;
         border?: StockChartSeriesItemLabelsBorder;
-        color?: any;
-        font?: any;
-        format?: any;
-        margin?: any;
-        padding?: any;
-        position?: any;
-        template?: any;
-        visible?: any;
+        color?: string|Function;
+        font?: string|Function;
+        format?: string|Function;
+        margin?: number|any;
+        padding?: number|any;
+        position?: string|Function;
+        template?: string|Function;
+        visible?: boolean|Function;
     }
 
     interface StockChartSeriesItemLine {
@@ -12494,17 +13687,17 @@ declare module kendo.dataviz.ui {
     }
 
     interface StockChartSeriesItemMarkersBorder {
-        color?: any;
-        width?: any;
+        color?: string|Function;
+        width?: number|Function;
     }
 
     interface StockChartSeriesItemMarkers {
-        background?: any;
+        background?: string|Function;
         border?: StockChartSeriesItemMarkersBorder;
-        size?: any;
-        rotation?: any;
-        type?: any;
-        visible?: any;
+        size?: number|Function;
+        rotation?: number|Function;
+        type?: string|Function;
+        visible?: boolean|Function;
     }
 
     interface StockChartSeriesItemNotesIconBorder {
@@ -12531,7 +13724,7 @@ declare module kendo.dataviz.ui {
         border?: StockChartSeriesItemNotesLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -12561,18 +13754,18 @@ declare module kendo.dataviz.ui {
     }
 
     interface StockChartSeriesItemTargetBorder {
-        color?: any;
-        dashType?: any;
-        width?: any;
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number|Function;
     }
 
     interface StockChartSeriesItemTargetLine {
-        width?: any;
+        width?: any|Function;
     }
 
     interface StockChartSeriesItemTarget {
         line?: StockChartSeriesItemTargetLine;
-        color?: any;
+        color?: string|Function;
         border?: StockChartSeriesItemTargetBorder;
     }
 
@@ -12587,8 +13780,8 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        padding?: any;
-        template?: any;
+        padding?: number|any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -12603,13 +13796,13 @@ declare module kendo.dataviz.ui {
         targetField?: string;
         name?: string;
         highlight?: StockChartSeriesItemHighlight;
-        aggregate?: any;
+        aggregate?: string|Function;
         axis?: string;
         border?: StockChartSeriesItemBorder;
         closeField?: string;
-        color?: any;
+        color?: string|Function;
         colorField?: string;
-        downColor?: any;
+        downColor?: string|Function;
         downColorField?: string;
         gap?: number;
         labels?: StockChartSeriesItemLabels;
@@ -12650,9 +13843,9 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        margin?: any;
-        padding?: any;
-        template?: any;
+        margin?: number|any;
+        padding?: number|any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -12671,8 +13864,8 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        padding?: any;
-        template?: any;
+        padding?: number|any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -12705,8 +13898,8 @@ declare module kendo.dataviz.ui {
         border?: StockChartTitleBorder;
         font?: string;
         color?: string;
-        margin?: any;
-        padding?: any;
+        margin?: number|any;
+        padding?: number|any;
         position?: string;
         text?: string;
         visible?: boolean;
@@ -12723,8 +13916,8 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        padding?: any;
-        template?: any;
+        padding?: number|any;
+        template?: string|Function;
         visible?: boolean;
         shared?: boolean;
         sharedTemplate?: string;
@@ -12741,8 +13934,8 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        padding?: any;
-        template?: any;
+        padding?: number|any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -12767,13 +13960,13 @@ declare module kendo.dataviz.ui {
         color?: string;
         font?: string;
         format?: string;
-        margin?: any;
+        margin?: number|any;
         mirror?: boolean;
-        padding?: any;
+        padding?: number|any;
         rotation?: number;
         skip?: number;
         step?: number;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
     }
 
@@ -12843,7 +14036,7 @@ declare module kendo.dataviz.ui {
         border?: StockChartValueAxisItemNotesDataItemLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -12889,7 +14082,7 @@ declare module kendo.dataviz.ui {
         border?: StockChartValueAxisItemNotesLabelBorder;
         color?: string;
         font?: string;
-        template?: any;
+        template?: string|Function;
         visible?: boolean;
         rotation?: number;
         format?: string;
@@ -12928,8 +14121,8 @@ declare module kendo.dataviz.ui {
         border?: StockChartValueAxisItemTitleBorder;
         color?: string;
         font?: string;
-        margin?: any;
-        padding?: any;
+        margin?: number|any;
+        padding?: number|any;
         position?: string;
         rotation?: number;
         text?: string;
@@ -12937,7 +14130,7 @@ declare module kendo.dataviz.ui {
     }
 
     interface StockChartValueAxisItem {
-        axisCrossingValue?: any;
+        axisCrossingValue?: any|Date|any;
         background?: string;
         color?: string;
         labels?: StockChartValueAxisItemLabels;
@@ -12971,14 +14164,14 @@ declare module kendo.dataviz.ui {
     }
 
     interface StockChartSeriesClickEventSeries {
-        type?: any;
-        name?: any;
+        type?: string;
+        name?: string;
         data?: any;
     }
 
     interface StockChartSeriesHoverEventSeries {
-        type?: any;
-        name?: any;
+        type?: string;
+        name?: string;
         data?: any;
     }
 
@@ -13026,8 +14219,8 @@ declare module kendo.dataviz.ui {
     }
     interface StockChartEvent {
         sender: StockChart;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface StockChartAxisLabelClickEvent extends StockChartEvent {
@@ -13148,38 +14341,46 @@ declare module kendo.dataviz.ui {
 
 
     class TreeMap extends kendo.ui.Widget {
+
         static fn: TreeMap;
-        static extend(proto: Object): TreeMap;
+
+        options: TreeMapOptions;
+
+        dataSource: kendo.data.DataSource;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): TreeMap;
+
         constructor(element: Element, options?: TreeMapOptions);
-        options: TreeMapOptions;
-        dataSource: kendo.data.DataSource;
+
+
+
     }
 
     interface TreeMapOptions {
         name?: string;
-        dataSource?: any;
+        dataSource?: any|any|kendo.data.HierarchicalDataSource;
         autoBind?: boolean;
         type?: string;
         theme?: string;
         valueField?: string;
         colorField?: string;
         textField?: string;
-        template?: any;
+        template?: string|Function;
         colors?: any;
         itemCreated?(e: TreeMapItemCreatedEvent): void;
         dataBound?(e: TreeMapDataBoundEvent): void;
     }
     interface TreeMapEvent {
         sender: TreeMap;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface TreeMapItemCreatedEvent extends TreeMapEvent {
-        element?: any;
+        element?: JQuery|Element;
     }
 
     interface TreeMapDataBoundEvent extends TreeMapEvent {
@@ -13189,7 +14390,13 @@ declare module kendo.dataviz.ui {
 }
 declare module kendo.dataviz {
     class ChartAxis extends Observable {
+
+
         options: ChartAxisOptions;
+
+
+
+
         range(): any;
         slot(from: string, to?: string): kendo.geometry.Rect;
         slot(from: string, to?: number): kendo.geometry.Rect;
@@ -13200,6 +14407,7 @@ declare module kendo.dataviz {
         slot(from: Date, to?: string): kendo.geometry.Rect;
         slot(from: Date, to?: number): kendo.geometry.Rect;
         slot(from: Date, to?: Date): kendo.geometry.Rect;
+
     }
 
     interface ChartAxisOptions {
@@ -13207,23 +14415,49 @@ declare module kendo.dataviz {
     }
     interface ChartAxisEvent {
         sender: ChartAxis;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
 }
 declare module kendo.dataviz.diagram {
     class Circle extends Observable {
-        constructor(options?: CircleOptions);
+
+
         options: CircleOptions;
+
+
+        constructor(options?: CircleOptions);
+
+
+        position(): void;
+        position(offset: kendo.dataviz.diagram.Point): void;
+        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
         visible(): boolean;
         visible(visible: boolean): void;
+
+    }
+
+    interface CircleFillGradientStop {
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface CircleFillGradient {
+        type?: string;
+        center?: any;
+        radius?: number;
+        start?: any;
+        end?: any;
+        stops?: CircleFillGradientStop[];
     }
 
     interface CircleFill {
         color?: string;
         opacity?: number;
+        gradient?: CircleFillGradient;
     }
 
     interface CircleStroke {
@@ -13240,14 +14474,20 @@ declare module kendo.dataviz.diagram {
     }
     interface CircleEvent {
         sender: Circle;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Connection extends Observable {
-        constructor(options?: ConnectionOptions);
+
+
         options: ConnectionOptions;
+
+
+        constructor(options?: ConnectionOptions);
+
+
         source(): any;
         source(source: kendo.dataviz.diagram.Shape): void;
         source(source: kendo.dataviz.diagram.Point): void;
@@ -13264,6 +14504,13 @@ declare module kendo.dataviz.diagram {
         points(): any;
         allPoints(): any;
         redraw(): void;
+
+    }
+
+    interface ConnectionContent {
+        template?: string|Function;
+        text?: string;
+        visual?: Function;
     }
 
     interface ConnectionEndCapFill {
@@ -13317,24 +14564,35 @@ declare module kendo.dataviz.diagram {
 
     interface ConnectionOptions {
         name?: string;
+        content?: ConnectionContent;
+        fromConnector?: string;
         stroke?: ConnectionStroke;
         hover?: ConnectionHover;
         startCap?: ConnectionStartCap;
         endCap?: ConnectionEndCap;
         points?: ConnectionPoint[];
         selectable?: boolean;
+        toConnector?: string;
+        type?: string;
     }
     interface ConnectionEvent {
         sender: Connection;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Connector extends Observable {
-        constructor(options?: ConnectorOptions);
+
+
         options: ConnectorOptions;
+
+
+        constructor(options?: ConnectorOptions);
+
+
         position(): kendo.dataviz.diagram.Point;
+
     }
 
     interface ConnectorFill {
@@ -13350,19 +14608,29 @@ declare module kendo.dataviz.diagram {
     }
     interface ConnectorEvent {
         sender: Connector;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Group extends Observable {
-        constructor(options?: GroupOptions);
+
+
         options: GroupOptions;
+
+
+        constructor(options?: GroupOptions);
+
+
         append(element: any): void;
         clear(): void;
         remove(element: any): void;
+        position(): void;
+        position(offset: kendo.dataviz.diagram.Point): void;
+        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
         visible(): boolean;
         visible(visible: boolean): void;
+
     }
 
     interface GroupOptions {
@@ -13372,16 +14640,26 @@ declare module kendo.dataviz.diagram {
     }
     interface GroupEvent {
         sender: Group;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Image extends Observable {
-        constructor(options?: ImageOptions);
+
+
         options: ImageOptions;
+
+
+        constructor(options?: ImageOptions);
+
+
+        position(): void;
+        position(offset: kendo.dataviz.diagram.Point): void;
+        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
         visible(): boolean;
         visible(visible: boolean): void;
+
     }
 
     interface ImageOptions {
@@ -13394,16 +14672,63 @@ declare module kendo.dataviz.diagram {
     }
     interface ImageEvent {
         sender: Image;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Layout extends Observable {
+
+
+        options: LayoutOptions;
+
+
+        constructor(rect: kendo.dataviz.diagram.Rect, options?: LayoutOptions);
+
+
+        append(element: any): void;
+        clear(): void;
+        rect(): kendo.dataviz.diagram.Rect;
+        rect(rect: kendo.dataviz.diagram.Rect): void;
+        reflow(): void;
+        remove(element: any): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface LayoutOptions {
+        name?: string;
+        alignContent?: string;
+        alignItems?: string;
+        justifyContent?: string;
+        lineSpacing?: number;
+        spacing?: number;
+        orientation?: string;
+        wrap?: boolean;
+    }
+    interface LayoutEvent {
+        sender: Layout;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Line extends Observable {
-        constructor(options?: LineOptions);
+
+
         options: LineOptions;
+
+
+        constructor(options?: LineOptions);
+
+
+        position(): void;
+        position(offset: kendo.dataviz.diagram.Point): void;
+        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
         visible(): boolean;
         visible(visible: boolean): void;
+
     }
 
     interface LineStroke {
@@ -13419,14 +14744,21 @@ declare module kendo.dataviz.diagram {
     }
     interface LineEvent {
         sender: Line;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Point extends Observable {
-        constructor(options?: PointOptions);
+
+
         options: PointOptions;
+
+
+        constructor(options?: PointOptions);
+
+
+
     }
 
     interface PointOptions {
@@ -13436,14 +14768,26 @@ declare module kendo.dataviz.diagram {
     }
     interface PointEvent {
         sender: Point;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Rect extends Observable {
-        constructor(options?: RectOptions);
+
+
         options: RectOptions;
+
+
+        constructor(options?: RectOptions);
+
+
+        position(): void;
+        position(offset: kendo.dataviz.diagram.Point): void;
+        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
     }
 
     interface RectOptions {
@@ -13455,21 +14799,44 @@ declare module kendo.dataviz.diagram {
     }
     interface RectEvent {
         sender: Rect;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Rectangle extends Observable {
-        constructor(options?: RectangleOptions);
+
+
         options: RectangleOptions;
+
+
+        constructor(options?: RectangleOptions);
+
+
         visible(): boolean;
         visible(visible: boolean): void;
+
+    }
+
+    interface RectangleFillGradientStop {
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface RectangleFillGradient {
+        type?: string;
+        center?: any;
+        radius?: number;
+        start?: any;
+        end?: any;
+        stops?: RectangleFillGradientStop[];
     }
 
     interface RectangleFill {
         color?: string;
         opacity?: number;
+        gradient?: RectangleFillGradient;
     }
 
     interface RectangleStroke {
@@ -13488,14 +14855,20 @@ declare module kendo.dataviz.diagram {
     }
     interface RectangleEvent {
         sender: Rectangle;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Shape extends Observable {
-        constructor(options?: ShapeOptions);
+
+
         options: ShapeOptions;
+
+
+        constructor(options?: ShapeOptions);
+
+
         position(): void;
         position(point: kendo.dataviz.diagram.Point): void;
         clone(): kendo.dataviz.diagram.Shape;
@@ -13504,6 +14877,7 @@ declare module kendo.dataviz.diagram {
         getConnector(): void;
         getPosition(side: string): void;
         redraw(): void;
+
     }
 
     interface ShapeConnector {
@@ -13521,9 +14895,25 @@ declare module kendo.dataviz.diagram {
         connect?: boolean;
     }
 
+    interface ShapeFillGradientStop {
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface ShapeFillGradient {
+        type?: string;
+        center?: any;
+        radius?: number;
+        start?: any;
+        end?: any;
+        stops?: ShapeFillGradientStop[];
+    }
+
     interface ShapeFill {
         color?: string;
         opacity?: number;
+        gradient?: ShapeFillGradient;
     }
 
     interface ShapeHoverFill {
@@ -13568,18 +14958,28 @@ declare module kendo.dataviz.diagram {
     }
     interface ShapeEvent {
         sender: Shape;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class TextBlock extends Observable {
-        constructor(options?: TextBlockOptions);
+
+
         options: TextBlockOptions;
+
+
+        constructor(options?: TextBlockOptions);
+
+
         content(): string;
         content(content: string): void;
+        position(): void;
+        position(offset: kendo.dataviz.diagram.Point): void;
+        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
         visible(): boolean;
         visible(visible: boolean): void;
+
     }
 
     interface TextBlockOptions {
@@ -13595,17 +14995,31 @@ declare module kendo.dataviz.diagram {
     }
     interface TextBlockEvent {
         sender: TextBlock;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
 }
 declare module kendo {
     class Color extends Observable {
+
+
         options: ColorOptions;
+
+
+
+
         diff(): number;
         equals(): boolean;
+        toHSV(): any;
+        toRGB(): any;
+        toBytes(): any;
+        toHex(): string;
+        toCss(): string;
+        toCssRgba(): string;
+        toDisplay(): string;
+
     }
 
     interface ColorOptions {
@@ -13613,14 +15027,14 @@ declare module kendo {
     }
     interface ColorEvent {
         sender: Color;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     module drawing {
         function align(elements: any, rect: kendo.geometry.Rect, alignment: string): void;
-        function drawDOM(element: JQuery): JQueryPromise<any>;
+        function drawDOM(element: JQuery, options: any): JQueryPromise<any>;
         function exportImage(group: kendo.drawing.Group, options: any): JQueryPromise<any>;
         function exportPDF(group: kendo.drawing.Group, options: kendo.drawing.PDFOptions): JQueryPromise<any>;
         function exportSVG(group: kendo.drawing.Group, options: any): JQueryPromise<any>;
@@ -13639,6 +15053,7 @@ declare module kendo {
         function transformOrigin(firstElement: HTMLElement, secondElement: HTMLElement): any;
     }
 
+        function antiForgeryTokens(): any;
         function bind(element: string, viewModel: any, namespace?: any): void;
         function bind(element: string, viewModel: kendo.data.ObservableObject, namespace?: any): void;
         function bind(element: JQuery, viewModel: any, namespace?: any): void;
@@ -13671,11 +15086,218 @@ declare module kendo {
         function unbind(element: JQuery): void;
         function unbind(element: Element): void;
 
+}
+declare module kendo.spreadsheet {
+    class CustomFilter extends Observable {
+
+
+        options: CustomFilterOptions;
+
+
+
+
+        init(options: any): void;
+
+    }
+
+    interface CustomFilterOptions {
+        name?: string;
+    }
+    interface CustomFilterEvent {
+        sender: CustomFilter;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class DynamicFilter extends Observable {
+
+
+        options: DynamicFilterOptions;
+
+
+
+
+        init(options: any): void;
+
+    }
+
+    interface DynamicFilterOptions {
+        name?: string;
+    }
+    interface DynamicFilterEvent {
+        sender: DynamicFilter;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Range extends Observable {
+
+
+        options: RangeOptions;
+
+
+
+
+        borderBottom(): any;
+        borderBottom(value?: any): void;
+        borderLeft(): any;
+        borderLeft(value?: any): void;
+        borderRight(): any;
+        borderRight(value?: any): void;
+        borderTop(): any;
+        borderTop(value?: any): void;
+        clear(options?: any): void;
+        clearFilter(indices: any): void;
+        clearFilter(indices: number): void;
+        filter(filter: boolean): void;
+        filter(filter: any): void;
+        format(): string;
+        format(format?: string): void;
+        formula(): string;
+        formula(formula?: string): void;
+        hasFilter(): boolean;
+        input(): any;
+        input(value?: string): void;
+        input(value?: number): void;
+        input(value?: Date): void;
+        isSortable(): boolean;
+        isFilterable(): boolean;
+        merge(): void;
+        select(): void;
+        sort(sort: number): void;
+        sort(sort: any): void;
+        unmerge(): void;
+        values(values: any): void;
+        validation(): any;
+        validation(value?: any): void;
+        value(): any;
+        value(value?: string): void;
+        value(value?: number): void;
+        value(value?: Date): void;
+        wrap(): boolean;
+        wrap(value?: boolean): void;
+
+    }
+
+    interface RangeOptions {
+        name?: string;
+    }
+    interface RangeEvent {
+        sender: Range;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Sheet extends Observable {
+
+
+        options: SheetOptions;
+
+
+
+
+        clearFilter(indexes: number): void;
+        clearFilter(indexes: any): void;
+        columnWidth(): void;
+        columnWidth(index: number, width?: number): void;
+        deleteColumn(index: number): void;
+        fromJSON(data: any): void;
+        frozenColumns(): number;
+        frozenColumns(count?: number): void;
+        frozenRows(): number;
+        frozenRows(count?: number): void;
+        hideColumn(index: number): void;
+        hideRow(index: number): void;
+        insertColumn(index: number): void;
+        insertRow(index: number): void;
+        range(ref: string): kendo.spreadsheet.Range;
+        rowHeight(): void;
+        rowHeight(index: number, width?: number): void;
+        selection(): kendo.spreadsheet.Range;
+        toJSON(): void;
+        unhideColumn(index: number): void;
+        unhideRow(index: number): void;
+
+    }
+
+    interface SheetOptions {
+        name?: string;
+        change?(e: SheetChangeEvent): void;
+    }
+    interface SheetEvent {
+        sender: Sheet;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SheetChangeEvent extends SheetEvent {
+    }
+
+
+    class TopFilter extends Observable {
+
+
+        options: TopFilterOptions;
+
+
+
+
+        init(options: any): void;
+
+    }
+
+    interface TopFilterOptions {
+        name?: string;
+    }
+    interface TopFilterEvent {
+        sender: TopFilter;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class ValueFilter extends Observable {
+
+
+        options: ValueFilterOptions;
+
+
+
+
+        init(options: any): void;
+
+    }
+
+    interface ValueFilterOptions {
+        name?: string;
+    }
+    interface ValueFilterEvent {
+        sender: ValueFilter;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
 }
 declare module kendo.dataviz.map {
     class Extent extends kendo.Class {
-        constructor(nw: kendo.dataviz.map.Location, se: kendo.dataviz.map.Location);
+
+
         options: ExtentOptions;
+
+        nw: kendo.dataviz.map.Location;
+        se: kendo.dataviz.map.Location;
+
+        constructor(nw: kendo.dataviz.map.Location, se: kendo.dataviz.map.Location);
+
+        static create(a: kendo.dataviz.map.Location, b?: kendo.dataviz.map.Location): kendo.dataviz.map.Extent;
+        static create(a: kendo.dataviz.map.Location, b?: any): kendo.dataviz.map.Extent;
+        static create(a: any, b?: kendo.dataviz.map.Location): kendo.dataviz.map.Extent;
+        static create(a: any, b?: any): kendo.dataviz.map.Extent;
+
         contains(location: kendo.dataviz.map.Location): boolean;
         containsAny(locations: any): boolean;
         center(): kendo.dataviz.map.Location;
@@ -13684,12 +15306,7 @@ declare module kendo.dataviz.map {
         edges(): any;
         toArray(): any;
         overlaps(extent: kendo.dataviz.map.Extent): boolean;
-        static create(a: kendo.dataviz.map.Location, b?: kendo.dataviz.map.Location): kendo.dataviz.map.Extent;
-        static create(a: kendo.dataviz.map.Location, b?: any): kendo.dataviz.map.Extent;
-        static create(a: any, b?: kendo.dataviz.map.Location): kendo.dataviz.map.Extent;
-        static create(a: any, b?: any): kendo.dataviz.map.Extent;
-        nw: kendo.dataviz.map.Location;
-        se: kendo.dataviz.map.Location;
+
     }
 
     interface ExtentOptions {
@@ -13697,17 +15314,24 @@ declare module kendo.dataviz.map {
     }
     interface ExtentEvent {
         sender: Extent;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Layer extends kendo.Class {
-        constructor(map: kendo.dataviz.ui.Map, options?: LayerOptions);
+
+
         options: LayerOptions;
+
+        map: kendo.dataviz.ui.Map;
+
+        constructor(map: kendo.dataviz.ui.Map, options?: LayerOptions);
+
+
         show(): void;
         hide(): void;
-        map: kendo.dataviz.ui.Map;
+
     }
 
     interface LayerOptions {
@@ -13715,14 +15339,27 @@ declare module kendo.dataviz.map {
     }
     interface LayerEvent {
         sender: Layer;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Location extends kendo.Class {
-        constructor(lat: number, lng: number);
+
+
         options: LocationOptions;
+
+        lat: number;
+        lng: number;
+
+        constructor(lat: number, lng: number);
+
+        static create(lat: number, lng?: number): kendo.dataviz.map.Location;
+        static create(lat: any, lng?: number): kendo.dataviz.map.Location;
+        static create(lat: kendo.dataviz.map.Location, lng?: number): kendo.dataviz.map.Location;
+        static fromLngLat(lnglat: any): kendo.dataviz.map.Location;
+        static fromLatLng(lnglat: any): kendo.dataviz.map.Location;
+
         clone(): kendo.dataviz.map.Location;
         destination(destination: kendo.dataviz.map.Location): number;
         distanceTo(distance: number, bearing: number): kendo.dataviz.map.Location;
@@ -13731,13 +15368,7 @@ declare module kendo.dataviz.map {
         toArray(): any;
         toString(): string;
         wrap(): kendo.dataviz.map.Location;
-        static create(lat: number, lng?: number): kendo.dataviz.map.Location;
-        static create(lat: any, lng?: number): kendo.dataviz.map.Location;
-        static create(lat: kendo.dataviz.map.Location, lng?: number): kendo.dataviz.map.Location;
-        static fromLngLat(lnglat: any): kendo.dataviz.map.Location;
-        static fromLatLng(lnglat: any): kendo.dataviz.map.Location;
-        lat: number;
-        lng: number;
+
     }
 
     interface LocationOptions {
@@ -13745,30 +15376,90 @@ declare module kendo.dataviz.map {
     }
     interface LocationEvent {
         sender: Location;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class MarkerLayer extends kendo.dataviz.map.Layer {
+
+
+        options: MarkerLayerOptions;
+
+        map: kendo.dataviz.ui.Map;
+
+        constructor(map: kendo.dataviz.ui.Map, options?: MarkerLayerOptions);
+
+
+        show(): void;
+        hide(): void;
+        setDataSource(): void;
+
+    }
+
+    interface MarkerLayerOptions {
+        name?: string;
+    }
+    interface MarkerLayerEvent {
+        sender: MarkerLayer;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class ShapeLayer extends kendo.dataviz.map.Layer {
+
+
+        options: ShapeLayerOptions;
+
+        map: kendo.dataviz.ui.Map;
+
+        constructor(map: kendo.dataviz.ui.Map, options?: ShapeLayerOptions);
+
+
+        show(): void;
+        hide(): void;
+        setDataSource(): void;
+
+    }
+
+    interface ShapeLayerOptions {
+        name?: string;
+    }
+    interface ShapeLayerEvent {
+        sender: ShapeLayer;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
 }
 declare module kendo.mobile.ui {
     class ActionSheet extends kendo.mobile.ui.Widget {
+
         static fn: ActionSheet;
-        static extend(proto: Object): ActionSheet;
+
+        options: ActionSheetOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): ActionSheet;
+
         constructor(element: Element, options?: ActionSheetOptions);
-        options: ActionSheetOptions;
+
+
         close(): void;
         destroy(): void;
         open(target: JQuery, context: any): void;
+
     }
 
     interface ActionSheetPopup {
-        direction?: any;
-        height?: any;
-        width?: any;
+        direction?: number|string;
+        height?: number|string;
+        width?: number|string;
     }
 
     interface ActionSheetOptions {
@@ -13781,8 +15472,8 @@ declare module kendo.mobile.ui {
     }
     interface ActionSheetEvent {
         sender: ActionSheet;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ActionSheetOpenEvent extends ActionSheetEvent {
@@ -13792,14 +15483,22 @@ declare module kendo.mobile.ui {
 
 
     class BackButton extends kendo.mobile.ui.Widget {
+
         static fn: BackButton;
-        static extend(proto: Object): BackButton;
+
+        options: BackButtonOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): BackButton;
+
         constructor(element: Element, options?: BackButtonOptions);
-        options: BackButtonOptions;
+
+
         destroy(): void;
+
     }
 
     interface BackButtonOptions {
@@ -13808,8 +15507,8 @@ declare module kendo.mobile.ui {
     }
     interface BackButtonEvent {
         sender: BackButton;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface BackButtonClickEvent extends BackButtonEvent {
@@ -13819,17 +15518,25 @@ declare module kendo.mobile.ui {
 
 
     class Button extends kendo.mobile.ui.Widget {
+
         static fn: Button;
-        static extend(proto: Object): Button;
+
+        options: ButtonOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Button;
+
         constructor(element: Element, options?: ButtonOptions);
-        options: ButtonOptions;
+
+
         badge(value: string): string;
         badge(value: boolean): string;
         destroy(): void;
         enable(enable: boolean): void;
+
     }
 
     interface ButtonOptions {
@@ -13842,8 +15549,8 @@ declare module kendo.mobile.ui {
     }
     interface ButtonEvent {
         sender: Button;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ButtonClickEvent extends ButtonEvent {
@@ -13853,13 +15560,20 @@ declare module kendo.mobile.ui {
 
 
     class ButtonGroup extends kendo.mobile.ui.Widget {
+
         static fn: ButtonGroup;
-        static extend(proto: Object): ButtonGroup;
+
+        options: ButtonGroupOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): ButtonGroup;
+
         constructor(element: Element, options?: ButtonGroupOptions);
-        options: ButtonGroupOptions;
+
+
         badge(button: string, value: string): string;
         badge(button: string, value: boolean): string;
         badge(button: number, value: string): string;
@@ -13869,6 +15583,7 @@ declare module kendo.mobile.ui {
         enable(enable: boolean): void;
         select(li: JQuery): void;
         select(li: number): void;
+
     }
 
     interface ButtonGroupOptions {
@@ -13880,8 +15595,8 @@ declare module kendo.mobile.ui {
     }
     interface ButtonGroupEvent {
         sender: ButtonGroup;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ButtonGroupSelectEvent extends ButtonGroupEvent {
@@ -13890,18 +15605,26 @@ declare module kendo.mobile.ui {
 
 
     class Collapsible extends kendo.mobile.ui.Widget {
+
         static fn: Collapsible;
-        static extend(proto: Object): Collapsible;
+
+        options: CollapsibleOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Collapsible;
+
         constructor(element: Element, options?: CollapsibleOptions);
-        options: CollapsibleOptions;
+
+
         collapse(instant: boolean): void;
         destroy(): void;
         expand(instant?: boolean): void;
         resize(): void;
         toggle(instant?: boolean): void;
+
     }
 
     interface CollapsibleOptions {
@@ -13916,20 +15639,28 @@ declare module kendo.mobile.ui {
     }
     interface CollapsibleEvent {
         sender: Collapsible;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class DetailButton extends kendo.mobile.ui.Widget {
+
         static fn: DetailButton;
-        static extend(proto: Object): DetailButton;
+
+        options: DetailButtonOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): DetailButton;
+
         constructor(element: Element, options?: DetailButtonOptions);
-        options: DetailButtonOptions;
+
+
         destroy(): void;
+
     }
 
     interface DetailButtonOptions {
@@ -13938,8 +15669,8 @@ declare module kendo.mobile.ui {
     }
     interface DetailButtonEvent {
         sender: DetailButton;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface DetailButtonClickEvent extends DetailButtonEvent {
@@ -13949,16 +15680,24 @@ declare module kendo.mobile.ui {
 
 
     class Drawer extends kendo.mobile.ui.Widget {
+
         static fn: Drawer;
-        static extend(proto: Object): Drawer;
+
+        options: DrawerOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Drawer;
+
         constructor(element: Element, options?: DrawerOptions);
-        options: DrawerOptions;
+
+
         destroy(): void;
         hide(): void;
         show(): void;
+
     }
 
     interface DrawerOptions {
@@ -13977,8 +15716,8 @@ declare module kendo.mobile.ui {
     }
     interface DrawerEvent {
         sender: Drawer;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface DrawerAfterHideEvent extends DrawerEvent {
@@ -13995,13 +15734,21 @@ declare module kendo.mobile.ui {
 
 
     class Layout extends kendo.mobile.ui.Widget {
+
         static fn: Layout;
-        static extend(proto: Object): Layout;
+
+        options: LayoutOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Layout;
+
         constructor(element: Element, options?: LayoutOptions);
-        options: LayoutOptions;
+
+
+
     }
 
     interface LayoutOptions {
@@ -14014,8 +15761,8 @@ declare module kendo.mobile.ui {
     }
     interface LayoutEvent {
         sender: Layout;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface LayoutHideEvent extends LayoutEvent {
@@ -14034,14 +15781,21 @@ declare module kendo.mobile.ui {
 
 
     class ListView extends kendo.mobile.ui.Widget {
+
         static fn: ListView;
-        static extend(proto: Object): ListView;
+
+        options: ListViewOptions;
+
+        dataSource: kendo.data.DataSource;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): ListView;
+
         constructor(element: Element, options?: ListViewOptions);
-        options: ListViewOptions;
-        dataSource: kendo.data.DataSource;
+
+
         append(dataItems: any): void;
         prepend(dataItems: any): void;
         replace(dataItems: any): void;
@@ -14051,6 +15805,7 @@ declare module kendo.mobile.ui {
         items(): JQuery;
         refresh(): void;
         setDataSource(dataSource: kendo.data.DataSource): void;
+
     }
 
     interface ListViewFilterable {
@@ -14072,16 +15827,16 @@ declare module kendo.mobile.ui {
         name?: string;
         appendOnRefresh?: boolean;
         autoBind?: boolean;
-        dataSource?: any;
+        dataSource?: kendo.data.DataSource|any;
         endlessScroll?: boolean;
         fixedHeaders?: boolean;
-        headerTemplate?: any;
+        headerTemplate?: string|Function;
         loadMore?: boolean;
         messages?: ListViewMessages;
         pullToRefresh?: boolean;
         pullParameters?: Function;
         style?: string;
-        template?: any;
+        template?: string|Function;
         type?: string;
         filterable?: ListViewFilterable;
         virtualViewSize?: number;
@@ -14092,8 +15847,8 @@ declare module kendo.mobile.ui {
     }
     interface ListViewEvent {
         sender: ListView;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ListViewClickEvent extends ListViewEvent {
@@ -14105,15 +15860,23 @@ declare module kendo.mobile.ui {
 
 
     class Loader extends kendo.mobile.ui.Widget {
+
         static fn: Loader;
-        static extend(proto: Object): Loader;
+
+        options: LoaderOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Loader;
+
         constructor(element: Element, options?: LoaderOptions);
-        options: LoaderOptions;
+
+
         hide(): void;
         show(): void;
+
     }
 
     interface LoaderOptions {
@@ -14121,22 +15884,30 @@ declare module kendo.mobile.ui {
     }
     interface LoaderEvent {
         sender: Loader;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class ModalView extends kendo.mobile.ui.Widget {
+
         static fn: ModalView;
-        static extend(proto: Object): ModalView;
+
+        options: ModalViewOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): ModalView;
+
         constructor(element: Element, options?: ModalViewOptions);
-        options: ModalViewOptions;
+
+
         close(): void;
         destroy(): void;
         open(target: JQuery): void;
+
     }
 
     interface ModalViewOptions {
@@ -14151,8 +15922,8 @@ declare module kendo.mobile.ui {
     }
     interface ModalViewEvent {
         sender: ModalView;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ModalViewBeforeOpenEvent extends ModalViewEvent {
@@ -14171,15 +15942,23 @@ declare module kendo.mobile.ui {
 
 
     class NavBar extends kendo.mobile.ui.Widget {
+
         static fn: NavBar;
-        static extend(proto: Object): NavBar;
+
+        options: NavBarOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): NavBar;
+
         constructor(element: Element, options?: NavBarOptions);
-        options: NavBarOptions;
+
+
         destroy(): void;
         title(value: string): void;
+
     }
 
     interface NavBarOptions {
@@ -14187,26 +15966,33 @@ declare module kendo.mobile.ui {
     }
     interface NavBarEvent {
         sender: NavBar;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Pane extends kendo.mobile.ui.Widget {
+
         static fn: Pane;
-        static extend(proto: Object): Pane;
+
+        options: PaneOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Pane;
+
         constructor(element: Element, options?: PaneOptions);
-        options: PaneOptions;
+
+
         destroy(): void;
         hideLoading(): void;
         navigate(url: string, transition: string): void;
         replace(url: string, transition: string): void;
-        Example(): void;
         showLoading(): void;
         view(): kendo.mobile.ui.View;
+
     }
 
     interface PaneOptions {
@@ -14222,8 +16008,8 @@ declare module kendo.mobile.ui {
     }
     interface PaneEvent {
         sender: Pane;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface PaneNavigateEvent extends PaneEvent {
@@ -14236,16 +16022,24 @@ declare module kendo.mobile.ui {
 
 
     class PopOver extends kendo.mobile.ui.Widget {
+
         static fn: PopOver;
-        static extend(proto: Object): PopOver;
+
+        options: PopOverOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): PopOver;
+
         constructor(element: Element, options?: PopOverOptions);
-        options: PopOverOptions;
+
+
         close(): void;
         destroy(): void;
         open(target: JQuery): void;
+
     }
 
     interface PopOverPane {
@@ -14256,8 +16050,8 @@ declare module kendo.mobile.ui {
     }
 
     interface PopOverPopup {
-        height?: any;
-        width?: any;
+        height?: number|string;
+        width?: number|string;
     }
 
     interface PopOverOptions {
@@ -14269,8 +16063,8 @@ declare module kendo.mobile.ui {
     }
     interface PopOverEvent {
         sender: PopOver;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface PopOverCloseEvent extends PopOverEvent {
@@ -14282,14 +16076,21 @@ declare module kendo.mobile.ui {
 
 
     class ScrollView extends kendo.mobile.ui.Widget {
+
         static fn: ScrollView;
-        static extend(proto: Object): ScrollView;
+
+        options: ScrollViewOptions;
+
+        dataSource: kendo.data.DataSource;
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): ScrollView;
+
         constructor(element: Element, options?: ScrollViewOptions);
-        options: ScrollViewOptions;
-        dataSource: kendo.data.DataSource;
+
+
         content(content: string): void;
         content(content: JQuery): void;
         destroy(): void;
@@ -14299,14 +16100,15 @@ declare module kendo.mobile.ui {
         scrollTo(page: number, instant: boolean): void;
         setDataSource(dataSource: kendo.data.DataSource): void;
         value(dataItem: any): any;
+
     }
 
     interface ScrollViewOptions {
         name?: string;
         autoBind?: boolean;
         bounceVelocityThreshold?: number;
-        contentHeight?: any;
-        dataSource?: any;
+        contentHeight?: number|string;
+        dataSource?: kendo.data.DataSource|any;
         duration?: number;
         emptyTemplate?: string;
         enablePager?: boolean;
@@ -14321,8 +16123,8 @@ declare module kendo.mobile.ui {
     }
     interface ScrollViewEvent {
         sender: ScrollView;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ScrollViewChangingEvent extends ScrollViewEvent {
@@ -14343,14 +16145,22 @@ declare module kendo.mobile.ui {
 
 
     class Scroller extends kendo.mobile.ui.Widget {
+
         static fn: Scroller;
-        static extend(proto: Object): Scroller;
+
+        options: ScrollerOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Scroller;
+
         constructor(element: Element, options?: ScrollerOptions);
-        options: ScrollerOptions;
+
+
         animatedScrollTo(x: number, y: number): void;
+        contentResized(): void;
         destroy(): void;
         disable(): void;
         enable(): void;
@@ -14361,6 +16171,7 @@ declare module kendo.mobile.ui {
         scrollTo(x: number, y: number): void;
         scrollWidth(): void;
         zoomOut(): void;
+
     }
 
     interface ScrollerMessages {
@@ -14384,8 +16195,8 @@ declare module kendo.mobile.ui {
     }
     interface ScrollerEvent {
         sender: Scroller;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ScrollerScrollEvent extends ScrollerEvent {
@@ -14395,16 +16206,24 @@ declare module kendo.mobile.ui {
 
 
     class SplitView extends kendo.mobile.ui.Widget {
+
         static fn: SplitView;
-        static extend(proto: Object): SplitView;
+
+        options: SplitViewOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): SplitView;
+
         constructor(element: Element, options?: SplitViewOptions);
-        options: SplitViewOptions;
+
+
         destroy(): void;
         expandPanes(): void;
         collapsePanes(): void;
+
     }
 
     interface SplitViewOptions {
@@ -14415,8 +16234,8 @@ declare module kendo.mobile.ui {
     }
     interface SplitViewEvent {
         sender: SplitView;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface SplitViewInitEvent extends SplitViewEvent {
@@ -14429,19 +16248,27 @@ declare module kendo.mobile.ui {
 
 
     class Switch extends kendo.mobile.ui.Widget {
+
         static fn: Switch;
-        static extend(proto: Object): Switch;
+
+        options: SwitchOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): Switch;
+
         constructor(element: Element, options?: SwitchOptions);
-        options: SwitchOptions;
+
+
         check(): boolean;
         check(check: boolean): void;
         destroy(): void;
         enable(enable: boolean): void;
         refresh(): void;
         toggle(): void;
+
     }
 
     interface SwitchOptions {
@@ -14454,8 +16281,8 @@ declare module kendo.mobile.ui {
     }
     interface SwitchEvent {
         sender: Switch;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface SwitchChangeEvent extends SwitchEvent {
@@ -14464,13 +16291,20 @@ declare module kendo.mobile.ui {
 
 
     class TabStrip extends kendo.mobile.ui.Widget {
+
         static fn: TabStrip;
-        static extend(proto: Object): TabStrip;
+
+        options: TabStripOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): TabStrip;
+
         constructor(element: Element, options?: TabStripOptions);
-        options: TabStripOptions;
+
+
         badge(tab: string, value: string): string;
         badge(tab: string, value: boolean): string;
         badge(tab: number, value: string): string;
@@ -14481,6 +16315,7 @@ declare module kendo.mobile.ui {
         switchTo(url: number): void;
         switchByFullUrl(url: string): void;
         clear(): void;
+
     }
 
     interface TabStripOptions {
@@ -14490,8 +16325,8 @@ declare module kendo.mobile.ui {
     }
     interface TabStripEvent {
         sender: TabStrip;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface TabStripSelectEvent extends TabStripEvent {
@@ -14500,16 +16335,24 @@ declare module kendo.mobile.ui {
 
 
     class View extends kendo.mobile.ui.Widget {
+
         static fn: View;
-        static extend(proto: Object): View;
+
+        options: ViewOptions;
+
 
         element: JQuery;
         wrapper: JQuery;
+
+        static extend(proto: Object): View;
+
         constructor(element: Element, options?: ViewOptions);
-        options: ViewOptions;
+
+
         contentElement(): void;
         destroy(): void;
         enable(enable: boolean): void;
+
     }
 
     interface ViewOptions {
@@ -14532,8 +16375,8 @@ declare module kendo.mobile.ui {
     }
     interface ViewEvent {
         sender: View;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
     interface ViewAfterShowEvent extends ViewEvent {
@@ -14572,14 +16415,22 @@ declare module kendo.mobile.ui {
 }
 declare module kendo.ooxml {
     class Workbook extends Observable {
-        constructor(options?: WorkbookOptions);
+
+
         options: WorkbookOptions;
-        toDataURL(): string;
+
         sheets: WorkbookSheet[];
+
+        constructor(options?: WorkbookOptions);
+
+
+        toDataURL(): string;
+
     }
 
     interface WorkbookSheetColumn {
         autoWidth?: boolean;
+        index?: number;
         width?: number;
     }
 
@@ -14598,26 +16449,35 @@ declare module kendo.ooxml {
         bold?: boolean;
         color?: string;
         colSpan?: number;
+        fontFamily?: string;
         fontName?: string;
         fontSize?: number;
         format?: string;
         hAlign?: string;
+        index?: any;
         italic?: boolean;
         rowSpan?: number;
+        textAlign?: string;
         underline?: boolean;
         wrap?: boolean;
         vAlign?: string;
-        value?: any;
+        verticalAlign?: string;
+        value?: Date|number|string|boolean;
     }
 
     interface WorkbookSheetRow {
         cells?: WorkbookSheetRowCell[];
+        index?: number;
+        height?: number;
     }
 
     interface WorkbookSheet {
         columns?: WorkbookSheetColumn[];
         freezePane?: WorkbookSheetFreezePane;
+        frozenColumns?: number;
+        frozenRows?: number;
         filter?: WorkbookSheetFilter;
+        name?: string;
         rows?: WorkbookSheetRow[];
         title?: string;
     }
@@ -14630,16 +16490,734 @@ declare module kendo.ooxml {
     }
     interface WorkbookEvent {
         sender: Workbook;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
 }
 
+declare module kendo.dataviz.drawing {
+    class Arc extends kendo.drawing.Element {
+
+
+        options: ArcOptions;
+
+
+        constructor(geometry: kendo.geometry.Arc, options?: ArcOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        geometry(): kendo.geometry.Arc;
+        geometry(value: kendo.geometry.Arc): void;
+        fill(color: string, opacity?: number): kendo.drawing.Arc;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Arc;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface ArcOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface ArcEvent {
+        sender: Arc;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Circle extends kendo.drawing.Element {
+
+
+        options: CircleOptions;
+
+
+        constructor(geometry: kendo.geometry.Circle, options?: CircleOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        geometry(): kendo.geometry.Circle;
+        geometry(value: kendo.geometry.Circle): void;
+        fill(color: string, opacity?: number): kendo.drawing.Circle;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Circle;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface CircleOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface CircleEvent {
+        sender: Circle;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Element extends kendo.Class {
+
+
+        options: ElementOptions;
+
+
+        constructor(options?: ElementOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        opacity(): number;
+        opacity(opacity: number): void;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface ElementOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        opacity?: number;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface ElementEvent {
+        sender: Element;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    interface FillOptions  {
+
+
+
+        color: string;
+        opacity: number;
+
+
+
+
+    }
+
+
+
+    class Gradient extends kendo.Class {
+
+
+        options: GradientOptions;
+
+        stops: any;
+
+        constructor(options?: GradientOptions);
+
+
+        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
+        removeStop(stop: kendo.drawing.GradientStop): void;
+
+    }
+
+    interface GradientOptions {
+        name?: string;
+        stops?: any;
+    }
+    interface GradientEvent {
+        sender: Gradient;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class GradientStop extends kendo.Class {
+
+
+        options: GradientStopOptions;
+
+
+        constructor(options?: GradientStopOptions);
+
+
+
+    }
+
+    interface GradientStopOptions {
+        name?: string;
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+    interface GradientStopEvent {
+        sender: GradientStop;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Group extends kendo.drawing.Element {
+
+
+        options: GroupOptions;
+
+        children: any;
+
+        constructor(options?: GroupOptions);
+
+
+        append(element: kendo.drawing.Element): void;
+        clear(): void;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        insert(position: number, element: kendo.drawing.Element): void;
+        opacity(): number;
+        opacity(opacity: number): void;
+        remove(element: kendo.drawing.Element): void;
+        removeAt(index: number): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface GroupOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        opacity?: number;
+        pdf?: kendo.drawing.PDFOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface GroupEvent {
+        sender: Group;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Image extends kendo.drawing.Element {
+
+
+        options: ImageOptions;
+
+
+        constructor(src: string, rect: kendo.geometry.Rect);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        opacity(): number;
+        opacity(opacity: number): void;
+        src(): string;
+        src(value: string): void;
+        rect(): kendo.geometry.Rect;
+        rect(value: kendo.geometry.Rect): void;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface ImageOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        opacity?: number;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface ImageEvent {
+        sender: Image;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Layout extends kendo.drawing.Group {
+
+
+        options: LayoutOptions;
+
+
+        constructor(rect: kendo.geometry.Rect, options?: LayoutOptions);
+
+
+        rect(): kendo.geometry.Rect;
+        rect(rect: kendo.geometry.Rect): void;
+        reflow(): void;
+
+    }
+
+    interface LayoutOptions {
+        name?: string;
+        alignContent?: string;
+        alignItems?: string;
+        justifyContent?: string;
+        lineSpacing?: number;
+        spacing?: number;
+        orientation?: string;
+        wrap?: boolean;
+    }
+    interface LayoutEvent {
+        sender: Layout;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class LinearGradient extends kendo.drawing.Gradient {
+
+
+        options: LinearGradientOptions;
+
+        stops: any;
+
+        constructor(options?: LinearGradientOptions);
+
+
+        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
+        end(): kendo.geometry.Point;
+        end(end: any): void;
+        end(end: kendo.geometry.Point): void;
+        start(): kendo.geometry.Point;
+        start(start: any): void;
+        start(start: kendo.geometry.Point): void;
+        removeStop(stop: kendo.drawing.GradientStop): void;
+
+    }
+
+    interface LinearGradientOptions {
+        name?: string;
+        stops?: any;
+    }
+    interface LinearGradientEvent {
+        sender: LinearGradient;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class MultiPath extends kendo.drawing.Element {
+
+
+        options: MultiPathOptions;
+
+        paths: any;
+
+        constructor(options?: MultiPathOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        close(): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: any, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        fill(color: string, opacity?: number): kendo.drawing.MultiPath;
+        lineTo(x: number, y?: number): kendo.drawing.MultiPath;
+        lineTo(x: any, y?: number): kendo.drawing.MultiPath;
+        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
+        moveTo(x: number, y?: number): kendo.drawing.MultiPath;
+        moveTo(x: any, y?: number): kendo.drawing.MultiPath;
+        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.MultiPath;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface MultiPathOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface MultiPathEvent {
+        sender: MultiPath;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class OptionsStore extends kendo.Class {
+
+
+        options: OptionsStoreOptions;
+
+        observer: any;
+
+        constructor(options?: OptionsStoreOptions);
+
+
+        get(field: string): any;
+        set(field: string, value: any): void;
+
+    }
+
+    interface OptionsStoreOptions {
+        name?: string;
+    }
+    interface OptionsStoreEvent {
+        sender: OptionsStore;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    interface PDFOptions  {
+
+
+
+        creator: string;
+        date: Date;
+        keywords: string;
+        landscape: boolean;
+        margin: any;
+        paperSize: any;
+        subject: string;
+        title: string;
+
+
+
+
+    }
+
+
+
+    class Path extends kendo.drawing.Element {
+
+
+        options: PathOptions;
+
+        segments: any;
+
+        constructor(options?: PathOptions);
+
+        static fromPoints(points: any): kendo.drawing.Path;
+        static fromRect(rect: kendo.geometry.Rect): kendo.drawing.Path;
+        static parse(svgPath: string, options?: any): kendo.drawing.Path;
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        close(): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: any, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        fill(color: string, opacity?: number): kendo.drawing.Path;
+        lineTo(x: number, y?: number): kendo.drawing.Path;
+        lineTo(x: any, y?: number): kendo.drawing.Path;
+        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
+        moveTo(x: number, y?: number): kendo.drawing.Path;
+        moveTo(x: any, y?: number): kendo.drawing.Path;
+        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Path;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface PathOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface PathEvent {
+        sender: Path;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class RadialGradient extends kendo.drawing.Gradient {
+
+
+        options: RadialGradientOptions;
+
+        stops: any;
+
+        constructor(options?: RadialGradientOptions);
+
+
+        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
+        center(): kendo.geometry.Point;
+        center(center: any): void;
+        center(center: kendo.geometry.Point): void;
+        radius(): number;
+        radius(value: number): void;
+        removeStop(stop: kendo.drawing.GradientStop): void;
+
+    }
+
+    interface RadialGradientOptions {
+        name?: string;
+        center?: any|kendo.geometry.Point;
+        radius?: number;
+        stops?: any;
+    }
+    interface RadialGradientEvent {
+        sender: RadialGradient;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Rect extends kendo.drawing.Element {
+
+
+        options: RectOptions;
+
+
+        constructor(geometry: kendo.geometry.Rect, options?: RectOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        geometry(): kendo.geometry.Rect;
+        geometry(value: kendo.geometry.Rect): void;
+        fill(color: string, opacity?: number): kendo.drawing.Rect;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Rect;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface RectOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface RectEvent {
+        sender: Rect;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Segment extends kendo.Class {
+
+
+        options: SegmentOptions;
+
+
+        constructor(anchor: kendo.geometry.Point, controlIn: kendo.geometry.Point, controlOut: kendo.geometry.Point);
+
+
+        anchor(): kendo.geometry.Point;
+        anchor(value: kendo.geometry.Point): void;
+        controlIn(): kendo.geometry.Point;
+        controlIn(value: kendo.geometry.Point): void;
+        controlOut(): kendo.geometry.Point;
+        controlOut(value: kendo.geometry.Point): void;
+
+    }
+
+    interface SegmentOptions {
+        name?: string;
+    }
+    interface SegmentEvent {
+        sender: Segment;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    interface StrokeOptions  {
+
+
+
+        color: string;
+        dashType: string;
+        lineCap: string;
+        lineJoin: string;
+        opacity: number;
+        width: number;
+
+
+
+
+    }
+
+
+
+    class Surface extends kendo.Observable {
+
+
+        options: SurfaceOptions;
+
+
+        constructor(options?: SurfaceOptions);
+
+        static create(element: JQuery, options?: any): kendo.drawing.Surface;
+        static create(element: Element, options?: any): kendo.drawing.Surface;
+
+        clear(): void;
+        draw(element: kendo.drawing.Element): void;
+        eventTarget(e: any): kendo.drawing.Element;
+        resize(force?: boolean): void;
+
+    }
+
+    interface SurfaceOptions {
+        name?: string;
+        type?: string;
+        height?: string;
+        width?: string;
+        click?(e: SurfaceClickEvent): void;
+        mouseenter?(e: SurfaceMouseenterEvent): void;
+        mouseleave?(e: SurfaceMouseleaveEvent): void;
+    }
+    interface SurfaceEvent {
+        sender: Surface;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SurfaceClickEvent extends SurfaceEvent {
+        element?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+    interface SurfaceMouseenterEvent extends SurfaceEvent {
+        element?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+    interface SurfaceMouseleaveEvent extends SurfaceEvent {
+        element?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+
+    class Text extends kendo.drawing.Element {
+
+
+        options: TextOptions;
+
+
+        constructor(content: string, position: kendo.geometry.Point, options?: TextOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        content(): string;
+        content(value: string): void;
+        fill(color: string, opacity?: number): kendo.drawing.Text;
+        opacity(): number;
+        opacity(opacity: number): void;
+        position(): kendo.geometry.Point;
+        position(value: kendo.geometry.Point): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Text;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface TextOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        fill?: kendo.drawing.FillOptions;
+        font?: string;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface TextEvent {
+        sender: Text;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+}
 declare module kendo.dataviz.geometry {
     class Arc extends Observable {
+
+
         options: ArcOptions;
+
+        anticlockwise: boolean;
+        center: kendo.geometry.Point;
+        endAngle: number;
+        radiusX: number;
+        radiusY: number;
+        startAngle: number;
+
+
+
         bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
         getAnticlockwise(): boolean;
         getCenter(): kendo.geometry.Point;
@@ -14654,12 +17232,7 @@ declare module kendo.dataviz.geometry {
         setRadiusX(value: number): kendo.geometry.Arc;
         setRadiusY(value: number): kendo.geometry.Arc;
         setStartAngle(value: number): kendo.geometry.Arc;
-        anticlockwise: boolean;
-        center: kendo.geometry.Point;
-        endAngle: number;
-        radiusX: number;
-        radiusY: number;
-        startAngle: number;
+
     }
 
     interface ArcOptions {
@@ -14667,13 +17240,21 @@ declare module kendo.dataviz.geometry {
     }
     interface ArcEvent {
         sender: Arc;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Circle extends Observable {
+
+
         options: CircleOptions;
+
+        center: kendo.geometry.Point;
+        radius: number;
+
+
+
         bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
         clone(): kendo.geometry.Circle;
         equals(other: kendo.geometry.Circle): boolean;
@@ -14683,8 +17264,7 @@ declare module kendo.dataviz.geometry {
         setCenter(value: kendo.geometry.Point): kendo.geometry.Point;
         setCenter(value: any): kendo.geometry.Point;
         setRadius(value: number): kendo.geometry.Circle;
-        center: kendo.geometry.Point;
-        radius: number;
+
     }
 
     interface CircleOptions {
@@ -14692,29 +17272,36 @@ declare module kendo.dataviz.geometry {
     }
     interface CircleEvent {
         sender: Circle;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Matrix extends Observable {
+
+
         options: MatrixOptions;
-        clone(): kendo.geometry.Matrix;
-        equals(other: kendo.geometry.Matrix): boolean;
-        round(digits: number): kendo.geometry.Matrix;
-        multiplyCopy(matrix: kendo.geometry.Matrix): kendo.geometry.Matrix;
-        toArray(digits: number): any;
-        toString(digits: number, separator: string): string;
-        static rotate(angle: number, x: number, y: number): kendo.geometry.Matrix;
-        static scale(scaleX: number, scaleY: number): kendo.geometry.Matrix;
-        static translate(x: number, y: number): kendo.geometry.Matrix;
-        static unit(): kendo.geometry.Matrix;
+
         a: number;
         b: number;
         c: number;
         d: number;
         e: number;
         f: number;
+
+
+        static rotate(angle: number, x: number, y: number): kendo.geometry.Matrix;
+        static scale(scaleX: number, scaleY: number): kendo.geometry.Matrix;
+        static translate(x: number, y: number): kendo.geometry.Matrix;
+        static unit(): kendo.geometry.Matrix;
+
+        clone(): kendo.geometry.Matrix;
+        equals(other: kendo.geometry.Matrix): boolean;
+        round(digits: number): kendo.geometry.Matrix;
+        multiplyCopy(matrix: kendo.geometry.Matrix): kendo.geometry.Matrix;
+        toArray(digits: number): any;
+        toString(digits: number, separator: string): string;
+
     }
 
     interface MatrixOptions {
@@ -14722,13 +17309,29 @@ declare module kendo.dataviz.geometry {
     }
     interface MatrixEvent {
         sender: Matrix;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Point extends Observable {
+
+
         options: PointOptions;
+
+        x: number;
+        y: number;
+
+        constructor(x: number, y: number);
+
+        static create(x: number, y: number): kendo.geometry.Point;
+        static create(x: any, y: number): kendo.geometry.Point;
+        static create(x: kendo.geometry.Point, y: number): kendo.geometry.Point;
+        static min(): kendo.geometry.Point;
+        static max(): kendo.geometry.Point;
+        static minPoint(): kendo.geometry.Point;
+        static maxPoint(): kendo.geometry.Point;
+
         clone(): kendo.geometry.Point;
         distanceTo(point: kendo.geometry.Point): number;
         equals(other: kendo.geometry.Point): boolean;
@@ -14749,15 +17352,7 @@ declare module kendo.dataviz.geometry {
         translate(dx: number, dy: number): kendo.geometry.Point;
         translateWith(vector: kendo.geometry.Point): kendo.geometry.Point;
         translateWith(vector: any): kendo.geometry.Point;
-        static create(x: number, y: number): kendo.geometry.Point;
-        static create(x: any, y: number): kendo.geometry.Point;
-        static create(x: kendo.geometry.Point, y: number): kendo.geometry.Point;
-        static min(): kendo.geometry.Point;
-        static max(): kendo.geometry.Point;
-        static minPoint(): kendo.geometry.Point;
-        static maxPoint(): kendo.geometry.Point;
-        x: number;
-        y: number;
+
     }
 
     interface PointOptions {
@@ -14765,14 +17360,24 @@ declare module kendo.dataviz.geometry {
     }
     interface PointEvent {
         sender: Point;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Rect extends Observable {
-        constructor(origin: kendo.geometry.Point, size: kendo.geometry.Size);
+
+
         options: RectOptions;
+
+        origin: kendo.geometry.Point;
+        size: kendo.geometry.Size;
+
+        constructor(origin: kendo.geometry.Point, size: kendo.geometry.Size);
+
+        static fromPoints(pointA: kendo.geometry.Point, pointB: kendo.geometry.Point): kendo.geometry.Rect;
+        static union(rectA: kendo.geometry.Rect, rectB: kendo.geometry.Rect): kendo.geometry.Rect;
+
         bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
         bottomLeft(): kendo.geometry.Point;
         bottomRight(): kendo.geometry.Point;
@@ -14789,10 +17394,7 @@ declare module kendo.dataviz.geometry {
         topLeft(): kendo.geometry.Point;
         topRight(): kendo.geometry.Point;
         width(): number;
-        static fromPoints(pointA: kendo.geometry.Point, pointB: kendo.geometry.Point): kendo.geometry.Rect;
-        static union(rectA: kendo.geometry.Rect, rectB: kendo.geometry.Rect): kendo.geometry.Rect;
-        origin: kendo.geometry.Point;
-        size: kendo.geometry.Size;
+
     }
 
     interface RectOptions {
@@ -14800,24 +17402,31 @@ declare module kendo.dataviz.geometry {
     }
     interface RectEvent {
         sender: Rect;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Size extends Observable {
+
+
         options: SizeOptions;
+
+        width: number;
+        height: number;
+
+
+        static create(width: number, height: number): kendo.geometry.Size;
+        static create(width: any, height: number): kendo.geometry.Size;
+        static create(width: kendo.geometry.Size, height: number): kendo.geometry.Size;
+
         clone(): kendo.geometry.Size;
         equals(other: kendo.geometry.Size): boolean;
         getWidth(): number;
         getHeight(): number;
         setWidth(value: number): kendo.geometry.Size;
         setHeight(value: number): kendo.geometry.Size;
-        static create(width: number, height: number): kendo.geometry.Size;
-        static create(width: any, height: number): kendo.geometry.Size;
-        static create(width: kendo.geometry.Size, height: number): kendo.geometry.Size;
-        width: number;
-        height: number;
+
     }
 
     interface SizeOptions {
@@ -14825,13 +17434,19 @@ declare module kendo.dataviz.geometry {
     }
     interface SizeEvent {
         sender: Size;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
+        isDefaultPrevented(): boolean;
     }
 
 
     class Transformation extends Observable {
+
+
         options: TransformationOptions;
+
+
+
+
         clone(): kendo.geometry.Transformation;
         equals(other: kendo.geometry.Transformation): boolean;
         matrix(): kendo.geometry.Matrix;
@@ -14840,6 +17455,7 @@ declare module kendo.dataviz.geometry {
         rotate(angle: number, center: kendo.geometry.Point): kendo.geometry.Transformation;
         scale(scaleX: number, scaleY: number): kendo.geometry.Transformation;
         translate(x: number, y: number): kendo.geometry.Transformation;
+
     }
 
     interface TransformationOptions {
@@ -14847,530 +17463,8 @@ declare module kendo.dataviz.geometry {
     }
     interface TransformationEvent {
         sender: Transformation;
-        isDefaultPrevented(): boolean;
         preventDefault: Function;
-    }
-
-
-}
-declare module kendo.dataviz.drawing {
-    class Arc extends kendo.drawing.Element {
-        constructor(geometry: kendo.geometry.Arc, options?: ArcOptions);
-        options: ArcOptions;
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        geometry(): kendo.geometry.Arc;
-        geometry(value: kendo.geometry.Arc): void;
-        fill(color: string, opacity?: number): kendo.drawing.Arc;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Arc;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-    }
-
-    interface ArcOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface ArcEvent {
-        sender: Arc;
         isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class Circle extends kendo.drawing.Element {
-        constructor(geometry: kendo.geometry.Circle, options?: CircleOptions);
-        options: CircleOptions;
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        geometry(): kendo.geometry.Circle;
-        geometry(value: kendo.geometry.Circle): void;
-        fill(color: string, opacity?: number): kendo.drawing.Circle;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Circle;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-    }
-
-    interface CircleOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface CircleEvent {
-        sender: Circle;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class Element extends kendo.Class {
-        constructor(options?: ElementOptions);
-        options: ElementOptions;
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        opacity(): number;
-        opacity(opacity: number): void;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-    }
-
-    interface ElementOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        opacity?: number;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface ElementEvent {
-        sender: Element;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    interface FillOptions  {
-        color: string;
-        opacity: number;
-    }
-
-
-
-    class Gradient extends kendo.Class {
-        constructor(options?: GradientOptions);
-        options: GradientOptions;
-        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
-        removeStop(stop: kendo.drawing.GradientStop): void;
-        stops: any;
-    }
-
-    interface GradientOptions {
-        name?: string;
-        stops?: any;
-    }
-    interface GradientEvent {
-        sender: Gradient;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class GradientStop extends kendo.Class {
-        constructor(options?: GradientStopOptions);
-        options: GradientStopOptions;
-    }
-
-    interface GradientStopOptions {
-        name?: string;
-        offset?: number;
-        color?: string;
-        opacity?: number;
-    }
-    interface GradientStopEvent {
-        sender: GradientStop;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class Group extends kendo.drawing.Element {
-        constructor(options?: GroupOptions);
-        options: GroupOptions;
-        append(element: kendo.drawing.Element): void;
-        clear(): void;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        opacity(): number;
-        opacity(opacity: number): void;
-        remove(element: kendo.drawing.Element): void;
-        removeAt(index: number): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-        children: any;
-    }
-
-    interface GroupOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        opacity?: number;
-        pdf?: kendo.drawing.PDFOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface GroupEvent {
-        sender: Group;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class Image extends kendo.drawing.Element {
-        constructor(src: string, rect: kendo.geometry.Rect);
-        options: ImageOptions;
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        opacity(): number;
-        opacity(opacity: number): void;
-        src(): string;
-        src(value: string): void;
-        rect(): kendo.geometry.Rect;
-        rect(value: kendo.geometry.Rect): void;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-    }
-
-    interface ImageOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        opacity?: number;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface ImageEvent {
-        sender: Image;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class Layout extends kendo.drawing.Group {
-        constructor(rect: kendo.geometry.Rect, options?: LayoutOptions);
-        options: LayoutOptions;
-        rect(): kendo.geometry.Rect;
-        rect(rect: kendo.geometry.Rect): void;
-        reflow(): void;
-    }
-
-    interface LayoutOptions {
-        name?: string;
-        alignContent?: string;
-        alignItems?: string;
-        justifyContent?: string;
-        lineSpacing?: number;
-        spacing?: number;
-        orientation?: string;
-        wrap?: boolean;
-    }
-    interface LayoutEvent {
-        sender: Layout;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class LinearGradient extends kendo.drawing.Gradient {
-        constructor(options?: LinearGradientOptions);
-        options: LinearGradientOptions;
-        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
-        end(): kendo.geometry.Point;
-        end(end: any): void;
-        end(end: kendo.geometry.Point): void;
-        start(): kendo.geometry.Point;
-        start(start: any): void;
-        start(start: kendo.geometry.Point): void;
-        removeStop(stop: kendo.drawing.GradientStop): void;
-        stops: any;
-    }
-
-    interface LinearGradientOptions {
-        name?: string;
-        stops?: any;
-    }
-    interface LinearGradientEvent {
-        sender: LinearGradient;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class MultiPath extends kendo.drawing.Element {
-        constructor(options?: MultiPathOptions);
-        options: MultiPathOptions;
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        close(): kendo.drawing.MultiPath;
-        curveTo(controlOut: any, controlIn: any): kendo.drawing.MultiPath;
-        curveTo(controlOut: any, controlIn: kendo.geometry.Point): kendo.drawing.MultiPath;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: any): kendo.drawing.MultiPath;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point): kendo.drawing.MultiPath;
-        fill(color: string, opacity?: number): kendo.drawing.MultiPath;
-        lineTo(x: number, y?: number): kendo.drawing.MultiPath;
-        lineTo(x: any, y?: number): kendo.drawing.MultiPath;
-        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
-        moveTo(x: number, y?: number): kendo.drawing.MultiPath;
-        moveTo(x: any, y?: number): kendo.drawing.MultiPath;
-        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.MultiPath;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-        paths: any;
-    }
-
-    interface MultiPathOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface MultiPathEvent {
-        sender: MultiPath;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class OptionsStore extends kendo.Class {
-        constructor(options?: OptionsStoreOptions);
-        options: OptionsStoreOptions;
-        get(field: string): any;
-        set(field: string, value: any): void;
-        observer: any;
-    }
-
-    interface OptionsStoreOptions {
-        name?: string;
-    }
-    interface OptionsStoreEvent {
-        sender: OptionsStore;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    interface PDFOptions  {
-        creator: string;
-        date: Date;
-        keywords: string;
-        landscape: boolean;
-        margin: any;
-        paperSize: any;
-        subject: string;
-        title: string;
-    }
-
-
-
-    class Path extends kendo.drawing.Element {
-        constructor(options?: PathOptions);
-        options: PathOptions;
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        close(): kendo.drawing.Path;
-        curveTo(controlOut: any, controlIn: any): kendo.drawing.Path;
-        curveTo(controlOut: any, controlIn: kendo.geometry.Point): kendo.drawing.Path;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: any): kendo.drawing.Path;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point): kendo.drawing.Path;
-        fill(color: string, opacity?: number): kendo.drawing.Path;
-        lineTo(x: number, y?: number): kendo.drawing.Path;
-        lineTo(x: any, y?: number): kendo.drawing.Path;
-        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
-        moveTo(x: number, y?: number): kendo.drawing.Path;
-        moveTo(x: any, y?: number): kendo.drawing.Path;
-        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Path;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-        static fromPoints(points: any): kendo.drawing.Path;
-        static fromRect(rect: kendo.geometry.Rect): kendo.drawing.Path;
-        static parse(svgPath: string, options?: any): kendo.drawing.Path;
-        segments: any;
-    }
-
-    interface PathOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface PathEvent {
-        sender: Path;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class RadialGradient extends kendo.drawing.Gradient {
-        constructor(options?: RadialGradientOptions);
-        options: RadialGradientOptions;
-        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
-        center(): kendo.geometry.Point;
-        center(center: any): void;
-        center(center: kendo.geometry.Point): void;
-        radius(): number;
-        radius(value: number): void;
-        removeStop(stop: kendo.drawing.GradientStop): void;
-        stops: any;
-    }
-
-    interface RadialGradientOptions {
-        name?: string;
-        center?: any;
-        radius?: number;
-        stops?: any;
-    }
-    interface RadialGradientEvent {
-        sender: RadialGradient;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    class Segment extends kendo.Class {
-        constructor(anchor: kendo.geometry.Point, controlIn: kendo.geometry.Point, controlOut: kendo.geometry.Point);
-        options: SegmentOptions;
-        anchor(): kendo.geometry.Point;
-        anchor(value: kendo.geometry.Point): void;
-        controlIn(): kendo.geometry.Point;
-        controlIn(value: kendo.geometry.Point): void;
-        controlOut(): kendo.geometry.Point;
-        controlOut(value: kendo.geometry.Point): void;
-    }
-
-    interface SegmentOptions {
-        name?: string;
-    }
-    interface SegmentEvent {
-        sender: Segment;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-
-    interface StrokeOptions  {
-        color: string;
-        dashType: string;
-        lineCap: string;
-        lineJoin: string;
-        opacity: number;
-        width: number;
-    }
-
-
-
-    class Surface extends kendo.Observable {
-        constructor(options?: SurfaceOptions);
-        options: SurfaceOptions;
-        clear(): void;
-        draw(element: kendo.drawing.Element): void;
-        eventTarget(e: any): kendo.drawing.Element;
-        resize(force?: boolean): void;
-        static create(element: JQuery, options?: any): kendo.drawing.Surface;
-        static create(element: Element, options?: any): kendo.drawing.Surface;
-    }
-
-    interface SurfaceOptions {
-        name?: string;
-        type?: string;
-        height?: string;
-        width?: string;
-        click?(e: SurfaceClickEvent): void;
-        mouseenter?(e: SurfaceMouseenterEvent): void;
-        mouseleave?(e: SurfaceMouseleaveEvent): void;
-    }
-    interface SurfaceEvent {
-        sender: Surface;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
-    }
-
-    interface SurfaceClickEvent extends SurfaceEvent {
-        element?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-    interface SurfaceMouseenterEvent extends SurfaceEvent {
-        element?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-    interface SurfaceMouseleaveEvent extends SurfaceEvent {
-        element?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-
-    class Text extends kendo.drawing.Element {
-        constructor(content: string, position: kendo.geometry.Point, options?: TextOptions);
-        options: TextOptions;
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        content(): string;
-        content(value: string): void;
-        fill(color: string, opacity?: number): kendo.drawing.Text;
-        opacity(): number;
-        opacity(opacity: number): void;
-        position(): kendo.geometry.Point;
-        position(value: kendo.geometry.Point): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Text;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-    }
-
-    interface TextOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        fill?: kendo.drawing.FillOptions;
-        font?: string;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface TextEvent {
-        sender: Text;
-        isDefaultPrevented(): boolean;
-        preventDefault: Function;
     }
 
 
@@ -15404,286 +17498,294 @@ interface JQuery {
 
     kendoAutoComplete(): JQuery;
     kendoAutoComplete(options: kendo.ui.AutoCompleteOptions): JQuery;
-    data(key: "kendoAutoComplete") : kendo.ui.AutoComplete;
+    data(key: "kendoAutoComplete"): kendo.ui.AutoComplete;
 
     kendoBarcode(): JQuery;
     kendoBarcode(options: kendo.dataviz.ui.BarcodeOptions): JQuery;
-    data(key: "kendoBarcode") : kendo.dataviz.ui.Barcode;
+    data(key: "kendoBarcode"): kendo.dataviz.ui.Barcode;
 
     kendoButton(): JQuery;
     kendoButton(options: kendo.ui.ButtonOptions): JQuery;
-    data(key: "kendoButton") : kendo.ui.Button;
+    data(key: "kendoButton"): kendo.ui.Button;
 
     kendoCalendar(): JQuery;
     kendoCalendar(options: kendo.ui.CalendarOptions): JQuery;
-    data(key: "kendoCalendar") : kendo.ui.Calendar;
+    data(key: "kendoCalendar"): kendo.ui.Calendar;
 
     kendoChart(): JQuery;
     kendoChart(options: kendo.dataviz.ui.ChartOptions): JQuery;
-    data(key: "kendoChart") : kendo.dataviz.ui.Chart;
+    data(key: "kendoChart"): kendo.dataviz.ui.Chart;
 
     kendoColorPalette(): JQuery;
     kendoColorPalette(options: kendo.ui.ColorPaletteOptions): JQuery;
-    data(key: "kendoColorPalette") : kendo.ui.ColorPalette;
+    data(key: "kendoColorPalette"): kendo.ui.ColorPalette;
 
     kendoColorPicker(): JQuery;
     kendoColorPicker(options: kendo.ui.ColorPickerOptions): JQuery;
-    data(key: "kendoColorPicker") : kendo.ui.ColorPicker;
+    data(key: "kendoColorPicker"): kendo.ui.ColorPicker;
 
     kendoComboBox(): JQuery;
     kendoComboBox(options: kendo.ui.ComboBoxOptions): JQuery;
-    data(key: "kendoComboBox") : kendo.ui.ComboBox;
+    data(key: "kendoComboBox"): kendo.ui.ComboBox;
 
     kendoContextMenu(): JQuery;
     kendoContextMenu(options: kendo.ui.ContextMenuOptions): JQuery;
-    data(key: "kendoContextMenu") : kendo.ui.ContextMenu;
+    data(key: "kendoContextMenu"): kendo.ui.ContextMenu;
 
     kendoDatePicker(): JQuery;
     kendoDatePicker(options: kendo.ui.DatePickerOptions): JQuery;
-    data(key: "kendoDatePicker") : kendo.ui.DatePicker;
+    data(key: "kendoDatePicker"): kendo.ui.DatePicker;
 
     kendoDateTimePicker(): JQuery;
     kendoDateTimePicker(options: kendo.ui.DateTimePickerOptions): JQuery;
-    data(key: "kendoDateTimePicker") : kendo.ui.DateTimePicker;
+    data(key: "kendoDateTimePicker"): kendo.ui.DateTimePicker;
 
     kendoDiagram(): JQuery;
     kendoDiagram(options: kendo.dataviz.ui.DiagramOptions): JQuery;
-    data(key: "kendoDiagram") : kendo.dataviz.ui.Diagram;
+    data(key: "kendoDiagram"): kendo.dataviz.ui.Diagram;
 
     kendoDropDownList(): JQuery;
     kendoDropDownList(options: kendo.ui.DropDownListOptions): JQuery;
-    data(key: "kendoDropDownList") : kendo.ui.DropDownList;
+    data(key: "kendoDropDownList"): kendo.ui.DropDownList;
 
     kendoEditor(): JQuery;
     kendoEditor(options: kendo.ui.EditorOptions): JQuery;
-    data(key: "kendoEditor") : kendo.ui.Editor;
+    data(key: "kendoEditor"): kendo.ui.Editor;
 
     kendoFlatColorPicker(): JQuery;
     kendoFlatColorPicker(options: kendo.ui.FlatColorPickerOptions): JQuery;
-    data(key: "kendoFlatColorPicker") : kendo.ui.FlatColorPicker;
+    data(key: "kendoFlatColorPicker"): kendo.ui.FlatColorPicker;
 
     kendoGantt(): JQuery;
     kendoGantt(options: kendo.ui.GanttOptions): JQuery;
-    data(key: "kendoGantt") : kendo.ui.Gantt;
+    data(key: "kendoGantt"): kendo.ui.Gantt;
 
     kendoGrid(): JQuery;
     kendoGrid(options: kendo.ui.GridOptions): JQuery;
-    data(key: "kendoGrid") : kendo.ui.Grid;
+    data(key: "kendoGrid"): kendo.ui.Grid;
 
     kendoLinearGauge(): JQuery;
     kendoLinearGauge(options: kendo.dataviz.ui.LinearGaugeOptions): JQuery;
-    data(key: "kendoLinearGauge") : kendo.dataviz.ui.LinearGauge;
+    data(key: "kendoLinearGauge"): kendo.dataviz.ui.LinearGauge;
 
     kendoListView(): JQuery;
     kendoListView(options: kendo.ui.ListViewOptions): JQuery;
-    data(key: "kendoListView") : kendo.ui.ListView;
+    data(key: "kendoListView"): kendo.ui.ListView;
 
     kendoMap(): JQuery;
     kendoMap(options: kendo.dataviz.ui.MapOptions): JQuery;
-    data(key: "kendoMap") : kendo.dataviz.ui.Map;
+    data(key: "kendoMap"): kendo.dataviz.ui.Map;
 
     kendoMaskedTextBox(): JQuery;
     kendoMaskedTextBox(options: kendo.ui.MaskedTextBoxOptions): JQuery;
-    data(key: "kendoMaskedTextBox") : kendo.ui.MaskedTextBox;
+    data(key: "kendoMaskedTextBox"): kendo.ui.MaskedTextBox;
 
     kendoMenu(): JQuery;
     kendoMenu(options: kendo.ui.MenuOptions): JQuery;
-    data(key: "kendoMenu") : kendo.ui.Menu;
+    data(key: "kendoMenu"): kendo.ui.Menu;
 
     kendoMobileActionSheet(): JQuery;
     kendoMobileActionSheet(options: kendo.mobile.ui.ActionSheetOptions): JQuery;
-    data(key: "kendoMobileActionSheet") : kendo.mobile.ui.ActionSheet;
+    data(key: "kendoMobileActionSheet"): kendo.mobile.ui.ActionSheet;
 
     kendoMobileBackButton(): JQuery;
     kendoMobileBackButton(options: kendo.mobile.ui.BackButtonOptions): JQuery;
-    data(key: "kendoMobileBackButton") : kendo.mobile.ui.BackButton;
+    data(key: "kendoMobileBackButton"): kendo.mobile.ui.BackButton;
 
     kendoMobileButton(): JQuery;
     kendoMobileButton(options: kendo.mobile.ui.ButtonOptions): JQuery;
-    data(key: "kendoMobileButton") : kendo.mobile.ui.Button;
+    data(key: "kendoMobileButton"): kendo.mobile.ui.Button;
 
     kendoMobileButtonGroup(): JQuery;
     kendoMobileButtonGroup(options: kendo.mobile.ui.ButtonGroupOptions): JQuery;
-    data(key: "kendoMobileButtonGroup") : kendo.mobile.ui.ButtonGroup;
+    data(key: "kendoMobileButtonGroup"): kendo.mobile.ui.ButtonGroup;
 
     kendoMobileCollapsible(): JQuery;
     kendoMobileCollapsible(options: kendo.mobile.ui.CollapsibleOptions): JQuery;
-    data(key: "kendoMobileCollapsible") : kendo.mobile.ui.Collapsible;
+    data(key: "kendoMobileCollapsible"): kendo.mobile.ui.Collapsible;
 
     kendoMobileDetailButton(): JQuery;
     kendoMobileDetailButton(options: kendo.mobile.ui.DetailButtonOptions): JQuery;
-    data(key: "kendoMobileDetailButton") : kendo.mobile.ui.DetailButton;
+    data(key: "kendoMobileDetailButton"): kendo.mobile.ui.DetailButton;
 
     kendoMobileDrawer(): JQuery;
     kendoMobileDrawer(options: kendo.mobile.ui.DrawerOptions): JQuery;
-    data(key: "kendoMobileDrawer") : kendo.mobile.ui.Drawer;
+    data(key: "kendoMobileDrawer"): kendo.mobile.ui.Drawer;
 
     kendoMobileLayout(): JQuery;
     kendoMobileLayout(options: kendo.mobile.ui.LayoutOptions): JQuery;
-    data(key: "kendoMobileLayout") : kendo.mobile.ui.Layout;
+    data(key: "kendoMobileLayout"): kendo.mobile.ui.Layout;
 
     kendoMobileListView(): JQuery;
     kendoMobileListView(options: kendo.mobile.ui.ListViewOptions): JQuery;
-    data(key: "kendoMobileListView") : kendo.mobile.ui.ListView;
+    data(key: "kendoMobileListView"): kendo.mobile.ui.ListView;
 
     kendoMobileLoader(): JQuery;
     kendoMobileLoader(options: kendo.mobile.ui.LoaderOptions): JQuery;
-    data(key: "kendoMobileLoader") : kendo.mobile.ui.Loader;
+    data(key: "kendoMobileLoader"): kendo.mobile.ui.Loader;
 
     kendoMobileModalView(): JQuery;
     kendoMobileModalView(options: kendo.mobile.ui.ModalViewOptions): JQuery;
-    data(key: "kendoMobileModalView") : kendo.mobile.ui.ModalView;
+    data(key: "kendoMobileModalView"): kendo.mobile.ui.ModalView;
 
     kendoMobileNavBar(): JQuery;
     kendoMobileNavBar(options: kendo.mobile.ui.NavBarOptions): JQuery;
-    data(key: "kendoMobileNavBar") : kendo.mobile.ui.NavBar;
+    data(key: "kendoMobileNavBar"): kendo.mobile.ui.NavBar;
 
     kendoMobilePane(): JQuery;
     kendoMobilePane(options: kendo.mobile.ui.PaneOptions): JQuery;
-    data(key: "kendoMobilePane") : kendo.mobile.ui.Pane;
+    data(key: "kendoMobilePane"): kendo.mobile.ui.Pane;
 
     kendoMobilePopOver(): JQuery;
     kendoMobilePopOver(options: kendo.mobile.ui.PopOverOptions): JQuery;
-    data(key: "kendoMobilePopOver") : kendo.mobile.ui.PopOver;
+    data(key: "kendoMobilePopOver"): kendo.mobile.ui.PopOver;
 
     kendoMobileScrollView(): JQuery;
     kendoMobileScrollView(options: kendo.mobile.ui.ScrollViewOptions): JQuery;
-    data(key: "kendoMobileScrollView") : kendo.mobile.ui.ScrollView;
+    data(key: "kendoMobileScrollView"): kendo.mobile.ui.ScrollView;
 
     kendoMobileScroller(): JQuery;
     kendoMobileScroller(options: kendo.mobile.ui.ScrollerOptions): JQuery;
-    data(key: "kendoMobileScroller") : kendo.mobile.ui.Scroller;
+    data(key: "kendoMobileScroller"): kendo.mobile.ui.Scroller;
 
     kendoMobileSplitView(): JQuery;
     kendoMobileSplitView(options: kendo.mobile.ui.SplitViewOptions): JQuery;
-    data(key: "kendoMobileSplitView") : kendo.mobile.ui.SplitView;
+    data(key: "kendoMobileSplitView"): kendo.mobile.ui.SplitView;
 
     kendoMobileSwitch(): JQuery;
     kendoMobileSwitch(options: kendo.mobile.ui.SwitchOptions): JQuery;
-    data(key: "kendoMobileSwitch") : kendo.mobile.ui.Switch;
+    data(key: "kendoMobileSwitch"): kendo.mobile.ui.Switch;
 
     kendoMobileTabStrip(): JQuery;
     kendoMobileTabStrip(options: kendo.mobile.ui.TabStripOptions): JQuery;
-    data(key: "kendoMobileTabStrip") : kendo.mobile.ui.TabStrip;
+    data(key: "kendoMobileTabStrip"): kendo.mobile.ui.TabStrip;
 
     kendoMobileView(): JQuery;
     kendoMobileView(options: kendo.mobile.ui.ViewOptions): JQuery;
-    data(key: "kendoMobileView") : kendo.mobile.ui.View;
+    data(key: "kendoMobileView"): kendo.mobile.ui.View;
 
     kendoMultiSelect(): JQuery;
     kendoMultiSelect(options: kendo.ui.MultiSelectOptions): JQuery;
-    data(key: "kendoMultiSelect") : kendo.ui.MultiSelect;
+    data(key: "kendoMultiSelect"): kendo.ui.MultiSelect;
 
     kendoNotification(): JQuery;
     kendoNotification(options: kendo.ui.NotificationOptions): JQuery;
-    data(key: "kendoNotification") : kendo.ui.Notification;
+    data(key: "kendoNotification"): kendo.ui.Notification;
 
     kendoNumericTextBox(): JQuery;
     kendoNumericTextBox(options: kendo.ui.NumericTextBoxOptions): JQuery;
-    data(key: "kendoNumericTextBox") : kendo.ui.NumericTextBox;
+    data(key: "kendoNumericTextBox"): kendo.ui.NumericTextBox;
 
     kendoPager(): JQuery;
     kendoPager(options: kendo.ui.PagerOptions): JQuery;
-    data(key: "kendoPager") : kendo.ui.Pager;
+    data(key: "kendoPager"): kendo.ui.Pager;
 
     kendoPanelBar(): JQuery;
     kendoPanelBar(options: kendo.ui.PanelBarOptions): JQuery;
-    data(key: "kendoPanelBar") : kendo.ui.PanelBar;
+    data(key: "kendoPanelBar"): kendo.ui.PanelBar;
 
     kendoPivotConfigurator(): JQuery;
     kendoPivotConfigurator(options: kendo.ui.PivotConfiguratorOptions): JQuery;
-    data(key: "kendoPivotConfigurator") : kendo.ui.PivotConfigurator;
+    data(key: "kendoPivotConfigurator"): kendo.ui.PivotConfigurator;
 
     kendoPivotGrid(): JQuery;
     kendoPivotGrid(options: kendo.ui.PivotGridOptions): JQuery;
-    data(key: "kendoPivotGrid") : kendo.ui.PivotGrid;
+    data(key: "kendoPivotGrid"): kendo.ui.PivotGrid;
+
+    kendoPopup(): JQuery;
+    kendoPopup(options: kendo.ui.PopupOptions): JQuery;
+    data(key: "kendoPopup"): kendo.ui.Popup;
 
     kendoProgressBar(): JQuery;
     kendoProgressBar(options: kendo.ui.ProgressBarOptions): JQuery;
-    data(key: "kendoProgressBar") : kendo.ui.ProgressBar;
+    data(key: "kendoProgressBar"): kendo.ui.ProgressBar;
 
     kendoQRCode(): JQuery;
     kendoQRCode(options: kendo.dataviz.ui.QRCodeOptions): JQuery;
-    data(key: "kendoQRCode") : kendo.dataviz.ui.QRCode;
+    data(key: "kendoQRCode"): kendo.dataviz.ui.QRCode;
 
     kendoRadialGauge(): JQuery;
     kendoRadialGauge(options: kendo.dataviz.ui.RadialGaugeOptions): JQuery;
-    data(key: "kendoRadialGauge") : kendo.dataviz.ui.RadialGauge;
+    data(key: "kendoRadialGauge"): kendo.dataviz.ui.RadialGauge;
 
     kendoRangeSlider(): JQuery;
     kendoRangeSlider(options: kendo.ui.RangeSliderOptions): JQuery;
-    data(key: "kendoRangeSlider") : kendo.ui.RangeSlider;
+    data(key: "kendoRangeSlider"): kendo.ui.RangeSlider;
 
     kendoResponsivePanel(): JQuery;
     kendoResponsivePanel(options: kendo.ui.ResponsivePanelOptions): JQuery;
-    data(key: "kendoResponsivePanel") : kendo.ui.ResponsivePanel;
+    data(key: "kendoResponsivePanel"): kendo.ui.ResponsivePanel;
 
     kendoScheduler(): JQuery;
     kendoScheduler(options: kendo.ui.SchedulerOptions): JQuery;
-    data(key: "kendoScheduler") : kendo.ui.Scheduler;
+    data(key: "kendoScheduler"): kendo.ui.Scheduler;
 
     kendoSlider(): JQuery;
     kendoSlider(options: kendo.ui.SliderOptions): JQuery;
-    data(key: "kendoSlider") : kendo.ui.Slider;
+    data(key: "kendoSlider"): kendo.ui.Slider;
 
     kendoSortable(): JQuery;
     kendoSortable(options: kendo.ui.SortableOptions): JQuery;
-    data(key: "kendoSortable") : kendo.ui.Sortable;
+    data(key: "kendoSortable"): kendo.ui.Sortable;
 
     kendoSparkline(): JQuery;
     kendoSparkline(options: kendo.dataviz.ui.SparklineOptions): JQuery;
-    data(key: "kendoSparkline") : kendo.dataviz.ui.Sparkline;
+    data(key: "kendoSparkline"): kendo.dataviz.ui.Sparkline;
 
     kendoSplitter(): JQuery;
     kendoSplitter(options: kendo.ui.SplitterOptions): JQuery;
-    data(key: "kendoSplitter") : kendo.ui.Splitter;
+    data(key: "kendoSplitter"): kendo.ui.Splitter;
+
+    kendoSpreadsheet(): JQuery;
+    kendoSpreadsheet(options: kendo.ui.SpreadsheetOptions): JQuery;
+    data(key: "kendoSpreadsheet"): kendo.ui.Spreadsheet;
 
     kendoStockChart(): JQuery;
     kendoStockChart(options: kendo.dataviz.ui.StockChartOptions): JQuery;
-    data(key: "kendoStockChart") : kendo.dataviz.ui.StockChart;
+    data(key: "kendoStockChart"): kendo.dataviz.ui.StockChart;
 
     kendoTabStrip(): JQuery;
     kendoTabStrip(options: kendo.ui.TabStripOptions): JQuery;
-    data(key: "kendoTabStrip") : kendo.ui.TabStrip;
+    data(key: "kendoTabStrip"): kendo.ui.TabStrip;
 
     kendoTimePicker(): JQuery;
     kendoTimePicker(options: kendo.ui.TimePickerOptions): JQuery;
-    data(key: "kendoTimePicker") : kendo.ui.TimePicker;
+    data(key: "kendoTimePicker"): kendo.ui.TimePicker;
 
     kendoToolBar(): JQuery;
     kendoToolBar(options: kendo.ui.ToolBarOptions): JQuery;
-    data(key: "kendoToolBar") : kendo.ui.ToolBar;
+    data(key: "kendoToolBar"): kendo.ui.ToolBar;
 
     kendoTooltip(): JQuery;
     kendoTooltip(options: kendo.ui.TooltipOptions): JQuery;
-    data(key: "kendoTooltip") : kendo.ui.Tooltip;
+    data(key: "kendoTooltip"): kendo.ui.Tooltip;
 
     kendoTouch(): JQuery;
     kendoTouch(options: kendo.ui.TouchOptions): JQuery;
-    data(key: "kendoTouch") : kendo.ui.Touch;
+    data(key: "kendoTouch"): kendo.ui.Touch;
 
     kendoTreeList(): JQuery;
     kendoTreeList(options: kendo.ui.TreeListOptions): JQuery;
-    data(key: "kendoTreeList") : kendo.ui.TreeList;
+    data(key: "kendoTreeList"): kendo.ui.TreeList;
 
     kendoTreeMap(): JQuery;
     kendoTreeMap(options: kendo.dataviz.ui.TreeMapOptions): JQuery;
-    data(key: "kendoTreeMap") : kendo.dataviz.ui.TreeMap;
+    data(key: "kendoTreeMap"): kendo.dataviz.ui.TreeMap;
 
     kendoTreeView(): JQuery;
     kendoTreeView(options: kendo.ui.TreeViewOptions): JQuery;
-    data(key: "kendoTreeView") : kendo.ui.TreeView;
+    data(key: "kendoTreeView"): kendo.ui.TreeView;
 
     kendoUpload(): JQuery;
     kendoUpload(options: kendo.ui.UploadOptions): JQuery;
-    data(key: "kendoUpload") : kendo.ui.Upload;
+    data(key: "kendoUpload"): kendo.ui.Upload;
 
     kendoValidator(): JQuery;
     kendoValidator(options: kendo.ui.ValidatorOptions): JQuery;
-    data(key: "kendoValidator") : kendo.ui.Validator;
+    data(key: "kendoValidator"): kendo.ui.Validator;
 
     kendoWindow(): JQuery;
     kendoWindow(options: kendo.ui.WindowOptions): JQuery;
-    data(key: "kendoWindow") : kendo.ui.Window;
+    data(key: "kendoWindow"): kendo.ui.Window;
 
 }
diff --git a/keytar/keytar-tests.ts b/keytar/keytar-tests.ts
new file mode 100644
index 000000000..1ad9006c6
--- /dev/null
+++ b/keytar/keytar-tests.ts
@@ -0,0 +1,9 @@
+/// <reference path="keytar.d.ts" />
+
+import keytar = require('keytar');
+
+keytar.addPassword('keytar-tests', 'username', 'password');
+keytar.deletePassword('keytar-tests', 'username');
+keytar.findPassword('keytar-tests');
+keytar.getPassword('keytar-tests', 'username');
+keytar.replacePassword('keytar-tests', 'username', 'password');
diff --git a/keytar/keytar.d.ts b/keytar/keytar.d.ts
new file mode 100644
index 000000000..cee7e71bd
--- /dev/null
+++ b/keytar/keytar.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for keytar 3.0.0
+// Project: http://atom.github.io/node-keytar/
+// Definitions by: Milan Burda <https://github.com/miniak/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module 'keytar' {
+    /**
+     * Get the stored password for the service and account.
+     *
+     * @param service The string service name.
+     * @param account The string account name.
+     *
+     * @returns the string password or null on failures.
+     */
+    export function getPassword(service: string, account: string): string;
+
+    /**
+     * Add the password for the service and account to the keychain.
+     *
+     * @param service The string service name.
+     * @param account The string account name.
+     * @param password The string password.
+     *
+     * @returns true on success, false on failure.
+     */
+    export function addPassword(service: string, account: string, password: string): boolean;
+
+    /**
+     * Delete the stored password for the service and account.
+     *
+     * @param service The string service name.
+     * @param account The string account name.
+     *
+     * @returns the string password or null on failures.
+     */
+    export function deletePassword(service: string, account: string): string;
+
+    /**
+     * Replace the password for the service and account in the keychain.
+     *
+     * This is a simple convenience function that internally calls deletePassword(service, account)
+     * followed by addPassword(service, account, password).
+     *
+     * @param service The string service name.
+     * @param account The string account name.
+     * @param password The string password.
+     *
+     * @returns true on success, false on failure.
+     */
+    export function replacePassword(service: string, account: string, password: string): boolean;
+
+    /**
+     * Find a password for the service in the keychain.
+     *
+     * @param service The string service name.
+     *
+     * @returns the string password or null on failures.
+     */
+    export function findPassword(service: string): string;
+}
diff --git a/knockout/knockout.d.ts b/knockout/knockout.d.ts
index bee7041de..8f5d6fef4 100644
--- a/knockout/knockout.d.ts
+++ b/knockout/knockout.d.ts
@@ -142,6 +142,7 @@ interface KnockoutAllBindingsAccessor {
 }
 
 interface KnockoutBindingHandler {
+    after?: Array<string>;
     init?: (element: any, valueAccessor: () => any, allBindingsAccessor?: KnockoutAllBindingsAccessor, viewModel?: any, bindingContext?: KnockoutBindingContext) => void | { controlsDescendantBindings: boolean; };
     update?: (element: any, valueAccessor: () => any, allBindingsAccessor?: KnockoutAllBindingsAccessor, viewModel?: any, bindingContext?: KnockoutBindingContext) => void;
     options?: any;
diff --git a/leaflet-label/leaflet-label.d.ts b/leaflet-label/leaflet-label.d.ts
index a77def73c..02d94a321 100644
--- a/leaflet-label/leaflet-label.d.ts
+++ b/leaflet-label/leaflet-label.d.ts
@@ -56,6 +56,7 @@ declare module L {
 		className?: string;
 		clickable?: boolean;
 		direction?: string; // 'left' | 'right' | 'auto';
+		pane?: string;
 		noHide?: boolean;
 		offset?: Point;
 		opacity?: number;
diff --git a/leaflet/leaflet.d.ts b/leaflet/leaflet.d.ts
index cc4aa51b6..565a3c25d 100755
--- a/leaflet/leaflet.d.ts
+++ b/leaflet/leaflet.d.ts
@@ -4176,6 +4176,11 @@ declare namespace L {
           * When this option is set, the TileLayer only loads tiles that are in the given geographical bounds.
           */
         bounds?: LatLngBounds;
+        
+        /**
+          * Custom keys may be specified in TileLayerOptions so they can be used in a provided URL template.
+          */
+        [additionalKeys: string]: any;
     }
 }
 
diff --git a/line-reader/line-reader-tests.ts b/line-reader/line-reader-tests.ts
new file mode 100644
index 000000000..4d6ce4246
--- /dev/null
+++ b/line-reader/line-reader-tests.ts
@@ -0,0 +1,29 @@
+/// <reference path="line-reader.d.ts" />
+
+import lineReader = require('line-reader');
+
+lineReader.open('line-reader-tests.ts', function(err: Error, reader: LineReader) {
+	if (err) throw err;
+	if (reader.hasNextLine()) {
+		try {
+			reader.nextLine(function(err: Error, line: string) {
+				if (err) throw err;
+				console.log(line);
+			});
+		} finally {
+			reader.close(function(err: Error) {
+				if (err) throw err;
+			})
+		}
+	}
+	else {
+		reader.close(function(err: Error) {
+			if (err) throw err;
+		});
+	}
+});
+
+lineReader.eachLine('line-reader.d.ts', {encoding: 'utf8'}, function(line: string, last: boolean) {
+	console.log(line);
+	if (last) console.log('<EOF>');
+});
diff --git a/line-reader/line-reader.d.ts b/line-reader/line-reader.d.ts
new file mode 100644
index 000000000..f744dec6f
--- /dev/null
+++ b/line-reader/line-reader.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for line-reader
+// Project: https://github.com/nickewing/line-reader
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+interface LineReaderOptions {
+	separator?: any;
+	encoding?: string;
+	bufferSize?: number;
+}
+
+interface LineReader {
+	eachLine(): Function; // For Promise.promisify;
+	open(): Function;
+	eachLine(file: string, cb: (line: string, last?: boolean, cb?: Function) => void): LineReader;
+	eachLine(file: string, options: LineReaderOptions, cb: (line: string, last?: boolean, cb?: Function) => void): LineReader;
+	open(file: string, cb: (err: Error, reader: LineReader) => void): void;
+	open(file: string, options: LineReaderOptions, cb: (err: Error, reader: LineReader) => void): void;
+	hasNextLine(): boolean;
+	nextLine(cb: (err: Error, line: string) => void): void;
+	close(cb: (err: Error) => void): void;
+}
+
+declare module "line-reader" {
+	var lr: LineReader;
+	export = lr;
+}
diff --git a/linq/linq.d.ts b/linq/linq.d.ts
index c15bc895e..11bf36df9 100644
--- a/linq/linq.d.ts
+++ b/linq/linq.d.ts
@@ -205,9 +205,9 @@ declare module linq {
     }
 
     interface OrderedEnumerable<T> extends Enumerable<T> {
-        ThenBy(keySelector: ($) => T): OrderedEnumerable<T>;
+        ThenBy(keySelector: ($: T) => any): OrderedEnumerable<T>;
         ThenBy(keySelector: string): OrderedEnumerable<T>;
-        ThenByDescending(keySelector: ($) => T): OrderedEnumerable<T>;
+        ThenByDescending(keySelector: ($: T) => any): OrderedEnumerable<T>;
         ThenByDescending(keySelector: string): OrderedEnumerable<T>;
     }
 
diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index 4c587b57b..9cae2a872 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -453,13 +453,58 @@ module TestDropWhile {
 }
 
 // _.fill
-var testFillArray = [1, 2, 3];
-var testFillList: _.List<number> = {0: 1, 1: 2, 2: 3, length: 3};
+module TestFill {
+    let array: number[];
+    let list: _.List<number>;
 
-result = <string[]>_.fill<string>(testFillArray, 'a', 0, 3);
-result = <_.List<string>>_.fill<string>(testFillList, 'a', 0, 3);
-result = <number[]>_(testFillArray).fill<number>(0, 0, 3).value();
-result = <_.List<number>>_(testFillList).fill<number>(0, 0, 3).value();
+    {
+        let result: number[];
+
+        result = _.fill<number>(array, 42);
+        result = _.fill<number>(array, 42, 0);
+        result = _.fill<number>(array, 42, 0, 10);
+    }
+
+    {
+        let result: _.List<number>;
+
+        result = _.fill<number>(list, 42);
+        result = _.fill<number>(list, 42, 0);
+        result = _.fill<number>(list, 42, 0, 10);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<number>;
+
+        result = _(array).fill<number>(42);
+        result = _(array).fill<number>(42, 0);
+        result = _(array).fill<number>(42, 0, 10);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.List<number>>;
+
+        result = _(list).fill<number>(42);
+        result = _(list).fill<number>(42, 0);
+        result = _(list).fill<number>(42, 0, 10);
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<number>;
+
+        result = _(array).chain().fill<number>(42);
+        result = _(array).chain().fill<number>(42, 0);
+        result = _(array).chain().fill<number>(42, 0, 10);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.List<number>>;
+
+        result = _(list).chain().fill<number>(42);
+        result = _(list).chain().fill<number>(42, 0);
+        result = _(list).chain().fill<number>(42, 0, 10);
+    }
+}
 
 // _.findIndex
 module TestFindIndex {
@@ -615,18 +660,40 @@ module TestFlattenDeep {
 
         result = _.flattenDeep<TResult>(recursiveArray);
         result = _.flattenDeep<TResult>(listOfMaybeRecursiveArraysOrValues);
-
-        result = _(recursiveArray).flattenDeep<TResult>().value();
-
-        result = _(listOfMaybeRecursiveArraysOrValues).flattenDeep<TResult>().value();
     }
 
     {
-        let result: any;
+        let result: any[];
 
         result = _.flattenDeep<TResult>(recursiveList);
+    }
 
-        result = _(recursiveList).flattenDeep().value();
+    {
+        let result: _.LoDashImplicitArrayWrapper<TResult>;
+
+        result = _(recursiveArray).flattenDeep<TResult>();
+
+        result = _(listOfMaybeRecursiveArraysOrValues).flattenDeep<TResult>();
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<any>;
+
+        result = _(recursiveList).flattenDeep();
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<TResult>;
+
+        result = _(recursiveArray).chain().flattenDeep<TResult>();
+
+        result = _(listOfMaybeRecursiveArraysOrValues).chain().flattenDeep<TResult>();
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<any>;
+
+        result = _(recursiveList).chain().flattenDeep();
     }
 }
 
@@ -811,18 +878,17 @@ module TestLastIndexOf {
 module TestObject {
     let arrayOfKeys: string[];
     let arrayOfValues: number[];
+    let arrayOfKeyValuePairs: (string|number)[][]
 
     let listOfKeys: _.List<string>;
     let listOfValues: _.List<number>;
+    let listOfKeyValuePairs: _.List<_.List<string|number>>;
 
     {
         let result: _.Dictionary<void>;
 
         result = _.object<_.Dictionary<void>>(arrayOfKeys);
         result = _.object<_.Dictionary<void>>(listOfKeys);
-
-        result = _(arrayOfKeys).object<_.Dictionary<void>>().value();
-        result = _(listOfKeys).object<_.Dictionary<void>>().value();
     }
 
     {
@@ -838,15 +904,8 @@ module TestObject {
         result = _.object<number, _.Dictionary<number>>(listOfKeys, listOfValues);
         result = _.object<number, _.Dictionary<number>>(listOfKeys, arrayOfValues);
 
-        result = _(arrayOfKeys).object<_.Dictionary<number>>(arrayOfValues).value();
-        result = _(arrayOfKeys).object<_.Dictionary<number>>(listOfValues).value();
-        result = _(listOfKeys).object<_.Dictionary<number>>(listOfValues).value();
-        result = _(listOfKeys).object<_.Dictionary<number>>(arrayOfValues).value();
-
-        result = _(arrayOfKeys).object<number, _.Dictionary<number>>(arrayOfValues).value();
-        result = _(arrayOfKeys).object<number, _.Dictionary<number>>(listOfValues).value();
-        result = _(listOfKeys).object<number, _.Dictionary<number>>(listOfValues).value();
-        result = _(listOfKeys).object<number, _.Dictionary<number>>(arrayOfValues).value();
+        result = _.object<_.Dictionary<number>>(arrayOfKeyValuePairs);
+        result = _.object<_.Dictionary<number>>(listOfKeyValuePairs);
     }
 
     {
@@ -860,13 +919,86 @@ module TestObject {
         result = _.object(listOfKeys, listOfValues);
         result = _.object(listOfKeys, arrayOfValues);
 
-        result = _(arrayOfKeys).object().value();
-        result = _(arrayOfKeys).object(arrayOfValues).value();
-        result = _(arrayOfKeys).object(listOfValues).value();
+        result = _.object<_.Dictionary<number>>(arrayOfKeyValuePairs);
+        result = _.object<_.Dictionary<number>>(listOfKeyValuePairs);
+    }
 
-        result = _(listOfKeys).object().value();
-        result = _(listOfKeys).object(listOfValues).value();
-        result = _(listOfKeys).object(arrayOfValues).value();
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<void>>;
+
+        result = _(arrayOfKeys).object<_.Dictionary<void>>();
+        result = _(listOfKeys).object<_.Dictionary<void>>();
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
+
+        result = _(arrayOfKeys).object<_.Dictionary<number>>(arrayOfValues);
+        result = _(arrayOfKeys).object<_.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).object<_.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).object<_.Dictionary<number>>(arrayOfValues);
+
+        result = _(arrayOfKeys).object<number, _.Dictionary<number>>(arrayOfValues);
+        result = _(arrayOfKeys).object<number, _.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).object<number, _.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).object<number, _.Dictionary<number>>(arrayOfValues);
+
+        result = _(listOfKeys).object<_.Dictionary<number>>(arrayOfKeyValuePairs);
+        result = _(listOfKeys).object<_.Dictionary<number>>(listOfKeyValuePairs);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<any>>;
+
+        result = _(arrayOfKeys).object();
+        result = _(arrayOfKeys).object(arrayOfValues);
+        result = _(arrayOfKeys).object(listOfValues);
+
+        result = _(listOfKeys).object();
+        result = _(listOfKeys).object(listOfValues);
+        result = _(listOfKeys).object(arrayOfValues);
+
+        result = _(listOfKeys).object(arrayOfKeyValuePairs);
+        result = _(listOfKeys).object(listOfKeyValuePairs);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<void>>;
+
+        result = _(arrayOfKeys).chain().object<_.Dictionary<void>>();
+        result = _(listOfKeys).chain().object<_.Dictionary<void>>();
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
+
+        result = _(arrayOfKeys).chain().object<_.Dictionary<number>>(arrayOfValues);
+        result = _(arrayOfKeys).chain().object<_.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).chain().object<_.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).chain().object<_.Dictionary<number>>(arrayOfValues);
+
+        result = _(arrayOfKeys).chain().object<number, _.Dictionary<number>>(arrayOfValues);
+        result = _(arrayOfKeys).chain().object<number, _.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).chain().object<number, _.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).chain().object<number, _.Dictionary<number>>(arrayOfValues);
+
+        result = _(listOfKeys).chain().object<_.Dictionary<number>>(arrayOfKeyValuePairs);
+        result = _(listOfKeys).chain().object<_.Dictionary<number>>(listOfKeyValuePairs);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
+
+        result = _(arrayOfKeys).chain().object();
+        result = _(arrayOfKeys).chain().object(arrayOfValues);
+        result = _(arrayOfKeys).chain().object(listOfValues);
+
+        result = _(listOfKeys).chain().object();
+        result = _(listOfKeys).chain().object(listOfValues);
+        result = _(listOfKeys).chain().object(arrayOfValues);
+
+        result = _(listOfKeys).chain().object(arrayOfKeyValuePairs);
+        result = _(listOfKeys).chain().object(listOfKeyValuePairs);
     }
 }
 
@@ -932,26 +1064,51 @@ module TestPull {
 }
 
 // _.pullAt
-{
-    let testPullAtArray: TResult[];
-    let testPullAtList: _.List<TResult>;
-    let result: TResult[];
-    result = _.pullAt<TResult>(testPullAtArray);
-    result = _.pullAt<TResult>(testPullAtArray, 1);
-    result = _.pullAt<TResult>(testPullAtArray, [2, 3], 1);
-    result = _.pullAt<TResult>(testPullAtArray, 4, [2, 3], 1);
-    result = _.pullAt<TResult>(testPullAtList);
-    result = _.pullAt<TResult>(testPullAtList, 1);
-    result = _.pullAt<TResult>(testPullAtList, [2, 3], 1);
-    result = _.pullAt<TResult>(testPullAtList, 4, [2, 3], 1);
-    result = _(testPullAtArray).pullAt().value();
-    result = _(testPullAtArray).pullAt(1).value();
-    result = _(testPullAtArray).pullAt([2, 3], 1).value();
-    result = _(testPullAtArray).pullAt(4, [2, 3], 1).value();
-    result = _(testPullAtList).pullAt<TResult>().value();
-    result = _(testPullAtList).pullAt<TResult>(1).value();
-    result = _(testPullAtList).pullAt<TResult>([2, 3], 1).value();
-    result = _(testPullAtList).pullAt<TResult>(4, [2, 3], 1).value();
+module TestPullAt {
+    let array: TResult[];
+    let list: _.List<TResult>;
+
+    {
+        let result: TResult[];
+
+        result = _.pullAt<TResult>(array);
+        result = _.pullAt<TResult>(array, 1);
+        result = _.pullAt<TResult>(array, [2, 3], 1);
+        result = _.pullAt<TResult>(array, 4, [2, 3], 1);
+
+        result = _.pullAt<TResult>(list);
+        result = _.pullAt<TResult>(list, 1);
+        result = _.pullAt<TResult>(list, [2, 3], 1);
+        result = _.pullAt<TResult>(list, 4, [2, 3], 1);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<TResult>;
+
+        result = _(array).pullAt();
+        result = _(array).pullAt(1);
+        result = _(array).pullAt([2, 3], 1);
+        result = _(array).pullAt(4, [2, 3], 1);
+
+        result = _(list).pullAt<TResult>();
+        result = _(list).pullAt<TResult>(1);
+        result = _(list).pullAt<TResult>([2, 3], 1);
+        result = _(list).pullAt<TResult>(4, [2, 3], 1);
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<TResult>;
+
+        result = _(array).chain().pullAt();
+        result = _(array).chain().pullAt(1);
+        result = _(array).chain().pullAt([2, 3], 1);
+        result = _(array).chain().pullAt(4, [2, 3], 1);
+
+        result = _(list).chain().pullAt<TResult>();
+        result = _(list).chain().pullAt<TResult>(1);
+        result = _(list).chain().pullAt<TResult>([2, 3], 1);
+        result = _(list).chain().pullAt<TResult>(4, [2, 3], 1);
+    }
 }
 
 // _.remove
@@ -1074,17 +1231,86 @@ module TestSlice {
 
 // _.sortedIndex
 module TestSortedIndex {
-    result = <number>_.sortedIndex([20, 30, 50], 40);
-    result = <number>_.sortedIndex([{ 'x': 20 }, { 'x': 30 }, { 'x': 50 }], { 'x': 40 }, 'x');
-    var sortedIndexDict: { wordToNumber: { [idx: string]: number } } = {
-        'wordToNumber': { 'twenty': 20, 'thirty': 30, 'fourty': 40, 'fifty': 50 }
-    };
-    result = <number>_.sortedIndex(['twenty', 'thirty', 'fifty'], 'fourty', function (word: string) {
-        return sortedIndexDict.wordToNumber[word];
-    });
-    result = <number>_.sortedIndex(['twenty', 'thirty', 'fifty'], 'fourty', function (word: string) {
-        return this.wordToNumber[word];
-    }, sortedIndexDict);
+    type SampleType = {a: number; b: string; c: boolean;};
+
+    let array: SampleType[];
+    let list: _.List<SampleType>;
+
+    let value: SampleType;
+
+    let stringIterator: (x: string) => number;
+    let arrayIterator: (x: SampleType) => number;
+    let listIterator: (x: SampleType) => number;
+
+    {
+        let result: number;
+
+        result = _.sortedIndex<string>('', '');
+        result = _.sortedIndex<string>('', '', stringIterator);
+        result = _.sortedIndex<string>('', '', stringIterator, any);
+        result = _.sortedIndex<string, number>('', '', stringIterator);
+        result = _.sortedIndex<string, number>('', '', stringIterator, any);
+
+        result = _.sortedIndex<SampleType>(array, value);
+        result = _.sortedIndex<SampleType>(array, value, arrayIterator);
+        result = _.sortedIndex<SampleType>(array, value, arrayIterator, any);
+        result = _.sortedIndex<SampleType>(array, value, '');
+        result = _.sortedIndex<SampleType>(array, value, {a: 42});
+        result = _.sortedIndex<SampleType, number>(array, value, arrayIterator);
+        result = _.sortedIndex<SampleType, number>(array, value, arrayIterator, any);
+        result = _.sortedIndex<{a: number}, SampleType>(array, value, {a: 42});
+
+        result = _.sortedIndex<SampleType>(list, value);
+        result = _.sortedIndex<SampleType>(list, value, listIterator);
+        result = _.sortedIndex<SampleType>(list, value, listIterator, any);
+        result = _.sortedIndex<SampleType>(list, value, '');
+        result = _.sortedIndex<SampleType>(list, value, {a: 42});
+        result = _.sortedIndex<SampleType, number>(list, value, listIterator);
+        result = _.sortedIndex<SampleType, number>(list, value, listIterator, any);
+        result = _.sortedIndex<{a: number}, SampleType>(list, value, {a: 42});
+
+        result = _('').sortedIndex('');
+        result = _('').sortedIndex<number>('', stringIterator);
+        result = _('').sortedIndex<number>('', stringIterator, any);
+
+        result = _(array).sortedIndex(value);
+        result = _(array).sortedIndex<number>(value, arrayIterator);
+        result = _(array).sortedIndex<number>(value, arrayIterator, any);
+        result = _(array).sortedIndex(value, '');
+        result = _(array).sortedIndex<{a: number}>(value, {a: 42});
+
+        result = _(list).sortedIndex<SampleType>(value);
+        result = _(list).sortedIndex<SampleType>(value, listIterator);
+        result = _(list).sortedIndex<SampleType>(value, listIterator, any);
+        result = _(list).sortedIndex<SampleType>(value, '');
+        result = _(list).sortedIndex<SampleType>(value, {a: 42});
+        result = _(list).sortedIndex<SampleType, number>(value, listIterator);
+        result = _(list).sortedIndex<SampleType, number>(value, listIterator, any);
+        result = _(list).sortedIndex<{a: number}, SampleType>(value, {a: 42});
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<number>;
+
+        result = _('').chain().sortedIndex('');
+        result = _('').chain().sortedIndex<number>('', stringIterator);
+        result = _('').chain().sortedIndex<number>('', stringIterator, any);
+
+        result = _(array).chain().sortedIndex(value);
+        result = _(array).chain().sortedIndex<number>(value, arrayIterator);
+        result = _(array).chain().sortedIndex<number>(value, arrayIterator, any);
+        result = _(array).chain().sortedIndex(value, '');
+        result = _(array).chain().sortedIndex<{a: number}>(value, {a: 42});
+
+        result = _(list).chain().sortedIndex<SampleType>(value);
+        result = _(list).chain().sortedIndex<SampleType>(value, listIterator);
+        result = _(list).chain().sortedIndex<SampleType>(value, listIterator, any);
+        result = _(list).chain().sortedIndex<SampleType>(value, '');
+        result = _(list).chain().sortedIndex<SampleType>(value, {a: 42});
+        result = _(list).chain().sortedIndex<SampleType, number>(value, listIterator);
+        result = _(list).chain().sortedIndex<SampleType, number>(value, listIterator, any);
+        result = _(list).chain().sortedIndex<{a: number}, SampleType>(value, {a: 42});
+    }
 }
 
 // _.sortedLastIndex
@@ -1408,6 +1634,39 @@ result = <string[]>_(['A', 'b', 'C', 'a', 'B', 'c']).unique(function (letter) {
 result = <number[]>_([1, 2.5, 3, 1.5, 2, 3.5]).unique(function (num) { return this.floor(num); }, Math).value();
 result = <{ x: number; }[]>_([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }]).unique('x').value();
 
+// _.upzip
+module TestUnzip {
+    let array = [['a', 'b'], [1, 2], [true, false]];
+
+    let list: _.List<_.List<string|number|boolean>> = {
+        0: {0: 'a', 1: 'b', length: 2},
+        1: {0: 1, 1: 2, length: 2},
+        2: {0: true, 1: false, length: 2},
+        length: 3
+    };
+
+    {
+        let result: (string|number|boolean)[][];
+
+        result = _.unzip<string|number|boolean>(array);
+        result = _.unzip<string|number|boolean>(list);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<(string|number|boolean)[]>;
+
+        result = _(array).unzip<string|number|boolean>();
+        result = _(list).unzip<string|number|boolean>();
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<(string|number|boolean)[]>;
+
+        result = _(array).chain().unzip<string|number|boolean>();
+        result = _(list).chain().unzip<string|number|boolean>();
+    }
+}
+
 // _.unzipWith
 {
     let testUnzipWithArray: (number[]|_.List<number>)[];
@@ -1427,74 +1686,149 @@ result = <{ x: number; }[]>_([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }]).unique('x').v
 }
 
 // _.without
-{
-    let testWithoutArray: number[];
-    let testWithoutList: _.List<number>;
-    let result: number[];
-    result = _.without<number>(testWithoutArray);
-    result = _.without<number>(testWithoutArray, 1);
-    result = _.without<number>(testWithoutArray, 1, 2);
-    result = _.without<number>(testWithoutArray, 1, 2, 3);
-    result = _.without<number>(testWithoutList);
-    result = _.without<number>(testWithoutList, 1);
-    result = _.without<number>(testWithoutList, 1, 2);
-    result = _.without<number>(testWithoutList, 1, 2, 3);
-    result = _(testWithoutArray).without().value();
-    result = _(testWithoutArray).without(1).value();
-    result = _(testWithoutArray).without(1, 2).value();
-    result = _(testWithoutArray).without(1, 2, 3).value();
-    result = _(testWithoutList).without<number>().value();
-    result = _(testWithoutList).without<number>(1).value();
-    result = _(testWithoutList).without<number>(1, 2).value();
-    result = _(testWithoutList).without<number>(1, 2, 3).value();
+module TestWithout {
+    let array: number[];
+    let list: _.List<number>;
+
+    {
+        let result: number[];
+
+        result = _.without<number>(array);
+        result = _.without<number>(array, 1);
+        result = _.without<number>(array, 1, 2);
+        result = _.without<number>(array, 1, 2, 3);
+
+        result = _.without<number>(list);
+        result = _.without<number>(list, 1);
+        result = _.without<number>(list, 1, 2);
+        result = _.without<number>(list, 1, 2, 3);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<number>;
+
+        result = _(array).without();
+        result = _(array).without(1);
+        result = _(array).without(1, 2);
+        result = _(array).without(1, 2, 3);
+        result = _(list).without<number>();
+        result = _(list).without<number>(1);
+        result = _(list).without<number>(1, 2);
+        result = _(list).without<number>(1, 2, 3);
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<number>;
+
+        result = _(array).chain().without();
+        result = _(array).chain().without(1);
+        result = _(array).chain().without(1, 2);
+        result = _(array).chain().without(1, 2, 3);
+
+        result = _(list).chain().without<number>();
+        result = _(list).chain().without<number>(1);
+        result = _(list).chain().without<number>(1, 2);
+        result = _(list).chain().without<number>(1, 2, 3);
+    }
 }
 
 // _.xor
 module TestXor {
     let array: TResult[];
     let list: _.List<TResult>;
-    let result: TResult[];
 
-    result = _.xor<TResult>();
+    {
+        let result: TResult[];
 
-    result = _.xor<TResult>(array);
-    result = _.xor<TResult>(array, list);
-    result = _.xor<TResult>(array, list, array);
+        result = _.xor<TResult>();
 
-    result = _.xor<TResult>(list);
-    result = _.xor<TResult>(list, array);
-    result = _.xor<TResult>(list, array, list);
+        result = _.xor<TResult>(array);
+        result = _.xor<TResult>(array, list);
+        result = _.xor<TResult>(array, list, array);
 
-    result = _(array).xor().value();
-    result = _(array).xor(list).value();
-    result = _(array).xor(list, array).value();
+        result = _.xor<TResult>(list);
+        result = _.xor<TResult>(list, array);
+        result = _.xor<TResult>(list, array, list);
+    }
 
-    result = _(list).xor<TResult>().value();
-    result = _(list).xor<TResult>(array).value();
-    result = _(list).xor<TResult>(array, list).value();
+    {
+        let result: _.LoDashImplicitArrayWrapper<TResult>;
+
+        result = _(array).xor();
+        result = _(array).xor(list);
+        result = _(array).xor(list, array);
+
+        result = _(list).xor<TResult>();
+        result = _(list).xor<TResult>(array);
+        result = _(list).xor<TResult>(array, list);
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<TResult>;
+
+        result = _(array).chain().xor();
+        result = _(array).chain().xor(list);
+        result = _(array).chain().xor(list, array);
+
+        result = _(list).chain().xor<TResult>();
+        result = _(list).chain().xor<TResult>(array);
+        result = _(list).chain().xor<TResult>(array, list);
+    }
 }
 
-result = <any[][]>_.zip(['moe', 'larry'], [30, 40], [true, false]);
-result = <any[][]>_.unzip(['moe', 'larry'], [30, 40], [true, false]);
-result = <any[][]>_(['moe', 'larry']).zip([30, 40], [true, false]).value();
-result = <any[][]>_(['moe', 'larry']).unzip([30, 40], [true, false]).value();
+// _.zip
+module TestZip {
+    let array: TResult[];
+    let list: _.List<TResult>;
+
+    {
+        let result: TResult[][];
+
+        result = _.zip<TResult>(array);
+        result = _.zip<TResult>(array, list);
+        result = _.zip<TResult>(array, list, array);
+
+        result = _.zip<TResult>(list);
+        result = _.zip<TResult>(list, array);
+        result = _.zip<TResult>(list, array, list);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<TResult[]>;
+
+        result = _(array).zip<TResult>(list);
+        result = _(array).zip<TResult>(list, array);
+
+        result = _(list).zip<TResult>(array);
+        result = _(list).zip<TResult>(array, list);
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<TResult[]>;
+
+        result = _(array).chain().zip<TResult>(list);
+        result = _(array).chain().zip<TResult>(list, array);
+
+        result = _(list).chain().zip<TResult>(array);
+        result = _(list).chain().zip<TResult>(array, list);
+    }
+}
 
 // _.zipObject
 module TestZipObject {
     let arrayOfKeys: string[];
     let arrayOfValues: number[];
+    let arrayOfKeyValuePairs: (string|number)[][]
 
     let listOfKeys: _.List<string>;
     let listOfValues: _.List<number>;
+    let listOfKeyValuePairs: _.List<_.List<string|number>>;
 
     {
         let result: _.Dictionary<void>;
 
         result = _.zipObject<_.Dictionary<void>>(arrayOfKeys);
         result = _.zipObject<_.Dictionary<void>>(listOfKeys);
-
-        result = _(arrayOfKeys).zipObject<_.Dictionary<void>>().value();
-        result = _(listOfKeys).zipObject<_.Dictionary<void>>().value();
     }
 
     {
@@ -1510,15 +1844,8 @@ module TestZipObject {
         result = _.zipObject<number, _.Dictionary<number>>(listOfKeys, listOfValues);
         result = _.zipObject<number, _.Dictionary<number>>(listOfKeys, arrayOfValues);
 
-        result = _(arrayOfKeys).zipObject<_.Dictionary<number>>(arrayOfValues).value();
-        result = _(arrayOfKeys).zipObject<_.Dictionary<number>>(listOfValues).value();
-        result = _(listOfKeys).zipObject<_.Dictionary<number>>(listOfValues).value();
-        result = _(listOfKeys).zipObject<_.Dictionary<number>>(arrayOfValues).value();
-
-        result = _(arrayOfKeys).zipObject<number, _.Dictionary<number>>(arrayOfValues).value();
-        result = _(arrayOfKeys).zipObject<number, _.Dictionary<number>>(listOfValues).value();
-        result = _(listOfKeys).zipObject<number, _.Dictionary<number>>(listOfValues).value();
-        result = _(listOfKeys).zipObject<number, _.Dictionary<number>>(arrayOfValues).value();
+        result = _.zipObject<_.Dictionary<number>>(arrayOfKeyValuePairs);
+        result = _.zipObject<_.Dictionary<number>>(listOfKeyValuePairs);
     }
 
     {
@@ -1532,13 +1859,86 @@ module TestZipObject {
         result = _.zipObject(listOfKeys, listOfValues);
         result = _.zipObject(listOfKeys, arrayOfValues);
 
-        result = _(arrayOfKeys).zipObject().value();
-        result = _(arrayOfKeys).zipObject(arrayOfValues).value();
-        result = _(arrayOfKeys).zipObject(listOfValues).value();
+        result = _.zipObject<_.Dictionary<number>>(arrayOfKeyValuePairs);
+        result = _.zipObject<_.Dictionary<number>>(listOfKeyValuePairs);
+    }
 
-        result = _(listOfKeys).zipObject().value();
-        result = _(listOfKeys).zipObject(listOfValues).value();
-        result = _(listOfKeys).zipObject(arrayOfValues).value();
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<void>>;
+
+        result = _(arrayOfKeys).zipObject<_.Dictionary<void>>();
+        result = _(listOfKeys).zipObject<_.Dictionary<void>>();
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
+
+        result = _(arrayOfKeys).zipObject<_.Dictionary<number>>(arrayOfValues);
+        result = _(arrayOfKeys).zipObject<_.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).zipObject<_.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).zipObject<_.Dictionary<number>>(arrayOfValues);
+
+        result = _(arrayOfKeys).zipObject<number, _.Dictionary<number>>(arrayOfValues);
+        result = _(arrayOfKeys).zipObject<number, _.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).zipObject<number, _.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).zipObject<number, _.Dictionary<number>>(arrayOfValues);
+
+        result = _(listOfKeys).zipObject<_.Dictionary<number>>(arrayOfKeyValuePairs);
+        result = _(listOfKeys).zipObject<_.Dictionary<number>>(listOfKeyValuePairs);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<any>>;
+
+        result = _(arrayOfKeys).zipObject();
+        result = _(arrayOfKeys).zipObject(arrayOfValues);
+        result = _(arrayOfKeys).zipObject(listOfValues);
+
+        result = _(listOfKeys).zipObject();
+        result = _(listOfKeys).zipObject(listOfValues);
+        result = _(listOfKeys).zipObject(arrayOfValues);
+
+        result = _(listOfKeys).zipObject(arrayOfKeyValuePairs);
+        result = _(listOfKeys).zipObject(listOfKeyValuePairs);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<void>>;
+
+        result = _(arrayOfKeys).chain().zipObject<_.Dictionary<void>>();
+        result = _(listOfKeys).chain().zipObject<_.Dictionary<void>>();
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
+
+        result = _(arrayOfKeys).chain().zipObject<_.Dictionary<number>>(arrayOfValues);
+        result = _(arrayOfKeys).chain().zipObject<_.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).chain().zipObject<_.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).chain().zipObject<_.Dictionary<number>>(arrayOfValues);
+
+        result = _(arrayOfKeys).chain().zipObject<number, _.Dictionary<number>>(arrayOfValues);
+        result = _(arrayOfKeys).chain().zipObject<number, _.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).chain().zipObject<number, _.Dictionary<number>>(listOfValues);
+        result = _(listOfKeys).chain().zipObject<number, _.Dictionary<number>>(arrayOfValues);
+
+        result = _(listOfKeys).chain().zipObject<_.Dictionary<number>>(arrayOfKeyValuePairs);
+        result = _(listOfKeys).chain().zipObject<_.Dictionary<number>>(listOfKeyValuePairs);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
+
+        result = _(arrayOfKeys).chain().zipObject();
+        result = _(arrayOfKeys).chain().zipObject(arrayOfValues);
+        result = _(arrayOfKeys).chain().zipObject(listOfValues);
+
+        result = _(listOfKeys).chain().zipObject();
+        result = _(listOfKeys).chain().zipObject(listOfValues);
+        result = _(listOfKeys).chain().zipObject(arrayOfValues);
+
+        result = _(listOfKeys).chain().zipObject(arrayOfKeyValuePairs);
+        result = _(listOfKeys).chain().zipObject(listOfKeyValuePairs);
     }
 }
 
@@ -2293,17 +2693,34 @@ module TestAny {
 }
 
 // _.at
-{
-    let testAtArray: TResult[];
-    let testAtList: _.List<TResult>;
-    let testAtDictionary: _.Dictionary<TResult>;
-    let result: TResult[];
-    result = _.at<TResult>(testAtArray, 0, '1', [2], ['3'], [4, '5']);
-    result = _.at<TResult>(testAtList, 0, '1', [2], ['3'], [4, '5']);
-    result = _.at<TResult>(testAtDictionary, 0, '1', [2], ['3'], [4, '5']);
-    result = _(testAtArray).at(0, '1', [2], ['3'], [4, '5']).value();
-    result = _(testAtList).at<TResult>(0, '1', [2], ['3'], [4, '5']).value();
-    result = _(testAtDictionary).at<TResult>(0, '1', [2], ['3'], [4, '5']).value();
+module TestAt {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let dictionary: _.Dictionary<TResult>;
+
+    {
+        let result: TResult[];
+
+        result = _.at<TResult>(array, 0, '1', [2], ['3'], [4, '5']);
+        result = _.at<TResult>(list, 0, '1', [2], ['3'], [4, '5']);
+        result = _.at<TResult>(dictionary, 0, '1', [2], ['3'], [4, '5']);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<TResult>;
+
+        result = _(array).at(0, '1', [2], ['3'], [4, '5']);
+        result = _(list).at<TResult>(0, '1', [2], ['3'], [4, '5']);
+        result = _(dictionary).at<TResult>(0, '1', [2], ['3'], [4, '5']);
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<TResult>;
+
+        result = _(array).chain().at(0, '1', [2], ['3'], [4, '5']);
+        result = _(list).chain().at<TResult>(0, '1', [2], ['3'], [4, '5']);
+        result = _(dictionary).chain().at<TResult>(0, '1', [2], ['3'], [4, '5']);
+    }
 }
 
 // _.collect
@@ -2397,35 +2814,51 @@ module TestCollect {
     }
 }
 
-result = <boolean>_.contains([1, 2, 3], 1);
-result = <boolean>_.contains([1, 2, 3], 1, 2);
-result = <boolean>_.contains({ 'moe': 30, 'larry': 40, 'curly': 67 }, 40);
-result = <boolean>_.contains('curly', 'ur');
+// _.contains
+module TestContains {
+    type SampleType = {a: string; b: number; c: boolean;};
 
-result = <boolean>_([1, 2, 3]).contains(1);
-result = <boolean>_([1, 2, 3]).contains(1, 2);
-result = <boolean>_({ 'moe': 30, 'larry': 40, 'curly': 67 }).contains(40);
-result = <boolean>_('curly').contains('ur');
+    let array: SampleType[];
+    let list: _.List<SampleType>;
+    let dictionary: _.Dictionary<SampleType>;
 
-result = <boolean>_.include([1, 2, 3], 1);
-result = <boolean>_.include([1, 2, 3], 1, 2);
-result = <boolean>_.include({ 'moe': 30, 'larry': 40, 'curly': 67 }, 40);
-result = <boolean>_.include('curly', 'ur');
+    let target: SampleType;
 
-result = <boolean>_([1, 2, 3]).include(1);
-result = <boolean>_([1, 2, 3]).include(1, 2);
-result = <boolean>_({ 'moe': 30, 'larry': 40, 'curly': 67 }).include(40);
-result = <boolean>_('curly').include('ur');
+    {
+        let result: boolean;
 
-result = <boolean>_.includes([1, 2, 3], 1);
-result = <boolean>_.includes([1, 2, 3], 1, 2);
-result = <boolean>_.includes({ 'moe': 30, 'larry': 40, 'curly': 67 }, 40);
-result = <boolean>_.includes('curly', 'ur');
+        result = _.contains<SampleType>(array, target);
+        result = _.contains<SampleType>(array, target, 42);
 
-result = <boolean>_([1, 2, 3]).includes(1);
-result = <boolean>_([1, 2, 3]).includes(1, 2);
-result = <boolean>_({ 'moe': 30, 'larry': 40, 'curly': 67 }).includes(40);
-result = <boolean>_('curly').includes('ur');
+        result = _.contains<SampleType>(list, target);
+        result = _.contains<SampleType>(list, target, 42);
+
+        result = _.contains<SampleType>(dictionary, target);
+        result = _.contains<SampleType>(dictionary, target, 42);
+
+        result = _(array).contains(target);
+        result = _(array).contains(target, 42);
+
+        result = _(list).contains<SampleType>(target);
+        result = _(list).contains<SampleType>(target, 42);
+
+        result = _(dictionary).contains<SampleType>(target);
+        result = _(dictionary).contains<SampleType>(target, 42);
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<boolean>;
+
+        result = _(array).chain().contains(target);
+        result = _(array).chain().contains(target, 42);
+
+        result = _(list).chain().contains<SampleType>(target);
+        result = _(list).chain().contains<SampleType>(target, 42);
+
+        result = _(dictionary).chain().contains<SampleType>(target);
+        result = _(dictionary).chain().contains<SampleType>(target, 42);
+    }
+}
 
 result = <_.Dictionary<number>>_.countBy([4.3, 6.1, 6.4], function (num) { return Math.floor(num); });
 result = <_.Dictionary<number>>_.countBy([4.3, 6.1, 6.4], function (num) { return this.floor(num); }, Math);
@@ -2745,22 +3178,103 @@ module TestEvery {
     }
 }
 
-result = <number[]>_.filter([1, 2, 3, 4, 5, 6]);
-result = <number[]>_.filter([1, 2, 3, 4, 5, 6], function (num) { return num % 2 == 0; });
-result = <IFoodCombined[]>_.filter(foodsCombined, 'organic');
-result = <IFoodCombined[]>_.filter(foodsCombined, { 'type': 'fruit' });
+// _.filter
+module TestFilter {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let dictionary: _.Dictionary<TResult>;
 
-result = <number[]>_([1, 2, 3, 4, 5, 6]).filter(function (num) { return num % 2 == 0; }).value();
-result = <IFoodCombined[]>_(foodsCombined).filter('organic').value();
-result = <IFoodCombined[]>_(foodsCombined).filter({ 'type': 'fruit' }).value();
+    let stringIterator: (char: string, index: number, string: string) => any;
+    let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any;
+    let dictionaryIterator: (value: TResult, key: string, collection: _.Dictionary<TResult>) => any;
 
-result = <number[]>_.select([1, 2, 3, 4, 5, 6], function (num) { return num % 2 == 0; });
-result = <IFoodCombined[]>_.select(foodsCombined, 'organic');
-result = <IFoodCombined[]>_.select(foodsCombined, { 'type': 'fruit' });
+    {
+        let result: string[];
 
-result = <number[]>_([1, 2, 3, 4, 5, 6]).select(function (num) { return num % 2 == 0; }).value();
-result = <IFoodCombined[]>_(foodsCombined).select('organic').value();
-result = <IFoodCombined[]>_(foodsCombined).select({ 'type': 'fruit' }).value();
+        result = _.filter('', stringIterator);
+        result = _.filter('', stringIterator, any);
+    }
+
+    {
+        let result: TResult[];
+
+        result = _.filter<TResult>(array, listIterator);
+        result = _.filter<TResult>(array, listIterator, any);
+        result = _.filter<TResult>(array, '');
+        result = _.filter<TResult>(array, '', any);
+        result = _.filter<{a: number}, TResult>(array, {a: 42});
+
+        result = _.filter<TResult>(list, listIterator);
+        result = _.filter<TResult>(list, listIterator, any);
+        result = _.filter<TResult>(list, '');
+        result = _.filter<TResult>(list, '', any);
+        result = _.filter<{a: number}, TResult>(list, {a: 42});
+
+        result = _.filter<TResult>(dictionary, dictionaryIterator);
+        result = _.filter<TResult>(dictionary, dictionaryIterator, any);
+        result = _.filter<TResult>(dictionary, '');
+        result = _.filter<TResult>(dictionary, '', any);
+        result = _.filter<{a: number}, TResult>(dictionary, {a: 42});
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<string>;
+
+        result = _('').filter(stringIterator);
+        result = _('').filter(stringIterator, any);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<TResult>;
+
+        result = _(array).filter(listIterator);
+        result = _(array).filter(listIterator, any);
+        result = _(array).filter('');
+        result = _(array).filter('', any);
+        result = _(array).filter<{a: number}>({a: 42});
+
+        result = _(list).filter<TResult>(listIterator);
+        result = _(list).filter<TResult>(listIterator, any);
+        result = _(list).filter<TResult>('');
+        result = _(list).filter<TResult>('', any);
+        result = _(list).filter<{a: number}, TResult>({a: 42});
+
+        result = _(dictionary).filter<TResult>(dictionaryIterator);
+        result = _(dictionary).filter<TResult>(dictionaryIterator, any);
+        result = _(dictionary).filter<TResult>('');
+        result = _(dictionary).filter<TResult>('', any);
+        result = _(dictionary).filter<{a: number}, TResult>({a: 42});
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<string>;
+
+        result = _('').chain().filter(stringIterator);
+        result = _('').chain().filter(stringIterator, any);
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<TResult>;
+
+        result = _(array).chain().filter(listIterator);
+        result = _(array).chain().filter(listIterator, any);
+        result = _(array).chain().filter('');
+        result = _(array).chain().filter('', any);
+        result = _(array).chain().filter<{a: number}>({a: 42});
+
+        result = _(list).chain().filter<TResult>(listIterator);
+        result = _(list).chain().filter<TResult>(listIterator, any);
+        result = _(list).chain().filter<TResult>('');
+        result = _(list).chain().filter<TResult>('', any);
+        result = _(list).chain().filter<{a: number}, TResult>({a: 42});
+
+        result = _(dictionary).chain().filter<TResult>(dictionaryIterator);
+        result = _(dictionary).chain().filter<TResult>(dictionaryIterator, any);
+        result = _(dictionary).chain().filter<TResult>('');
+        result = _(dictionary).chain().filter<TResult>('', any);
+        result = _(dictionary).chain().filter<{a: number}, TResult>({a: 42});
+    }
+}
 
 // _.find
 module TestFind {
@@ -3018,21 +3532,246 @@ module TestForEachRight {
     }
 }
 
-result = <_.Dictionary<number[]>>_.groupBy([4.2, 6.1, 6.4], function (num) { return Math.floor(num); });
-result = <_.Dictionary<number[]>>_.groupBy([4.2, 6.1, 6.4], function (num) { return this.floor(num); }, Math);
-result = <_.Dictionary<string[]>>_.groupBy(['one', 'two', 'three'], 'length');
+// _.groupBy
+module TestGroupBy {
+    type SampleType = {a: number; b: string; c: boolean;};
 
-result = <_.Dictionary<number[]>>_.groupBy({ prop1: 4.2, prop2: 6.1, prop3: 6.4}, function (num) { return Math.floor(num); });
-result = <_.Dictionary<number[]>>_.groupBy({ prop1: 4.2, prop2: 6.1, prop3: 6.4}, function (num) { return this.floor(num); }, Math);
-result = <_.Dictionary<string[]>>_.groupBy({ prop1: 'one', prop2: 'two', prop3: 'three'}, 'length');
+    let array: SampleType[];
+    let list: _.List<SampleType>;
+    let dictionary: _.Dictionary<SampleType>;
 
-result = <_.Dictionary<number[]>>_([4.2, 6.1, 6.4]).groupBy(function (num) { return Math.floor(num); }).value();
-result = <_.Dictionary<number[]>>_([4.2, 6.1, 6.4]).groupBy(function (num) { return this.floor(num); }, Math).value();
-result = <_.Dictionary<string[]>>_(['one', 'two', 'three']).groupBy('length').value();
+    let stringIterator: (char: string, index: number, string: string) => number;
+    let listIterator: (value: SampleType, index: number, collection: _.List<SampleType>) => number;
+    let dictionaryIterator: (value: SampleType, key: string, collection: _.Dictionary<SampleType>) => number;
 
-result = <_.Dictionary<number[]>>_({ prop1: 4.2, prop2: 6.1, prop3: 6.4}).groupBy<number>(function (num) { return Math.floor(num); }).value();
-result = <_.Dictionary<number[]>>_({ prop1: 4.2, prop2: 6.1, prop3: 6.4}).groupBy<number>(function (num) { return this.floor(num); }, Math).value();
-result = <_.Dictionary<string[]>>_({ prop1: 'one', prop2: 'two', prop3: 'three'}).groupBy<string>('length').value();
+    {
+        let result: _.Dictionary<string[]>;
+
+        result = _.groupBy<string>('');
+        result = _.groupBy<string>('', stringIterator);
+        result = _.groupBy<string>('', stringIterator, any);
+        result = _.groupBy<string, number>('', stringIterator);
+        result = _.groupBy<string, number>('', stringIterator, any);
+    }
+
+    {
+        let result: _.Dictionary<SampleType[]>;
+
+        result = _.groupBy<SampleType>(array);
+        result = _.groupBy<SampleType>(array, listIterator);
+        result = _.groupBy<SampleType>(array, listIterator, any);
+        result = _.groupBy<SampleType>(array, '');
+        result = _.groupBy<SampleType>(array, '', any);
+        result = _.groupBy<SampleType>(array, {a: 42});
+
+        result = _.groupBy<SampleType, number>(array, listIterator);
+        result = _.groupBy<SampleType, number>(array, listIterator, any);
+        result = _.groupBy<SampleType, boolean>(array, '', true);
+        result = _.groupBy<{a: number}, SampleType>(array, {a: 42});
+
+        result = _.groupBy<SampleType>(list);
+        result = _.groupBy<SampleType>(list, listIterator);
+        result = _.groupBy<SampleType>(list, listIterator, any);
+        result = _.groupBy<SampleType>(list, '');
+        result = _.groupBy<SampleType>(list, '', any);
+        result = _.groupBy<SampleType>(list, {a: 42});
+
+        result = _.groupBy<SampleType, number>(list, listIterator);
+        result = _.groupBy<SampleType, number>(list, listIterator, any);
+        result = _.groupBy<SampleType, boolean>(list, '', true);
+        result = _.groupBy<{a: number}, SampleType>(list, {a: 42});
+
+        result = _.groupBy<SampleType>(dictionary);
+        result = _.groupBy<SampleType>(dictionary, dictionaryIterator);
+        result = _.groupBy<SampleType>(dictionary, dictionaryIterator, any);
+        result = _.groupBy<SampleType>(dictionary, '');
+        result = _.groupBy<SampleType>(dictionary, '', any);
+        result = _.groupBy<SampleType>(dictionary, {a: 42});
+
+        result = _.groupBy<SampleType, number>(dictionary, dictionaryIterator);
+        result = _.groupBy<SampleType, number>(dictionary, dictionaryIterator, any);
+        result = _.groupBy<SampleType, boolean>(dictionary, '', true);
+        result = _.groupBy<{a: number}, SampleType>(dictionary, {a: 42});
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<string[]>>;
+
+        result = _('').groupBy();
+        result = _('').groupBy<number>(stringIterator);
+        result = _('').groupBy<number>(stringIterator, any);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<SampleType[]>>;
+
+        result = _(array).groupBy();
+        result = _(array).groupBy<number>(listIterator);
+        result = _(array).groupBy<number>(listIterator, any);
+        result = _(array).groupBy('');
+        result = _(array).groupBy<boolean>('', true);
+        result = _(array).groupBy<{a: number}>({a: 42});
+
+        result = _(list).groupBy<SampleType>();
+        result = _(list).groupBy<SampleType>(listIterator);
+        result = _(list).groupBy<SampleType>(listIterator, any);
+        result = _(list).groupBy<SampleType>('');
+        result = _(list).groupBy<SampleType>('', any);
+        result = _(list).groupBy<SampleType>({a: 42});
+
+        result = _(list).groupBy<SampleType, number>(listIterator);
+        result = _(list).groupBy<SampleType, number>(listIterator, any);
+        result = _(list).groupBy<SampleType, boolean>('', true);
+        result = _(list).groupBy<{a: number}, SampleType>({a: 42});
+
+        result = _(dictionary).groupBy<SampleType>();
+        result = _(dictionary).groupBy<SampleType>(dictionaryIterator);
+        result = _(dictionary).groupBy<SampleType>(dictionaryIterator, any);
+        result = _(dictionary).groupBy<SampleType>('');
+        result = _(dictionary).groupBy<SampleType>('', any);
+        result = _(dictionary).groupBy<SampleType>({a: 42});
+
+        result = _(dictionary).groupBy<SampleType, number>(dictionaryIterator);
+        result = _(dictionary).groupBy<SampleType, number>(dictionaryIterator, any);
+        result = _(dictionary).groupBy<SampleType, boolean>('', true);
+        result = _(dictionary).groupBy<{a: number}, SampleType>({a: 42});
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<string[]>>;
+
+        result = _('').chain().groupBy();
+        result = _('').chain().groupBy<number>(stringIterator);
+        result = _('').chain().groupBy<number>(stringIterator, any);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<SampleType[]>>;
+
+        result = _(array).chain().groupBy();
+        result = _(array).chain().groupBy<number>(listIterator);
+        result = _(array).chain().groupBy<number>(listIterator, any);
+        result = _(array).chain().groupBy('');
+        result = _(array).chain().groupBy<boolean>('', true);
+        result = _(array).chain().groupBy<{a: number}>({a: 42});
+
+        result = _(list).chain().groupBy<SampleType>();
+        result = _(list).chain().groupBy<SampleType>(listIterator);
+        result = _(list).chain().groupBy<SampleType>(listIterator, any);
+        result = _(list).chain().groupBy<SampleType>('');
+        result = _(list).chain().groupBy<SampleType>('', any);
+        result = _(list).chain().groupBy<SampleType>({a: 42});
+
+        result = _(list).chain().groupBy<SampleType, number>(listIterator);
+        result = _(list).chain().groupBy<SampleType, number>(listIterator, any);
+        result = _(list).chain().groupBy<SampleType, boolean>('', true);
+        result = _(list).chain().groupBy<{a: number}, SampleType>({a: 42});
+
+        result = _(dictionary).chain().groupBy<SampleType>();
+        result = _(dictionary).chain().groupBy<SampleType>(dictionaryIterator);
+        result = _(dictionary).chain().groupBy<SampleType>(dictionaryIterator, any);
+        result = _(dictionary).chain().groupBy<SampleType>('');
+        result = _(dictionary).chain().groupBy<SampleType>('', any);
+        result = _(dictionary).chain().groupBy<SampleType>({a: 42});
+
+        result = _(dictionary).chain().groupBy<SampleType, number>(dictionaryIterator);
+        result = _(dictionary).chain().groupBy<SampleType, number>(dictionaryIterator, any);
+        result = _(dictionary).chain().groupBy<SampleType, boolean>('', true);
+        result = _(dictionary).chain().groupBy<{a: number}, SampleType>({a: 42});
+    }
+}
+
+// _.include
+module TestInclude {
+    type SampleType = {a: string; b: number; c: boolean;};
+
+    let array: SampleType[];
+    let list: _.List<SampleType>;
+    let dictionary: _.Dictionary<SampleType>;
+
+    let target: SampleType;
+
+    {
+        let result: boolean;
+
+        result = _.include<SampleType>(array, target);
+        result = _.include<SampleType>(array, target, 42);
+
+        result = _.include<SampleType>(list, target);
+        result = _.include<SampleType>(list, target, 42);
+
+        result = _.include<SampleType>(dictionary, target);
+        result = _.include<SampleType>(dictionary, target, 42);
+
+        result = _(array).include(target);
+        result = _(array).include(target, 42);
+
+        result = _(list).include<SampleType>(target);
+        result = _(list).include<SampleType>(target, 42);
+
+        result = _(dictionary).include<SampleType>(target);
+        result = _(dictionary).include<SampleType>(target, 42);
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<boolean>;
+
+        result = _(array).chain().include(target);
+        result = _(array).chain().include(target, 42);
+
+        result = _(list).chain().include<SampleType>(target);
+        result = _(list).chain().include<SampleType>(target, 42);
+
+        result = _(dictionary).chain().include<SampleType>(target);
+        result = _(dictionary).chain().include<SampleType>(target, 42);
+    }
+}
+
+// _.includes
+module TestIncludes {
+    type SampleType = {a: string; b: number; c: boolean;};
+
+    let array: SampleType[];
+    let list: _.List<SampleType>;
+    let dictionary: _.Dictionary<SampleType>;
+
+    let target: SampleType;
+
+    {
+        let result: boolean;
+
+        result = _.includes<SampleType>(array, target);
+        result = _.includes<SampleType>(array, target, 42);
+
+        result = _.includes<SampleType>(list, target);
+        result = _.includes<SampleType>(list, target, 42);
+
+        result = _.includes<SampleType>(dictionary, target);
+        result = _.includes<SampleType>(dictionary, target, 42);
+
+        result = _(array).includes(target);
+        result = _(array).includes(target, 42);
+
+        result = _(list).includes<SampleType>(target);
+        result = _(list).includes<SampleType>(target, 42);
+
+        result = _(dictionary).includes<SampleType>(target);
+        result = _(dictionary).includes<SampleType>(target, 42);
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<boolean>;
+
+        result = _(array).chain().includes(target);
+        result = _(array).chain().includes(target, 42);
+
+        result = _(list).chain().includes<SampleType>(target);
+        result = _(list).chain().includes<SampleType>(target, 42);
+
+        result = _(dictionary).chain().includes<SampleType>(target);
+        result = _(dictionary).chain().includes<SampleType>(target, 42);
+    }
+}
 
 result = <_.Dictionary<IKey>>_.indexBy(keys, 'dir');
 result = <_.Dictionary<IKey>>_.indexBy(keys, function (key) { return String.fromCharCode(key.code); });
@@ -3281,13 +4020,103 @@ result = <ABC>_({ 'a': 1, 'b': 2, 'c': 3 }).inject<number, ABC>(function (r: ABC
 result = <number[]>_.reduceRight([[0, 1], [2, 3], [4, 5]], function (a: number[], b: number[]) { return a.concat(b); }, <number[]>[]);
 result = <number[]>_.foldr([[0, 1], [2, 3], [4, 5]], function (a: number[], b: number[]) { return a.concat(b); }, <number[]>[]);
 
-result = <number[]>_.reject([1, 2, 3, 4, 5, 6], function (num) { return num % 2 == 0; });
-result = <IFoodCombined[]>_.reject(foodsCombined, 'organic');
-result = <IFoodCombined[]>_.reject(foodsCombined, { 'type': 'fruit' });
+// _.reject
+module TestReject {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let dictionary: _.Dictionary<TResult>;
 
-result = <number[]>_([1, 2, 3, 4, 5, 6]).reject(function (num) { return num % 2 == 0; }).value();
-result = <IFoodCombined[]>_(foodsCombined).reject('organic').value();
-result = <IFoodCombined[]>_(foodsCombined).reject({ 'type': 'fruit' }).value();
+    let stringIterator: (char: string, index: number, string: string) => any;
+    let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any;
+    let dictionaryIterator: (value: TResult, key: string, collection: _.Dictionary<TResult>) => any;
+
+    {
+        let result: string[];
+
+        result = _.reject('', stringIterator);
+        result = _.reject('', stringIterator, any);
+    }
+
+    {
+        let result: TResult[];
+
+        result = _.reject<TResult>(array, listIterator);
+        result = _.reject<TResult>(array, listIterator, any);
+        result = _.reject<TResult>(array, '');
+        result = _.reject<TResult>(array, '', any);
+        result = _.reject<{a: number}, TResult>(array, {a: 42});
+
+        result = _.reject<TResult>(list, listIterator);
+        result = _.reject<TResult>(list, listIterator, any);
+        result = _.reject<TResult>(list, '');
+        result = _.reject<TResult>(list, '', any);
+        result = _.reject<{a: number}, TResult>(list, {a: 42});
+
+        result = _.reject<TResult>(dictionary, dictionaryIterator);
+        result = _.reject<TResult>(dictionary, dictionaryIterator, any);
+        result = _.reject<TResult>(dictionary, '');
+        result = _.reject<TResult>(dictionary, '', any);
+        result = _.reject<{a: number}, TResult>(dictionary, {a: 42});
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<string>;
+
+        result = _('').reject(stringIterator);
+        result = _('').reject(stringIterator, any);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<TResult>;
+
+        result = _(array).reject(listIterator);
+        result = _(array).reject(listIterator, any);
+        result = _(array).reject('');
+        result = _(array).reject('', any);
+        result = _(array).reject<{a: number}>({a: 42});
+
+        result = _(list).reject<TResult>(listIterator);
+        result = _(list).reject<TResult>(listIterator, any);
+        result = _(list).reject<TResult>('');
+        result = _(list).reject<TResult>('', any);
+        result = _(list).reject<{a: number}, TResult>({a: 42});
+
+        result = _(dictionary).reject<TResult>(dictionaryIterator);
+        result = _(dictionary).reject<TResult>(dictionaryIterator, any);
+        result = _(dictionary).reject<TResult>('');
+        result = _(dictionary).reject<TResult>('', any);
+        result = _(dictionary).reject<{a: number}, TResult>({a: 42});
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<string>;
+
+        result = _('').chain().reject(stringIterator);
+        result = _('').chain().reject(stringIterator, any);
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<TResult>;
+
+        result = _(array).chain().reject(listIterator);
+        result = _(array).chain().reject(listIterator, any);
+        result = _(array).chain().reject('');
+        result = _(array).chain().reject('', any);
+        result = _(array).chain().reject<{a: number}>({a: 42});
+
+        result = _(list).chain().reject<TResult>(listIterator);
+        result = _(list).chain().reject<TResult>(listIterator, any);
+        result = _(list).chain().reject<TResult>('');
+        result = _(list).chain().reject<TResult>('', any);
+        result = _(list).chain().reject<{a: number}, TResult>({a: 42});
+
+        result = _(dictionary).chain().reject<TResult>(dictionaryIterator);
+        result = _(dictionary).chain().reject<TResult>(dictionaryIterator, any);
+        result = _(dictionary).chain().reject<TResult>('');
+        result = _(dictionary).chain().reject<TResult>('', any);
+        result = _(dictionary).chain().reject<{a: number}, TResult>({a: 42});
+    }
+}
 
 result = <number>_.sample([1, 2, 3, 4]);
 result = <number[]>_.sample([1, 2, 3, 4], 2);
@@ -3296,6 +4125,104 @@ result = <_.LoDashImplicitArrayWrapper<number>>_([1, 2, 3, 4]).sample(2);
 result = <number>_([1, 2, 3, 4]).sample().value();
 result = <number[]>_([1, 2, 3, 4]).sample(2).value();
 
+// _.select
+module TestSelect {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let dictionary: _.Dictionary<TResult>;
+
+    let stringIterator: (char: string, index: number, string: string) => any;
+    let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any;
+    let dictionaryIterator: (value: TResult, key: string, collection: _.Dictionary<TResult>) => any;
+
+    {
+        let result: string[];
+
+        result = _.select('', stringIterator);
+        result = _.select('', stringIterator, any);
+    }
+
+    {
+        let result: TResult[];
+
+        result = _.select<TResult>(array, listIterator);
+        result = _.select<TResult>(array, listIterator, any);
+        result = _.select<TResult>(array, '');
+        result = _.select<TResult>(array, '', any);
+        result = _.select<{a: number}, TResult>(array, {a: 42});
+
+        result = _.select<TResult>(list, listIterator);
+        result = _.select<TResult>(list, listIterator, any);
+        result = _.select<TResult>(list, '');
+        result = _.select<TResult>(list, '', any);
+        result = _.select<{a: number}, TResult>(list, {a: 42});
+
+        result = _.select<TResult>(dictionary, dictionaryIterator);
+        result = _.select<TResult>(dictionary, dictionaryIterator, any);
+        result = _.select<TResult>(dictionary, '');
+        result = _.select<TResult>(dictionary, '', any);
+        result = _.select<{a: number}, TResult>(dictionary, {a: 42});
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<string>;
+
+        result = _('').select(stringIterator);
+        result = _('').select(stringIterator, any);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<TResult>;
+
+        result = _(array).select(listIterator);
+        result = _(array).select(listIterator, any);
+        result = _(array).select('');
+        result = _(array).select('', any);
+        result = _(array).select<{a: number}>({a: 42});
+
+        result = _(list).select<TResult>(listIterator);
+        result = _(list).select<TResult>(listIterator, any);
+        result = _(list).select<TResult>('');
+        result = _(list).select<TResult>('', any);
+        result = _(list).select<{a: number}, TResult>({a: 42});
+
+        result = _(dictionary).select<TResult>(dictionaryIterator);
+        result = _(dictionary).select<TResult>(dictionaryIterator, any);
+        result = _(dictionary).select<TResult>('');
+        result = _(dictionary).select<TResult>('', any);
+        result = _(dictionary).select<{a: number}, TResult>({a: 42});
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<string>;
+
+        result = _('').chain().select(stringIterator);
+        result = _('').chain().select(stringIterator, any);
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<TResult>;
+
+        result = _(array).chain().select(listIterator);
+        result = _(array).chain().select(listIterator, any);
+        result = _(array).chain().select('');
+        result = _(array).chain().select('', any);
+        result = _(array).chain().select<{a: number}>({a: 42});
+
+        result = _(list).chain().select<TResult>(listIterator);
+        result = _(list).chain().select<TResult>(listIterator, any);
+        result = _(list).chain().select<TResult>('');
+        result = _(list).chain().select<TResult>('', any);
+        result = _(list).chain().select<{a: number}, TResult>({a: 42});
+
+        result = _(dictionary).chain().select<TResult>(dictionaryIterator);
+        result = _(dictionary).chain().select<TResult>(dictionaryIterator, any);
+        result = _(dictionary).chain().select<TResult>('');
+        result = _(dictionary).chain().select<TResult>('', any);
+        result = _(dictionary).chain().select<{a: number}, TResult>({a: 42});
+    }
+}
+
 // _.shuffle
 module TestShuffle {
     let array: TResult[];
@@ -3345,11 +4272,37 @@ module TestShuffle {
     }
 }
 
-result = <number>_.size([1, 2]);
-result = <number>_([1, 2]).size();
-result = <number>_.size({ 'one': 1, 'two': 2, 'three': 3 });
-result = <number>_({ 'one': 1, 'two': 2, 'three': 3 }).size();
-result = <number>_.size('curly');
+// _.size
+module TestSize {
+    type SampleType = {a: string; b: number; c: boolean;};
+
+    let array: SampleType[];
+    let list: _.List<SampleType>;
+    let dictionary: _.Dictionary<SampleType>;
+
+    {
+        let result: number;
+
+        result = _.size<SampleType>(array);
+        result = _.size<SampleType>(list);
+        result = _.size<SampleType>(dictionary);
+        result = _.size('');
+
+        result = _(array).size();
+        result = _(list).size();
+        result = _(dictionary).size();
+        result = _('').size();
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<number>;
+
+        result = _(array).chain().size();
+        result = _(list).chain().size();
+        result = _(dictionary).chain().size();
+        result = _('').chain().size();
+    }
+}
 
 // _.some
 module TestSome {
@@ -3576,8 +4529,34 @@ module TestAfter {
 }
 
 // _.ary
-result = <number[]>['6', '8', '10'].map(_.ary<(s: string) => number>(parseInt, 1));
-result = <number[]>['6', '8', '10'].map(_(parseInt).ary<(s: string) => number>(1).value());
+module TestAry {
+    type SampleFunc = (a: number, b: string) => boolean;
+
+    let func: SampleFunc;
+
+    {
+        let result: SampleFunc;
+
+        result = _.ary<SampleFunc>(func);
+        result = _.ary<SampleFunc>(func, 2);
+        result = _.ary<SampleFunc, SampleFunc>(func);
+        result = _.ary<SampleFunc, SampleFunc>(func, 2);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<SampleFunc>;
+
+        result = _(func).ary<SampleFunc>();
+        result = _(func).ary<SampleFunc>(2);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<SampleFunc>;
+
+        result = _(func).chain().ary<SampleFunc>();
+        result = _(func).chain().ary<SampleFunc>(2);
+    }
+}
 
 // _.backflow
 module TestBackflow {
@@ -3777,15 +4756,70 @@ source.addEventListener('message', <_.LoDashImplicitObjectWrapper<Function>>_(fu
     'maxWait': 1000
 }), false);
 
-var returnedDebounce = _.throttle(function (a: any) { return a * 5; }, 5);
-returnedThrottled(4);
+// _.defer
+module TestDefer {
+    type SampleFunc = (a: number, b: string) => boolean;
 
-result = <number>_.defer(function () { console.log('deferred'); });
-result = <_.LoDashImplicitWrapper<number>>_(function () { console.log('deferred'); }).defer();
+    let func: SampleFunc;
 
-var log = _.bind(console.log, console);
-result = <number>_.delay(log, 1000, 'logged later');
-result = <_.LoDashImplicitWrapper<number>>_(log).delay(1000, 'logged later');
+    {
+        let result: number;
+
+        result = _.defer<SampleFunc>(func);
+        result = _.defer<SampleFunc>(func, any);
+        result = _.defer<SampleFunc>(func, any, any);
+        result = _.defer<SampleFunc>(func, any, any, any);
+    }
+
+    {
+        let result: _.LoDashImplicitWrapper<number>;
+
+        result = _(func).defer();
+        result = _(func).defer(any);
+        result = _(func).defer(any, any);
+        result = _(func).defer(any, any, any);
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<number>;
+
+        result = _(func).chain().defer();
+        result = _(func).chain().defer(any);
+        result = _(func).chain().defer(any, any);
+        result = _(func).chain().defer(any, any, any);
+    }
+}
+
+// _.delay
+module TestDelay {
+    type SampleFunc = (a: number, b: string) => boolean;
+
+    let func: SampleFunc;
+
+    {
+        let result: number;
+
+        result = _.delay<SampleFunc>(func, 1);
+        result = _.delay<SampleFunc>(func, 1, 2);
+        result = _.delay<SampleFunc>(func, 1, 2, '');
+    }
+
+    {
+        let result: _.LoDashImplicitWrapper<number>;
+
+        result = _(func).delay(1);
+        result = _(func).delay(1, 2);
+        result = _(func).delay(1, 2, '');
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<number>;
+
+        result = _(func).chain().delay(1);
+        result = _(func).chain().delay(1, 2);
+        result = _(func).chain().delay(1, 2, '');
+    }
+}
 
 // _.flow
 var testFlowSquareFn = (n: number) => n * n;
@@ -3836,29 +4870,59 @@ result = <TestMemoizedResultFn>_.memoize<TestMemoizedResultFn>(testMemoizeFn, te
 result = <TestMemoizedResultFn>(_(testMemoizeFn).memoize<TestMemoizedResultFn>().value());
 result = <TestMemoizedResultFn>(_(testMemoizeFn).memoize<TestMemoizedResultFn>(testMemoizeResolverFn).value());
 
-var returnedMemoize = _.throttle(function (a: any) { return a * 5; }, 5);
-returnedMemoize(4);
-
 // _.modArgs
-function modArgsFn1(n: number): string {return n.toString()}
-function modArgsFn2(n: boolean): string {return n.toString()}
-interface ModArgsFunc {
-    (x: string, y: string): string[];
+module TestModArgs {
+    type Func1 = (a: boolean) => boolean;
+    type Func2 = (a: boolean, b: boolean) => boolean;
+
+    let func1: Func1;
+    let func2: Func2;
+
+    let transform1: (a: string) => boolean;
+    let transform2: (b: number) => boolean;
+
+    {
+        let result: (a: string) => boolean;
+
+        result = _.modArgs<Func1, (a: string) => boolean>(func1, transform1);
+        result = _.modArgs<Func1, (a: string) => boolean>(func1, [transform1]);
+    }
+
+    {
+        let result: (a: string, b: number) => boolean;
+
+        result = _.modArgs<Func2, (a: string, b: number) => boolean>(func2, transform1, transform2);
+        result = _.modArgs<Func2, (a: string, b: number) => boolean>(func2, [transform1, transform2]);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<(a: string) => boolean>;
+
+        result = _(func1).modArgs<(a: string) => boolean>(transform1);
+        result = _(func1).modArgs<(a: string) => boolean>([transform1]);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<(a: string, b: number) => boolean>;
+
+        result = _(func2).modArgs<(a: string, b: number) => boolean>(transform1, transform2);
+        result = _(func2).modArgs<(a: string, b: number) => boolean>([transform1, transform2]);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<(a: string) => boolean>;
+
+        result = _(func1).chain().modArgs<(a: string) => boolean>(transform1);
+        result = _(func1).chain().modArgs<(a: string) => boolean>([transform1]);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<(a: string, b: number) => boolean>;
+
+        result = _(func2).chain().modArgs<(a: string, b: number) => boolean>(transform1, transform2);
+        result = _(func2).chain().modArgs<(a: string, b: number) => boolean>([transform1, transform2]);
+    }
 }
-interface ModArgsResult {
-    (x: number, y: boolean): string[]
-}
-result = <ModArgsResult>_.modArgs<ModArgsFunc, ModArgsResult>((x: string, y: string) => [x, y], modArgsFn1, modArgsFn2);
-result = <string[]>result(1, true);
-
-result = <ModArgsResult>_.modArgs<ModArgsFunc, ModArgsResult>((x: string, y: string) => [x, y], [modArgsFn1, modArgsFn2]);
-result = <string[]>result(1, true);
-
-result = <ModArgsResult>_<ModArgsFunc>((x: string, y: string) => [x, y]).modArgs<ModArgsResult>(modArgsFn1, modArgsFn2).value();
-result = <string[]>result(1, true);
-
-result = <ModArgsResult>_<ModArgsFunc>((x: string, y: string) => [x, y]).modArgs<ModArgsResult>([modArgsFn1, modArgsFn2]).value();
-result = <string[]>result(1, true);
 
 // _.negate
 interface TestNegatePredicate {
@@ -3900,9 +4964,6 @@ module TestOnce {
     }
 }
 
-var returnedOnce = _.throttle(function (a: any) { return a * 5; }, 5);
-returnedOnce(4);
-
 var greetPartial = function (greeting: string, name: string) { return greeting + ' ' + name; };
 var hi = _.partial(greetPartial, 'hi');
 hi('moe');
@@ -3927,17 +4988,37 @@ result = <string[]>(_.rearg<TestReargResultFn>(testReargFn, [2, 0, 1]))('b', 'c'
 result = <string[]>(_(testReargFn).rearg<TestReargResultFn>(2, 0, 1).value())('b', 'c', 'a');
 result = <string[]>(_(testReargFn).rearg<TestReargResultFn>([2, 0, 1]).value())('b', 'c', 'a');
 
-//_.restParam
-var testRestParamFn = (a: string, b: string, c: number[]) => a + ' ' + b + ' ' + c.join(' ');
-interface testRestParamFunc {
-    (a: string, b: string, c: number[]): string;
+// _.restParam
+module TestRestParam {
+    type Func = (a: string, b: number[]) => boolean;
+    type ResultFunc = (a: string, ...b: number[]) => boolean;
+
+    let func: Func;
+
+    {
+        let result: ResultFunc;
+
+        result = _.restParam<ResultFunc>(func);
+        result = _.restParam<ResultFunc>(func, 1);
+
+        result = _.restParam<ResultFunc, Func>(func);
+        result = _.restParam<ResultFunc, Func>(func, 1);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<ResultFunc>;
+
+        result = _(func).restParam<ResultFunc>();
+        result = _(func).restParam<ResultFunc>(1);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<ResultFunc>;
+
+        result = _(func).chain().restParam<ResultFunc>();
+        result = _(func).chain().restParam<ResultFunc>(1);
+    }
 }
-interface testRestParamResult {
-    (a: string, b: string, ...c: number[]): string;
-}
-result = <string>(_.restParam<testRestParamResult, testRestParamFunc>(testRestParamFn, 2))('a', 'b', 1, 2, 3);
-result = <string>(_.restParam<testRestParamResult>(testRestParamFn, 2))('a', 'b', 1, 2, 3);
-result = <string>(_(testRestParamFn).restParam<testRestParamResult>(2).value())('a', 'b', 1, 2, 3);
 
 //_.spread
 var testSpreadFn = (who: string, what: string) => who + ' says ' + what;
@@ -3947,15 +5028,49 @@ interface TestSpreadResultFn {
 result = <string>(_.spread<TestSpreadResultFn>(testSpreadFn))(['fred', 'hello']);
 result = <string>(_(testSpreadFn).spread<TestSpreadResultFn>().value())(['fred', 'hello']);
 
-var throttled = _.throttle(function () { }, 100);
-jQuery(window).on('scroll', throttled);
+// _.throttle
+module TestThrottle {
+    interface SampleFunc {
+        (n: number, s: string): boolean;
+    }
 
-jQuery('.interactive').on('click', _.throttle(function () { }, 300000, {
-    'trailing': false
-}));
+    interface Options {
+        leading?: boolean;
+        trailing?: boolean;
+    }
 
-var returnedThrottled = _.throttle(function (a: any) { return a * 5; }, 5);
-returnedThrottled(4);
+    interface ResultFunc {
+        (n: number, s: string): boolean;
+        cancel(): void;
+    }
+
+    let func: SampleFunc;
+    let options: Options;
+
+    {
+        let result: ResultFunc;
+
+        result = _.throttle<SampleFunc>(func);
+        result = _.throttle<SampleFunc>(func, 42);
+        result = _.throttle<SampleFunc>(func, 42, options);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<ResultFunc>;
+
+        result = _(func).throttle();
+        result = _(func).throttle(42);
+        result = _(func).throttle(42, options);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<ResultFunc>;
+
+        result = _(func).chain().throttle();
+        result = _(func).chain().throttle(42);
+        result = _(func).chain().throttle(42, options);
+    }
+}
 
 var helloWrap = function (name: string) { return 'hello ' + name; };
 var helloWrap2 = _.wrap(helloWrap, function (func) {
@@ -4077,16 +5192,44 @@ module TestEq {
 }
 
 // _.gt
-result = <boolean>_.gt(1, 2);
-result = <boolean>_(1).gt(2);
-result = <boolean>_([]).gt(2);
-result = <boolean>_({}).gt(2);
+module TestGt {
+    {
+        let result: boolean;
+
+        result = _.gt(any, any);
+        result = _(1).gt(any);
+        result = _([]).gt(any);
+        result = _({}).gt(any);
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<boolean>;
+
+        result = _(1).chain().gt(any);
+        result = _([]).chain().gt(any);
+        result = _({}).chain().gt(any);
+    }
+}
 
 // _.gte
-result = <boolean>_.gte(1, 2);
-result = <boolean>_(1).gte(2);
-result = <boolean>_([]).gte(2);
-result = <boolean>_({}).gte(2);
+module TestGte {
+    {
+        let result: boolean;
+
+        result = _.gte(any, any);
+        result = _(1).gte(any);
+        result = _([]).gte(any);
+        result = _({}).gte(any);
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<boolean>;
+
+        result = _(1).chain().gte(any);
+        result = _([]).chain().gte(any);
+        result = _({}).chain().gte(any);
+    }
+}
 
 // _.isArguments
 result = <boolean>_.isArguments(any);
@@ -4157,10 +5300,25 @@ result = <boolean>_({}).isDate();
 }
 
 // _.isElement
-result = <boolean>_.isElement(any);
-result = <boolean>_(42).isElement();
-result = <boolean>_<any>([]).isElement();
-result = <boolean>_({}).isElement();
+module TestIsElement {
+    {
+        let result: boolean;
+
+        result = _.isElement(any);
+
+        result = _(42).isElement();
+        result = _<any>([]).isElement();
+        result = _({}).isElement();
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<boolean>;
+
+        result = _(42).chain().isElement();
+        result = _<any>([]).chain().isElement();
+        result = _({}).chain().isElement();
+    }
+}
 
 // _.isEmpty
 result = <boolean>_.isEmpty([1, 2, 3]);
@@ -4259,10 +5417,25 @@ result = <boolean>_(Array.prototype.push).isNative();
 }
 
 // _.isNull
-result = <boolean>_.isNull(any);
-result = <boolean>_(1).isNull();
-result = <boolean>_<any>([]).isNull();
-result = <boolean>_({}).isNull();
+module TestIsNull {
+    {
+        let result: boolean;
+
+        result = _.isNull(any);
+
+        result = _(1).isNull();
+        result = _<any>([]).isNull();
+        result = _({}).isNull();
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<boolean>;
+
+        result = _(1).chain().isNull();
+        result = _<any>([]).chain().isNull();
+        result = _({}).chain().isNull();
+    }
+}
 
 // _.isNumber
 result = <boolean>_.isNumber(any);
@@ -4320,8 +5493,20 @@ result = <boolean>_({}).isString();
 }
 
 // _.isTypedArray
-result = <boolean>_.isTypedArray([]);
-result = <boolean>_([]).isTypedArray();
+module TestIsTypedArray {
+    {
+        let result: boolean;
+
+        result = _.isTypedArray([]);
+        result = _([]).isTypedArray();
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<boolean>;
+
+        result = _([]).chain().isTypedArray();
+    }
+}
 
 // _.isUndefined
 result = <boolean>_.isUndefined(any);
@@ -4330,16 +5515,44 @@ result = <boolean>_<any>([]).isUndefined();
 result = <boolean>_({}).isUndefined();
 
 // _.lt
-result = <boolean>_.lt(1, 2);
-result = <boolean>_(1).lt(2);
-result = <boolean>_([]).lt(2);
-result = <boolean>_({}).lt(2);
+module TestLt {
+    {
+        let result: boolean;
+
+        result = _.lt(any, any);
+        result = _(1).lt(any);
+        result = _([]).lt(any);
+        result = _({}).lt(any);
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<boolean>;
+
+        result = _(1).chain().lt(any);
+        result = _([]).chain().lt(any);
+        result = _({}).chain().lt(any);
+    }
+}
 
 // _.lte
-result = <boolean>_.lte(1, 2);
-result = <boolean>_(1).lte(2);
-result = <boolean>_([]).lte(2);
-result = <boolean>_({}).lte(2);
+module TestLte {
+    {
+        let result: boolean;
+
+        result = _.lte(any, any);
+        result = _(1).lte(any);
+        result = _([]).lte(any);
+        result = _({}).lte(any);
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<boolean>;
+
+        result = _(1).chain().lte(any);
+        result = _([]).chain().lte(any);
+        result = _({}).chain().lte(any);
+    }
+}
 
 // _.toArray
 module TestToArray {
@@ -5179,10 +6392,9 @@ module TestExtend {
 
 // _.findKey
 module TestFindKey {
-    let result: string;
-
     {
         let predicateFn: (value: any, key?: string, object?: {}) => boolean;
+        let result: string;
 
         result = _.findKey<{a: string;}>({a: ''});
 
@@ -5209,6 +6421,7 @@ module TestFindKey {
 
     {
         let predicateFn: (value: string, key?: string, collection?: _.Dictionary<string>) => boolean;
+        let result: string;
 
         result = _.findKey<string, {a: string;}>({a: ''}, predicateFn);
         result = _.findKey<string, {a: string;}>({a: ''}, predicateFn, any);
@@ -5216,14 +6429,37 @@ module TestFindKey {
         result = _<{a: string;}>({a: ''}).findKey<string>(predicateFn);
         result = _<{a: string;}>({a: ''}).findKey<string>(predicateFn, any);
     }
+
+    {
+        let predicateFn: (value: any, key?: string, object?: {}) => boolean;
+        let result: _.LoDashExplicitWrapper<string>;
+
+        result = _<{a: string;}>({a: ''}).chain().findKey();
+
+        result = _<{a: string;}>({a: ''}).chain().findKey(predicateFn);
+        result = _<{a: string;}>({a: ''}).chain().findKey(predicateFn, any);
+
+
+        result = _<{a: string;}>({a: ''}).chain().findKey('');
+        result = _<{a: string;}>({a: ''}).chain().findKey('', any);
+
+        result = _<{a: string;}>({a: ''}).chain().findKey<{a: number;}>({a: 42});
+    }
+
+    {
+        let predicateFn: (value: string, key?: string, collection?: _.Dictionary<string>) => boolean;
+        let result: _.LoDashExplicitWrapper<string>;
+
+        result = _<{a: string;}>({a: ''}).chain().findKey<string>(predicateFn);
+        result = _<{a: string;}>({a: ''}).chain().findKey<string>(predicateFn, any);
+    }
 }
 
 // _.findLastKey
 module TestFindLastKey {
-    let result: string;
-
     {
         let predicateFn: (value: any, key?: string, object?: {}) => boolean;
+        let result: string;
 
         result = _.findLastKey<{a: string;}>({a: ''});
 
@@ -5250,6 +6486,7 @@ module TestFindLastKey {
 
     {
         let predicateFn: (value: string, key?: string, collection?: _.Dictionary<string>) => boolean;
+        let result: string;
 
         result = _.findLastKey<string, {a: string;}>({a: ''}, predicateFn);
         result = _.findLastKey<string, {a: string;}>({a: ''}, predicateFn, any);
@@ -5257,51 +6494,228 @@ module TestFindLastKey {
         result = _<{a: string;}>({a: ''}).findLastKey<string>(predicateFn);
         result = _<{a: string;}>({a: ''}).findLastKey<string>(predicateFn, any);
     }
+
+    {
+        let predicateFn: (value: any, key?: string, object?: {}) => boolean;
+        let result: _.LoDashExplicitWrapper<string>;
+
+        result = _<{a: string;}>({a: ''}).chain().findLastKey();
+
+        result = _<{a: string;}>({a: ''}).chain().findLastKey(predicateFn);
+        result = _<{a: string;}>({a: ''}).chain().findLastKey(predicateFn, any);
+
+
+        result = _<{a: string;}>({a: ''}).chain().findLastKey('');
+        result = _<{a: string;}>({a: ''}).chain().findLastKey('', any);
+
+        result = _<{a: string;}>({a: ''}).chain().findLastKey<{a: number;}>({a: 42});
+    }
+
+    {
+        let predicateFn: (value: string, key?: string, collection?: _.Dictionary<string>) => boolean;
+        let result: _.LoDashExplicitWrapper<string>;
+
+        result = _<{a: string;}>({a: ''}).chain().findLastKey<string>(predicateFn);
+        result = _<{a: string;}>({a: ''}).chain().findLastKey<string>(predicateFn, any);
+    }
 }
 
-result = <Dog>_.forIn(new Dog('Dagny'), function (value, key) {
-    console.log(key);
-});
+// _.forIn
+module TestForIn {
+    type SampleObject = {a: number; b: string; c: boolean;};
 
-result = <_.LoDashImplicitObjectWrapper<Dog>>_(new Dog('Dagny')).forIn(function (value, key) {
-    console.log(key);
-});
+    let dictionary: _.Dictionary<number>;
+    let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => any;
 
-result = <Dog>_.forInRight(new Dog('Dagny'), function (value, key) {
-    console.log(key);
-});
+    let object: SampleObject;
+    let objectIterator: (element: any, key?: string, collection?: any) => any;
 
-result = <_.LoDashImplicitObjectWrapper<Dog>>_(new Dog('Dagny')).forInRight(function (value, key) {
-    console.log(key);
-});
+    {
+        let result: _.Dictionary<number>;
 
-interface ZeroOne {
-    0: string;
-    1: string;
-    one: string;
+        result = _.forIn<number>(dictionary);
+        result = _.forIn<number>(dictionary, dictionaryIterator);
+        result = _.forIn<number>(dictionary, dictionaryIterator, any);
+    }
+
+    {
+        let result: SampleObject;
+
+        result = _.forIn<SampleObject>(object);
+        result = _.forIn<SampleObject>(object, objectIterator);
+        result = _.forIn<SampleObject>(object, objectIterator, any);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
+
+        result = _(dictionary).forIn<number>();
+        result = _(dictionary).forIn<number>(dictionaryIterator);
+        result = _(dictionary).forIn<number>(dictionaryIterator, any);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
+
+        result = _(dictionary).chain().forIn<number>();
+        result = _(dictionary).chain().forIn<number>(dictionaryIterator);
+        result = _(dictionary).chain().forIn<number>(dictionaryIterator, any);
+    }
 }
 
-result = <ZeroOne>_.forOwn(<ZeroOne>{ '0': 'zero', '1': 'one', 'one': '2' }, function (num, key) {
-    console.log(key);
-});
+// _.forInRight
+module TestForInRight {
+    type SampleObject = {a: number; b: string; c: boolean;};
 
-result = <_.LoDashImplicitObjectWrapper<ZeroOne>>_({ '0': 'zero', '1': 'one', 'length': 2 }).forOwn(function (num, key) {
-    console.log(key);
-});
+    let dictionary: _.Dictionary<number>;
+    let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => any;
 
-result = <any>_.forOwnRight({ '0': 'zero', '1': 'one', 'length': 2 }, function (num, key) {
-    console.log(key);
-});
+    let object: SampleObject;
+    let objectIterator: (element: any, key?: string, collection?: any) => any;
 
-result = <_.LoDashImplicitObjectWrapper<ZeroOne>>_({ '0': 'zero', '1': 'one', 'length': 2 }).forOwnRight(function (num, key) {
-    console.log(key);
-});
+    {
+        let result: _.Dictionary<number>;
 
-result = <string[]>_.functions(_);
-result = <string[]>_.methods(_);
+        result = _.forInRight<number>(dictionary);
+        result = _.forInRight<number>(dictionary, dictionaryIterator);
+        result = _.forInRight<number>(dictionary, dictionaryIterator, any);
+    }
 
-result = <_.LoDashImplicitArrayWrapper<string>>_(_).functions();
-result = <_.LoDashImplicitArrayWrapper<string>>_(_).methods();
+    {
+        let result: SampleObject;
+
+        result = _.forInRight<SampleObject>(object);
+        result = _.forInRight<SampleObject>(object, objectIterator);
+        result = _.forInRight<SampleObject>(object, objectIterator, any);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
+
+        result = _(dictionary).forInRight<number>();
+        result = _(dictionary).forInRight<number>(dictionaryIterator);
+        result = _(dictionary).forInRight<number>(dictionaryIterator, any);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
+
+        result = _(dictionary).chain().forInRight<number>();
+        result = _(dictionary).chain().forInRight<number>(dictionaryIterator);
+        result = _(dictionary).chain().forInRight<number>(dictionaryIterator, any);
+    }
+}
+
+// _.forOwn
+module TestForOwn {
+    type SampleObject = {a: number; b: string; c: boolean;};
+
+    let dictionary: _.Dictionary<number>;
+    let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => any;
+
+    let object: SampleObject;
+    let objectIterator: (element: any, key?: string, collection?: any) => any;
+
+    {
+        let result: _.Dictionary<number>;
+
+        result = _.forOwn<number>(dictionary);
+        result = _.forOwn<number>(dictionary, dictionaryIterator);
+        result = _.forOwn<number>(dictionary, dictionaryIterator, any);
+    }
+
+    {
+        let result: SampleObject;
+
+        result = _.forOwn<SampleObject>(object);
+        result = _.forOwn<SampleObject>(object, objectIterator);
+        result = _.forOwn<SampleObject>(object, objectIterator, any);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
+
+        result = _(dictionary).forOwn<number>();
+        result = _(dictionary).forOwn<number>(dictionaryIterator);
+        result = _(dictionary).forOwn<number>(dictionaryIterator, any);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
+
+        result = _(dictionary).chain().forOwn<number>();
+        result = _(dictionary).chain().forOwn<number>(dictionaryIterator);
+        result = _(dictionary).chain().forOwn<number>(dictionaryIterator, any);
+    }
+}
+
+// _.forOwnRight
+module TestForOwnRight {
+    type SampleObject = {a: number; b: string; c: boolean;};
+
+    let dictionary: _.Dictionary<number>;
+    let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => any;
+
+    let object: SampleObject;
+    let objectIterator: (element: any, key?: string, collection?: any) => any;
+
+    {
+        let result: _.Dictionary<number>;
+
+        result = _.forOwnRight<number>(dictionary);
+        result = _.forOwnRight<number>(dictionary, dictionaryIterator);
+        result = _.forOwnRight<number>(dictionary, dictionaryIterator, any);
+    }
+
+    {
+        let result: SampleObject;
+
+        result = _.forOwnRight<SampleObject>(object);
+        result = _.forOwnRight<SampleObject>(object, objectIterator);
+        result = _.forOwnRight<SampleObject>(object, objectIterator, any);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
+
+        result = _(dictionary).forOwnRight<number>();
+        result = _(dictionary).forOwnRight<number>(dictionaryIterator);
+        result = _(dictionary).forOwnRight<number>(dictionaryIterator, any);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
+
+        result = _(dictionary).chain().forOwnRight<number>();
+        result = _(dictionary).chain().forOwnRight<number>(dictionaryIterator);
+        result = _(dictionary).chain().forOwnRight<number>(dictionaryIterator, any);
+    }
+}
+
+// _.functions
+module TestFunctions {
+    type SampleObject = {a: number; b: string; c: boolean;};
+
+    let object: SampleObject;
+
+    {
+        let result: string[];
+
+        result = _.functions<SampleObject>(object);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<string>;
+
+        result = _(object).functions();
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<string>;
+
+        result = _(object).chain().functions();
+    }
+}
 
 // _.get
 result = <number>_.get<number>({ 'a': [{ 'b': { 'c': 3 } }] }, 'a[0].b.c');
@@ -5319,36 +6733,107 @@ result = <number>_.get<number>({ 'a': [{ 'b': { 'c': 3 } }] }, 'a[0].b.c');
 }
 
 // _.has
-result = <boolean>_.has({}, '');
-result = <boolean>_.has({}, 42);
-result = <boolean>_.has({}, true);
-result = <boolean>_.has({}, ['', 42, true]);
-result = <boolean>_({}).has('');
-result = <boolean>_({}).has(42);
-result = <boolean>_({}).has(true);
-result = <boolean>_({}).has(['', 42, true]);
+module TestHas {
+    type SampleObject = {a: number; b: string; c: boolean;};
+
+    let object: SampleObject;
+
+    {
+        let result: boolean;
+
+        result = _.has<SampleObject>(object, '');
+        result = _.has<SampleObject>(object, 42);
+        result = _.has<SampleObject>(object, true);
+        result = _.has<SampleObject>(object, ['', 42, true]);
+
+        result = _(object).has('');
+        result = _(object).has(42);
+        result = _(object).has(true);
+        result = _(object).has(['', 42, true]);
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<boolean>;
+
+        result = _(object).chain().has('');
+        result = _(object).chain().has(42);
+        result = _(object).chain().has(true);
+        result = _(object).chain().has(['', 42, true]);
+    }
+}
 
 // _.invert
-{
-    let result: TResult;
-    result = _.invert<Object, TResult>({});
-    result = _.invert<Object, TResult>({}, true);
-    result = _({}).invert<TResult>().value();
-    result = _({}).invert<TResult>(true).value();
+module TestInvert {
+    {
+        let result: TResult;
+
+        result = _.invert<Object, TResult>({});
+        result = _.invert<Object, TResult>({}, true);
+
+        result = _.invert<TResult>({});
+        result = _.invert<TResult>({}, true);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<TResult>;
+
+        result = _({}).invert<TResult>();
+        result = _({}).invert<TResult>(true);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<TResult>;
+
+        result = _({}).chain().invert<TResult>();
+        result = _({}).chain().invert<TResult>(true);
+    }
 }
 
-class Stooge {
-    constructor(
-        public name: string,
-        public age: number
-        ) { }
+// _.keys
+module TestKeys {
+    let object: _.Dictionary<any>;
+
+    {
+        let result: string[];
+
+        result = _.keys(object);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<string>;
+
+        result = _(object).keys();
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<string>;
+
+        result = _(object).chain().keys();
+    }
 }
 
-result = <string[]>_.keys({ 'one': 1, 'two': 2, 'three': 3 });
-result = <string[]>_({ 'one': 1, 'two': 2, 'three': 3 }).keys().value();
+// _.keysIn
+module TestKeysIn {
+    let object: _.Dictionary<any>;
 
-result = <string[]>_.keysIn({ 'one': 1, 'two': 2, 'three': 3 });
-result = <string[]>_({ 'one': 1, 'two': 2, 'three': 3 }).keysIn().value();
+    {
+        let result: string[];
+
+        result = _.keysIn(object);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<string>;
+
+        result = _(object).keysIn();
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<string>;
+
+        result = _(object).chain().keysIn();
+    }
+}
 
 // _.mapKeys
 module TestMapKeys {
@@ -5359,43 +6844,80 @@ module TestMapKeys {
     let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => string;
     let dictionaryIterator: (value: TResult, key: string, collection: _.Dictionary<TResult>) => string;
 
-    let result: _.Dictionary<TResult>;
+    {
+        let result: _.Dictionary<TResult>;
 
-    result = _.mapKeys<TResult, string>(array);
-    result = _.mapKeys<TResult, string>(array, listIterator);
-    result = _.mapKeys<TResult, string>(array, listIterator, any);
-    result = _.mapKeys<TResult>(array, '');
-    result = _.mapKeys<TResult, {}>(array, {});
+        result = _.mapKeys<TResult, string>(array);
+        result = _.mapKeys<TResult, string>(array, listIterator);
+        result = _.mapKeys<TResult, string>(array, listIterator, any);
+        result = _.mapKeys<TResult>(array, '');
+        result = _.mapKeys<TResult>(array, '', any);
+        result = _.mapKeys<TResult, {}>(array, {});
 
-    result = _.mapKeys<TResult, string>(list);
-    result = _.mapKeys<TResult, string>(list, listIterator);
-    result = _.mapKeys<TResult, string>(list, listIterator, any);
-    result = _.mapKeys<TResult>(list, '');
-    result = _.mapKeys<TResult, {}>(list, {});
+        result = _.mapKeys<TResult, string>(list);
+        result = _.mapKeys<TResult, string>(list, listIterator);
+        result = _.mapKeys<TResult, string>(list, listIterator, any);
+        result = _.mapKeys<TResult>(list, '');
+        result = _.mapKeys<TResult>(list, '', any);
+        result = _.mapKeys<TResult, {}>(list, {});
 
-    result = _.mapKeys<TResult, string>(dictionary);
-    result = _.mapKeys<TResult, string>(dictionary, dictionaryIterator);
-    result = _.mapKeys<TResult, string>(dictionary, dictionaryIterator, any);
-    result = _.mapKeys<TResult>(dictionary, '');
-    result = _.mapKeys<TResult, {}>(dictionary, {});
+        result = _.mapKeys<TResult, string>(dictionary);
+        result = _.mapKeys<TResult, string>(dictionary, dictionaryIterator);
+        result = _.mapKeys<TResult, string>(dictionary, dictionaryIterator, any);
+        result = _.mapKeys<TResult>(dictionary, '');
+        result = _.mapKeys<TResult>(dictionary, '', any);
+        result = _.mapKeys<TResult, {}>(dictionary, {});
+    }
 
-    result = _(array).mapKeys<string>().value();
-    result = _(array).mapKeys<string>(listIterator).value();
-    result = _(array).mapKeys<string>(listIterator, any).value();
-    result = _(array).mapKeys('').value();
-    result = _(array).mapKeys<{}>({}).value();
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<TResult>>;
 
-    result = _(list).mapKeys<TResult, string>().value();
-    result = _(list).mapKeys<TResult, string>(listIterator).value();
-    result = _(list).mapKeys<TResult, string>(listIterator, any).value();
-    result = _(list).mapKeys<TResult>('').value();
-    result = _(list).mapKeys<TResult, {}>({}).value();
+        result = _(array).mapKeys<string>();
+        result = _(array).mapKeys<string>(listIterator);
+        result = _(array).mapKeys<string>(listIterator, any);
+        result = _(array).mapKeys('');
+        result = _(array).mapKeys('', any);
+        result = _(array).mapKeys<{}>({});
 
-    result = _(dictionary).mapKeys<TResult, string>().value();
-    result = _(dictionary).mapKeys<TResult, string>(dictionaryIterator).value();
-    result = _(dictionary).mapKeys<TResult, string>(dictionaryIterator, any).value();
-    result = _(dictionary).mapKeys<TResult>('').value();
-    result = _(dictionary).mapKeys<TResult, {}>({}).value();
+        result = _(list).mapKeys<TResult, string>();
+        result = _(list).mapKeys<TResult, string>(listIterator);
+        result = _(list).mapKeys<TResult, string>(listIterator, any);
+        result = _(list).mapKeys<TResult>('');
+        result = _(list).mapKeys<TResult>('', any);
+        result = _(list).mapKeys<TResult, {}>({});
+
+        result = _(dictionary).mapKeys<TResult, string>();
+        result = _(dictionary).mapKeys<TResult, string>(dictionaryIterator);
+        result = _(dictionary).mapKeys<TResult, string>(dictionaryIterator, any);
+        result = _(dictionary).mapKeys<TResult>('');
+        result = _(dictionary).mapKeys<TResult>('', any);
+        result = _(dictionary).mapKeys<TResult, {}>({});
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<TResult>>;
+
+        result = _(array).chain().mapKeys<string>();
+        result = _(array).chain().mapKeys<string>(listIterator);
+        result = _(array).chain().mapKeys<string>(listIterator, any);
+        result = _(array).chain().mapKeys('');
+        result = _(array).chain().mapKeys('', any);
+        result = _(array).chain().mapKeys<{}>({});
+
+        result = _(list).chain().mapKeys<TResult, string>();
+        result = _(list).chain().mapKeys<TResult, string>(listIterator);
+        result = _(list).chain().mapKeys<TResult, string>(listIterator, any);
+        result = _(list).chain().mapKeys<TResult>('');
+        result = _(list).chain().mapKeys<TResult>('', any);
+        result = _(list).chain().mapKeys<TResult, {}>({});
+
+        result = _(dictionary).chain().mapKeys<TResult, string>();
+        result = _(dictionary).chain().mapKeys<TResult, string>(dictionaryIterator);
+        result = _(dictionary).chain().mapKeys<TResult, string>(dictionaryIterator, any);
+        result = _(dictionary).chain().mapKeys<TResult>('');
+        result = _(dictionary).chain().mapKeys<TResult>('', any);
+        result = _(dictionary).chain().mapKeys<TResult, {}>({});
+    }
 }
 
 // _.merge
@@ -5444,6 +6966,31 @@ module TestMerge {
     result = _({}).merge<TResult>({}, {}, {}, {}, {}, customizer, any).value();
 }
 
+// _.methods
+module TestFunctions {
+    type SampleObject = {a: number; b: string; c: boolean;};
+
+    let object: SampleObject;
+
+    {
+        let result: string[];
+
+        result = _.methods<SampleObject>(object);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<string>;
+
+        result = _(object).methods();
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<string>;
+
+        result = _(object).chain().methods();
+    }
+}
+
 interface HasName {
     name: string;
 }
@@ -5458,8 +7005,46 @@ result = <HasName>_({ 'name': 'moe', 'age': 40 }).omit(function (value) {
     return typeof value == 'number';
 }).value();
 
-result = <any[][]>_.pairs({ 'moe': 30, 'larry': 40 });
-result = <any[][]>_({ 'moe': 30, 'larry': 40 }).pairs().value();
+// _.pairs
+module TestPairs {
+    let object: _.Dictionary<string>;
+
+    {
+        let result: any[][];
+
+        result = _.pairs<_.Dictionary<string>>(object);
+    }
+
+    {
+        let result: string[][];
+
+        result = _.pairs<_.Dictionary<string>, string>(object);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<string[]>;
+
+        result = _(object).pairs<string>();
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<any[]>;
+
+        result = _(object).pairs();
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<string[]>;
+
+        result = _(object).chain().pairs<string>();
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<any[]>;
+
+        result = _(object).chain().pairs();
+    }
+}
 
 // _.pick
 interface TestPickFn {
@@ -5488,14 +7073,41 @@ interface TestPickFn {
 }
 
 // _.set
-{
-    let testSetObject: TResult;
-    let testSetPath: {toSting(): string};
-    let result: TResult;
-    result = _.set(testSetObject, testSetPath, any);
-    result = _.set(testSetObject, [testSetPath], any);
-    result = _(testSetObject).set(testSetPath, any).value();
-    result = _(testSetObject).set([testSetPath], any).value();
+module TestSet {
+    type SampleValue = {a: number; b: string; c: boolean;};
+
+    let object: TResult;
+    let value = {a: 1, b: '', c: true};
+
+    {
+        let result: TResult;
+
+        result = _.set(object, '', any);
+        result = _.set(object, ['a', 'b', 1], any);
+
+        result = _.set<SampleValue>(object, '', value);
+        result = _.set<SampleValue>(object, ['a', 'b', 1], value);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<TResult>;
+
+        result = _(object).set('', any);
+        result = _(object).set(['a', 'b', 1], any);
+
+        result = _(object).set<SampleValue>('', value);
+        result = _(object).set<SampleValue>(['a', 'b', 1], value);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<TResult>;
+
+        result = _(object).chain().set('', any);
+        result = _(object).chain().set(['a', 'b', 1], any);
+
+        result = _(object).chain().set<SampleValue>('', value);
+        result = _(object).chain().set<SampleValue>(['a', 'b', 1], value);
+    }
 }
 
 // _.transform
@@ -5565,44 +7177,50 @@ module TestTransform {
 }
 
 // _.values
-class TestValues {
-    public a = 1;
-    public b = 2;
-    public c: string;
-}
-TestValues.prototype.c = 'a';
-result = <number[]>_.values<number>(new TestValues());
-// → [1, 2] (iteration order is not guaranteed)
-result = <number[]>_(new TestValues()).values<number>().value();
-// → [1, 2] (iteration order is not guaranteed)
+module TestValues {
+    let object: _.Dictionary<TResult>;
 
-// _.valueIn
-class TestValueIn {
-    public a = 1;
-    public b = 2;
-    public c: number;
-}
-TestValueIn.prototype.c = 3;
-result = <number[]>_.valuesIn<number>(new TestValueIn());
-// → [1, 2, 3]
-result = <number[]>_(new TestValueIn()).valuesIn<number>().value();
-// → [1, 2, 3]
+    {
+        let result: TResult[];
 
-/**********
-* Utility *
-***********/
+        result = _.values<TResult>(object);
+    }
 
-// _.property
-interface TestPropertyObject {
-    a: {
-        b: number;
+    {
+        let result: _.LoDashImplicitArrayWrapper<TResult>;
+
+        result = _(object).values<TResult>();
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<TResult>;
+
+        result = _(object).chain().values<TResult>();
+    }
+}
+
+// _.valuesIn
+module TestValuesIn {
+    let object: _.Dictionary<TResult>;
+
+    {
+        let result: TResult[];
+
+        result = _.valuesIn<TResult>(object);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<TResult>;
+
+        result = _(object).valuesIn<TResult>();
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<TResult>;
+
+        result = _(object).chain().valuesIn<TResult>();
     }
 }
-var testPropertyObject: TestPropertyObject;
-result = <number>_.property<TestPropertyObject, number>('a.b')(testPropertyObject);
-result = <number>_.property<TestPropertyObject, number>(['a', 'b'])(testPropertyObject);
-result = <number>(_('a.b').property<TestPropertyObject, number>().value())(testPropertyObject);
-result = <number>(_(['a', 'b']).property<TestPropertyObject, number>().value())(testPropertyObject);
 
 /**********
  * String *
@@ -6560,6 +8178,36 @@ module TestNoop {
     }
 }
 
+// _.property
+module TestProperty {
+    interface SampleObject {
+        a: {
+            b: number[];
+        }
+    }
+
+    {
+        let result: (object: SampleObject) => number;
+
+        result = _.property<SampleObject, number>('a.b[0]');
+        result = _.property<SampleObject, number>(['a', 'b', 0]);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<(object: SampleObject) => number>;
+
+        result = _('a.b[0]').property<SampleObject, number>();
+        result = _(['a', 'b', 0]).property<SampleObject, number>();
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<(object: SampleObject) => number>;
+
+        result = _('a.b[0]').chain().property<SampleObject, number>();
+        result = _(['a', 'b', 0]).chain().property<SampleObject, number>();
+    }
+}
+
 // _.propertyOf
 module TestPropertyOf {
     interface SampleObject {
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index 98d8bf55d..ed8d72443 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -749,6 +749,81 @@ declare module _ {
         ): LoDashExplicitArrayWrapper<TValue>;
     }
 
+    //_.fill
+    interface LoDashStatic {
+        /**
+         * Fills elements of array with value from start up to, but not including, end.
+         *
+         * Note: This method mutates array.
+         *
+         * @param array The array to fill.
+         * @param value The value to fill array with.
+         * @param start The start position.
+         * @param end The end position.
+         * @return Returns array.
+         */
+        fill<T>(
+            array: any[],
+            value: T,
+            start?: number,
+            end?: number
+        ): T[];
+
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            array: List<any>,
+            value: T,
+            start?: number,
+            end?: number
+        ): List<T>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            value: T,
+            start?: number,
+            end?: number
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            value: T,
+            start?: number,
+            end?: number
+        ): LoDashImplicitObjectWrapper<List<T>>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            value: T,
+            start?: number,
+            end?: number
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            value: T,
+            start?: number,
+            end?: number
+        ): LoDashExplicitObjectWrapper<List<T>>;
+    }
+
     //_.findIndex
     interface LoDashStatic {
         /**
@@ -1131,14 +1206,28 @@ declare module _ {
         /**
          * @see _.flattenDeep
          */
-        flattenDeep<TResult>(): LoDashImplicitArrayWrapper<TResult>;
+        flattenDeep<T>(): LoDashImplicitArrayWrapper<T>;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.flattenDeep
          */
-        flattenDeep<TResult>(): LoDashImplicitArrayWrapper<TResult>;
+        flattenDeep<T>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.flattenDeep
+         */
+        flattenDeep<T>(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.flattenDeep
+         */
+        flattenDeep<T>(): LoDashExplicitArrayWrapper<T>;
     }
 
     //_.head
@@ -1403,7 +1492,7 @@ declare module _ {
          * @see _.zipObject
          */
         object<TValues, TResult extends {}>(
-            props: List<StringRepresentable>,
+            props: List<StringRepresentable>|List<List<any>>,
             values?: List<TValues>
         ): TResult;
 
@@ -1411,7 +1500,7 @@ declare module _ {
          * @see _.zipObject
          */
         object<TResult extends {}>(
-            props: List<StringRepresentable>,
+            props: List<StringRepresentable>|List<List<any>>,
             values?: List<any>
         ): TResult;
 
@@ -1419,7 +1508,7 @@ declare module _ {
          * @see _.zipObject
          */
         object(
-            props: List<StringRepresentable>,
+            props: List<StringRepresentable>|List<List<any>>,
             values?: List<any>
         ): _.Dictionary<any>;
     }
@@ -1470,6 +1559,52 @@ declare module _ {
         ): _.LoDashImplicitObjectWrapper<_.Dictionary<any>>;
     }
 
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.zipObject
+         */
+        object<TValues, TResult extends {}>(
+            values?: List<TValues>
+        ): _.LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        object<TResult extends {}>(
+            values?: List<any>
+        ): _.LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        object(
+            values?: List<any>
+        ): _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.zipObject
+         */
+        object<TValues, TResult extends {}>(
+            values?: List<TValues>
+        ): _.LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        object<TResult extends {}>(
+            values?: List<any>
+        ): _.LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        object(
+            values?: List<any>
+        ): _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
+    }
+
     //_.pull
     interface LoDashStatic {
         /**
@@ -1536,7 +1671,7 @@ declare module _ {
          * @return Returns the new array of removed elements.
          */
         pullAt<T>(
-            array: T[]|List<T>,
+            array: List<T>,
             ...indexes: (number|number[])[]
         ): T[];
     }
@@ -1552,7 +1687,21 @@ declare module _ {
         /**
          * @see _.pullAt
          */
-        pullAt<TValue>(...indexes: (number|number[])[]): LoDashImplicitArrayWrapper<TValue>;
+        pullAt<T>(...indexes: (number|number[])[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.pullAt
+         */
+        pullAt(...indexes: (number|number[])[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.pullAt
+         */
+        pullAt<T>(...indexes: (number|number[])[]): LoDashExplicitArrayWrapper<T>;
     }
 
     //_.remove
@@ -1782,71 +1931,226 @@ declare module _ {
     //_.sortedIndex
     interface LoDashStatic {
         /**
-        * Uses a binary search to determine the smallest index at which a value should be inserted
-        * into a given sorted array in order to maintain the sort order of the array. If a callback
-        * is provided it will be executed for value and each element of array to compute their sort
-        * ranking. The callback is bound to thisArg and invoked with one argument; (value).
-        *
-        * If a property name is provided for callback the created "_.pluck" style callback will
-        * return the property value of the given element.
-        *
-        * If an object is provided for callback the created "_.where" style callback will return
-        * true for elements that have the properties of the given object, else false.
-        * @param array The sorted list.
-        * @param value The value to determine its index within `list`.
-        * @param callback Iterator to compute the sort ranking of each value, optional.
-        * @return The index at which value should be inserted into array.
-        **/
-        sortedIndex<T, TSort>(
-            array: Array<T>,
-            value: T,
-            callback?: (x: T) => TSort,
-            thisArg?: any): number;
-
-        /**
-        * @see _.sortedIndex
-        **/
+         * Uses a binary search to determine the lowest index at which value should be inserted into array in order to maintain its sort order. If an iteratee function is provided it’s invoked for value and each element of array to compute their sort ranking. The iteratee is bound to thisArg and invoked with one argument; (value).
+         *
+         * If a property name is provided for iteratee the created _.property style callback returns the property value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for elements that have a matching property value, else false.
+         *
+         * If an object is provided for iteratee the created _.matches style callback returns true for elements that have the properties of the given object, else false.
+         *
+         * @param array The sorted array to inspect.
+         * @param value The value to evaluate.
+         * @param iteratee The function invoked per iteration.
+         * @return The this binding of iteratee.
+         */
         sortedIndex<T, TSort>(
             array: List<T>,
             value: T,
-            callback?: (x: T) => TSort,
-            thisArg?: any): number;
+            iteratee?: (x: T) => TSort,
+            thisArg?: any
+        ): number;
 
         /**
-        * @see _.sortedIndex
-        * @param pluckValue the _.pluck style callback
-        **/
-        sortedIndex<T>(
-            array: Array<T>,
-            value: T,
-            pluckValue: string): number;
-
-        /**
-        * @see _.sortedIndex
-        * @param pluckValue the _.pluck style callback
-        **/
+         * @see _.sortedIndex
+         */
         sortedIndex<T>(
             array: List<T>,
             value: T,
-            pluckValue: string): number;
+            iteratee?: (x: T) => any,
+            thisArg?: any
+        ): number;
 
         /**
-        * @see _.sortedIndex
-        * @param pluckValue the _.where style callback
-        **/
-        sortedIndex<W, T>(
-            array: Array<T>,
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            array: List<T>,
             value: T,
-            whereValue: W): number;
+            iteratee: string
+        ): number;
 
         /**
-        * @see _.sortedIndex
-        * @param pluckValue the _.where style callback
-        **/
+         * @see _.sortedIndex
+         */
         sortedIndex<W, T>(
             array: List<T>,
             value: T,
-            whereValue: W): number;
+            iteratee: W
+        ): number;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            array: List<T>,
+            value: T,
+            iteratee: Object
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<TSort>(
+            value: string,
+            iteratee?: (x: string) => TSort,
+            thisArg?: any
+        ): number;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<TSort>(
+            value: T,
+            iteratee?: (x: T) => TSort,
+            thisArg?: any
+        ): number;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex(
+            value: T,
+            iteratee: string
+        ): number;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<W>(
+            value: T,
+            iteratee: W
+        ): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T, TSort>(
+            value: T,
+            iteratee?: (x: T) => TSort,
+            thisArg?: any
+        ): number;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            value: T,
+            iteratee?: (x: T) => any,
+            thisArg?: any
+        ): number;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            value: T,
+            iteratee: string
+        ): number;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<W, T>(
+            value: T,
+            iteratee: W
+        ): number;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            value: T,
+            iteratee: Object
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<TSort>(
+            value: string,
+            iteratee?: (x: string) => TSort,
+            thisArg?: any
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<TSort>(
+            value: T,
+            iteratee?: (x: T) => TSort,
+            thisArg?: any
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex(
+            value: T,
+            iteratee: string
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<W>(
+            value: T,
+            iteratee: W
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T, TSort>(
+            value: T,
+            iteratee?: (x: T) => TSort,
+            thisArg?: any
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            value: T,
+            iteratee?: (x: T) => any,
+            thisArg?: any
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            value: T,
+            iteratee: string
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<W, T>(
+            value: T,
+            iteratee: W
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            value: T,
+            iteratee: Object
+        ): LoDashExplicitWrapper<number>;
     }
 
     //_.sortedLastIndex
@@ -2721,6 +3025,46 @@ declare module _ {
             whereValue: W): LoDashImplicitArrayWrapper<T>;
     }
 
+    //_.unzip
+    interface LoDashStatic {
+        /**
+         * This method is like _.zip except that it accepts an array of grouped elements and creates an array
+         * regrouping the elements to their pre-zip configuration.
+         *
+         * @param array The array of grouped elements to process.
+         * @return Returns the new array of regrouped elements.
+         */
+        unzip<T>(array: List<List<T>>): T[][];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.unzip
+         */
+        unzip<T>(): LoDashImplicitArrayWrapper<T[]>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.unzip
+         */
+        unzip<T>(): LoDashImplicitArrayWrapper<T[]>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.unzip
+         */
+        unzip<T>(): LoDashExplicitArrayWrapper<T[]>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.unzip
+         */
+        unzip<T>(): LoDashExplicitArrayWrapper<T[]>;
+    }
+
     //_.unzipWith
     interface LoDashStatic {
         /**
@@ -2770,7 +3114,7 @@ declare module _ {
          * @return Returns the new array of filtered values.
          */
         without<T>(
-            array: T[]|List<T>,
+            array: List<T>,
             ...values: T[]
         ): T[];
     }
@@ -2786,7 +3130,21 @@ declare module _ {
         /**
          * @see _.without
          */
-        without<TValue>(...values: TValue[]): LoDashImplicitArrayWrapper<TValue>;
+        without<T>(...values: T[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.without
+         */
+        without(...values: T[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.without
+         */
+        without<T>(...values: T[]): LoDashExplicitArrayWrapper<T>;
     }
 
     //_.xor
@@ -2811,46 +3169,61 @@ declare module _ {
         /**
          * @see _.xor
          */
-        xor<TValue>(...arrays: List<TValue>[]): LoDashImplicitArrayWrapper<TValue>;
+        xor<T>(...arrays: List<T>[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.xor
+         */
+        xor(...arrays: List<T>[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.xor
+         */
+        xor<T>(...arrays: List<T>[]): LoDashExplicitArrayWrapper<T>;
     }
 
     //_.zip
     interface LoDashStatic {
         /**
-        * Creates an array of grouped elements, the first of which contains the first
-        * elements of the given arrays, the second of which contains the second elements
-        * of the given arrays, and so on.
-        * @param arrays Arrays to process.
-        * @return A new array of grouped elements.
-        **/
-        zip(...arrays: any[][]): any[][];
-
-        /**
-        * @see _.zip
-        **/
-        zip(...arrays: any[]): any[];
-
-        /**
-        * @see _.zip
-        **/
-        unzip(...arrays: any[][]): any[][];
-
-        /**
-        * @see _.zip
-        **/
-        unzip(...arrays: any[]): any[];
+         * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
+         * the second of which contains the second elements of the given arrays, and so on.
+         *
+         * @param arrays The arrays to process.
+         * @return Returns the new array of grouped elements.
+         */
+        zip<T>(...arrays: List<T>[]): T[][];
     }
 
     interface LoDashImplicitArrayWrapper<T> {
         /**
-        * @see _.zip
-        **/
-        zip(...arrays: any[][]): _.LoDashImplicitArrayWrapper<any[][]>;
+         * @see _.zip
+         */
+        zip<T>(...arrays: List<T>[]): _.LoDashImplicitArrayWrapper<T[]>;
+    }
 
+    interface LoDashImplicitObjectWrapper<T> {
         /**
-        * @see _.zip
-        **/
-        unzip(...arrays: any[]): _.LoDashImplicitArrayWrapper<any[][]>;
+         * @see _.zip
+         */
+        zip<T>(...arrays: List<T>[]): _.LoDashImplicitArrayWrapper<T[]>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.zip
+         */
+        zip<T>(...arrays: List<T>[]): _.LoDashExplicitArrayWrapper<T[]>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.zip
+         */
+        zip<T>(...arrays: List<T>[]): _.LoDashExplicitArrayWrapper<T[]>;
     }
 
     //_.zipObject
@@ -2867,7 +3240,7 @@ declare module _ {
          * @return Returns the new object.
          */
         zipObject<TValues, TResult extends {}>(
-            props: List<StringRepresentable>,
+            props: List<StringRepresentable>|List<List<any>>,
             values?: List<TValues>
         ): TResult;
 
@@ -2875,7 +3248,7 @@ declare module _ {
          * @see _.zipObject
          */
         zipObject<TResult extends {}>(
-            props: List<StringRepresentable>,
+            props: List<StringRepresentable>|List<List<any>>,
             values?: List<any>
         ): TResult;
 
@@ -2883,7 +3256,7 @@ declare module _ {
          * @see _.zipObject
          */
         zipObject(
-            props: List<StringRepresentable>,
+            props: List<StringRepresentable>|List<List<any>>,
             values?: List<any>
         ): _.Dictionary<any>;
     }
@@ -2934,6 +3307,52 @@ declare module _ {
         ): _.LoDashImplicitObjectWrapper<_.Dictionary<any>>;
     }
 
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.zipObject
+         */
+        zipObject<TValues, TResult extends {}>(
+            values?: List<TValues>
+        ): _.LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject<TResult extends {}>(
+            values?: List<any>
+        ): _.LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject(
+            values?: List<any>
+        ): _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.zipObject
+         */
+        zipObject<TValues, TResult extends {}>(
+            values?: List<TValues>
+        ): _.LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject<TResult extends {}>(
+            values?: List<any>
+        ): _.LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject(
+            values?: List<any>
+        ): _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
+    }
+
     //_.zipWith
     interface LoDashStatic {
         /**
@@ -3618,7 +4037,7 @@ declare module _ {
          */
         at<T>(
             collection: List<T>|Dictionary<T>,
-            ...props: Array<number|string|Array<number|string>>
+            ...props: (number|string|(number|string)[])[]
         ): T[];
     }
 
@@ -3626,14 +4045,28 @@ declare module _ {
         /**
          * @see _.at
          */
-        at(...props: Array<number|string|Array<number|string>>): LoDashImplicitArrayWrapper<T>;
+        at(...props: (number|string|(number|string)[])[]): LoDashImplicitArrayWrapper<T>;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.at
          */
-        at<TResult>(...props: Array<number|string|Array<number|string>>): LoDashImplicitArrayWrapper<TResult>;
+        at<T>(...props: (number|string|(number|string)[])[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.at
+         */
+        at(...props: (number|string|(number|string)[])[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.at
+         */
+        at<T>(...props: (number|string|(number|string)[])[]): LoDashExplicitArrayWrapper<T>;
     }
 
     //_.collect
@@ -3772,160 +4205,82 @@ declare module _ {
     //_.contains
     interface LoDashStatic {
         /**
-        * Checks if a given value is present in a collection using strict equality for comparisons,
-        * i.e. ===. If fromIndex is negative, it is used as the offset from the end of the collection.
-        * @param collection The collection to iterate over.
-        * @param target The value to check for.
-        * @param fromIndex The index to search from.
-        * @return True if the target element is found, else false.
-        **/
+         * @see _.includes
+         */
         contains<T>(
-            collection: Array<T>,
+            collection: List<T>|Dictionary<T>,
             target: T,
-            fromIndex?: number): boolean;
+            fromIndex?: number
+        ): boolean;
 
         /**
-        * @see _.contains
-        **/
-        contains<T>(
-            collection: List<T>,
-            target: T,
-            fromIndex?: number): boolean;
-
-        /**
-        * @see _.contains
-        * @param dictionary The dictionary to iterate over.
-        * @param value The value in the dictionary to search for.
-        **/
-        contains<T>(
-            dictionary: Dictionary<T>,
-            value: T,
-            fromIndex?: number): boolean;
-
-        /**
-        * @see _.contains
-        * @param searchString the string to search
-        * @param targetString the string to search for
-        **/
+         * @see _.includes
+         */
         contains(
-            searchString: string,
-            targetString: string,
-            fromIndex?: number): boolean;
-
-        /**
-        * @see _.contains
-        **/
-        include<T>(
-            collection: Array<T>,
-            target: T,
-            fromIndex?: number): boolean;
-
-        /**
-        * @see _.contains
-        **/
-        include<T>(
-            collection: List<T>,
-            target: T,
-            fromIndex?: number): boolean;
-
-        /**
-        * @see _.contains
-        **/
-        include<T>(
-            dictionary: Dictionary<T>,
-            value: T,
-            fromIndex?: number): boolean;
-
-        /**
-        * @see _.contains
-        **/
-        include(
-            searchString: string,
-            targetString: string,
-            fromIndex?: number): boolean;
-
-        /**
-        * @see _.contains
-        **/
-        includes<T>(
-            collection: Array<T>,
-            target: T,
-            fromIndex?: number): boolean;
-
-        /**
-        * @see _.contains
-        **/
-        includes<T>(
-            collection: List<T>,
-            target: T,
-            fromIndex?: number): boolean;
-
-        /**
-        * @see _.contains
-        **/
-        includes<T>(
-            dictionary: Dictionary<T>,
-            value: T,
-            fromIndex?: number): boolean;
-
-        /**
-        * @see _.contains
-        **/
-        includes(
-            searchString: string,
-            targetString: string,
-            fromIndex?: number): boolean;
+            collection: string,
+            target: string,
+            fromIndex?: number
+        ): boolean;
     }
 
     interface LoDashImplicitArrayWrapper<T> {
         /**
-         * @see _.contains
-         **/
-        contains(target: T, fromIndex?: number): boolean;
-
-        /**
-         * @see _.contains
-         **/
-        include(target: T, fromIndex?: number): boolean;
-
-        /**
-         * @see _.contains
-         **/
-        includes(target: T, fromIndex?: number): boolean;
+         * @see _.includes
+         */
+        contains(
+            target: T,
+            fromIndex?: number
+        ): boolean;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
-         * @see _.contains
-         **/
-        contains<TValue>(target: TValue, fromIndex?: number): boolean;
-
-        /**
-         * @see _.contains
-         **/
-        include<TValue>(target: TValue, fromIndex?: number): boolean;
-
-        /**
-         * @see _.contains
-         **/
-        includes<TValue>(target: TValue, fromIndex?: number): boolean;
+         * @see _.includes
+         */
+        contains<TValue>(
+            target: TValue,
+            fromIndex?: number
+        ): boolean;
     }
 
-    interface LoDashImplicitStringWrapper {
+    interface LoDashImplicitWrapper<T> {
         /**
-         * @see _.contains
-         **/
-        contains(target: string, fromIndex?: number): boolean;
+         * @see _.includes
+         */
+        contains(
+            target: string,
+            fromIndex?: number
+        ): boolean;
+    }
 
+    interface LoDashExplicitArrayWrapper<T> {
         /**
-         * @see _.contains
-         **/
-        include(target: string, fromIndex?: number): boolean;
+         * @see _.includes
+         */
+        contains(
+            target: T,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
 
+    interface LoDashExplicitObjectWrapper<T> {
         /**
-         * @see _.contains
-         **/
-        includes(target: string, fromIndex?: number): boolean;
+         * @see _.includes
+         */
+        contains<TValue>(
+            target: TValue,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        contains(
+            target: string,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<boolean>;
     }
 
     //_.countBy
@@ -4104,15 +4459,6 @@ declare module _ {
 
     //_.each
     interface LoDashStatic {
-        /**
-         * @see _.forEach
-         */
-        each(
-            collection: string,
-            iteratee?: StringIterator<any>,
-            thisArg?: any
-        ): string;
-
         /**
          * @see _.forEach
          */
@@ -4139,6 +4485,24 @@ declare module _ {
             iteratee?: DictionaryIterator<T, any>,
             thisArg?: any
         ): Dictionary<T>;
+
+        /**
+         * @see _.forEach
+         */
+        each<T extends {}>(
+            collection: T,
+            iteratee?: ObjectIterator<any, any>,
+            thisArgs?: any
+        ): T;
+
+        /**
+         * @see _.forEach
+         */
+        each<T extends {}, TValue>(
+            collection: T,
+            iteratee?: ObjectIterator<TValue, any>,
+            thisArgs?: any
+        ): T;
     }
 
     interface LoDashImplicitWrapper<T> {
@@ -4146,7 +4510,7 @@ declare module _ {
          * @see _.forEach
          */
         each(
-            iteratee: StringIterator<any>,
+            iteratee: ListIterator<string, any>,
             thisArg?: any
         ): LoDashImplicitWrapper<string>;
     }
@@ -4176,7 +4540,7 @@ declare module _ {
          * @see _.forEach
          */
         each(
-            iteratee: StringIterator<any>,
+            iteratee: ListIterator<string, any>,
             thisArg?: any
         ): LoDashExplicitWrapper<string>;
     }
@@ -4203,15 +4567,6 @@ declare module _ {
 
     //_.eachRight
     interface LoDashStatic {
-        /**
-         * @see _.forEachRight
-         */
-        eachRight(
-            collection: string,
-            iteratee?: StringIterator<any>,
-            thisArg?: any
-        ): string;
-
         /**
          * @see _.forEachRight
          */
@@ -4238,6 +4593,24 @@ declare module _ {
             iteratee?: DictionaryIterator<T, any>,
             thisArg?: any
         ): Dictionary<T>;
+
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T extends {}>(
+            collection: T,
+            iteratee?: ObjectIterator<any, any>,
+            thisArgs?: any
+        ): T;
+
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T extends {}, TValue>(
+            collection: T,
+            iteratee?: ObjectIterator<TValue, any>,
+            thisArgs?: any
+        ): T;
     }
 
     interface LoDashImplicitWrapper<T> {
@@ -4245,7 +4618,7 @@ declare module _ {
          * @see _.forEachRight
          */
         eachRight(
-            iteratee: StringIterator<any>,
+            iteratee: ListIterator<string, any>,
             thisArg?: any
         ): LoDashImplicitWrapper<string>;
     }
@@ -4275,7 +4648,7 @@ declare module _ {
          * @see _.forEachRight
          */
         eachRight(
-            iteratee: StringIterator<any>,
+            iteratee: ListIterator<string, any>,
             thisArg?: any
         ): LoDashExplicitWrapper<string>;
     }
@@ -4455,280 +4828,180 @@ declare module _ {
         ): LoDashExplicitWrapper<boolean>;
     }
 
-    //_.fill
-    interface LoDashStatic {
-        /**
-         * Fills elements of array with value from start up to, but not including, end.
-         *
-         * Note: This method mutates array.
-         *
-         * @param array (Array): The array to fill.
-         * @param value (*): The value to fill array with.
-         * @param [start=0] (number): The start position.
-         * @param [end=array.length] (number): The end position.
-         * @return (Array): Returns array.
-         */
-        fill<TResult>(
-            array: any[],
-            value: any,
-            start?: number,
-            end?: number): TResult[];
-
-        /**
-         * @see _.fill
-         */
-        fill<TResult>(
-            array: List<any>,
-            value: any,
-            start?: number,
-            end?: number): List<TResult>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.fill
-         */
-        fill<TResult>(
-            value: TResult,
-            start?: number,
-            end?: number): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.fill
-         */
-        fill<TResult>(
-            value: TResult,
-            start?: number,
-            end?: number): LoDashImplicitObjectWrapper<List<TResult>>;
-    }
-
     //_.filter
     interface LoDashStatic {
         /**
-        * Iterates over elements of a collection, returning an array of all elements the
-        * identity function returns truey for.
-        *
-        * @param collection The collection to iterate over.
-        * @return Returns a new array of elements that passed the callback check.
-        **/
-        filter<T>(
-            collection: (Array<T>|List<T>)): T[];
-
-        /**
-        * Iterates over elements of a collection, returning an array of all elements the
-        * callback returns truey for. The callback is bound to thisArg and invoked with three
-        * arguments; (value, index|key, collection).
-        *
-        * If a property name is provided for callback the created "_.pluck" style callback will
-        * return the property value of the given element.
-        *
-        * If an object is provided for callback the created "_.where" style callback will return
-        * true for elements that have the properties of the given object, else false.
-        * @param collection The collection to iterate over.
-        * @param callback The function called per iteration.
-        * @param context The this binding of callback.
-        * @return Returns a new array of elements that passed the callback check.
-        **/
-        filter<T>(
-            collection: Array<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.filter
-        **/
+         * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+         * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @alias _.select
+         *
+         * @param collection The collection to iterate over.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the new filtered array.
+         */
         filter<T>(
             collection: List<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T[];
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): T[];
 
         /**
-        * @see _.filter
-        **/
+         * @see _.filter
+         */
         filter<T>(
             collection: Dictionary<T>,
-            callback: DictionaryIterator<T, boolean>,
-            thisArg?: any): T[];
+            predicate?: DictionaryIterator<T, boolean>,
+            thisArg?: any
+        ): T[];
 
         /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
+         * @see _.filter
+         */
+        filter(
+            collection: string,
+            predicate?: StringIterator<boolean>,
+            thisArg?: any
+        ): string[];
+
+        /**
+         * @see _.filter
+         */
         filter<T>(
-            collection: Array<T>,
-            pluckValue: string): T[];
+            collection: List<T>|Dictionary<T>,
+            predicate: string,
+            thisArg?: any
+        ): T[];
 
         /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
-        filter<T>(
-            collection: List<T>,
-            pluckValue: string): T[];
+         * @see _.filter
+         */
+        filter<W extends {}, T>(
+            collection: List<T>|Dictionary<T>,
+            predicate: W
+        ): T[];
+    }
 
+    interface LoDashImplicitWrapper<T> {
         /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
-        filter<T>(
-            collection: Dictionary<T>,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
-        filter<W, T>(
-            collection: Array<T>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
-        filter<W, T>(
-            collection: List<T>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
-        filter<W, T>(
-            collection: Dictionary<T>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.filter
-        **/
-        select<T>(
-            collection: Array<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.filter
-        **/
-        select<T>(
-            collection: List<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.filter
-        **/
-        select<T>(
-            collection: Dictionary<T>,
-            callback: DictionaryIterator<T, boolean>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
-        select<T>(
-            collection: Array<T>,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
-        select<T>(
-            collection: List<T>,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
-        select<T>(
-            collection: Dictionary<T>,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
-        select<W, T>(
-            collection: Array<T>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
-        select<W, T>(
-            collection: List<T>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
-        select<W, T>(
-            collection: Dictionary<T>,
-            whereValue: W): T[];
+         * @see _.filter
+         */
+        filter(
+            predicate?: StringIterator<boolean>,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<string>;
     }
 
     interface LoDashImplicitArrayWrapper<T> {
         /**
-        * @see _.filter
-        **/
-        filter(): LoDashImplicitArrayWrapper<T>;
-
-        /**
-        * @see _.filter
-        **/
+         * @see _.filter
+         */
         filter(
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): LoDashImplicitArrayWrapper<T>;
+            predicate: ListIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<T>;
 
         /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
+         * @see _.filter
+         */
         filter(
-            pluckValue: string): LoDashImplicitArrayWrapper<T>;
+            predicate: string,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<T>;
 
         /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
-        filter<W>(
-            whereValue: W): LoDashImplicitArrayWrapper<T>;
-
-        /**
-        * @see _.filter
-        **/
-        select(
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): LoDashImplicitArrayWrapper<T>;
-
-        /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
-        select(
-            pluckValue: string): LoDashImplicitArrayWrapper<T>;
-
-        /**
-        * @see _.filter
-        * @param pluckValue _.pluck style callback
-        **/
-        select<W>(
-            whereValue: W): LoDashImplicitArrayWrapper<T>;
+         * @see _.filter
+         */
+        filter<W>(predicate: W): LoDashImplicitArrayWrapper<T>;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
-        * @see _.filter
-        **/
-        filter<T extends {}>(
-            callback: ObjectIterator<T, boolean>,
-            thisArg?: any): LoDashImplicitObjectWrapper<T>;
+         * @see _.filter
+         */
+        filter<T>(
+            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T>(
+            predicate: string,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        filter<W, T>(predicate: W): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        filter(
+            predicate?: StringIterator<boolean>,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        filter(
+            predicate: ListIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        filter(
+            predicate: string,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        filter<W>(predicate: W): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        filter<T>(
+            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T>(
+            predicate: string,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        filter<W, T>(predicate: W): LoDashExplicitArrayWrapper<T>;
     }
 
     //_.find
@@ -5029,15 +5302,6 @@ declare module _ {
          * @param iteratee The function invoked per iteration.
          * @param thisArg The this binding of iteratee.
          */
-        forEach(
-            collection: string,
-            iteratee?: StringIterator<any>,
-            thisArg?: any
-        ): string;
-
-        /**
-         * @see _.forEach
-         */
         forEach<T>(
             collection: T[],
             iteratee?: ListIterator<T, any>,
@@ -5061,6 +5325,24 @@ declare module _ {
             iteratee?: DictionaryIterator<T, any>,
             thisArg?: any
         ): Dictionary<T>;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T extends {}>(
+            collection: T,
+            iteratee?: ObjectIterator<any, any>,
+            thisArgs?: any
+        ): T;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T extends {}, TValue>(
+            collection: T,
+            iteratee?: ObjectIterator<TValue, any>,
+            thisArgs?: any
+        ): T;
     }
 
     interface LoDashImplicitWrapper<T> {
@@ -5068,7 +5350,7 @@ declare module _ {
          * @see _.forEach
          */
         forEach(
-            iteratee: StringIterator<any>,
+            iteratee: ListIterator<string, any>,
             thisArg?: any
         ): LoDashImplicitWrapper<string>;
     }
@@ -5098,7 +5380,7 @@ declare module _ {
          * @see _.forEach
          */
         forEach(
-            iteratee: StringIterator<any>,
+            iteratee: ListIterator<string, any>,
             thisArg?: any
         ): LoDashExplicitWrapper<string>;
     }
@@ -5134,15 +5416,6 @@ declare module _ {
          * @param iteratee The function called per iteration.
          * @param thisArg The this binding of callback.
          */
-        forEachRight(
-            collection: string,
-            iteratee?: StringIterator<any>,
-            thisArg?: any
-        ): string;
-
-        /**
-         * @see _.forEachRight
-         */
         forEachRight<T>(
             collection: T[],
             iteratee?: ListIterator<T, any>,
@@ -5166,6 +5439,24 @@ declare module _ {
             iteratee?: DictionaryIterator<T, any>,
             thisArg?: any
         ): Dictionary<T>;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T extends {}>(
+            collection: T,
+            iteratee?: ObjectIterator<any, any>,
+            thisArgs?: any
+        ): T;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T extends {}, TValue>(
+            collection: T,
+            iteratee?: ObjectIterator<TValue, any>,
+            thisArgs?: any
+        ): T;
     }
 
     interface LoDashImplicitWrapper<T> {
@@ -5173,7 +5464,7 @@ declare module _ {
          * @see _.forEachRight
          */
         forEachRight(
-            iteratee: StringIterator<any>,
+            iteratee: ListIterator<string, any>,
             thisArg?: any
         ): LoDashImplicitWrapper<string>;
     }
@@ -5203,7 +5494,7 @@ declare module _ {
          * @see _.forEachRight
          */
         forEachRight(
-            iteratee: StringIterator<any>,
+            iteratee: ListIterator<string, any>,
             thisArg?: any
         ): LoDashExplicitWrapper<string>;
     }
@@ -5231,130 +5522,427 @@ declare module _ {
     //_.groupBy
     interface LoDashStatic {
         /**
-        * Creates an object composed of keys generated from the results of running each element
-        * of a collection through the callback. The corresponding value of each key is an array
-        * of the elements responsible for generating the key. The callback is bound to thisArg
-        * and invoked with three arguments; (value, index|key, collection).
-        *
-        * If a property name is provided for callback the created "_.pluck" style callback will
-        * return the property value of the given element.
-        * If an object is provided for callback the created "_.where" style callback will return
-        * true for elements that have the properties of the given object, else false
-        * @param collection The collection to iterate over.
-        * @param callback The function called per iteration.
-        * @param thisArg The this binding of callback.
-        * @return Returns the composed aggregate object.
-        **/
-        groupBy<T>(
-            collection: Array<T>,
-            callback?: ListIterator<T, any>,
-            thisArg?: any): Dictionary<T[]>;
-
-        /**
-        * @see _.groupBy
-        **/
-        groupBy<T>(
+         * Creates an object composed of keys generated from the results of running each element of collection through
+         * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
+         * key. The iteratee is bound to thisArg and invoked with three arguments:
+         * (value, index|key, collection).
+         *
+         * If a property name is provided for iteratee the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the composed aggregate object.
+         */
+        groupBy<T, TKey>(
             collection: List<T>,
-            callback?: ListIterator<T, any>,
-            thisArg?: any): Dictionary<T[]>;
+            iteratee?: ListIterator<T, TKey>,
+            thisArg?: any
+        ): Dictionary<T[]>;
 
         /**
-        * @see _.groupBy
-        * @param pluckValue _.pluck style callback
-        **/
+         * @see _.groupBy
+         */
         groupBy<T>(
-            collection: Array<T>,
-            pluckValue: string): Dictionary<T[]>;
+            collection: List<any>,
+            iteratee?: ListIterator<T, any>,
+            thisArg?: any
+        ): Dictionary<T[]>;
 
         /**
-        * @see _.groupBy
-        * @param pluckValue _.pluck style callback
-        **/
-        groupBy<T>(
-            collection: List<T>,
-            pluckValue: string): Dictionary<T[]>;
-
-        /**
-        * @see _.groupBy
-        * @param whereValue _.where style callback
-        **/
-        groupBy<W, T>(
-            collection: Array<T>,
-            whereValue: W): Dictionary<T[]>;
-
-        /**
-        * @see _.groupBy
-        * @param whereValue _.where style callback
-        **/
-        groupBy<W, T>(
-            collection: List<T>,
-            whereValue: W): Dictionary<T[]>;
-
-        /**
-        * @see _.groupBy
-        **/
-        groupBy<T>(
+         * @see _.groupBy
+         */
+        groupBy<T, TKey>(
             collection: Dictionary<T>,
-            callback?: DictionaryIterator<T, any>,
-            thisArg?: any): Dictionary<T[]>;
+            iteratee?: DictionaryIterator<T, TKey>,
+            thisArg?: any
+        ): Dictionary<T[]>;
 
         /**
-        * @see _.groupBy
-        * @param pluckValue _.pluck style callback
-        **/
-        groupBy<TValue>(
-            collection: Dictionary<TValue>,
-            pluckValue: string): Dictionary<TValue[]>;
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            collection: Dictionary<any>,
+            iteratee?: DictionaryIterator<T, any>,
+            thisArg?: any
+        ): Dictionary<T[]>;
 
         /**
-        * @see _.groupBy
-        * @param whereValue _.where style callback
-        **/
-        groupBy<W, TValue>(
-            collection: Dictionary<TValue>,
-            whereValue: W): Dictionary<TValue[]>;
+         * @see _.groupBy
+         */
+        groupBy<T, TValue>(
+            collection: List<T>|Dictionary<T>,
+            iteratee?: string,
+            thisArg?: TValue
+        ): Dictionary<T[]>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            collection: List<T>|Dictionary<T>,
+            iteratee?: string,
+            thisArg?: any
+        ): Dictionary<T[]>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TWhere, T>(
+            collection: List<T>|Dictionary<T>,
+            iteratee?: TWhere
+        ): Dictionary<T[]>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            collection: List<T>|Dictionary<T>,
+            iteratee?: Object
+        ): Dictionary<T[]>;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TKey>(
+            iteratee?: ListIterator<T, TKey>,
+            thisArg?: any
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
     }
 
     interface LoDashImplicitArrayWrapper<T> {
         /**
-        * @see _.groupBy
-        **/
-        groupBy(
-            callback: ListIterator<T, any>,
-            thisArg?: any): _.LoDashImplicitObjectWrapper<_.Dictionary<T[]>>;
+         * @see _.groupBy
+         */
+        groupBy<TKey>(
+            iteratee?: ListIterator<T, TKey>,
+            thisArg?: any
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
 
         /**
-        * @see _.groupBy
-        **/
-        groupBy(
-            pluckValue: string): _.LoDashImplicitObjectWrapper<_.Dictionary<T[]>>;
+         * @see _.groupBy
+         */
+        groupBy<TValue>(
+            iteratee?: string,
+            thisArg?: TValue
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
 
         /**
-        * @see _.groupBy
-        **/
-        groupBy<W>(
-            whereValue: W): _.LoDashImplicitObjectWrapper<_.Dictionary<T[]>>;
+         * @see _.groupBy
+         */
+        groupBy<TWhere>(
+            iteratee?: TWhere
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
-        * @see _.groupBy
-        **/
-        groupBy<TValue>(
-            callback: ListIterator<TValue, any>,
-            thisArg?: any): _.LoDashImplicitObjectWrapper<_.Dictionary<TValue[]>>;
+         * @see _.groupBy
+         */
+        groupBy<T, TKey>(
+            iteratee?: ListIterator<T, TKey>|DictionaryIterator<T, TKey>,
+            thisArg?: any
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
 
         /**
-        * @see _.groupBy
-        **/
-        groupBy<TValue>(
-            pluckValue: string): _.LoDashImplicitObjectWrapper<_.Dictionary<TValue[]>>;
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>,
+            thisArg?: any
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
 
         /**
-        * @see _.groupBy
-        **/
-        groupBy<W, TValue>(
-            whereValue: W): _.LoDashImplicitObjectWrapper<_.Dictionary<TValue[]>>;
+         * @see _.groupBy
+         */
+        groupBy<T, TValue>(
+            iteratee?: string,
+            thisArg?: TValue
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            iteratee?: string,
+            thisArg?: any
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TWhere, T>(
+            iteratee?: TWhere
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            iteratee?: Object
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TKey>(
+            iteratee?: ListIterator<T, TKey>,
+            thisArg?: any
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TKey>(
+            iteratee?: ListIterator<T, TKey>,
+            thisArg?: any
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TValue>(
+            iteratee?: string,
+            thisArg?: TValue
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TWhere>(
+            iteratee?: TWhere
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T, TKey>(
+            iteratee?: ListIterator<T, TKey>|DictionaryIterator<T, TKey>,
+            thisArg?: any
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>,
+            thisArg?: any
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T, TValue>(
+            iteratee?: string,
+            thisArg?: TValue
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            iteratee?: string,
+            thisArg?: any
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TWhere, T>(
+            iteratee?: TWhere
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            iteratee?: Object
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+    }
+
+    //_.include
+    interface LoDashStatic {
+        /**
+         * @see _.includes
+         */
+        include<T>(
+            collection: List<T>|Dictionary<T>,
+            target: T,
+            fromIndex?: number
+        ): boolean;
+
+        /**
+         * @see _.includes
+         */
+        include(
+            collection: string,
+            target: string,
+            fromIndex?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        include(
+            target: T,
+            fromIndex?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        include<TValue>(
+            target: TValue,
+            fromIndex?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        include(
+            target: string,
+            fromIndex?: number
+        ): boolean;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        include(
+            target: T,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        include<TValue>(
+            target: TValue,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        include(
+            target: string,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.includes
+    interface LoDashStatic {
+        /**
+         * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+         * it’s used as the offset from the end of collection.
+         *
+         * @alias _.contains, _.include
+         *
+         * @param collection The collection to search.
+         * @param target The value to search for.
+         * @param fromIndex The index to search from.
+         * @return True if the target element is found, else false.
+         */
+        includes<T>(
+            collection: List<T>|Dictionary<T>,
+            target: T,
+            fromIndex?: number
+        ): boolean;
+
+        /**
+         * @see _.includes
+         */
+        includes(
+            collection: string,
+            target: string,
+            fromIndex?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        includes(
+            target: T,
+            fromIndex?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        includes<TValue>(
+            target: TValue,
+            fromIndex?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        includes(
+            target: string,
+            fromIndex?: number
+        ): boolean;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        includes(
+            target: T,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        includes<TValue>(
+            target: TValue,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        includes(
+            target: string,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<boolean>;
     }
 
     //_.indexBy
@@ -6208,108 +6796,166 @@ declare module _ {
     //_.reject
     interface LoDashStatic {
         /**
-        * The opposite of _.filter this method returns the elements of a collection that
-        * the callback does not return truey for.
-        *
-        * If a property name is provided for callback the created "_.pluck" style callback
-        * will return the property value of the given element.
-        *
-        * If an object is provided for callback the created "_.where" style callback will
-        * return true for elements that have the properties of the given object, else false.
-        * @param collection The collection to iterate over.
-        * @param callback The function called per iteration.
-        * @param thisArg The this binding of callback.
-        * @return A new array of elements that failed the callback check.
-        **/
-        reject<T>(
-            collection: Array<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.reject
-        **/
+         * The opposite of _.filter; this method returns the elements of collection that predicate does not return
+         * truthy for.
+         *
+         * @param collection The collection to iterate over.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the new filtered array.
+         */
         reject<T>(
             collection: List<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T[];
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): T[];
 
         /**
-        * @see _.reject
-        **/
+         * @see _.reject
+         */
         reject<T>(
             collection: Dictionary<T>,
-            callback: DictionaryIterator<T, boolean>,
-            thisArg?: any): T[];
+            predicate?: DictionaryIterator<T, boolean>,
+            thisArg?: any
+        ): T[];
 
         /**
-        * @see _.reject
-        * @param pluckValue _.pluck style callback
-        **/
+         * @see _.reject
+         */
+        reject(
+            collection: string,
+            predicate?: StringIterator<boolean>,
+            thisArg?: any
+        ): string[];
+
+        /**
+         * @see _.reject
+         */
         reject<T>(
-            collection: Array<T>,
-            pluckValue: string): T[];
+            collection: List<T>|Dictionary<T>,
+            predicate: string,
+            thisArg?: any
+        ): T[];
 
         /**
-        * @see _.reject
-        * @param pluckValue _.pluck style callback
-        **/
-        reject<T>(
-            collection: List<T>,
-            pluckValue: string): T[];
+         * @see _.reject
+         */
+        reject<W extends {}, T>(
+            collection: List<T>|Dictionary<T>,
+            predicate: W
+        ): T[];
+    }
 
+    interface LoDashImplicitWrapper<T> {
         /**
-        * @see _.reject
-        * @param pluckValue _.pluck style callback
-        **/
-        reject<T>(
-            collection: Dictionary<T>,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.reject
-        * @param whereValue _.where style callback
-        **/
-        reject<W, T>(
-            collection: Array<T>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.reject
-        * @param whereValue _.where style callback
-        **/
-        reject<W, T>(
-            collection: List<T>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.reject
-        * @param whereValue _.where style callback
-        **/
-        reject<W, T>(
-            collection: Dictionary<T>,
-            whereValue: W): T[];
+         * @see _.reject
+         */
+        reject(
+            predicate?: StringIterator<boolean>,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<string>;
     }
 
     interface LoDashImplicitArrayWrapper<T> {
         /**
-        * @see _.reject
-        **/
+         * @see _.reject
+         */
         reject(
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): LoDashImplicitArrayWrapper<T>;
+            predicate: ListIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<T>;
 
         /**
-        * @see _.reject
-        * @param pluckValue _.pluck style callback
-        **/
-        reject(pluckValue: string): LoDashImplicitArrayWrapper<T>;
+         * @see _.reject
+         */
+        reject(
+            predicate: string,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<T>;
 
         /**
-        * @see _.reject
-        * @param whereValue _.where style callback
-        **/
-        reject<W>(whereValue: W): LoDashImplicitArrayWrapper<T>;
+         * @see _.reject
+         */
+        reject<W>(predicate: W): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.reject
+         */
+        reject<T>(
+            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.reject
+         */
+        reject<T>(
+            predicate: string,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.reject
+         */
+        reject<W, T>(predicate: W): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.reject
+         */
+        reject(
+            predicate?: StringIterator<boolean>,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.reject
+         */
+        reject(
+            predicate: ListIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.reject
+         */
+        reject(
+            predicate: string,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.reject
+         */
+        reject<W>(predicate: W): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.reject
+         */
+        reject<T>(
+            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.reject
+         */
+        reject<T>(
+            predicate: string,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.reject
+         */
+        reject<W, T>(predicate: W): LoDashExplicitArrayWrapper<T>;
     }
 
     //_.sample
@@ -6362,6 +7008,165 @@ declare module _ {
         sample(): LoDashImplicitWrapper<T>;
     }
 
+    //_.select
+    interface LoDashStatic {
+        /**
+         * @see _.filter
+         */
+        select<T>(
+            collection: List<T>,
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): T[];
+
+        /**
+         * @see _.filter
+         */
+        select<T>(
+            collection: Dictionary<T>,
+            predicate?: DictionaryIterator<T, boolean>,
+            thisArg?: any
+        ): T[];
+
+        /**
+         * @see _.filter
+         */
+        select(
+            collection: string,
+            predicate?: StringIterator<boolean>,
+            thisArg?: any
+        ): string[];
+
+        /**
+         * @see _.filter
+         */
+        select<T>(
+            collection: List<T>|Dictionary<T>,
+            predicate: string,
+            thisArg?: any
+        ): T[];
+
+        /**
+         * @see _.filter
+         */
+        select<W extends {}, T>(
+            collection: List<T>|Dictionary<T>,
+            predicate: W
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        select(
+            predicate?: StringIterator<boolean>,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        select(
+            predicate: ListIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        select(
+            predicate: string,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        select<W>(predicate: W): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        select<T>(
+            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        select<T>(
+            predicate: string,
+            thisArg?: any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        select<W, T>(predicate: W): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        select(
+            predicate?: StringIterator<boolean>,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        select(
+            predicate: ListIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        select(
+            predicate: string,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        select<W>(predicate: W): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        select<T>(
+            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        select<T>(
+            predicate: string,
+            thisArg?: any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        select<W, T>(predicate: W): LoDashExplicitArrayWrapper<T>;
+    }
+
     //_.shuffle
     interface LoDashStatic {
         /**
@@ -6423,47 +7228,62 @@ declare module _ {
     //_.size
     interface LoDashStatic {
         /**
-        * Gets the size of the collection by returning collection.length for arrays and array-like
-        * objects or the number of own enumerable properties for objects.
-        * @param collection The collection to inspect.
-        * @return collection.length
-        **/
-        size<T>(collection: Array<T>): number;
+         * Gets the size of collection by returning its length for array-like values or the number of own enumerable
+         * properties for objects.
+         *
+         * @param collection The collection to inspect.
+         * @return Returns the size of collection.
+         */
+        size<T>(collection: List<T>|Dictionary<T>): number;
 
         /**
-        * @see _.size
-        **/
-        size<T>(collection: List<T>): number;
+         * @see _.size
+         */
+        size(collection: string): number;
+    }
 
+    interface LoDashImplicitWrapper<T> {
         /**
-        * @see _.size
-        * @param object The object to inspect
-        * @return The number of own enumerable properties.
-        **/
-        size<T extends {}>(object: T): number;
-
-        /**
-        * @see _.size
-        * @param aString The string to inspect
-        * @return The length of aString
-        **/
-        size(aString: string): number;
+         * @see _.size
+         */
+        size(): number;
     }
 
     interface LoDashImplicitArrayWrapper<T> {
         /**
          * @see _.size
-         **/
+         */
         size(): number;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.size
-         **/
+         */
         size(): number;
     }
 
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.size
+         */
+        size(): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.size
+         */
+        size(): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.size
+         */
+        size(): LoDashExplicitWrapper<number>;
+    }
+
     //_.some
     interface LoDashStatic {
         /**
@@ -7021,19 +7841,34 @@ declare module _ {
     interface LoDashStatic {
         /**
          * Creates a function that accepts up to n arguments ignoring any additional arguments.
+         *
          * @param func The function to cap arguments for.
          * @param n The arity cap.
-         * @param guard Enables use as a callback for functions like `_.map`.
          * @returns Returns the new function.
          */
-        ary<TResult extends Function>(func: Function, n?: number, guard?: Object): TResult;
+        ary<TResult extends Function>(
+            func: Function,
+            n?: number
+        ): TResult;
+
+        ary<T extends Function, TResult extends Function>(
+            func: T,
+            n?: number
+        ): TResult;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.ary
          */
-        ary<TResult extends Function>(n?: number, guard?: Object): LoDashImplicitObjectWrapper<TResult>;
+        ary<TResult extends Function>(n?: number): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.ary
+         */
+        ary<TResult extends Function>(n?: number): LoDashExplicitObjectWrapper<TResult>;
     }
 
     //_.backflow
@@ -7436,47 +8271,68 @@ declare module _ {
     //_.defer
     interface LoDashStatic {
         /**
-        * Defers executing the func function until the current call stack has cleared. Additional
-        * arguments will be provided to func when it is invoked.
-        * @param func The function to defer.
-        * @param args Arguments to invoke the function with.
-        * @return The timer id.
-        **/
-        defer(
-            func: Function,
-            ...args: any[]): number;
+         * Defers invoking the func until the current call stack has cleared. Any additional arguments are provided to
+         * func when it’s invoked.
+         *
+         * @param func The function to defer.
+         * @param args The arguments to invoke the function with.
+         * @return Returns the timer id.
+         */
+        defer<T extends Function>(
+            func: T,
+            ...args: any[]
+        ): number;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
-        * @see _.defer
-        **/
+         * @see _.defer
+         */
         defer(...args: any[]): LoDashImplicitWrapper<number>;
     }
 
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.defer
+         */
+        defer(...args: any[]): LoDashExplicitWrapper<number>;
+    }
+
     //_.delay
     interface LoDashStatic {
         /**
-        * Executes the func function after wait milliseconds. Additional arguments will be provided
-        * to func when it is invoked.
-        * @param func The function to delay.
-        * @param wait The number of milliseconds to delay execution.
-        * @param args Arguments to invoke the function with.
-        * @return The timer id.
-        **/
-        delay(
-            func: Function,
+         * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
+         *
+         * @param func The function to delay.
+         * @param wait The number of milliseconds to delay invocation.
+         * @param args The arguments to invoke the function with.
+         * @return Returns the timer id.
+         */
+        delay<T extends Function>(
+            func: T,
             wait: number,
-            ...args: any[]): number;
+            ...args: any[]
+        ): number;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
-        * @see _.delay
-        **/
+         * @see _.delay
+         */
         delay(
             wait: number,
-            ...args: any[]): LoDashImplicitWrapper<number>;
+            ...args: any[]
+        ): LoDashImplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.delay
+         */
+        delay(
+            wait: number,
+            ...args: any[]
+        ): LoDashExplicitWrapper<number>;
     }
 
     //_.flow
@@ -7557,6 +8413,7 @@ declare module _ {
     interface LoDashStatic {
         /**
          * Creates a function that runs each argument through a corresponding transform function.
+         *
          * @param func The function to wrap.
          * @param transforms The functions to transform arguments, specified as individual functions or arrays
          * of functions.
@@ -7588,6 +8445,18 @@ declare module _ {
         modArgs<TResult extends Function>(transforms: Function[]): LoDashImplicitObjectWrapper<TResult>;
     }
 
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.modArgs
+         */
+        modArgs<TResult extends Function>(...transforms: Function[]): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.modArgs
+         */
+        modArgs<TResult extends Function>(transforms: Function[]): LoDashExplicitObjectWrapper<TResult>;
+    }
+
     //_.negate
     interface LoDashStatic {
         /**
@@ -7802,16 +8671,25 @@ declare module _ {
         /**
          * Creates a function that invokes func with the this binding of the created function and arguments from start
          * and beyond provided as an array.
+         *
+         * Note: This method is based on the rest parameter.
+         *
          * @param func The function to apply a rest parameter to.
          * @param start The start position of the rest parameter.
          * @return Returns the new function.
          */
-        restParam<TResult extends Function>(func: Function, start?: number): TResult;
+        restParam<TResult extends Function>(
+            func: Function,
+            start?: number
+        ): TResult;
 
         /**
          * @see _.restParam
          */
-        restParam<TResult extends Function, TFunc extends Function>(func: TFunc, start?: number): TResult;
+        restParam<TResult extends Function, TFunc extends Function>(
+            func: TFunc,
+            start?: number
+        ): TResult;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
@@ -7821,6 +8699,13 @@ declare module _ {
         restParam<TResult extends Function>(start?: number): LoDashImplicitObjectWrapper<TResult>;
     }
 
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.restParam
+         */
+        restParam<TResult extends Function>(start?: number): LoDashExplicitObjectWrapper<TResult>;
+    }
+
     //_.spread
     interface LoDashStatic {
         /**
@@ -7841,41 +8726,62 @@ declare module _ {
 
 
     //_.throttle
-    interface LoDashStatic {
-        /**
-        * Creates a function that, when executed, will only call the func function at most once per
-        * every wait milliseconds. Provide an options object to indicate that func should be invoked
-        * on the leading and/or trailing edge of the wait timeout. Subsequent calls to the throttled
-        * function will return the result of the last func call.
-        *
-        * Note: If leading and trailing options are true func will be called on the trailing edge of
-        * the timeout only if the the throttled function is invoked more than once during the wait timeout.
-        * @param func The function to throttle.
-        * @param wait The number of milliseconds to throttle executions to.
-        * @param options The options object.
-        * @param options.leading Specify execution on the leading edge of the timeout.
-        * @param options.trailing Specify execution on the trailing edge of the timeout.
-        * @return The new throttled function.
-        **/
-        throttle<T extends Function>(
-            func: T,
-            wait: number,
-            options?: ThrottleSettings): T;
-    }
-
     interface ThrottleSettings {
-
         /**
-        * If you'd like to disable the leading-edge call, pass this as false.
-        **/
+         * If you'd like to disable the leading-edge call, pass this as false.
+         */
         leading?: boolean;
 
         /**
-        * If you'd like to disable the execution on the trailing-edge, pass false.
-        **/
+         * If you'd like to disable the execution on the trailing-edge, pass false.
+         */
         trailing?: boolean;
     }
 
+    interface LoDashStatic {
+        /**
+         * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
+         * function comes with a cancel method to cancel delayed invocations. Provide an options object to indicate
+         * that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent calls to
+         * the throttled function return the result of the last func call.
+         *
+         * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
+         * the the throttled function is invoked more than once during the wait timeout.
+         *
+         * @param func The function to throttle.
+         * @param wait The number of milliseconds to throttle invocations to.
+         * @param options The options object.
+         * @param options.leading Specify invoking on the leading edge of the timeout.
+         * @param options.trailing Specify invoking on the trailing edge of the timeout.
+         * @return Returns the new throttled function.
+         */
+        throttle<T extends Function>(
+            func: T,
+            wait?: number,
+            options?: ThrottleSettings
+        ): T & Cancelable;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.throttle
+         */
+        throttle(
+            wait?: number,
+            options?: ThrottleSettings
+        ): LoDashImplicitObjectWrapper<T & Cancelable>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.throttle
+         */
+        throttle(
+            wait?: number,
+            options?: ThrottleSettings
+        ): LoDashExplicitObjectWrapper<T & Cancelable>;
+    }
+
     //_.wrap
     interface LoDashStatic {
         /**
@@ -8063,38 +8969,60 @@ declare module _ {
     interface LoDashStatic {
         /**
          * Checks if value is greater than other.
+         *
          * @param value The value to compare.
          * @param other The other value to compare.
          * @return Returns true if value is greater than other, else false.
          */
-        gt(value: any, other: any): boolean;
+        gt(
+            value: any,
+            other: any
+        ): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T,TWrapper> {
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
         /**
          * @see _.gt
          */
         gt(other: any): boolean;
     }
 
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.gt
+         */
+        gt(other: any): LoDashExplicitWrapper<boolean>;
+    }
+
     //_.gte
     interface LoDashStatic {
         /**
          * Checks if value is greater than or equal to other.
+         *
          * @param value The value to compare.
          * @param other The other value to compare.
          * @return Returns true if value is greater than or equal to other, else false.
          */
-        gte(value: any, other: any): boolean;
+        gte(
+            value: any,
+            other: any
+        ): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T,TWrapper> {
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
         /**
          * @see _.gte
          */
         gte(other: any): boolean;
     }
 
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.gte
+         */
+        gte(other: any): LoDashExplicitWrapper<boolean>;
+    }
+
     //_.isArguments
     interface LoDashStatic {
         /**
@@ -8167,6 +9095,7 @@ declare module _ {
     interface LoDashStatic {
         /**
          * Checks if value is a DOM element.
+         *
          * @param value The value to check.
          * @return Returns true if value is a DOM element, else false.
          */
@@ -8180,6 +9109,13 @@ declare module _ {
         isElement(): boolean;
     }
 
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isElement
+         */
+        isElement(): LoDashExplicitWrapper<boolean>;
+    }
+
     //_.isEmpty
     interface LoDashStatic {
         /**
@@ -8371,9 +9307,10 @@ declare module _ {
     interface LoDashStatic {
         /**
          * Checks if value is null.
+         *
          * @param value The value to check.
          * @return Returns true if value is null, else false.
-         **/
+         */
         isNull(value?: any): boolean;
     }
 
@@ -8384,6 +9321,13 @@ declare module _ {
         isNull(): boolean;
     }
 
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isNull
+         */
+        isNull(): LoDashExplicitWrapper<boolean>;
+    }
+
     //_.isNumber
     interface LoDashStatic {
         /**
@@ -8479,6 +9423,7 @@ declare module _ {
     interface LoDashStatic {
         /**
          * Checks if value is classified as a typed array.
+         *
          * @param value The value to check.
          * @return Returns true if value is correctly classified, else false.
          */
@@ -8492,6 +9437,13 @@ declare module _ {
         isTypedArray(): boolean;
     }
 
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isTypedArray
+         */
+        isTypedArray(): LoDashExplicitWrapper<boolean>;
+    }
+
     //_.isUndefined
     interface LoDashStatic {
         /**
@@ -8513,38 +9465,60 @@ declare module _ {
     interface LoDashStatic {
         /**
          * Checks if value is less than other.
+         *
          * @param value The value to compare.
          * @param other The other value to compare.
          * @return Returns true if value is less than other, else false.
          */
-        lt(value: any, other: any): boolean;
+        lt(
+            value: any,
+            other: any
+        ): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T,TWrapper> {
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
         /**
          * @see _.lt
          */
         lt(other: any): boolean;
     }
 
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.lt
+         */
+        lt(other: any): LoDashExplicitWrapper<boolean>;
+    }
+
     //_.lte
     interface LoDashStatic {
         /**
          * Checks if value is less than or equal to other.
+         *
          * @param value The value to compare.
          * @param other The other value to compare.
          * @return Returns true if value is less than or equal to other, else false.
          */
-        lte(value: any, other: any): boolean;
+        lte(
+            value: any,
+            other: any
+        ): boolean;
     }
 
-    interface LoDashImplicitWrapperBase<T,TWrapper> {
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
         /**
          * @see _.lte
          */
         lte(other: any): boolean;
     }
 
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.lte
+         */
+        lte(other: any): LoDashExplicitWrapper<boolean>;
+    }
+
     //_.toArray
     interface LoDashStatic {
         /**
@@ -9848,6 +10822,39 @@ declare module _ {
         ): string;
     }
 
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.findKey
+         */
+        findKey<TValues>(
+            predicate?: DictionaryIterator<TValues, boolean>,
+            thisArg?: any
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.findKey
+         */
+        findKey(
+            predicate?: ObjectIterator<any, boolean>,
+            thisArg?: any
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.findKey
+         */
+        findKey(
+            predicate?: string,
+            thisArg?: any
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.findKey
+         */
+        findKey<TWhere extends Dictionary<any>>(
+            predicate?: TWhere
+        ): LoDashExplicitWrapper<string>;
+    }
+
     //_.findLastKey
     interface LoDashStatic {
         /**
@@ -9933,165 +10940,252 @@ declare module _ {
         ): string;
     }
 
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey<TValues>(
+            predicate?: DictionaryIterator<TValues, boolean>,
+            thisArg?: any
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey(
+            predicate?: ObjectIterator<any, boolean>,
+            thisArg?: any
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey(
+            predicate?: string,
+            thisArg?: any
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey<TWhere extends Dictionary<any>>(
+            predicate?: TWhere
+        ): LoDashExplicitWrapper<string>;
+    }
+
     //_.forIn
     interface LoDashStatic {
         /**
-        * Iterates over own and inherited enumerable properties of an object, executing the callback for
-        * each property. The callback is bound to thisArg and invoked with three arguments; (value, key,
-        * object). Callbacks may exit iteration early by explicitly returning false.
-        * @param object The object to iterate over.
-        * @param callback The function called per iteration.
-        * @param thisArg The this binding of callback.
-        * @return object
-        **/
+         * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
+         * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
+         * exit iteration early by explicitly returning false.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns object.
+         */
         forIn<T>(
             object: Dictionary<T>,
-            callback?: DictionaryIterator<T, void>,
-            thisArg?: any): Dictionary<T>;
+            iteratee?: DictionaryIterator<T, any>,
+            thisArg?: any
+        ): Dictionary<T>;
 
         /**
-        * @see _.forIn
-        **/
-        forIn<T>(
+         * @see _.forIn
+         */
+        forIn<T extends {}>(
             object: T,
-            callback?: ObjectIterator<any, void>,
-            thisArg?: any): T;
+            iteratee?: ObjectIterator<any, any>,
+            thisArg?: any
+        ): T;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
-        * @see _.forIn
-        **/
-        forIn<T extends {}>(
-            callback: ObjectIterator<T, void>,
-            thisArg?: any): _.LoDashImplicitObjectWrapper<T>;
+         * @see _.forIn
+         */
+        forIn<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>,
+            thisArg?: any
+        ): _.LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.forIn
+         */
+        forIn<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>,
+            thisArg?: any
+        ): _.LoDashExplicitObjectWrapper<T>;
     }
 
     //_.forInRight
     interface LoDashStatic {
         /**
-        * This method is like _.forIn except that it iterates over elements of a collection in the
-        * opposite order.
-        * @param object The object to iterate over.
-        * @param callback The function called per iteration.
-        * @param thisArg The this binding of callback.
-        * @return object
-        **/
-        forInRight<T extends {}>(
+         * This method is like _.forIn except that it iterates over properties of object in the opposite order.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns object.
+         */
+        forInRight<T>(
             object: Dictionary<T>,
-            callback?: DictionaryIterator<T, void>,
-            thisArg?: any): Dictionary<T>;
+            iteratee?: DictionaryIterator<T, any>,
+            thisArg?: any
+        ): Dictionary<T>;
 
         /**
-        * @see _.forInRight
-        **/
+         * @see _.forInRight
+         */
         forInRight<T extends {}>(
             object: T,
-            callback?: ObjectIterator<T, void>,
-            thisArg?: any): T;
+            iteratee?: ObjectIterator<any, any>,
+            thisArg?: any
+        ): T;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
-        * @see _.forInRight
-        **/
-        forInRight<T extends {}>(
-            callback: ObjectIterator<T, void>,
-            thisArg?: any): _.LoDashImplicitObjectWrapper<T>;
+         * @see _.forInRight
+         */
+        forInRight<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>,
+            thisArg?: any
+        ): _.LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.forInRight
+         */
+        forInRight<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>,
+            thisArg?: any
+        ): _.LoDashExplicitObjectWrapper<T>;
     }
 
     //_.forOwn
     interface LoDashStatic {
         /**
-        * Iterates over own enumerable properties of an object, executing the callback for each
-        * property. The callback is bound to thisArg and invoked with three arguments; (value, key,
-        * object). Callbacks may exit iteration early by explicitly returning false.
-        * @param object The object to iterate over.
-        * @param callback The function called per iteration.
-        * @param thisArg The this binding of callback.
-        * @return object
-        **/
-        forOwn<T extends {}>(
+         * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
+         * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
+         * iteration early by explicitly returning false.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns object.
+         */
+        forOwn<T>(
             object: Dictionary<T>,
-            callback?: DictionaryIterator<T, void>,
-            thisArg?: any): Dictionary<T>;
+            iteratee?: DictionaryIterator<T, any>,
+            thisArg?: any
+        ): Dictionary<T>;
 
         /**
-        * @see _.forOwn
-        **/
+         * @see _.forOwn
+         */
         forOwn<T extends {}>(
             object: T,
-            callback?: ObjectIterator<any, void>,
-            thisArg?: any): T;
+            iteratee?: ObjectIterator<any, any>,
+            thisArg?: any
+        ): T;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
-        * @see _.forOwn
-        **/
-        forOwn<T extends {}>(
-            callback: ObjectIterator<T, void>,
-            thisArg?: any): _.LoDashImplicitObjectWrapper<T>;
+         * @see _.forOwn
+         */
+        forOwn<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>,
+            thisArg?: any
+        ): _.LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.forOwn
+         */
+        forOwn<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>,
+            thisArg?: any
+        ): _.LoDashExplicitObjectWrapper<T>;
     }
 
     //_.forOwnRight
     interface LoDashStatic {
         /**
-        * This method is like _.forOwn except that it iterates over elements of a collection in the
-        * opposite order.
-        * @param object The object to iterate over.
-        * @param callback The function called per iteration.
-        * @param thisArg The this binding of callback.
-        * @return object
-        **/
-        forOwnRight<T extends {}>(
+         * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns object.
+         */
+        forOwnRight<T>(
             object: Dictionary<T>,
-            callback?: DictionaryIterator<T, void>,
-            thisArg?: any): Dictionary<T>;
+            iteratee?: DictionaryIterator<T, any>,
+            thisArg?: any
+        ): Dictionary<T>;
+
         /**
-        * @see _.forOwnRight
-        **/
+         * @see _.forOwnRight
+         */
         forOwnRight<T extends {}>(
             object: T,
-            callback?: ObjectIterator<any, void>,
-            thisArg?: any): T;
+            iteratee?: ObjectIterator<any, any>,
+            thisArg?: any
+        ): T;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
-        * @see _.forOwnRight
-        **/
-        forOwnRight<T extends {}>(
-            callback: ObjectIterator<T, void>,
-            thisArg?: any): _.LoDashImplicitObjectWrapper<T>;
+         * @see _.forOwnRight
+         */
+        forOwnRight<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>,
+            thisArg?: any
+        ): _.LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.forOwnRight
+         */
+        forOwnRight<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>,
+            thisArg?: any
+        ): _.LoDashExplicitObjectWrapper<T>;
     }
 
     //_.functions
     interface LoDashStatic {
         /**
-        * Creates a sorted array of property names of all enumerable properties, own and inherited, of
-        * object that have function values.
-        * @param object The object to inspect.
-        * @return An array of property names that have function values.
-        **/
-        functions(object: any): string[];
-
-        /**
-        * @see _functions
-        **/
-        methods(object: any): string[];
+         * Creates an array of function property names from all enumerable properties, own and inherited, of object.
+         *
+         * @alias _.methods
+         *
+         * @param object The object to inspect.
+         * @return Returns the new array of property names.
+         */
+        functions<T extends {}>(object: any): string[];
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
-        * @see _.functions
-        **/
+         * @see _.functions
+         */
         functions(): _.LoDashImplicitArrayWrapper<string>;
+    }
 
+    interface LoDashExplicitObjectWrapper<T> {
         /**
-        * @see _.functions
-        **/
-        methods(): _.LoDashImplicitArrayWrapper<string>;
+         * @see _.functions
+         */
+        functions(): _.LoDashExplicitArrayWrapper<string>;
     }
 
     //_.get
@@ -10128,14 +11222,24 @@ declare module _ {
          * @param path The path to check.
          * @return Returns true if path is a direct property, else false.
          */
-        has(object: any, path: string|number|boolean|Array<string|number|boolean>): boolean;
+        has<T extends {}>(
+            object: T,
+            path: StringRepresentable|StringRepresentable[]
+        ): boolean;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.has
          */
-        has(path: string|number|boolean|Array<string|number|boolean>): boolean;
+        has(path: StringRepresentable|StringRepresentable[]): boolean;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.has
+         */
+        has(path: StringRepresentable|StringRepresentable[]): LoDashExplicitWrapper<boolean>;
     }
 
     //_.invert
@@ -10148,7 +11252,18 @@ declare module _ {
          * @param multiValue Allow multiple values per key.
          * @return Returns the new inverted object.
          */
-        invert<T extends {}, TResult extends {}>(object: T, multiValue?: boolean): TResult;
+        invert<T extends {}, TResult extends {}>(
+            object: T,
+            multiValue?: boolean
+        ): TResult;
+
+        /**
+         * @see _.invert
+         */
+        invert<TResult extends {}>(
+            object: Object,
+            multiValue?: boolean
+        ): TResult;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
@@ -10158,38 +11273,65 @@ declare module _ {
         invert<TResult extends {}>(multiValue?: boolean): LoDashImplicitObjectWrapper<TResult>;
     }
 
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.invert
+         */
+        invert<TResult extends {}>(multiValue?: boolean): LoDashExplicitObjectWrapper<TResult>;
+    }
+
     //_.keys
     interface LoDashStatic {
         /**
-        * Creates an array composed of the own enumerable property names of an object.
-        * @param object The object to inspect.
-        * @return An array of property names.
-        **/
+         * Creates an array of the own enumerable property names of object.
+         *
+         * Note: Non-object values are coerced to objects. See the ES spec for more details.
+         *
+         * @param object The object to query.
+         * @return Returns the array of property names.
+         */
         keys(object?: any): string[];
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
-        * @see _.keys
-        **/
-        keys(): LoDashImplicitArrayWrapper<string>
+         * @see _.keys
+         */
+        keys(): LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.keys
+         */
+        keys(): LoDashExplicitArrayWrapper<string>;
     }
 
     //_.keysIn
     interface LoDashStatic {
         /**
          * Creates an array of the own and inherited enumerable property names of object.
+         *
+         * Note: Non-object values are coerced to objects.
+         *
          * @param object The object to query.
          * @return An array of property names.
-         **/
+         */
         keysIn(object?: any): string[];
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.keysIn
-         **/
-        keysIn(): LoDashImplicitArrayWrapper<string>
+         */
+        keysIn(): LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.keysIn
+         */
+        keysIn(): LoDashExplicitArrayWrapper<string>;
     }
 
     //_.mapKeys
@@ -10231,7 +11373,8 @@ declare module _ {
          */
         mapKeys<T>(
             object: List<T>|Dictionary<T>,
-            iteratee?: string
+            iteratee?: string,
+            thisArg?: any
         ): Dictionary<T>;
     }
 
@@ -10255,7 +11398,8 @@ declare module _ {
          * @see _.mapKeys
          */
         mapKeys(
-            iteratee?: string
+            iteratee?: string,
+            thisArg?: any
         ): LoDashImplicitObjectWrapper<Dictionary<T>>;
     }
 
@@ -10279,10 +11423,61 @@ declare module _ {
          * @see _.mapKeys
          */
         mapKeys<TResult>(
-            iteratee?: string
+            iteratee?: string,
+            thisArg?: any
         ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
     }
 
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TKey>(
+            iteratee?: ListIterator<T, TKey>,
+            thisArg?: any
+        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys(
+            iteratee?: string,
+            thisArg?: any
+        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TResult, TKey>(
+            iteratee?: ListIterator<TResult, TKey>|DictionaryIterator<TResult, TKey>,
+            thisArg?: any
+        ): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TResult, TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TResult>(
+            iteratee?: string,
+            thisArg?: any
+        ): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
+    }
+
     //_.mapValues
     interface LoDashStatic {
         /**
@@ -10462,6 +11657,28 @@ declare module _ {
         ): LoDashImplicitObjectWrapper<TResult>;
     }
 
+    //_.methods
+    interface LoDashStatic {
+        /**
+         * @see _.functions
+         */
+        methods<T extends {}>(object: any): string[];
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.functions
+         */
+        methods(): _.LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.functions
+         */
+        methods(): _.LoDashExplicitArrayWrapper<string>;
+    }
+
     //_.omit
     interface LoDashStatic {
         /**
@@ -10518,19 +11735,28 @@ declare module _ {
     //_.pairs
     interface LoDashStatic {
         /**
-        * Creates a two dimensional array of an object's key-value pairs,
-        * i.e. [[key1, value1], [key2, value2]].
-        * @param object The object to inspect.
-        * @return Aew array of key-value pairs.
-        **/
-        pairs(object?: any): any[][];
+         * Creates a two dimensional array of the key-value pairs for object, e.g. [[key1, value1], [key2, value2]].
+         *
+         * @param object The object to query.
+         * @return Returns the new array of key-value pairs.
+         */
+        pairs<T extends {}>(object?: T): any[][];
+
+        pairs<T extends {}, TResult>(object?: T): TResult[][];
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
-        * @see _.pairs
-        **/
-        pairs(): LoDashImplicitArrayWrapper<any[]>;
+         * @see _.pairs
+         */
+        pairs<TResult>(): LoDashImplicitArrayWrapper<TResult[]>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.pairs
+         */
+        pairs<TResult>(): LoDashExplicitArrayWrapper<TResult[]>;
     }
 
     //_.pick
@@ -10622,18 +11848,37 @@ declare module _ {
             path: StringRepresentable|StringRepresentable[],
             value: any
         ): T;
+
+        /**
+         * @see _.set
+         */
+        set<V, T>(
+            object: T,
+            path: StringRepresentable|StringRepresentable[],
+            value: V
+        ): T;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.set
          */
-        set(
+        set<V>(
             path: StringRepresentable|StringRepresentable[],
-            value: any
+            value: V
         ): LoDashImplicitObjectWrapper<T>;
     }
 
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.set
+         */
+        set<V>(
+            path: StringRepresentable|StringRepresentable[],
+            value: V
+        ): LoDashExplicitObjectWrapper<T>;
+    }
+
     //_.transform
     interface LoDashStatic {
         /**
@@ -10729,35 +11974,51 @@ declare module _ {
     //_.values
     interface LoDashStatic {
         /**
-        * Creates an array of the own enumerable property values of object.
-        * @param object The object to query.
-        * @return Returns an array of property values.
-        **/
+         * Creates an array of the own enumerable property values of object.
+         *
+         * @param object The object to query.
+         * @return Returns an array of property values.
+         */
         values<T>(object?: any): T[];
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
-        * @see _.values
-        **/
-        values<TResult>(): LoDashImplicitObjectWrapper<TResult[]>;
+         * @see _.values
+         */
+        values<T>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.values
+         */
+        values<T>(): LoDashExplicitArrayWrapper<T>;
     }
 
     //_.valuesIn
     interface LoDashStatic {
         /**
-        * Creates an array of the own and inherited enumerable property values of object.
-        * @param object The object to query.
-        * @return Returns the array of property values.
-        **/
+         * Creates an array of the own and inherited enumerable property values of object.
+         *
+         * @param object The object to query.
+         * @return Returns the array of property values.
+         */
         valuesIn<T>(object?: any): T[];
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
-        * @see _.valuesIn
-        **/
-        valuesIn<TResult>(): LoDashImplicitObjectWrapper<TResult[]>;
+         * @see _.valuesIn
+         */
+        valuesIn<T>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.valuesIn
+         */
+        valuesIn<T>(): LoDashExplicitArrayWrapper<T>;
     }
 
     /**********
@@ -12014,13 +13275,14 @@ declare module _ {
     interface LoDashStatic {
         /**
          * Creates a function that returns the property value at path on a given object.
+         *
          * @param path The path of the property to get.
          * @return Returns the new function.
          */
-        property<TObj, TResult>(path: string|string[]): (obj: TObj) => TResult;
+        property<TObj, TResult>(path: StringRepresentable|StringRepresentable[]): (obj: TObj) => TResult;
     }
 
-    interface LoDashImplicitStringWrapper {
+    interface LoDashImplicitWrapper<T> {
         /**
          * @see _.property
          */
@@ -12034,6 +13296,20 @@ declare module _ {
         property<TObj, TResult>(): LoDashImplicitObjectWrapper<(obj: TObj) => TResult>;
     }
 
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.property
+         */
+        property<TObj, TResult>(): LoDashExplicitObjectWrapper<(obj: TObj) => TResult>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.property
+         */
+        property<TObj, TResult>(): LoDashExplicitObjectWrapper<(obj: TObj) => TResult>;
+    }
+
     //_.propertyOf
     interface LoDashStatic {
         /**
@@ -12248,6 +13524,10 @@ declare module _ {
     interface StringRepresentable {
         toString(): string;
     }
+
+    interface Cancelable {
+        cancel(): void;
+    }
 }
 
 declare module "lodash" {
diff --git a/loglevel/loglevel-tests.ts b/loglevel/loglevel-tests.ts
index 2c4f89733..ab1993956 100644
--- a/loglevel/loglevel-tests.ts
+++ b/loglevel/loglevel-tests.ts
@@ -13,8 +13,15 @@ log.setLevel(0, false);
 log.setLevel("error");
 log.setLevel("error", false);
 
-log.setLevel(log.levels.WARN);
-log.setLevel(log.levels.WARN, false);
+log.setLevel(LogLevel.WARN);
+log.setLevel(LogLevel.WARN, false);
+
+var logLevel = log.getLevel();
+
+var testLogger = log.getLogger("TestLogger");
+
+testLogger.setLevel(logLevel);
+testLogger.warn("logging test");
 
 var logging = log.noConflict();
 
diff --git a/loglevel/loglevel.d.ts b/loglevel/loglevel.d.ts
index 9f3c53f5a..33dd8cd63 100644
--- a/loglevel/loglevel.d.ts
+++ b/loglevel/loglevel.d.ts
@@ -1,101 +1,144 @@
-// Type definitions for loglevel 1.3.1
+// Type definitions for loglevel 1.4.0
 // Project: https://github.com/pimterry/loglevel
-// Definitions by: Stefan Profanter <https://github.com/Pro/>
+// Definitions by: Stefan Profanter <https://github.com/Pro/>, Florian Wagner <https://github.com/flqw/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare module loglevel {
-
-	/**
-	 * Log levels
-	 */
-	export enum levels {
-		TRACE = 0,
-		DEBUG = 1,
-		INFO = 2,
-		WARN = 3,
-		ERROR = 4,
-		SILENT = 5
-	}
-
-	/**
-	 * Output trace message to console.
-	 * This will also include a full stack trace
-	 *
-	 * @param msg any data to log to the console
-	 */
-	export function trace(msg:any):void;
-
-	/**
-	 * Output debug message to console including appropriate icons
-	 *
-	 * @param msg any data to log to the console
-	 */
-	export function debug(msg:any):void;
-
-	/**
-	 * Output info message to console including appropriate icons
-	 *
-	 * @param msg any data to log to the console
-	 */
-	export function info(msg:any):void;
-
-	/**
-	 * Output warn message to console including appropriate icons
-	 *
-	 * @param msg any data to log to the console
-	 */
-	export function warn(msg:any):void;
-
-	/**
-	 * Output error message to console including appropriate icons
-	 *
-	 * @param msg any data to log to the console
-	 */
-	export function error(msg:any):void;
-
-
-	/**
-	 * This disables all logging below the given level, so that after a log.setLevel("warn") call log.warn("something")
-	 * or log.error("something") will output messages, but log.info("something") will not.
-	 *
-	 * @param level 0=trace to 5=silent
-	 * @param persist Where possible the log level will be persisted. LocalStorage will be used if available, falling back
-	 *            to cookies if not. If neither is available in the current environment (i.e. in Node), or if you pass
-	 *            false as the optional 'persist' second argument, persistence will be skipped.
-	 */
-	export function setLevel(level:number, persist?:boolean):void;
-
-
-	/**
-	 * This disables all logging below the given level, so that after a log.setLevel("warn") call log.warn("something")
-	 * or log.error("something") will output messages, but log.info("something") will not.
-	 *
-	 * @param level as a string, like 'error' (case-insensitive)
-	 * @param persist Where possible the log level will be persisted. LocalStorage will be used if available, falling back
-	 *            to cookies if not. If neither is available in the current environment (i.e. in Node), or if you pass
-	 *            false as the optional 'persist' second argument, persistence will be skipped.
-	 */
-	export function setLevel(level:string, persist?:boolean):void;
-
-
-	/**
-	 * This disables all logging below the given level, so that after a log.setLevel("warn") call log.warn("something")
-	 * or log.error("something") will output messages, but log.info("something") will not.
-	 *
-	 * @param level as the value from the enum
-	 * @param persist Where possible the log level will be persisted. LocalStorage will be used if available, falling back
-	 *            to cookies if not. If neither is available in the current environment (i.e. in Node), or if you pass
-	 *            false as the optional 'persist' second argument, persistence will be skipped.
-	 */
-	export function setLevel(level:levels, persist?:boolean):void;
-
-	/**
-	 * If you're using another JavaScript library that exposes a 'log' global, you can run into conflicts with loglevel.
-	 * Similarly to jQuery, you can solve this by putting loglevel into no-conflict mode immediately after it is loaded
-	 * onto the page. This resets to 'log' global to its value before loglevel was loaded (typically undefined), and
-	 * returns the loglevel object, which you can then bind to another name yourself.
-	 */
-	export function noConflict():any;
+/**
+ * Log levels
+ */
+declare const enum LogLevel {
+    TRACE = 0,
+    DEBUG = 1,
+    INFO = 2,
+    WARN = 3,
+    ERROR = 4,
+    SILENT = 5
 }
 
-declare var log:typeof loglevel;
+interface Log {
+
+    /**
+     * Output trace message to console.
+     * This will also include a full stack trace
+     *
+     * @param msg any data to log to the console
+     */
+    trace(...msg : any[]):void;
+
+    /**
+     * Output debug message to console including appropriate icons
+     *
+     * @param msg any data to log to the console
+     */
+    debug(...msg : any[]):void;
+
+    /**
+     * Output info message to console including appropriate icons
+     *
+     * @param msg any data to log to the console
+     */
+    info(...msg : any[]):void;
+
+    /**
+     * Output warn message to console including appropriate icons
+     *
+     * @param msg any data to log to the console
+     */
+    warn(...msg : any[]):void;
+
+    /**
+     * Output error message to console including appropriate icons
+     *
+     * @param msg any data to log to the console
+     */
+    error(...msg : any[]):void;
+
+
+    /**
+     * This disables all logging below the given level, so that after a log.setLevel("warn") call log.warn("something")
+     * or log.error("something") will output messages, but log.info("something") will not.
+     *
+     * @param level 0=trace to 5=silent
+     * @param persist Where possible the log level will be persisted. LocalStorage will be used if available, falling
+     *     back to cookies if not. If neither is available in the current environment (i.e. in Node), or if you pass
+     *     false as the optional 'persist' second argument, persistence will be skipped.
+     */
+    setLevel(level : LogLevel, persist? : boolean):void;
+
+
+    /**
+     * This disables all logging below the given level, so that after a log.setLevel("warn") call log.warn("something")
+     * or log.error("something") will output messages, but log.info("something") will not.
+     *
+     * @param level as a string, like 'error' (case-insensitive)
+     * @param persist Where possible the log level will be persisted. LocalStorage will be used if available, falling
+     *     back to cookies if not. If neither is available in the current environment (i.e. in Node), or if you pass
+     *     false as the optional 'persist' second argument, persistence will be skipped.
+     */
+    setLevel(level : string, persist? : boolean):void;
+
+
+    /**
+     * This disables all logging below the given level, so that after a log.setLevel("warn") call log.warn("something")
+     * or log.error("something") will output messages, but log.info("something") will not.
+     *
+     * @param level as the value from the enum
+     * @param persist Where possible the log level will be persisted. LocalStorage will be used if available, falling
+     *     back to cookies if not. If neither is available in the current environment (i.e. in Node), or if you pass
+     *     false as the optional 'persist' second argument, persistence will be skipped.
+     */
+    setLevel(level : LogLevel, persist? : boolean):void;
+
+    /**
+     * If you're using another JavaScript library that exposes a 'log' global, you can run into conflicts with loglevel.
+     * Similarly to jQuery, you can solve this by putting loglevel into no-conflict mode immediately after it is loaded
+     * onto the page. This resets to 'log' global to its value before loglevel was loaded (typically undefined), and
+     * returns the loglevel object, which you can then bind to another name yourself.
+     */
+    noConflict():any;
+
+    /**
+     * Returns the current logging level, as a value from the enum.
+     * It's very unlikely you'll need to use this for normal application logging; it's provided partly to help plugin
+     * development, and partly to let you optimize logging code as below, where debug data is only generated if the
+     * level is set such that it'll actually be logged. This probably doesn't affect you, unless you've run profiling
+     * on your code and you have hard numbers telling you that your log data generation is a real performance problem.
+     */
+    getLevel():LogLevel;
+
+    /**
+     * This sets the current log level only if one has not been persisted and can’t be loaded. This is useful when
+     * initializing scripts; if a developer or user has previously called setLevel(), this won’t alter their settings.
+     * For example, your application might set the log level to error in a production environment, but when debugging
+     * an issue, you might call setLevel("trace") on the console to see all the logs. If that error setting was set
+     * using setDefaultLevel(), it will still say as trace on subsequent page loads and refreshes instead of resetting
+     * to error.
+     *
+     * The level argument takes is the same values that you might pass to setLevel(). Levels set using
+     * setDefaultLevel() never persist to subsequent page loads.
+     *
+     * @param level as the value from the enum
+     */
+    setDefaultLevel(level : LogLevel):void;
+
+    /**
+     * This gets you a new logger object that works exactly like the root log object, but can have its level and
+     * logging methods set independently. All loggers must have a name (which is a non-empty string). Calling
+     * getLogger() multiple times with the same name will return an identical logger object.
+     * In large applications, it can be incredibly useful to turn logging on and off for particular modules as you are
+     * working with them. Using the getLogger() method lets you create a separate logger for each part of your
+     * application with its own logging level. Likewise, for small, independent modules, using a named logger instead
+     * of the default root logger allows developers using your module to selectively turn on deep, trace-level logging
+     * when trying to debug problems, while logging only errors or silencing logging altogether under normal
+     * circumstances.
+     * @param name The name of the produced logger
+     */
+    getLogger(name : String):Log;
+
+}
+
+declare var log : Log;
+
+declare module "loglevel" {
+    export = log;
+}
diff --git a/long/long-tests.ts b/long/long-tests.ts
index f70835f66..928cc9453 100644
--- a/long/long-tests.ts
+++ b/long/long-tests.ts
@@ -2,7 +2,7 @@
 
 import Long = require("long");
 
-var val: dcodeIO.Long;
+var val: Long;
 var n: number = 42;
 var b: boolean = true;
 var s: string = "1337";
diff --git a/long/long.d.ts b/long/long.d.ts
index 32d773b9d..492dc3362 100644
--- a/long/long.d.ts
+++ b/long/long.d.ts
@@ -1,75 +1,352 @@
-// Type definitions for Long.js v2.2.5
-// Project: https://github.com/dcodeIO/Long.js
+// Type definitions for long.js 3.0.2
+// Project: https://github.com/dcodeIO/long.js
 // Definitions by: Peter Kooijmans <https://github.com/peterkooijmans/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions by: Denis Cappellin <http://github.com/cappellin>
 
-declare module dcodeIO {
-    interface LongStatic {
-        new (low: number, high?: number, unsigned?: boolean): Long;
+declare class Long
+{
+    /**
+     * Constructs a 64 bit two's-complement integer, given its low and high 32 bit values as signed integers. See the from* functions below for more convenient ways of constructing Longs.
+     */
+    constructor( low: number, high?: number, unsigned?: boolean );
 
-        MAX_UNSIGNED_VALUE: Long;
-        MAX_VALUE: Long;
-        MIN_VALUE: Long;
-        NEG_ONE: Long;
-        ONE: Long;
-        UONE: Long;
-        UZERO: Long;
-        ZERO: Long;
+    /**
+     * Maximum unsigned value.
+     */
+    static MAX_UNSIGNED_VALUE: Long;
 
-        fromBits(lowBits: number, highBits: number, unsigned?: boolean): Long;
-        fromInt(value: number, unsigned?: boolean): Long;
-        fromNumber(value: number, unsigned?: boolean): Long;
-        fromString(str: string, unsigned?: boolean | number, radix?: number): Long;
-        fromValue(val: Long | number | string): Long;
-        isLong(obj: any): boolean;
-    }
+    /**
+     * Maximum signed value.
+     */
+    static MAX_VALUE: Long;
 
-    interface Long {
-        high: number;
-        low: number;
-        unsigned: boolean;
+    /**
+     * Minimum signed value.
+     */
+    static MIN_VALUE: Long;
 
-        add(other: Long | number | string): Long;
-        and(other: Long | number | string): Long;
-        compare(other: Long | number | string): number;
-        div(divisor: Long | number | string): Long;
-        equals(other: Long | number | string): boolean;
-        getHighBits(): number;
-        getHighBitsUnsigned(): number;
-        getLowBits(): number;
-        getLowBitsUnsigned(): number;
-        getNumBitsAbs(): number;
-        greaterThan(other: Long | number | string): boolean;
-        greaterThanOrEqual(other: Long | number | string): boolean;
-        isEven(): boolean;
-        isNegative(): boolean;
-        isOdd(): boolean;
-        isPositive(): boolean;
-        isZero(): boolean;
-        lessThan(other: Long | number | string): boolean;
-        lessThanOrEqual(other: Long | number | string): boolean;
-        modulo(divisor: Long | number | string): Long;
-        multiply(multiplier: Long | number | string): Long;
-        negate(): Long;
-        not(): Long;
-        notEquals(other: Long | number | string): boolean;
-        or(other: Long | number | string): Long;
-        shiftLeft(numBits: number | Long): Long;
-        shiftRight(numBits: number | Long): Long;
-        shiftRightUnsigned(numBits: number | Long): Long;
-        subtract(other: Long | number | string): Long;
-        toInt(): number;
-        toNumber(): number;
-        toSigned(): Long;
-        toString(radix?: number): string;
-        toUnsigned(): Long;
-        xor(other: Long | number | string): Long;
-    }
+    /**
+     * Signed negative one.
+     */
+    static NEG_ONE: Long;
 
-    export var Long: LongStatic;
+    /**
+     * Signed one.
+     */
+    static ONE: Long;
+
+    /**
+     * Unsigned one.
+     */
+    static UONE: Long;
+
+    /**
+     * Unsigned zero.
+     */
+    static UZERO: Long;
+
+    /**
+     * Signed zero
+     */
+    static ZERO: Long;
+
+    /**
+     * The high 32 bits as a signed value.
+     */
+    high: number;
+
+    /**
+     * The low 32 bits as a signed value.
+     */
+    low: number;
+
+    /**
+     * Whether unsigned or not.
+     */
+    unsigned: boolean;
+
+    /**
+     * Returns a Long representing the 64 bit integer that comes by concatenating the given low and high bits. Each is assumed to use 32 bits.
+     */
+    static fromBits( lowBits:number, highBits:number, unsigned?:boolean ): Long;
+
+    /**
+     * Returns a Long representing the given 32 bit integer value.
+     */
+    static fromInt( value: number, unsigned?: boolean ): Long;
+
+    /**
+     * Returns a Long representing the given value, provided that it is a finite number. Otherwise, zero is returned.
+     */
+    static fromNumber( value: number, unsigned?: boolean ): Long;
+
+    /**
+     * Returns a Long representation of the given string, written using the specified radix.
+     */
+    static fromString( str: string, unsigned?: boolean | number, radix?: number ): Long;
+
+    /**
+     * Tests if the specified object is a Long.
+     */
+    static isLong( obj: any ): boolean;
+
+    /**
+     * Converts the specified value to a Long.
+     */
+    static fromValue( val: Long | number | string | {low: number, high: number, unsigned: boolean} ): Long;
+
+    /**
+     * Returns the sum of this and the specified Long.
+     */
+    add( addend: number | Long | string ): Long;
+
+    /**
+     * Returns the bitwise AND of this Long and the specified.
+     */
+    and( other: Long | number | string ): Long;
+
+    /**
+     * Compares this Long's value with the specified's.
+     */
+    compare( other: Long | number | string ): number;
+
+    /**
+     * Compares this Long's value with the specified's.
+     */
+    comp( other: Long | number | string ): number;
+
+    /**
+     * Returns this Long divided by the specified.
+     */
+    divide( divisor: Long | number | string ): Long;
+
+    /**
+     * Returns this Long divided by the specified.
+     */
+    div( divisor: Long | number | string ): Long;
+
+    /**
+     * Tests if this Long's value equals the specified's.
+     */
+    equals( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value equals the specified's.
+     */
+    eq( other: Long | number | string ): boolean;
+
+    /**
+     * Gets the high 32 bits as a signed integer.
+     */
+    getHighBits(): number;
+
+    /**
+     * Gets the high 32 bits as an unsigned integer.
+     */
+    getHighBitsUnsigned(): number;
+
+    /**
+     * Gets the low 32 bits as a signed integer.
+     */
+    getLowBits(): number;
+
+    /**
+     * Gets the low 32 bits as an unsigned integer.
+     */
+    getLowBitsUnsigned(): number;
+
+    /**
+     * Gets the number of bits needed to represent the absolute value of this Long.
+     */
+    getNumBitsAbs(): number;
+
+    /**
+     * Tests if this Long's value is greater than the specified's.
+     */
+    greaterThan( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value is greater than the specified's.
+     */
+    gt( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value is greater than or equal the specified's.
+     */
+    greaterThanOrEqual( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value is greater than or equal the specified's.
+     */
+    gte( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value is even.
+     */
+    isEven(): boolean;
+
+    /**
+     * Tests if this Long's value is negative.
+     */
+    isNegative(): boolean;
+
+    /**
+     * Tests if this Long's value is odd.
+     */
+    isOdd(): boolean;
+
+    /**
+     * Tests if this Long's value is positive.
+     */
+    isPositive(): boolean;
+
+    /**
+     * Tests if this Long's value equals zero.
+     */
+    isZero(): boolean;
+
+    /**
+     * Tests if this Long's value is less than the specified's.
+     */
+    lessThan( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value is less than the specified's.
+     */
+    lt( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value is less than or equal the specified's.
+     */
+    lessThanOrEqual( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value is less than or equal the specified's.
+     */
+    lte( other: Long | number | string ): boolean;
+
+    /**
+     * Returns this Long modulo the specified.
+     */
+    modulo( other: Long | number | string ): Long;
+
+    /**
+     * Returns this Long modulo the specified.
+     */
+    mod( other: Long | number | string ): Long;
+
+    /**
+     * Returns the product of this and the specified Long.
+     */
+    multiply( multiplier: Long | number | string ): Long;
+
+    /**
+     * Returns the product of this and the specified Long.
+     */
+    mul( multiplier: Long | number | string ): Long;
+
+    /**
+     * Negates this Long's value.
+     */
+    negate(): Long;
+
+    /**
+     * Negates this Long's value.
+     */
+    neg(): Long;
+
+    /**
+     * Returns the bitwise NOT of this Long.
+     */
+    not(): Long;
+
+    /**
+     * Tests if this Long's value differs from the specified's.
+     */
+    notEquals( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value differs from the specified's.
+     */
+    neq( other: Long | number | string ): boolean;
+
+    /**
+     * Returns the bitwise OR of this Long and the specified.
+     */
+    or( other: Long | number | string ): Long;
+
+    /**
+     * Returns this Long with bits shifted to the left by the given amount.
+     */
+    shiftLeft( numBits: number | Long ): Long;
+
+    /**
+     * Returns this Long with bits shifted to the left by the given amount.
+     */
+    shl( numBits: number | Long ): Long;
+
+    /**
+     * Returns this Long with bits arithmetically shifted to the right by the given amount.
+     */
+    shiftRight( numBits: number | Long ): Long;
+
+    /**
+     * Returns this Long with bits arithmetically shifted to the right by the given amount.
+     */
+    shr( numBits: number | Long ): Long;
+
+    /**
+     * Returns this Long with bits logically shifted to the right by the given amount.
+     */
+    shiftRightUnsigned( numBits: number | Long ): Long;
+
+    /**
+     * Returns this Long with bits logically shifted to the right by the given amount.
+     */
+    shru( numBits: number | Long ): Long;
+
+    /**
+     * Returns the difference of this and the specified Long.
+     */
+    subtract( subtrahend: number | Long | string ): Long;
+
+    /**
+     * Returns the difference of this and the specified Long.
+     */
+    sub( subtrahend: number | Long |string ): Long;
+
+    /**
+     * Converts the Long to a 32 bit integer, assuming it is a 32 bit integer.
+     */
+    toInt(): number;
+
+    /**
+     * Converts the Long to a the nearest floating-point representation of this value (double, 53 bit mantissa).
+     */
+    toNumber(): number;
+
+    /**
+     * Converts this Long to signed.
+     */
+    toSigned(): Long;
+
+    /**
+     * Converts the Long to a string written in the specified radix.
+     */
+    toString( radix?: number ): string;
+
+    /**
+     * Converts this Long to unsigned.
+     */
+    toUnsigned(): Long;
+
+    /**
+     * Returns the bitwise XOR of this Long and the given one.
+     */
+    xor( other: Long | number | string ): Long;
 }
 
-declare module "long" {
-    var Long: dcodeIO.LongStatic;
+declare module 'long' {
     export = Long;
 }
\ No newline at end of file
diff --git a/lovefield/lovefield-tests.ts b/lovefield/lovefield-tests.ts
index 45de3299d..b9bc73a82 100644
--- a/lovefield/lovefield-tests.ts
+++ b/lovefield/lovefield-tests.ts
@@ -9,7 +9,9 @@ function main(): void {
       addColumn('deadline', lf.Type.DATE_TIME).
       addColumn('done', lf.Type.BOOLEAN).
       addPrimaryKey(['id'], false).
-      addIndex('idxDeadline', ['deadline'], false, lf.Order.DESC);
+      addIndex('idxDeadline', ['deadline'], false, lf.Order.DESC).
+      addNullable(['deadline']).
+      addUnique('uq_description', ['description']);
 
   var todoDb: lf.Database = null;
   var itemSchema: lf.schema.Table = null;
diff --git a/lovefield/lovefield.d.ts b/lovefield/lovefield.d.ts
index dc91b9f90..0b0afe023 100644
--- a/lovefield/lovefield.d.ts
+++ b/lovefield/lovefield.d.ts
@@ -199,11 +199,11 @@ declare module lf {
       addIndex(
           name: string, columns: Array<string>|Array<IndexedColumn>,
           unique?: boolean, order?: Order): TableBuilder
-      addNullable(columns: Array<Column>): TableBuilder
+      addNullable(columns: Array<string>): TableBuilder
       addPrimaryKey(
           columns: Array<string>|Array<IndexedColumn>,
           autoInc?: boolean): TableBuilder
-      addUnique(name: string, columns: Array<Column>): TableBuilder
+      addUnique(name: string, columns: Array<string>): TableBuilder
     }
 
     function create(dbName: string, dbVersion: number): Builder
diff --git a/lwip/lwip-tests.ts b/lwip/lwip-tests.ts
new file mode 100644
index 000000000..4fca56381
--- /dev/null
+++ b/lwip/lwip-tests.ts
@@ -0,0 +1,285 @@
+/// <reference path="./lwip.d.ts" />
+
+import * as lwip from 'lwip';
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.batch()
+        .blur(10)
+        .writeFile('lena_blur.jpg', function(err) {
+            if (err) return console.log(err);
+            console.log('done');
+        });
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.batch()
+        .border(10, 'green')
+        .writeFile('lena_border.jpg', function(err) {
+            if (err) return console.log(err);
+            console.log('done');
+        });
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+
+    image.batch()
+        .scale(0.75)
+        .border(5, [50, 100, 75, 75])
+        .exec(function(err, image) {
+            if (err) return console.log(err);
+
+            image.clone(function(err, clone1) {
+                if (err) return console.log("clone1:", err);
+                clone1.batch()
+                    .mirror('y')
+                    .hue(100)
+                    .writeFile('lena_clone1.png', function(err) {
+                        if (err) return console.log(err);
+                        console.log('clone1: done');
+                    });
+            });
+
+            image.clone(function(err, clone2) {
+                if (err) return console.log("clone2:", err);
+                clone2.batch()
+                    .fade(0.5)
+                    .mirror('x')
+                    .writeFile('lena_clone2.png', function(err) {
+                        if (err) return console.log(err);
+                        console.log('clone2: done');
+                    });
+            });
+
+        });
+
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.contain(400,700,'green',function(err, image){
+        image.writeFile('lena_contain.jpg', function(err){
+            if (err) return console.log(err);
+            console.log('done');
+        });
+    });
+});
+
+lwip.open('lena.gif', function(err, image) {
+    if (err) return console.log(err);
+    image.writeFile('lena_from_gif.png', function(err) {
+        if (err) return console.log(err);
+        console.log('done')
+    });
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.cover(400,800,function(err, image){
+        image.writeFile('lena_cover.jpg', function(err){
+            if (err) return console.log(err);
+            console.log('done');
+        });
+    });
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.batch()
+        .crop(400, 400)
+        .writeFile('lena_crop.jpg', function(err) {
+            if (err) return console.log(err);
+            console.log('done');
+        });
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+
+    image.extract(230, 230, 370, 300, function(err, eyes) {
+        eyes.writeFile('lena_eyes.jpg', function(err) {
+            if (err) return console.log("eyes:", err);
+            console.log('eyes: done');
+        });
+
+        eyes.extract(0, 0, 70, 71, function(err, left_eye) {
+            left_eye.writeFile('lena_eyes_left.jpg', function(err) {
+                if (err) return console.log("eyes left:", err);
+                console.log('eyes left: done');
+            });
+        });
+
+        eyes.extract(71, 0, 141, 71, function(err, right_eye) {
+            right_eye.writeFile('lena_eyes_right.jpg', function(err) {
+                if (err) return console.log("eyes right:", err);
+                console.log('eyes right: done');
+            });
+        });
+    });
+
+    image.extract(240, 320, 350, 380, function(err, eyes) {
+        eyes.writeFile('lena_mouth.jpg', function(err) {
+            if (err) return console.log("mouth:", err);
+            console.log('mouth: done');
+        });
+    });
+
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.batch()
+        .fade(0.5)
+        .writeFile('lena_fade.png', function(err) {
+            if (err) return console.log(err);
+            console.log('done');
+        });
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.writeFile('lena_interlaced.gif', {
+        colors: 222,
+        interlaced: true
+    }, function(err) {
+        if (err) return console.log(err);
+        console.log('done');
+    });
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.batch()
+        .hue(50)
+        .writeFile('lena_hue.jpg', function(err) {
+            if (err) return console.log(err);
+            console.log('done');
+        });
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.batch()
+        .lighten(0.5)
+        .writeFile('lena_lighten.jpg', function(err) {
+            if (err) return console.log(err);
+            console.log('done');
+        });
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.batch()
+        .mirror('x')
+        .writeFile('lena_mirror.jpg', function(err) {
+            if (err) return console.log(err);
+            console.log('done');
+        });
+});
+
+lwip.open(new Buffer(1000), { width: 10, height: 10 }, function(err, image) {
+    if (err) return console.log("err open", err);
+    image.batch()
+    	.blur(9)
+    	.writeFile('image_from_pixelbuffer.png', function(err){
+    		if (err) return console.log("err write", err);
+        console.log('done');
+    	});
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.batch()
+        .pad(10, 5, 10, 5, 'blue')
+        .writeFile('lena_pad.jpg', function(err) {
+            if (err) return console.log(err);
+            console.log('done');
+        });
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.writeFile('lena_interlaced.png', {
+        compression: 'high',
+        interlaced: true
+    }, function(err) {
+        if (err) return console.log(err);
+        console.log('done');
+    });
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.writeFile('lena_low_quality.jpg', {
+        quality: 10
+    }, function(err) {
+        if (err) return console.log(err);
+        console.log('done');
+    });
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.batch()
+        .rotate(45, {
+            r: 90,
+            g: 55,
+            b: 40
+        })
+        .writeFile('lena_rotate.gif', function(err) {
+            if (err) return console.log(err);
+            console.log('done')
+        });
+});
+
+lwip.open('lena.png', function(err, image) {
+    if (err) return console.log(err);
+    image.batch()
+        .rotate(-33, 'white')
+        .scale(1.5)
+        .blur(5)
+        .writeFile('lena_rotate_scale_blur.jpg', function(err) {
+            if (err) return console.log(err);
+            console.log('done');
+        });
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.batch()
+        .saturate(0.5)
+        .writeFile('lena_saturate.jpg', function(err) {
+            if (err) return console.log(err);
+            console.log('done');
+        });
+});
+
+lwip.create(3, 3, function(err, image){
+    if (err) return console.log(err);
+
+    var batch = image.batch();
+
+    // set the same color for each columns in the image
+    for (let x = 0; x < 3 ; x++){
+        let c = {r: 100, g: 100, b: 100};
+        for (let y = 0; y < 3; y++){
+            batch.setPixel(x, y, c);
+        }
+    }
+
+    batch.writeFile('rainbow.png', function(err){
+        if (err) console.log(err);
+    });
+});
+
+lwip.open('lena.jpg', function(err, image) {
+    if (err) return console.log(err);
+    image.batch()
+        .sharpen(200)
+        .writeFile('lena_sharpen.jpg', function(err) {
+            if (err) return console.log(err);
+            console.log('done');
+        });
+});
diff --git a/lwip/lwip.d.ts b/lwip/lwip.d.ts
new file mode 100644
index 000000000..63d2c701b
--- /dev/null
+++ b/lwip/lwip.d.ts
@@ -0,0 +1,1003 @@
+// Type definitions for Light-weight image processor 0.0.8
+// Project: https://github.com/EyalAr/lwip
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "lwip" {
+	type ColorObject = {r: number, g: number, b: number, a?: number};
+	type Color = string | [number, number, number, number] | ColorObject;
+
+	interface ImageCallback {
+		(err: any, image: Image): void;
+	}
+
+	/**
+	 * Open an image
+	 * @param source The path to the image on disk.
+	 */
+	function open(source: string, callback: ImageCallback): void;
+
+	/**
+	 * Open an image
+	 * @param source The path to the image on disk.
+	 * @param type Optional type of the image. If omitted, the type will be inferred from the file extension. Type must be a string of the image type (i.e. "jpg").
+	 */
+	function open(source: string, type: string, callback: ImageCallback): void;
+
+	/**
+	 * Open an image
+	 * @param source The path to the image on disk or an image buffer.
+	 * @param type Type of the image. If source is an encoded image buffer, type must be a string of the image type (i.e. "jpg"). If source is a raw pixels buffer type must be an object with type.width and type.height properties. 
+	 */
+	function open(source: Buffer, type: string | {width: number, height: number}, callback: ImageCallback): any;
+
+	/**
+	 * Create a new image
+	 * @param width The width of the new image.
+	 * @param height The height of the new image.
+	 */
+	function create(width: number, height: number, callback: ImageCallback): void;
+
+	/**
+	 * Create a new image
+	 * @param width The width of the new image.
+	 * @param height The height of the new image.
+	 * @param color Optional Color of the canvas.
+	 */
+	function create(width: number, height: number, color: Color, callback: ImageCallback): void;
+
+	type JpegBufferParams = {
+		quality?: number;
+	};
+
+	type PngBufferParams = {
+		compression?: string;
+		interlaced?: boolean;
+		transparency?: boolean | string;
+	};
+	
+	type GifBufferParams = {
+		colors?: number;
+		interlaced?: boolean;
+		transparency?: boolean | string;
+		threshold: number;
+	}
+
+	interface Image {
+		// Image operations
+
+		/**
+		 * Resize
+		 * @param Width in pixels.
+		 */
+		resize(width: number, callback: ImageCallback): void;
+
+		/**
+		 * Resize
+		 * @param Width in pixels.
+		 * @param Interpolation method.
+		 */
+		resize(width: number, inter: string, callback: ImageCallback): void;
+
+		/**
+		 * Resize
+		 * @param Width in pixels.
+		 * @param Height in pixels.
+		 */
+		resize(width: number, height: number, callback: ImageCallback): void;
+
+		/**
+		 * Resize
+		 * @param Width in pixels.
+		 * @param Height in pixels.
+		 * @param Interpolation method.
+		 */
+		resize(width: number, height: number, inter: string, callback: ImageCallback): void;
+
+		/**
+		 * Scale
+		 * @param wRatio Width scale ratio.
+		 */
+		scale(wRatio: number, callback: ImageCallback): void;
+		
+		/**
+		 * Scale
+		 * @param wRatio Width scale ratio.
+		 * @param inter Interpolation method.
+		 */
+		scale(wRatio: number, inter: string, callback: ImageCallback): void;
+		
+		/**
+		 * Scale
+		 * @param wRatio Width scale ratio.
+		 * @param hRatio Height scale ratio.
+		 */
+		scale(wRatio: number, hRatio: number, callback: ImageCallback): void;
+		
+		/**
+		 * Scale
+		 * @param wRatio Width scale ratio.
+		 * @param hRatio Height scale ratio.
+		 * @param inter Interpolation method.
+		 */
+		scale(wRatio: number, hRatio: number, inter: string, callback: ImageCallback): void;
+		
+		/**
+		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+		 * @param width Canvas' width in pixels.
+		 * @param height Canvas' height in pixels.
+		 */
+		contain(width: number, height: number, callback: ImageCallback): void;
+
+		/**
+		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+		 * @param width Canvas' width in pixels.
+		 * @param height Canvas' height in pixels.
+		 * @param color Color of the canvas.
+		 */
+		contain(width: number, height: number, color: Color, callback: ImageCallback): void;
+
+		/**
+		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+		 * @param width Canvas' width in pixels.
+		 * @param height Canvas' height in pixels.
+		 * @param inter Interpolation method.
+		 */
+		contain(width: number, height: number, inter: string, callback: ImageCallback): void;
+
+		/**
+		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+		 * @param width Canvas' width in pixels.
+		 * @param height Canvas' height in pixels.
+		 * @param color Color of the canvas.
+		 * @param inter Interpolation method.
+		 */
+		contain(width: number, height: number, color: Color, inter: string, callback: ImageCallback): void;
+
+		/**
+		 * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
+		 * @param width Canvas' width in pixels.
+		 * @param height Canvas' height in pixels.
+		 */
+		cover(width: number, height: number, callback: ImageCallback): void;
+
+		/**
+		 * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
+		 * @param width Canvas' width in pixels.
+		 * @param height Canvas' height in pixels.
+		 * @param inter Interpolation method.
+		 */
+		cover(width: number, height: number, inter: string, callback: ImageCallback): void;
+
+		/**
+		 * Rotate
+		 * @param degs Clockwise rotation degrees.
+		 */
+		rotate(degs: number, callback: ImageCallback): void;
+
+		/**
+		 * Rotate
+		 * @param degs Clockwise rotation degrees.
+		 * @param color Color of the canvas.
+		 */
+		rotate(degs: number, color: Color, callback: ImageCallback): void;
+
+		/**
+		 * Crop with rectangle coordinates
+		 */
+		crop(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
+		
+		/**
+		 * Crop a rectangle from center
+		 * @param width Width of the rectangle to crop from the center of the image.
+		 * @param height Height of the rectangle to crop from the center of the image.
+		 */
+		crop(width: number, height: number, callback: ImageCallback): void;
+
+		/**
+		 * Gaussian blur.
+		 * @param sigma Standard deviation of the Gaussian filter.
+		 */
+		blur(sigma: number, callback: ImageCallback): void;
+
+		/**
+		 * Inverse diffusion shapren.
+		 * @param amplitude Sharpening amplitude.
+		 */
+		sharpen(amplitude: number, callback: ImageCallback): void;
+
+		/**
+		 * Mirror an image along the 'x' axis, 'y' axis or both.
+		 * @param axes 'x', 'y' or 'xy' (case sensitive).
+		 */
+		mirror(axes: string, callback: ImageCallback): void;
+
+		/**
+		 * Alias of mirror. Mirror an image along the 'x' axis, 'y' axis or both.
+		 * @param axes 'x', 'y' or 'xy' (case sensitive).
+		 */
+		flip(axes: string, callback: ImageCallback): void;
+
+		/**
+		 * Add a colored border to the image.
+		 * @param width Border width in pixels.
+		 */
+		border(width: number, callback: ImageCallback): void;
+
+		/**
+		 * Add a colored border to the image.
+		 * @param width Border width in pixels.
+		 * @param color Color of the border.
+		 */
+		border(width: number, color: Color, callback: ImageCallback): void;
+
+		/**
+		 * Pad image edges with colored pixels.
+		 * @param left Number of pixels to add to left edge.
+		 * @param top Number of pixels to add to top edge.
+		 * @param right Number of pixels to add to right edge.
+		 * @param bottom Number of pixels to add to bottom edge.
+		 */
+		pad(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
+
+		/**
+		 * Pad image edges with colored pixels.
+		 * @param left Number of pixels to add to left edge.
+		 * @param top Number of pixels to add to top edge.
+		 * @param right Number of pixels to add to right edge.
+		 * @param bottom Number of pixels to add to bottom edge.
+		 * @param color Color of the padding.
+		 */
+		pad(left: number, top: number, right: number, bottom: number, color: Color, callback: ImageCallback): void;
+
+		/**
+		 * Adjust image saturation.
+		 * 
+		 * Examples:
+		 * 1. image.saturate(0, ...) will have no effect on the image.
+		 * 2. image.saturate(0.5, ...) will increase the saturation by 50%.
+		 * 3. image.saturate(-1, ...) will decrease the saturation by 100%, effectively desaturating the image.
+		 * 
+		 * @param delta By how much to increase / decrease the saturation.
+		 */
+		saturate(delta: number, callback: ImageCallback): void;
+
+		/**
+		 * Adjust image lightness.
+		 * 
+		 * Examples:
+		 * 1. image.lighten(0, ...) will have no effect on the image.
+		 * 2. image.lighten(0.5, ...) will increase the lightness by 50%.
+		 * 3. image.lighten(-1, ...) will decrease the lightness by 100%, effectively making the image black.
+		 * 
+		 * @param delta By how much to increase / decrease the lightness.
+		 */
+		lighten(delta: number, callback: ImageCallback): void;
+
+		/**
+		 * Adjust image lightness. Equivalent to image.lighten(-delta, callback).
+		 * @param delta By how much to increase / decrease the lightness.
+		 */
+		darken(delta: number, callback: ImageCallback): void;
+
+		/**
+		 * Adjust image hue.
+		 * 
+		 * Examples:
+		 * 1. image.hue(0, ...) will have no effect on the image.
+		 * 2. image.hue(100, ...) will shift pixels' hue by 100 degrees.
+		 * 
+		 * Note: The hue is shifted in a circular manner in the range [0,360] for each pixel individually.
+		 * 
+		 * @param shift By how many degrees to shift each pixel's hue.
+		 */
+		hue(shift: number, callback: ImageCallback): void;
+
+		/**
+		 * Adjust image transperancy.
+		 * 
+		 * Examples:
+		 * 1. image.fade(0, ...) will have no effect on the image.
+		 * 2. image.fade(0.5, ...) will increase the transparency by 50%.
+		 * 3. image.fade(1, ...) will make the image completely transparent.
+		 * 
+		 * Note: The transparency is adjusted independently for each pixel.
+		 * 
+		 * @param delta By how much to increase / decrease the transperancy.
+		 */
+		fade(delta: number, callback: ImageCallback): void;
+
+		/**
+		 * Make image completely opaque.
+		 */
+		opacity(callback: ImageCallback): void;
+
+		/**
+		 * Paste an image on top of this image.
+		 * 
+		 * Notes:
+		 * 1. If the pasted image exceeds the bounds of the base image, an exception is thrown.
+		 * 2. img is pasted in the state it was at the time image.paste( ... ) was called, eventhough callback is called asynchronously.
+		 * 3. For transparent images, alpha blending is done according to the equations described here.
+		 * 4. Extra caution is required when using this method in batch mode, as the images may change by the time this operation is called.
+		 * 
+		 * @param left Coordinates of the left corner of the pasted image.
+		 * @param top Coordinates of the top corner of the pasted image.
+		 * @param img The image to paste.
+		 */
+		paste(left: number, top: number, img: Image, callback: ImageCallback): void;
+
+		/**
+		 * Set the color of a pixel.
+		 * 
+		 * Notes:
+		 * 1. If the coordinates exceed the bounds of the image, an exception is thrown.
+		 * 2. Extra caution is required when using this method in batch mode, as the dimensions of the image may change by the time this operation is called.
+		 * 
+		 * @param left Coordinates of the pixel from the left corner of the image.
+		 * @param top Coordinates of the pixel from the top corner of the image.
+		 * @param color Color of the pixel to set.
+		 */
+		setPixel(left: number, top: number, color: Color, callback: ImageCallback): void;
+
+		/**
+		 * Set the metadata in an image. This is currently only supported for PNG files. Sets a tEXt chunk with the key lwip_data and comment as the given string. If called with a null parameter, removes existing metadata from the image, if present.
+		 * @param metadata A string of arbitrary length, or null.
+		 */
+		setMetaData(metadata: string): void;
+
+		// Getters
+
+		/**
+		 * Return the image's width in pixels.
+		 */
+		width(): number;
+
+		/**
+		 * Return the image's height in pixels.
+		 */
+		height(): number;
+
+		/**
+		 * Return the color of the pixel at the (left, top) coordinate.
+		 */
+		getPixel(left: number, top: number): ColorObject;
+
+		/**
+		 * Clone the image into a new image object.
+		 * 
+		 * Note: The image is cloned to the state it was at the time image.clone( ... ) was called, eventhough callback is called asynchronously.
+		 */
+		clone(callback: ImageCallback): void;
+
+		/**
+		 * Copy an area of the image into a new image object.
+		 * 
+		 * Note: The sub-image is extracted from the original image in the state it was at the time image.extract( ... ) was called, eventhough callback is called asynchronously.
+		 */
+		extract(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
+
+		/**
+		 * Get encoded binary image data as a NodeJS Buffer.
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 */
+		toBuffer(format: "jpg", callback: ImageCallback): void;
+
+		/**
+		 * Get encoded binary image data as a NodeJS Buffer.
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		toBuffer(format: "jpg", params: JpegBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Get encoded binary image data as a NodeJS Buffer.
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 */
+		toBuffer(format: "png", callback: ImageCallback): void;
+
+		/**
+		 * Get encoded binary image data as a NodeJS Buffer.
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		toBuffer(format: "png", params: PngBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Get encoded binary image data as a NodeJS Buffer.
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 */
+		toBuffer(format: "gif", callback: ImageCallback): void;
+
+		/**
+		 * Get encoded binary image data as a NodeJS Buffer.
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		toBuffer(format: "gif", params: GifBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Get encoded binary image data as a NodeJS Buffer.
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 */
+		toBuffer(format: string, callback: ImageCallback): void;
+
+		/**
+		 * Get encoded binary image data as a NodeJS Buffer.
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		toBuffer(format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Write encoded binary image data directly to a file.
+		 * 
+		 * @param path Path of file to write.
+		 */
+		writeFile(path: string, callback: ImageCallback): void;
+
+		/**
+		 * Write encoded binary image data directly to a file.
+		 * 
+		 * @param path Path of file to write.
+		 * @param params Format-specific parameters.
+		 */
+		writeFile(path: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Write encoded binary image data directly to a file.
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 */
+		writeFile(path: string, format: "jpg", callback: ImageCallback): void;
+
+		/**
+		 * Write encoded binary image data directly to a file.
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		writeFile(path: string, format: "jpg", params: JpegBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Write encoded binary image data directly to a file.
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 */
+		writeFile(path: string, format: "png", callback: ImageCallback): void;
+
+		/**
+		 * Write encoded binary image data directly to a file.
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		writeFile(path: string, format: "png", params: PngBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Write encoded binary image data directly to a file.
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 */
+		writeFile(path: string, format: "gif", callback: ImageCallback): void;
+
+		/**
+		 * Write encoded binary image data directly to a file.
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		writeFile(path: string, format: "gif", params: GifBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Write encoded binary image data directly to a file.
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 */
+		writeFile(path: string, format: string, callback: ImageCallback): void;
+
+		/**
+		 * Write encoded binary image data directly to a file.
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		writeFile(path: string, format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Get the textual metadata from an image. This is currently only supported for tEXt chunks in PNG images, and will get the first tEXt chunk found with the key lwip_data. If none is found, returns null.
+		 */
+		getMetaData<T>(): T;
+
+		// Obtaining a batch object
+
+		/**
+		 * Obtain a batch object from the image
+		 */
+		batch(): Batch;
+	}
+
+	interface Batch {
+		// Using a batch object
+
+		/**
+		 * Resize
+		 * @param Width in pixels.
+		 */
+		resize(width: number): Batch;
+
+		/**
+		 * Resize
+		 * @param Width in pixels.
+		 * @param Interpolation method.
+		 */
+		resize(width: number, inter: string): Batch;
+
+		/**
+		 * Resize
+		 * @param Width in pixels.
+		 * @param Height in pixels.
+		 */
+		resize(width: number, height: number): Batch;
+
+		/**
+		 * Resize
+		 * @param Width in pixels.
+		 * @param Height in pixels.
+		 * @param Interpolation method.
+		 */
+		resize(width: number, height: number, inter: string): Batch;
+
+		/**
+		 * Scale
+		 * @param wRatio Width scale ratio.
+		 */
+		scale(wRatio: number): Batch;
+		
+		/**
+		 * Scale
+		 * @param wRatio Width scale ratio.
+		 * @param inter Interpolation method.
+		 */
+		scale(wRatio: number, inter: string): Batch;
+		
+		/**
+		 * Scale
+		 * @param wRatio Width scale ratio.
+		 * @param hRatio Height scale ratio.
+		 */
+		scale(wRatio: number, hRatio: number): Batch;
+		
+		/**
+		 * Scale
+		 * @param wRatio Width scale ratio.
+		 * @param hRatio Height scale ratio.
+		 * @param inter Interpolation method.
+		 */
+		scale(wRatio: number, hRatio: number, inter: string): Batch;
+		
+		/**
+		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+		 * @param width Canvas' width in pixels.
+		 * @param height Canvas' height in pixels.
+		 */
+		contain(width: number, height: number): Batch;
+
+		/**
+		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+		 * @param width Canvas' width in pixels.
+		 * @param height Canvas' height in pixels.
+		 * @param color Color of the canvas.
+		 */
+		contain(width: number, height: number, color: Color): Batch;
+
+		/**
+		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+		 * @param width Canvas' width in pixels.
+		 * @param height Canvas' height in pixels.
+		 * @param inter Interpolation method.
+		 */
+		contain(width: number, height: number, inter: string): Batch;
+
+		/**
+		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+		 * @param width Canvas' width in pixels.
+		 * @param height Canvas' height in pixels.
+		 * @param color Color of the canvas.
+		 * @param inter Interpolation method.
+		 */
+		contain(width: number, height: number, color: Color, inter: string): Batch;
+
+		/**
+		 * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
+		 * @param width Canvas' width in pixels.
+		 * @param height Canvas' height in pixels.
+		 */
+		cover(width: number, height: number): Batch;
+
+		/**
+		 * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
+		 * @param width Canvas' width in pixels.
+		 * @param height Canvas' height in pixels.
+		 * @param inter Interpolation method.
+		 */
+		cover(width: number, height: number, inter: string): Batch;
+
+		/**
+		 * Rotate
+		 * @param degs Clockwise rotation degrees.
+		 */
+		rotate(degs: number): Batch;
+
+		/**
+		 * Rotate
+		 * @param degs Clockwise rotation degrees.
+		 * @param color Color of the canvas.
+		 */
+		rotate(degs: number, color: Color): Batch;
+
+		/**
+		 * Crop with rectangle coordinates
+		 */
+		crop(left: number, top: number, right: number, bottom: number): Batch;
+		
+		/**
+		 * Crop a rectangle from center
+		 * @param width Width of the rectangle to crop from the center of the image.
+		 * @param height Height of the rectangle to crop from the center of the image.
+		 */
+		crop(width: number, height: number): Batch;
+
+		/**
+		 * Gaussian blur.
+		 * @param sigma Standard deviation of the Gaussian filter.
+		 */
+		blur(sigma: number): Batch;
+
+		/**
+		 * Inverse diffusion shapren.
+		 * @param amplitude Sharpening amplitude.
+		 */
+		sharpen(amplitude: number): Batch;
+
+		/**
+		 * Mirror an image along the 'x' axis, 'y' axis or both.
+		 * @param axes 'x', 'y' or 'xy' (case sensitive).
+		 */
+		mirror(axes: string): Batch;
+
+		/**
+		 * Alias of mirror. Mirror an image along the 'x' axis, 'y' axis or both.
+		 * @param axes 'x', 'y' or 'xy' (case sensitive).
+		 */
+		flip(axes: string): Batch;
+
+		/**
+		 * Add a colored border to the image.
+		 * @param width Border width in pixels.
+		 */
+		border(width: number): Batch;
+
+		/**
+		 * Add a colored border to the image.
+		 * @param width Border width in pixels.
+		 * @param color Color of the border.
+		 */
+		border(width: number, color: Color): Batch;
+
+		/**
+		 * Pad image edges with colored pixels.
+		 * @param left Number of pixels to add to left edge.
+		 * @param top Number of pixels to add to top edge.
+		 * @param right Number of pixels to add to right edge.
+		 * @param bottom Number of pixels to add to bottom edge.
+		 */
+		pad(left: number, top: number, right: number, bottom: number): Batch;
+
+		/**
+		 * Pad image edges with colored pixels.
+		 * @param left Number of pixels to add to left edge.
+		 * @param top Number of pixels to add to top edge.
+		 * @param right Number of pixels to add to right edge.
+		 * @param bottom Number of pixels to add to bottom edge.
+		 * @param color Color of the padding.
+		 */
+		pad(left: number, top: number, right: number, bottom: number, color: Color): Batch;
+
+		/**
+		 * Adjust image saturation.
+		 * 
+		 * Examples:
+		 * 1. image.saturate(0, ...) will have no effect on the image.
+		 * 2. image.saturate(0.5, ...) will increase the saturation by 50%.
+		 * 3. image.saturate(-1, ...) will decrease the saturation by 100%, effectively desaturating the image.
+		 * 
+		 * @param delta By how much to increase / decrease the saturation.
+		 */
+		saturate(delta: number): Batch;
+
+		/**
+		 * Adjust image lightness.
+		 * 
+		 * Examples:
+		 * 1. image.lighten(0, ...) will have no effect on the image.
+		 * 2. image.lighten(0.5, ...) will increase the lightness by 50%.
+		 * 3. image.lighten(-1, ...) will decrease the lightness by 100%, effectively making the image black.
+		 * 
+		 * @param delta By how much to increase / decrease the lightness.
+		 */
+		lighten(delta: number): Batch;
+
+		/**
+		 * Adjust image lightness. Equivalent to image.lighten(-delta, callback).
+		 * @param delta By how much to increase / decrease the lightness.
+		 */
+		darken(delta: number): Batch;
+
+		/**
+		 * Adjust image hue.
+		 * 
+		 * Examples:
+		 * 1. image.hue(0, ...) will have no effect on the image.
+		 * 2. image.hue(100, ...) will shift pixels' hue by 100 degrees.
+		 * 
+		 * Note: The hue is shifted in a circular manner in the range [0,360] for each pixel individually.
+		 * 
+		 * @param shift By how many degrees to shift each pixel's hue.
+		 */
+		hue(shift: number): Batch;
+
+		/**
+		 * Adjust image transperancy.
+		 * 
+		 * Examples:
+		 * 1. image.fade(0, ...) will have no effect on the image.
+		 * 2. image.fade(0.5, ...) will increase the transparency by 50%.
+		 * 3. image.fade(1, ...) will make the image completely transparent.
+		 * 
+		 * Note: The transparency is adjusted independently for each pixel.
+		 * 
+		 * @param delta By how much to increase / decrease the transperancy.
+		 */
+		fade(delta: number): Batch;
+
+		/**
+		 * Make image completely opaque.
+		 */
+		opacity(callback: ImageCallback): void;
+
+		/**
+		 * Paste an image on top of this image.
+		 * 
+		 * Notes:
+		 * 1. If the pasted image exceeds the bounds of the base image, an exception is thrown.
+		 * 2. img is pasted in the state it was at the time image.paste( ... ) was called, eventhough callback is called asynchronously.
+		 * 3. For transparent images, alpha blending is done according to the equations described here.
+		 * 4. Extra caution is required when using this method in batch mode, as the images may change by the time this operation is called.
+		 * 
+		 * @param left Coordinates of the left corner of the pasted image.
+		 * @param top Coordinates of the top corner of the pasted image.
+		 * @param img The image to paste.
+		 */
+		paste(left: number, top: number, img: Image): Batch;
+
+		/**
+		 * Set the color of a pixel.
+		 * 
+		 * Notes:
+		 * 1. If the coordinates exceed the bounds of the image, an exception is thrown.
+		 * 2. Extra caution is required when using this method in batch mode, as the dimensions of the image may change by the time this operation is called.
+		 * 
+		 * @param left Coordinates of the pixel from the left corner of the image.
+		 * @param top Coordinates of the pixel from the top corner of the image.
+		 * @param color Color of the pixel to set.
+		 */
+		setPixel(left: number, top: number, color: Color): Batch;
+
+		/**
+		 * Set the metadata in an image. This is currently only supported for PNG files. Sets a tEXt chunk with the key lwip_data and comment as the given string. If called with a null parameter, removes existing metadata from the image, if present.
+		 * @param metadata A string of arbitrary length, or null.
+		 */
+		setMetaData(metadata: string): void;
+
+		// Executing a batch
+
+		/**
+		 * Execute batch and obtain the manipulated image object
+		 */
+		exec(callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and obtain a Buffer object
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 */
+		toBuffer(format: "jpg", callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and obtain a Buffer object
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		toBuffer(format: "jpg", params: JpegBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and obtain a Buffer object
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 */
+		toBuffer(format: "png", callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and obtain a Buffer object
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		toBuffer(format: "png", params: PngBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and obtain a Buffer object
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 */
+		toBuffer(format: "gif", callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and obtain a Buffer object
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		toBuffer(format: "gif", params: GifBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and obtain a Buffer object
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 */
+		toBuffer(format: string, callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and obtain a Buffer object
+		 * 
+		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+		 * 
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		toBuffer(format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and write to file
+		 * 
+		 * @param path Path of file to write.
+		 */
+		writeFile(path: string, callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and write to file
+		 * 
+		 * @param path Path of file to write.
+		 * @param params Format-specific parameters.
+		 */
+		writeFile(path: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and write to file
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 */
+		writeFile(path: string, format: "jpg", callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and write to file
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		writeFile(path: string, format: "jpg", params: JpegBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and write to file
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 */
+		writeFile(path: string, format: "png", callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and write to file
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		writeFile(path: string, format: "png", params: PngBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and write to file
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 */
+		writeFile(path: string, format: "gif", callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and write to file
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		writeFile(path: string, format: "gif", params: GifBufferParams, callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and write to file
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 */
+		writeFile(path: string, format: string, callback: ImageCallback): void;
+
+		/**
+		 * Execute batch and write to file
+		 * 
+		 * @param path Path of file to write.
+		 * @param format Encoding format.
+		 * @param params Format-specific parameters.
+		 */
+		writeFile(path: string, format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
+	}
+}
diff --git a/material-ui/legacy/material-ui-0.11.1-tests.tsx b/material-ui/legacy/material-ui-0.11.1-tests.tsx
index c686efa9e..7f81cf177 100644
--- a/material-ui/legacy/material-ui-0.11.1-tests.tsx
+++ b/material-ui/legacy/material-ui-0.11.1-tests.tsx
@@ -1,7 +1,8 @@
-///<reference path='../../react/react.d.ts' />
+///<reference path='../../react/react-0.13.3.d.ts' />
 ///<reference path='material-ui-0.11.1.d.ts' />
 
 import * as React from "react/addons";
+
 import mui = require("material-ui");
 import Colors = require("material-ui/lib/styles/colors");
 import AppBar = require("material-ui/lib/app-bar");
@@ -473,4 +474,4 @@ class MaterialUiTests extends React.Component<{}, {}> implements React.LinkedSta
 
         return element;
     }
-}
\ No newline at end of file
+}
diff --git a/material-ui/legacy/material-ui-0.11.1.d.ts b/material-ui/legacy/material-ui-0.11.1.d.ts
index 7f464bc57..706a98537 100644
--- a/material-ui/legacy/material-ui-0.11.1.d.ts
+++ b/material-ui/legacy/material-ui-0.11.1.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Nathan Brown <https://github.com/ngbrown>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-///<reference path='../../react/react.d.ts' />
+///<reference path='../../react/react-0.13.3.d.ts' />
 
 declare module "material-ui" {
     // The reason for exporting the namespace types (__MaterialUI.*) is to also export the type for casting variable.
diff --git a/material-ui/legacy/material-ui-0.12.1-tests.tsx b/material-ui/legacy/material-ui-0.12.1-tests.tsx
new file mode 100644
index 000000000..6792e9f4f
--- /dev/null
+++ b/material-ui/legacy/material-ui-0.12.1-tests.tsx
@@ -0,0 +1,468 @@
+///<reference path='../../react/react-0.13.3.d.ts' />
+///<reference path='material-ui-0.12.1.d.ts' />
+
+import * as React from "react/addons";
+import Checkbox = require("material-ui/lib/checkbox");
+import Colors = require("material-ui/lib/styles/colors");
+import AppBar = require("material-ui/lib/app-bar");
+import IconButton = require("material-ui/lib/icon-button");
+import FlatButton = require("material-ui/lib/flat-button");
+import Avatar = require("material-ui/lib/avatar");
+import FontIcon = require("material-ui/lib/font-icon");
+import Typography = require("material-ui/lib/styles/typography");
+import RaisedButton = require("material-ui/lib/raised-button");
+import FloatingActionButton = require("material-ui/lib/floating-action-button");
+import Card = require("material-ui/lib/card/card");
+import CardHeader = require("material-ui/lib/card/card-header");
+import CardText = require("material-ui/lib/card/card-text");
+import CardActions = require("material-ui/lib/card/card-actions");
+import Dialog = require("material-ui/lib/dialog");
+import DropDownMenu = require("material-ui/lib/drop-down-menu");
+import RadioButtonGroup = require("material-ui/lib/radio-button-group");
+import RadioButton = require("material-ui/lib/radio-button");
+import Toggle = require("material-ui/lib/toggle");
+import TextField = require("material-ui/lib/text-field");
+import SelectField = require("material-ui/lib/select-field");
+import IconMenu = require("material-ui/lib/menus/icon-menu");
+import Menu = require('material-ui/lib/menus/menu');
+import MenuItem = require('material-ui/lib/menus/menu-item');
+import MenuDivider = require('material-ui/lib/menus/menu-divider');
+import ThemeManager = require('material-ui/lib/styles/theme-manager');
+
+import NavigationClose = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/navigation/close", but they aren't defined yet.
+import FileFolder = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/file/folder", but they aren't defined yet.
+import ToggleStar = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/toggle/star", but they aren't defined yet.
+import ActionGrade = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/action/grade", but they aren't defined yet.
+import ToggleStarBorder = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/toggle/star-border", but they aren't defined yet.
+import ArrowDropRight = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/toggle/star-border", but they aren't defined yet.
+
+type CheckboxProps = __MaterialUI.CheckboxProps;
+type MuiTheme = __MaterialUI.Styles.MuiTheme;
+type TouchTapEvent = __MaterialUI.TouchTapEvent;
+
+class MaterialUiTests extends React.Component<{}, {}> implements React.LinkedStateMixin {
+
+    // injected with mixin
+    linkState: <T>(key: string) => React.ReactLink<T>;
+    dialog: Dialog;
+
+    private touchTapEventHandler(e: TouchTapEvent) {
+        this.dialog.show();
+    }
+    private formEventHandler(e: React.FormEvent) {
+    }
+    private selectFieldChangeHandler(e: TouchTapEvent, si: number, mi: any) {
+    }
+
+    render() {
+
+        // "http://material-ui.com/#/customization/themes"
+        let muiTheme: MuiTheme = ThemeManager.getMuiTheme({
+            palette: {
+                accent1Color: Colors.cyan100
+            },
+            spacing: {
+
+            }
+        });
+
+        // "http://material-ui.com/#/customization/inline-styles"
+        let element: React.ReactElement<any>;
+        element = <Checkbox
+            id="checkboxId1"
+            name="checkboxName1"
+            value="checkboxValue1"
+            label="went for a run today"
+            style={{
+                width: '50%',
+                margin: '0 auto'
+            }}
+            iconStyle={{
+                fill: '#FF4081'
+            }}/>
+        element = React.createElement<CheckboxProps>(Checkbox, {
+            id: "checkboxId1", name: "checkboxName1", value: "checkboxValue1", label: "went for a run today", style: {
+                width: '50%',
+                margin: '0 auto'
+            }, iconStyle: {
+                fill: '#FF4081'
+            }
+        });
+
+        // "http://material-ui.com/#/components/appbar"
+        element = <AppBar
+            title="Title"
+            iconClassNameRight="muidocs-icon-navigation-expand-more" />
+        element = <AppBar
+            title="Title"
+            iconElementLeft={<IconButton><NavigationClose /></IconButton>}
+            iconElementRight={<FlatButton label="Save" />} />;
+
+        // "http://material-ui.com/#/components/avatars"
+        //image avatar
+        element = <Avatar src="images/uxceo-128.jpg" />;
+        //SvgIcon avatar
+        element = <Avatar icon={<FileFolder />} />;
+        //SvgIcon avatar with custom colors
+        element = <Avatar
+            icon={<FileFolder />}
+            color={Colors.orange200}
+            backgroundColor={Colors.pink400} />;
+        //FontIcon avatar
+        element = <Avatar
+            icon={
+            <FontIcon className="muidocs-icon-communication-voicemail" />
+            } />;
+        //FontIcon avatar with custom colors
+        element = <Avatar
+            icon={<FontIcon className="muidocs-icon-communication-voicemail" />}
+            color={Colors.blue300}
+            backgroundColor={Colors.indigo900} />;
+        //Letter avatar
+        element = <Avatar>A</Avatar>;
+        //Letter avatar with custom colors
+        element = <Avatar
+            color={Colors.deepOrange300}
+            backgroundColor={Colors.purple500}>
+            </Avatar>
+
+
+        // "http://material-ui.com/#/components/buttons"
+        element = <FlatButton linkButton={true} href="https://github.com/callemall/material-ui" secondary={true} label="GitHub">
+        <FontIcon style={{ color: Typography.textFullWhite }} className="muidocs-icon-custom-github"/>
+            </FlatButton>;
+        element = <RaisedButton linkButton={true} href="https://github.com/callemall/material-ui" secondary={true} label="GitHub">
+        <FontIcon style={{ color: Typography.textFullWhite }} className="muidocs-icon-custom-github"/>
+            </RaisedButton>;
+        element = <FloatingActionButton secondary={true} mini={true} linkButton={true}
+            href="https://github.com/callemall/material-ui" >
+            <ToggleStar />
+            </FloatingActionButton>;
+
+        // "http://material-ui.com/#/components/cards"
+        element = <Card initiallyExpanded={true}>
+        <CardHeader
+            title="Title"
+            subtitle="Subtitle"
+            avatar={<Avatar style={{ color: 'red' }}>A</Avatar>}
+            showExpandableButton={true}>
+            </CardHeader>
+        <CardText expandable={true}>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            </CardText>
+        <CardActions expandable={true}>
+        <FlatButton label="Action1"/>
+        <FlatButton label="Action2"/>
+            </CardActions>
+        <CardText expandable={true}>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            </CardText>
+            </Card>;
+
+        // "http://material-ui.com/#/components/date-picker"
+
+
+        // "http://material-ui.com/#/components/dialog"
+        let standardActions = [
+            { text: 'Cancel' },
+            { text: 'Submit', onTouchTap: this.touchTapEventHandler, ref: 'submit' }
+        ];
+
+        element = <Dialog
+            title="Dialog With Standard Actions"
+            actions={standardActions}
+            actionFocus="submit"
+            modal={true}>
+            The actions in this window are created from the json that's passed in.
+            </Dialog>;
+
+        //Custom Actions
+        let customActions = [
+            <FlatButton
+                label="Cancel"
+                secondary={true}
+                onTouchTap={this.touchTapEventHandler} />,
+            <FlatButton
+                label="Submit"
+                primary={true}
+                onTouchTap={this.touchTapEventHandler} />
+        ];
+
+        element = <Dialog
+            title="Dialog With Custom Actions"
+            actions={customActions}
+            modal={false}
+            autoDetectWindowHeight={true}
+            autoScrollBodyContent={true}>
+            The actions in this window were passed in as an array of react objects.
+            </Dialog>;
+
+
+        // "http://material-ui.com/#/components/dropdown-menu"
+        let menuItems = [
+            { payload: '1', text: 'Never' },
+            { payload: '2', text: 'Every Night' },
+            { payload: '3', text: 'Weeknights' },
+            { payload: '4', text: 'Weekends' },
+            { payload: '5', text: 'Weekly' },
+        ];
+        element = <DropDownMenu menuItems={menuItems} />;
+
+        // "http://material-ui.com/#/components/icons"
+        element = <FontIcon className= "material-icons" color= { Colors.red500 } > home</FontIcon>;
+
+        // "http://material-ui.com/#/components/icon-buttons"
+        //Method 1: muidocs-icon-github is defined in a style sheet.
+        element = <IconButton iconClassName="muidocs-icon-custom-github" tooltip="GitHub"/>;
+        //Method 2: ActionGrade is a component created using mui.SvgIcon.
+        element = <IconButton tooltip= "Star" touch= { true}>
+        <ActionGrade/>
+            </IconButton >;
+        //Method 3: Manually creating a mui.FontIcon component within IconButton
+        element = <IconButton tooltip= "Sort" disabled= {true}>
+        <FontIcon className="muidocs-icon-custom-sort"/>
+            </IconButton>;
+        //Method 4: Using Google material-icons
+        element = <IconButton iconClassName="material-icons" tooltipPosition="bottom-center"
+            tooltip="Sky">settings_system_daydream</IconButton>;
+
+        // "http://material-ui.com/#/components/icon-menus"
+        element = <IconMenu iconButtonElement={<IconButton />}>
+                <MenuItem primaryText="Refresh" />
+                <MenuItem primaryText="Send feedback" />
+                <MenuItem primaryText="Settings" />
+                <MenuItem primaryText="Help" />
+                <MenuItem primaryText="Sign out" />
+            </IconMenu>;
+
+        // "http://material-ui.com/#/components/left-nav"
+
+
+        // "http://material-ui.com/#/components/lists"
+
+
+        // "http://material-ui.com/#/components/menus"
+        element = <Menu>
+                <MenuItem primaryText="Maps" />
+                <MenuItem primaryText="Books" />
+                <MenuItem primaryText="Flights" />
+                <MenuItem primaryText="Apps" />
+            </Menu>;
+        element = <Menu desktop={true} width={320}>
+                <MenuItem primaryText="Bold" secondaryText="&#8984;B" />
+                <MenuItem primaryText="Italic" secondaryText="&#8984;I" />
+                <MenuItem primaryText="Underline" secondaryText="&#8984;U" />
+                <MenuItem primaryText="Strikethrough" secondaryText="Alt+Shift+5" />
+                <MenuItem primaryText="Superscript" secondaryText="&#8984;." />
+                <MenuItem primaryText="Subscript" secondaryText="&#8984;," />
+                <MenuDivider />
+                <MenuItem primaryText="Paragraph styles" rightIcon={<ArrowDropRight />} />
+                <MenuItem primaryText="Align" rightIcon={<ArrowDropRight />} />
+                <MenuItem primaryText="Line spacing" rightIcon={<ArrowDropRight />} />
+                <MenuItem primaryText="Numbered list" rightIcon={<ArrowDropRight />} />
+                <MenuItem primaryText="List options" rightIcon={<ArrowDropRight />} />
+                <MenuDivider />
+                <MenuItem primaryText="Clear formatting" secondaryText="&#8984;/" />
+            </Menu>;
+
+        // "http://material-ui.com/#/components/paper"
+
+
+        // "http://material-ui.com/#/components/progress"
+
+
+        // "http://material-ui.com/#/components/refresh-indicator"
+
+
+        // "http://material-ui.com/#/components/sliders"
+
+
+        // "http://material-ui.com/#/components/switches"
+        element = <Checkbox
+            name="checkboxName2"
+            value="checkboxValue2"
+            label="fed the dog"
+            defaultChecked={true}/>;
+        element = <Checkbox
+            name = "checkboxName3"
+            value = "checkboxValue3"
+            label = "built a house on the moon"
+            disabled = {true}/>;
+        element = <Checkbox
+            name="checkboxName4"
+            value="checkboxValue4"
+            checkedIcon={<ToggleStar />}
+            unCheckedIcon={<ToggleStarBorder />}
+            label="custom icon" />;
+
+        element = <RadioButtonGroup name="shipSpeed" defaultSelected="not_light">
+        <RadioButton
+            value="light"
+            label="prepare for light speed"
+            style={{ marginBottom: 16 }} />;
+        <RadioButton
+            value="not_light"
+            label="light speed too slow"
+            style={{ marginBottom: 16 }}/>;
+        <RadioButton
+            value="ludicrous"
+            label="go to ludicrous speed"
+            style={{ marginBottom: 16 }}
+            disabled={true}/>
+            </RadioButtonGroup>;
+
+        element = <Toggle
+            name="toggleName1"
+            value="toggleValue1"
+            label="activate thrusters"/>;
+
+        element = <Toggle
+            name = "toggleName2"
+            value = "toggleValue2"
+            label = "auto-pilot"
+            defaultToggled = { true}/>;
+
+        element = <Toggle
+            name="toggleName3"
+            value="toggleValue3"
+            label="initiate self-destruct sequence"
+            disabled={true}/>;
+
+        // "http://material-ui.com/#/components/snackbar"
+
+
+        // "http://material-ui.com/#/components/table"
+
+
+        // "http://material-ui.com/#/components/tabs"
+
+
+        // "http://material-ui.com/#/components/text-fields"
+        element = <TextField
+            hintText="Hint Text" />;
+        element = <TextField
+            hintText="Hint Text"
+            defaultValue="Default Value" />;
+        element = <TextField
+            hintText = "Hint Text"
+            value = { "value" }
+            underlineStyle = {{ borderColor: Colors.green500 }}
+            onChange = { this.formEventHandler } />;
+        element = <TextField
+            hintText="Custom Underline Focus Color"
+            underlineFocusStyle={{ borderColor: Colors.amber900 }} />;
+        element = <TextField
+            hintText = "Hint Text"
+            valueLink = { this.linkState<string>('valueLinkValue') } />;
+        element = <TextField
+            hintText="Hint Text (MultiLine)"
+            multiLine={true} />;
+        element = <TextField
+            hintText = "The hint text can be as long as you want, it will wrap."
+            multiLine = { true} />;
+        element = <TextField
+            hintText="Hint Text"
+            errorText="The error text can be as long as you want, it will wrap." />;
+        element = <TextField
+            hintText = "Hint Text"
+            errorText = { "error text" }
+            onChange = { this.formEventHandler } />;
+        element = <TextField
+            hintText="Hint Text (custom error color)"
+            errorText={"error text"}
+            errorStyle={{ color: 'orange' }}
+            onChange={ this.formEventHandler }
+            defaultValue="Custom error color" />;
+        element = <TextField
+            hintText = "Disabled Hint Text"
+            disabled = { true} />;
+        element = <TextField
+            hintText="Disabled Hint Text"
+            disabled={true}
+            defaultValue="Disabled With Value" />;
+
+        //Select Fields
+        let arbitraryArrayMenuItems = [
+            {
+                id: 0,
+                name: "zero",
+            },
+        ];
+        element = <SelectField
+            value = { 0 }
+            onChange = { this.selectFieldChangeHandler }
+            hintText = "Hint Text"
+            menuItems = { menuItems } />;
+        element = <SelectField
+            valueLink={this.linkState('selectValueLinkValue') }
+            floatingLabelText="Float Label Text"
+            valueMember="id"
+            displayMember="name"
+            menuItems={arbitraryArrayMenuItems} />;
+        element = <SelectField
+            valueLink = { this.linkState('selectValueLinkValue2') }
+            floatingLabelText = "Float Custom Label Text"
+            floatingLabelStyle = {{ color: "red" }}
+            valueMember = "id"
+            displayMember = "name"
+            menuItems = { arbitraryArrayMenuItems } />;
+        element = <SelectField
+            value={0}
+            onChange={ this.selectFieldChangeHandler }
+            menuItems={arbitraryArrayMenuItems} />;
+
+        //Floating Hint Text Labels
+        element = <TextField
+            hintText = "Hint Text"
+            floatingLabelText = "Floating Label Text" />;
+        element = <TextField
+            hintText="Hint Text"
+            defaultValue="Default Value"
+            floatingLabelText="Floating Label Text" />;
+        element = <TextField
+            hintText = "Hint Text"
+            floatingLabelText = "Floating Label Text"
+            value = { "value" }
+            onChange = { this.formEventHandler } />;
+        element = <TextField
+            hintText="Hint Text"
+            floatingLabelText="Floating Label Text"
+            valueLink={this.linkState<string>('floatingValueLinkValue') } />;
+        element = <TextField
+            hintText = "Hint Text (MultiLine)"
+            floatingLabelText = "Floating Label Text"
+            multiLine = { true} />;
+        element = <TextField
+            hintText="Hint Text"
+            errorText={"floating text"}
+            floatingLabelText="Floating Label Text"
+            onChange={this.formEventHandler } />;
+        element = <TextField
+            hintText = "Hint Text"
+            errorText = { "error text" }
+            defaultValue = "abc"
+            floatingLabelText = "Floating Label Text"
+            onChange = { this.formEventHandler } />;
+        element = <TextField
+            hintText="Disabled Hint Text"
+            disabled={true}
+            floatingLabelText="Floating Label Text" />;
+        element = <TextField
+            hintText = "Disabled Hint Text"
+            disabled = { true}
+            defaultValue = "Disabled With Value"
+            floatingLabelText = "Floating Label Text" />;
+        element = <TextField
+            hintText="Password Field"
+            floatingLabelText="Password"
+            type="password" />;
+
+
+        // "http://material-ui.com/#/components/time-picker"
+
+
+        // "http://material-ui.com/#/components/toolbars"
+
+        return element;
+    }
+}
diff --git a/material-ui/legacy/material-ui-0.12.1.d.ts b/material-ui/legacy/material-ui-0.12.1.d.ts
new file mode 100644
index 000000000..23b438357
--- /dev/null
+++ b/material-ui/legacy/material-ui-0.12.1.d.ts
@@ -0,0 +1,2249 @@
+// Type definitions for material-ui v0.12.1
+// Project: https://github.com/callemall/material-ui
+// Definitions by: Nathan Brown <https://github.com/ngbrown>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path='../../react/react-0.13.3.d.ts' />
+
+declare module "material-ui" {
+    export import AppBar = __MaterialUI.AppBar; // require('material-ui/lib/app-bar');
+    export import AppCanvas = __MaterialUI.AppCanvas; // require('material-ui/lib/app-canvas');
+    export import Avatar = __MaterialUI.Avatar; // require('material-ui/lib/avatar');
+    export import BeforeAfterWrapper = __MaterialUI.BeforeAfterWrapper; // require('material-ui/lib/before-after-wrapper');
+    export import Card = __MaterialUI.Card.Card; // require('material-ui/lib/card/card');
+    export import CardActions = __MaterialUI.Card.CardActions; // require('material-ui/lib/card/card-actions');
+    export import CardExpandable = __MaterialUI.Card.CardExpandable; // require('material-ui/lib/card/card-expandable');
+    export import CardHeader = __MaterialUI.Card.CardHeader; // require('material-ui/lib/card/card-header');
+    export import CardMedia = __MaterialUI.Card.CardMedia; // require('material-ui/lib/card/card-media');
+    export import CardText = __MaterialUI.Card.CardText; // require('material-ui/lib/card/card-text');
+    export import CardTitle = __MaterialUI.Card.CardTitle; // require('material-ui/lib/card/card-title');
+    export import Checkbox = __MaterialUI.Checkbox; // require('material-ui/lib/checkbox');
+    export import CircularProgress = __MaterialUI.CircularProgress; // require('material-ui/lib/circular-progress');
+    export import ClearFix = __MaterialUI.ClearFix; // require('material-ui/lib/clearfix');
+    export import DatePicker = __MaterialUI.DatePicker.DatePicker; // require('material-ui/lib/date-picker/date-picker');
+    export import DatePickerDialog = __MaterialUI.DatePicker.DatePickerDialog; // require('material-ui/lib/date-picker/date-picker-dialog');
+    export import Dialog = __MaterialUI.Dialog // require('material-ui/lib/dialog');
+    export import DropDownIcon = __MaterialUI.DropDownIcon; // require('material-ui/lib/drop-down-icon');
+    export import DropDownMenu = __MaterialUI.DropDownMenu; // require('material-ui/lib/drop-down-menu');
+    export import EnhancedButton = __MaterialUI.EnhancedButton; // require('material-ui/lib/enhanced-button');
+    export import FlatButton = __MaterialUI.FlatButton; // require('material-ui/lib/flat-button');
+    export import FloatingActionButton = __MaterialUI.FloatingActionButton; // require('material-ui/lib/floating-action-button');
+    export import FontIcon = __MaterialUI.FontIcon; // require('material-ui/lib/font-icon');
+    export import IconButton = __MaterialUI.IconButton; // require('material-ui/lib/icon-button');
+    export import IconMenu = __MaterialUI.Menus.IconMenu; // require('material-ui/lib/menus/icon-menu');
+    export import LeftNav = __MaterialUI.LeftNav; // require('material-ui/lib/left-nav');
+    export import LinearProgress = __MaterialUI.LinearProgress; // require('material-ui/lib/linear-progress');
+    export import List = __MaterialUI.Lists.List; // require('material-ui/lib/lists/list');
+    export import ListDivider = __MaterialUI.Lists.ListDivider; // require('material-ui/lib/lists/list-divider');
+    export import ListItem = __MaterialUI.Lists.ListItem; // require('material-ui/lib/lists/list-item');
+    export import Menu = __MaterialUI.Menu.Menu; // require('material-ui/lib/menu/menu');
+    export import MenuItem = __MaterialUI.Menu.MenuItem; // require('material-ui/lib/menu/menu-item');
+    export import Mixins = __MaterialUI.Mixins; // require('material-ui/lib/mixins/');
+    export import Overlay = __MaterialUI.Overlay; // require('material-ui/lib/overlay');
+    export import Paper = __MaterialUI.Paper; // require('material-ui/lib/paper');
+    export import RadioButton = __MaterialUI.RadioButton; // require('material-ui/lib/radio-button');
+    export import RadioButtonGroup = __MaterialUI.RadioButtonGroup; // require('material-ui/lib/radio-button-group');
+    export import RaisedButton = __MaterialUI.RaisedButton; // require('material-ui/lib/raised-button');
+    export import RefreshIndicator = __MaterialUI.RefreshIndicator; // require('material-ui/lib/refresh-indicator');
+    export import Ripples = __MaterialUI.Ripples; // require('material-ui/lib/ripples/');
+    export import SelectField = __MaterialUI.SelectField; // require('material-ui/lib/select-field');
+    export import Slider = __MaterialUI.Slider; // require('material-ui/lib/slider');
+    export import SvgIcon = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon');
+    export import Icons = __MaterialUI.Icons;
+    export import Styles = __MaterialUI.Styles; // require('material-ui/lib/styles/');
+    export import Snackbar = __MaterialUI.Snackbar; // require('material-ui/lib/snackbar');
+    export import Tab = __MaterialUI.Tabs.Tab; // require('material-ui/lib/tabs/tab');
+    export import Tabs = __MaterialUI.Tabs.Tabs; // require('material-ui/lib/tabs/tabs');
+    export import Table = __MaterialUI.Table.Table; // require('material-ui/lib/table/table');
+    export import TableBody = __MaterialUI.Table.TableBody; // require('material-ui/lib/table/table-body');
+    export import TableFooter = __MaterialUI.Table.TableFooter; // require('material-ui/lib/table/table-footer');
+    export import TableHeader = __MaterialUI.Table.TableHeader; // require('material-ui/lib/table/table-header');
+    export import TableHeaderColumn = __MaterialUI.Table.TableHeaderColumn; // require('material-ui/lib/table/table-header-column');
+    export import TableRow = __MaterialUI.Table.TableRow; // require('material-ui/lib/table/table-row');
+    export import TableRowColumn = __MaterialUI.Table.TableRowColumn; // require('material-ui/lib/table/table-row-column');
+    export import ThemeWrapper = __MaterialUI.ThemeWrapper; // require('material-ui/lib/theme-wrapper');
+    export import Toggle = __MaterialUI.Toggle; // require('material-ui/lib/toggle');
+    export import TimePicker = __MaterialUI.TimePicker; // require('material-ui/lib/time-picker');
+    export import TextField = __MaterialUI.TextField; // require('material-ui/lib/text-field');
+    export import Toolbar = __MaterialUI.Toolbar.Toolbar; // require('material-ui/lib/toolbar/toolbar');
+    export import ToolbarGroup = __MaterialUI.Toolbar.ToolbarGroup; // require('material-ui/lib/toolbar/toolbar-group');
+    export import ToolbarSeparator = __MaterialUI.Toolbar.ToolbarSeparator; // require('material-ui/lib/toolbar/toolbar-separator');
+    export import ToolbarTitle = __MaterialUI.Toolbar.ToolbarTitle; // require('material-ui/lib/toolbar/toolbar-title');
+    export import Tooltip = __MaterialUI.Tooltip; // require('material-ui/lib/tooltip');
+    export import Utils = __MaterialUI.Utils; // require('material-ui/lib/utils/');
+
+    // export type definitions
+    export type TouchTapEvent = __MaterialUI.TouchTapEvent;
+    export type TouchTapEventHandler = __MaterialUI.TouchTapEventHandler;
+    export type DialogAction = __MaterialUI.DialogAction;
+}
+
+declare namespace __MaterialUI {
+    import React = __React;
+
+    // ReactLink is from "react/addons"
+    interface ReactLink<T> {
+        value: T;
+        requestChange(newValue: T): void;
+    }
+
+    // What's common between React.TouchEvent and React.MouseEvent
+    interface TouchTapEvent extends React.SyntheticEvent {
+        altKey: boolean;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        metaKey: boolean;
+        shiftKey: boolean;
+    }
+
+    // What's common between React.TouchEventHandler and React.MouseEventHandler
+    interface TouchTapEventHandler extends React.EventHandler<TouchTapEvent> { }
+
+    // more specific than React.HTMLAttributes
+
+    interface AppBarProps extends React.Props<AppBar> {
+        iconClassNameLeft?: string;
+        iconClassNameRight?: string;
+        iconElementLeft?: React.ReactElement<any>;
+        iconElementRight?: React.ReactElement<any>;
+        iconStyleRight?: string;
+        style?: React.CSSProperties;
+        showMenuIconButton?: boolean;
+        title?: React.ReactNode;
+        zDepth?: number;
+
+        onLeftIconButtonTouchTap?: TouchTapEventHandler;
+        onRightIconButtonTouchTap?: TouchTapEventHandler;
+    }
+    export class AppBar extends React.Component<AppBarProps, {}>{
+    }
+
+    interface AppCanvasProps extends React.Props<AppCanvas> {
+    }
+    export class AppCanvas extends React.Component<AppCanvasProps, {}> {
+    }
+
+    interface AvatarProps extends React.Props<Avatar> {
+        icon?: React.ReactElement<any>;
+        backgroundColor?: string;
+        color?: string;
+        size?: number;
+        src?: string;
+        style?: React.CSSProperties;
+    }
+    export class Avatar extends React.Component<AvatarProps, {}> {
+    }
+
+    interface BeforeAfterWrapperProps extends React.Props<BeforeAfterWrapper> {
+        beforeStyle?: React.CSSProperties;
+        afterStyle?: React.CSSProperties;
+        beforeElementType?: string;
+        afterElementType?: string;
+        elementType?: string;
+    }
+    export class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps, {}> {
+    }
+
+    namespace Card {
+
+        interface CardProps extends React.Props<Card> {
+            expandable?: boolean;
+            initiallyExpanded?: boolean;
+            onExpandedChange?: (isExpanded: boolean) => void;
+            style?: React.CSSProperties;
+        }
+        export class Card extends React.Component<CardProps, {}> {
+        }
+
+        interface CardActionsProps extends React.Props<CardActions> {
+            expandable?: boolean;
+            showExpandableButton?: boolean;
+        }
+        export class CardActions extends React.Component<CardActionsProps, {}> {
+        }
+
+        interface CardExpandableProps extends React.Props<CardExpandable> {
+            onExpanding?: (isExpanded: boolean) => void;
+            expanded?: boolean;
+        }
+        export class CardExpandable extends React.Component<CardExpandableProps, {}> {
+        }
+
+        interface CardHeaderProps extends React.Props<CardHeader> {
+            expandable?: boolean;
+            showExpandableButton?: boolean;
+            title?: string | React.ReactElement<any>;
+            titleColor?: string;
+            titleStyle?: React.CSSProperties;
+            subtitle?: string | React.ReactElement<any>;
+            subtitleColor?: string;
+            subtitleStyle?: React.CSSProperties;
+            textStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
+            avatar: React.ReactElement<any> | string;
+        }
+        export class CardHeader extends React.Component<CardHeaderProps, {}> {
+        }
+
+        interface CardMediaProps extends React.Props<CardMedia> {
+            expandable?: boolean;
+            overlay?: React.ReactNode;
+            overlayStyle?: React.CSSProperties;
+            overlayContainerStyle?: React.CSSProperties;
+            overlayContentStyle?: React.CSSProperties;
+            mediaStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
+        }
+        export class CardMedia extends React.Component<CardMediaProps, {}> {
+        }
+
+        interface CardTextProps extends React.Props<CardText> {
+            expandable?: boolean;
+            color?: string;
+            style?: React.CSSProperties;
+        }
+        export class CardText extends React.Component<CardTextProps, {}> {
+        }
+
+        interface CardTitleProps extends React.Props<CardTitle> {
+            expandable?: boolean;
+            showExpandableButton?: boolean;
+            title?: string | React.ReactElement<any>;
+            titleColor?: string;
+            titleStyle?: React.CSSProperties;
+            subtitle?: string | React.ReactElement<any>;
+            subtitleColor?: string;
+            subtitleStyle?: React.CSSProperties;
+            textStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
+        }
+        export class CardTitle extends React.Component<CardTitleProps, {}> {
+        }
+    }
+
+    // what's not commonly overridden by Checkbox, RadioButton, or Toggle
+    interface CommonEnhancedSwitchProps<T> extends React.HTMLAttributesBase<T> {
+        // <input/> is root element
+        id?: string;
+        iconStyle?: React.CSSProperties;
+        labelStyle?: React.CSSProperties;
+        rippleStyle?: React.CSSProperties;
+        thumbStyle?: React.CSSProperties;
+        trackStyle?: React.CSSProperties;
+        name?: string;
+        value?: string;
+        label?: string;
+        required?: boolean;
+        disabled?: boolean;
+        defaultSwitched?: boolean;
+        disableFocusRipple?: boolean;
+        disableTouchRipple?: boolean;
+    }
+
+    interface EnhancedSwitchProps extends CommonEnhancedSwitchProps<EnhancedSwitch> {
+        // <input/> is root element
+        inputType: string;
+        switchElement: React.ReactElement<any>;
+        onParentShouldUpdate: (isInputChecked: boolean) => void;
+        switched: boolean;
+        rippleColor?: string;
+        onSwitch?: (e: React.MouseEvent, isInputChecked: boolean) => void;
+        labelPosition?: string;
+    }
+    export class EnhancedSwitch extends React.Component<EnhancedSwitchProps, {}> {
+        isSwitched(): boolean;
+        setSwitched(newSwitchedValue: boolean): void;
+        getValue(): any;
+        isKeyboardFocused(): boolean;
+    }
+
+    interface CheckboxProps extends CommonEnhancedSwitchProps<Checkbox> {
+        // <EnhancedSwitch/> is root element
+        checkedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
+        defaultChecked?: boolean;
+        iconStyle?: React.CSSProperties;
+        label?: string;
+        labelStyle?: React.CSSProperties;
+        labelPosition?: string;
+        style?: React.CSSProperties;
+        checked?: boolean;
+        unCheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
+
+        disabled?: boolean;
+        valueLink?: ReactLink<boolean>;
+        checkedLink?: ReactLink<boolean>;
+
+        onCheck?: (event: React.MouseEvent, checked: boolean) => void;
+    }
+    export class Checkbox extends React.Component<CheckboxProps, {}> {
+        isChecked(): void;
+        setChecked(newCheckedValue: boolean): void;
+    }
+
+    interface CircularProgressProps extends React.Props<CircularProgress> {
+        mode?: string;
+        value?: number;
+        min?: number;
+        max?: number;
+        size?: number;
+        color?: string;
+        innerStyle?: React.CSSProperties;
+
+    }
+    export class CircularProgress extends React.Component<CircularProgressProps, {}> {
+    }
+
+    interface ClearFixProps extends React.Props<ClearFix> {
+    }
+    export class ClearFix extends React.Component<ClearFixProps, {}> {
+    }
+
+    namespace DatePicker {
+        interface DatePickerProps extends React.Props<DatePicker> {
+            autoOk?: boolean;
+            defaultDate?: Date;
+            formatDate?: string;
+            hideToolbarYearChange?: boolean;
+            maxDate?: Date;
+            minDate?: Date;
+            mode?: string;
+            onDismiss?: () => void;
+
+            // e is always null
+            onChange?: (e: any, d: Date) => void;
+
+            onFocus?: React.FocusEventHandler;
+            onShow?: () => void;
+            onTouchTap?: React.TouchEventHandler;
+            shouldDisableDate?: (day: Date) => boolean;
+            showYearSelector?: boolean;
+            textFieldStyle?: React.CSSProperties;
+        }
+        export class DatePicker extends React.Component<DatePickerProps, {}> {
+        }
+
+        interface DatePickerDialogProps extends React.Props<DatePickerDialog> {
+            disableYearSelection?: boolean;
+            initialDate?: Date;
+            maxDate?: Date;
+            minDate?: Date;
+            onAccept?: (d: Date) => void;
+            onClickAway?: () => void;
+            onDismiss?: () => void;
+            onShow?: () => void;
+            shouldDisableDate?: (day: Date) => boolean;
+            showYearSelector?: boolean;
+        }
+        export class DatePickerDialog extends React.Component<DatePickerDialogProps, {}> {
+        }
+    }
+
+    export interface DialogAction {
+        id?: string;
+        text: string;
+        ref?: string;
+
+        onTouchTap?: TouchTapEventHandler;
+        onClick?: React.MouseEventHandler;
+    }
+    interface DialogProps extends React.Props<Dialog> {
+        actions?: Array<DialogAction | React.ReactElement<any>>;
+        actionFocus?: string;
+        autoDetectWindowHeight?: boolean;
+        autoScrollBodyContent?: boolean;
+        bodyStyle?: React.CSSProperties;
+        contentClassName?: string;
+        contentInnerStyle?: React.CSSProperties;
+        contentStyle?: React.CSSProperties;
+        modal?: boolean;
+        openImmediately?: boolean;
+        repositionOnUpdate?: boolean;
+        title?: React.ReactNode;
+
+        onClickAway?: () => void;
+        onDismiss?: () => void;
+        onShow?: () => void;
+    }
+    export class Dialog extends React.Component<DialogProps, {}> {
+        dismiss(): void;
+        show(): void;
+    }
+
+    interface DropDownIconProps extends React.Props<DropDownIcon> {
+        menuItems: Menu.MenuItemRequest[];
+        closeOnMenuItemTouchTap?: boolean;
+        iconStyle?: React.CSSProperties;
+        iconClassName?: string;
+        iconLigature?: string;
+
+        onChange?: Menu.ItemTapEventHandler;
+    }
+    export class DropDownIcon extends React.Component<DropDownIconProps, {}> {
+    }
+
+    interface DropDownMenuProps extends React.Props<DropDownMenu> {
+        displayMember?: string;
+        valueMember?: string;
+        autoWidth?: boolean;
+        menuItems: Menu.MenuItemRequest[];
+        menuItemStyle?: React.CSSProperties;
+        selectedIndex?: number;
+        underlineStyle?: React.CSSProperties;
+        iconStyle?: React.CSSProperties;
+        labelStyle?: React.CSSProperties;
+        style?: React.CSSProperties;
+        disabled?: boolean;
+        valueLink?: ReactLink<any>;
+        value?: number;
+
+        onChange?: Menu.ItemTapEventHandler;
+    }
+    export class DropDownMenu extends React.Component<DropDownMenuProps, {}> {
+    }
+
+    // non generally overridden elements of EnhancedButton
+    interface SharedEnhancedButtonProps<T> extends React.HTMLAttributesBase<T> {
+        centerRipple?: boolean;
+        containerElement?: string | React.ReactElement<any>;
+        disabled?: boolean;
+        disableFocusRipple?: boolean;
+        disableKeyboardFocus?: boolean;
+        disableTouchRipple?: boolean;
+        keyboardFocused?: boolean;
+        linkButton?: boolean;
+        focusRippleColor?: string;
+        focusRippleOpacity?: number;
+        touchRippleOpacity?: number;
+        tabIndex?: number;
+
+        onBlur?: React.FocusEventHandler;
+        onFocus?: React.FocusEventHandler;
+        onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
+        onKeyDown?: React.KeyboardEventHandler;
+        onKeyUp?: React.KeyboardEventHandler;
+        onMouseEnter?: React.MouseEventHandler;
+        onMouseLeave?: React.MouseEventHandler;
+        onTouchStart?: React.TouchEventHandler;
+        onTouchEnd?: React.TouchEventHandler;
+        onTouchTap?: TouchTapEventHandler;
+    }
+
+    interface EnhancedButtonProps extends SharedEnhancedButtonProps<EnhancedButton> {
+        touchRippleColor?: string;
+        focusRippleColor?: string;
+        style?: React.CSSProperties;
+    }
+    export class EnhancedButton extends React.Component<EnhancedButtonProps, {}> {
+    }
+
+    interface FlatButtonProps extends SharedEnhancedButtonProps<FlatButton> {
+        hoverColor?: string;
+        label?: string;
+        labelPosition?: string;
+        labelStyle?: React.CSSProperties;
+        linkButton?: boolean;
+        primary?: boolean;
+        secondary?: boolean;
+        rippleColor?: string;
+        style?: React.CSSProperties;
+    }
+    export class FlatButton extends React.Component<FlatButtonProps, {}> {
+    }
+
+    interface FloatingActionButtonProps extends SharedEnhancedButtonProps<FloatingActionButton> {
+        backgroundColor?: string;
+        disabled?: boolean;
+        disabledColor?: string;
+        iconClassName?: string;
+        iconStyle?: React.CSSProperties;
+        mini?: boolean;
+        secondary?: boolean;
+        style?: React.CSSProperties;
+    }
+    export class FloatingActionButton extends React.Component<FloatingActionButtonProps, {}> {
+    }
+
+    interface FontIconProps extends React.Props<FontIcon> {
+        color?: string;
+        hoverColor?: string;
+        onMouseLeave?: React.MouseEventHandler;
+        onMouseEnter?: React.MouseEventHandler;
+        style?: React.CSSProperties;
+        className?: string;
+    }
+    export class FontIcon extends React.Component<FontIconProps, {}> {
+    }
+
+    interface IconButtonProps extends SharedEnhancedButtonProps<IconButton> {
+        iconClassName?: string;
+        iconStyle?: React.CSSProperties;
+        style?: React.CSSProperties;
+        tooltip?: string;
+        tooltipPosition?: string;
+        tooltipStyles?: React.CSSProperties;
+        touch?: boolean;
+
+        onBlur?: React.FocusEventHandler;
+        onFocus?: React.FocusEventHandler;
+    }
+    export class IconButton extends React.Component<IconButtonProps, {}> {
+    }
+
+    interface LeftNavProps extends React.Props<LeftNav> {
+        disableSwipeToOpen?: boolean;
+        docked?: boolean;
+        header?: React.ReactElement<any>;
+        menuItems: Menu.MenuItemRequest[];
+        onChange?: Menu.ItemTapEventHandler;
+        onNavOpen?: () => void;
+        onNavClose?: () => void;
+        openRight?: Boolean;
+        selectedIndex?: number;
+        menuItemClassName?: string;
+        menuItemClassNameSubheader?: string;
+        menuItemClassNameLink?: string;
+    }
+    export class LeftNav extends React.Component<LeftNavProps, {}> {
+    }
+
+    interface LinearProgressProps extends React.Props<LinearProgress> {
+        mode?: string;
+        value?: number;
+        min?: number;
+        max?: number;
+    }
+    export class LinearProgress extends React.Component<LinearProgressProps, {}> {
+    }
+
+    namespace Lists {
+        interface ListProps extends React.Props<List> {
+            insetSubheader?: boolean;
+            subheader?: string;
+            subheaderStyle?: React.CSSProperties;
+            zDepth?: number;
+        }
+        export class List extends React.Component<ListProps, {}> {
+        }
+
+        interface ListDividerProps extends React.Props<ListDivider> {
+            inset?: boolean;
+        }
+        export class ListDivider extends React.Component<ListDividerProps, {}> {
+        }
+
+        interface ListItemProps extends React.Props<ListItem> {
+            autoGenerateNestedIndicator?: boolean;
+            disableKeyboardFocus?: boolean;
+            initiallyOpen?: boolean;
+            innerDivStyle?: React.CSSProperties;
+            insetChildren?: boolean;
+            innerStyle?: React.CSSProperties;
+            leftAvatar?: React.ReactElement<any>;
+            leftCheckbox?: React.ReactElement<any>;
+            leftIcon?: React.ReactElement<any>;
+            nestedLevel?: number;
+            nestedItems?: React.ReactElement<any>[];
+            onKeyboardFocus?: React.FocusEventHandler;
+            onNestedListToggle?: (item: ListItem) => void;
+            rightAvatar?: React.ReactElement<any>;
+            rightIcon?: React.ReactElement<any>;
+            rightIconButton?: React.ReactElement<any>;
+            rightToggle?: React.ReactElement<any>;
+            primaryText?: React.ReactNode;
+            secondaryText?: React.ReactNode;
+            secondaryTextLines?: number;
+        }
+        export class ListItem extends React.Component<ListItemProps, {}> {
+        }
+    }
+
+    // Old menu implementation.  Being replaced by new "menus".
+    namespace Menu {
+        interface ItemTapEventHandler {
+            (e: TouchTapEvent, index: number, menuItem: MenuItemRequest): void;
+        }
+
+        // almost extends MenuItemProps, but certain required items are generated in Menu and not passed here.
+        interface MenuItemRequest extends React.Props<MenuItem> {
+            // use value from MenuItem.Types.*
+            type?: string;
+
+            text?: string;
+            data?: string;
+            payload?: string;
+            icon?: React.ReactElement<any>;
+            attribute?: string;
+            number?: string;
+            toggle?: boolean;
+            onTouchTap?: TouchTapEventHandler;
+            isDisabled?: boolean;
+
+            // for MenuItems.Types.NESTED
+            items?: MenuItemRequest[];
+
+            // for custom text or payloads
+            [propertyName: string]: any;
+        }
+
+        interface MenuProps extends React.Props<Menu> {
+            index: number;
+            text?: string;
+            menuItems: MenuItemRequest[];
+            zDepth?: number;
+            active?: boolean;
+            onItemTap?: ItemTapEventHandler;
+            menuItemStyle?: React.CSSProperties;
+        }
+        export class Menu extends React.Component<MenuProps, {}> {
+        }
+
+        interface MenuItemProps extends React.Props<MenuItem> {
+            index: number;
+            icon?: React.ReactElement<any>;
+            iconClassName?: string;
+            iconRightClassName?: string;
+            iconStyle?: React.CSSProperties;
+            iconRightStyle?: React.CSSProperties;
+            attribute?: string;
+            number?: string;
+            data?: string;
+            toggle?: boolean;
+            onTouchTap?: (e: React.MouseEvent, key: number) => void;
+            onToggle?: (e: React.MouseEvent, key: number, toggled: boolean) => void;
+            selected?: boolean;
+            active?: boolean;
+        }
+        export class MenuItem extends React.Component<MenuItemProps, {}> {
+            static Types: { LINK: string, SUBHEADER: string, NESTED: string, }
+        }
+    }
+
+    export namespace Mixins {
+        interface ClickAwayable extends React.Mixin<any, any> {
+        }
+        var ClickAwayable: ClickAwayable;
+
+        interface WindowListenable extends React.Mixin<any, any> {
+        }
+        var WindowListenable: WindowListenable;
+
+        interface StylePropable extends React.Mixin<any, any> {
+        }
+        var StylePropable: StylePropable
+
+        interface StyleResizable extends React.Mixin<any, any> {
+        }
+        var StyleResizable: StyleResizable
+    }
+
+    interface OverlayProps extends React.Props<Overlay> {
+        autoLockScrolling?: boolean;
+        show?: boolean;
+        transitionEnabled?: boolean;
+    }
+    export class Overlay extends React.Component<OverlayProps, {}> {
+    }
+
+    interface PaperProps extends React.HTMLAttributesBase<Paper> {
+        circle?: boolean;
+        rounded?: boolean;
+        transitionEnabled?: boolean;
+        zDepth?: number;
+    }
+    export class Paper extends React.Component<PaperProps, {}> {
+    }
+
+    interface RadioButtonProps extends CommonEnhancedSwitchProps<RadioButton> {
+        // <EnhancedSwitch/> is root element
+        defaultChecked?: boolean;
+        iconStyle?: React.CSSProperties;
+        label?: string;
+        labelStyle?: React.CSSProperties;
+        labelPosition?: string;
+        style?: React.CSSProperties;
+        value?: string;
+
+        onCheck?: (e: React.FormEvent, selected: string) => void;
+    }
+    export class RadioButton extends React.Component<RadioButtonProps, {}> {
+    }
+
+    interface RadioButtonGroupProps extends React.Props<RadioButtonGroup> {
+        defaultSelected?: string;
+        labelPosition?: string;
+        name: string;
+        style?: React.CSSProperties;
+        valueSelected?: string;
+
+        onChange?: (e: React.FormEvent, selected: string) => void;
+    }
+    export class RadioButtonGroup extends React.Component<RadioButtonGroupProps, {}> {
+        getSelectedValue(): string;
+        setSelectedValue(newSelectionValue: string): void;
+        clearValue(): void;
+    }
+
+    interface RaisedButtonProps extends SharedEnhancedButtonProps<RaisedButton> {
+        className?: string;
+        disabled?: boolean;
+        label?: string;
+        primary?: boolean;
+        secondary?: boolean;
+        labelStyle?: React.CSSProperties;
+        backgroundColor?: string;
+        labelColor?: string;
+        disabledBackgroundColor?: string;
+        disabledLabelColor?: string;
+        fullWidth?: boolean;
+    }
+    export class RaisedButton extends React.Component<RaisedButtonProps, {}> {
+    }
+
+    interface RefreshIndicatorProps extends React.Props<RefreshIndicator> {
+        left: number;
+        percentage?: number;
+        size?: number;
+        status?: string;
+        top: number;
+    }
+    export class RefreshIndicator extends React.Component<RefreshIndicatorProps, {}> {
+    }
+
+    namespace Ripples {
+        interface CircleRippleProps extends React.Props<CircleRipple> {
+            color?: string;
+            opacity?: number;
+        }
+        export class CircleRipple extends React.Component<CircleRippleProps, {}> {
+        }
+
+        interface FocusRippleProps extends React.Props<FocusRipple> {
+            color?: string;
+            innerStyle?: React.CSSProperties;
+            opacity?: number;
+            show?: boolean;
+        }
+        export class FocusRipple extends React.Component<FocusRippleProps, {}> {
+        }
+
+        interface TouchRippleProps extends React.Props<TouchRipple> {
+            centerRipple?: boolean;
+            color?: string;
+            opacity?: number;
+        }
+        export class TouchRipple extends React.Component<TouchRippleProps, {}> {
+        }
+    }
+
+    interface SelectFieldProps extends React.Props<SelectField> {
+        // passed to TextField
+        errorStyle?: React.CSSProperties;
+        errorText?: string;
+        floatingLabelText?: string;
+        floatingLabelStyle?: React.CSSProperties;
+        fullWidth?: boolean;
+        hintText?: string | React.ReactElement<any>;
+
+        // passed to DropDownMenu
+        displayMember?: string;
+        valueMember?: string;
+        autoWidth?: boolean;
+        menuItems: Menu.MenuItemRequest[];
+        menuItemStyle?: React.CSSProperties;
+        selectedIndex?: number;
+        underlineStyle?: React.CSSProperties;
+        iconStyle?: React.CSSProperties;
+        labelStyle?: React.CSSProperties;
+        style?: React.CSSProperties;
+        disabled?: boolean;
+        valueLink?: ReactLink<any>;
+        value?: number;
+
+        onChange?: Menu.ItemTapEventHandler;
+        onEnterKeyDown?: React.KeyboardEventHandler;
+
+        // own properties
+        selectFieldRoot?: string;
+        multiLine?: boolean;
+        type?: string;
+        rows?: number;
+        inputStyle?: React.CSSProperties;
+    }
+    export class SelectField extends React.Component<SelectFieldProps, {}> {
+    }
+
+    interface SliderProps extends React.Props<Slider> {
+        name: string;
+        defaultValue?: number;
+        description?: string;
+        error?: string;
+        max?: number;
+        min?: number;
+        required?: boolean;
+        step?: number;
+        value?: number;
+    }
+    export class Slider extends React.Component<SliderProps, {}> {
+    }
+
+    interface SvgIconProps extends React.Props<SvgIcon> {
+        color?: string;
+        hoverColor?: string;
+        viewBox?: string;
+    }
+    export class SvgIcon extends React.Component<SvgIconProps, {}> {
+    }
+
+    export namespace Icons {
+        export import NavigationMenu = __MaterialUI.NavigationMenu;
+        export import NavigationChevronLeft = __MaterialUI.NavigationChevronLeft;
+        export import NavigationChevronRight = __MaterialUI.NavigationChevronRight;
+    }
+
+    interface NavigationMenuProps extends React.Props<NavigationMenu> {
+    }
+    export class NavigationMenu extends React.Component<NavigationMenuProps, {}> {
+    }
+
+    interface NavigationChevronLeftProps extends React.Props<NavigationChevronLeft> {
+    }
+    export class NavigationChevronLeft extends React.Component<NavigationChevronLeftProps, {}> {
+    }
+
+    interface NavigationChevronRightProps extends React.Props<NavigationChevronRight> {
+    }
+    export class NavigationChevronRight extends React.Component<NavigationChevronRightProps, {}> {
+    }
+
+    export namespace Styles {
+        interface AutoPrefix {
+            all(styles: React.CSSProperties): React.CSSProperties;
+            set(style: React.CSSProperties, key: string, value: string | number): void;
+            single(key: string): string;
+            singleHyphened(key: string): string;
+        }
+        export var AutoPrefix: AutoPrefix;
+
+        interface Spacing {
+            iconSize?: number;
+
+            desktopGutter?: number;
+            desktopGutterMore?: number;
+            desktopGutterLess?: number;
+            desktopGutterMini?: number;
+            desktopKeylineIncrement?: number;
+            desktopDropDownMenuItemHeight?: number;
+            desktopDropDownMenuFontSize?: number;
+            desktopLeftNavMenuItemHeight?: number;
+            desktopSubheaderHeight?: number;
+            desktopToolbarHeight?: number;
+        }
+        interface ThemePalette {
+            primary1Color?: string;
+            primary2Color?: string;
+            primary3Color?: string;
+            accent1Color?: string;
+            accent2Color?: string;
+            accent3Color?: string;
+            textColor?: string;
+            canvasColor?: string;
+            borderColor?: string;
+            disabledColor?: string;
+            alternateTextColor?: string;
+        }
+        interface MuiTheme {
+            rawTheme: RawTheme;
+            static: boolean;
+            appBar?: {
+                color?: string,
+                textColor?: string,
+                height?: number
+            },
+            avatar?: {
+                borderColor?: string;
+            }
+            button?: {
+                height?: number,
+                minWidth?: number,
+                iconButtonSize?: number
+            },
+            checkbox?: {
+                boxColor?: string,
+                checkedColor?: string,
+                requiredColor?: string,
+                disabledColor?: string,
+                labelColor?: string,
+                labelDisabledColor?: string
+            },
+            datePicker?: {
+                color?: string,
+                textColor?: string,
+                calendarTextColor?: string,
+                selectColor?: string,
+                selectTextColor?: string,
+            },
+            dropDownMenu?: {
+                accentColor?: string,
+            },
+            flatButton?: {
+                color?: string,
+                textColor?: string,
+                primaryTextColor?: string,
+                secondaryTextColor?: string,
+                disabledColor?: string
+            },
+            floatingActionButton?: {
+                buttonSize?: number,
+                miniSize?: number,
+                color?: string,
+                iconColor?: string,
+                secondaryColor?: string,
+                secondaryIconColor?: string,
+                disabledColor?: string,
+                disabledTextColor?: string
+            },
+            inkBar?: {
+                backgroundColor?: string;
+            },
+            leftNav?: {
+                width?: number,
+                color?: string,
+            },
+            listItem?: {
+                nestedLevelDepth?: number;
+            },
+            menu?: {
+                backgroundColor?: string,
+                containerBackgroundColor?: string,
+            },
+            menuItem?: {
+                dataHeight?: number,
+                height?: number,
+                hoverColor?: string,
+                padding?: number,
+                selectedTextColor?: string,
+            },
+            menuSubheader?: {
+                padding?: number,
+                borderColor?: string,
+                textColor?: string,
+            },
+            paper?: {
+                backgroundColor?: string,
+            },
+            radioButton?: {
+                borderColor?: string,
+                backgroundColor?: string,
+                checkedColor?: string,
+                requiredColor?: string,
+                disabledColor?: string,
+                size?: number,
+                labelColor?: string,
+                labelDisabledColor?: string
+            },
+            raisedButton?: {
+                color?: string,
+                textColor?: string,
+                primaryColor?: string,
+                primaryTextColor?: string,
+                secondaryColor?: string,
+                secondaryTextColor?: string,
+                disabledColor?: string,
+                disabledTextColor?: string
+            },
+            refreshIndicator?: {
+                strokeColor?: string;
+                loadingStrokeColor?: string;
+            };
+            slider?: {
+                trackSize?: number,
+                trackColor?: string,
+                trackColorSelected?: string,
+                handleSize?: number,
+                handleSizeActive?: number,
+                handleSizeDisabled?: number,
+                handleColorZero?: string,
+                handleFillColor?: string,
+                selectionColor?: string,
+                rippleColor?: string,
+            },
+            snackbar?: {
+                textColor?: string,
+                backgroundColor?: string,
+                actionColor?: string,
+            },
+            table?: {
+                backgroundColor?: string;
+            };
+            tableHeader?: {
+                borderColor?: string;
+            };
+            tableHeaderColumn?: {
+                textColor?: string;
+            };
+            tableFooter?: {
+                borderColor?: string;
+                textColor?: string;
+            };
+            tableRow?: {
+                hoverColor?: string;
+                stripeColor?: string;
+                selectedColor?: string;
+                textColor?: string;
+                borderColor?: string;
+            };
+            tableRowColumn?: {
+                height?: number;
+                spacing?: number;
+            };
+            timePicker?: {
+                color?: string;
+                textColor?: string;
+                accentColor?: string;
+                clockColor?: string;
+                selectColor?: string;
+                selectTextColor?: string;
+            };
+            toggle?: {
+                thumbOnColor?: string,
+                thumbOffColor?: string,
+                thumbDisabledColor?: string,
+                thumbRequiredColor?: string,
+                trackOnColor?: string,
+                trackOffColor?: string,
+                trackDisabledColor?: string,
+                trackRequiredColor?: string,
+                labelColor?: string,
+                labelDisabledColor?: string
+            },
+            toolbar?: {
+                backgroundColor?: string,
+                height?: number,
+                titleFontSize?: number,
+                iconColor?: string,
+                separatorColor?: string,
+                menuHoverColor?: string,
+            };
+            tabs?: {
+                backgroundColor?: string;
+            };
+            textField?: {
+                textColor?: string;
+                hintColor?: string;
+                floatingLabelColor?: string;
+                disabledTextColor?: string;
+                errorColor?: string;
+                focusColor?: string;
+                backgroundColor?: string;
+                borderColor?: string;
+            };
+        }
+
+        interface RawTheme {
+            spacing: Spacing;
+            fontFamily?: string;
+            palette: ThemePalette;
+        }
+
+        export function ThemeDecorator(muiTheme: Styles.MuiTheme): <P>(Component: React.ComponentClass<P>) => React.ComponentClass<P>;
+
+        interface ThemeManager {
+            getMuiTheme(rawTheme: RawTheme): MuiTheme;
+            modifyRawThemeSpacing(muiTheme: MuiTheme, newSpacing: Spacing): MuiTheme;
+            modifyRawThemePalette(muiTheme: MuiTheme, newPaletteKeys: ThemePalette): MuiTheme;
+            modifyRawThemeFontFamily(muiTheme: MuiTheme, newFontFamily: string): MuiTheme;
+        }
+        export var ThemeManager: ThemeManager;
+
+        interface Transitions {
+            easeOut(duration?: string, property?: string | string[], delay?: string, easeFunction?: string): string;
+            create(duration?: string, property?: string, delay?: string, easeFunction?: string): string;
+            easeOutFunction: string;
+            easeInOutFunction: string;
+        }
+        export var Transitions: Transitions;
+
+        interface Typography {
+            textFullBlack:string;
+            textDarkBlack: string;
+            textLightBlack: string;
+            textMinBlack: string;
+            textFullWhite: string;
+            textDarkWhite: string;
+            textLightWhite: string;
+
+            // font weight
+            fontWeightLight: number;
+            fontWeightNormal: number;
+            fontWeightMedium: number;
+
+            fontStyleButtonFontSize: number;
+        }
+        export var Typography: Typography;
+
+        export var DarkRawTheme: RawTheme;
+        export var LightRawTheme: RawTheme;
+    }
+
+    interface SnackbarProps extends React.Props<Snackbar> {
+        message: string;
+        action?: string;
+        autoHideDuration?: number;
+        onActionTouchTap?: React.TouchEventHandler;
+        onShow?: () => void;
+        onDismiss?: () => void;
+        openOnMount?: boolean;
+    }
+    export class Snackbar extends React.Component<SnackbarProps, {}> {
+    }
+
+    namespace Tabs {
+        interface TabProps extends React.Props<Tab> {
+            label?: string;
+            value?: string;
+            selected?: boolean;
+            width?: string;
+
+            // Called by Tabs component
+            onActive?: (tab: Tab) => void;
+
+            onTouchTap?: (value: string, e: TouchTapEvent, tab: Tab) => void;
+        }
+        export class Tab extends React.Component<TabProps, {}> {
+        }
+
+        interface TabsProps extends React.Props<Tabs> {
+            contentContainerStyle?: React.CSSProperties;
+            initialSelectedIndex?: number;
+            inkBarStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
+            tabItemContainerStyle?: React.CSSProperties;
+            tabWidth?: number;
+            value?: string | number;
+
+            onChange?: (value: string | number, e: React.FormEvent, tab: Tab) => void;
+        }
+        export class Tabs extends React.Component<TabsProps, {}> {
+        }
+    }
+
+    namespace Table {
+        interface TableProps extends React.Props<Table> {
+            allRowsSelected?: boolean;
+            fixedFooter?: boolean;
+            fixedHeader?: boolean;
+            height?: string;
+            multiSelectable?: boolean;
+            onCellClick?: (row: number, column: number) => void;
+            onCellHover?: (row: number, column: number) => void;
+            onCellHoverExit?: (row: number, column: number) => void;
+            onRowHover?: (row: number) => void;
+            onRowHoverExit?: (row: number) => void;
+            onRowSelection?: (selectedRows: number[])=> void;
+            selectable?: boolean;
+        }
+        export class Table extends React.Component<TableProps, {}> {
+        }
+
+        interface TableBodyProps extends React.Props<TableBody> {
+            allRowsSelected?: boolean;
+            deselectOnClickaway?: boolean;
+            displayRowCheckbox?: boolean;
+            multiSelectable?: boolean;
+            onCellClick?: (row: number, column: number) => void;
+            onCellHover?: (row: number, column: number) => void;
+            onCellHoverExit?: (row: number, column: number) => void;
+            onRowHover?: (row: number) => void;
+            onRowHoverExit?: (row: number) => void;
+            onRowSelection?: (selectedRows: number[])=> void;
+            preScanRows?: boolean;
+            selectable?: boolean;
+            showRowHover?: boolean;
+            stripedRows?: boolean;
+        }
+        export class TableBody extends React.Component<TableBodyProps, {}> {
+        }
+
+        interface TableFooterProps extends React.Props<TableFooter> {
+            adjustForCheckbox?: boolean;
+        }
+        export class TableFooter extends React.Component<TableFooterProps, {}> {
+        }
+
+        interface TableHeaderProps extends React.Props<TableHeader> {
+            adjustForCheckbox?: boolean;
+            displaySelectAll?: boolean;
+            enableSelectAll?: boolean;
+            onSelectAll?: (event: React.MouseEvent) => void;
+            selectAllSelected?: boolean;
+        }
+        export class TableHeader extends React.Component<TableHeaderProps, {}> {
+        }
+
+        interface TableHeaderColumnProps extends React.Props<TableHeaderColumn> {
+            columnNumber?: number;
+            onClick?:  (e: React.MouseEvent, column: number) => void;
+            tooltip?: string;
+            tooltipStyle?: React.CSSProperties;
+        }
+        export class TableHeaderColumn extends React.Component<TableHeaderColumnProps, {}> {
+        }
+
+        interface TableRowProps extends React.Props<TableRow> {
+            displayBorder?: boolean;
+            hoverable?: boolean;
+            onCellClick?: (e: React.MouseEvent, row: number, column: number) => void;
+            onCellHover?: (e: React.MouseEvent, row: number, column: number) => void;
+            onCellHoverExit?: (e: React.MouseEvent, row: number, column: number) => void;
+            onRowClick?: (e: React.MouseEvent, row: number) => void;
+            onRowHover?: (e: React.MouseEvent, row: number) => void;
+            onRowHoverExit?: (e: React.MouseEvent, row: number) => void;
+            rowNumber?: number;
+            selectable?: boolean;
+            selected?: boolean;
+            striped?: boolean;
+        }
+        export class TableRow extends React.Component<TableRowProps, {}> {
+        }
+
+        interface TableRowColumnProps extends React.Props<TableRowColumn> {
+            columnNumber?: number;
+            hoverable?: boolean;
+            onHover?: (e: React.MouseEvent, column: number) => void;
+            onHoverExit?: (e: React.MouseEvent, column: number) => void;
+        }
+        export class TableRowColumn extends React.Component<TableRowColumnProps, {}> {
+        }
+    }
+
+    interface ThemeWrapperProps extends React.Props<ThemeWrapper> {
+        theme: Styles.MuiTheme;
+    }
+    export class ThemeWrapper extends React.Component<ThemeWrapperProps, {}> {
+    }
+
+    interface ToggleProps extends CommonEnhancedSwitchProps<Toggle> {
+        // <EnhancedSwitch/> is root element
+
+        elementStyle?: React.CSSProperties;
+        labelStyle?: React.CSSProperties;
+        onToggle?: (e: React.MouseEvent, isInputChecked: boolean) => void;
+        toggled?: boolean;
+        defaultToggled?: boolean;
+    }
+    export class Toggle extends React.Component<ToggleProps, {}> {
+        isToggled(): boolean;
+        setToggled(newToggledValue: boolean): void;
+    }
+
+    interface TimePickerProps extends React.Props<TimePicker> {
+        defaultTime?: Date;
+        format?: string;
+        pedantic?: boolean;
+        onFocus?: React.FocusEventHandler;
+        onTouchTap?: TouchTapEventHandler;
+        onChange?: (e: any, time: Date) => void;
+        onShow?: () => void;
+        onDismiss?: () => void;
+    }
+    export class TimePicker extends React.Component<TimePickerProps, {}> {
+    }
+
+    interface TextFieldProps extends React.Props<TextField> {
+        errorStyle?: React.CSSProperties;
+        errorText?: string;
+        floatingLabelText?: string;
+        floatingLabelStyle?: React.CSSProperties;
+        fullWidth?: boolean;
+        hintText?: string | React.ReactElement<any>;
+        id?: string;
+        inputStyle?: React.CSSProperties;
+        multiLine?: boolean;
+        onEnterKeyDown?: React.KeyboardEventHandler;
+        style?: React.CSSProperties;
+        rows?: number,
+        underlineStyle?: React.CSSProperties;
+        underlineFocusStyle?: React.CSSProperties;
+        underlineDisabledStyle?: React.CSSProperties;
+        type?: string;
+
+        disabled?: boolean;
+        isRtl?: boolean;
+        value?: string;
+        defaultValue?: string;
+        valueLink?: ReactLink<string>;
+
+        onBlur?: React.FocusEventHandler;
+        onChange?: React.FormEventHandler;
+        onFocus?: React.FocusEventHandler;
+        onKeyDown?: React.KeyboardEventHandler;
+    }
+    export class TextField extends React.Component<TextFieldProps, {}> {
+        blur(): void;
+        clearValue(): void;
+        focus(): void;
+        getValue(): string;
+        setErrorText(newErrorText: string): void;
+        setValue(newValue: string): void;
+    }
+
+    namespace Toolbar {
+        interface ToolbarProps extends React.Props<Toolbar> {
+        }
+        export class Toolbar extends React.Component<ToolbarProps, {}> {
+        }
+
+        interface ToolbarGroupProps extends React.Props<ToolbarGroup> {
+            float?: string;
+        }
+        export class ToolbarGroup extends React.Component<ToolbarGroupProps, {}> {
+        }
+
+        interface ToolbarSeparatorProps extends React.Props<ToolbarSeparator> {
+        }
+        export class ToolbarSeparator extends React.Component<ToolbarSeparatorProps, {}> {
+        }
+
+        interface ToolbarTitleProps extends React.HTMLAttributesBase<ToolbarTitle> {
+           text?: string;
+        }
+        export class ToolbarTitle extends React.Component<ToolbarTitleProps, {}> {
+        }
+    }
+
+    interface TooltipProps extends React.Props<Tooltip> {
+        label: string;
+        show?: boolean;
+        touch?: boolean;
+        verticalPosition?: string;
+        horizontalPosition?: string;
+    }
+    export class Tooltip extends React.Component<TooltipProps, {}> {
+    }
+
+    export namespace Utils {
+        interface ContrastLevel {
+            range: [number, number];
+            color: string;
+        }
+        interface ColorManipulator {
+            fade(color: string, amount: string|number): string;
+            lighten(color: string, amount: string|number): string;
+            darken(color: string, amount: string|number): string;
+            contrastRatio(background: string, foreground: string): number;
+            contrastRatioLevel(background: string, foreground: string): ContrastLevel;
+        }
+        export var ColorManipulator: ColorManipulator;
+
+        interface CssEvent {
+            transitionEndEventName(): string;
+            animationEndEventName(): string;
+            onTransitionEnd(el: Element, callback: () => void): void;
+            onAnimationEnd(el: Element, callback: () => void): void;
+        }
+        export var CssEvent: CssEvent;
+
+        interface Dom {
+            isDescendant(parent: Node, child: Node): boolean;
+            offset(el: Element): { top: number, left: number };
+            getStyleAttributeAsNumber(el: HTMLElement, attr: string): number;
+            addClass(el: Element, className: string): void;
+            removeClass(el: Element, className: string): void;
+            hasClass(el: Element, className: string): boolean;
+            toggleClass(el: Element, className: string): void;
+            forceRedraw(el: HTMLElement): void;
+            withoutTransition(el: HTMLElement, callback: () => void): void;
+        }
+        export var Dom: Dom;
+
+        interface Events {
+            once(el: Element, type: string, callback: EventListener): void;
+            on(el: Element, type: string, callback: EventListener): void;
+            off(el: Element, type: string, callback: EventListener): void;
+            isKeyboard(e: Event): boolean;
+        }
+        export var Events: Events;
+
+        function Extend<T, S1>(base: T, override: S1): (T & S1);
+
+        interface ImmutabilityHelper {
+            merge(base: any, ...args: any[]): any;
+            mergeItem(obj: any, key: any, newValueObject: any): any;
+            push(array: any[], obj: any): any[];
+            shift(array: any[]): any[];
+        }
+        export var ImmutabilityHelper: ImmutabilityHelper;
+
+        interface KeyCode {
+            DOWN: number;
+            ESC: number;
+            ENTER: number;
+            LEFT: number;
+            RIGHT: number;
+            SPACE: number;
+            TAB: number;
+            UP: number;
+        }
+        var KeyCode: KeyCode;
+
+        interface KeyLine {
+            Desktop: {
+                GUTTER: number;
+                GUTTER_LESS: number;
+                INCREMENT: number;
+                MENU_ITEM_HEIGHT: number;
+            };
+
+            getIncrementalDim(dim: number): number;
+        }
+        export var KeyLine: KeyLine;
+
+        interface UniqueId {
+            generate(): string;
+        }
+        export var UniqueId: UniqueId;
+
+        interface Styles {
+            mergeAndPrefix(base: any, ...args: any[]): React.CSSProperties;
+        }
+        export var Styles: Styles;
+    }
+
+    // New menus available only through requiring directly to the end file
+    namespace Menus {
+        interface IconMenuProps extends React.Props<IconMenu> {
+            closeOnItemTouchTap?: boolean;
+            desktop?: boolean;
+            iconButtonElement: React.ReactElement<IconButtonProps>;
+            openDirection?: string;
+            menuStyle?: React.CSSProperties;
+            multiple?: boolean;
+            value?: string | Array<string>;
+            width?: string | number;
+            touchTapCloseDelay?: number;
+
+            onKeyboardFocus?: React.FocusEventHandler;
+            onItemTouchTap?: (e: TouchTapEvent, item: React.ReactElement<any>) => void;
+            onChange?: (e: React.FormEvent, value: string | Array<string>) => void;
+        }
+        export class IconMenu extends React.Component<IconMenuProps, {}> {
+        }
+
+        interface MenuProps extends React.Props<Menu> {
+            animated?: boolean;
+            autoWidth?: boolean;
+            desktop?: boolean;
+            listStyle?: React.CSSProperties;
+            maxHeight?: number;
+            multiple?: boolean;
+            openDirection?: string;
+            value?: string | Array<string>;
+            width?: string | number;
+            zDepth?: number;
+        }
+        export class Menu extends React.Component<MenuProps, {}>{
+        }
+
+        interface MenuItemProps extends React.Props<MenuItem> {
+            checked?: boolean;
+            desktop?: boolean;
+            disabled?: boolean;
+            innerDivStyle?: React.CSSProperties;
+            insetChildren?: boolean;
+            leftIcon?: React.ReactElement<any>;
+            primaryText?: string | React.ReactElement<any>;
+            rightIcon?: React.ReactElement<any>;
+            secondaryText?: React.ReactNode;
+            value?: string;
+
+            onEscKeyDown?: React.KeyboardEventHandler;
+            onItemTouchTap?: (e: TouchTapEvent, item: React.ReactElement<any>) => void;
+            onChange?: (e: React.FormEvent, value: string) => void;
+        }
+        export class MenuItem extends React.Component<MenuItemProps, {}>{
+        }
+
+        interface MenuDividerProps extends React.Props<MenuDivider> {
+            inset?: boolean;
+            style?: React.CSSProperties;
+        }
+        export class MenuDivider extends React.Component<MenuDividerProps, {}>{
+        }
+    }
+}    // __MaterialUI
+
+declare module 'material-ui/lib/app-bar' {
+    import AppBar = __MaterialUI.AppBar;
+    export = AppBar;
+}
+
+declare module 'material-ui/lib/app-canvas' {
+    import AppCanvas = __MaterialUI.AppCanvas;
+    export = AppCanvas;
+}
+
+declare module 'material-ui/lib/avatar' {
+    import Avatar = __MaterialUI.Avatar;
+    export = Avatar;
+}
+
+declare module 'material-ui/lib/before-after-wrapper' {
+    import BeforeAfterWrapper = __MaterialUI.BeforeAfterWrapper;
+    export = BeforeAfterWrapper;
+}
+
+declare module 'material-ui/lib/card/card' {
+    import Card = __MaterialUI.Card.Card;
+    export = Card;
+}
+
+declare module 'material-ui/lib/card/card-actions' {
+    import CardActions = __MaterialUI.Card.CardActions;
+    export = CardActions;
+}
+
+declare module 'material-ui/lib/card/card-expandable' {
+    import CardExpandable = __MaterialUI.Card.CardExpandable;
+    export = CardExpandable;
+}
+
+declare module 'material-ui/lib/card/card-header' {
+    import CardHeader = __MaterialUI.Card.CardHeader;
+    export = CardHeader;
+}
+
+declare module 'material-ui/lib/card/card-media' {
+    import CardMedia = __MaterialUI.Card.CardMedia;
+    export = CardMedia;
+}
+
+declare module 'material-ui/lib/card/card-text' {
+    import CardText = __MaterialUI.Card.CardText;
+    export = CardText;
+}
+
+declare module 'material-ui/lib/card/card-title' {
+    import CardTitle = __MaterialUI.Card.CardTitle;
+    export = CardTitle;
+}
+
+declare module 'material-ui/lib/checkbox' {
+    import Checkbox = __MaterialUI.Checkbox;
+    export = Checkbox;
+}
+
+declare module 'material-ui/lib/circular-progress' {
+    import CircularProgress = __MaterialUI.CircularProgress;
+    export = CircularProgress;
+}
+
+declare module 'material-ui/lib/clearfix' {
+    import ClearFix = __MaterialUI.ClearFix;
+    export = ClearFix;
+}
+
+declare module 'material-ui/lib/date-picker/date-picker' {
+    import DatePicker = __MaterialUI.DatePicker.DatePicker;
+    export = DatePicker;
+}
+
+declare module 'material-ui/lib/date-picker/date-picker-dialog' {
+    import DatePickerDialog = __MaterialUI.DatePicker.DatePickerDialog;
+    export = DatePickerDialog;
+}
+
+declare module 'material-ui/lib/dialog' {
+    import Dialog = __MaterialUI.Dialog;
+    export = Dialog;
+}
+
+declare module 'material-ui/lib/drop-down-icon' {
+    import DropDownIcon = __MaterialUI.DropDownIcon;
+    export = DropDownIcon;
+}
+
+declare module 'material-ui/lib/drop-down-menu' {
+    import DropDownMenu = __MaterialUI.DropDownMenu;
+    export = DropDownMenu;
+}
+
+declare module 'material-ui/lib/enhanced-button' {
+    import EnhancedButton = __MaterialUI.EnhancedButton;
+    export = EnhancedButton;
+}
+
+declare module 'material-ui/lib/flat-button' {
+    import FlatButton = __MaterialUI.FlatButton;
+    export = FlatButton;
+}
+
+declare module 'material-ui/lib/floating-action-button' {
+    import FloatingActionButton = __MaterialUI.FloatingActionButton;
+    export = FloatingActionButton;
+}
+
+declare module 'material-ui/lib/font-icon' {
+    import FontIcon = __MaterialUI.FontIcon;
+    export = FontIcon;
+}
+
+declare module 'material-ui/lib/icon-button' {
+    import IconButton = __MaterialUI.IconButton;
+    export = IconButton;
+}
+
+declare module 'material-ui/lib/left-nav' {
+    import LeftNav = __MaterialUI.LeftNav;
+    export = LeftNav;
+}
+
+declare module 'material-ui/lib/linear-progress' {
+    import LinearProgress = __MaterialUI.LinearProgress;
+    export = LinearProgress;
+}
+
+declare module 'material-ui/lib/lists/list' {
+    import List = __MaterialUI.Lists.List;
+    export = List;
+}
+
+declare module 'material-ui/lib/lists/list-divider' {
+    import ListDivider = __MaterialUI.Lists.ListDivider;
+    export = ListDivider;
+}
+
+declare module 'material-ui/lib/lists/list-item' {
+    import ListItem = __MaterialUI.Lists.ListItem;
+    export = ListItem;
+}
+
+declare module 'material-ui/lib/menu/menu' {
+    import Menu = __MaterialUI.Menu.Menu;
+    export = Menu;
+}
+
+declare module 'material-ui/lib/menu/menu-item' {
+    import MenuItem = __MaterialUI.Menu.MenuItem;
+    export = MenuItem;
+}
+
+declare module 'material-ui/lib/mixins/' {
+    export import ClickAwayable = __MaterialUI.Mixins.ClickAwayable; // require('material-ui/lib/mixins/click-awayable');
+    export import WindowListenable = __MaterialUI.Mixins.WindowListenable; // require('material-ui/lib/mixins/window-listenable');
+    export import StylePropable = __MaterialUI.Mixins.StylePropable; // require('material-ui/lib/mixins/style-propable');
+    export import StyleResizable = __MaterialUI.Mixins.StyleResizable; // require('material-ui/lib/mixins/style-resizable');
+}
+
+declare module 'material-ui/lib/mixins/click-awayable' {
+    import ClickAwayable = __MaterialUI.Mixins.ClickAwayable;
+    export = ClickAwayable;
+}
+
+declare module 'material-ui/lib/mixins/window-listenable' {
+    import WindowListenable = __MaterialUI.Mixins.WindowListenable;
+    export = WindowListenable;
+}
+
+declare module 'material-ui/lib/mixins/style-propable' {
+    import StylePropable = __MaterialUI.Mixins.StylePropable;
+    export = StylePropable;
+}
+
+declare module 'material-ui/lib/mixins/style-resizable' {
+    import StyleResizable = __MaterialUI.Mixins.StyleResizable;
+    export = StyleResizable;
+}
+
+declare module 'material-ui/lib/overlay' {
+    import Overlay = __MaterialUI.Overlay;
+    export = Overlay;
+}
+
+declare module 'material-ui/lib/paper' {
+    import Paper = __MaterialUI.Paper;
+    export = Paper;
+}
+
+declare module 'material-ui/lib/radio-button' {
+    import RadioButton = __MaterialUI.RadioButton;
+    export = RadioButton;
+}
+
+declare module 'material-ui/lib/radio-button-group' {
+    import RadioButtonGroup = __MaterialUI.RadioButtonGroup;
+    export = RadioButtonGroup;
+}
+
+declare module 'material-ui/lib/raised-button' {
+    import RaisedButton = __MaterialUI.RaisedButton;
+    export = RaisedButton;
+}
+
+declare module 'material-ui/lib/refresh-indicator' {
+    import RefreshIndicator = __MaterialUI.RefreshIndicator;
+    export = RefreshIndicator;
+}
+
+declare module 'material-ui/lib/ripples/' {
+    export import CircleRipple = __MaterialUI.Ripples.CircleRipple;
+    export import FocusRipple = __MaterialUI.Ripples.FocusRipple;
+    export import TouchRipple = __MaterialUI.Ripples.TouchRipple;
+}
+
+declare module 'material-ui/lib/select-field' {
+    import SelectField = __MaterialUI.SelectField;
+    export = SelectField;
+}
+
+declare module 'material-ui/lib/slider' {
+    import Slider = __MaterialUI.Slider;
+    export = Slider;
+}
+
+declare module 'material-ui/lib/svg-icon' {
+    import SvgIcon = __MaterialUI.SvgIcon;
+    export = SvgIcon;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/menu' {
+    import NavigationMenu = __MaterialUI.NavigationMenu;
+    export = NavigationMenu;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/chevron-left' {
+    import NavigationChevronLeft = __MaterialUI.NavigationChevronLeft;
+    export = NavigationChevronLeft;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/chevron-right' {
+    import NavigationChevronRight = __MaterialUI.NavigationChevronRight;
+    export = NavigationChevronRight;
+}
+
+declare module 'material-ui/lib/styles/' {
+    export import AutoPrefix = __MaterialUI.Styles.AutoPrefix; // require('material-ui/lib/styles/auto-prefix');
+    export import Colors = __MaterialUI.Styles.Colors; // require('material-ui/lib/styles/colors');
+    export import Spacing = require('material-ui/lib/styles/spacing');
+    export import ThemeManager = __MaterialUI.Styles.ThemeManager; // require('material-ui/lib/styles/theme-manager');
+    export import Transitions = __MaterialUI.Styles.Transitions; // require('material-ui/lib/styles/transitions');
+    export import Typography = __MaterialUI.Styles.Typography; // require('material-ui/lib/styles/typography');
+    export import LightRawTheme = __MaterialUI.Styles.LightRawTheme; // require('material-ui/lib/styles/raw-themes/light-raw-theme'),
+    export import DarkRawTheme = __MaterialUI.Styles.DarkRawTheme; // require('material-ui/lib/styles/raw-themes/dark-raw-theme'),
+    export import ThemeDecorator = __MaterialUI.Styles.ThemeDecorator; //require('material-ui/lib/styles/theme-decorator');
+}
+
+declare module 'material-ui/lib/styles/auto-prefix' {
+    import AutoPrefix = __MaterialUI.Styles.AutoPrefix;
+    export = AutoPrefix;
+}
+
+declare module 'material-ui/lib/styles/spacing' {
+    type Spacing = __MaterialUI.Styles.Spacing;
+    var Spacing: Spacing;
+    export = Spacing;
+}
+
+declare module 'material-ui/lib/styles/theme-manager' {
+    import ThemeManager = __MaterialUI.Styles.ThemeManager;
+    export = ThemeManager;
+}
+
+declare module 'material-ui/lib/styles/transitions' {
+    import Transitions = __MaterialUI.Styles.Transitions;
+    export = Transitions;
+}
+
+declare module 'material-ui/lib/styles/typography' {
+    import Typography = __MaterialUI.Styles.Typography;
+    export = Typography;
+}
+
+declare module 'material-ui/lib/styles/raw-themes/light-raw-theme' {
+    import LightRawTheme = __MaterialUI.Styles.LightRawTheme;
+    export = LightRawTheme;
+}
+
+declare module 'material-ui/lib/styles/raw-themes/dark-raw-theme' {
+    import DarkRawTheme = __MaterialUI.Styles.DarkRawTheme;
+    export = DarkRawTheme;
+}
+
+declare module 'material-ui/lib/styles/theme-decorator' {
+    import ThemeDecorator = __MaterialUI.Styles.ThemeDecorator;
+    export = ThemeDecorator;
+}
+
+
+declare module 'material-ui/lib/snackbar' {
+    import Snackbar = __MaterialUI.Snackbar;
+    export = Snackbar;
+}
+
+declare module 'material-ui/lib/tabs/tab' {
+    import Tab = __MaterialUI.Tabs.Tab;
+    export = Tab;
+}
+
+declare module 'material-ui/lib/tabs/tabs' {
+    import Tabs = __MaterialUI.Tabs.Tabs;
+    export = Tabs;
+}
+
+declare module 'material-ui/lib/table/table' {
+    import Table = __MaterialUI.Table.Table;
+    export = Table;
+}
+
+declare module 'material-ui/lib/table/table-body' {
+    import TableBody = __MaterialUI.Table.TableBody;
+    export = TableBody;
+}
+
+declare module 'material-ui/lib/table/table-footer' {
+    import TableFooter = __MaterialUI.Table.TableFooter;
+    export = TableFooter;
+}
+
+declare module 'material-ui/lib/table/table-header' {
+    import TableHeader = __MaterialUI.Table.TableHeader;
+    export = TableHeader;
+}
+
+declare module 'material-ui/lib/table/table-header-column' {
+    import TableHeaderColumn = __MaterialUI.Table.TableHeaderColumn;
+    export = TableHeaderColumn;
+}
+
+declare module 'material-ui/lib/table/table-row' {
+    import TableRow = __MaterialUI.Table.TableRow;
+    export = TableRow;
+}
+
+declare module 'material-ui/lib/table/table-row-column' {
+    import TableRowColumn = __MaterialUI.Table.TableRowColumn;
+    export = TableRowColumn;
+}
+
+declare module 'material-ui/lib/theme-wrapper' {
+    import ThemeWrapper = __MaterialUI.ThemeWrapper;
+    export = ThemeWrapper;
+}
+
+declare module 'material-ui/lib/toggle' {
+    import Toggle = __MaterialUI.Toggle;
+    export = Toggle;
+}
+
+declare module 'material-ui/lib/time-picker' {
+    import TimePicker = __MaterialUI.TimePicker;
+    export = TimePicker;
+}
+
+declare module 'material-ui/lib/text-field' {
+    import TextField = __MaterialUI.TextField;
+    export = TextField;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar' {
+    import Toolbar = __MaterialUI.Toolbar.Toolbar;
+    export = Toolbar;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar-group' {
+    import ToolbarGroup = __MaterialUI.Toolbar.ToolbarGroup;
+    export = ToolbarGroup;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar-separator' {
+    import ToolbarSeparator = __MaterialUI.Toolbar.ToolbarSeparator;
+    export = ToolbarSeparator;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar-title' {
+    import ToolbarTitle = __MaterialUI.Toolbar.ToolbarTitle;
+    export = ToolbarTitle;
+}
+
+declare module 'material-ui/lib/tooltip' {
+    import Tooltip = __MaterialUI.Tooltip;
+    export = Tooltip;
+}
+
+declare module 'material-ui/lib/utils/' {
+    export import ColorManipulator = __MaterialUI.Utils.ColorManipulator; // require('material-ui/lib/utils/color-manipulator');
+    export import CssEvent = __MaterialUI.Utils.CssEvent; // require('material-ui/lib/utils/css-event');
+    export import Dom = __MaterialUI.Utils.Dom; // require('material-ui/lib/utils/dom');
+    export import Events = __MaterialUI.Utils.Events; // require('material-ui/lib/utils/events');
+    export import Extend = __MaterialUI.Utils.Extend; // require('material-ui/lib/utils/extend');
+    export import ImmutabilityHelper = __MaterialUI.Utils.ImmutabilityHelper; // require('material-ui/lib/utils/immutability-helper');
+    export import KeyCode = __MaterialUI.Utils.KeyCode; // require('material-ui/lib/utils/key-code');
+    export import KeyLine = __MaterialUI.Utils.KeyLine; // require('material-ui/lib/utils/key-line');
+    export import UniqueId = __MaterialUI.Utils.UniqueId; // require('material-ui/lib/utils/unique-id');
+    export import Styles = __MaterialUI.Utils.Styles; // require('material-ui/lib/utils/styles');
+}
+
+declare module 'material-ui/lib/utils/color-manipulator' {
+    import ColorManipulator = __MaterialUI.Utils.ColorManipulator;
+    export = ColorManipulator;
+}
+
+declare module 'material-ui/lib/utils/css-event' {
+    import CssEvent = __MaterialUI.Utils.CssEvent;
+    export = CssEvent;
+}
+
+declare module 'material-ui/lib/utils/dom' {
+    import Dom = __MaterialUI.Utils.Dom;
+    export = Dom;
+}
+
+declare module 'material-ui/lib/utils/events' {
+    import Events = __MaterialUI.Utils.Events;
+    export = Events;
+}
+
+declare module 'material-ui/lib/utils/extend' {
+    import Extend = __MaterialUI.Utils.Extend;
+    export = Extend;
+}
+
+declare module 'material-ui/lib/utils/immutability-helper' {
+    import ImmutabilityHelper = __MaterialUI.Utils.ImmutabilityHelper;
+    export = ImmutabilityHelper;
+}
+
+declare module 'material-ui/lib/utils/key-code' {
+    import KeyCode = __MaterialUI.Utils.KeyCode;
+    export = KeyCode;
+}
+
+declare module 'material-ui/lib/utils/key-line' {
+    import KeyLine = __MaterialUI.Utils.KeyLine;
+    export = KeyLine;
+}
+
+declare module 'material-ui/lib/utils/unique-id' {
+    import UniqueId = __MaterialUI.Utils.UniqueId;
+    export = UniqueId;
+}
+
+declare module 'material-ui/lib/utils/styles' {
+    import Styles = __MaterialUI.Utils.Styles;
+    export = Styles;
+}
+
+declare module "material-ui/lib/menus/icon-menu" {
+    import IconMenu = __MaterialUI.Menus.IconMenu;
+    export = IconMenu;
+}
+
+declare module "material-ui/lib/menus/menu" {
+    import Menu = __MaterialUI.Menus.Menu;
+    export = Menu;
+}
+
+declare module "material-ui/lib/menus/menu-item" {
+    import MenuItem = __MaterialUI.Menus.MenuItem;
+    export = MenuItem;
+}
+
+declare module "material-ui/lib/menus/menu-divider" {
+    import MenuDivider = __MaterialUI.Menus.MenuDivider;
+    export = MenuDivider;
+}
+
+declare module "material-ui/lib/styles/colors" {
+    import Colors = __MaterialUI.Styles.Colors;
+    export = Colors;
+}
+
+declare namespace __MaterialUI.Styles {
+    interface Colors {
+        red50: string;
+        red100: string;
+        red200: string;
+        red300: string;
+        red400: string;
+        red500: string;
+        red600: string;
+        red700: string;
+        red800: string;
+        red900: string;
+        redA100: string;
+        redA200: string;
+        redA400: string;
+        redA700: string;
+
+        pink50: string;
+        pink100: string;
+        pink200: string;
+        pink300: string;
+        pink400: string;
+        pink500: string;
+        pink600: string;
+        pink700: string;
+        pink800: string;
+        pink900: string;
+        pinkA100: string;
+        pinkA200: string;
+        pinkA400: string;
+        pinkA700: string;
+
+        purple50: string;
+        purple100: string;
+        purple200: string;
+        purple300: string;
+        purple400: string;
+        purple500: string;
+        purple600: string;
+        purple700: string;
+        purple800: string;
+        purple900: string;
+        purpleA100: string;
+        purpleA200: string;
+        purpleA400: string;
+        purpleA700: string;
+
+        deepPurple50: string;
+        deepPurple100: string;
+        deepPurple200: string;
+        deepPurple300: string;
+        deepPurple400: string;
+        deepPurple500: string;
+        deepPurple600: string;
+        deepPurple700: string;
+        deepPurple800: string;
+        deepPurple900: string;
+        deepPurpleA100: string;
+        deepPurpleA200: string;
+        deepPurpleA400: string;
+        deepPurpleA700: string;
+
+        indigo50: string;
+        indigo100: string;
+        indigo200: string;
+        indigo300: string;
+        indigo400: string;
+        indigo500: string;
+        indigo600: string;
+        indigo700: string;
+        indigo800: string;
+        indigo900: string;
+        indigoA100: string;
+        indigoA200: string;
+        indigoA400: string;
+        indigoA700: string;
+
+        blue50: string;
+        blue100: string;
+        blue200: string;
+        blue300: string;
+        blue400: string;
+        blue500: string;
+        blue600: string;
+        blue700: string;
+        blue800: string;
+        blue900: string;
+        blueA100: string;
+        blueA200: string;
+        blueA400: string;
+        blueA700: string;
+
+        lightBlue50: string;
+        lightBlue100: string;
+        lightBlue200: string;
+        lightBlue300: string;
+        lightBlue400: string;
+        lightBlue500: string;
+        lightBlue600: string;
+        lightBlue700: string;
+        lightBlue800: string;
+        lightBlue900: string;
+        lightBlueA100: string;
+        lightBlueA200: string;
+        lightBlueA400: string;
+        lightBlueA700: string;
+
+        cyan50: string;
+        cyan100: string;
+        cyan200: string;
+        cyan300: string;
+        cyan400: string;
+        cyan500: string;
+        cyan600: string;
+        cyan700: string;
+        cyan800: string;
+        cyan900: string;
+        cyanA100: string;
+        cyanA200: string;
+        cyanA400: string;
+        cyanA700: string;
+
+        teal50: string;
+        teal100: string;
+        teal200: string;
+        teal300: string;
+        teal400: string;
+        teal500: string;
+        teal600: string;
+        teal700: string;
+        teal800: string;
+        teal900: string;
+        tealA100: string;
+        tealA200: string;
+        tealA400: string;
+        tealA700: string;
+
+        green50: string;
+        green100: string;
+        green200: string;
+        green300: string;
+        green400: string;
+        green500: string;
+        green600: string;
+        green700: string;
+        green800: string;
+        green900: string;
+        greenA100: string;
+        greenA200: string;
+        greenA400: string;
+        greenA700: string;
+
+        lightGreen50: string;
+        lightGreen100: string;
+        lightGreen200: string;
+        lightGreen300: string;
+        lightGreen400: string;
+        lightGreen500: string;
+        lightGreen600: string;
+        lightGreen700: string;
+        lightGreen800: string;
+        lightGreen900: string;
+        lightGreenA100: string;
+        lightGreenA200: string;
+        lightGreenA400: string;
+        lightGreenA700: string;
+
+        lime50: string;
+        lime100: string;
+        lime200: string;
+        lime300: string;
+        lime400: string;
+        lime500: string;
+        lime600: string;
+        lime700: string;
+        lime800: string;
+        lime900: string;
+        limeA100: string;
+        limeA200: string;
+        limeA400: string;
+        limeA700: string;
+
+        yellow50: string;
+        yellow100: string;
+        yellow200: string;
+        yellow300: string;
+        yellow400: string;
+        yellow500: string;
+        yellow600: string;
+        yellow700: string;
+        yellow800: string;
+        yellow900: string;
+        yellowA100: string;
+        yellowA200: string;
+        yellowA400: string;
+        yellowA700: string;
+
+        amber50: string;
+        amber100: string;
+        amber200: string;
+        amber300: string;
+        amber400: string;
+        amber500: string;
+        amber600: string;
+        amber700: string;
+        amber800: string;
+        amber900: string;
+        amberA100: string;
+        amberA200: string;
+        amberA400: string;
+        amberA700: string;
+
+        orange50: string;
+        orange100: string;
+        orange200: string;
+        orange300: string;
+        orange400: string;
+        orange500: string;
+        orange600: string;
+        orange700: string;
+        orange800: string;
+        orange900: string;
+        orangeA100: string;
+        orangeA200: string;
+        orangeA400: string;
+        orangeA700: string;
+
+        deepOrange50: string;
+        deepOrange100: string;
+        deepOrange200: string;
+        deepOrange300: string;
+        deepOrange400: string;
+        deepOrange500: string;
+        deepOrange600: string;
+        deepOrange700: string;
+        deepOrange800: string;
+        deepOrange900: string;
+        deepOrangeA100: string;
+        deepOrangeA200: string;
+        deepOrangeA400: string;
+        deepOrangeA700: string;
+
+        brown50: string;
+        brown100: string;
+        brown200: string;
+        brown300: string;
+        brown400: string;
+        brown500: string;
+        brown600: string;
+        brown700: string;
+        brown800: string;
+        brown900: string;
+
+        blueGrey50: string;
+        blueGrey100: string;
+        blueGrey200: string;
+        blueGrey300: string;
+        blueGrey400: string;
+        blueGrey500: string;
+        blueGrey600: string;
+        blueGrey700: string;
+        blueGrey800: string;
+        blueGrey900: string;
+
+        grey50: string;
+        grey100: string;
+        grey200: string;
+        grey300: string;
+        grey400: string;
+        grey500: string;
+        grey600: string;
+        grey700: string;
+        grey800: string;
+        grey900: string;
+
+        black: string;
+        white: string;
+
+        transparent: string;
+        fullBlack: string;
+        darkBlack: string;
+        lightBlack: string;
+        minBlack: string;
+        faintBlack: string;
+        fullWhite: string;
+        darkWhite: string;
+        lightWhite: string;
+    }
+    export var Colors: Colors;
+}
diff --git a/material-ui/material-ui-tests.tsx b/material-ui/material-ui-tests.tsx
index 4c69f3410..0165dee1f 100644
--- a/material-ui/material-ui-tests.tsx
+++ b/material-ui/material-ui-tests.tsx
@@ -1,10 +1,13 @@
 ///<reference path='../react/react.d.ts' />
+///<reference path='../react/react-addons-linked-state-mixin.d.ts' />
 ///<reference path='material-ui.d.ts' />
 
-import * as React from "react/addons";
+import * as React from "react";
+import * as LinkedStateMixin from "react-addons-linked-state-mixin";
 import Checkbox = require("material-ui/lib/checkbox");
 import Colors = require("material-ui/lib/styles/colors");
 import AppBar = require("material-ui/lib/app-bar");
+import Badge = require("material-ui/lib/badge");
 import IconButton = require("material-ui/lib/icon-button");
 import FlatButton = require("material-ui/lib/flat-button");
 import Avatar = require("material-ui/lib/avatar");
@@ -14,6 +17,7 @@ import RaisedButton = require("material-ui/lib/raised-button");
 import FloatingActionButton = require("material-ui/lib/floating-action-button");
 import Card = require("material-ui/lib/card/card");
 import CardHeader = require("material-ui/lib/card/card-header");
+import DatePicker = require("material-ui/lib/date-picker/date-picker");
 import CardText = require("material-ui/lib/card/card-text");
 import CardActions = require("material-ui/lib/card/card-actions");
 import Dialog = require("material-ui/lib/dialog");
@@ -28,6 +32,9 @@ import Menu = require('material-ui/lib/menus/menu');
 import MenuItem = require('material-ui/lib/menus/menu-item');
 import MenuDivider = require('material-ui/lib/menus/menu-divider');
 import ThemeManager = require('material-ui/lib/styles/theme-manager');
+import GridList = require('material-ui/lib/grid-list/grid-list');
+import GridTile = require('material-ui/lib/grid-list/grid-tile');
+
 
 import NavigationClose = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/navigation/close", but they aren't defined yet.
 import FileFolder = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/file/folder", but they aren't defined yet.
@@ -126,6 +133,17 @@ class MaterialUiTests extends React.Component<{}, {}> implements React.LinkedSta
             backgroundColor={Colors.purple500}>
             </Avatar>
 
+        // "http://material-ui.com/#/components/badge"
+        element = <Badge badgeContent={<span>Hello</span>}>
+                    <Avatar color={Colors.deepOrange300} />
+                  </Badge>;
+        element = <Badge
+                    primary
+                    badgeContent={<span>Hello</span>}
+                    badgeStyle={{height: '24px', width: '24px'}}
+                  >
+                    This text has a badge!
+                  </Badge>;
 
         // "http://material-ui.com/#/components/buttons"
         element = <FlatButton linkButton={true} href="https://github.com/callemall/material-ui" secondary={true} label="GitHub">
@@ -160,7 +178,10 @@ class MaterialUiTests extends React.Component<{}, {}> implements React.LinkedSta
             </Card>;
 
         // "http://material-ui.com/#/components/date-picker"
-
+        element = <DatePicker
+            floatingLabelText="Floating Label Text" />;
+        element = <DatePicker
+            hintText="Hint Text" />;
 
         // "http://material-ui.com/#/components/dialog"
         let standardActions = [
@@ -456,13 +477,30 @@ class MaterialUiTests extends React.Component<{}, {}> implements React.LinkedSta
             hintText="Password Field"
             floatingLabelText="Password"
             type="password" />;
-
+            
 
         // "http://material-ui.com/#/components/time-picker"
 
 
         // "http://material-ui.com/#/components/toolbars"
+        
+        // "http://material-ui.com/#/components/grid-list"
+        element = <GridList
+            cols={3}
+            padding={50}
+            cellHeight={200} />;
+            
+        element = <GridTile
+            title="GridTileTitle"
+            actionIcon={<h1>GridTile</h1>}
+            actionPosition="left"
+            titlePosition="top"
+            titleBackground="rgba(0, 0, 0, 0.4)"
+            cols={2}
+            rows={1} >
+            <h1>Children are Required!</h1>
+            </GridTile>;
 
         return element;
     }
-}
\ No newline at end of file
+}
diff --git a/material-ui/material-ui.d.ts b/material-ui/material-ui.d.ts
index ecd32ae06..df6a088a7 100644
--- a/material-ui/material-ui.d.ts
+++ b/material-ui/material-ui.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for material-ui v0.12.1
+// Type definitions for material-ui v0.13.1
 // Project: https://github.com/callemall/material-ui
-// Definitions by: Nathan Brown <https://github.com/ngbrown>
+// Definitions by: Nathan Brown <https://github.com/ngbrown>, Oliver Herrmann <https://github.com/herrmanno>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 ///<reference path='../react/react.d.ts' />
@@ -9,6 +9,7 @@ declare module "material-ui" {
     export import AppBar = __MaterialUI.AppBar; // require('material-ui/lib/app-bar');
     export import AppCanvas = __MaterialUI.AppCanvas; // require('material-ui/lib/app-canvas');
     export import Avatar = __MaterialUI.Avatar; // require('material-ui/lib/avatar');
+    export import Badge = __MaterialUI.Badge; // require('material-ui/lib/badge');
     export import BeforeAfterWrapper = __MaterialUI.BeforeAfterWrapper; // require('material-ui/lib/before-after-wrapper');
     export import Card = __MaterialUI.Card.Card; // require('material-ui/lib/card/card');
     export import CardActions = __MaterialUI.Card.CardActions; // require('material-ui/lib/card/card-actions');
@@ -71,6 +72,9 @@ declare module "material-ui" {
     export import ToolbarTitle = __MaterialUI.Toolbar.ToolbarTitle; // require('material-ui/lib/toolbar/toolbar-title');
     export import Tooltip = __MaterialUI.Tooltip; // require('material-ui/lib/tooltip');
     export import Utils = __MaterialUI.Utils; // require('material-ui/lib/utils/');
+    
+    export import GridList = __MaterialUI.GridList.GridList; // require('material-ui/lib/gridlist/grid-list');
+    export import GridTile = __MaterialUI.GridList.GridTile; // require('material-ui/lib/gridlist/grid-tile');
 
     // export type definitions
     export type TouchTapEvent = __MaterialUI.TouchTapEvent;
@@ -134,6 +138,16 @@ declare namespace __MaterialUI {
     export class Avatar extends React.Component<AvatarProps, {}> {
     }
 
+    interface BadgeProps extends React.Props<Badge> {
+        badgeContent: React.ReactElement<any> | string | number;
+        primary?: boolean;
+        secondary?: boolean;
+        style?: React.CSSProperties;
+        badgeStyle?: React.CSSProperties;
+    }
+    export class Badge extends React.Component<BadgeProps, {}> {
+    }
+
     interface BeforeAfterWrapperProps extends React.Props<BeforeAfterWrapper> {
         beforeStyle?: React.CSSProperties;
         afterStyle?: React.CSSProperties;
@@ -158,6 +172,7 @@ declare namespace __MaterialUI {
         interface CardActionsProps extends React.Props<CardActions> {
             expandable?: boolean;
             showExpandableButton?: boolean;
+            style?: React.CSSProperties;
         }
         export class CardActions extends React.Component<CardActionsProps, {}> {
         }
@@ -165,6 +180,7 @@ declare namespace __MaterialUI {
         interface CardExpandableProps extends React.Props<CardExpandable> {
             onExpanding?: (isExpanded: boolean) => void;
             expanded?: boolean;
+            style?: React.CSSProperties;
         }
         export class CardExpandable extends React.Component<CardExpandableProps, {}> {
         }
@@ -222,7 +238,7 @@ declare namespace __MaterialUI {
     }
 
     // what's not commonly overridden by Checkbox, RadioButton, or Toggle
-    interface CommonEnhancedSwitchProps<T> extends React.HTMLAttributesBase<T> {
+    interface CommonEnhancedSwitchProps<T> extends React.HTMLAttributes, React.Props<T> {
         // <input/> is root element
         id?: string;
         iconStyle?: React.CSSProperties;
@@ -288,6 +304,7 @@ declare namespace __MaterialUI {
         size?: number;
         color?: string;
         innerStyle?: React.CSSProperties;
+        style?: React.CSSProperties;
 
     }
     export class CircularProgress extends React.Component<CircularProgressProps, {}> {
@@ -303,6 +320,8 @@ declare namespace __MaterialUI {
             autoOk?: boolean;
             defaultDate?: Date;
             formatDate?: string;
+            hintText?: string;
+            floatingLabelText?: string;
             hideToolbarYearChange?: boolean;
             maxDate?: Date;
             minDate?: Date;
@@ -351,6 +370,7 @@ declare namespace __MaterialUI {
         actionFocus?: string;
         autoDetectWindowHeight?: boolean;
         autoScrollBodyContent?: boolean;
+        style?: React.CSSProperties;
         bodyStyle?: React.CSSProperties;
         contentClassName?: string;
         contentInnerStyle?: React.CSSProperties;
@@ -402,7 +422,7 @@ declare namespace __MaterialUI {
     }
 
     // non generally overridden elements of EnhancedButton
-    interface SharedEnhancedButtonProps<T> extends React.HTMLAttributesBase<T> {
+    interface SharedEnhancedButtonProps<T> extends React.HTMLAttributes, React.Props<T> {
         centerRipple?: boolean;
         containerElement?: string | React.ReactElement<any>;
         disabled?: boolean;
@@ -502,6 +522,7 @@ declare namespace __MaterialUI {
         menuItemClassName?: string;
         menuItemClassNameSubheader?: string;
         menuItemClassNameLink?: string;
+        style?: React.CSSProperties;
     }
     export class LeftNav extends React.Component<LeftNavProps, {}> {
     }
@@ -521,6 +542,7 @@ declare namespace __MaterialUI {
             subheader?: string;
             subheaderStyle?: React.CSSProperties;
             zDepth?: number;
+            style?: React.CSSProperties;
         }
         export class List extends React.Component<ListProps, {}> {
         }
@@ -552,6 +574,7 @@ declare namespace __MaterialUI {
             primaryText?: React.ReactNode;
             secondaryText?: React.ReactNode;
             secondaryTextLines?: number;
+            style?: React.CSSProperties;
         }
         export class ListItem extends React.Component<ListItemProps, {}> {
         }
@@ -577,6 +600,7 @@ declare namespace __MaterialUI {
             toggle?: boolean;
             onTouchTap?: TouchTapEventHandler;
             isDisabled?: boolean;
+            style?: React.CSSProperties;
 
             // for MenuItems.Types.NESTED
             items?: MenuItemRequest[];
@@ -593,6 +617,7 @@ declare namespace __MaterialUI {
             active?: boolean;
             onItemTap?: ItemTapEventHandler;
             menuItemStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
         }
         export class Menu extends React.Component<MenuProps, {}> {
         }
@@ -612,6 +637,7 @@ declare namespace __MaterialUI {
             onToggle?: (e: React.MouseEvent, key: number, toggled: boolean) => void;
             selected?: boolean;
             active?: boolean;
+            style?: React.CSSProperties;
         }
         export class MenuItem extends React.Component<MenuItemProps, {}> {
             static Types: { LINK: string, SUBHEADER: string, NESTED: string, }
@@ -644,7 +670,7 @@ declare namespace __MaterialUI {
     export class Overlay extends React.Component<OverlayProps, {}> {
     }
 
-    interface PaperProps extends React.HTMLAttributesBase<Paper> {
+    interface PaperProps extends React.HTMLAttributes, React.Props<Paper> {
         circle?: boolean;
         rounded?: boolean;
         transitionEnabled?: boolean;
@@ -705,6 +731,7 @@ declare namespace __MaterialUI {
         size?: number;
         status?: string;
         top: number;
+        style?: React.CSSProperties;
     }
     export class RefreshIndicator extends React.Component<RefreshIndicatorProps, {}> {
     }
@@ -713,12 +740,14 @@ declare namespace __MaterialUI {
         interface CircleRippleProps extends React.Props<CircleRipple> {
             color?: string;
             opacity?: number;
+            style?: React.CSSProperties;
         }
         export class CircleRipple extends React.Component<CircleRippleProps, {}> {
         }
 
         interface FocusRippleProps extends React.Props<FocusRipple> {
             color?: string;
+            style?: React.CSSProperties;
             innerStyle?: React.CSSProperties;
             opacity?: number;
             show?: boolean;
@@ -730,6 +759,7 @@ declare namespace __MaterialUI {
             centerRipple?: boolean;
             color?: string;
             opacity?: number;
+            style?: React.CSSProperties;
         }
         export class TouchRipple extends React.Component<TouchRippleProps, {}> {
         }
@@ -782,6 +812,7 @@ declare namespace __MaterialUI {
         required?: boolean;
         step?: number;
         value?: number;
+        style?: React.CSSProperties;
     }
     export class Slider extends React.Component<SliderProps, {}> {
     }
@@ -790,6 +821,7 @@ declare namespace __MaterialUI {
         color?: string;
         hoverColor?: string;
         viewBox?: string;
+        style?: React.CSSProperties;
     }
     export class SvgIcon extends React.Component<SvgIconProps, {}> {
     }
@@ -1037,6 +1069,7 @@ declare namespace __MaterialUI {
                 backgroundColor?: string;
                 borderColor?: string;
             };
+            isRtl: boolean;
         }
 
         interface RawTheme {
@@ -1064,7 +1097,7 @@ declare namespace __MaterialUI {
         export var Transitions: Transitions;
 
         interface Typography {
-            textFullBlack:string;
+            textFullBlack: string;
             textDarkBlack: string;
             textLightBlack: string;
             textMinBlack: string;
@@ -1093,6 +1126,7 @@ declare namespace __MaterialUI {
         onShow?: () => void;
         onDismiss?: () => void;
         openOnMount?: boolean;
+        style?: React.CSSProperties;
     }
     export class Snackbar extends React.Component<SnackbarProps, {}> {
     }
@@ -1103,6 +1137,7 @@ declare namespace __MaterialUI {
             value?: string;
             selected?: boolean;
             width?: string;
+            style?: React.CSSProperties;
 
             // Called by Tabs component
             onActive?: (tab: Tab) => void;
@@ -1120,6 +1155,7 @@ declare namespace __MaterialUI {
             tabItemContainerStyle?: React.CSSProperties;
             tabWidth?: number;
             value?: string | number;
+            tabTemplate?: __React.ComponentClass<any>;
 
             onChange?: (value: string | number, e: React.FormEvent, tab: Tab) => void;
         }
@@ -1139,8 +1175,9 @@ declare namespace __MaterialUI {
             onCellHoverExit?: (row: number, column: number) => void;
             onRowHover?: (row: number) => void;
             onRowHoverExit?: (row: number) => void;
-            onRowSelection?: (selectedRows: number[])=> void;
+            onRowSelection?: (selectedRows: number[]) => void;
             selectable?: boolean;
+            style?: React.CSSProperties;
         }
         export class Table extends React.Component<TableProps, {}> {
         }
@@ -1155,17 +1192,19 @@ declare namespace __MaterialUI {
             onCellHoverExit?: (row: number, column: number) => void;
             onRowHover?: (row: number) => void;
             onRowHoverExit?: (row: number) => void;
-            onRowSelection?: (selectedRows: number[])=> void;
+            onRowSelection?: (selectedRows: number[]) => void;
             preScanRows?: boolean;
             selectable?: boolean;
             showRowHover?: boolean;
             stripedRows?: boolean;
+            style?: React.CSSProperties;
         }
         export class TableBody extends React.Component<TableBodyProps, {}> {
         }
 
         interface TableFooterProps extends React.Props<TableFooter> {
             adjustForCheckbox?: boolean;
+            style?: React.CSSProperties;
         }
         export class TableFooter extends React.Component<TableFooterProps, {}> {
         }
@@ -1176,15 +1215,17 @@ declare namespace __MaterialUI {
             enableSelectAll?: boolean;
             onSelectAll?: (event: React.MouseEvent) => void;
             selectAllSelected?: boolean;
+            style?: React.CSSProperties;
         }
         export class TableHeader extends React.Component<TableHeaderProps, {}> {
         }
 
         interface TableHeaderColumnProps extends React.Props<TableHeaderColumn> {
             columnNumber?: number;
-            onClick?:  (e: React.MouseEvent, column: number) => void;
+            onClick?: (e: React.MouseEvent, column: number) => void;
             tooltip?: string;
             tooltipStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
         }
         export class TableHeaderColumn extends React.Component<TableHeaderColumnProps, {}> {
         }
@@ -1202,6 +1243,7 @@ declare namespace __MaterialUI {
             selectable?: boolean;
             selected?: boolean;
             striped?: boolean;
+            style?: React.CSSProperties;
         }
         export class TableRow extends React.Component<TableRowProps, {}> {
         }
@@ -1211,6 +1253,7 @@ declare namespace __MaterialUI {
             hoverable?: boolean;
             onHover?: (e: React.MouseEvent, column: number) => void;
             onHoverExit?: (e: React.MouseEvent, column: number) => void;
+            style?: React.CSSProperties;
         }
         export class TableRowColumn extends React.Component<TableRowColumnProps, {}> {
         }
@@ -1240,6 +1283,10 @@ declare namespace __MaterialUI {
         defaultTime?: Date;
         format?: string;
         pedantic?: boolean;
+        style?: __React.CSSProperties;
+        textFieldStye?: __React.CSSProperties;
+        autoOk?: boolean;
+        openDialog?: () => void;
         onFocus?: React.FocusEventHandler;
         onTouchTap?: TouchTapEventHandler;
         onChange?: (e: any, time: Date) => void;
@@ -1266,6 +1313,7 @@ declare namespace __MaterialUI {
         underlineFocusStyle?: React.CSSProperties;
         underlineDisabledStyle?: React.CSSProperties;
         type?: string;
+        hintStyle?: React.CSSProperties;
 
         disabled?: boolean;
         isRtl?: boolean;
@@ -1289,23 +1337,27 @@ declare namespace __MaterialUI {
 
     namespace Toolbar {
         interface ToolbarProps extends React.Props<Toolbar> {
+            style?: React.CSSProperties;
         }
         export class Toolbar extends React.Component<ToolbarProps, {}> {
         }
 
         interface ToolbarGroupProps extends React.Props<ToolbarGroup> {
             float?: string;
+            style?: React.CSSProperties;
         }
         export class ToolbarGroup extends React.Component<ToolbarGroupProps, {}> {
         }
 
         interface ToolbarSeparatorProps extends React.Props<ToolbarSeparator> {
+            style?: React.CSSProperties;
         }
         export class ToolbarSeparator extends React.Component<ToolbarSeparatorProps, {}> {
         }
 
-        interface ToolbarTitleProps extends React.HTMLAttributesBase<ToolbarTitle> {
-           text?: string;
+        interface ToolbarTitleProps extends React.HTMLAttributes, React.Props<ToolbarTitle> {
+            text?: string;
+            style?: React.CSSProperties;
         }
         export class ToolbarTitle extends React.Component<ToolbarTitleProps, {}> {
         }
@@ -1327,9 +1379,9 @@ declare namespace __MaterialUI {
             color: string;
         }
         interface ColorManipulator {
-            fade(color: string, amount: string|number): string;
-            lighten(color: string, amount: string|number): string;
-            darken(color: string, amount: string|number): string;
+            fade(color: string, amount: string | number): string;
+            lighten(color: string, amount: string | number): string;
+            darken(color: string, amount: string | number): string;
             contrastRatio(background: string, foreground: string): number;
             contrastRatioLevel(background: string, foreground: string): ContrastLevel;
         }
@@ -1421,6 +1473,7 @@ declare namespace __MaterialUI {
             value?: string | Array<string>;
             width?: string | number;
             touchTapCloseDelay?: number;
+            style?: React.CSSProperties;
 
             onKeyboardFocus?: React.FocusEventHandler;
             onItemTouchTap?: (e: TouchTapEvent, item: React.ReactElement<any>) => void;
@@ -1440,6 +1493,7 @@ declare namespace __MaterialUI {
             value?: string | Array<string>;
             width?: string | number;
             zDepth?: number;
+            style?: React.CSSProperties;
         }
         export class Menu extends React.Component<MenuProps, {}>{
         }
@@ -1455,6 +1509,7 @@ declare namespace __MaterialUI {
             rightIcon?: React.ReactElement<any>;
             secondaryText?: React.ReactNode;
             value?: string;
+            style?: React.CSSProperties;
 
             onEscKeyDown?: React.KeyboardEventHandler;
             onItemTouchTap?: (e: TouchTapEvent, item: React.ReactElement<any>) => void;
@@ -1470,6 +1525,34 @@ declare namespace __MaterialUI {
         export class MenuDivider extends React.Component<MenuDividerProps, {}>{
         }
     }
+    
+    namespace GridList {
+        
+        interface GridListProps extends React.Props<GridList> {
+            cols?: number;
+            padding?: number;
+            cellHeight?: number;
+        }
+        
+        export class GridList extends React.Component<GridListProps, {}>{
+        }
+        
+        interface GridTileProps extends React.Props<GridTile> {
+            title?: string;
+            subtitle?: __React.ReactNode;
+            titlePosition?: string; //"top"|"bottom"
+            titleBackground?: string;
+            actionIcon?: __React.ReactElement<any>;
+            actionPosition?: string; //"left"|"right"
+            cols?: number;
+            rows?: number;
+            rootClass?: string | __React.Component<any,any>;
+        }
+        
+        export class GridTile extends React.Component<GridTileProps, {}>{
+        }
+        
+    }
 }    // __MaterialUI
 
 declare module 'material-ui/lib/app-bar' {
@@ -1487,6 +1570,11 @@ declare module 'material-ui/lib/avatar' {
     export = Avatar;
 }
 
+declare module "material-ui/lib/badge" {
+    import Badge = __MaterialUI.Badge;
+    export = Badge;
+}
+
 declare module 'material-ui/lib/before-after-wrapper' {
     import BeforeAfterWrapper = __MaterialUI.BeforeAfterWrapper;
     export = BeforeAfterWrapper;
@@ -1952,6 +2040,16 @@ declare module "material-ui/lib/menus/menu-divider" {
     export = MenuDivider;
 }
 
+declare module "material-ui/lib/grid-list/grid-list" {
+    import GridList = __MaterialUI.GridList.GridList;
+    export = GridList;
+}
+
+declare module "material-ui/lib/grid-list/grid-tile" {
+    import GridTile = __MaterialUI.GridList.GridTile;
+    export = GridTile;
+}
+
 declare module "material-ui/lib/styles/colors" {
     import Colors = __MaterialUI.Styles.Colors;
     export = Colors;
diff --git a/mathjs/mathjs-tests.ts b/mathjs/mathjs-tests.ts
new file mode 100644
index 000000000..78c9ed941
--- /dev/null
+++ b/mathjs/mathjs-tests.ts
@@ -0,0 +1,581 @@
+/// <reference path="mathjs.d.ts" />
+
+
+/*
+Basic usage examples
+*/
+(function(){
+	// functions and constants
+	math.round(math.e, 3);           // 2.718
+	math.atan2(3, -3) / math.pi;     // 0.75
+	math.log(10000, 10);             // 4
+	math.sqrt(-4);                   // 2i
+	math.pow([[-1, 2], [3, 1]], 2);  // [[7, 0], [0, 7]]
+	
+	// expressions
+	math.eval('1.2 * (2 + 4.5)');    // 7.8
+	math.eval('5.08 cm to inch');    // 2 inch
+	math.eval('sin(45 deg) ^ 2');    // 0.5
+	math.eval('9 / 3 + 2i');         // 3 + 2i
+	math.eval('det([-1, 2; 3, 1])'); // -7
+	
+	// chained operations
+	var a = math.chain(3)
+		.add(4)
+		.multiply(2)
+		.done(); // 14
+	
+	// mixed use of different data types in functions
+	console.log('mixed use of data types');
+	math.add(4, [5, 6]);                   // number + Array, [9, 10]
+	math.multiply(math.unit('5 mm'), 3);   // Unit * number,  15 mm
+	math.subtract([2, 3, 4], 5);           // Array - number, [-3, -2, -1]
+	math.add(math.matrix([2, 3]), [4, 5]); // Matrix + Array, [6, 8]
+}());
+
+
+/*
+Bignumbers examples
+*/
+(function() {
+	// configure the default type of numbers as BigNumbers
+	math.config({
+	number: 'bignumber',  // Default type of number:
+							// 'number' (default), 'bignumber', or 'fraction'
+	precision: 20         // Number of significant digits for BigNumbers
+	});
+	
+	console.log('round-off errors with numbers');
+	math.add(0.1, 0.2);    // number, 0.30000000000000004
+	math.divide(0.3, 0.2); // number, 1.4999999999999998
+	console.log();
+	
+	console.log('no round-off errors with BigNumbers');
+	math.add(math.bignumber(0.1), math.bignumber(0.2));     // BigNumber, 0.3
+	math.divide(math.bignumber(0.3), math.bignumber(0.2));  // BigNumber, 1.5
+	console.log();
+	
+	console.log('create BigNumbers from strings when exceeding the range of a number');
+	math.bignumber(1.2e+500);    // BigNumber, Infinity      WRONG
+	math.bignumber('1.2e+500');  // BigNumber, 1.2e+500
+	console.log();
+	
+	// one can work conveniently with BigNumbers using the expression parser.
+	// note though that BigNumbers are only supported in arithmetic functions
+	console.log('use BigNumbers in the expression parser');
+	math.eval('0.1 + 0.2');  // BigNumber, 0.3
+	math.eval('0.3 / 0.2');  // BigNumber, 1.5
+	console.log();
+}());
+
+
+
+/*
+Chaining examples
+*/
+(function() {
+	// create a chained operation using the function `chain(value)`
+	// end a chain using done(). Let's calculate (3 + 4) * 2
+	var a = math.chain(3)
+		.add(4)
+		.multiply(2)
+		.done(); // 14
+	
+	// Another example, calculate square(sin(pi / 4))
+	var b = math.chain(math.pi)
+		.divide(4)
+		.sin()
+		.square()
+		.done(); // 0.5
+	
+	// A chain has a few special methods: done, toString, valueOf, get, and set.
+	// these are demonstrated in the following examples
+	
+	// toString will return a string representation of the chain's value
+	var chain = math.chain(2).divide(3);
+	var str = chain.toString(); // "0.6666666666666666"
+	
+	// a chain has a function .valueOf(), which returns the value hold by the chain.
+	// This allows using it in regular operations. The function valueOf() acts the
+	// same as function done().
+	chain.valueOf(); // 0.66666666666667
+	
+	
+	// the function subset can be used to get or replace sub matrices
+	var array = [[1, 2], [3, 4]];
+	var v = math.chain(array)
+		.subset(math.index(1, 0))
+		.done(); // 3
+	
+	var m = math.chain(array)
+		.subset(math.index(0, 0), 8)
+		.multiply(3)
+		.done(); // [[24, 6], [9, 12]]
+}());
+
+
+/*
+Complex numbers examples
+*/
+(function(){
+	var a = math.complex(2, 3); // 2 + 3i
+	
+	// read the real and complex parts of the complex number
+	a.re;                    // 2
+	a.im;                    // 3
+	
+	// clone a complex value
+	var clone = a.clone(); // 2 + 3i
+	
+	// adjust the complex value
+	a.re = 5; // 5 + 3i
+	
+	// create a complex number by providing a string with real and complex parts
+	var b = math.complex('3 - 7i'); // 3 - 7i
+	console.log();
+	
+	// perform operations with complex numbers
+	console.log('perform operations');
+	math.add(a, b);          // 8 - 4i
+	math.multiply(a, b);     // 36 - 26i
+	math.sin(a);             // -9.6541254768548 + 2.8416922956064i
+	
+	// some operations will return a complex number depending on the arguments
+	math.sqrt(4);           // 2
+	math.sqrt(-4);          // 2i
+	
+	// create a complex number from polar coordinates
+	console.log('create complex numbers with polar coordinates');
+	var c = math.complex({r: math.sqrt(2), phi: math.pi / 4}); // 1 + i
+	
+	// get polar coordinates of a complex number
+	var d = math.complex(3, 4);
+	d.toPolar();      // { r: 5, phi: 0.9272952180016122 }	
+}());
+
+
+/*
+Expressions examples
+*/
+(function() {
+	// 1. using the function math.eval
+	//
+	// Function `eval` accepts a single expression or an array with
+	// expressions as first argument, and has an optional second argument
+	// containing a scope with variables and functions. The scope is a regular
+	// JavaScript Object. The scope will be used to resolve symbols, and to write
+	// assigned variables or function.
+	console.log('1. USING FUNCTION MATH.EVAL');
+	
+	// evaluate expressions
+	console.log('\nevaluate expressions');
+	math.eval('sqrt(3^2 + 4^2)');        // 5
+	math.eval('sqrt(-4)');               // 2i
+	math.eval('2 inch to cm');           // 5.08 cm
+	math.eval('cos(45 deg)');            // 0.70711
+	
+	// evaluate multiple expressions at once
+	console.log('\nevaluate multiple expressions at once');
+	math.eval([
+	'f = 3',
+	'g = 4',
+	'f * g'
+	]);                                        // [3, 4, 12]
+	
+	// provide a scope (just a regular JavaScript Object)
+	console.log('\nevaluate expressions providing a scope with variables and functions');
+	var scope: any = {
+	a: 3,
+	b: 4
+	};
+	
+	// variables can be read from the scope
+	math.eval('a * b', scope);           // 12
+	
+	// variable assignments are written to the scope
+	math.eval('c = 2.3 + 4.5', scope);   // 6.8
+	scope.c;                             // 6.8
+	
+	// scope can contain both variables and functions
+	scope["hello"] = function (name: string) {
+		return 'hello, ' + name + '!';
+	};
+	math.eval('hello("hero")', scope);   // "hello, hero!"
+	
+	// define a function as an expression
+	var f = math.eval('f(x) = x ^ a', scope);
+	f(2);                                // 8
+	scope.f(2);                          // 8
+	
+	
+	
+	// 2. using function math.parse
+	//
+	// Function `math.parse` parses expressions into a node tree. The syntax is
+	// similar to function `math.eval`.
+	// Function `parse` accepts a single expression or an array with
+	// expressions as first argument. The function returns a node tree, which
+	// then can be compiled against math, and then evaluated against an (optional
+	// scope. This scope is a regular JavaScript Object. The scope will be used
+	// to resolve symbols, and to write assigned variables or function.
+	console.log('\n2. USING FUNCTION MATH.PARSE');
+	
+	// parse an expression
+	console.log('\nparse an expression into a node tree');
+	var node1 = math.parse('sqrt(3^2 + 4^2)');
+	node1.toString();                    // "sqrt((3 ^ 2) + (4 ^ 2))"
+	
+	// compile and evaluate the compiled code
+	// you could also do this in two steps: node1.compile().eval()
+	node1.eval();                        // 5
+	
+	// provide a scope
+	console.log('\nprovide a scope');
+	var node2 = math.parse('x^a');
+	var code2 = node2.compile();
+	node2.toString();                    // "x ^ a"
+	var scope: any = {
+	x: 3,
+	a: 2
+	};
+	code2.eval(scope);                   // 9
+	
+	// change a value in the scope and re-evaluate the node
+	scope.a = 3;
+	code2.eval(scope);                   // 27
+	
+	
+	// 3. using function math.compile
+	//
+	// Function `math.compile` compiles expressions into a node tree. The syntax is
+	// similar to function `math.eval`.
+	// Function `compile` accepts a single expression or an array with
+	// expressions as first argument, and returns an object with a function eval
+	// to evaluate the compiled expression. On evaluation, an optional scope can
+	// be provided. This scope will be used to resolve symbols, and to write
+	// assigned variables or function.
+	console.log('\n3. USING FUNCTION MATH.COMPILE');
+	
+	// parse an expression
+	console.log('\ncompile an expression');
+	var code3 = math.compile('sqrt(3^2 + 4^2)');
+	
+	// evaluate the compiled code
+	code3.eval();                        // 5
+	
+	// provide a scope for the variable assignment
+	console.log('\nprovide a scope');
+	var code2 = math.compile('a = a + 3');
+	var scope: any = {
+	a: 7
+	};
+	code2.eval(scope);
+	scope.a;                             // 10
+	
+	
+	// 4. using a parser
+	//
+	// In addition to the static functions `math.eval` and `math.parse`, math.js
+	// contains a parser with functions `eval` and `parse`, which automatically
+	// keeps a scope with assigned variables in memory. The parser also contains
+	// some convenience methods to get, set, and remove variables from memory.
+	console.log('\n4. USING A PARSER');
+	var parser = math.parser();
+	
+	// evaluate with parser
+	console.log('\nevaluate expressions');
+	parser.eval('sqrt(3^2 + 4^2)');          // 5
+	parser.eval('sqrt(-4)');                 // 2i
+	parser.eval('2 inch to cm');             // 5.08 cm
+	parser.eval('cos(45 deg)');              // 0.70711
+	
+	// define variables and functions
+	console.log('\ndefine variables and functions');
+	parser.eval('x = 7 / 2');                // 3.5
+	parser.eval('x + 3');                    // 6.5
+	parser.eval('f(x, y) = x^y');            // f(x, y)
+	parser.eval('f(2, 3)');                  // 8
+	
+	// manipulate matrices
+	// Note that matrix indexes in the expression parser are one-based with the
+	// upper-bound included. On a JavaScript level however, math.js uses zero-based
+	// indexes with an excluded upper-bound.
+	console.log('\nmanipulate matrices');
+	parser.eval('k = [1, 2; 3, 4]');         // [[1, 2], [3, 4]]
+	parser.eval('l = zeros(2, 2)');          // [[0, 0], [0, 0]]
+	parser.eval('l[1, 1:2] = [5, 6]');       // [[5, 6], [0, 0]]
+	parser.eval('l[2, :] = [7, 8]');         // [[5, 6], [7, 8]]
+	parser.eval('m = k * l');                // [[19, 22], [43, 50]]
+	parser.eval('n = m[2, 1]');              // 43
+	parser.eval('n = m[:, 1]');              // [[19], [43]]
+	
+	// get and set variables and functions
+	console.log('\nget and set variables and function in the scope of the parser');
+	var x = parser.get('x');
+	console.log('x =', x);                          // x = 7
+	var f = parser.get('f');
+	console.log('f =', math.format(f));             // f = f(x, y)
+	var g = f(3, 3);
+	console.log('g =', g);                          // g = 27
+	
+	parser.set('h', 500);
+	parser.eval('h / 2');                    // 250
+	parser.set('hello', function (name: string) {
+	return 'hello, ' + name + '!';
+	});
+	parser.eval('hello("hero")');            // "hello, hero!"
+	
+	// clear defined functions and variables
+	parser.clear();
+}());
+
+
+/*
+Fractions examples
+*/
+(function(){
+	// configure the default type of numbers as Fractions
+	math.config({
+		number: 'fraction'   // Default type of number:
+							// 'number' (default), 'bignumber', or 'fraction'
+	});
+	
+	console.log('basic usage');
+	math.fraction(0.125);         // Fraction, 1/8
+	math.fraction(0.32);          // Fraction, 8/25
+	math.fraction('1/3');         // Fraction, 1/3
+	math.fraction('0.(3)');       // Fraction, 1/3
+	math.fraction(2, 3);          // Fraction, 2/3
+	math.fraction('0.(285714)');  // Fraction, 2/7
+	console.log();
+	
+	console.log('round-off errors with numbers');
+	math.add(0.1, 0.2);                // number, 0.30000000000000004
+	math.divide(0.3, 0.2);             // number, 1.4999999999999998
+	console.log();
+	
+	console.log('no round-off errors with fractions :)');
+	math.add(math.fraction(0.1), math.fraction(0.2));     // Fraction, 3/10
+	math.divide(math.fraction(0.3), math.fraction(0.2));  // Fraction, 3/2
+	console.log();
+	
+	console.log('represent an infinite number of repeating digits');
+	math.fraction('1/3');        // Fraction, 0.(3)
+	math.fraction('2/7');        // Fraction, 0.(285714)
+	math.fraction('23/11');      // Fraction, 2.(09)
+	console.log();
+	
+	// one can work conveniently with fractions using the expression parser.
+	// note though that Fractions are only supported by basic arithmetic functions
+	console.log('use fractions in the expression parser');
+	math.eval('0.1 + 0.2'); // Fraction,  3/10
+	math.eval('0.3 / 0.2'); // Fraction,  3/2
+	math.eval('23 / 11');   // Fraction, 23/11
+	console.log();
+	
+	// output formatting
+	console.log('output formatting of fractions');
+	var a = math.fraction('2/3');
+	console.log(math.format(a));                          // Fraction,  2/3
+	console.log(math.format(a, {fraction: 'ratio'}));     // Fraction,  2/3
+	console.log(math.format(a, {fraction: 'decimal'}));   // Fraction,  0.(6)
+	console.log(a.toString());                            // Fraction,  0.(6)
+	console.log();	
+}());
+
+/*
+Matrices examples
+*/
+(function() {
+	// create matrices and arrays. a matrix is just a wrapper around an Array,
+	// providing some handy utilities.
+	console.log('create a matrix');
+	var a = math.matrix([1, 4, 9, 16, 25]); // [1, 4, 9, 16, 25]
+	var b = math.matrix(math.ones([2, 3])); // [[1, 1, 1], [1, 1, 1]]
+	b.size();                           // [2, 3]
+	
+	// the Array data of a Matrix can be retrieved using valueOf()
+	var array = a.valueOf();  // [1, 4, 9, 16, 25]
+	
+	// Matrices can be cloned
+	var clone = a.clone(); // [1, 4, 9, 16, 25]
+	console.log();
+	
+	// perform operations with matrices
+	console.log('perform operations');
+	math.sqrt(a);                       // [1, 2, 3, 4, 5]
+	var c = [1, 2, 3, 4, 5];
+	math.factorial(c);                  // [1, 2, 6, 24, 120]
+	console.log();
+	
+	// create and manipulate matrices. Arrays and Matrices can be used mixed.
+	console.log('manipulate matrices');
+	var d = [[1, 2], [3, 4]]; // [[1, 2], [3, 4]]
+	var e = math.matrix([[5, 6], [1, 1]]); // [[5, 6], [1, 1]]
+	
+	// set a submatrix.
+	// Matrix indexes are zero-based.
+	e.subset(math.index(1, [0, 1]), [[7, 8]]); // [[5, 6], [7, 8]]
+	var f = math.multiply(d, e); // [[19, 22], [43, 50]]
+	var g = f.subset(math.index(1, 0)); // 43
+	console.log();
+	
+	// get a sub matrix
+	// Matrix indexes are zero-based.
+	console.log('get a sub matrix');
+	var h = math.diag(math.range(1,4)); // [[1, 0, 0], [0, 2, 0], [0, 0, 3]]
+	h.subset( math.index([1, 2], [1, 2])); // [[2, 0], [0, 3]]
+	var i = math.range(1,6); // [1, 2, 3, 4, 5]
+	i.subset(math.index(math.range(1,4))); // [2, 3, 4]
+	console.log();
+	
+	
+	// resize a multi dimensional matrix
+	console.log('resizing a matrix');
+	var j = math.matrix();
+	var defaultValue = 0;
+	j.resize([2, 2, 2], defaultValue); // [[[0, 0], [0, 0]], [[0, 0], [0, 0]]]
+	j.size();                            // [2, 2, 2]
+	j.resize([2, 2]); // [[0, 0], [0, 0]]
+	j.size();                            // [2, 2]
+	console.log();
+	
+	// setting a value outside the matrices range will resize the matrix.
+	// new elements will be initialized with zero.
+	console.log('set a value outside a matrices range');
+	var k = math.matrix();
+	k.subset(math.index(2), 6); // [0, 0, 6]
+	console.log();
+	
+	console.log('set a value outside a matrices range, leaving new entries uninitialized');
+	var m = math.matrix();
+	defaultValue = math.uninitialized;
+	m.subset(math.index(2), 6, defaultValue); // [undefined, undefined, 6]
+	console.log();
+	
+	// create ranges
+	console.log('create ranges');
+	math.range(1, 6);                    // [1, 2, 3, 4, 5]
+	math.range(0, 18, 3);                // [0, 3, 6, 9, 12, 15]
+	math.range('2:-1:-3');               // [2, 1, 0, -1, -2]
+	math.factorial(math.range('1:6'));   // [1, 2, 6, 24, 120]
+	console.log();
+}());
+
+/*
+Sparse matrices examples
+*/
+(function() {
+	// create a sparse matrix
+	console.log('creating a 1000x1000 sparse matrix...');
+	var a = math.eye(1000, 1000, 'sparse');
+	
+	// do operations with a sparse matrix
+	console.log('doing some operations on the sparse matrix...');
+	var b = math.multiply(a, a);
+	var c = math.multiply(b, math.complex(2, 2));
+	var d = math.transpose(c);
+	var e = math.multiply(d, a);
+	
+	// we will not print the output, but doing the same operations
+	// with a dense matrix are very slow, try it for yourself.
+	console.log('already done');
+	console.log('now try this with a dense matrix :)');
+}());
+
+/*
+Units examples
+*/
+(function() {
+	// units can be created by providing a value and unit name, or by providing
+	// a string with a valued unit.
+	console.log('create units');
+	var a = math.unit(45, 'cm'); // 450 mm
+	var b = math.unit('0.1m'); // 100 mm
+	console.log();
+	
+	// units can be added, subtracted, and multiplied or divided by numbers and by other units
+	console.log('perform operations');
+	math.add(a, b);                                  // 0.55 m
+	math.multiply(b, 2);                             // 200 mm
+	math.divide(math.unit('1 m'), math.unit('1 s')); // 1 m / s
+	math.pow(math.unit('12 in'), 3);                 // 1728 in^3
+	console.log();
+	
+	// units can be converted to a specific type, or to a number
+	console.log('convert to another type or to a number');
+	b.to('cm');                    // 10 cm  Alternatively: math.to(b, 'cm')
+	math.to(b, 'inch');            // 3.9370... inch
+	b.toNumber('cm');              // 10
+	math.number(b, 'cm');          // 10
+	console.log();
+	
+	// the expression parser supports units too
+	console.log('parse expressions');
+	math.eval('2 inch to cm');     // 5.08 cm
+	math.eval('cos(45 deg)');      // 0.70711...
+	math.eval('90 km/h to m/s');   // 25 m / s
+	console.log();
+	
+	// convert a unit to a number
+	// A second parameter with the unit for the exported number must be provided
+	math.eval('number(5 cm, mm)'); // number, 50
+	console.log();
+	
+	// simplify units
+	console.log('simplify units');
+	math.eval('100000 N / m^2');   // 100 kPa
+	math.eval('9.81 m/s^2 * 100 kg * 40 m'); // 39.24 kJ
+	console.log();
+	
+	// example engineering calculations
+	console.log('compute molar volume of ideal gas at 65 Fahrenheit, 14.7 psi in L/mol');
+	var Rg = math.unit('8.314 N m / (mol K)');
+	var T = math.unit('65 degF');
+	var P = math.unit('14.7 psi');
+	var v = math.divide(math.multiply(Rg, T), P);
+	console.log('gas constant (Rg) = ', format(Rg));
+	console.log('P = ' + format(P));
+	console.log('T = ' + format(T));
+	console.log('v = Rg * T / P = ' + format(math.to(v, 'L/mol'))); // 23.910... L / mol
+	console.log();
+	
+	console.log('compute speed of fluid flowing out of hole in a container');
+	var g = math.unit('9.81 m / s^2');
+	var h = math.unit('1 m');
+	var v2 = math.pow(math.multiply(2, math.multiply(g, h)), 0.5); // Can also use math.sqrt
+	console.log('g = ' + format(g));
+	console.log('h = ' + format(h));
+	console.log('v = (2 g h) ^ 0.5 = ' + format(v2)); // 4.429... m / s
+	console.log();
+	
+	console.log('electrical power consumption:');
+	var expr = '460 V * 20 A * 30 days to kWh';
+	console.log(expr + ' = ' + math.eval(expr));  // 6624 kWh
+	console.log();
+	
+	console.log('circuit design:');
+	var expr = '24 V / (6 mA)';
+	console.log(expr + ' = ' + math.eval(expr));  // 4 kohm
+	console.log();
+	
+	console.log('operations on arrays:');
+	var B = math.eval('[1, 0, 0] T');
+	var v3 = math.eval('[0, 1, 0] m/s');
+	var q = math.eval('1 C');
+	var F = math.multiply(q, math.cross(v3, B));
+	console.log('B (magnetic field strength) = ' + format(B)); // [1 T, 0 T, 0 T]
+	console.log('v (particle velocity) = ' + format(v3));       // [0 m / s, 1 m / s, 0 m / s]
+	console.log('q (particle charge) = ' + format(q));         // 1 C
+	console.log('F (force) = q (v cross B) = ' + format(F));   // [0 N, 0 N, -1 N]
+	
+	/**
+	* Helper function to format an output a value.
+	* @param {*} value
+	* @return {string} Returns the formatted value
+	*/
+	function format (value: any): string {
+		var precision = 14;
+		return math.format(value, precision);
+	}
+}());
\ No newline at end of file
diff --git a/mathjs/mathjs.d.ts b/mathjs/mathjs.d.ts
new file mode 100644
index 000000000..e6fa6a877
--- /dev/null
+++ b/mathjs/mathjs.d.ts
@@ -0,0 +1,2138 @@
+// Type definitions for mathjs
+// Project: http://mathjs.org/
+// Definitions by: Ilya Shestakov <https://github.com/siavol/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare var math: mathjs.IMathJsStatic;
+
+declare module mathjs {
+	
+	type MathArray = number[]|number[][];
+	type MathType = number|BigNumber|Fraction|Complex|Unit|MathArray|Matrix;
+	type MathExpression = string|string[]|MathArray|Matrix;
+	
+	export interface IMathJsStatic {
+		
+		e: number;
+		pi: number;
+		uninitialized: any;
+		
+		config(options: any): void;
+		
+		/**
+		 * Solves the linear equation system by forwards substitution. Matrix must be a lower triangular matrix.
+		 * @param L A N x N matrix or array (L)
+		 * @param b A column vector with the b values
+		 * @returns A column vector with the linear system solution (x)
+		 */
+		lsolve(L: Matrix|MathArray, b: Matrix|MathArray): Matrix|MathArray;
+		
+		/**
+		 * Calculate the Matrix LU decomposition with partial pivoting. Matrix A is decomposed in two matrices (L, U) 
+		 * and a row permutation vector p where A[p,:] = L * U
+		 * @param A A two dimensional matrix or array for which to get the LUP decomposition.
+		 * @returns The lower triangular matrix, the upper triangular matrix and the permutation matrix.
+		 */
+		lup(A?: Matrix|MathArray): MathArray;
+		
+		/**
+		 * Solves the linear system A * x = b where A is an [n x n] matrix and b is a [n] column vector.
+		 * @param A Invertible Matrix or the Matrix LU decomposition
+		 * @param b Column Vector
+		 * @returns Column vector with the solution to the linear system A * x = b
+		 */
+		lusolve(A: Matrix|MathArray|Number, b: Matrix|MathArray): Matrix|MathArray;
+		
+		/**
+		 * Calculate the Sparse Matrix LU decomposition with full pivoting. Sparse Matrix A is decomposed in 
+		 * two matrices (L, U) and two permutation vectors (pinv, q) where P * A * Q = L * U
+		 * @param A A two dimensional sparse matrix for which to get the LU decomposition.
+		 * @param order The Symbolic Ordering and Analysis order: 0 - Natural ordering, no permutation vector q is 
+		 * returned 1 - Matrix must be square, symbolic ordering and analisis is performed on M = A + A' 2 - Symbolic 
+		 * ordering and analisis is performed on M = A' * A. Dense columns from A' are dropped, A recreated from A'. 
+		 * This is appropriatefor LU factorization of unsymmetric matrices. 3 - Symbolic ordering and analisis is performed 
+		 * on M = A' * A. This is best used for LU factorization is matrix M has no dense rows. A dense row is a row with 
+		 * more than 10*sqr(columns) entries.
+		 * @param threshold Partial pivoting threshold (1 for partial pivoting)
+		 * @returns The lower triangular matrix, the upper triangular matrix and the permutation vectors.
+		 */
+		slu(A: Matrix, order: Number, threshold: Number): any;
+		
+		/**
+		 * Solves the linear equation system by backward substitution. Matrix must be an upper triangular matrix. U * x = b
+		 * @param U A N x N matrix or array (U)
+		 * @param b A column vector with the b values
+		 * @returns A column vector with the linear system solution (x)
+		 */
+		usolve(U: Matrix|MathArray, b:Matrix|MathArray): Matrix|MathArray;
+		
+		/**
+		 * Calculate the absolute value of a number. For matrices, the function is evaluated element wise.
+		 * @param x A number or matrix for which to get the absolute value
+		 * @returns Absolute value of x
+		 */
+		abs(x: number): number;
+		abs(x: BigNumber): BigNumber;
+		abs(x: Fraction): Fraction;
+		abs(x: Complex): Complex;
+		abs(x: MathArray): MathArray;
+		abs(x: Matrix): Matrix;
+		abs(x: Unit): Unit;
+		
+		/**
+		 * Add two values, x + y. For matrices, the function is evaluated element wise.
+		 * @param x First value to add
+		 * @param y Second value to add
+		 * @returns Sum of x and y
+		 */
+		add(x: MathType, y: MathType): MathType;
+		
+		/**
+		 * Calculate the cubic root of a value. For matrices, the function is evaluated element wise.
+		 * @param x Value for which to calculate the cubic root.
+		 * @param allRoots Optional, false by default. Only applicable when x is a number or complex number. If true, all complex roots are returned, if false (default) the principal root is returned.
+		 * @returns Returns the cubic root of x
+		 */
+		cbrt(x: number, allRoots?: boolean): number;
+		cbrt(x: BigNumber, allRoots?: boolean): BigNumber;
+		cbrt(x: Fraction, allRoots?: boolean): Fraction;
+		cbrt(x: Complex, allRoots?: boolean): Complex;
+		cbrt(x: MathArray, allRoots?: boolean): MathArray;
+		cbrt(x: Matrix, allRoots?: boolean): Matrix;
+		cbrt(x: Unit, allRoots?: boolean): Unit;
+		
+		/**
+		 * Round a value towards plus infinity If x is complex, both real and imaginary part are rounded towards plus infinity. For matrices, the function is evaluated element wise.
+		 * @param x Number to be rounded
+		 * @returns Rounded value
+		 */
+		ceil(x: number): number;
+		ceil(x: BigNumber): BigNumber;
+		ceil(x: Fraction): Fraction;
+		ceil(x: Complex): Complex;
+		ceil(x: MathArray): MathArray;
+		ceil(x: Matrix): Matrix;
+		ceil(x: Unit): Unit;
+		
+		/** 
+		 * Compute the cube of a value, x * x * x. For matrices, the function is evaluated element wise.
+		 * @param x Number for which to calculate the cube
+		 * @returns Cube of x
+		 */
+		cube(x: number): number;
+		cube(x: BigNumber): BigNumber;
+		cube(x: Fraction): Fraction;
+		cube(x: Complex): Complex;
+		cube(x: MathArray): MathArray;
+		cube(x: Matrix): Matrix;
+		cube(x: Unit): Unit;
+		
+		/**
+		 * Divide two values, x / y. To divide matrices, x is multiplied with the inverse of y: x * inv(y).
+		 * @param x Numerator
+		 * @param y Denominator
+		 * @returns Quotient, x / y
+		 */
+		divide(x: Unit, y: Unit): Unit;
+		divide(x: number, y: number): number;
+		divide(x:MathType, y:MathType): MathType;
+		
+		/**
+		 * Divide two matrices element wise. The function accepts both matrices and scalar values.
+		 * @param x Numerator
+		 * @param y Denominator
+		 * @returns Quotient, x ./ y
+		 */
+		dotDivide(x: MathType, y: MathType): MathType;
+		
+		/**
+		 * Multiply two matrices element wise. The function accepts both matrices and scalar values.
+		 * @param x Left hand value
+		 * @param y Right hand value
+		 * @returns Multiplication of x and y
+		 */
+		dotMultiply(x: MathType, y: MathType): MathType;
+		
+		/** 
+		 * Calculates the power of x to y element wise.
+		 * @param x The base
+		 * @param y The exponent
+		 * @returns The value of x to the power y
+		 */
+		dotPow(x: MathType, y: MathType): MathType;
+		
+		/**
+		 * Calculate the exponent of a value. For matrices, the function is evaluated element wise.
+		 * @param x A number or matrix to exponentiate
+		 * #returns Exponent of x
+		 */
+		exp(x: number): number;
+		exp(x: BigNumber ): BigNumber ;
+		exp(x: Complex ): Complex ;
+		exp(x: MathArray ): MathArray ;
+		exp(x: Matrix): Matrix;
+
+		/** 
+		 * Round a value towards zero. For matrices, the function is evaluated element wise.
+		 * @param x Number to be rounded
+		 * @returns Rounded value
+		 */
+		fix(x: number): number;
+		fix(x: BigNumber ): BigNumber ;
+		fix(x: Fraction ): Fraction ;
+		fix(x: Complex ): Complex ;
+		fix(x: MathArray ): MathArray ;
+		fix(x: Matrix): Matrix;
+		
+		/**
+		 * Round a value towards minus infinity. For matrices, the function is evaluated element wise.
+		 * @param Number to be rounded
+		 * @returns Rounded value
+		 */
+		floor(x: number): number;
+		floor(x: BigNumber ): BigNumber ;
+		floor(x: Fraction ): Fraction ;
+		floor(x: Complex ): Complex ;
+		floor(x: MathArray ): MathArray ;
+		floor(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the greatest common divisor for two or more values or arrays. For matrices, the function is evaluated element wise.
+		 */
+		gcd(...args: number[]): number;
+		gcd(...args: BigNumber[]): BigNumber ;
+		gcd(...args: Fraction[]): Fraction ;
+		gcd(...args: MathArray[]): MathArray ;
+		gcd(...args: Matrix[]): Matrix;
+		
+		/**
+		 * Calculate the hypotenusa of a list with values. The hypotenusa is defined as:
+		 * hypot(a, b, c, ...) = sqrt(a^2 + b^2 + c^2 + ...)
+		 * For matrix input, the hypotenusa is calculated for all values in the matrix.
+		 */
+		hypot(...args: number[]): number;
+		hypot(...args: BigNumber[]): BigNumber;
+		
+		/**
+		 * Calculate the least common multiple for two or more values or arrays. lcm is defined as:
+		 * lcm(a, b) = abs(a * b) / gcd(a, b)
+		 * For matrices, the function is evaluated element wise.
+		 */
+		lcm(a: number, b: number): number;
+		lcm(a: BigNumber , b: BigNumber ): BigNumber ;
+		lcm(a: MathArray, b: MathArray): MathArray;
+		lcm(a: Matrix, b: Matrix): Matrix;
+		
+		/**
+		 * Calculate the logarithm of a value. For matrices, the function is evaluated element wise.
+		 * @param x Value for which to calculate the logarithm.
+		 * @param base Optional base for the logarithm. If not provided, the natural logarithm of x is calculated. Default value: e.
+		 */
+		log(x: number|BigNumber|Complex|MathArray|Matrix, base?: number|BigNumber|Complex): number|BigNumber|Complex|MathArray|Matrix;
+		
+		/**
+		 * Calculate the 10-base of a value. This is the same as calculating log(x, 10). For matrices, the function is evaluated element wise.
+		 * @param x Value for which to calculate the logarithm.
+		 */
+		log10(x: number): number;
+		log10(x: BigNumber): BigNumber;
+		log10(x: Complex): Complex;
+		log10(x: MathArray): MathArray;
+		log10(x: Matrix): Matrix;
+		
+		/**
+		 * Calculates the modulus, the remainder of an integer division. For matrices, the function is evaluated element wise.
+		 * The modulus is defined as:
+		 * x - y * floor(x / y)
+		 * See http://en.wikipedia.org/wiki/Modulo_operation.
+		 * @param x Dividend
+		 * @param y Divisor
+		 */
+		mod(x: number|BigNumber|Fraction|MathArray|Matrix, y: number|BigNumber|Fraction|MathArray|Matrix): number|BigNumber|Fraction|MathArray|Matrix;
+		
+		/**
+		 * Multiply two values, x * y. The result is squeezed. For matrices, the matrix product is calculated.
+		 */
+		multiply(x: MathArray|Matrix, y: MathArray|Matrix): Matrix;
+		multiply(x: MathArray|Matrix, y: MathType): Matrix;
+		multiply(x: Unit, y: Unit): Unit;
+		multiply(x: number, y: number): number;
+		multiply(x: MathType, y: MathType): MathType;
+		
+		/**
+		 * Calculate the norm of a number, vector or matrix. The second parameter p is optional. If not provided, it defaults to 2.
+		 * @param x Value for which to calculate the norm
+		 * @param p Vector space. Supported numbers include Infinity and -Infinity. Supported strings are: 'inf', '-inf', and 'fro' (The Frobenius norm) Default value: 2.
+		 * @returns the p-norm
+		 */
+		norm(x: number|BigNumber|Complex|MathArray|Matrix, p?: number|BigNumber|string): number|BigNumber;
+		
+		/**
+		 * Calculate the nth root of a value. The principal nth root of a positive real number A, is the positive real solution of the equation
+		 * x^root = A
+		 * For matrices, the function is evaluated element wise.
+		 * @param a Value for which to calculate the nth root
+		 * @param root The root. Default value: 2.
+		 */
+		nthRoot(a: number|BigNumber|MathArray|Matrix|Complex, root?: number|BigNumber): number|Complex|MathArray|Matrix;
+		
+		/**
+		 * Calculates the power of x to y, x ^ y. Matrix exponentiation is supported for square matrices x, and positive integer exponents y.
+		 * @param x The base
+		 * @param y The exponent
+		 */
+		pow(x: number|BigNumber|Complex|MathArray|Matrix, y: number|BigNumber|Complex): number|BigNumber|Complex|MathArray|Matrix;
+		
+		/**
+		 * Round a value towards the nearest integer. For matrices, the function is evaluated element wise.
+		 * @param x Number to be rounded
+		 * @param n Number of decimals Default value: 0.
+		 */
+		round(x: number|BigNumber|Fraction|Complex|MathArray|Matrix, n?: number|BigNumber|MathArray): number|BigNumber|Fraction|Complex|MathArray|Matrix;
+		
+		/**
+		 * Compute the sign of a value. The sign of a value x is:
+		 * 1 when x > 1
+		 * -1 when x < 0
+		 * 0 when x == 0
+		 * For matrices, the function is evaluated element wise.
+		 */
+		sign(x: number): number;
+		sign(x: BigNumber ): BigNumber;
+		sign(x: Fraction ): Fraction ;
+		sign(x: Complex ): Complex ;
+		sign(x: MathArray): MathArray;
+		sign(x: Matrix): Matrix;
+		sign(x: Unit): Unit;
+		
+		/**
+		 * Calculate the square root of a value. For matrices, the function is evaluated element wise.
+		 */
+		sqrt(x: number): number;
+		sqrt(x: BigNumber ): BigNumber;
+		sqrt(x: Complex ): Complex ;
+		sqrt(x: MathArray): MathArray;
+		sqrt(x: Matrix): Matrix;
+		sqrt(x: Unit): Unit;
+		
+		/**
+		 * Compute the square of a value, x * x. For matrices, the function is evaluated element wise.
+		 */
+		square(x: number): number;
+		square(x: BigNumber ): BigNumber;
+		square(x: Fraction ): Fraction ;
+		square(x: Complex ): Complex ;
+		square(x: MathArray): MathArray;
+		square(x: Matrix): Matrix;
+		square(x: Unit): Unit;
+		
+		/**
+		 * Subtract two values, x - y. For matrices, the function is evaluated element wise.
+		 */
+		subtract(x: MathType, y: MathType): MathType;
+		
+		/**
+		 * Inverse the sign of a value, apply a unary minus operation.
+		 * For matrices, the function is evaluated element wise. Boolean values and strings will be converted to a number. For complex numbers, both real and complex value are inverted.
+		 */
+		unaryMinus(x: number): number;
+		unaryMinus(x: BigNumber ): BigNumber;
+		unaryMinus(x: Fraction ): Fraction ;
+		unaryMinus(x: Complex ): Complex ;
+		unaryMinus(x: MathArray): MathArray;
+		unaryMinus(x: Matrix): Matrix;
+		unaryMinus(x: Unit): Unit;
+		
+		/**
+		 * Unary plus operation. Boolean values and strings will be converted to a number, numeric values will be returned as is.
+		 * For matrices, the function is evaluated element wise.
+		 */
+		unaryPlus(x: number): number;
+		unaryPlus(x: BigNumber ): BigNumber;
+		unaryPlus(x: Fraction ): Fraction ;
+		unaryPlus(x: string): string;
+		unaryPlus(x: Complex ): Complex ;
+		unaryPlus(x: MathArray): MathArray;
+		unaryPlus(x: Matrix): Matrix;
+		unaryPlus(x: Unit): Unit;
+		
+		/**
+		 * Calculate the extended greatest common divisor for two values. See http://en.wikipedia.org/wiki/Extended_Euclidean_algorithm.
+		 */
+		xgcd(a: number|BigNumber, b: number|BigNumber): MathArray;
+		
+		/**
+		 * Bitwise AND two values, x & y. For matrices, the function is evaluated element wise.
+		 */
+		bitAnd(x: number|BigNumber|MathArray|Matrix, y: number|BigNumber|MathArray|Matrix): number|BigNumber|MathArray|Matrix;
+		
+		/**
+		 * Bitwise NOT value, ~x. For matrices, the function is evaluated element wise. For units, the function is evaluated on the best prefix base.
+		 */
+		bitNot(x: number): number;
+		bitNot(x: BigNumber ): BigNumber ;
+		bitNot(x: MathArray): MathArray;
+		bitNot(x: Matrix): Matrix;
+		
+		/**
+		 * Bitwise OR two values, x | y. For matrices, the function is evaluated element wise. For units, the function is evaluated on the lowest print base.
+		 */
+		bitOr(x: number): number;
+		bitOr(x: BigNumber ): BigNumber ;
+		bitOr(x: MathArray): MathArray;
+		bitOr(x: Matrix): Matrix;
+		
+		/**
+		 * Bitwise XOR two values, x ^ y. For matrices, the function is evaluated element wise.
+		 */
+		bitXor(x: number|BigNumber|MathArray|Matrix, y: number|BigNumber|MathArray|Matrix): number|BigNumber|MathArray|Matrix;
+		
+		/**
+		 * Bitwise left logical shift of a value x by y number of bits, x << y. For matrices, the function is evaluated element wise. For units, the function is evaluated on the best prefix base.
+		 * @param x Value to be shifted
+		 * @param y Amount of shifts
+		 */
+		leftShift(x: number|BigNumber|MathArray|Matrix, y: number|BigNumber): number|BigNumber|MathArray|Matrix;
+		
+		/**
+		 * Bitwise right arithmetic shift of a value x by y number of bits, x >> y. For matrices, the function is evaluated element wise. For units, the function is evaluated on the best prefix base.
+		 * @param x Value to be shifted
+		 * @param y Amount of shifts
+		 */
+		rightArithShift(x: number|BigNumber|MathArray|Matrix, y: number|BigNumber): number|BigNumber|MathArray|Matrix;
+		
+		/**
+		 * Bitwise right logical shift of value x by y number of bits, x >>> y. For matrices, the function is evaluated element wise. For units, the function is evaluated on the best prefix base.
+		 * @param x Value to be shifted
+		 * @param y Amount of shifts
+		 */
+		rightLogShift(x: number|MathArray|Matrix, y: number): number|MathArray|Matrix;
+		
+		/**
+		 * The Bell Numbers count the number of partitions of a set. A partition is a pairwise disjoint subset of S whose union is S. bellNumbers only takes integer arguments. The following condition must be enforced: n >= 0
+		 * @param n Total number of objects in the set
+		 */
+		bellNumbers(n: Number): Number;
+		bellNumbers(n: BigNumber): BigNumber;
+		
+		/**
+		 * The Catalan Numbers enumerate combinatorial structures of many different types. catalan only takes integer arguments. The following condition must be enforced: n >= 0
+		 * @pararm n nth Catalan number
+		 */
+		catalan(n: Number): Number;
+		catalan(n: BigNumber): BigNumber;
+		
+		/**
+		 * The composition counts of n into k parts. Composition only takes integer arguments. The following condition must be enforced: k <= n.
+		 * @param n Total number of objects in the set
+		 * @param k Number of objects in the subset
+		 * @returns Returns the composition counts of n into k parts.
+		 */
+		composition(n: Number|BigNumber, k: Number|BigNumber): Number|BigNumber
+		
+		/**
+		 * The Stirling numbers of the second kind, counts the number of ways to partition a set of n labelled objects into k nonempty unlabelled subsets. stirlingS2 only takes integer arguments. The following condition must be enforced: k <= n.
+		 * If n = k or k = 1, then s(n,k) = 1
+		 * @param n Total number of objects in the set
+		 * @param k Number of objects in the subset
+		 */
+		stirlingS2(n: Number|BigNumber, k: Number|BigNumber): Number|BigNumber;
+		
+		/**
+		 * Compute the argument of a complex value. For a complex number a + bi, the argument is computed as atan2(b, a). For matrices, the function is evaluated element wise.
+		 * @param x A complex number or array with complex numbers
+		 */
+		arg(x: number): number;
+		arg(x: Complex): number;
+		arg(x: MathArray): MathArray;
+		arg(x: Matrix): Matrix;
+		
+		/**
+		 * Compute the complex conjugate of a complex value. If x = a+bi, the complex conjugate of x is a - bi. For matrices, the function is evaluated element wise.
+		 * @param x A complex number or array with complex numbers
+		 */
+		conj(x: number|BigNumber|Complex|MathArray|Matrix): number|BigNumber|Complex|MathArray|Matrix;
+		
+		/** 
+		 * Get the imaginary part of a complex number. For a complex number a + bi, the function returns b. 
+		 * For matrices, the function is evaluated element wise.
+		 */
+		im(x: number|BigNumber|Complex|MathArray|Matrix): number|BigNumber|MathArray|Matrix;
+
+		/**
+		 * Get the real part of a complex number. For a complex number a + bi, the function returns a.
+		 * For matrices, the function is evaluated element wise.
+		 */
+		re(x: number|BigNumber|Complex|MathArray|Matrix): number|BigNumber|MathArray|Matrix;
+		
+		/**
+		 * Create a BigNumber, which can store numbers with arbitrary precision. When a matrix is provided, all elements will be converted to BigNumber.
+		 */
+		bignumber(x?: number|string|MathArray|Matrix|boolean): BigNumber;
+		
+		/**
+		 * Create a boolean or convert a string or number to a boolean. In case of a number, true is returned for non-zero numbers, and false in case of zero. Strings can be 'true' or 'false', or can contain a number. When value is a matrix, all elements will be converted to boolean.
+		 */
+		boolean(x: string|number|boolean|MathArray|Matrix ): boolean|MathArray|Matrix;
+		
+		/**
+		 * Wrap any value in a chain, allowing to perform chained operations on the value.
+		 * All methods available in the math.js library can be called upon the chain, and then will be evaluated with the value itself as first argument. The chain can be closed by executing chain.done(), which returns the final value.
+		 * The chain has a number of special functions:
+		 * done() Finalize the chain and return the chain's value.
+		 * valueOf() The same as done()
+		 * toString() Executes math.format() onto the chain's value, returning a string representation of the value.
+		 */
+		chain(value?: any): IMathJsChain;
+		
+		/**
+		 * Create a complex value or convert a value to a complex value.
+		 */
+		complex(): Complex;
+		complex(re: number, im: number): Complex;
+		complex(complex: Complex): Complex;
+		complex(arg: string): Complex;
+		complex(array: MathArray): Complex;
+		complex(obj: IPolarCoordinates): Complex;
+		
+		/**
+		 * Create a fraction convert a value to a fraction.
+		 */
+		fraction(numerator: number|string|MathArray|Matrix, denominator?: number|string|MathArray|Matrix): Fraction|MathArray|Matrix;
+		
+		/**
+		 * Create an index. An Index can store ranges having start, step, and end for multiple dimensions. Matrix.get, Matrix.set, and math.subset accept an Index as input.
+		 */
+		index(...ranges: any[]): Index;
+		
+		/**
+		 * Create a Matrix. The function creates a new math.type.Matrix object from an Array. A Matrix has utility functions 
+		 * to manipulate the data in the matrix, like getting the size and getting or setting values in the matrix. Supported 
+		 * storage formats are 'dense' and 'sparse'.
+		 */
+		matrix(format?: string): Matrix;
+		matrix(data: MathArray|Matrix, format?: string, dataType?:string): Matrix;
+		
+		/**
+		 * Create a number or convert a string, boolean, or unit to a number. When value is a matrix, all elements will be converted to number.
+		 */
+		number(value?: string|number|boolean|MathArray|Matrix|Unit): number|MathArray|Matrix;
+		number(unit: Unit, valuelessUnit: Unit|string): number|MathArray|Matrix;
+		
+		/**
+		 * Create a Sparse Matrix. The function creates a new math.type.Matrix object from an Array. A Matrix has utility 
+		 * functions to manipulate the data in the matrix, like getting the size and getting or setting values in the matrix.
+		 * @param data A two dimensional array
+		 */
+		sparse(data?: MathArray|Matrix, dataType?:string): Matrix;
+		
+		/**
+		 * Create a string or convert any object into a string. Elements of Arrays and Matrices are processed element wise.
+		 * @param value A value to convert to a string
+		 */
+		string(value: any): string|MathArray|Matrix;
+		
+		/**
+		 * Create a unit. Depending on the passed arguments, the function will create and return a new math.type.Unit object. 
+		 * When a matrix is provided, all elements will be converted to units.
+		 */
+		unit(unit: string): Unit;
+		unit(value: number, unit: string): Unit;
+		
+		/**
+		 * Parse and compile an expression. Returns a an object with a function eval([scope]) to evaluate the compiled expression.
+		 */
+		compile(expr: MathExpression): EvalFunction;
+		compile(exprs: MathExpression[]): EvalFunction[];
+		
+		/**
+		 * Evaluate an expression.
+		 */
+		eval(expr: MathExpression, scope?: any): any;
+		eval(exprs: MathExpression[], scope?: any): any;
+		
+		/**
+		 * Retrieve help on a function or data type. Help files are retrieved from the documentation in math.expression.docs.
+		 */
+		help(search: any): Help;
+		
+		/**
+		 * Parse an expression. Returns a node tree, which can be evaluated by invoking node.eval();
+		 */
+		parse(expr: MathExpression, options?: any): MathNode;
+		parse(exprs: MathExpression[], options?: any): MathNode[];
+		
+		/**
+		 * Create a parser. The function creates a new math.expression.Parser object.
+		 */
+		parser(): Parser;
+		
+		/**
+		 * Calculates: The eucledian distance between two points in 2 and 3 dimensional spaces. Distance between point 
+		 * and a line in 2 and 3 dimensional spaces. Pairwise distance between a set of 2D or 3D points NOTE: When 
+		 * substituting coefficients of a line(a, b and c), use ax + by + c = 0 instead of ax + by = c For parametric 
+		 * equation of a 3D line, x0, y0, z0, a, b, c are from: (x−x0, y−y0, z−z0) = t(a, b, c)
+		 */
+		distance(x: MathArray|Matrix|any, y: MathArray|Matrix|any): Number | BigNumber;
+		
+		/**
+		 * Calculates the point of intersection of two lines in two or three dimensions and of a line and a plane in 
+		 * three dimensions. The inputs are in the form of arrays or 1 dimensional matrices. The line intersection functions 
+		 * return null if the lines do not meet.
+		 * Note: Fill the plane coefficients as x + y + z = c and not as x + y + z + c = 0.
+		 * @param w Co-ordinates of first end-point of first line
+		 * @param x Co-ordinates of second end-point of first line
+		 * @param y Co-ordinates of first end-point of second line OR Co-efficients of the plane's equation
+		 * @param z Co-ordinates of second end-point of second line OR null if the calculation is for line and plane
+		 * @returns Returns the point of intersection of lines/lines-planes
+		 */
+		intersect(w: MathArray|Matrix, x: MathArray|Matrix, y: MathArray|Matrix, z: MathArray|Matrix): MathArray;
+		
+		/**
+		 * Logical and. Test whether two values are both defined with a nonzero/nonempty value. For matrices, the function is evaluated element wise.
+		 */
+		and(x: number|BigNumber|Complex|Unit|MathArray|Matrix, y: number|BigNumber|Complex|Unit|MathArray|Matrix): boolean|MathArray|Matrix;
+		
+		/**
+		 * Logical not. Flips boolean value of a given parameter. For matrices, the function is evaluated element wise.
+		 */
+		not(x: number|BigNumber|Complex|Unit|MathArray|Matrix): boolean|MathArray|Matrix;
+		
+		/**
+		 * Logical or. Test if at least one value is defined with a nonzero/nonempty value. For matrices, the function is evaluated element wise.
+		 */
+		or(x: number|BigNumber|Complex|Unit|MathArray|Matrix, y: number|BigNumber|Complex|Unit|MathArray|Matrix): boolean|MathArray|Matrix;
+		
+		/**
+		 * Logical xor. Test whether one and only one value is defined with a nonzero/nonempty value. For matrices, the function is evaluated element wise.
+		 */
+		xor(x: number|BigNumber|Complex|Unit|MathArray|Matrix, y: number|BigNumber|Complex|Unit|MathArray|Matrix): boolean|MathArray|Matrix;
+		
+		/**
+		 * Concatenate two or more matrices.
+		 * dim: number is a zero-based dimension over which to concatenate the matrices. By default the last dimension of the matrices.
+		 */
+		concat(...args: (MathArray|Matrix|number)[]): MathArray|Matrix;
+		
+		/**
+		 * Calculate the cross product for two vectors in three dimensional space. The cross product of A = [a1, a2, a3] 
+		 * and B =[b1, b2, b3] is defined as:
+		 * cross(A, B) = [ a2 * b3 - a3 * b2, a3 * b1 - a1 * b3, a1 * b2 - a2 * b1 ]
+		 */
+		cross(x: MathArray|Matrix, y: MathArray|Matrix): Matrix;
+		
+		/**
+		 * Calculate the determinant of a matrix.
+		 */
+		det(x: MathArray|Matrix): number;
+		
+		/**
+		 * Create a diagonal matrix or retrieve the diagonal of a matrix.
+		 * When x is a vector, a matrix with vector x on the diagonal will be returned. When x is a two dimensional matrix, 
+		 * the matrixes kth diagonal will be returned
+		 * as vector. When k is positive, the values are placed on the super diagonal. When k is negative, the values are 
+		 * placed on the sub diagonal.
+		 * @param X A two dimensional matrix or a vector
+		 * @param k The diagonal where the vector will be filled in or retrieved. Default value: 0.
+		 * @param format The matrix storage format. Default value: 'dense'.
+		 */
+		diag(X: MathArray|Matrix, format?: string): Matrix;
+		diag(X: MathArray|Matrix, k: number|BigNumber, format?: string): Matrix;
+		
+		/**
+		 * Calculate the dot product of two vectors. The dot product of A = [a1, a2, a3, ..., an] and B = [b1, b2, b3, ..., bn] 
+		 * is defined as:
+		 * dot(A, B) = a1 * b1 + a2 * b2 + a3 * b3 + ... + an * bn
+		 */
+		dot(x: MathArray|Matrix, y: MathArray|Matrix): number;
+		
+		/**
+		 * Create a 2-dimensional identity matrix with size m x n or n x n. The matrix has ones on the diagonal and zeros elsewhere.
+		 */
+		eye(n: number, format?: string): Matrix;
+		eye(m: number, n: number, format?: string): Matrix;
+		eye(size: number[], format?: string): Matrix;
+		
+		/**
+		 * Flatten a multi dimensional matrix into a single dimensional matrix.
+		 */
+		flatten(x: MathArray|Matrix): MathArray|Matrix; 
+		
+		/**
+		 * Calculate the inverse of a square matrix.
+		 */
+		inv(x: number|Complex|MathArray|Matrix): number|Complex|MathArray|Matrix;
+		
+		/**
+		 * Create a matrix filled with ones. The created matrix can have one or multiple dimensions.
+		 */
+		ones(n: number, format?: string): MathArray|Matrix;
+		ones(m: number, n: number, format?: string): MathArray|Matrix;
+		ones(size: number[], format?: string): MathArray|Matrix;
+		
+		/**
+		 * Create an array from a range. By default, the range end is excluded. This can be customized by providing an extra parameter includeEnd.
+		 * @param str A string 'start:end' or 'start:step:end'
+		 * @param start Start of the range
+		 * @param end End of the range, excluded by default, included when parameter includeEnd=true
+		 * @param step Step size. Default value is 1.
+		 * @returns Parameters describing the ranges start, end, and optional step.
+		 */
+		range(str: string, includeEnd?: boolean): Matrix;
+		range(start: number|BigNumber, end:number|BigNumber, includeEnd?:boolean): Matrix;
+		range(start: number|BigNumber, end: number|BigNumber, step: number|BigNumber, includeEnd?:boolean): Matrix;
+		
+		/**
+		 * Resize a matrix
+		 * @param x Matrix to be resized
+		 * @param size One dimensional array with numbers
+		 * @param defaultValue Zero by default, except in case of a string, in that case defaultValue = ' ' Default value: 0.
+		 */
+		resize(x: MathArray|Matrix, size: MathArray|Matrix, defaultValue?: number|string): MathArray|Matrix;
+		
+		/**
+		 * Calculate the size of a matrix or scalar.
+		 */
+		size(x: boolean|number|Complex|Unit|string|MathArray|Matrix): MathArray|Matrix;
+		
+		/**
+		 * Squeeze a matrix, remove inner and outer singleton dimensions from a matrix.
+		 */
+		squeeze(x: MathArray|Matrix): Matrix|MathArray;
+		
+		/**
+		 * Get or set a subset of a matrix or string.
+		 * @param value An array, matrix, or string
+		 * @param index An index containing ranges for each dimension
+		 * @param replacement An array, matrix, or scalar. If provided, the subset is replaced with replacement. If not provided, the subset is returned
+		 * @param defaultValue Default value, filled in on new entries when the matrix is resized. If not provided, math.matrix elements will be left undefined. Default value: undefined.
+		 */
+		subset(value: MathArray|Matrix|string, index: Index, replacement?: any, defaultValue?: any): MathArray|Matrix|string;
+		
+		/**
+		 * Calculate the trace of a matrix: the sum of the elements on the main diagonal of a square matrix.
+		 */
+		trace(x: MathArray|Matrix): number;
+		
+		/**
+		 * Transpose a matrix. All values of the matrix are reflected over its main diagonal. Only two dimensional matrices are supported.
+		 */
+		transpose(x: MathArray|Matrix): MathArray|Matrix;
+		
+		/**
+		 * Create a matrix filled with zeros. The created matrix can have one or multiple dimensions.
+		 */
+		zeros(n: number, format?: string): MathArray|Matrix;
+		zeros(m: number, n: number, format?: string): MathArray|Matrix;
+		zeros(size: number[], format?: string): MathArray|Matrix;
+	
+		/**
+		 * Compute the number of ways of picking k unordered outcomes from n possibilities. 
+		 * Combinations only takes integer arguments. The following condition must be enforced: k <= n.
+		 */
+		combinations(n: number|BigNumber, k: number|BigNumber): number|BigNumber;
+		
+		/**
+		 * Create a distribution object with a set of random functions for given random distribution.
+		 * @param name Name of a distribution. Choose from 'uniform', 'normal'.
+		 */
+		distribution(name: string): Distribution;
+		
+		/**
+		 * Compute the factorial of a value
+		 * Factorial only supports an integer value as argument. For matrices, the function is evaluated element wise.
+		 */
+		factorial(n: number|BigNumber|MathArray|Matrix): number|BigNumber|MathArray|Matrix;
+		
+		/**
+		 * Compute the gamma function of a value using Lanczos approximation for small values, and an extended 
+		 * Stirling approximation for large values.
+		 * For matrices, the function is evaluated element wise.
+		 */
+		gamma(n: number|MathArray|Matrix): number|MathArray|Matrix;
+		
+		/**
+		 * Calculate the Kullback-Leibler (KL) divergence between two distributions
+		 */
+		kldivergence(x: MathArray|Matrix, y: MathArray|Matrix): number;
+		
+		/**
+		 * Multinomial Coefficients compute the number of ways of picking a1, a2, ..., ai unordered outcomes from n possibilities.
+		 * multinomial takes one array of integers as an argument. The following condition must be enforced: every ai <= 0
+		 */
+		multinomial(a: number[]|BigNumber[]): number|BigNumber;
+		
+		/**
+		 * Compute the number of ways of obtaining an ordered subset of k elements from a set of n elements.
+		 * Permutations only takes integer arguments. The following condition must be enforced: k <= n.
+		 * @param n The number of objects in total
+		 * @param k The number of objects in the subset
+		 */
+		permutations(n: number|BigNumber, k?:number|BigNumber): number|BigNumber;
+		
+		/**
+		 * Random pick a value from a one dimensional array. Array element is picked using a random function with uniform distribution.
+		 */
+		pickRandom(array: number[]): number;
+		
+		/**
+		 * Return a random number larger or equal to min and smaller than max using a uniform distribution.
+		 */
+		random(): number;
+		random(max: number): number;
+		random(min: number, max: number): number;
+		random(size: MathArray|Matrix, max?: number): MathArray|Matrix;
+		random(size: MathArray|Matrix, min:number, max: number): MathArray|Matrix;
+		
+		/**
+		 * Return a random integer number larger or equal to min and smaller than max using a uniform distribution.
+		 */
+		randomInt(max: number): number;
+		randomInt(min: number, max: number): number;
+		randomInt(size: MathArray|Matrix, max?: number): MathArray|Matrix;
+		randomInt(size: MathArray|Matrix, min:number, max: number): MathArray|Matrix;
+		
+		/**
+		 * Compare two values. Returns 1 when x > y, -1 when x < y, and 0 when x == y.
+		 * x and y are considered equal when the relative difference between x and y is smaller than the configured epsilon. 
+		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
+		 * For matrices, the function is evaluated element wise.
+		 */
+		compare(x: MathType, y: MathType): number|BigNumber|Fraction|MathArray|Matrix;
+		
+		/**
+		 * Test element wise whether two matrices are equal. The function accepts both matrices and scalar values.
+		 */
+		deepEqual(x: MathType, y: MathType): number|BigNumber|Fraction|Complex|Unit|MathArray|Matrix;
+		
+		/**
+		 * Test whether two values are equal.
+		 * 
+		 * The function tests whether the relative difference between x and y is smaller than the configured epsilon. 
+		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
+		 * 
+		 * For matrices, the function is evaluated element wise. In case of complex numbers, x.re must equal y.re, and x.im must equal y.im.
+		 * 
+		 * Values null and undefined are compared strictly, thus null is only equal to null and nothing else, and undefined is only equal to undefined and nothing else.
+		 */
+		equal(x: MathType, y: MathType): boolean|MathArray|Matrix;
+		
+		/**
+		 * Test whether value x is larger than y.
+		 * 
+		 * The function returns true when x is larger than y and the relative difference between x and y is larger than the configured epsilon. 
+		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
+		 * 
+		 * For matrices, the function is evaluated element wise.
+		 */
+		larger(x: MathType, y: MathType): boolean|MathArray|Matrix;
+		
+		/**
+		 * Test whether value x is larger or equal to y.
+		 * 
+		 * The function returns true when x is larger than y or the relative difference between x and y is smaller than the configured epsilon. 
+		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
+		 * 
+		 * For matrices, the function is evaluated element wise.
+		 */
+		largerEq(x: MathType, y: MathType): boolean|MathArray|Matrix;
+		
+		/**
+		 * Test whether value x is smaller than y.
+		 * 
+		 * The function returns true when x is smaller than y and the relative difference between x and y is smaller than the configured epsilon. 
+		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
+		 * 
+		 * For matrices, the function is evaluated element wise.
+		 */
+		smaller(x: MathType, y: MathType): boolean|MathArray|Matrix;
+		
+		/**
+		 * Test whether value x is smaller or equal to y.
+		 * 
+		 * The function returns true when x is smaller than y or the relative difference between x and y is smaller than the configured epsilon. 
+		 * The function cannot be used to compare values smaller than approximately 2.22e-16. For matrices, the function is evaluated element wise.
+		 */
+		smallerEq(x: MathType, y: MathType): boolean|MathArray|Matrix;
+		
+		/**
+		 * Test whether two values are unequal.
+		 * 
+		 * The function tests whether the relative difference between x and y is larger than the configured epsilon. The function cannot 
+		 * be used to compare values smaller than approximately 2.22e-16.
+		 * 
+		 * For matrices, the function is evaluated element wise. In case of complex numbers, x.re must unequal y.re, or x.im must unequal y.im.
+		 * 
+		 * Values null and undefined are compared strictly, thus null is unequal with everything except null, and undefined is unequal with 
+		 * everying except. undefined.
+		 */
+		unequal(x: MathType, y: MathType): boolean|MathArray|Matrix;
+		
+		/**
+		 * Compute the maximum value of a matrix or a list with values. In case of a multi dimensional array, the maximum of the flattened 
+		 * array will be calculated. When dim is provided, the maximum over the selected dimension will be calculated. Parameter dim is zero-based.
+		 */
+		max(...args: MathType[]): any;
+		max(A: MathArray|Matrix, dim?: number): any;
+		
+		/**
+		 * Compute the mean value of matrix or a list with values. In case of a multi dimensional array, the mean of the flattened array will be 
+		 * calculated. When dim is provided, the maximum over the selected dimension will be calculated. Parameter dim is zero-based.
+		 */
+		mean(...args: MathType[]): any;
+		mean(A: MathArray|Matrix, dim?: number): any;
+		
+		/**
+		 * Compute the median of a matrix or a list with values. The values are sorted and the middle value is returned. In case of an 
+		 * even number of values, the average of the two middle values is returned. Supported types of values are: Number, BigNumber, Unit
+		 * 
+		 * In case of a (multi dimensional) array or matrix, the median of all elements will be calculated.
+		 */
+		median(...args: MathType[]): any;
+		
+		/**
+		 * Compute the maximum value of a matrix or a list of values. In case of a multi dimensional array, the maximum of the flattened 
+		 * array will be calculated. When dim is provided, the maximum over the selected dimension will be calculated. Parameter dim is zero-based.
+		 */
+		min(...args: MathType[]): any;
+		min(A: MathArray|Matrix, dim?: number): any;
+		
+		/**
+		 * Computes the mode of a set of numbers or a list with values(numbers or characters). If there are more than one modes, it returns a list of those values.
+		 */
+		mode(...args: MathType[]): any;
+		
+		/**
+		 * Compute the product of a matrix or a list with values. In case of a (multi dimensional) array or matrix, the sum of all elements will be calculated.
+		 */
+		prod(...args: MathType[]): any;
+		
+		/**
+		 * Compute the prob order quantile of a matrix or a list with values. The sequence is sorted and the middle value is returned. 
+		 * Supported types of sequence values are: Number, BigNumber, Unit Supported types of probability are: Number, BigNumber
+		 * 
+		 * In case of a (multi dimensional) array or matrix, the prob order quantile of all elements will be calculated.
+		 */
+		quantileSeq(A: MathArray|Matrix, prob: Number|BigNumber|MathArray, sorted?: boolean): Number|BigNumber|Unit|MathArray;
+		
+		/**
+		 * Compute the standard deviation of a matrix or a list with values. The standard deviations is defined as the square root of the 
+		 * variance: std(A) = sqrt(var(A)). In case of a (multi dimensional) array or matrix, the standard deviation over all elements will 
+		 * be calculated.
+		 * 
+		 * Optionally, the type of normalization can be specified as second parameter. The parameter normalization can be one of the following 
+		 * values:
+		 * 
+		 * 'unbiased' (default) The sum of squared errors is divided by (n - 1)
+		 * 'uncorrected' The sum of squared errors is divided by n
+		 * 'biased' The sum of squared errors is divided by (n + 1)
+		 */
+		std(array: MathArray|Matrix, normalization?: string): number;
+		
+		/**
+		 * Compute the sum of a matrix or a list with values. In case of a (multi dimensional) array or matrix, the sum of all elements will be calculated.
+		 */
+		sum(...args: (Number|BigNumber|Fraction)[]): any;
+		sum(array: MathArray|Matrix): any;
+		
+		/**
+		 * Compute the variance of a matrix or a list with values. In case of a (multi dimensional) array or matrix, the variance over all 
+		 * elements will be calculated.
+		 * 
+		 * Optionally, the type of normalization can be specified as second parameter. The parameter normalization can be one of the 
+		 * following values:
+		 * 
+		 * 'unbiased' (default) The sum of squared errors is divided by (n - 1)
+		 * 'uncorrected' The sum of squared errors is divided by n
+		 * 'biased' The sum of squared errors is divided by (n + 1)
+		 * Note that older browser may not like the variable name var. In that case, the function can be called as math['var'](...) 
+		 * instead of math.var(...).
+		 */
+		var(...args: (Number|BigNumber|Fraction)[]): any;
+		var(array: MathArray|Matrix, normalization?: string): any;
+		
+		/**
+		 * Calculate the inverse cosine of a value. For matrices, the function is evaluated element wise.
+		 */
+		acos(x: number): number;
+		acos(x: BigNumber): BigNumber;
+		acos(x: Complex): Complex;
+		acos(x: MathArray): MathArray;
+		acos(x: Matrix): Matrix;
+
+		/**
+		 * Calculate the hyperbolic arccos of a value, defined as acosh(x) = ln(sqrt(x^2 - 1) + x).
+		 * For matrices, the function is evaluated element wise.
+		 */
+		acosh(x: number): number;
+		acosh(x: BigNumber): BigNumber;
+		acosh(x: Complex): Complex;
+		acosh(x: MathArray): MathArray;
+		acosh(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the inverse cotangent of a value. For matrices, the function is evaluated element wise.
+		 */
+		acot(x: number): number;
+		acot(x: BigNumber): BigNumber;
+		acot(x: MathArray): MathArray;
+		acot(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the hyperbolic arccotangent of a value, defined as acoth(x) = (ln((x+1)/x) + ln(x/(x-1))) / 2.
+		 * For matrices, the function is evaluated element wise.
+		 */
+		acoth(x: number): number;
+		acoth(x: BigNumber): BigNumber;
+		acoth(x: MathArray): MathArray;
+		acoth(x: Matrix): Matrix;
+
+		/**
+		 * Calculate the inverse cosecant of a value. For matrices, the function is evaluated element wise.
+		 */
+		acsc(x: number): number;
+		acsc(x: BigNumber): BigNumber;
+		acsc(x: MathArray): MathArray;
+		acsc(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the hyperbolic arccosecant of a value, defined as acsch(x) = ln(1/x + sqrt(1/x^2 + 1)).
+		 * For matrices, the function is evaluated element wise.
+		 */
+		acsch(x: number): number;
+		acsch(x: BigNumber): BigNumber;
+		acsch(x: MathArray): MathArray;
+		acsch(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the inverse secant of a value. For matrices, the function is evaluated element wise.
+		 */
+		asec(x: number): number;
+		asec(x: BigNumber): BigNumber;
+		asec(x: MathArray): MathArray;
+		asec(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the hyperbolic arcsecant of a value, defined as asech(x) = ln(sqrt(1/x^2 - 1) + 1/x). For matrices, the function is evaluated element wise.
+		 */
+		asech(x: number): number;
+		asech(x: BigNumber): BigNumber;
+		asech(x: MathArray): MathArray;
+		asech(x: Matrix): Matrix;
+		
+		/** 
+		 * Calculate the inverse sine of a value. For matrices, the function is evaluated element wise.
+		 */
+		asin(x: number): number;
+		asin(x: BigNumber): BigNumber;
+		asin(x: Complex): Complex;
+		asin(x: MathArray): MathArray;
+		asin(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the hyperbolic arcsine of a value, defined as asinh(x) = ln(x + sqrt(x^2 + 1)). For matrices, the function is evaluated element wise.
+		 */
+		asinh(x: number): number;
+		asinh(x: BigNumber): BigNumber;
+		asinh(x: MathArray): MathArray;
+		asinh(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the inverse tangent of a value. For matrices, the function is evaluated element wise.
+		 */
+		atan(x: number): number;
+		atan(x: BigNumber): BigNumber;
+		atan(x: MathArray): MathArray;
+		atan(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the inverse tangent function with two arguments, y/x. By providing two arguments, the right quadrant of the 
+		 * computed angle can be determined.
+		 * 
+		 * For matrices, the function is evaluated element wise.
+		 */
+		atan2(y: number, x: number): number;
+		atan2(y: MathArray|Matrix, x: MathArray|Matrix): MathArray|Matrix;
+		
+		/**
+		 * Calculate the hyperbolic arctangent of a value, defined as atanh(x) = ln((1 + x)/(1 - x)) / 2.
+		 * For matrices, the function is evaluated element wise.
+		 */
+		atanh(x: number): number;
+		atanh(x: BigNumber): BigNumber;
+		atanh(x: MathArray): MathArray;
+		atanh(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the cosine of a value. For matrices, the function is evaluated element wise.
+		 */
+		asin(x: number): number;
+		asin(x: BigNumber): BigNumber;
+		asin(x: Complex): Complex;
+		asin(x: Unit): number;
+		asin(x: MathArray): MathArray;
+		asin(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the hyperbolic cosine of a value, defined as cosh(x) = 1/2 * (exp(x) + exp(-x)). For matrices, the function is evaluated element wise.
+		 */
+		cosh(x: number): number;
+		cosh(x: BigNumber): BigNumber;
+		cosh(x: Complex): Complex;
+		cosh(x: Unit): number;
+		cosh(x: MathArray): MathArray;
+		cosh(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the cotangent of a value. cot(x) is defined as 1 / tan(x). For matrices, the function is evaluated element wise.
+		 */
+		cot(x: number): number;
+		cot(x: Complex): Complex;
+		cot(x: Unit): number;
+		cot(x: MathArray): MathArray;
+		cot(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the hyperbolic cotangent of a value, defined as coth(x) = 1 / tanh(x). For matrices, the function is evaluated element wise.
+		 */
+		coth(x: number): number;
+		coth(x: Complex): Complex;
+		coth(x: Unit): number;
+		coth(x: MathArray): MathArray;
+		coth(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the cosecant of a value, defined as csc(x) = 1/sin(x). For matrices, the function is evaluated element wise.
+		 */
+		csc(x: number): number;
+		csc(x: Complex): Complex;
+		csc(x: Unit): number;
+		csc(x: MathArray): MathArray;
+		csc(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the hyperbolic cosecant of a value, defined as csch(x) = 1 / sinh(x). For matrices, the function is evaluated element wise.
+		 */
+		csch(x: number): number;
+		csch(x: Complex): Complex;
+		csch(x: Unit): number;
+		csch(x: MathArray): MathArray;
+		csch(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the secant of a value, defined as sec(x) = 1/cos(x). For matrices, the function is evaluated element wise.
+		 */
+		sec(x: number): number;
+		sec(x: Complex): Complex;
+		sec(x: Unit): number;
+		sec(x: MathArray): MathArray;
+		sec(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the hyperbolic secant of a value, defined as sech(x) = 1 / cosh(x). For matrices, the function is evaluated element wise.
+		 */
+		sech(x: number): number;
+		sech(x: Complex): Complex;
+		sech(x: Unit): number;
+		sech(x: MathArray): MathArray;
+		sech(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the sine of a value. For matrices, the function is evaluated element wise.
+		 */
+		sin(x: number): number;
+		sin(x: BigNumber): BigNumber;
+		sin(x: Complex): Complex;
+		sin(x: Unit): number;
+		sin(x: MathArray): MathArray;
+		sin(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the hyperbolic sine of a value, defined as sinh(x) = 1/2 * (exp(x) - exp(-x)). For matrices, the function is evaluated element wise.
+		 */
+		sinh(x: number): number;
+		sinh(x: BigNumber): BigNumber;
+		sinh(x: Complex): Complex;
+		sinh(x: Unit): number;
+		sinh(x: MathArray): MathArray;
+		sinh(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the tangent of a value. tan(x) is equal to sin(x) / cos(x). For matrices, the function is evaluated element wise.
+		 */
+		tan(x: number): number;
+		tan(x: BigNumber): BigNumber;
+		tan(x: Complex): Complex;
+		tan(x: Unit): number;
+		tan(x: MathArray): MathArray;
+		tan(x: Matrix): Matrix;
+		
+		/**
+		 * Calculate the hyperbolic tangent of a value, defined as tanh(x) = (exp(2 * x) - 1) / (exp(2 * x) + 1). For matrices, the function is evaluated element wise.
+		 */
+		tanh(x: number): number;
+		tanh(x: BigNumber): BigNumber;
+		tanh(x: Complex): Complex;
+		tanh(x: Unit): number;
+		tanh(x: MathArray): MathArray;
+		tanh(x: Matrix): Matrix;
+		
+		/**
+		 * Change the unit of a value. For matrices, the function is evaluated element wise.
+		 * @param x The unit to be converted.
+		 * @param unit New unit. Can be a string like "cm" or a unit without value.
+		 */
+		to(x: Unit|MathArray|Matrix, unit: Unit|string): Unit|MathArray|Matrix
+		
+		/**
+		 * Clone an object.
+		 */
+		clone(x: any): any;
+		
+		/**
+		 * Filter the items in an array or one dimensional matrix.
+		 * @param x A one dimensional matrix or array to filter
+		 * @param test 
+		 */
+		filter(x: MathArray|Matrix, test: RegExp|((item: any)=>boolean)): MathArray|Matrix;
+		
+		/**
+		 * Iterate over all elements of a matrix/array, and executes the given callback function.
+		 * @param x The matrix to iterate on.
+		 * @param callback The callback function is invoked with three parameters: the value of the element, the index of the element, and the Matrix/array being traversed.
+		 */
+		forEach(x: MathArray|Matrix, callback: (item: any)=>any): void;
+		
+		/**
+		 * Format a value of any type into a string.
+		 * @param value The value to be formatted
+		 */
+		format(value: any, options?: IFormatOptions|number|((item: any)=>string)): string;
+		
+		/**
+		 * Test whether a value is an integer number. The function supports number, BigNumber, and Fraction. 
+		 * The function is evaluated element-wise in case of Array or Matrix input.
+		 */
+		isInteger(x: any): boolean;
+		
+		/**
+		 * Test whether a value is negative: smaller than zero. The function supports types number, BigNumber, Fraction, and Unit.
+		 * The function is evaluated element-wise in case of Array or Matrix input.
+		 */
+		isNegative(x: any): boolean;
+		
+		/**
+		 * Test whether a value is an numeric value. The function is evaluated element-wise in case of Array or Matrix input.
+		 */
+		isNumeric(x: any): boolean;
+		
+		/**
+		 * Test whether a value is positive: larger than zero. The function supports types number, BigNumber, Fraction, and Unit.
+		 * The function is evaluated element-wise in case of Array or Matrix input.
+		 */
+		isPositive(x: any): boolean;
+		
+		/**
+		 * Test whether a value is zero. The function can check for zero for types number, BigNumber, Fraction, Complex, and Unit.
+		 * The function is evaluated element-wise in case of Array or Matrix input.
+		 */
+		isZero(x: any): boolean;
+		
+		/**
+		 * Create a new matrix or array with the results of the callback function executed on each entry of the matrix/array.
+		 * @param x The matrix to iterate on.
+		 * @param callback The callback method is invoked with three parameters: the value of the element, the index of the element, and the matrix being traversed.
+		 */
+		map(x: MathArray|Matrix, callback: (item: any)=>any): MathArray|Matrix;
+		
+		/**
+		 * Partition-based selection of an array or 1D matrix. Will find the kth smallest value, and mutates the input array. Uses Quickselect.
+		 * @param x A one dimensional matrix or array to sort
+		 * @param k The kth smallest value to be retrieved; zero-based index
+		 * @param compare  An optional comparator function. The function is called as compare(a, b), and must return 1 when a > b, -1 when a < b, and 0 when a == b. Default value: 'asc'.
+		 * @returns Returns the kth lowest value.
+		 */
+		partitionSelect(x: MathArray|Matrix, k: number, compare?: string|((a: any, b: any)=>number)): any;
+		
+		/**
+		 * Interpolate values into a string template.
+		 * @param template A string containing variable placeholders.
+		 * @param values An object containing variables which will be filled in in the template.
+		 * @param precision Number of digits to format numbers. If not provided, the value will not be rounded.
+		 */
+		print(template:string, values: any, precision?: number): void;
+		
+		/**
+		 * Sort the items in a matrix.
+		 * @param x A one dimensional matrix or array to sort
+		 * @param compare  An optional comparator function. The function is called as compare(a, b), and must return 1 when a > b, -1 when a < b, and 0 when a == b. Default value: 'asc'.
+		 */
+		sort(x: MathArray|Matrix, compare?: string|((a: any, b: any)=>number)): MathArray|Matrix;
+		
+		/**
+		 * Determine the type of a variable.
+		 */
+		typeof(x: any): string;
+	}
+	
+	export interface Matrix {
+		size(): number[];
+		subset(index: Index, replacement?: any, defaultValue?: any): Matrix;
+		resize(size: MathArray|Matrix, defaultValue?: number|string): Matrix;
+		clone(): Matrix;
+	}
+	
+	export interface BigNumber {
+		
+	}
+	
+	export interface Fraction {
+		
+	}
+	
+	export interface Complex {
+		re: number;
+		im: number;
+		toPolar(): IPolarCoordinates;
+		clone(): Complex;
+	}
+	
+	export interface IPolarCoordinates {
+		r: number; 
+		phi: number;
+	} 
+	
+	export interface Unit {
+		to(unit: string): Unit;
+		toNumber(unit: string): number;
+	}
+	
+	export interface Index {
+		
+	}
+	
+	export interface EvalFunction {
+		eval(scope?: any): any;
+	}
+	
+	export interface MathNode {
+		compile(): EvalFunction;
+		eval(): any;
+	}
+	
+	export interface Parser {
+		eval(expr: string): any;
+		get(variable: string): any;
+		set(variable: string, value: any): void;
+		clear(): void;
+	}
+	
+	export interface Distribution {
+		random(size: any, min?: any, max?: any): any;
+		randomInt(min: any, max?: any): any;
+		pickRandom(array: any): any;
+	}
+	
+	export interface IFormatOptions {
+		/**
+		 * Number notation. Choose from:
+		 * 'fixed' Always use regular number notation. For example '123.40' and '14000000'
+		 * 'exponential' Always use exponential notation. For example '1.234e+2' and '1.4e+7'
+		 * 'auto' (default) Regular number notation for numbers having an absolute value between lower and upper bounds, and 
+		 * uses exponential notation elsewhere. Lower bound is included, upper bound is excluded. For example '123.4' and '1.4e7'.
+		 */
+		notation?: string;
+		
+		/**
+		 * A number between 0 and 16 to round the digits of the number. In case of notations 'exponential' and 'auto', 
+		 * precision defines the total number of significant digits returned and is undefined by default. In case of notation 'fixed', 
+		 * precision defines the number of significant digits after the decimal point, and is 0 by default.
+		 */
+		precision?: number;
+		
+		/**
+		 * An object containing two parameters, {number} lower and {number} upper, used by notation 'auto' to determine 
+		 * when to return exponential notation. Default values are lower=1e-3 and upper=1e5. Only applicable for notation auto.
+		 */
+		exponential?: {lower: number; upper: number};
+		
+		/**
+		 * Available values: 'ratio' (default) or 'decimal'. For example format(fraction(1, 3)) will output '1/3' when 'ratio' 
+		 * is configured, and will output 0.(3) when 'decimal' is configured.
+		 */
+		fraction?: string;
+		
+		/** 
+		 * A custom formatting function. Can be used to override the built-in notations. Function fn is called with 
+		 * value as parameter and must return a string. Is useful for example to format all values inside a matrix in a particular way. 
+		 * */
+		fn?: (item: any)=>string;
+	}
+	
+	export interface Help {
+		toString(): string;
+		toJSON(): string;
+	}	
+	
+	export interface IMathJsChain {		
+		/**
+		 * Solves the linear equation system by forwards substitution. Matrix must be a lower triangular matrix.
+		 * @param b A column vector with the b values
+		 */
+		lsolve(b: Matrix|MathArray): IMathJsChain;
+		
+		/**
+		 * Calculate the Matrix LU decomposition with partial pivoting. Matrix A is decomposed in two matrices (L, U) 
+		 * and a row permutation vector p where A[p,:] = L * U
+		 */
+		lup(): IMathJsChain;
+		
+		/**
+		 * Solves the linear system A * x = b where A is an [n x n] matrix and b is a [n] column vector.
+		 * @param b Column Vector
+		 */
+		lusolve(b: Matrix|MathArray): IMathJsChain;
+		
+		/**
+		 * Calculate the Sparse Matrix LU decomposition with full pivoting. Sparse Matrix A is decomposed in 
+		 * two matrices (L, U) and two permutation vectors (pinv, q) where P * A * Q = L * U
+		 * @param order The Symbolic Ordering and Analysis order: 0 - Natural ordering, no permutation vector q is 
+		 * returned 1 - Matrix must be square, symbolic ordering and analisis is performed on M = A + A' 2 - Symbolic 
+		 * ordering and analisis is performed on M = A' * A. Dense columns from A' are dropped, A recreated from A'. 
+		 * This is appropriatefor LU factorization of unsymmetric matrices. 3 - Symbolic ordering and analisis is performed 
+		 * on M = A' * A. This is best used for LU factorization is matrix M has no dense rows. A dense row is a row with 
+		 * more than 10*sqr(columns) entries.
+		 * @param threshold Partial pivoting threshold (1 for partial pivoting)
+		 * @returns The lower triangular matrix, the upper triangular matrix and the permutation vectors.
+		 */
+		slu(order: Number, threshold: Number): IMathJsChain;
+		
+		/**
+		 * Solves the linear equation system by backward substitution. Matrix must be an upper triangular matrix. U * x = b
+		 * @param b A column vector with the b values
+		 * @returns A column vector with the linear system solution (x)
+		 */
+		usolve(b:Matrix|MathArray): IMathJsChain;
+		
+		/**
+		 * Calculate the absolute value of a number. For matrices, the function is evaluated element wise.
+		 */
+		abs(): IMathJsChain;
+		
+		/**
+		 * Add two values, x + y. For matrices, the function is evaluated element wise.
+		 * @param y Second value to add
+		 */
+		add(y: MathType): IMathJsChain;
+		
+		/**
+		 * Calculate the cubic root of a value. For matrices, the function is evaluated element wise.
+		 * @param allRoots Optional, false by default. Only applicable when x is a number or complex number. If true, all complex roots are returned, if false (default) the principal root is returned.
+		 */
+		cbrt(allRoots?: boolean): IMathJsChain;
+		
+		/**
+		 * Round a value towards plus infinity If x is complex, both real and imaginary part are rounded towards plus infinity. For matrices, the function is evaluated element wise.
+		 */
+		ceil(): IMathJsChain;
+		
+		/** 
+		 * Compute the cube of a value, x * x * x. For matrices, the function is evaluated element wise.
+		 */
+		cube(): IMathJsChain;
+		
+		/**
+		 * Divide two values, x / y. To divide matrices, x is multiplied with the inverse of y: x * inv(y).
+		 * @param y Denominator
+		 */
+		divide(y:MathType): IMathJsChain;
+		
+		/**
+		 * Divide two matrices element wise. The function accepts both matrices and scalar values.
+		 * @param y Denominator
+		 */
+		dotDivide(y: MathType): IMathJsChain;
+		
+		/**
+		 * Multiply two matrices element wise. The function accepts both matrices and scalar values.
+		 * @param y Right hand value
+		 */
+		dotMultiply(y: MathType): IMathJsChain;
+		
+		/** 
+		 * Calculates the power of x to y element wise.
+		 * @param y The exponent
+		 */
+		dotPow(y: MathType): IMathJsChain;
+		
+		/**
+		 * Calculate the exponent of a value. For matrices, the function is evaluated element wise.
+		 */
+		exp(): IMathJsChain;
+
+		/** 
+		 * Round a value towards zero. For matrices, the function is evaluated element wise.
+		 */
+		fix(): IMathJsChain;
+		
+		/**
+		 * Round a value towards minus infinity. For matrices, the function is evaluated element wise.
+		 */
+		floor(): IMathJsChain;
+		
+		/**
+		 * Calculate the greatest common divisor for two or more values or arrays. For matrices, the function is evaluated element wise.
+		 */
+		gcd(...args: number[]): IMathJsChain;
+		gcd(...args: BigNumber[]): IMathJsChain ;
+		gcd(...args: Fraction[]): IMathJsChain ;
+		gcd(...args: MathArray[]): IMathJsChain ;
+		gcd(...args: Matrix[]): IMathJsChain;
+		
+		/**
+		 * Calculate the hypotenusa of a list with values. The hypotenusa is defined as:
+		 * hypot(a, b, c, ...) = sqrt(a^2 + b^2 + c^2 + ...)
+		 * For matrix input, the hypotenusa is calculated for all values in the matrix.
+		 */
+		hypot(...args: number[]): IMathJsChain;
+		hypot(...args: BigNumber[]): IMathJsChain;
+		
+		/**
+		 * Calculate the least common multiple for two or more values or arrays. lcm is defined as:
+		 * lcm(a, b) = abs(a * b) / gcd(a, b)
+		 * For matrices, the function is evaluated element wise.
+		 */
+		lcm(b: number): IMathJsChain;
+		lcm(b: BigNumber ): IMathJsChain ;
+		lcm(b: MathArray): IMathJsChain;
+		lcm(b: Matrix): IMathJsChain;
+		
+		/**
+		 * Calculate the logarithm of a value. For matrices, the function is evaluated element wise.
+		 * @param base Optional base for the logarithm. If not provided, the natural logarithm of x is calculated. Default value: e.
+		 */
+		log(base?: number|BigNumber|Complex): IMathJsChain;
+		
+		/**
+		 * Calculate the 10-base of a value. This is the same as calculating log(x, 10). For matrices, the function is evaluated element wise.
+		 */
+		log10(): IMathJsChain;
+		
+		/**
+		 * Calculates the modulus, the remainder of an integer division. For matrices, the function is evaluated element wise.
+		 * The modulus is defined as:
+		 * x - y * floor(x / y)
+		 * See http://en.wikipedia.org/wiki/Modulo_operation.
+		 * @param y Divisor
+		 */
+		mod(y: number|BigNumber|Fraction|MathArray|Matrix): IMathJsChain;
+		
+		/**
+		 * Multiply two values, x * y. The result is squeezed. For matrices, the matrix product is calculated.
+		 */
+		multiply(y: MathType): IMathJsChain;
+		
+		/**
+		 * Calculate the norm of a number, vector or matrix. The second parameter p is optional. If not provided, it defaults to 2.
+		 * @param p Vector space. Supported numbers include Infinity and -Infinity. Supported strings are: 'inf', '-inf', and 'fro' (The Frobenius norm) Default value: 2.
+		 */
+		norm(p?: number|BigNumber|string): IMathJsChain;
+		
+		/**
+		 * Calculate the nth root of a value. The principal nth root of a positive real number A, is the positive real solution of the equation
+		 * x^root = A
+		 * For matrices, the function is evaluated element wise.
+		 * @param root The root. Default value: 2.
+		 */
+		nthRoot(root?: number|BigNumber): IMathJsChain;
+		
+		/**
+		 * Calculates the power of x to y, x ^ y. Matrix exponentiation is supported for square matrices x, and positive integer exponents y.
+		 * @param y The exponent
+		 */
+		pow(y: number|BigNumber|Complex): IMathJsChain;
+		
+		/**
+		 * Round a value towards the nearest integer. For matrices, the function is evaluated element wise.
+		 * @param n Number of decimals Default value: 0.
+		 */
+		round(n?: number|BigNumber|MathArray): IMathJsChain;
+		
+		/**
+		 * Compute the sign of a value. The sign of a value x is:
+		 * 1 when x > 1
+		 * -1 when x < 0
+		 * 0 when x == 0
+		 * For matrices, the function is evaluated element wise.
+		 */
+		sign(): IMathJsChain;
+		
+		/**
+		 * Calculate the square root of a value. For matrices, the function is evaluated element wise.
+		 */
+		sqrt(): IMathJsChain;
+		
+		/**
+		 * Compute the square of a value, x * x. For matrices, the function is evaluated element wise.
+		 */
+		square(): IMathJsChain;
+		
+		/**
+		 * Subtract two values, x - y. For matrices, the function is evaluated element wise.
+		 */
+		subtract(y: MathType): IMathJsChain;
+		
+		/**
+		 * Inverse the sign of a value, apply a unary minus operation.
+		 * For matrices, the function is evaluated element wise. Boolean values and strings will be converted to a number. For complex numbers, both real and complex value are inverted.
+		 */
+		unaryMinus(): IMathJsChain;
+		
+		/**
+		 * Unary plus operation. Boolean values and strings will be converted to a number, numeric values will be returned as is.
+		 * For matrices, the function is evaluated element wise.
+		 */
+		unaryPlus(): IMathJsChain;
+		
+		/**
+		 * Calculate the extended greatest common divisor for two values. See http://en.wikipedia.org/wiki/Extended_Euclidean_algorithm.
+		 */
+		xgcd(b: number|BigNumber): IMathJsChain;
+		
+		/**
+		 * Bitwise AND two values, x & y. For matrices, the function is evaluated element wise.
+		 */
+		bitAnd(y: number|BigNumber|MathArray|Matrix): IMathJsChain;
+		
+		/**
+		 * Bitwise NOT value, ~x. For matrices, the function is evaluated element wise. For units, the function is evaluated on the best prefix base.
+		 */
+		bitNot(): IMathJsChain;
+		
+		/**
+		 * Bitwise OR two values, x | y. For matrices, the function is evaluated element wise. For units, the function is evaluated on the lowest print base.
+		 */
+		bitOr(): IMathJsChain;
+		
+		/**
+		 * Bitwise XOR two values, x ^ y. For matrices, the function is evaluated element wise.
+		 */
+		bitXor(y: number|BigNumber|MathArray|Matrix): IMathJsChain;
+		
+		/**
+		 * Bitwise left logical shift of a value x by y number of bits, x << y. For matrices, the function is evaluated element wise. For units, the function is evaluated on the best prefix base.
+		 * @param x Value to be shifted
+		 * @param y Amount of shifts
+		 */
+		leftShift(y: number|BigNumber): IMathJsChain;
+		
+		/**
+		 * Bitwise right arithmetic shift of a value x by y number of bits, x >> y. For matrices, the function is evaluated element wise. For units, the function is evaluated on the best prefix base.
+		 * @param x Value to be shifted
+		 * @param y Amount of shifts
+		 */
+		rightArithShift(y: number|BigNumber): IMathJsChain;
+		
+		/**
+		 * Bitwise right logical shift of value x by y number of bits, x >>> y. For matrices, the function is evaluated element wise. For units, the function is evaluated on the best prefix base.
+		 * @param x Value to be shifted
+		 * @param y Amount of shifts
+		 */
+		rightLogShift(y: number): IMathJsChain;
+		
+		/**
+		 * The Bell Numbers count the number of partitions of a set. A partition is a pairwise disjoint subset of S whose union is S. bellNumbers only takes integer arguments. The following condition must be enforced: n >= 0
+		 * @param n Total number of objects in the set
+		 */
+		bellNumbers(): IMathJsChain;
+		
+		/**
+		 * The Catalan Numbers enumerate combinatorial structures of many different types. catalan only takes integer arguments. The following condition must be enforced: n >= 0
+		 * @pararm n nth Catalan number
+		 */
+		catalan(): IMathJsChain;
+		
+		/**
+		 * The composition counts of n into k parts. Composition only takes integer arguments. The following condition must be enforced: k <= n.
+		 * @param n Total number of objects in the set
+		 * @param k Number of objects in the subset
+		 * @returns Returns the composition counts of n into k parts.
+		 */
+		composition(k: Number|BigNumber): IMathJsChain;
+		
+		/**
+		 * The Stirling numbers of the second kind, counts the number of ways to partition a set of n labelled objects into k nonempty unlabelled subsets. stirlingS2 only takes integer arguments. The following condition must be enforced: k <= n.
+		 * If n = k or k = 1, then s(n,k) = 1
+		 * @param n Total number of objects in the set
+		 * @param k Number of objects in the subset
+		 */
+		stirlingS2(k: Number|BigNumber): IMathJsChain;
+		
+		/**
+		 * Compute the argument of a complex value. For a complex number a + bi, the argument is computed as atan2(b, a). For matrices, the function is evaluated element wise.
+		 * @param x A complex number or array with complex numbers
+		 */
+		arg(): IMathJsChain;
+		
+		/**
+		 * Compute the complex conjugate of a complex value. If x = a+bi, the complex conjugate of x is a - bi. For matrices, the function is evaluated element wise.
+		 * @param x A complex number or array with complex numbers
+		 */
+		conj(): IMathJsChain;
+		
+		/** 
+		 * Get the imaginary part of a complex number. For a complex number a + bi, the function returns b. 
+		 * For matrices, the function is evaluated element wise.
+		 */
+		im(): IMathJsChain;
+
+		/**
+		 * Get the real part of a complex number. For a complex number a + bi, the function returns a.
+		 * For matrices, the function is evaluated element wise.
+		 */
+		re(): IMathJsChain;
+				
+		/**
+		 * Calculates: The eucledian distance between two points in 2 and 3 dimensional spaces. Distance between point 
+		 * and a line in 2 and 3 dimensional spaces. Pairwise distance between a set of 2D or 3D points NOTE: When 
+		 * substituting coefficients of a line(a, b and c), use ax + by + c = 0 instead of ax + by = c For parametric 
+		 * equation of a 3D line, x0, y0, z0, a, b, c are from: (x−x0, y−y0, z−z0) = t(a, b, c)
+		 */
+		distance(y: MathArray|Matrix|any): IMathJsChain;
+		
+		/**
+		 * Calculates the point of intersection of two lines in two or three dimensions and of a line and a plane in 
+		 * three dimensions. The inputs are in the form of arrays or 1 dimensional matrices. The line intersection functions 
+		 * return null if the lines do not meet.
+		 * Note: Fill the plane coefficients as x + y + z = c and not as x + y + z + c = 0.
+		 * @param w Co-ordinates of first end-point of first line
+		 * @param x Co-ordinates of second end-point of first line
+		 * @param y Co-ordinates of first end-point of second line OR Co-efficients of the plane's equation
+		 * @param z Co-ordinates of second end-point of second line OR null if the calculation is for line and plane
+		 * @returns Returns the point of intersection of lines/lines-planes
+		 */
+		intersect(x: MathArray|Matrix, y: MathArray|Matrix, z: MathArray|Matrix): IMathJsChain;
+		
+		/**
+		 * Logical and. Test whether two values are both defined with a nonzero/nonempty value. For matrices, the function is evaluated element wise.
+		 */
+		and(y: number|BigNumber|Complex|Unit|MathArray|Matrix): IMathJsChain;
+		
+		/**
+		 * Logical not. Flips boolean value of a given parameter. For matrices, the function is evaluated element wise.
+		 */
+		not(): IMathJsChain;
+		
+		/**
+		 * Logical or. Test if at least one value is defined with a nonzero/nonempty value. For matrices, the function is evaluated element wise.
+		 */
+		or(y: number|BigNumber|Complex|Unit|MathArray|Matrix): IMathJsChain;
+		
+		/**
+		 * Logical xor. Test whether one and only one value is defined with a nonzero/nonempty value. For matrices, the function is evaluated element wise.
+		 */
+		xor(y: number|BigNumber|Complex|Unit|MathArray|Matrix): IMathJsChain;
+				
+		/**
+		 * Calculate the cross product for two vectors in three dimensional space. The cross product of A = [a1, a2, a3] 
+		 * and B =[b1, b2, b3] is defined as:
+		 * cross(A, B) = [ a2 * b3 - a3 * b2, a3 * b1 - a1 * b3, a1 * b2 - a2 * b1 ]
+		 */
+		cross(y: MathArray|Matrix): IMathJsChain;
+		
+		/**
+		 * Calculate the determinant of a matrix.
+		 */
+		det(): IMathJsChain;
+				
+		/**
+		 * Resize a matrix
+		 * @param x Matrix to be resized
+		 * @param size One dimensional array with numbers
+		 * @param defaultValue Zero by default, except in case of a string, in that case defaultValue = ' ' Default value: 0.
+		 */
+		resize(size: MathArray|Matrix, defaultValue?: number|string): IMathJsChain;
+		
+		/**
+		 * Calculate the size of a matrix or scalar.
+		 */
+		size(): IMathJsChain;
+		
+		/**
+		 * Squeeze a matrix, remove inner and outer singleton dimensions from a matrix.
+		 */
+		squeeze(): IMathJsChain;
+		
+		/**
+		 * Get or set a subset of a matrix or string.
+		 * @param value An array, matrix, or string
+		 * @param index An index containing ranges for each dimension
+		 * @param replacement An array, matrix, or scalar. If provided, the subset is replaced with replacement. If not provided, the subset is returned
+		 * @param defaultValue Default value, filled in on new entries when the matrix is resized. If not provided, math.matrix elements will be left undefined. Default value: undefined.
+		 */
+		subset(index: Index, replacement?: any, defaultValue?: any): IMathJsChain;
+		
+		/**
+		 * Calculate the trace of a matrix: the sum of the elements on the main diagonal of a square matrix.
+		 */
+		trace(): IMathJsChain;
+		
+		/**
+		 * Transpose a matrix. All values of the matrix are reflected over its main diagonal. Only two dimensional matrices are supported.
+		 */
+		transpose(): IMathJsChain;
+		
+		/**
+		 * Random pick a value from a one dimensional array. Array element is picked using a random function with uniform distribution.
+		 */
+		pickRandom(): IMathJsChain;
+		
+		/**
+		 * Return a random number larger or equal to min and smaller than max using a uniform distribution.
+		 */
+		random(): IMathJsChain;
+		random(max?: number): IMathJsChain;
+		random(min:number, max: number): IMathJsChain;
+		
+		/**
+		 * Return a random integer number larger or equal to min and smaller than max using a uniform distribution.
+		 */
+		randomInt(max?: number): IMathJsChain;
+		randomInt(min:number, max: number): IMathJsChain;
+		
+		/**
+		 * Compare two values. Returns 1 when x > y, -1 when x < y, and 0 when x == y.
+		 * x and y are considered equal when the relative difference between x and y is smaller than the configured epsilon. 
+		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
+		 * For matrices, the function is evaluated element wise.
+		 */
+		compare(y: MathType): IMathJsChain;
+		
+		/**
+		 * Test element wise whether two matrices are equal. The function accepts both matrices and scalar values.
+		 */
+		deepEqual(y: MathType): IMathJsChain;
+		
+		/**
+		 * Test whether two values are equal.
+		 * 
+		 * The function tests whether the relative difference between x and y is smaller than the configured epsilon. 
+		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
+		 * 
+		 * For matrices, the function is evaluated element wise. In case of complex numbers, x.re must equal y.re, and x.im must equal y.im.
+		 * 
+		 * Values null and undefined are compared strictly, thus null is only equal to null and nothing else, and undefined is only equal to undefined and nothing else.
+		 */
+		equal(y: MathType): IMathJsChain;
+		
+		/**
+		 * Test whether value x is larger than y.
+		 * 
+		 * The function returns true when x is larger than y and the relative difference between x and y is larger than the configured epsilon. 
+		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
+		 * 
+		 * For matrices, the function is evaluated element wise.
+		 */
+		larger(y: MathType): IMathJsChain;
+		
+		/**
+		 * Test whether value x is larger or equal to y.
+		 * 
+		 * The function returns true when x is larger than y or the relative difference between x and y is smaller than the configured epsilon. 
+		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
+		 * 
+		 * For matrices, the function is evaluated element wise.
+		 */
+		largerEq(y: MathType): IMathJsChain;
+		
+		/**
+		 * Test whether value x is smaller than y.
+		 * 
+		 * The function returns true when x is smaller than y and the relative difference between x and y is smaller than the configured epsilon. 
+		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
+		 * 
+		 * For matrices, the function is evaluated element wise.
+		 */
+		smaller(IMathJsChainy: MathType): IMathJsChain;
+		
+		/**
+		 * Test whether value x is smaller or equal to y.
+		 * 
+		 * The function returns true when x is smaller than y or the relative difference between x and y is smaller than the configured epsilon. 
+		 * The function cannot be used to compare values smaller than approximately 2.22e-16. For matrices, the function is evaluated element wise.
+		 */
+		smallerEq(IMathJsChainy: MathType): IMathJsChain;
+		
+		/**
+		 * Test whether two values are unequal.
+		 * 
+		 * The function tests whether the relative difference between x and y is larger than the configured epsilon. The function cannot 
+		 * be used to compare values smaller than approximately 2.22e-16.
+		 * 
+		 * For matrices, the function is evaluated element wise. In case of complex numbers, x.re must unequal y.re, or x.im must unequal y.im.
+		 * 
+		 * Values null and undefined are compared strictly, thus null is unequal with everything except null, and undefined is unequal with 
+		 * everying except. undefined.
+		 */
+		unequal(IMathJsChainy: MathType): IMathJsChain;
+		
+		/**
+		 * Compute the maximum value of a matrix or a list with values. In case of a multi dimensional array, the maximum of the flattened 
+		 * array will be calculated. When dim is provided, the maximum over the selected dimension will be calculated. Parameter dim is zero-based.
+		 */
+		max(dim?: number): IMathJsChain;
+		
+		/**
+		 * Compute the mean value of matrix or a list with values. In case of a multi dimensional array, the mean of the flattened array will be 
+		 * calculated. When dim is provided, the maximum over the selected dimension will be calculated. Parameter dim is zero-based.
+		 */
+		mean(dim?: number): IMathJsChain;
+		
+		/**
+		 * Compute the median of a matrix or a list with values. The values are sorted and the middle value is returned. In case of an 
+		 * even number of values, the average of the two middle values is returned. Supported types of values are: Number, BigNumber, Unit
+		 * 
+		 * In case of a (multi dimensional) array or matrix, the median of all elements will be calculated.
+		 */
+		median(): IMathJsChain;
+		
+		/**
+		 * Compute the maximum value of a matrix or a list of values. In case of a multi dimensional array, the maximum of the flattened 
+		 * array will be calculated. When dim is provided, the maximum over the selected dimension will be calculated. Parameter dim is zero-based.
+		 */
+		min(dim?: number): IMathJsChain;
+		
+		/**
+		 * Computes the mode of a set of numbers or a list with values(numbers or characters). If there are more than one modes, it returns a list of those values.
+		 */
+		mode(): IMathJsChain;
+		
+		/**
+		 * Compute the product of a matrix or a list with values. In case of a (multi dimensional) array or matrix, the sum of all elements will be calculated.
+		 */
+		prod(): IMathJsChain;
+		
+		/**
+		 * Compute the prob order quantile of a matrix or a list with values. The sequence is sorted and the middle value is returned. 
+		 * Supported types of sequence values are: Number, BigNumber, Unit Supported types of probability are: Number, BigNumber
+		 * 
+		 * In case of a (multi dimensional) array or matrix, the prob order quantile of all elements will be calculated.
+		 */
+		quantileSeq(prob: Number|BigNumber|MathArray, sorted?: boolean): IMathJsChain;
+		
+		/**
+		 * Compute the standard deviation of a matrix or a list with values. The standard deviations is defined as the square root of the 
+		 * variance: std(A) = sqrt(var(A)). In case of a (multi dimensional) array or matrix, the standard deviation over all elements will 
+		 * be calculated.
+		 * 
+		 * Optionally, the type of normalization can be specified as second parameter. The parameter normalization can be one of the following 
+		 * values:
+		 * 
+		 * 'unbiased' (default) The sum of squared errors is divided by (n - 1)
+		 * 'uncorrected' The sum of squared errors is divided by n
+		 * 'biased' The sum of squared errors is divided by (n + 1)
+		 */
+		std(normalization?: string): IMathJsChain;
+		
+		/**
+		 * Compute the sum of a matrix or a list with values. In case of a (multi dimensional) array or matrix, the sum of all elements will be calculated.
+		 */
+		sum(): IMathJsChain;
+		
+		/**
+		 * Compute the variance of a matrix or a list with values. In case of a (multi dimensional) array or matrix, the variance over all 
+		 * elements will be calculated.
+		 * 
+		 * Optionally, the type of normalization can be specified as second parameter. The parameter normalization can be one of the 
+		 * following values:
+		 * 
+		 * 'unbiased' (default) The sum of squared errors is divided by (n - 1)
+		 * 'uncorrected' The sum of squared errors is divided by n
+		 * 'biased' The sum of squared errors is divided by (n + 1)
+		 * Note that older browser may not like the variable name var. In that case, the function can be called as math['var'](...) 
+		 * instead of math.var(...).
+		 */
+		var(normalization?: string): IMathJsChain;
+		
+		/**
+		 * Calculate the inverse cosine of a value. For matrices, the function is evaluated element wise.
+		 */
+		acos(): IMathJsChain;
+
+		/**
+		 * Calculate the hyperbolic arccos of a value, defined as acosh(x) = ln(sqrt(x^2 - 1) + x).
+		 * For matrices, the function is evaluated element wise.
+		 */
+		acosh(): IMathJsChain;
+		
+		/**
+		 * Calculate the inverse cotangent of a value. For matrices, the function is evaluated element wise.
+		 */
+		acot(): IMathJsChain;
+		
+		/**
+		 * Calculate the hyperbolic arccotangent of a value, defined as acoth(x) = (ln((x+1)/x) + ln(x/(x-1))) / 2.
+		 * For matrices, the function is evaluated element wise.
+		 */
+		acoth(): IMathJsChain;
+
+		/**
+		 * Calculate the inverse cosecant of a value. For matrices, the function is evaluated element wise.
+		 */
+		acsc(): IMathJsChain;
+		
+		/**
+		 * Calculate the hyperbolic arccosecant of a value, defined as acsch(x) = ln(1/x + sqrt(1/x^2 + 1)).
+		 * For matrices, the function is evaluated element wise.
+		 */
+		acsch(): IMathJsChain;
+		
+		/**
+		 * Calculate the inverse secant of a value. For matrices, the function is evaluated element wise.
+		 */
+		asec(): IMathJsChain;
+		
+		/**
+		 * Calculate the hyperbolic arcsecant of a value, defined as asech(x) = ln(sqrt(1/x^2 - 1) + 1/x). For matrices, the function is evaluated element wise.
+		 */
+		asech(): IMathJsChain;
+		
+		/** 
+		 * Calculate the inverse sine of a value. For matrices, the function is evaluated element wise.
+		 */
+		asin(): IMathJsChain;
+		
+		/**
+		 * Calculate the hyperbolic arcsine of a value, defined as asinh(x) = ln(x + sqrt(x^2 + 1)). For matrices, the function is evaluated element wise.
+		 */
+		asinh(): IMathJsChain;
+		
+		/**
+		 * Calculate the inverse tangent of a value. For matrices, the function is evaluated element wise.
+		 */
+		atan(): IMathJsChain;
+		
+		/**
+		 * Calculate the inverse tangent function with two arguments, y/x. By providing two arguments, the right quadrant of the 
+		 * computed angle can be determined.
+		 * 
+		 * For matrices, the function is evaluated element wise.
+		 */
+		atan2(x: number): IMathJsChain;
+		atan2(x: MathArray|Matrix): IMathJsChain;
+		
+		/**
+		 * Calculate the hyperbolic arctangent of a value, defined as atanh(x) = ln((1 + x)/(1 - x)) / 2.
+		 * For matrices, the function is evaluated element wise.
+		 */
+		atanh(): IMathJsChain;
+		
+		/**
+		 * Calculate the cosine of a value. For matrices, the function is evaluated element wise.
+		 */
+		asin(): IMathJsChain;
+		
+		/**
+		 * Calculate the hyperbolic cosine of a value, defined as cosh(x) = 1/2 * (exp(x) + exp(-x)). For matrices, the function is evaluated element wise.
+		 */
+		cosh(): IMathJsChain;
+		
+		/**
+		 * Calculate the cotangent of a value. cot(x) is defined as 1 / tan(x). For matrices, the function is evaluated element wise.
+		 */
+		cot(): IMathJsChain;
+		
+		/**
+		 * Calculate the hyperbolic cotangent of a value, defined as coth(x) = 1 / tanh(x). For matrices, the function is evaluated element wise.
+		 */
+		coth(): IMathJsChain;
+		
+		/**
+		 * Calculate the cosecant of a value, defined as csc(x) = 1/sin(x). For matrices, the function is evaluated element wise.
+		 */
+		csc(): IMathJsChain;
+		
+		/**
+		 * Calculate the hyperbolic cosecant of a value, defined as csch(x) = 1 / sinh(x). For matrices, the function is evaluated element wise.
+		 */
+		csch(): IMathJsChain;
+		
+		/**
+		 * Calculate the secant of a value, defined as sec(x) = 1/cos(x). For matrices, the function is evaluated element wise.
+		 */
+		sec(): IMathJsChain;
+		
+		/**
+		 * Calculate the hyperbolic secant of a value, defined as sech(x) = 1 / cosh(x). For matrices, the function is evaluated element wise.
+		 */
+		sech(): IMathJsChain;
+		
+		/**
+		 * Calculate the sine of a value. For matrices, the function is evaluated element wise.
+		 */
+		sin(): IMathJsChain;
+		
+		/**
+		 * Calculate the hyperbolic sine of a value, defined as sinh(x) = 1/2 * (exp(x) - exp(-x)). For matrices, the function is evaluated element wise.
+		 */
+		sinh(): IMathJsChain;
+		
+		/**
+		 * Calculate the tangent of a value. tan(x) is equal to sin(x) / cos(x). For matrices, the function is evaluated element wise.
+		 */
+		tan(): IMathJsChain;
+		
+		/**
+		 * Calculate the hyperbolic tangent of a value, defined as tanh(x) = (exp(2 * x) - 1) / (exp(2 * x) + 1). For matrices, the function is evaluated element wise.
+		 */
+		tanh(): IMathJsChain;
+		
+		/**
+		 * Change the unit of a value. For matrices, the function is evaluated element wise.
+		 * @param x The unit to be converted.
+		 * @param unit New unit. Can be a string like "cm" or a unit without value.
+		 */
+		to(unit: Unit|string): IMathJsChain;
+		
+		/**
+		 * Clone an object.
+		 */
+		clone(): IMathJsChain;
+		
+		/**
+		 * Filter the items in an array or one dimensional matrix.
+		 * @param x A one dimensional matrix or array to filter
+		 * @param test 
+		 */
+		filter(test: RegExp|((item: any)=>boolean)): IMathJsChain;
+			
+		/**
+		 * Format a value of any type into a string.
+		 */
+		format(options?: IFormatOptions|number|((item: any)=>string)): IMathJsChain;
+		
+		/**
+		 * Create a new matrix or array with the results of the callback function executed on each entry of the matrix/array.
+		 * @param callback The callback method is invoked with three parameters: the value of the element, the index of the element, and the matrix being traversed.
+		 */
+		map(callback: (item: any)=>any): IMathJsChain;
+		
+		/**
+		 * Partition-based selection of an array or 1D matrix. Will find the kth smallest value, and mutates the input array. Uses Quickselect.
+		 * @param k The kth smallest value to be retrieved; zero-based index
+		 * @param compare  An optional comparator function. The function is called as compare(a, b), and must return 1 when a > b, -1 when a < b, and 0 when a == b. Default value: 'asc'.
+		 * @returns Returns the kth lowest value.
+		 */
+		partitionSelect(k: number, compare?: string|((a: any, b: any)=>number)): IMathJsChain;
+			
+		/**
+		 * Sort the items in a matrix.
+		 * @param compare  An optional comparator function. The function is called as compare(a, b), and must return 1 when a > b, -1 when a < b, and 0 when a == b. Default value: 'asc'.
+		 */
+		sort(compare?: string|((a: any, b: any)=>number)): IMathJsChain;
+		
+		done(): any;
+		valueOf(): any;
+		toString(): string;
+	}
+}
\ No newline at end of file
diff --git a/meteor/meteor.d.ts b/meteor/meteor.d.ts
index ee6c1db41..222de7ae7 100644
--- a/meteor/meteor.d.ts
+++ b/meteor/meteor.d.ts
@@ -616,7 +616,7 @@ declare module Mongo {
 		insert(doc: T, callback?: Function): string;
 		rawCollection(): any;
 		rawDatabase(): any;
-		remove(selector: Mongo.Selector | Mongo.ObjectID | string, callback?: Function): void;
+		remove(selector: Mongo.Selector | Mongo.ObjectID | string, callback?: Function): number;
 		update(selector: Mongo.Selector | Mongo.ObjectID | string, modifier: Mongo.Modifier, options?: {
 			multi?: boolean;
 			upsert?: boolean;
diff --git a/method-override/method-override-tests.ts b/method-override/method-override-tests.ts
index 84b4e966e..9023135d1 100644
--- a/method-override/method-override-tests.ts
+++ b/method-override/method-override-tests.ts
@@ -5,6 +5,7 @@ import methodOverride = require('method-override');
 var app = express();
 
 app.use(methodOverride('X-HTTP-Method-Override'));
+app.use(methodOverride('X-HTTP-Method-Override', { methods: ["GET", 'POST'] }));
 app.use(methodOverride((req: express.Request, res: express.Response) => {
     if (req.body && typeof req.body === 'object' && '_method' in req.body) {
         // look in urlencoded POST bodies and delete it
diff --git a/method-override/method-override.d.ts b/method-override/method-override.d.ts
index 099b5eeb9..22e3b74c1 100644
--- a/method-override/method-override.d.ts
+++ b/method-override/method-override.d.ts
@@ -13,12 +13,15 @@ declare module Express {
 
 declare module "method-override" {
     import express = require('express');
-    module e {
-        interface MethodOverrideOptions {
+
+    namespace e {
+        export interface MethodOverrideOptions {
             methods: string[];
         }
     }
-    function e(getter: string, options?: any): express.RequestHandler;
-    function e(getter: (req: express.Request, res: express.Response) => string, options?: any): express.RequestHandler;
+
+    function e(getter?: string, options?: e.MethodOverrideOptions): express.RequestHandler;
+    function e(getter?: (req: express.Request, res: express.Response) => string, options?: e.MethodOverrideOptions): express.RequestHandler;
+
     export = e;
 }
\ No newline at end of file
diff --git a/milliseconds/milliseconds-tests.ts b/milliseconds/milliseconds-tests.ts
new file mode 100644
index 000000000..04fa7408f
--- /dev/null
+++ b/milliseconds/milliseconds-tests.ts
@@ -0,0 +1,9 @@
+/// <reference path="milliseconds.d.ts" />
+
+milliseconds.seconds(1)
+milliseconds.minutes(2)
+milliseconds.hours(3)
+milliseconds.days(4)
+milliseconds.weeks(5)
+milliseconds.month(6)
+milliseconds.years(7)
diff --git a/milliseconds/milliseconds.d.ts b/milliseconds/milliseconds.d.ts
new file mode 100644
index 000000000..144886e45
--- /dev/null
+++ b/milliseconds/milliseconds.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for milliseconds
+// Project: http://npmjs.com/milliseconds
+// Definitions by: Elmar Burke <github.com/elmarburke>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Milliseconds {
+	seconds(seconds: number): number
+	minutes(minutes: number): number
+	hours(hours: number): number
+	days(days: number): number
+	weeks(weeks: number): number
+	month(month: number): number
+	years(years: number): number
+}
+
+declare var milliseconds: Milliseconds
+
+declare module 'milliseconds' {
+	export = milliseconds
+}
diff --git a/mobservable-react/mobservable-react-tests.ts b/mobservable-react/mobservable-react-tests.ts
index 7b39dbb7f..1bf2b49c6 100644
--- a/mobservable-react/mobservable-react-tests.ts
+++ b/mobservable-react/mobservable-react-tests.ts
@@ -17,7 +17,7 @@ import {reactiveComponent} from 'mobservable-react';
     }));
 
     let c1Factory = React.createFactory(c1);
-    React.render(c1Factory({
+    ReactDOM.render(c1Factory({
         test: "hello"
     }), null);
 }
@@ -31,7 +31,7 @@ class TestComponent extends React.Component<{ test: string },{}> {
 
 {
     let c2Factory = React.createFactory(TestComponent);
-    React.render(c2Factory({
+    ReactDOM.render(c2Factory({
         test: "hello" 
     }) , null);
 }
@@ -39,7 +39,7 @@ class TestComponent extends React.Component<{ test: string },{}> {
 {
     var c3 = reactiveComponent((props: { test: string }) => React.createElement("div"));
     var c3Factory = React.createFactory(c3); //without JSX
-    React.render(c3Factory({
+    ReactDOM.render(c3Factory({
         test: "hello"
     }), null);
 }
@@ -55,7 +55,7 @@ class TestComponent2 extends React.Component<{ test: string },{}> {
     // Argument of type 'typeof TestComponent2 | void' is not assignable to parameter of type 'ComponentClass<{ test: string; }>'.
     // Type 'void' is not assignable to type 'ComponentClass<{ test: string; }>'.
     let c4Factory = React.createFactory(<React.ClassicComponentClass<{test:string}>><any> reactiveComponent(TestComponent2));
-    React.render(c4Factory({
+    ReactDOM.render(c4Factory({
         test: "hello" 
     }) , null);
 }
\ No newline at end of file
diff --git a/mongoose-auto-increment/mongoose-auto-increment-tests.ts b/mongoose-auto-increment/mongoose-auto-increment-tests.ts
new file mode 100644
index 000000000..fbd2ef68a
--- /dev/null
+++ b/mongoose-auto-increment/mongoose-auto-increment-tests.ts
@@ -0,0 +1,20 @@
+/// <reference path="../mongoose/mongoose.d.ts" />
+/// <reference path="./mongoose-auto-increment.d.ts" />
+
+import * as autoIncrement from 'mongoose-auto-increment';
+import * as mongoose from 'mongoose';
+import { Schema } from 'mongoose';
+
+var connection = mongoose.createConnection("mongodb://localhost/myDatabase");
+
+autoIncrement.initialize(connection);
+
+var bookSchema = new Schema({
+    author: { type: Schema.Types.ObjectId, ref: 'Author' },
+    title: String,
+    genre: String,
+    publishDate: Date
+});
+
+bookSchema.plugin(autoIncrement.plugin, 'Book');
+var Book = connection.model('Book', bookSchema);
diff --git a/mongoose-auto-increment/mongoose-auto-increment.d.ts b/mongoose-auto-increment/mongoose-auto-increment.d.ts
new file mode 100644
index 000000000..34e7b5ddd
--- /dev/null
+++ b/mongoose-auto-increment/mongoose-auto-increment.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for mongoose-auto-increment 5.0.1
+// Project: https://github.com/codetunnel/mongoose-auto-increment
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../mongoose/mongoose.d.ts" />
+
+declare module 'mongoose-auto-increment' {
+	import { Connection, Schema, Mongoose } from 'mongoose';
+	
+	/**
+	 * Initialize plugin by creating counter collection in database.
+	 */
+	function initialize(connection: Connection): void;
+
+	/**
+	 * The function to use when invoking the plugin on a custom schema.
+	 */
+	function plugin(schema: Schema, options: Object): void;
+}
diff --git a/mongoose-deep-populate/mongoose-deep-populate-tests.ts b/mongoose-deep-populate/mongoose-deep-populate-tests.ts
new file mode 100644
index 000000000..d85a854a9
--- /dev/null
+++ b/mongoose-deep-populate/mongoose-deep-populate-tests.ts
@@ -0,0 +1,19 @@
+/// <reference path="../mongoose/mongoose.d.ts" />
+/// <reference path="./mongoose-deep-populate.d.ts" />
+
+import mongooseDeepPopulate from 'mongoose-deep-populate';
+import * as mongoose from 'mongoose';
+import { Schema } from 'mongoose';
+
+var connection = mongoose.connect("mongodb://localhost/myDatabase");
+
+var deepPopulate = mongooseDeepPopulate(connection);
+
+var bookSchema = new Schema({
+    author: { type: Schema.Types.ObjectId, ref: 'Author' },
+    title: String,
+    genre: String,
+    publishDate: Date
+});
+
+bookSchema.plugin(deepPopulate, {});
diff --git a/mongoose-deep-populate/mongoose-deep-populate.d.ts b/mongoose-deep-populate/mongoose-deep-populate.d.ts
new file mode 100644
index 000000000..247ba6b48
--- /dev/null
+++ b/mongoose-deep-populate/mongoose-deep-populate.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for mongoose-deep-populate 2.0.3
+// Project: https://github.com/buunguyen/mongoose-deep-populate
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../mongoose/mongoose.d.ts" />
+
+declare module "mongoose-deep-populate" {
+	import { Mongoose, Schema } from 'mongoose';
+
+	export default function(mognoose: Mongoose): (schema: Schema, options: Object) => void;
+}
diff --git a/ng-cordova/app-version-tests.ts b/ng-cordova/app-version-tests.ts
new file mode 100644
index 000000000..b83fb9ebb
--- /dev/null
+++ b/ng-cordova/app-version-tests.ts
@@ -0,0 +1,16 @@
+/// <reference path="app-version.d.ts" />
+
+module ngCordova {
+    function test($cordovaAppVersion: IAppVersionService) {
+
+        $cordovaAppVersion.getVersionNumber()
+            .then((versionNumber) => {
+                console.log(versionNumber.toLowerCase());
+            });
+
+        $cordovaAppVersion.getVersionCode()
+            .then((versionCode) => {
+                console.log(versionCode.toLowerCase());
+            });
+    }
+}
diff --git a/ng-cordova/app-version.d.ts b/ng-cordova/app-version.d.ts
new file mode 100644
index 000000000..b81c71b94
--- /dev/null
+++ b/ng-cordova/app-version.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for ngCordova datepicker plugin
+// Project: https://github.com/driftyco/ng-cordova
+// Definitions by: Jacques Kang <https://www.linkedin.com/in/jacqueskang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../angularjs/angular.d.ts" />
+
+declare module ngCordova {
+    export interface IAppVersionService {
+        getVersionNumber(): ng.IPromise<string>;
+        getVersionCode(): ng.IPromise<string>;
+    }
+}
diff --git a/ng-cordova/camera-tests.ts b/ng-cordova/camera-tests.ts
new file mode 100644
index 000000000..207329b7a
--- /dev/null
+++ b/ng-cordova/camera-tests.ts
@@ -0,0 +1,26 @@
+/// <reference path="camera.d.ts" />
+
+module ngCordova {
+    function cameraTest($cordovaCamera: ICameraService) {
+        var options = {
+            quality: 50,
+            destinationType: Camera.DestinationType.DATA_URL,
+            sourceType: Camera.PictureSourceType.CAMERA,
+            allowEdit: true,
+            encodingType: Camera.EncodingType.JPEG,
+            targetWidth: 100,
+            targetHeight: 100,
+            saveToPhotoAlbum: false,
+            correctOrientation: true
+        };
+
+        $cordovaCamera.getPicture(options).then((imageData) => {
+            console.log(imageData.trim());
+        }).finally(() => {
+            $cordovaCamera.cleanup()
+                .then(() => {
+                    console.log('cleaned up.');
+                });
+        });
+    };
+}
diff --git a/ng-cordova/camera.d.ts b/ng-cordova/camera.d.ts
new file mode 100644
index 000000000..e9a6cd2c1
--- /dev/null
+++ b/ng-cordova/camera.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for ngCordova.plugins.camera
+// Project: https://github.com/driftyco/ng-cordova
+// Definitions by: Jacques Kang <https://www.linkedin.com/in/jacqueskang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../cordova/plugins/Camera.d.ts" />
+/// <reference path="../angularjs/angular.d.ts" />
+
+declare module ngCordova {
+    export interface ICameraService {
+        getPicture(options?: CameraOptions): ng.IPromise<string>;
+        cleanup(): ng.IPromise<void>;
+    }
+}
diff --git a/ng-cordova/datepicker-tests.ts b/ng-cordova/datepicker-tests.ts
new file mode 100644
index 000000000..340b9fff0
--- /dev/null
+++ b/ng-cordova/datepicker-tests.ts
@@ -0,0 +1,31 @@
+/// <reference path="datepicker.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
+
+module ngCordova {
+    function smoketest($cordovaDatePicker: IDatePickerService, isIos: boolean) {
+    
+        // minDate is a Date object for iOS and a millisecond precision unix timestamp
+        // for Android, so you need to account for that when using the plugin. Also,
+        // on Android, only the date is enforced (time is not).
+        // - from https://github.com/VitaliiBlagodir/cordova-plugin-datepicker
+        var minDate = isIos ? new Date() : (new Date()).valueOf();
+
+        var options: DatePickerOptions = {
+            date: new Date(),
+            mode: 'date',
+            minDate: minDate,
+            maxDate: '',
+            allowOldDates: true,
+            allowFutureDates: false,
+            doneButtonLabel: 'DONE',
+            doneButtonColor: '#F2F3F4',
+            cancelButtonLabel: 'CANCEL',
+            cancelButtonColor: '#000000',
+            androidTheme: AndroidTheme.HoloDark
+        };
+
+        $cordovaDatePicker.show(options).then(function(date) {
+            alert(date);
+        });
+    };
+}
diff --git a/ng-cordova/datepicker.d.ts b/ng-cordova/datepicker.d.ts
new file mode 100644
index 000000000..b4b195982
--- /dev/null
+++ b/ng-cordova/datepicker.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for ngCordova datepicker plugin
+// Project: https://github.com/VitaliiBlagodir/cordova-plugin-datepicker
+// Definitions by: Jacques Kang <https://www.linkedin.com/in/jacqueskang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../angularjs/angular.d.ts" />
+
+declare module ngCordova {
+
+    export enum AndroidTheme {
+        Traditional = 1,
+        HoloDark = 2,
+        HoloLight = 3,
+        DeviceDefaultDark = 4,
+        DeviceDefaultLight = 5
+    }
+
+    export interface DatePickerOptions {
+        mode?: string;
+        date?: Date | string | number;
+        minDate?: Date | string | number;
+        maxDate?: Date | string | number;
+        titleText?: string;
+        okText?: string;
+        cancelText?: string;
+        todayText?: string;
+        nowText?: string;
+        is24Hour?: boolean;
+        androidTheme?: AndroidTheme;
+        allowOldDates?: boolean;
+        allowFutureDates?: boolean;
+        doneButtonLabel?: string;
+        doneButtonColor?: string;
+        cancelButtonLabel?: string;
+        cancelButtonColor?: string;
+        x?: number;
+        y?: number;
+        minuteInterval?: number;
+        popoverArrowDirection?: string;
+        locale?: string;
+    }
+
+    export interface IDatePickerService {
+        show(options?: DatePickerOptions): ng.IPromise<Date>;
+    }
+}
diff --git a/ng-cordova/tsd.d.ts b/ng-cordova/tsd.d.ts
index 188cb367d..5f17dd706 100644
--- a/ng-cordova/tsd.d.ts
+++ b/ng-cordova/tsd.d.ts
@@ -12,3 +12,6 @@
 /// <reference path="deviceMotion.d.ts"/>
 /// <reference path="deviceOrientation.d.ts"/>
 /// <reference path="appAvailability.d.ts"/>
+/// <reference path="datepicker.d.ts"/>
+/// <reference path="app-version.d.ts"/>
+/// <reference path="camera.d.ts"/>
diff --git a/ng-stomp/ng-stomp-tests.ts b/ng-stomp/ng-stomp-tests.ts
new file mode 100644
index 000000000..4f9092c20
--- /dev/null
+++ b/ng-stomp/ng-stomp-tests.ts
@@ -0,0 +1,49 @@
+/// <reference path="../angularjs/angular.d.ts" />
+/// <reference path="ng-stomp.d.ts" />
+
+module ngStompTesting {
+
+    "use strict";
+    var ngStompTest = "ngStompTest";
+
+    class test {
+        constructor(private ngstomp:ngStomp) {
+            var connectHeaders ={
+                "Auth": "user",
+                "Accept": "lol"
+            };
+
+            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);
+}
\ No newline at end of file
diff --git a/ng-stomp/ng-stomp.d.ts b/ng-stomp/ng-stomp.d.ts
new file mode 100644
index 000000000..7cf263eeb
--- /dev/null
+++ b/ng-stomp/ng-stomp.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for ngStomp
+// Project: https://github.com/beevelop/ng-stomp
+// Definitions by: Lukasz Potapczuk <https://github.com/lpotapczuk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference path="../angularjs/angular.d.ts" />
+
+
+interface ngStomp {
+        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;
+    }
+
+
+
+
+
+
diff --git a/node/node-tests.ts b/node/node-tests.ts
index bd80329dc..930bd1a71 100644
--- a/node/node-tests.ts
+++ b/node/node-tests.ts
@@ -23,6 +23,8 @@ assert.equal(3, "3", "uses == comparator");
 
 assert.notStrictEqual(2, "2", "uses === comparator");
 
+assert.notDeepStrictEqual({ x: { y: "3" } }, { x: { y: 3 } }, "uses === comparator");
+
 assert.throws(() => { throw "a hammer at your face"; }, undefined, "DODGED IT");
 
 assert.doesNotThrow(() => {
diff --git a/node/node.d.ts b/node/node.d.ts
index 5a163f0df..017ca8e6b 100644
--- a/node/node.d.ts
+++ b/node/node.d.ts
@@ -430,7 +430,7 @@ declare module "http" {
     import * as events from "events";
     import * as net from "net";
     import * as stream from "stream";
-    
+
     export interface RequestOptions {
         protocol?: string;
         host?: string;
@@ -1808,6 +1808,8 @@ declare module "assert" {
         export function notDeepEqual(acutal: any, expected: any, message?: string): void;
         export function strictEqual(actual: any, expected: any, message?: string): void;
         export function notStrictEqual(actual: any, expected: any, message?: string): void;
+        export function deepStrictEqual(actual: any, expected: any, message?: string): void;
+        export function notDeepStrictEqual(actual: any, expected: any, message?: string): void;
         export var throws: {
             (block: Function, message?: string): void;
             (block: Function, error: Function, message?: string): void;
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index da07b4d07..6dc63bfb0 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -2,254 +2,217 @@
   "name": "DefinitelyTyped",
   "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": "2.10.2",
+      "from": "bluebird@>=2.10.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz"
+    },
+    "brace-expansion": {
+      "version": "1.1.2",
+      "from": "brace-expansion@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.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"
+    },
+    "definition-header": {
+      "version": "0.1.0",
+      "from": "definition-header@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/definition-header/-/definition-header-0.1.0.tgz"
+    },
     "definition-tester": {
       "version": "0.3.0",
       "from": "definition-tester@0.3.0",
+      "resolved": "https://registry.npmjs.org/definition-tester/-/definition-tester-0.3.0.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"
+    },
+    "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": "5.0.15",
+      "from": "glob@>=5.0.14 <6.0.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
+    },
+    "hoek": {
+      "version": "2.16.3",
+      "from": "hoek@>=2.2.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.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": "1.2.0",
+      "from": "isemail@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz"
+    },
+    "joi": {
+      "version": "4.9.0",
+      "from": "joi@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-4.9.0.tgz"
+    },
+    "joi-assert": {
+      "version": "0.0.3",
+      "from": "joi-assert@0.0.3",
+      "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": "2.10.1",
-          "from": "bluebird@>=2.10.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz"
-        },
-        "definition-header": {
-          "version": "0.1.0",
-          "from": "definition-header@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/definition-header/-/definition-header-0.1.0.tgz",
-          "dependencies": {
-            "joi": {
-              "version": "4.9.0",
-              "from": "joi@>=4.0.0 <5.0.0",
-              "resolved": "https://registry.npmjs.org/joi/-/joi-4.9.0.tgz",
-              "dependencies": {
-                "hoek": {
-                  "version": "2.16.3",
-                  "from": "hoek@>=2.2.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-                },
-                "topo": {
-                  "version": "1.0.3",
-                  "from": "topo@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/topo/-/topo-1.0.3.tgz"
-                },
-                "isemail": {
-                  "version": "1.2.0",
-                  "from": "isemail@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz"
-                },
-                "moment": {
-                  "version": "2.10.6",
-                  "from": "moment@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"
-                }
-              }
-            },
-            "joi-assert": {
-              "version": "0.0.3",
-              "from": "joi-assert@0.0.3",
-              "resolved": "https://registry.npmjs.org/joi-assert/-/joi-assert-0.0.3.tgz",
-              "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"
-                }
-              }
-            },
-            "parsimmon": {
-              "version": "0.5.1",
-              "from": "parsimmon@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/parsimmon/-/parsimmon-0.5.1.tgz",
-              "dependencies": {
-                "pjs": {
-                  "version": "5.1.1",
-                  "from": "pjs@>=5.0.0 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/pjs/-/pjs-5.1.1.tgz"
-                }
-              }
-            },
-            "xregexp": {
-              "version": "2.0.0",
-              "from": "xregexp@>=2.0.0 <2.1.0",
-              "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.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"
-        },
-        "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": "5.0.14",
-          "from": "glob@>=5.0.14 <6.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.14.tgz",
-          "dependencies": {
-            "inflight": {
-              "version": "1.0.4",
-              "from": "inflight@>=1.0.4 <2.0.0",
-              "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-              "dependencies": {
-                "wrappy": {
-                  "version": "1.0.1",
-                  "from": "wrappy@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.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"
-            },
-            "minimatch": {
-              "version": "2.0.10",
-              "from": "minimatch@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-              "dependencies": {
-                "brace-expansion": {
-                  "version": "1.1.0",
-                  "from": "brace-expansion@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
-                  "dependencies": {
-                    "balanced-match": {
-                      "version": "0.2.0",
-                      "from": "balanced-match@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.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"
-                    }
-                  }
-                }
-              }
-            },
-            "once": {
-              "version": "1.3.2",
-              "from": "once@>=1.3.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
-              "dependencies": {
-                "wrappy": {
-                  "version": "1.0.1",
-                  "from": "wrappy@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.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"
-            }
-          }
-        },
-        "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": {
-            "JSONStream": {
-              "version": "0.8.4",
-              "from": "JSONStream@>=0.8.4 <0.9.0",
-              "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-              "dependencies": {
-                "jsonparse": {
-                  "version": "0.0.5",
-                  "from": "jsonparse@0.0.5",
-                  "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.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"
-                }
-              }
-            },
-            "bluebird": {
-              "version": "1.2.4",
-              "from": "bluebird@>=1.2.4 <2.0.0",
-              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-1.2.4.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",
-              "dependencies": {
-                "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",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.1",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.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"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.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"
-                }
-              }
-            },
-            "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"
-            }
-          }
-        },
-        "optimist": {
-          "version": "0.6.1",
-          "from": "optimist@>=0.6.1 <0.7.0",
-          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-          "dependencies": {
-            "wordwrap": {
-              "version": "0.0.3",
-              "from": "wordwrap@>=0.0.2 <0.1.0",
-              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.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"
-            }
-          }
+          "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.10.6",
+      "from": "moment@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.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.5.1",
+      "from": "parsimmon@>=0.5.0 <0.6.0",
+      "resolved": "https://registry.npmjs.org/parsimmon/-/parsimmon-0.5.1.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": "1.1.0",
+      "from": "topo@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.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"
+    },
     "typescript": {
-      "version": "1.6.2",
-      "from": "typescript@1.6.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.6.2.tgz"
+      "version": "1.7.3",
+      "from": "typescript@1.7.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.7.3.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": "2.0.0",
+      "from": "xregexp@>=2.0.0 <2.1.0",
+      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.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/openpgp/openpgp.d.ts b/openpgp/openpgp.d.ts
index 0ae8445a2..309aea153 100644
--- a/openpgp/openpgp.d.ts
+++ b/openpgp/openpgp.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for openpgpjs
+// Type definitions for openpgpjs
 // Project: http://openpgpjs.org/
 // Definitions by: Guillaume Lacasa <https://blog.lacasa.fr>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -22,7 +22,7 @@ declare module openpgp {
     }
 
     interface Keyid {
-        bytes: String,
+        bytes: string,
     }
 
     interface Signature {
@@ -31,7 +31,7 @@ declare module openpgp {
     }
 
     interface VerifiedMessage {
-        text: String,
+        text: string,
         signatures: Array<Signature>
     }
 
@@ -41,34 +41,34 @@ declare module openpgp {
         @param publicKeys array of keys to verify signatures
         @param msg the message object with signed and encrypted data
      */
-    function decryptAndVerifyMessage(privateKey: key.Key, publicKeys: Array<key.Key>, msg: String): Promise<VerifiedMessage>;
+    function decryptAndVerifyMessage(privateKey: key.Key, publicKeys: Array<key.Key>, msg: string): Promise<VerifiedMessage>;
     /** Decrypts message and verifies signatures
 
         @param privateKey private key with decrypted secret key data
         @param publicKey single key to verify signatures
         @param msg the message object with signed and encrypted data
      */
-    function decryptAndVerifyMessage(privateKey: key.Key, publicKey: key.Key, msg: String): Promise<VerifiedMessage>;
+    function decryptAndVerifyMessage(privateKey: key.Key, publicKey: key.Key, msg: string): Promise<VerifiedMessage>;
 
     /** Decrypts message
 
         @param privateKey private key with decrypted secret key data
         @param msg the message object with the encrypted data
      */
-    function decryptMessage(privateKey: key.Key, msg: message.Message): Promise<String>;
+    function decryptMessage(privateKey: key.Key, msg: message.Message): Promise<string>;
 
     /** Encrypts message text with keys
         @param keys array of keys used to encrypt the message
         @param text message as native JavaScript string
         @returns encrypted ASCII armored message
      */
-    function encryptMessage(keys: Array<key.Key>, message: string): Promise<String>;
+    function encryptMessage(keys: Array<key.Key>, message: string): Promise<string>;
     /** Encrypts message text with keys
 
         @param single key used to encrypt the message
         @param text message as native JavaScript string
      */
-    function encryptMessage(key: key.Key, message: string): Promise<String>;
+    function encryptMessage(key: key.Key, message: string): Promise<string>;
 
     /** Generates a new OpenPGP key pair. Currently only supports RSA keys. Primary and subkey will be of same type.
         @param options
@@ -81,27 +81,27 @@ declare module openpgp {
         @param privateKey private key with decrypted secret key data for signing
         @param text private key with decrypted secret key data for signing
      */
-    function signAndEncryptMessage(publicKeys: Array<key.Key>, privateKey: key.Key, text: String): Promise<String>;
+    function signAndEncryptMessage(publicKeys: Array<key.Key>, privateKey: key.Key, text: string): Promise<string>;
     /** Signs message text and encrypts it
 
         @param publicKeys single key used to encrypt the message
         @param privateKey private key with decrypted secret key data for signing
         @param text private key with decrypted secret key data for signing
      */
-    function signAndEncryptMessage(publicKey: key.Key, privateKey: key.Key, text: String): Promise<String>;
+    function signAndEncryptMessage(publicKey: key.Key, privateKey: key.Key, text: string): Promise<string>;
 
     /** Signs a cleartext message
-    
+
         @param privateKeys array of keys with decrypted secret key data to sign cleartext
         @param text cleartext
      */
-    function signClearMessage(privateKeys: Array<key.Key>, text: String): Promise<String>;
+    function signClearMessage(privateKeys: Array<key.Key>, text: string): Promise<string>;
     /** Signs a cleartext message
-    
+
         @param privateKeys single key with decrypted secret key data to sign cleartext
         @param text cleartext
      */
-    function signClearMessage(privateKey: key.Key, text: String): Promise<String>;
+    function signClearMessage(privateKey: key.Key, text: string): Promise<string>;
 
     /** Verifies signatures of cleartext signed message
 
@@ -126,13 +126,13 @@ declare module openpgp.armor {
         @param partindex
         @param parttotal
      */
-    function armor(messagetype: enums.armor, body: Object, partindex: Number, parttotal: Number): String;
+    function armor(messagetype: enums.armor, body: Object, partindex: number, parttotal: number): string;
 
     /** DeArmor an OpenPGP armored message; verify the checksum and return the encoded bytes
 
         @param text OpenPGP armored message
      */
-    function dearmor(text: String): Object;
+    function dearmor(text: string): Object;
 }
 
 declare module openpgp.cleartext {
@@ -142,7 +142,7 @@ declare module openpgp.cleartext {
     interface CleartextMessage {
         /** Returns ASCII armored text of cleartext signed message
          */
-        armor(): String;
+        armor(): string;
 
         /** Returns the key IDs of the keys that signed the cleartext message
          */
@@ -150,7 +150,7 @@ declare module openpgp.cleartext {
 
         /** Get cleartext
          */
-        getText(): String;
+        getText(): string;
 
         /** Sign the cleartext message
             @param privateKeys private keys with decrypted secret key data for signing
@@ -163,41 +163,41 @@ declare module openpgp.cleartext {
         verify(keys: Array<key.Key>): Array<VerifiedMessage>;
     }
 
-    function readArmored(armoredText: String): CleartextMessage;
+    function readArmored(armoredText: string): CleartextMessage;
 }
 
 declare module openpgp.config {
     var prefer_hash_algorithm: enums.hash;
     var encryption_cipher: enums.symmetric;
     var compression: enums.compression;
-    var show_version: Boolean;
-    var show_comment: Boolean;
-    var integrity_protect: Boolean;
-    var keyserver: String;
-    var debug: Boolean;
+    var show_version: boolean;
+    var show_comment: boolean;
+    var integrity_protect: boolean;
+    var keyserver: string;
+    var debug: boolean;
 }
 
 declare module openpgp.crypto {
     interface Mpi {
-        data: Number,
-        read(input: String): Number,
-        write(): String,
+        data: number,
+        read(input: string): number,
+        write(): string,
     }
 
     /** Generating a session key for the specified symmetric algorithm
         @param algo Algorithm to use
      */
-    function generateSessionKey(algo: enums.symmetric): String;
+    function generateSessionKey(algo: enums.symmetric): string;
 
     /** generate random byte prefix as string for the specified algorithm
         @param algo Algorithm to use
      */
-    function getPrefixRandom(algo: enums.symmetric): String;
+    function getPrefixRandom(algo: enums.symmetric): string;
 
     /** Returns the number of integers comprising the private key of an algorithm
         @param algo The public key algorithm
      */
-    function getPrivateMpiCount(algo: enums.symmetric): Number;
+    function getPrivateMpiCount(algo: enums.symmetric): number;
 
     /** Decrypts data using the specified public key multiprecision integers of the private key, the specified secretMPIs of the private key and the specified algorithm.
         @param algo Algorithm to be used
@@ -222,8 +222,8 @@ declare module openpgp.crypto.cfb {
         @param ciphertext to be decrypted provided as a string
         @param resync a boolean value specifying if a resync of the IV should be used or not. The encrypteddatapacket uses the "old" style with a resync. Decryption within an encryptedintegrityprotecteddata packet is not resyncing the IV.
      */
-    function decrypt(cipherfn: String, key: String, ciphertext: String, resync: Boolean): String;
-    
+    function decrypt(cipherfn: string, key: string, ciphertext: string, resync: boolean): string;
+
     /** This function encrypts a given with the specified prefixrandom using the specified blockcipher to encrypt a message
         @param prefixrandom random bytes of block_size length provided as a string to be used in prefixing the data
         @param cipherfn the algorithm cipher class to encrypt data in one block_size encryption
@@ -231,14 +231,14 @@ declare module openpgp.crypto.cfb {
         @param key binary string representation of key to be used to encrypt the plaintext. This will be passed to the cipherfn
         @param resync a boolean value specifying if a resync of the IV should be used or not. The encrypteddatapacket uses the "old" style with a resync. Encryption within an encryptedintegrityprotecteddata packet is not resyncing the IV.
      */
-    function encrypt(prefixrandom: String, cipherfn: String, plaintext: String, key: String, resync: Boolean): String;
-    
+    function encrypt(prefixrandom: string, cipherfn: string, plaintext: string, key: string, resync: boolean): string;
+
     /** Decrypts the prefixed data for the Modification Detection Code (MDC) computation
         @param cipherfn cipherfn.encrypt Cipher function to use
         @param key binary string representation of key to be used to check the mdc This will be passed to the cipherfn
         @param ciphertext The encrypted data
      */
-    function mdc(cipherfn: Object, key: String, ciphertext: String): String;
+    function mdc(cipherfn: Object, key: string, ciphertext: string): string;
 }
 
 declare module openpgp.crypto.hash {
@@ -246,35 +246,35 @@ declare module openpgp.crypto.hash {
         @param algo Hash algorithm type
         @param data Data to be hashed
      */
-    function digest(algo: enums.hash, data: String): String;
+    function digest(algo: enums.hash, data: string): string;
 
     /** Returns the hash size in bytes of the specified hash algorithm type
         @param algo Hash algorithm type
      */
-    function getHashByteLength(algo: enums.hash): Number;
+    function getHashByteLength(algo: enums.hash): number;
 }
 
 declare module openpgp.crypto.random {
     /** Create a secure random big integer of bits length
         @param bits Bit length of the MPI to create
      */
-    function getRandomBigInteger(bits: Number): Number;
-    
+    function getRandomBigInteger(bits: number): number;
+
     /** Retrieve secure random byte string of the specified length
         @param length Length in bytes to generate
      */
-    function getRandomBytes(length: Number): String;
-    
+    function getRandomBytes(length: number): string;
+
     /** Helper routine which calls platform specific crypto random generator
-        @param buf 
+        @param buf
      */
     function getRandomValues(buf: Uint8Array): void;
-    
+
     /** Return a secure random number in the specified range
         @param from Min of the random number
         @param to Max of the random number (max 32bit)
      */
-    function getSecureRandom(from: Number, to: Number): Number;
+    function getSecureRandom(from: number, to: number): number;
 }
 
 declare module openpgp.crypto.signature {
@@ -285,16 +285,16 @@ declare module openpgp.crypto.signature {
         @param secretMPIs Private key multiprecision integers which is used to sign the data
         @param data Data to be signed
      */
-    function sign(hash_algo: enums.hash, algo: enums.publicKey, publicMPIs: Array<Mpi>, secretMPIs: Array<Mpi>, data: String): Mpi;
+    function sign(hash_algo: enums.hash, algo: enums.publicKey, publicMPIs: Array<Mpi>, secretMPIs: Array<Mpi>, data: string): Mpi;
 
-    /** 
+    /**
         @param algo public Key algorithm
         @param hash_algo Hash algorithm
         @param msg_MPIs Signature multiprecision integers
         @param publickey_MPIs Public key multiprecision integers
         @param data Data on where the signature was computed on
      */
-    function verify(algo: enums.publicKey, hash_algo: enums.hash, msg_MPIs: Array<Mpi>, publickey_MPIs: Array<Mpi>, data: String): Boolean;
+    function verify(algo: enums.publicKey, hash_algo: enums.hash, msg_MPIs: Array<Mpi>, publickey_MPIs: Array<Mpi>, data: string): boolean;
 }
 
 declare module openpgp.enums {
@@ -364,6 +364,14 @@ declare module openpgp.enums {
         aes256,
         twofish
     }
+
+    enum keyStatus {
+        invalid,
+        expired,
+        revoked,
+        valid,
+        no_self_cert
+    }
 }
 
 declare module openpgp.key {
@@ -376,8 +384,19 @@ declare module openpgp.key {
     /** Class that represents an OpenPGP key. Must contain a primary key. Can contain additional subkeys, signatures, user ids, user attributes.
      */
     interface Key {
-        armor(): String,
-        decrypt(passphrase: String): Boolean,
+        armor(): string,
+        decrypt(passphrase: string): boolean;
+        getExpirationTime(): Date;
+        getKeyIds(): Array<Keyid>;
+        getPreferredHashAlgorithm(): string;
+        getPrimaryUser(): any;
+        getUserIds(): Array<string>;
+        isPrivate(): boolean;
+        isPublic(): boolean;
+        primaryKey: packet.PublicKey;
+        toPublic(): Key;
+        update(key: Key): void;
+        verifyPrimaryKey(): enums.keyStatus;
     }
 
     /** Generates a new OpenPGP key. Currently only supports RSA keys. Primary and subkey will be of same type.
@@ -390,7 +409,7 @@ declare module openpgp.key {
 
         @param armoredText text to be parsed
      */
-    function readArmored(armoredText: String): KeyResult;
+    function readArmored(armoredText: string): KeyResult;
 
 }
 
@@ -400,7 +419,7 @@ declare module openpgp.message {
     interface Message {
         /** Returns ASCII armored text of message
          */
-        armor(): String,
+        armor(): string,
 
         /** Decrypt the message
             @param privateKey private key with decrypted secret data
@@ -418,7 +437,7 @@ declare module openpgp.message {
 
         /** Get literal data that is the body of the message
          */
-        getLiteralData(): String,
+        getLiteralData(): string,
 
         /** Returns the key IDs of the keys that signed the message
          */
@@ -426,7 +445,7 @@ declare module openpgp.message {
 
         /** Get literal data as text
          */
-        getText(): String,
+        getText(): string,
 
         /** Sign the message (the literal data packet of the message)
             @param privateKey private keys with decrypted secret key data for signing
@@ -446,22 +465,41 @@ declare module openpgp.message {
     /** creates new message object from binary data
         @param bytes
      */
-    function fromBinary(bytes: String): Message;
+    function fromBinary(bytes: string): Message;
 
     /** creates new message object from text
         @param text
      */
-    function fromText(text: String): Message;
+    function fromText(text: string): Message;
 
     /** reads an OpenPGP armored message and returns a message object
 
         @param armoredText text to be parsed
      */
-    function readArmored(armoredText: String): Message;
+    function readArmored(armoredText: string): Message;
 }
 
 declare module openpgp.packet {
 
+    interface PublicKey {
+        algorithm: enums.publicKey;
+        created: Date;
+        fingerprint: string;
+
+        getBitSize(): number;
+        getFingerprint(): string;
+        getKeyId(): string;
+        read(input: string): any;
+        write(): any;
+    }
+
+    interface SecretKey extends PublicKey {
+        read(bytes:string): void;
+        write(): string;
+        clearPrivateMPIs(str_passphrase: string): boolean;
+        encrypt(passphrase:string): void;
+    }
+
     /** Allocate a new packet from structured packet clone
         @param packetClone packet clone
      */
@@ -470,33 +508,33 @@ declare module openpgp.packet {
     /** Allocate a new packet
         @param property name from enums.packet
      */
-    function newPacketFromTag(tag: String): Object;
+    function newPacketFromTag(tag: string): Object;
 }
 
 declare module openpgp.util {
     /** Convert an array of integers(0.255) to a string
         @param bin An array of (binary) integers to convert
      */
-    function bin2str(bin: Array<Number>): String;
+    function bin2str(bin: Array<number>): string;
 
     /** Calculates a 16bit sum of a string by adding each character codes modulus 65535
-        @param text String to create a sum of
+        @param text string to create a sum of
      */
-    function calc_checksum(text: String): Number;
+    function calc_checksum(text: string): number;
 
     /** Convert a string of utf8 bytes to a native javascript string
         @param utf8 A valid squence of utf8 bytes
      */
-    function decode_utf8(utf8: String): String
+    function decode_utf8(utf8: string): string
 
     /** Convert a native javascript string to a string of utf8 bytes
         param str The string to convert
      */
-    function encode_utf8(str: String): String
+    function encode_utf8(str: string): string
 
     /** Return the algorithm type as string
      */
-    function get_hashAlgorithmString(): String
+    function get_hashAlgorithmString(): string
 
     /** Get native Web Cryptography api. The default configuration is to use the api when available. But it can also be deactivated with config.useWebCrypto
      */
@@ -505,48 +543,48 @@ declare module openpgp.util {
     /** Create binary string from a hex encoded string
         @param str Hex string to convert
      */
-    function hex2bin(str: String): String;
+    function hex2bin(str: string): string;
 
     /** Creating a hex string from an binary array of integers (0..255)
         @param str Array of bytes to convert
      */
-    function hexidump(str: String): String;
+    function hexidump(str: string): string;
 
     /** Create hexstring from a binary
-        @param str String to convert
+        @param str string to convert
      */
-    function hexstrdump(str: String): String;
-    
+    function hexstrdump(str: string): string;
+
     /** Helper function to print a debug message. Debug messages are only printed if
-        @param str String of the debug message
+        @param str string of the debug message
      */
-    function print_debug(str: String): void;
-    
+    function print_debug(str: string): void;
+
     /** Helper function to print a debug message. Debug messages are only printed if
-        @param str String of the debug message
+        @param str string of the debug message
      */
-    function print_debug_hexstr_dump(str: String): void;
-    
+    function print_debug_hexstr_dump(str: string): void;
+
     /** Shifting a string to n bits right
         @param value The string to shift
         @param bitcount Amount of bits to shift (MUST be smaller than 9)
      */
-    function shiftRight(value: String, bitcount: Number): String;
-    
+    function shiftRight(value: string, bitcount: number): string;
+
     /** Convert a string to an array of integers(0.255)
-        @param str String to convert
+        @param str string to convert
      */
-    function str2bin(str: String): Array<Number>;
-    
+    function str2bin(str: string): Array<number>;
+
     /** Convert a string to a Uint8Array
-        @param str String to convert
+        @param str string to convert
      */
-    function str2Uint8Array(str: String): Uint8Array;
-    
+    function str2Uint8Array(str: string): Uint8Array;
+
     /** Convert a Uint8Array to a string. This currently functions the same as bin2str.
         @param bin An array of (binary) integers to convert
      */
-    function Uint8Array2str(bin: Uint8Array): String;
+    function Uint8Array2str(bin: Uint8Array): string;
 
 
-}
\ No newline at end of file
+}
diff --git a/p2/p2-tests.ts b/p2/p2-tests.ts
new file mode 100644
index 000000000..63c213321
--- /dev/null
+++ b/p2/p2-tests.ts
@@ -0,0 +1,45 @@
+/// <reference path="p2.d.ts"/>
+
+// Create a physics world, where bodies and constraints live
+var world = new p2.World({
+    gravity:[0, -9.82]
+});
+
+// Create an empty dynamic body
+var circleBody = new p2.Body({
+    mass: 5,
+    position: [0, 10]
+});
+
+// Add a circle shape to the body.
+var circleShape = new p2.Circle({ radius: 1 });
+circleBody.addShape(circleShape);
+
+// ...and add the body to the world.
+// If we don't add it to the world, it won't be simulated.
+world.addBody(circleBody);
+
+// Create an infinite ground plane.
+var groundBody = new p2.Body({
+    mass: 0 // Setting mass to 0 makes the body static
+});
+var groundShape = new p2.Plane();
+groundBody.addShape(groundShape);
+world.addBody(groundBody);
+
+// To get the trajectories of the bodies,
+// we must step the world forward in time.
+// This is done using a fixed time step size.
+var timeStep = 1 / 60; // seconds
+
+// The "Game loop". Could be replaced by, for example, requestAnimationFrame.
+setInterval(function(){
+
+    // The step method moves the bodies forward in time.
+    world.step(timeStep);
+
+    // Print the circle position to console.
+    // Could be replaced by a render call.
+    console.log("Circle y position: " + circleBody.position[1]);
+
+}, 1000 * timeStep);
diff --git a/p2/p2.d.ts b/p2/p2.d.ts
new file mode 100644
index 000000000..a0e3f8b6a
--- /dev/null
+++ b/p2/p2.d.ts
@@ -0,0 +1,1005 @@
+// Type definitions for p2.js v0.7.1
+// Project: https://github.com/schteppe/p2.js/
+// Definitions by: Clark Stevenson <https://github.com/clark-stevenson>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module p2 {
+
+    export class AABB {
+
+        constructor(options?: {
+            upperBound?: number[];
+            lowerBound?: number[];
+        });
+
+        setFromPoints(points: number[][], position: number[], angle: number, skinSize: number): void;
+        copy(aabb: AABB): void;
+        extend(aabb: AABB): void;
+        overlaps(aabb: AABB): boolean;
+
+    }
+
+    export class Broadphase {
+
+        static AABB: number;
+        static BOUNDING_CIRCLE: number;
+
+        static NAIVE: number;
+        static SAP: number;
+
+        static boundingRadiusCheck(bodyA: Body, bodyB: Body): boolean;
+        static aabbCheck(bodyA: Body, bodyB: Body): boolean;
+        static canCollide(bodyA: Body, bodyB: Body): boolean;
+
+        constructor(type: number);
+
+        type: number;
+        result: Body[];
+        world: World;
+        boundingVolumeType: number;
+
+        setWorld(world: World): void;
+        getCollisionPairs(world: World): Body[];
+        boundingVolumeCheck(bodyA: Body, bodyB: Body): boolean;
+
+    }
+
+    export class GridBroadphase extends Broadphase {
+
+        constructor(options?: {
+            xmin?: number;
+            xmax?: number;
+            ymin?: number;
+            ymax?: number;
+            nx?: number;
+            ny?: number;
+        });
+
+        xmin: number;
+        xmax: number;
+        ymin: number;
+        ymax: number;
+        nx: number;
+        ny: number;
+        binsizeX: number;
+        binsizeY: number;
+
+    }
+
+    export class NativeBroadphase extends Broadphase {
+
+    }
+
+    export class Narrowphase {
+
+        contactEquations: ContactEquation[];
+        frictionEquations: FrictionEquation[];
+        enableFriction: boolean;
+        enableEquations: boolean;
+        slipForce: number;
+        frictionCoefficient: number;
+        surfaceVelocity: number;
+        reuseObjects: boolean;
+        resuableContactEquations: any[];
+        reusableFrictionEquations: any[];
+        restitution: number;
+        stiffness: number;
+        relaxation: number;
+        frictionStiffness: number;
+        frictionRelaxation: number;
+        enableFrictionReduction: boolean;
+        contactSkinSize: number;
+
+        collidedLastStep(bodyA: Body, bodyB: Body): boolean;
+        reset(): void;
+        createContactEquation(bodyA: Body, bodyB: Body, shapeA: Shape, shapeB: Shape): ContactEquation;
+        createFrictionFromContact(c: ContactEquation): FrictionEquation;
+
+    }
+
+    export class SAPBroadphase extends Broadphase {
+
+        axisList: Body[];
+        axisIndex: number;
+
+    }
+
+    export class Constraint {
+
+        static DISTANCE: number;
+        static GEAR: number;
+        static LOCK: number;
+        static PRISMATIC: number;
+        static REVOLUTE: number;
+
+        constructor(bodyA: Body, bodyB: Body, type: number, options?: {
+            collideConnected?: boolean;
+            wakeUpBodies?: boolean;
+        });
+
+        type: number;
+        equeations: Equation[];
+        bodyA: Body;
+        bodyB: Body;
+        collideConnected: boolean;
+
+        update(): void;
+        setStiffness(stiffness: number): void;
+        setRelaxation(relaxation: number): void;
+
+    }
+
+    export class DistanceConstraint extends Constraint {
+
+        constructor(bodyA: Body, bodyB: Body, type: number, options?: {
+            collideConnected?: boolean;
+            wakeUpBodies?: boolean;
+            distance?: number;
+            localAnchorA?: number[];
+            localAnchorB?: number[];
+            maxForce?: number;
+        });
+
+        localAnchorA: number[];
+        localAnchorB: number[];
+        distance: number;
+        maxForce: number;
+        upperLimitEnabled: boolean;
+        upperLimit: number;
+        lowerLimitEnabled: boolean;
+        lowerLimit: number;
+        position: number;
+
+        setMaxForce(f: number): void;
+        getMaxForce(): number;
+
+    }
+
+    export class GearConstraint extends Constraint {
+
+        constructor(bodyA: Body, bodyB: Body, type: number, options?: {
+            collideConnected?: boolean;
+            wakeUpBodies?: boolean;
+            angle?: number;
+            ratio?: number;
+            maxTorque?: number;
+        });
+
+        ratio: number;
+        angle: number;
+
+        setMaxTorque(torque: number): void;
+        getMaxTorque(): number;
+
+    }
+
+    export class LockConstraint extends Constraint {
+
+        constructor(bodyA: Body, bodyB: Body, type: number, options?: {
+            collideConnected?: boolean;
+            wakeUpBodies?: boolean;
+            localOffsetB?: number[];
+            localAngleB?: number;
+            maxForce?: number;
+        });
+
+        setMaxForce(force: number): void;
+        getMaxForce(): number;
+
+    }
+
+    export class PrismaticConstraint extends Constraint {
+
+        constructor(bodyA: Body, bodyB: Body, type: number, options?: {
+            collideConnected?: boolean;
+            wakeUpBodies?: boolean;
+            maxForce?: number;
+            localAnchorA?: number[];
+            localAnchorB?: number[];
+            localAxisA?: number[];
+            disableRotationalLock?: boolean;
+            upperLimit?: number;
+            lowerLimit?: number;
+        });
+
+        localAnchorA: number[];
+        localAnchorB: number[];
+        localAxisA: number[];
+        position: number;
+        velocity: number;
+        lowerLimitEnabled: boolean;
+        upperLimitEnabled: boolean;
+        lowerLimit: number;
+        upperLimit: number;
+        upperLimitEquation: ContactEquation;
+        lowerLimitEquation: ContactEquation;
+        motorEquation: Equation;
+        motorEnabled: boolean;
+        motorSpeed: number;
+
+        enableMotor(): void;
+        disableMotor(): void;
+        setLimits(lower: number, upper: number): void;
+
+    }
+
+    export class RevoluteConstraint extends Constraint {
+
+        constructor(bodyA: Body, bodyB: Body, type: number, options?: {
+            collideConnected?: boolean;
+            wakeUpBodies?: boolean;
+            worldPivot?: number[];
+            localPivotA?: number[];
+            localPivotB?: number[];
+            maxForce?: number;
+        });
+
+        pivotA: number[];
+        pivotB: number[];
+        motorEquation: RotationalVelocityEquation;
+        motorEnabled: boolean;
+        angle: number;
+        lowerLimitEnabled: boolean;
+        upperLimitEnabled: boolean;
+        lowerLimit: number;
+        upperLimit: number;
+        upperLimitEquation: ContactEquation;
+        lowerLimitEquation: ContactEquation;
+
+        enableMotor(): void;
+        disableMotor(): void;
+        motorIsEnabled(): boolean;
+        setLimits(lower: number, upper: number): void;
+        setMotorSpeed(speed: number): void;
+        getMotorSpeed(): number;
+
+    }
+
+    export class AngleLockEquation extends Equation {
+
+        constructor(bodyA: Body, bodyB: Body, options?: {
+            angle?: number;
+            ratio?: number;
+        });
+
+        computeGq(): number;
+        setRatio(ratio: number): number;
+        setMaxTorque(torque: number): number;
+
+    }
+
+    export class ContactEquation extends Equation {
+
+        constructor(bodyA: Body, bodyB: Body);
+
+        contactPointA: number[];
+        penetrationVec: number[];
+        contactPointB: number[];
+        normalA: number[];
+        restitution: number;
+        firstImpact: boolean;
+        shapeA: Shape;
+        shapeB: Shape;
+
+        computeB(a: number, b: number, h: number): number;
+
+    }
+
+    export class Equation {
+
+        static DEFAULT_STIFFNESS: number;
+        static DEFAULT_RELAXATION: number;
+
+        constructor(bodyA: Body, bodyB: Body, minForce?: number, maxForce?: number);
+
+        minForce: number;
+        maxForce: number;
+        bodyA: Body;
+        bodyB: Body;
+        stiffness: number;
+        relaxation: number;
+        G: number[];
+        offset: number;
+        a: number;
+        b: number;
+        epsilon: number;
+        timeStep: number;
+        needsUpdate: boolean;
+        multiplier: number;
+        relativeVelocity: number;
+        enabled: boolean;
+
+        gmult(G: number[], vi: number[], wi: number[], vj: number[], wj: number[]): number;
+        computeB(a: number, b: number, h: number): number;
+        computeGq(): number;
+        computeGW(): number;
+        computeGWlambda(): number;
+        computeGiMf(): number;
+        computeGiMGt(): number;
+        addToWlambda(deltalambda: number): number;
+        computeInvC(eps: number): number;
+
+    }
+
+    export class FrictionEquation extends Equation {
+
+        constructor(bodyA: Body, bodyB: Body, slipForce: number);
+
+        contactPointA: number[];
+        contactPointB: number[];
+        t: number[];
+        shapeA: Shape;
+        shapeB: Shape;
+        frictionCoefficient: number;
+
+        setSlipForce(slipForce: number): number;
+        getSlipForce(): number;
+        computeB(a: number, b: number, h: number): number;
+
+    }
+
+    export class RotationalLockEquation extends Equation {
+
+        constructor(bodyA: Body, bodyB: Body, options?: {
+            angle?: number;
+        });
+
+        angle: number;
+
+        computeGq(): number;
+
+    }
+
+    export class RotationalVelocityEquation extends Equation {
+
+        constructor(bodyA: Body, bodyB: Body);
+
+        computeB(a: number, b: number, h: number): number;
+
+    }
+
+    export class EventEmitter {
+
+        on(type: string, listener: Function, context: any): EventEmitter;
+        has(type: string, listener: Function): boolean;
+        off(type: string, listener: Function): EventEmitter;
+        emit(event: any): EventEmitter;
+
+    }
+
+    export class ContactMaterialOptions {
+
+        friction: number;
+        restitution: number;
+        stiffness: number;
+        relaxation: number;
+        frictionStiffness: number;
+        frictionRelaxation: number;
+        surfaceVelocity: number;
+
+    }
+
+    export class ContactMaterial {
+
+        static idCounter: number;
+
+        constructor(materialA: Material, materialB: Material, options?: ContactMaterialOptions);
+
+        id: number;
+        materialA: Material;
+        materialB: Material;
+        friction: number;
+        restitution: number;
+        stiffness: number;
+        relaxation: number;
+        frictionStuffness: number;
+        frictionRelaxation: number;
+        surfaceVelocity: number;
+        contactSkinSize: number;
+
+    }
+
+    export class Material {
+
+        static idCounter: number;
+
+        constructor(id: number);
+
+        id: number;
+
+    }
+
+    export class vec2 {
+
+        static crossLength(a: number[], b: number[]): number;
+        static crossVZ(out: number[], vec: number[], zcomp: number): number;
+        static crossZV(out: number[], zcomp: number, vec: number[]): number;
+        static rotate(out: number[], a: number[], angle: number): void;
+        static rotate90cw(out: number[], a: number[]): number;
+        static centroid(out: number[], a: number[], b: number[], c: number[]): number[];
+        static create(): number[];
+        static clone(a: number[]): number[];
+        static fromValues(x: number, y: number): number[];
+        static copy(out: number[], a: number[]): number[];
+        static set(out: number[], x: number, y: number): number[];
+        static toLocalFrame(out: number[], worldPoint: number[], framePosition: number[], frameAngle: number): void;
+        static toGlobalFrame(out: number[], localPoint: number[], framePosition: number[], frameAngle: number): void;
+        static add(out: number[], a: number[], b: number[]): number[];
+        static subtract(out: number[], a: number[], b: number[]): number[];
+        static sub(out: number[], a: number[], b: number[]): number[];
+        static multiply(out: number[], a: number[], b: number[]): number[];
+        static mul(out: number[], a: number[], b: number[]): number[];
+        static divide(out: number[], a: number[], b: number[]): number[];
+        static div(out: number[], a: number[], b: number[]): number[];
+        static scale(out: number[], a: number[], b: number): number[];
+        static distance(a: number[], b: number[]): number;
+        static dist(a: number[], b: number[]): number;
+        static squaredDistance(a: number[], b: number[]): number;
+        static sqrDist(a: number[], b: number[]): number;
+        static length(a: number[]): number;
+        static len(a: number[]): number;
+        static squaredLength(a: number[]): number;
+        static sqrLen(a: number[]): number;
+        static negate(out: number[], a: number[]): number[];
+        static normalize(out: number[], a: number[]): number[];
+        static dot(a: number[], b: number[]): number;
+        static str(a: number[]): string;
+
+    }
+
+    export interface BodyOptions {
+
+        mass?: number;
+        position?: number[];
+        velocity?: number[];
+        angle?: number;
+        angularVelocity?: number;
+        force?: number[];
+        angularForce?: number;
+        fixedRotation?: boolean;
+
+    }
+
+    export class Body extends EventEmitter {
+
+        sleepyEvent: {
+            type: string;
+        };
+
+        sleepEvent: {
+            type: string;
+        };
+
+        wakeUpEvent: {
+            type: string;
+        };
+
+        static DYNAMIC: number;
+        static STATIC: number;
+        static KINEMATIC: number;
+        static AWAKE: number;
+        static SLEEPY: number;
+        static SLEEPING: number;
+
+        constructor(options?: BodyOptions);
+
+        id: number;
+        world: World;
+        shapes: Shape[];
+        mass: number;
+        invMass: number;
+        inertia: number;
+        invInertia: number;
+        invMassSolve: number;
+        invInertiaSolve: number;
+        fixedRotation: number;
+        position: number[];
+        interpolatedPosition: number[];
+        interpolatedAngle: number;
+        previousPosition: number[];
+        previousAngle: number;
+        velocity: number[];
+        vlambda: number[];
+        wlambda: number[];
+        angle: number;
+        angularVelocity: number;
+        force: number[];
+        angularForce: number;
+        damping: number;
+        angularDamping: number;
+        type: number;
+        boundingRadius: number;
+        aabb: AABB;
+        aabbNeedsUpdate: boolean;
+        allowSleep: boolean;
+        wantsToSleep: boolean;
+        sleepState: number;
+        sleepSpeedLimit: number;
+        sleepTimeLimit: number;
+        gravityScale: number;
+        collisionResponse: boolean;
+
+        updateSolveMassProperties(): void;
+        setDensity(density: number): void;
+        getArea(): number;
+        getAABB(): AABB;
+        updateAABB(): void;
+        updateBoundingRadius(): void;
+        addShape(shape: Shape, offset?: number[], angle?: number): void;
+        removeShape(shape: Shape): boolean;
+        updateMassProperties(): void;
+        applyForce(force: number[], worldPoint: number[]): void;
+        toLocalFrame(out: number[], worldPoint: number[]): void;
+        toWorldFrame(out: number[], localPoint: number[]): void;
+        fromPolygon(path: number[][], options?: {
+            optimalDecomp?: boolean;
+            skipSimpleCheck?: boolean;
+            removeCollinearPoints?: any; //boolean | number
+        }): boolean;
+        adjustCenterOfMass(): void;
+        setZeroForce(): void;
+        resetConstraintVelocity(): void;
+        applyDamping(dy: number): void;
+        wakeUp(): void;
+        sleep(): void;
+        sleepTick(time: number, dontSleep: boolean, dt: number): void;
+        getVelocityFromPosition(story: number[], dt: number): number[];
+        getAngularVelocityFromPosition(timeStep: number): number;
+        overlaps(body: Body): boolean;
+
+    }
+
+    export class Spring {
+
+        constructor(bodyA: Body, bodyB: Body, options?: {
+
+            stiffness?: number;
+            damping?: number;
+            localAnchorA?: number[];
+            localAnchorB?: number[];
+            worldAnchorA?: number[];
+            worldAnchorB?: number[];
+
+        });
+
+        stiffness: number;
+        damping: number;
+        bodyA: Body;
+        bodyB: Body;
+
+        applyForce(): void;
+
+    }
+
+    export class LinearSpring extends Spring {
+
+        localAnchorA: number[];
+        localAnchorB: number[];
+        restLength: number;
+
+        setWorldAnchorA(worldAnchorA: number[]): void;
+        setWorldAnchorB(worldAnchorB: number[]): void;
+        getWorldAnchorA(result: number[]): number[];
+        getWorldAnchorB(result: number[]): number[];
+        applyForce(): void;
+
+    }
+
+    export class RotationalSpring extends Spring {
+
+        constructor(bodyA: Body, bodyB: Body, options?: {
+            restAngle?: number;
+            stiffness?: number;
+            damping?: number;
+        });
+
+        restAngle: number;
+
+    }
+
+    export interface CapsuleOptions extends SharedShapeOptions {
+
+      length?: number;
+      radius?: number;
+
+    }
+
+    export class Capsule extends Shape {
+
+        constructor(options?: CapsuleOptions);
+
+        length: number;
+        radius: number;
+
+    }
+
+    export interface CircleOptions extends SharedShapeOptions {
+
+      radius?: number;
+
+    }
+
+    export class Circle extends Shape {
+
+        constructor(options?: CircleOptions);
+
+        radius: number;
+
+    }
+
+    export interface ConvexOptions extends SharedShapeOptions {
+
+      length?: number;
+      radius?: number;
+
+    }
+
+    export class Convex extends Shape {
+
+        static triangleArea(a: number[], b: number[], c: number[]): number;
+
+        constructor(options?: ConvexOptions);
+
+        vertices: number[][];
+        axes: number[];
+        centerOfMass: number[];
+        triangles: number[];
+        boundingRadius: number;
+
+        projectOntoLocalAxis(localAxis: number[], result: number[]): void;
+        projectOntoWorldAxis(localAxis: number[], shapeOffset: number[], shapeAngle: number, result: number[]): void;
+
+        updateCenterOfMass(): void;
+
+    }
+
+    export interface HeightfieldOptions extends SharedShapeOptions {
+
+        heights?: number[];
+        minValue?: number;
+        maxValue?: number;
+        elementWidth?: number;
+
+    }
+
+    export class Heightfield extends Shape {
+
+        constructor(options?: HeightfieldOptions);
+
+        data: number[];
+        maxValue: number;
+        minValue: number;
+        elementWidth: number;
+
+    }
+
+    export interface SharedShapeOptions {
+
+        position?: number[];
+        angle?: number;
+        collisionGroup?: number;
+        collisionResponse?: boolean;
+        collisionMask?: number;
+        sensor?: boolean;
+
+    }
+
+    export interface ShapeOptions extends SharedShapeOptions {
+
+        type?: number;
+
+    }
+
+    export class Shape {
+
+        static idCounter: number;
+        static CIRCLE: number;
+        static PARTICLE: number;
+        static PLANE: number;
+        static CONVEX: number;
+        static LINE: number;
+        static BOX: number;
+        static CAPSULE: number;
+        static HEIGHTFIELD: number;
+
+        constructor(options?: ShapeOptions);
+
+        type: number;
+        id: number;
+        position: number[];
+        angle: number;
+        boundingRadius: number;
+        collisionGroup: number;
+        collisionResponse: boolean;
+        collisionMask: number;
+        material: Material;
+        area: number;
+        sensor: boolean;
+
+        computeMomentOfInertia(mass: number): number;
+        updateBoundingRadius(): number;
+        updateArea(): void;
+        computeAABB(out: AABB, position: number[], angle: number): void;
+
+    }
+
+    export interface LineOptions extends SharedShapeOptions {
+
+      length?: number;
+
+    }
+
+    export class Line extends Shape {
+
+        constructor(options?: LineOptions);
+
+        length: number;
+
+    }
+
+    export class Particle extends Shape {
+
+        constructor(options?: SharedShapeOptions);
+
+    }
+
+    export class Plane extends Shape {
+
+        constructor(options?: SharedShapeOptions);
+
+    }
+
+    export interface BoxOptions {
+
+      width?: number;
+      height?: number;
+
+    }
+
+    export class Box extends Shape {
+
+        constructor(options?: BoxOptions);
+
+        width: number;
+        height: number;
+
+    }
+
+    export class Solver extends EventEmitter {
+
+        static GS: number;
+        static ISLAND: number;
+
+        constructor(options?: {}, type?: number);
+
+        type: number;
+        equations: Equation[];
+        equationSortFunction: Equation; //Equation | boolean
+
+        solve(dy: number, world: World): void;
+        solveIsland(dy: number, island: Island): void;
+        sortEquations(): void;
+        addEquation(eq: Equation): void;
+        addEquations(eqs: Equation[]): void;
+        removeEquation(eq: Equation): void;
+        removeAllEquations(): void;
+
+    }
+
+    export class GSSolver extends Solver {
+
+        constructor(options?: {
+            iterations?: number;
+            tolerance?: number;
+        });
+
+        iterations: number;
+        tolerance: number;
+        useZeroRHS: boolean;
+        frictionIterations: number;
+        usedIterations: number;
+
+        solve(h: number, world: World): void;
+
+    }
+
+    export class OverlapKeeper {
+
+        constructor(bodyA: Body, shapeA: Shape, bodyB: Body, shapeB: Shape);
+
+        shapeA: Shape;
+        shapeB: Shape;
+        bodyA: Body;
+        bodyB: Body;
+
+        tick(): void;
+        setOverlapping(bodyA: Body, shapeA: Shape, bodyB: Body, shapeB: Body): void;
+        bodiesAreOverlapping(bodyA: Body, bodyB: Body): boolean;
+        set(bodyA: Body, shapeA: Shape, bodyB: Body, shapeB: Shape): void;
+
+    }
+
+    export class TupleDictionary {
+
+        data: number[];
+        keys: number[];
+
+        getKey(id1: number, id2: number): string;
+        getByKey(key: number): number;
+        get(i: number, j: number): number;
+        set(i: number, j: number, value: number): number;
+        reset(): void;
+        copy(dict: TupleDictionary): void;
+
+    }
+
+    export class Utils {
+
+        static appendArray<T>(a: Array<T>, b: Array<T>): Array<T>;
+        static splice<T>(array: Array<T>, index: number, howMany: number): void;
+        static extend(a: any, b: any): void;
+        static defaults(options: any, defaults: any): any;
+
+    }
+
+    export class Island {
+
+        equations: Equation[];
+        bodies: Body[];
+
+        reset(): void;
+        getBodies(result: any): Body[];
+        wantsToSleep(): boolean;
+        sleep(): boolean;
+
+    }
+
+    export class IslandManager extends Solver {
+
+        static getUnvisitedNode(nodes: IslandNode[]): IslandNode; // IslandNode | boolean
+
+        equations: Equation[];
+        islands: Island[];
+        nodes: IslandNode[];
+
+        visit(node: IslandNode, bds: Body[], eqs: Equation[]): void;
+        bfs(root: IslandNode, bds: Body[], eqs: Equation[]): void;
+        split(world: World): Island[];
+
+    }
+
+    export class IslandNode {
+
+        constructor(body: Body);
+
+        body: Body;
+        neighbors: IslandNode[];
+        equations: Equation[];
+        visited: boolean;
+
+        reset(): void;
+
+    }
+
+    export class World extends EventEmitter {
+
+        postStepEvent: {
+            type: string;
+        };
+
+        addBodyEvent: {
+            type: string;
+        };
+
+        removeBodyEvent: {
+            type: string;
+        };
+
+        addSpringEvent: {
+            type: string;
+        };
+
+        impactEvent: {
+            type: string;
+            bodyA: Body;
+            bodyB: Body;
+            shapeA: Shape;
+            shapeB: Shape;
+            contactEquation: ContactEquation;
+        };
+
+        postBroadphaseEvent: {
+            type: string;
+            pairs: Body[];
+        };
+
+        beginContactEvent: {
+            type: string;
+            shapeA: Shape;
+            shapeB: Shape;
+            bodyA: Body;
+            bodyB: Body;
+            contactEquations: ContactEquation[];
+        };
+
+        endContactEvent: {
+            type: string;
+            shapeA: Shape;
+            shapeB: Shape;
+            bodyA: Body;
+            bodyB: Body;
+        };
+
+        preSolveEvent: {
+            type: string;
+            contactEquations: ContactEquation[];
+            frictionEquations: FrictionEquation[];
+        };
+
+        static NO_SLEEPING: number;
+        static BODY_SLEEPING: number;
+        static ISLAND_SLEEPING: number;
+
+        static integrateBody(body: Body, dy: number): void;
+
+        constructor(options?: {
+            solver?: Solver;
+            gravity?: number[];
+            broadphase?: Broadphase;
+            islandSplit?: boolean;
+            doProfiling?: boolean;
+        });
+
+        springs: Spring[];
+        bodies: Body[];
+        solver: Solver;
+        narrowphase: Narrowphase;
+        islandManager: IslandManager;
+        gravity: number[];
+        frictionGravity: number;
+        useWorldGravityAsFrictionGravity: boolean;
+        useFrictionGravityOnZeroGravity: boolean;
+        doProfiling: boolean;
+        lastStepTime: number;
+        broadphase: Broadphase;
+        constraints: Constraint[];
+        defaultMaterial: Material;
+        defaultContactMaterial: ContactMaterial;
+        lastTimeStep: number;
+        applySpringForces: boolean;
+        applyDamping: boolean;
+        applyGravity: boolean;
+        solveConstraints: boolean;
+        contactMaterials: ContactMaterial[];
+        time: number;
+        stepping: boolean;
+        islandSplit: boolean;
+        emitImpactEvent: boolean;
+        sleepMode: number;
+
+        addConstraint(c: Constraint): void;
+        addContactMaterial(contactMaterial: ContactMaterial): void;
+        removeContactMaterial(cm: ContactMaterial): void;
+        getContactMaterial(materialA: Material, materialB: Material): ContactMaterial; // ContactMaterial | boolean
+        removeConstraint(c: Constraint): void;
+        step(dy: number, timeSinceLastCalled?: number, maxSubSteps?: number): void;
+        runNarrowphase(np: Narrowphase, bi: Body, si: Shape, xi: any[], ai: number, bj: Body, sj: Shape, xj: any[], aj: number, cm: number, glen: number): void;
+        addSpring(s: Spring): void;
+        removeSpring(s: Spring): void;
+        addBody(body: Body): void;
+        removeBody(body: Body): void;
+        getBodyByID(id: number): Body; //Body | boolean
+        disableBodyCollision(bodyA: Body, bodyB: Body): void;
+        enableBodyCollision(bodyA: Body, bodyB: Body): void;
+        clear(): void;
+        clone(): World;
+        hitTest(worldPoint: number[], bodies: Body[], precision: number): Body[];
+        setGlobalEquationParameters(parameters: {
+            relaxation?: number;
+            stiffness?: number;
+        }): void;
+        setGlobalStiffness(stiffness: number): void;
+        setGlobalRelaxation(relaxation: number): void;
+    }
+
+}
diff --git a/package.json b/package.json
index 2b9d019f8..52cc5b719 100644
--- a/package.json
+++ b/package.json
@@ -20,22 +20,22 @@
     "node": ">= 0.12.0"
   },
   "scripts": {
-    "test": "./node_modules/.bin/dt --changes",
-    "changes": "./node_modules/.bin/dt --changes",
-    "lint": "./node_modules/.bin/dt --lint",
-    "tscparams": "./node_modules/.bin/dt --tscparams --no-tests --no-headers",
-    "all": "./node_modules/.bin/dt",
-    "dry": "./node_modules/.bin/dt --dry --changes",
-    "list": "./node_modules/.bin/dt --dry --print-files --print-refmap",
-    "last": "./node_modules/.bin/dt --dry --print-files --print-refmap --changes",
-    "files": "./node_modules/.bin/dt --dry --print-files",
-    "refmap": "./node_modules/.bin/dt --dry --print-refmap",
-    "help": "./node_modules/.bin/dt -h"
+    "test": "dt --changes",
+    "changes": "dt --changes",
+    "lint": "dt --lint",
+    "tscparams": "dt --tscparams --no-tests --no-headers",
+    "all": "dt",
+    "dry": "dt --dry --changes",
+    "list": "dt --dry --print-files --print-refmap",
+    "last": "dt --dry --print-files --print-refmap --changes",
+    "files": "dt --dry --print-files",
+    "refmap": "dt --dry --print-refmap",
+    "help": "dt -h"
   },
   "dependencies": {
   },
   "devDependencies": {
     "definition-tester": "0.3.0",
-    "typescript": "1.6.2"
+    "typescript": "1.7.3"
   }
 }
diff --git a/pako/pako-tests.ts b/pako/pako-tests.ts
new file mode 100644
index 000000000..b364d971f
--- /dev/null
+++ b/pako/pako-tests.ts
@@ -0,0 +1,17 @@
+/// <reference path="pako.d.ts" />
+
+import pako = require("pako");
+
+var chunk1 = new Uint8Array([1,2,3,4,5,6,7,8,9])
+var chunk2 = new Uint8Array([10,11,12,13,14,15,16,17,18,19]);
+
+var deflate = new pako.Deflate({ level: 3});
+
+deflate.push(chunk1, false);
+deflate.push(chunk2, true);  // true -> last chunk
+
+if (deflate.err) { 
+	throw new Error( deflate.err.toString() ); 
+}
+
+console.log(deflate.result);
\ No newline at end of file
diff --git a/pako/pako.d.ts b/pako/pako.d.ts
new file mode 100644
index 000000000..1b86f81fa
--- /dev/null
+++ b/pako/pako.d.ts
@@ -0,0 +1,63 @@
+// Type definitions for pako 0.2.8
+// Project: https://github.com/nodeca/pako
+// Definitions by: Denis Cappellin <http://github.com/cappellin>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module Pako {
+
+	/**
+	 * Compress data with deflate algorithm and options.
+	 */
+	export function deflate( data: Uint8Array | Array<number> | string, options?: any ): string;
+	/**
+	 * The same as deflate, but creates raw data, without wrapper (header and adler32 crc).
+	 */
+	export function deflateRaw( data: Uint8Array | Array<number> | string, options?: any ): string;
+	/**
+	 * The same as deflate, but create gzip wrapper instead of deflate one.
+	 */
+	export function gzip( data: Uint8Array | Array<number> | string, options?: any ): string;
+	/**
+	 * Decompress data with inflate/ungzip and options. Autodetect format via wrapper header
+	 * by default. That's why we don't provide separate ungzip method.
+	 */
+	export function inflate( data: Uint8Array | Array<number> | string, options?: any ): Uint8Array;
+	export function inflate( data: Uint8Array | Array<number> | string, options?: any ): Array<number>;
+	export function inflate( data: Uint8Array | Array<number> | string, options?: any ): String;
+	/**
+	 * The same as inflate, but creates raw data, without wrapper (header and adler32 crc).
+	 */
+	export function inflateRaw( data: Uint8Array | Array<number> | string, options?: any ): Uint8Array;
+	export function inflateRaw( data: Uint8Array | Array<number> | string, options?: any ): Array<number>;
+	export function inflateRaw( data: Uint8Array | Array<number> | string, options?: any ): string;
+	/**
+	 * Just shortcut to inflate, because it autodetects format by header.content. Done for convenience.
+	 */
+	export function ungzip( data: Uint8Array | Array<number> | string, options?: any ): Uint8Array;
+	export function ungzip( data: Uint8Array | Array<number> | string, options?: any ): Array<number>;
+	export function ungzip( data: Uint8Array | Array<number> | string, options?: any ): string;
+
+	export class Deflate {
+		constructor( options?: any );
+		err: number;
+		msg: string;
+		result: Uint8Array | Array<number>;
+		onData( chunk: Uint8Array | Array<number> | string ): void;
+		onEnd( status: number ): void;
+		push( data: Uint8Array | Array<number> | ArrayBuffer | string, mode?: number | boolean ): boolean;
+	}
+
+	export class Inflate {
+		constructor( options?: any );
+		err: number;
+		msg: string;
+		result: Uint8Array | Array<number> | string;
+		onData( chunk: Uint8Array | Array<number> | string ): void;
+		onEnd( status: number ): void;
+		push( data: Uint8Array | Array<number> | ArrayBuffer | string, mode?: number | boolean ): boolean;
+	}
+}
+
+declare module 'pako' {
+	export = Pako;
+}
diff --git a/pegjs/pegjs.d.ts b/pegjs/pegjs.d.ts
index c42b9aae5..1e8bfc6ad 100644
--- a/pegjs/pegjs.d.ts
+++ b/pegjs/pegjs.d.ts
@@ -6,11 +6,22 @@
 declare module PEG {
 	function parse(input:string):any;
 
-	class SyntaxError {
-		line:number;
-		column:number;
-		offset:number;
+	interface Location {
+		line: number;
+		column: number;
+		offset: number;		
+	}
 
+	interface LocationRange {
+		start: Location,
+		end: Location
+	}
+
+	class SyntaxError {
+		line: number;
+		column: number;
+		offset: number;	
+		location: LocationRange;
 		expected:any[];
 		found:any;
 		name:string;
diff --git a/phonegap-plugin-push/phonegap-plugin-push-tests.ts b/phonegap-plugin-push/phonegap-plugin-push-tests.ts
index 916a6cf82..339c7e8e1 100644
--- a/phonegap-plugin-push/phonegap-plugin-push-tests.ts
+++ b/phonegap-plugin-push/phonegap-plugin-push-tests.ts
@@ -1,26 +1,39 @@
 /// <reference path="phonegap-plugin-push.d.ts" />
 
 function test() {
-	var options:PhonegapPluginPush.InitOptions = {
+	let options: PhonegapPluginPush.InitOptions = {
 		android: {
 			senderID: '123456789',
 			icon: 'phonegap',
 			iconColor: 'blue',
 			sound: true,
 			vibrate: true,
-			clearNotifications: false
+			clearNotifications: false,
+			forceShow: true
 		},
 		ios: {
 			badge: true,
 			sound: true,
-			alert: true
+			alert: true,
+			clearBadge: true
 		},
 		windows: {}
 	};
-	var push:PhonegapPluginPush.PushNotification;
+
+	let iosStringOptions = {
+		badge: 'true',
+		sound: 'true',
+		alert: 'true',
+		clearBadge: 'true'
+	};
+
+	options.ios = iosStringOptions;
+
+	let push: PhonegapPluginPush.PushNotification;
 
 	/*from constructor*/
 	push = new PushNotification(options);
+	push = new window.PushNotification(options);
 
 	push.unregister(() => {
 		console.log('did unregister');
@@ -30,12 +43,13 @@ function test() {
 
 	/*from init*/
 	push = PushNotification.init(options);
+	push = window.PushNotification.init(options);
 
-	push.on('registration', (data:PhonegapPluginPush.RegistrationEventResponse) => {
+	let registrationHandler = (data: PhonegapPluginPush.RegistrationEventResponse) => {
 		console.log(data.registrationId);
-	});
+	};
 
-	push.on('notification', (data:PhonegapPluginPush.NotificationEventResponse) => {
+	let notificationHandler = (data: PhonegapPluginPush.NotificationEventResponse) => {
 		console.log(data.message);
 		console.log(data.title);
 		console.log(data.count);
@@ -45,15 +59,35 @@ function test() {
 		/*the rest of the additional fields are not 'canon'*/
 		console.log(data.additionalData);
 		console.log(data.additionalData.foreground);
-	});
 
-	push.on('error', (e:Error) => {
+		push.finish(() => {
+			console.log('did finish');
+		}, () => {
+			console.log('did not finish');
+		});
+	};
+
+	let errorHandler = (e: Error) => {
 		console.log(e.message);
-	});
+	};
+
+	push.on('registration', registrationHandler);
+	push.on('notification', notificationHandler);
+	push.on('error', errorHandler);
+
+	push.off('registration', registrationHandler);
+	push.off('notification', notificationHandler);
+	push.off('error', errorHandler);
 
 	push.setApplicationIconBadgeNumber(() => {
 		console.log('did setApplicationIconBadgeNumber');
 	}, () => {
 		console.log('did not setApplicationIconBadgeNumber');
 	}, 1);
+
+	push.getApplicationIconBadgeNumber((count: number) => {
+		console.log('did getApplicationIconBadgeNumber', count);
+	}, () => {
+		console.log('did not getApplicationIconBadgeNumber');
+	});
 }
diff --git a/phonegap-plugin-push/phonegap-plugin-push.d.ts b/phonegap-plugin-push/phonegap-plugin-push.d.ts
index e9168a642..a8807cc34 100644
--- a/phonegap-plugin-push/phonegap-plugin-push.d.ts
+++ b/phonegap-plugin-push/phonegap-plugin-push.d.ts
@@ -12,43 +12,77 @@ declare module PhonegapPluginPush {
 		 * @param event
 		 * @param callback
 		 */
-		on(event:"registration", callback:(response:RegistrationEventResponse)=>any):void
+		on(event: "registration", callback: (response: RegistrationEventResponse) => any): void
 		/**
 		 * The event notification will be triggered each time a push notification is received by a 3rd party push service on the device.
 		 * @param event
 		 * @param callback
 		 */
-		on(event:"notification", callback:(response:NotificationEventResponse)=>any):void
+		on(event: "notification", callback: (response: NotificationEventResponse) => any): void
 		/**
 		 * The event error will trigger when an internal error occurs and the cache is aborted.
 		 * @param event
 		 * @param callback
 		 */
-		on(event:"error", callback:(response:Error)=>any):void
-		/*Generic one, needed for the overloads*/
+		on(event: "error", callback: (response: Error) => any): void
 		/**
 		 *
 		 * @param event Name of the event to listen to. See below(above) for all the event names.
 		 * @param callback is called when the event is triggered.
+		 * @param event
+		 * @param callback
 		 */
-		on(event:string, callback:(response:EventResponse)=>any):void
+		on(event: string, callback: (response: EventResponse) => any): void
+
+		off(event: "registration", callback: (response: RegistrationEventResponse) => any): void
+		off(event: "notification", callback: (response: NotificationEventResponse) => any): void
+		off(event: "error", callback: (response: Error) => any): void
+		/**
+		 * As stated in the example, you will have to store your event handler if you are planning to remove it.
+		 * @param event Name of the event type. The possible event names are the same as for the push.on function.
+		 * @param callback handle to the function to get removed.
+		 * @param event
+		 * @param callback
+		 */
+		off(event: string, callback: (response: EventResponse) => any): void
 
 		/**
 		 * The unregister method is used when the application no longer wants to receive push notifications.
+		 * Beware that this cleans up all event handlers previously registered,
+		 * so you will need to re-register them if you want them to function again without an application reload.
 		 * @param successHandler
 		 * @param errorHandler
 		 */
-		unregister(successHandler:()=>any, errorHandler?:()=>any):void
+		unregister(successHandler: () => any, errorHandler?: () => any): void
+
 		/*TODO according to js source code, "errorHandler" is optional, but is "count" also optional? I can't read objetive-C code (can anyone at all? I wonder...)*/
 		/**
 		 * Set the badge count visible when the app is not running
 		 *
-		 * The count is an integer indicating what number should show up in the badge. Passing 0 will clear the badge. Each notification event contains a data.count value which can be used to set the badge to correct number.
+		 * The count is an integer indicating what number should show up in the badge.
+		 * Passing 0 will clear the badge.
+		 * Each notification event contains a data.count value which can be used to set the badge to correct number.
 		 * @param successHandler
 		 * @param errorHandler
 		 * @param count
 		 */
-		setApplicationIconBadgeNumber(successHandler:()=>any, errorHandler:()=>any, count:number):void
+		setApplicationIconBadgeNumber(successHandler: () => any, errorHandler: () => any, count: number): void
+		/**
+		 * Get the current badge count visible when the app is not running
+		 * successHandler gets called with an integer which is the current badge count
+		 * @param successHandler
+		 * @param errorHandler
+		 */
+		getApplicationIconBadgeNumber(successHandler: (count: number) => any, errorHandler: () => any): void
+		
+		/**
+		 * iOS only
+		 * Tells the OS that you are done processing a background push notification.
+		 * successHandler gets called when background push processing is successfully completed.
+		 * @param successHandler
+		 * @param errorHandler
+		 */
+		finish(successHandler: () => any, errorHandler: () => any): void
 	}
 
 	/**
@@ -62,28 +96,32 @@ declare module PhonegapPluginPush {
 			/**
 			 * Maps to the project number in the Google Developer Console.
 			 */
-			senderID:string
+			senderID: string
 			/**
-			 * The name of a drawable resource to use as the small-icon.
+			 * The name of a drawable resource to use as the small-icon. The name should not include the extension.
 			 */
-			icon?:string
+			icon?: string
 			/**
-			 * Sets the background color of the small icon.
+			 * Sets the background color of the small icon on Android 5.0 and greater.
 			 * Supported Formats - http://developer.android.com/reference/android/graphics/Color.html#parseColor(java.lang.String)
 			 */
-			iconColor?:string
+			iconColor?: string
 			/**
 			 * If true it plays the sound specified in the push data or the default system sound. Default is true.
 			 */
-			sound?:boolean
+			sound?: boolean
 			/**
 			 * If true the device vibrates on receipt of notification. Default is true.
 			 */
-			vibrate?:boolean
+			vibrate?: boolean
 			/**
 			 * If true the app clears all pending notifications when it is closed. Default is true.
 			 */
-			clearNotifications?:boolean
+			clearNotifications?: boolean
+			/**
+			 * If true will always show a notification, even when the app is on the foreground. Default is false.
+			 */
+			forceShow?: boolean
 		}
 
 		/**
@@ -91,17 +129,33 @@ declare module PhonegapPluginPush {
 		 */
 		ios?: {
 			/**
-			 * If true the device shows an alert on receipt of notification. Default is false.
+			 * If true|"true" the device sets the badge number on receipt of notification.
+			 * Default is false|"false".
+			 * Note: the value you set this option to the first time you call the init method will be how the application always acts.
+			 * Once this is set programmatically in the init method it can only be changed manually by the user in Settings>Notifications>App Name.
+			 * This is normal iOS behaviour.
 			 */
-			badge?: boolean
+			badge?: boolean | string
 			/**
-			 * If true the device sets the badge number on receipt of notification. Default is false.
+			 * If true|"true" the device plays a sound on receipt of notification.
+			 * Default is false|"false".
+			 * Note: the value you set this option to the first time you call the init method will be how the application always acts.
+			 * Once this is set programmatically in the init method it can only be changed manually by the user in Settings>Notifications>App Name.
+			 * This is normal iOS behaviour.
 			 */
-			sound?: boolean
+			sound?: boolean | string
 			/**
-			 * If true the device plays a sound on receipt of notification. Default is false.
+			 * If true|"true" the device shows an alert on receipt of notification.
+			 * Default is false|"false".
+			 * Note: the value you set this option to the first time you call the init method will be how the application always acts.
+			 * Once this is set programmatically in the init method it can only be changed manually by the user in Settings>Notifications>App Name.
+			 * This is normal iOS behaviour.
 			 */
-			alert?: boolean
+			alert?: boolean | string
+			/**
+			 * If true|"true" the badge will be cleared on app startup. Default is false|"false".
+			 */
+			clearBadge?: boolean | string
 		}
 
 		/**
@@ -116,63 +170,64 @@ declare module PhonegapPluginPush {
 		/**
 		 * The registration ID provided by the 3rd party remote push service.
 		 */
-		registrationId:string
+		registrationId: string
 	}
 
 	interface NotificationEventResponse {
 		/**
 		 * The text of the push message sent from the 3rd party service.
 		 */
-		message:string
+		message: string
 		/**
 		 * The optional title of the push message sent from the 3rd party service.
 		 */
-		title?:string
+		title?: string
 		/**
 		 * The number of messages to be displayed in the badge iOS or message count in the notification shade in Android.
 		 * For windows, it represents the value in the badge notification which could be a number or a status glyph.
 		 */
-		count:string
+		count: string
 		/**
 		 * The name of the sound file to be played upon receipt of the notification.
 		 */
-		sound:string
+		sound: string
 		/**
 		 * The path of the image file to be displayed in the notification.
 		 */
-		image:string
+		image: string
 		/**
 		 * An optional collection of data sent by the 3rd party push service that does not fit in the above properties.
 		 */
 		additionalData: NotificationEventAdditionalData
 	}
 
+	/**
+	 * TODO: document all possible properties (I only got the android ones)
+	 *
+	 * Loosened up with a dictionary notation, but all non-defined properties need to use (map['prop']) notation
+	 *
+	 * Ideally the developer would overload (merged declaration) this or create a new interface that would extend this one
+	 * so that he could specify any custom code without having to use array notation (map['prop']) for all of them.
+	 */
 	interface NotificationEventAdditionalData {
-		/**
-		 * TODO: document all possible properties (I only got the android ones)
-		 *
-		 * Loosened up with a dictionary notation, but all non-defined properties need to use (map['prop']) notation
-		 *
-		 * Ideally the developer would overload (merged declaration) this or create a new interface that would extend this one
-		 * so that he could specify any custom code without having to use array notation (map['prop']) for all of them.
-		 */
 		[name: string]: any
+
 		/**
 		 * Whether the notification was received while the app was in the foreground
 		 */
-		foreground?:boolean
-		collapse_key?:string
-		from?:string
-		notId?:string
+		foreground?: boolean
+		collapse_key?: string
+		from?: string
+		notId?: string
 	}
 
 	interface PushNotificationStatic {
-		init(options:InitOptions):PushNotification
-		new(options:InitOptions):PushNotification
+		init(options: InitOptions): PushNotification
+		new (options: InitOptions): PushNotification
 	}
 }
 
 interface Window {
-	PushNotification:PhonegapPluginPush.PushNotificationStatic
+	PushNotification: PhonegapPluginPush.PushNotificationStatic
 }
-declare var PushNotification:PhonegapPluginPush.PushNotificationStatic;
+declare var PushNotification: PhonegapPluginPush.PushNotificationStatic;
diff --git a/pixi.js/pixi.js-tests.ts b/pixi.js/pixi.js-tests.ts
index 6a462fc2e..3d3098c38 100644
--- a/pixi.js/pixi.js-tests.ts
+++ b/pixi.js/pixi.js-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="pixi.js.d.ts" />
-
 module basics {
 
     export class Basics {
diff --git a/pixi.js/pixi.js.d.ts b/pixi.js/pixi.js.d.ts
index d3f268d2f..5886fc419 100644
--- a/pixi.js/pixi.js.d.ts
+++ b/pixi.js/pixi.js.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Pixi.js 3.0.7
+// Type definitions for Pixi.js 3.0.9 dev
 // Project: https://github.com/GoodBoyDigital/pixi.js/
 // Definitions by: clark-stevenson <https://github.com/pixijs/pixi-typescript>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -10,7 +10,7 @@ declare class PIXI {
     static RAD_TO_DEG: number;
     static DEG_TO_RAD: number;
     static TARGET_FPMS: number;
-    static RENDER_TYPE: {
+    static RENDERER_TYPE: {
         UNKNOWN: number;
         WEBGL: number;
         CANVAS: number;
@@ -155,6 +155,8 @@ declare module PIXI {
         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;
@@ -290,7 +292,7 @@ declare module PIXI {
         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;
+        drawPolygon(path: number[] | Point[]): Graphics;
         clear(): Graphics;
         //todo
         generateTexture(renderer: WebGLRenderer | CanvasRenderer, resolution?: number, scaleMode?: number): Texture;
@@ -344,6 +346,8 @@ declare module PIXI {
         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;
@@ -444,6 +448,7 @@ declare module PIXI {
         rotation?: boolean;
         uvs?: boolean;
         alpha?: boolean;
+
     }
     export class ParticleContainer extends Container {
 
@@ -451,8 +456,11 @@ declare module PIXI {
 
         protected _maxSize: number;
         protected _batchSize: number;
+        protected _properties: boolean[];
+        protected _buffers: WebGLBuffer[];
+        protected _bufferToUpdate: number;
 
-        protected onChildrenChange: () => void;
+        protected onChildrenChange: (smallestChildIndex?: number) => void;
 
         interactiveChildren: boolean;
         blendMode: number;
@@ -492,18 +500,17 @@ declare module PIXI {
     //renderers
 
     export interface RendererOptions {
+
         view?: HTMLCanvasElement;
         transparent?: boolean
         antialias?: boolean;
         resolution?: number;
+        clearBeforeRendering?: boolean;
         preserveDrawingBuffer?: boolean;
         forceFXAA?: boolean;
         roundPixels?: boolean;
-
-        autoResize?: boolean;
         backgroundColor?: number;
-        blendModes?: { [s: string]: any; };
-        clearBeforeRender?: boolean;
+
     }
     export class SystemRenderer extends EventEmitter {
 
@@ -525,6 +532,7 @@ declare module PIXI {
         blendModes: any; //todo?
         preserveDrawingBuffer: boolean;
         clearBeforeRender: boolean;
+        roundPixels: boolean;
         backgroundColor: number;
 
         render(object: DisplayObject): void;
@@ -543,8 +551,6 @@ declare module PIXI {
         refresh: boolean;
         maskManager: CanvasMaskManager;
         roundPixels: boolean;
-        currentScaleMode: number;
-        currentBlendMode: number;
         smoothProperty: string;
 
         render(object: DisplayObject): void;
@@ -612,6 +618,7 @@ declare module PIXI {
         protected _createContext(): void;
         protected handleContextLost: (event: WebGLContextEvent) => void;
         protected _mapGlModes(): void;
+        protected _managedTextures: Texture[];
 
         constructor(width?: number, height?: number, options?: RendererOptions);
 
@@ -629,7 +636,7 @@ declare module PIXI {
         setObjectRenderer(objectRenderer: ObjectRenderer): void;
         setRenderTarget(renderTarget: RenderTarget): void;
         updateTexture(texture: BaseTexture | Texture): BaseTexture | Texture;
-        destroyTexture(texture: BaseTexture | Texture): void;
+        destroyTexture(texture: BaseTexture | Texture, _skipRemove?: boolean): void;
 
     }
     export class AbstractFilter {
@@ -764,7 +771,7 @@ declare module PIXI {
         fragmentSrc: string;
 
         init(): void;
-        cacheUniformLocations(keys: string): void;
+        cachUniformLocations(keys: string): void;
         cacheAttributeLocations(keys: string): void;
         compile(): WebGLProgram;
         syncUniform(uniform: any): void;
@@ -841,6 +848,7 @@ declare module PIXI {
 
         map(rect: Rectangle, rect2: Rectangle): void;
         upload(): void;
+        destroy(): void;
 
     }
 
@@ -954,7 +962,7 @@ declare module PIXI {
         static fromImage(imageUrl: string, crossorigin?: boolean, scaleMode?: number): BaseTexture;
         static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): BaseTexture;
 
-        protected _glTextures: any[];
+        protected _glTextures: any;
 
         protected _sourceLoaded(): void;
 
@@ -969,7 +977,7 @@ declare module PIXI {
         scaleMode: number;
         hasLoaded: boolean;
         isLoading: boolean;
-        source: HTMLImageElement | HTMLCanvasElement;
+        source: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement;
         premultipliedAlpha: boolean;
         imageUrl: string;
         isPowerOfTwo: boolean;
@@ -1072,10 +1080,9 @@ declare module PIXI {
     export class VideoBaseTexture extends BaseTexture {
 
         static fromVideo(video: HTMLVideoElement, scaleMode?: number): VideoBaseTexture;
-        static fromUrl(videoSrc: string | any | string[]| any[]): VideoBaseTexture;
+        static fromUrl(videoSrc: string | any | string[] | any[]): VideoBaseTexture;
 
         protected _loaded: boolean;
-
         protected _onUpdate(): void;
         protected _onPlayStart(): void;
         protected _onPlayStop(): void;
@@ -1096,11 +1103,11 @@ declare module PIXI {
         static uuid(): number;
         static hex2rgb(hex: number, out?: number[]): number[];
         static hex2String(hex: number): string;
-        static rbg2hex(rgb: Number[]): number;
+        static rgb2hex(rgb: Number[]): number;
         static canUseNewCanvasBlendModel(): boolean;
         static getNextPowerOfTwo(number: number): number;
         static isPowerOfTwo(width: number, height: number): boolean;
-        static getResolutionOfUrl(url: string): boolean;
+        static getResolutionOfUrl(url: string): number;
         static sayHello(type: string): void;
         static isWebGLSupported(): boolean;
         static sign(n: number): number;
@@ -1147,6 +1154,7 @@ declare module PIXI {
             textWidth: number;
             textHeight: number;
             maxWidth: number;
+            maxLineHeight: number;
             dirty: boolean;
 
             tint: number;
@@ -1165,7 +1173,8 @@ declare module PIXI {
             static fromFrames(frame: string[]): MovieClip;
             static fromImages(images: string[]): MovieClip;
 
-            protected _textures: Texture;
+            protected _textures: Texture[];
+            protected _durations: number[];
             protected _currentTime: number;
 
             protected update(deltaTime: number): void;
@@ -1527,6 +1536,10 @@ declare module PIXI {
             xhrType?: string;
 
         }
+        export interface ResourceDictionary {
+
+            [index: string]: PIXI.loaders.Resource;
+        }
         export class Loader extends EventEmitter {
 
             constructor(baseUrl?: string, concurrency?: number);
@@ -1534,7 +1547,7 @@ declare module PIXI {
             baseUrl: string;
             progress: number;
             loading: boolean;
-            resources: Resource[];
+            resources: ResourceDictionary;
 
             add(name: string, url: string, options?: LoaderOptions, cb?: () => void): Loader;
             add(url: string, options?: LoaderOptions, cb?: () => void): Loader;
@@ -1633,6 +1646,7 @@ declare module PIXI {
             blendMode: number;
             canvasPadding: number;
             drawMode: number;
+            shader: Shader;
 
             getBounds(matrix?: Matrix): Rectangle;
             containsPoint(point: Point): boolean;
@@ -1660,6 +1674,15 @@ declare module PIXI {
             refresh(): void;
 
         }
+        export class Plane extends Mesh {
+
+            segmentsX: number;
+            segmentsY: number;
+
+            constructor(texture: Texture, segmentsX?: number, segmentsY?: number);
+
+        }
+
 
         export class MeshRenderer extends ObjectRenderer {
 
@@ -1719,4 +1742,4 @@ declare module PIXI {
 
 declare module 'pixi.js' {
     export = PIXI;
-}
\ No newline at end of file
+}
diff --git a/protobufjs/protobufjs-tests.ts b/protobufjs/protobufjs-tests.ts
index f20efec3c..94afba0a8 100644
--- a/protobufjs/protobufjs-tests.ts
+++ b/protobufjs/protobufjs-tests.ts
@@ -409,7 +409,7 @@ function assertIsRPCMethod(rpc: ProtoBuf.ReflectRPCMethod, name: string) {
     assertIsMethod(rpc, name);
 
     assertIsMessage(rpc.resolvedRequestType, name + ".resolvedRequestType");
-    assertIsMessage(rpc.resolveResponseType, name + ".resolvedResponsetype");
+    assertIsMessage(rpc.resolvedResponseType, name + ".resolvedResponsetype");
 }
 
 testProtoBufJs();
diff --git a/protobufjs/protobufjs.d.ts b/protobufjs/protobufjs.d.ts
index 7133df6f6..ec8131e7f 100644
--- a/protobufjs/protobufjs.d.ts
+++ b/protobufjs/protobufjs.d.ts
@@ -379,7 +379,7 @@ declare module ProtoBuf {
         requestName: string;
         responseName: string;
         resolvedRequestType: ReflectMessage;
-        resolveResponseType: ReflectMessage;
+        resolvedResponseType: ReflectMessage;
     }
 
 }
diff --git a/q/Q.d.ts b/q/Q.d.ts
index 50ee49c52..ba30b2745 100644
--- a/q/Q.d.ts
+++ b/q/Q.d.ts
@@ -206,6 +206,11 @@ declare module Q {
      * 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: IPromise<T>[]): Promise<T[]>;
+    
+    /**
+    * Returns a promise for the first of an array of promises to become settled.
+    */
+    export function race<T>(promises: IPromise<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.
diff --git a/query-string/query-string-tests.ts b/query-string/query-string-tests.ts
new file mode 100644
index 000000000..597d270f2
--- /dev/null
+++ b/query-string/query-string-tests.ts
@@ -0,0 +1,13 @@
+/// <reference path="./query-string.d.ts" />
+
+import qs = require('query-string');
+
+qs.stringify({ foo: 'bar' });
+qs.stringify({ foo: 'bar', bar: 'baz' });
+
+qs.parse('?foo=bar');
+qs.parse('#foo=bar');
+qs.parse('&foo=bar&foo=baz');
+
+qs.extract('http://foo.bar/?abc=def&hij=klm');
+qs.extract('http://foo.bar/?foo=bar');
diff --git a/query-string/query-string.d.ts b/query-string/query-string.d.ts
new file mode 100644
index 000000000..e4d76d003
--- /dev/null
+++ b/query-string/query-string.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for query-string v3.0.0
+// Project: https://github.com/sindresorhus/query-string
+// Definitions by: Sam Verschueren <https://github.com/SamVerschueren>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "query-string" {
+    /**
+     * Parse a query string into an object.
+     * Leading ? or # are ignored, so you can pass location.search or location.hash directly.
+     * @param str
+     */
+    export function parse(str: string): any;
+
+    /**
+     * Stringify an object into a query string, sorting the keys.
+     *
+     * @param obj
+     */
+    export function stringify(obj: any): string;
+
+    /**
+     * Extract a query string from a URL that can be passed into .parse().
+     *
+     * @param str
+     */
+    export function extract(str: string): string;
+}
diff --git a/qunit/qunit-tests.ts b/qunit/qunit-tests.ts
index dd0335aed..9a3486118 100644
--- a/qunit/qunit-tests.ts
+++ b/qunit/qunit-tests.ts
@@ -170,6 +170,30 @@ QUnit.module("module A", {
     }
 });
 
+QUnit.module("module with async setup and teardown", {
+    setup: function (assert) {
+        var done = assert.async();
+        setTimeout(function () {
+            // prepare something for all following tests
+        });
+    },
+    teardown: function (assert) {
+        // clean up after each test
+    }
+});
+
+QUnit.module("module with async setup and teardown", {
+    beforeEach: function (assert: QUnitAssert) {
+        var done = assert.async();
+        setTimeout(function () {
+            // prepare something for all following tests
+        });
+    },
+    afterEach: function () {
+        // clean up after each test
+    }
+});
+
 QUnit.test("a test", function (assert) {
 
     function square(x) {
diff --git a/qunit/qunit.d.ts b/qunit/qunit.d.ts
index fde535a68..98b513b9a 100644
--- a/qunit/qunit.d.ts
+++ b/qunit/qunit.d.ts
@@ -148,23 +148,27 @@ interface URLConfigItem {
 interface LifecycleObject {
     /**
      * Runs before each test
+     * @param assert
      * @deprecated
      */
-    setup?: () => void;
+    setup?: (assert: QUnitAssert) => void;
 
     /**
      * Runs after each test
+     * @param assert
      * @deprecated
      */
-    teardown?: () => void;
+    teardown?: (assert: QUnitAssert) => void;
     /**
      * Runs before each test
+     * @param assert
      */
-    beforeEach?: () => void;
+    beforeEach?: (assert: QUnitAssert) => void;
     /**
      * Runs after each test
+     * @param assert
      */
-    afterEach?: () => void;
+    afterEach?: (assert: QUnitAssert) => void;
 
     /**
      * Any additional properties on the hooks object will be added to that context.
diff --git a/ratelimiter/ratelimiter-tests.ts b/ratelimiter/ratelimiter-tests.ts
new file mode 100644
index 000000000..14d42422e
--- /dev/null
+++ b/ratelimiter/ratelimiter-tests.ts
@@ -0,0 +1,17 @@
+/// <reference path="../redis/redis.d.ts" />
+/// <reference path="./ratelimiter.d.ts" />
+
+import redis = require('redis');
+import Limiter = require('ratelimiter');
+
+let id: string;
+let db: redis.RedisClient;
+let limit = new Limiter({ id: id, db: db });
+
+const str: string = limit.inspect();
+
+limit.get((err, limit): void => {
+	const total: number = limit.total;
+	const remaining: number = limit.remaining;
+	const reset: number = limit.reset;
+});
diff --git a/ratelimiter/ratelimiter.d.ts b/ratelimiter/ratelimiter.d.ts
new file mode 100644
index 000000000..6e9883dd5
--- /dev/null
+++ b/ratelimiter/ratelimiter.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for ratelimiter 2.1.1
+// Project: https://github.com/tj/node-ratelimiter
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../redis/redis.d.ts" />
+
+declare module "ratelimiter" {
+	import { RedisClient } from 'redis';
+
+	interface LimiterOption {
+		/**
+		 * The identifier to limit against (typically a user id)
+		 */
+		id: string;
+
+		/**
+		 * Redis connection instance
+		 */
+		db: RedisClient;
+
+		/**
+		 * Max requests within duration
+		 */
+		max?: number;
+
+		/**
+		 * Duration of limit in milliseconds
+		 */
+		duration?: number;
+	}
+
+	interface LimiterInfo {
+		/**
+		 * max value
+		 */
+		total: number;
+
+		/**
+		 * Number of calls left in current duration without decreasing current get
+		 */
+		remaining: number;
+
+		/**
+		 * Time in milliseconds until the end of current duration
+		 */
+		reset: number;
+	}
+
+	class Limiter {
+		constructor(opts: LimiterOption);
+
+		inspect(): string;
+
+		get(fn: (err: any, info: LimiterInfo) => void): void;
+	}
+
+	export = Limiter;
+}
diff --git a/react-day-picker/react-day-picker-tests.tsx b/react-day-picker/react-day-picker-tests.tsx
new file mode 100644
index 000000000..984834dfd
--- /dev/null
+++ b/react-day-picker/react-day-picker-tests.tsx
@@ -0,0 +1,22 @@
+/// <reference path="react-day-picker.d.ts" />
+/// <reference path="../react/react-global.d.ts" />
+
+import * as DayPicker2 from "react-day-picker";
+
+function isSunday(day: Date) {
+    return day.getDay() === 0;
+}
+
+// make sure global variable version works
+function MyComponent2() {
+    return <DayPicker ref="foo" initialMonth={ new Date(2016, 1) } localeUtils={DayPicker.LocaleUtils} modifiers={{ isSunday }} />
+}
+DayPicker.DateUtils.clone(new Date());
+DayPicker.DateUtils.isDayInRange(new Date(), {from: new Date()});
+
+// make sure imported version works
+function MyComponent() {
+   return <DayPicker2 ref="foo" initialMonth={ new Date(2016, 1) } localeUtils={DayPicker2.LocaleUtils} modifiers={{ isSunday }} />
+}
+DayPicker2.DateUtils.clone(new Date());
+DayPicker2.DateUtils.isDayInRange(new Date(), { from: new Date() });
diff --git a/react-day-picker/react-day-picker-tests.tsx.tscparams b/react-day-picker/react-day-picker-tests.tsx.tscparams
new file mode 100644
index 000000000..0fa3ed717
--- /dev/null
+++ b/react-day-picker/react-day-picker-tests.tsx.tscparams
@@ -0,0 +1 @@
+--target es5 --noImplicitAny --jsx react
diff --git a/react-day-picker/react-day-picker.d.ts b/react-day-picker/react-day-picker.d.ts
new file mode 100644
index 000000000..94214ec45
--- /dev/null
+++ b/react-day-picker/react-day-picker.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for react-day-picker v1.1.4
+// Project: https://github.com/gpbl/react-day-picker
+// Definitions by: Giampaolo Bellavite <https://github.com/gpbl>, Jason Killian <https://github.com/jkillian>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../react/react.d.ts" />
+
+declare module "react-day-picker" {
+    import DayPicker = ReactDayPicker.DayPicker;
+    export = DayPicker;
+}
+
+declare var DayPicker: typeof ReactDayPicker.DayPicker;
+
+declare namespace ReactDayPicker {
+    interface LocaleUtils {
+        formatMonthTitle: (month: Date, locale: string) => string;
+        formatWeekdayShort: (weekday: number, locale: string) => string;
+        formatWeekdayLong: (weekday: number, locale: string) => string;
+        getFirstDayOfWeek: (locale: string) => number;
+    }
+
+    interface Modifiers {
+        [name: string]: (date: Date) => boolean;
+    }
+
+    interface Props extends __React.Props<DayPicker>{
+        modifiers?: Modifiers;
+        initialMonth?: Date;
+        numberOfMonths?: number;
+        renderDay?: (date: Date) => number | string | JSX.Element;
+        enableOutsideDays?: boolean;
+        canChangeMonth?: boolean;
+        fromMonth?: Date;
+        toMonth?: Date;
+        localeUtils?: LocaleUtils;
+        locale?: string;
+        onDayClick?: (e: __React.SyntheticEvent, day: Date, modifiers: string[]) => any;
+        onDayTouchTap?: (e: __React.SyntheticEvent, day: Date, modifiers: string[]) => any;
+        onDayMouseEnter?: (e: __React.SyntheticEvent, day: Date, modifiers: string[]) => any;
+        onDayMouseLeave?: (e: __React.SyntheticEvent, day: Date, modifiers: string[]) => any;
+        onMonthChange?: (month: Date) => any;
+        onCaptionClick?: (e: __React.SyntheticEvent, month: Date) => any;
+        className?: string;
+        style?: __React.CSSProperties;
+        tabIndex?: number;
+    }
+
+    class DayPicker extends __React.Component<Props, {}> {
+        showMonth(month: Date): void;
+        showPreviousMonth(): void;
+        showNextMonth(): void;
+    }
+
+    namespace DayPicker {
+        var LocaleUtils: LocaleUtils;
+        namespace DateUtils {
+            function clone(d: Date): Date;
+            function isSameDay(d1?: Date, d2?: Date): boolean;
+            function isPastDay(d: Date): boolean;
+            function isDayBetween(day: Date, startDate: Date, endDate: Date): boolean;
+            function addDayToRange(day: Date, range: { from?: Date, to?: Date }): { from?: Date, to?: Date };
+            function isDayInRange(day: Date, range: { from?: Date, to?: Date }): boolean;
+        }  
+    }
+}
diff --git a/react-dom/react-dom.d.ts b/react-dom/react-dom.d.ts
deleted file mode 100644
index 1351fa02e..000000000
--- a/react-dom/react-dom.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for React-DOM v0.14.0-rc
-// Project: https://www.npmjs.com/package/react-dom
-// Definitions by: Stefan-Bieliauskas <http://www.conts.de>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-/// <reference path="./../react/react.d.ts" />
-
-declare namespace __ReactDom {
-    function render<P>(
-        element: __React.DOMElement<P>,
-        container: Element,
-        callback?: () => any): __React.DOMComponent<P>;
-    function render<P, S>(
-        element: __React.ClassicElement<P>,
-        container: Element,
-        callback?: () => any): __React.ClassicComponent<P, S>;
-    function render<P, S>(
-        element: __React.ReactElement<P>,
-        container: Element,
-        callback?: () => any): __React.Component<P, S>;
-
-    function findDOMNode<TElement extends Element>(
-        componentOrElement: __React.Component<any, any> | Element): TElement;
-    function findDOMNode(
-        componentOrElement: __React.Component<any, any> | Element): Element;
-
-    function unmountComponentAtNode(container: Element): boolean;
-}
-
-declare namespace __ReactDomServer {
-    function renderToString(element: __React.ReactElement<any>): string;
-    function renderToStaticMarkup(element: __React.ReactElement<any>): string;
-}
-declare module "react-dom" {
-    export = __ReactDom
-}
-
-declare module "react-dom/server" {
-    export = __ReactDomServer
-}
diff --git a/react-input-calendar/react-input-calendar-tests.tsx b/react-input-calendar/react-input-calendar-tests.tsx
index 127106424..9cc4963fb 100644
--- a/react-input-calendar/react-input-calendar-tests.tsx
+++ b/react-input-calendar/react-input-calendar-tests.tsx
@@ -1,6 +1,8 @@
 /// <reference path="./react-input-calendar.d.ts"/>
 /// <reference path="../react/react.d.ts"/>
+/// <reference path="../react/react-dom.d.ts"/>
 
 import * as ReactInputCalendar from 'react-input-calendar';
 import * as React from 'react';
-React.render(<ReactInputCalendar />, document.body);
+import * as ReactDOM from 'react-dom';
+ReactDOM.render(<ReactInputCalendar />, document.body);
diff --git a/react-native/react-native-tests.tsx b/react-native/react-native-tests.tsx
index 7c02ce9ca..f2e4cc22f 100644
--- a/react-native/react-native-tests.tsx
+++ b/react-native/react-native-tests.tsx
@@ -3,19 +3,19 @@
 
 Note: This must be compiled with the target set to ES6
 
-
 The content of index.io.js could be something like
 
+    'use strict';
 
-'use strict';
+     import { AppRegistry } from 'react-native'
+     import Welcome from './gen/Welcome'
 
-import { AppRegistry } from 'react-native'
-import Welcome from './gen/Welcome'
-
-AppRegistry.registerComponent('MopNative', () => Welcome);
+     AppRegistry.registerComponent('MopNative', () => Welcome);
 
 
-*/
+For a list of complete Typescript examples: check https://github.com/bgrieder/RNTSExplorer
+
+ */
 
 ///<reference path="../react-native/react-native.d.ts" />
 
diff --git a/react-native/react-native.d.ts b/react-native/react-native.d.ts
index 485fdf5c0..dc6cc5e3c 100644
--- a/react-native/react-native.d.ts
+++ b/react-native/react-native.d.ts
@@ -5,21 +5,24 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
-// These definitions are meant to be used with the TSC compiler target set to ES6
+// USING: these definitions are meant to be used with the TSC compiler target set to ES6
 //
-// This work is based on an original work made by Bernd Paradies: https://github.com/bparadie
+// USAGE EXAMPLES: check the RNTSExplorer project at https://github.com/bgrieder/RNTSExplorer
 //
-// WARNING: this work is very much beta:
-//            -it is still missing react-native definitions
-//            -it re-exports the whole of react 0.14 which may not be what react-native actually does
+// CONTRIBUTING: please open pull requests and make sure that the changes do not break RNTSExplorer (they should not)
+// Do not hesitate to open a pull request against RNTSExplorer to provide an example for a case not covered by the current App
+//
+// CREDITS: This work is based on an original work made by Bernd Paradies: https://github.com/bparadie
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /// <reference path="../react/react.d.ts" />
 
+//so we know what is "original" React
 import React = __React;
 
-declare namespace  ReactNative {
+//react-native "extends" react
+declare namespace  __React {
 
 
     /**
@@ -44,7 +47,7 @@ declare namespace  ReactNative {
 
 
         // not in lib.es6.d.ts but called by react-native
-        done(): void;
+        done( callback?: ( value: T ) => void ): void;
     }
 
     export interface PromiseConstructor {
@@ -118,6 +121,7 @@ declare namespace  ReactNative {
     // @see lib.es6.d.ts
     export var Promise: PromiseConstructor;
 
+    //TODO: BGR: Replace with ComponentClass ?
     // node_modules/react-tools/src/classic/class/ReactClass.js
     export interface ReactClass<D, P, S> {
         // TODO:
@@ -131,6 +135,105 @@ declare namespace  ReactNative {
 
     export type Runnable = ( appParameters: any ) => void;
 
+
+    // Similar to React.SyntheticEvent except for nativeEvent
+    interface NativeSyntheticEvent<T> {
+        bubbles: boolean
+        cancelable: boolean
+        currentTarget: EventTarget
+        defaultPrevented: boolean
+        eventPhase: number
+        isTrusted: boolean
+        nativeEvent: T
+        preventDefault(): void
+        stopPropagation(): void
+        target: EventTarget
+        timeStamp: Date
+        type: string
+    }
+
+    export interface NativeTouchEvent {
+        /**
+         * Array of all touch events that have changed since the last event
+         */
+        changedTouches: NativeTouchEvent[]
+
+        /**
+         * The ID of the touch
+         */
+        identifier: string
+
+        /**
+         * The X position of the touch, relative to the element
+         */
+        locationX: number
+
+        /**
+         * The Y position of the touch, relative to the element
+         */
+        locationY: number
+
+        /**
+         * The X position of the touch, relative to the screen
+         */
+        pageX: number
+
+        /**
+         * The Y position of the touch, relative to the screen
+         */
+        pageY: number
+
+        /**
+         * The node id of the element receiving the touch event
+         */
+        target: string
+
+        /**
+         * A time identifier for the touch, useful for velocity calculation
+         */
+        timestamp: number
+
+        /**
+         * Array of all current touches on the screen
+         */
+        touches : NativeTouchEvent[]
+    }
+
+    export interface GestureResponderEvent extends NativeSyntheticEvent<NativeTouchEvent> {
+    }
+
+
+    export interface  PointProperties {
+        x: number
+        y: number
+    }
+
+    export interface Insets {
+        top?: number
+        left?: number
+        bottom?: number
+        right?: number
+    }
+
+    /**
+     * //FIXME: need to find documentation on which compoenent is a native (i.e. non composite component)
+     */
+    export interface NativeComponent {
+        setNativeProps: ( props: Object ) => void
+    }
+
+    /**
+     * //FIXME: need to find documentation on which component is a TTouchable and can implement that interface
+     * @see React.DOMAtributes
+     */
+    export interface Touchable {
+        onTouchStart?: ( event: GestureResponderEvent ) => void
+        onTouchMove?: ( event: GestureResponderEvent ) => void
+        onTouchEnd?: ( event: GestureResponderEvent ) => void
+        onTouchCancel?: ( event: GestureResponderEvent ) => void
+        onTouchEndCapture?: ( event: GestureResponderEvent ) => void
+    }
+
     export type AppConfig = {
         appKey: string;
         component: ReactClass<any, any, any>;
@@ -148,17 +251,49 @@ declare namespace  ReactNative {
         static runApplication( appKey: string, appParameters: any ): void;
     }
 
-    /*
-     export interface ReactPropTypes extends React.ReactPropTypes
-     {
+    export interface LayoutAnimationTypes {
+        spring: string
+        linear: string
+        easeInEaseOut: string
+        easeIn: string
+        easeOut: string
+    }
 
-     }
+    export interface LayoutAnimationProperties {
+        opacity: string
+        scaleXY: string
+    }
+
+    export interface LayoutAnimationAnim {
+        duration?: number
+        delay?: number
+        springDamping?: number
+        initialVelocity?: number
+        type?: string //LayoutAnimationTypes
+        property?: string //LayoutAnimationProperties
+    }
+
+    export interface LayoutAnimationConfig {
+        duration: number
+        create?: LayoutAnimationAnim
+        update?: LayoutAnimationAnim
+        delete?: LayoutAnimationAnim
+    }
+
+    export interface LayoutAnimationStatic {
+
+        configureNext: ( config: LayoutAnimationConfig, onAnimationDidEnd?: () => void, onError?: ( error?: any ) => void ) => void
+        create: ( duration: number, type?: string, creationProp?: string ) => LayoutAnimationConfig
+        Types: LayoutAnimationTypes
+        Properties: LayoutAnimationProperties
+        configChecker: ( conf: {config: LayoutAnimationConfig}, name: string, next: string ) => void
+        Presets : {
+            easeInEaseOut: LayoutAnimationConfig
+            linear:LayoutAnimationConfig
+            spring: LayoutAnimationConfig
+        }
+    }
 
-     export interface PropTypes
-     {
-     [key:string]: React.Requireable<any>;
-     }
-     */
 
     /**
      * Flex Prop Types
@@ -211,7 +346,6 @@ declare namespace  ReactNative {
         scaleY?: number
         translateX?: number
         translateY?: number
-
     }
 
 
@@ -234,50 +368,71 @@ declare namespace  ReactNative {
     }
 
     // @see https://facebook.github.io/react-native/docs/text.html#style
-    export interface TextStyle extends FlexStyle {
-        color?: string;
-        containerBackgroundColor?: string;
-        fontFamily?: string;
-        fontSize?: number;
-        fontStyle?: string; // 'normal' | 'italic';
-        fontWeight?: string; // enum("normal", 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900')
-        letterSpacing?: number;
-        lineHeight?: number;
-        textAlign?: string; // enum("auto", 'left', 'right', 'center')
+    export interface TextStyle extends ViewStyle {
+        color?: string
+        fontFamily?: string
+        fontSize?: number
+        fontStyle?: string // 'normal' | 'italic';
+        fontWeight?: string // enum("normal", 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900')
+        letterSpacing?: number
+        lineHeight?: number
+        textAlign?: string // enum("auto", 'left', 'right', 'center')
+        textDecorationLine?: string // enum("none", 'underline', 'line-through', 'underline line-through')
+        textDecorationStyle?: string // enum("solid", 'double', 'dotted', 'dashed')
+        textDecorationColor?: string
         writingDirection?: string; //enum("auto", 'ltr', 'rtl')
+        //containerBackgroundColor?: string
+    }
+
+    export interface TextPropertiesIOS {
+
+        /**
+         * When true, no visual change is made when text is pressed down.
+         * By default, a gray oval highlights the text on press down.
+         */
+        suppressHighlighting?: boolean
     }
 
     // https://facebook.github.io/react-native/docs/text.html#props
     export interface TextProperties extends React.Props<TextProperties> {
-        /**
-         * numberOfLines number
-         *
-         * Used to truncate the text with an elipsis after computing the text layout, including line wrapping, such that the total number of lines does not exceed this number.
-         */
-        numberOfLines?: number;
 
         /**
-         * onLayout function
-         *
+         * Specifies should fonts scale to respect Text Size accessibility setting on iOS.
+         */
+        allowFontScaling?: boolean
+
+        /**
+         * Used to truncate the text with an elipsis after computing the text layout, including line wrapping, such that the total number of lines does not exceed this number.
+         */
+        numberOfLines?: number
+
+        /**
          * Invoked on mount and layout changes with
          *
          * {nativeEvent: { layout: {x, y, width, height}}}.
          */
-        onLayout?: ( event: LayoutChangeEvent ) => void;
+        onLayout?: ( event: LayoutChangeEvent ) => void
 
         /**
-         * onPress function
-         *
-         * This function is called on press. Text intrinsically supports press handling with a default highlight state (which can be disabled with suppressHighlighting).
+         * This function is called on press.
+         * Text intrinsically supports press handling with a default highlight state (which can be disabled with suppressHighlighting).
          */
-        onPress?: () => void;
+        onPress?: () => void
 
         /**
          * @see https://facebook.github.io/react-native/docs/text.html#style
          */
-        style?: TextStyle;
+        style?: TextStyle
+
+        /**
+         * Used to locate this view in end-to-end tests.
+         */
+        testID?: string
     }
 
+    /**
+     * A React component for displaying text which supports nesting, styling, and touch handling.
+     */
     export interface TextStatic extends React.ComponentClass<TextProperties> {
 
     }
@@ -331,7 +486,7 @@ declare namespace  ReactNative {
         selectTextOnFocus?: boolean
 
         /**
-         * //FIXME: require typing
+         * //FIXME: requires typing
          * See DocumentSelectionState.js, some state that is responsible for maintaining selection information for a document
          */
         selectionState?: any
@@ -436,7 +591,7 @@ declare namespace  ReactNative {
         /**
          * Callback that is called when the text input's text changes.
          */
-        onChange?: (event: {nativeEvent: {text: string}}) => void
+        onChange?: ( event: {nativeEvent: {text: string}} ) => void
 
         /**
          * Callback that is called when the text input's text changes.
@@ -447,7 +602,7 @@ declare namespace  ReactNative {
         /**
          * Callback that is called when text input ends.
          */
-        onEndEditing?: (event: {nativeEvent: {text: string}}) => void
+        onEndEditing?: ( event: {nativeEvent: {text: string}} ) => void
 
         /**
          * Callback that is called when the text input is focused
@@ -457,12 +612,17 @@ declare namespace  ReactNative {
         /**
          * Invoked on mount and layout changes with {x, y, width, height}.
          */
-        onLayout?: (event: {nativeEvent: {x: number, y: number, width: number, height: number}}) => void
+        onLayout?: ( event: {nativeEvent: {x: number, y: number, width: number, height: number}} ) => void
 
         /**
          * Callback that is called when the text input's submit button is pressed.
          */
-        onSubmitEditing?: (event: {nativeEvent: {text: string}}) => void
+        onSubmitEditing?: ( event: {nativeEvent: {text: string}} ) => void
+
+        /**
+         * //FIXME: Not part of the doc but found in examples
+         */
+        password?: boolean
 
         /**
          * The string that will be rendered before text input has been entered
@@ -500,12 +660,126 @@ declare namespace  ReactNative {
         value?: string
     }
 
-    export interface TextInputStatic extends React.ComponentClass<TextInputProperties> {
-
+    export interface TextInputStatic extends NativeComponent, React.ComponentClass<TextInputProperties> {
+        blur: () => void
+        focus: () => void
     }
 
-    export interface AccessibilityTraits {
-        // TODO
+
+    /**
+     * Gesture recognition on mobile devices is much more complicated than web.
+     * A touch can go through several phases as the app determines what the user's intention is.
+     * For example, the app needs to determine if the touch is scrolling, sliding on a widget, or tapping.
+     * This can even change during the duration of a touch. There can also be multiple simultaneous touches.
+     *
+     * The touch responder system is needed to allow components to negotiate these touch interactions
+     * without any additional knowledge about their parent or child components.
+     * This system is implemented in ResponderEventPlugin.js, which contains further details and documentation.
+     *
+     * Best Practices
+     * Users can feel huge differences in the usability of web apps vs. native, and this is one of the big causes.
+     * Every action should have the following attributes:
+     *      Feedback/highlighting- show the user what is handling their touch, and what will happen when they release the gesture
+     *      Cancel-ability- when making an action, the user should be able to abort it mid-touch by dragging their finger away
+     *
+     * These features make users more comfortable while using an app,
+     * because it allows people to experiment and interact without fear of making mistakes.
+     *
+     * TouchableHighlight and Touchable*
+     * The responder system can be complicated to use.
+     * So we have provided an abstract Touchable implementation for things that should be "tappable".
+     * This uses the responder system and allows you to easily configure tap interactions declaratively.
+     * Use TouchableHighlight anywhere where you would use a button or link on web.
+     */
+    export interface GestureResponderHandlers {
+
+        /**
+         * A view can become the touch responder by implementing the correct negotiation methods.
+         * There are two methods to ask the view if it wants to become responder:
+         */
+
+        /**
+         * Does this view want to become responder on the start of a touch?
+         */
+        onStartShouldSetResponder?: ( event: GestureResponderEvent ) => boolean
+
+        /**
+         * Called for every touch move on the View when it is not the responder: does this view want to "claim" touch responsiveness?
+         */
+        onMoveShouldSetResponder?: ( event: GestureResponderEvent ) => boolean
+
+        /**
+         * If the View returns true and attempts to become the responder, one of the following will happen:
+         */
+
+        /**
+         * The View is now responding for touch events.
+         * This is the time to highlight and show the user what is happening
+         */
+        onResponderGrant?: ( event: GestureResponderEvent ) => void
+
+        /**
+         * Something else is the responder right now and will not release it
+         */
+        onResponderReject?: ( event: GestureResponderEvent ) => void
+
+        /**
+         * If the view is responding, the following handlers can be called:
+         */
+
+        /**
+         * The user is moving their finger
+         */
+        onResponderMove?: ( event: GestureResponderEvent ) => void
+
+        /**
+         * Fired at the end of the touch, ie "touchUp"
+         */
+        onResponderRelease?: ( event: GestureResponderEvent ) => void
+
+        /**
+         *  Something else wants to become responder.
+         *  Should this view release the responder? Returning true allows release
+         */
+        onResponderTerminationRequest?: ( event: GestureResponderEvent ) => boolean
+
+        /**
+         * The responder has been taken from the View.
+         * Might be taken by other views after a call to onResponderTerminationRequest,
+         * or might be taken by the OS without asking (happens with control center/ notification center on iOS)
+         */
+        onResponderTerminate?: ( event: GestureResponderEvent ) => void
+
+        /**
+         * onStartShouldSetResponder and onMoveShouldSetResponder are called with a bubbling pattern,
+         * where the deepest node is called first.
+         * That means that the deepest component will become responder when multiple Views return true for *ShouldSetResponder handlers.
+         * This is desirable in most cases, because it makes sure all controls and buttons are usable.
+         *
+         * However, sometimes a parent will want to make sure that it becomes responder.
+         * This can be handled by using the capture phase.
+         * Before the responder system bubbles up from the deepest component,
+         * it will do a capture phase, firing on*ShouldSetResponderCapture.
+         * So if a parent View wants to prevent the child from becoming responder on a touch start,
+         * it should have a onStartShouldSetResponderCapture handler which returns true.
+         */
+        onStartShouldSetResponderCapture?: ( event: GestureResponderEvent ) => boolean
+
+        /**
+         * onStartShouldSetResponder and onMoveShouldSetResponder are called with a bubbling pattern,
+         * where the deepest node is called first.
+         * That means that the deepest component will become responder when multiple Views return true for *ShouldSetResponder handlers.
+         * This is desirable in most cases, because it makes sure all controls and buttons are usable.
+         *
+         * However, sometimes a parent will want to make sure that it becomes responder.
+         * This can be handled by using the capture phase.
+         * Before the responder system bubbles up from the deepest component,
+         * it will do a capture phase, firing on*ShouldSetResponderCapture.
+         * So if a parent View wants to prevent the child from becoming responder on a touch start,
+         * it should have a onStartShouldSetResponderCapture handler which returns true.
+         */
+        onMoveShouldSetResponderCapture?: () => void;
+
     }
 
     // @see https://facebook.github.io/react-native/docs/view.html#style
@@ -529,177 +803,120 @@ declare namespace  ReactNative {
         shadowRadius?: number;
     }
 
-    /**
-     * @see https://facebook.github.io/react-native/docs/view.html#props
-     */
-    export interface ViewProperties extends React.Props<ViewStatic> {
+
+    export interface ViewPropertiesIOS {
+
         /**
-         * accessibilityLabel string
-         *
-         * Overrides the text that's read by the screen reader when the user interacts with the element. By default, the label is constructed by traversing all the children and accumulating all the Text nodes separated by space.
+         * Provides additional traits to screen reader.
+         * By default no traits are provided unless specified otherwise in element
          *
+         * @enum('none', 'button', 'link', 'header', 'search', 'image', 'selected', 'plays', 'key', 'text','summary', 'disabled', 'frequentUpdates', 'startsMedia', 'adjustable', 'allowsDirectInteraction', 'pageTurn')
          */
-
-        accessibilityLabel?: string;
-
+        accessibilityTraits?: string | string[];
 
         /**
-         * accessibilityTraits AccessibilityTraits, [AccessibilityTraits]
-         * Provides additional traits to screen reader. By default no traits are provided unless specified otherwise in element
+         * Whether this view should be rendered as a bitmap before compositing.
+         *
+         * On iOS, this is useful for animations and interactions that do not modify this component's dimensions nor its children;
+         * for example, when translating the position of a static view, rasterization allows the renderer to reuse a cached bitmap of a static view
+         * and quickly composite it during each frame.
+         *
+         * Rasterization incurs an off-screen drawing pass and the bitmap consumes memory.
+         * Test and measure when using this property.
          */
+        shouldRasterizeIOS?: boolean
+    }
 
-        accessibilityTraits?: AccessibilityTraits;
+    export interface ViewPropertiesAndroid {
 
         /**
-         * accessible bool
+         * Indicates to accessibility services to treat UI component like a native one.
+         * Works for Android only.
          *
-         * When true, indicates that the view is an accessibility element. By default, all the touchable elements are accessible.
+         * @enum('none', 'button', 'radiobutton_checked', 'radiobutton_unchecked' )
          */
+        accessibilityComponentType?: string
 
-        accessible?: boolean;
 
         /**
-         * onAcccessibilityTap function
-         * When accessible is true, the system will try to invoke this function when the user performs accessibility tap gesture.
-         *
+         * Indicates to accessibility services whether the user should be notified when this view changes.
+         * Works for Android API >= 19 only.
+         * See http://developer.android.com/reference/android/view/View.html#attr_android:accessibilityLiveRegion for references.
          */
-
-        onAcccessibilityTap?: () => void;
+        accessibilityLiveRegion?: string
 
         /**
-         * onLayout function
-         *
-         * Invoked on mount and layout changes with
-         *
-         * {nativeEvent: { layout: {x, y, width, height}}}.
+         * Views that are only used to layout their children or otherwise don't draw anything
+         * may be automatically removed from the native hierarchy as an optimization.
+         * Set this property to false to disable this optimization and ensure that this View exists in the native view hierarchy.
          */
-        onLayout?: ( event: LayoutChangeEvent ) => void;
+        collapsable?: boolean
+
 
         /**
-         * onMagicTap function
+         * Controls how view is important for accessibility which is if it fires accessibility events
+         * and if it is reported to accessibility services that query the screen.
+         * Works for Android only. See http://developer.android.com/reference/android/R.attr.html#importantForAccessibility for references.
          *
-         * When accessible is true, the system will invoke this function when the user performs the magic tap gesture.
+         * Possible values:
+         *      'auto' - The system determines whether the view is important for accessibility - default (recommended).
+         *      'yes' - The view is important for accessibility.
+         *      'no' - The view is not important for accessibility.
+         *      'no-hide-descendants' - The view is not important for accessibility, nor are any of its descendant views.
          */
+        importantForAccessibility?: string
 
-        onMagicTap?: () => void;
 
         /**
-         * onMoveShouldSetResponder function
+         * Whether this view needs to rendered offscreen and composited with an alpha in order to preserve 100% correct colors and blending behavior.
+         * The default (false) falls back to drawing the component and its children
+         * with an alpha applied to the paint used to draw each element instead of rendering the full component offscreen and compositing it back with an alpha value.
+         * This default may be noticeable and undesired in the case where the View you are setting an opacity on
+         * has multiple overlapping elements (e.g. multiple overlapping Views, or text and a background).
          *
-         * For most touch interactions, you'll simply want to wrap your component in TouchableHighlight or TouchableOpacity. Check out Touchable.js, ScrollResponder.js and ResponderEventPlugin.js for more discussion.
+         * Rendering offscreen to preserve correct alpha behavior is extremely expensive
+         * and hard to debug for non-native developers, which is why it is not turned on by default.
+         * If you do need to enable this property for an animation,
+         * consider combining it with renderToHardwareTextureAndroid if the view contents are static (i.e. it doesn't need to be redrawn each frame).
+         * If that property is enabled, this View will be rendered off-screen once,
+         * saved in a hardware texture, and then composited onto the screen with an alpha each frame without having to switch rendering targets on the GPU.
          */
-        onMoveShouldSetResponder?: () => void;
+        needsOffscreenAlphaCompositing?: boolean
 
-        onResponderGrant?: () => void;
-
-        onResponderMove?: () => void;
-
-        onResponderReject?: () => void;
-
-        onResponderRelease?: () => void;
-
-        onResponderTerminate?: () => void;
-
-        onResponderTerminationRequest?: () => void;
-
-        onStartShouldSetResponder?: () => void;
-
-        onStartShouldSetResponderCapture?: () => void;
 
         /**
-         * pointerEvents enum('box-none', 'none', 'box-only', 'auto')
-         *
-         * In the absence of auto property, none is much like CSS's none value. box-none is as if you had applied the CSS class:
-         *
-         * .box-none {
-     *   pointer-events: none;
-     * }
-         * .box-none * {
-     *   pointer-events: all;
-     * }
-         *
-         * box-only is the equivalent of
-         *
-         * .box-only {
-     *   pointer-events: all;
-     * }
-         * .box-only * {
-     *   pointer-events: none;
-     * }
-         *
-         * But since pointerEvents does not affect layout/appearance, and we are already deviating from the spec by adding additional modes,
-         * we opt to not include pointerEvents on style. On some platforms, we would need to implement it as a className anyways. Using style or not is an implementation detail of the platform.
-         */
-
-        pointerEvents?: string;
-
-        /**
-         * removeClippedSubviews bool
-         *
-         * This is a special performance property exposed by RCTView and is useful for scrolling content when there are many subviews,
-         * most of which are offscreen. For this property to be effective, it must be applied to a view that contains many subviews that extend outside its bound.
-         * The subviews must also have overflow: hidden, as should the containing view (or one of its superviews).
-         */
-
-        removeClippedSubviews?: boolean
-
-        /**
-         * renderToHardwareTextureAndroid bool
-         *
          * Whether this view should render itself (and all of its children) into a single hardware texture on the GPU.
          *
          * On Android, this is useful for animations and interactions that only modify opacity, rotation, translation, and/or scale:
          * in those cases, the view doesn't have to be redrawn and display lists don't need to be re-executed. The texture can just be
          * re-used and re-composited with different parameters. The downside is that this can use up limited video memory, so this prop should be set back to false at the end of the interaction/animation.
          */
-
         renderToHardwareTextureAndroid?: boolean;
 
-        style?: ViewStyle;
-
-        /**
-         * testID string
-         *
-         * Used to locate this view in end-to-end tests.
-         */
-
-        testID?: string;
-    }
-
-    export interface ViewStatic extends React.ComponentClass<ViewProperties> {
-
     }
 
     /**
-     * @see https://facebook.github.io/react-native/docs/activityindicatorios.html#props
+     * @see https://facebook.github.io/react-native/docs/view.html#props
      */
-    export interface AlertIOSProperties {
+    export interface ViewProperties extends ViewPropertiesAndroid, ViewPropertiesIOS, GestureResponderHandlers, Touchable, React.Props<ViewStatic> {
+
         /**
-         * animating bool
-         *
-         * Whether to show the indicator (true, the default) or hide it (false).
+         * Overrides the text that's read by the screen reader when the user interacts with the element. By default, the label is constructed by traversing all the children and accumulating all the Text nodes separated by space.
          */
-        animating?: boolean;
+        accessibilityLabel?: string;
 
         /**
-         * color string
-         *
-         * The foreground color of the spinner (default is gray).
+         * When true, indicates that the view is an accessibility element.
+         * By default, all the touchable elements are accessible.
          */
-
-        color?: string;
+        accessible?: boolean;
 
         /**
-         * hidesWhenStopped bool
-         *
-         * Whether the indicator should hide when not animating (true by default).
+         * When `accessible` is true, the system will try to invoke this function when the user performs accessibility tap gesture.
          */
-
-        hidesWhenStopped?: boolean;
+        onAcccessibilityTap?: () => void;
 
         /**
-         * onLayout function
-         *
          * Invoked on mount and layout changes with
          *
          * {nativeEvent: { layout: {x, y, width, height}}}.
@@ -707,13 +924,145 @@ declare namespace  ReactNative {
         onLayout?: ( event: LayoutChangeEvent ) => void;
 
         /**
-         * size enum('small', 'large')
-         *
-         * Size of the indicator. Small has a height of 20, large has a height of 36.
+         * When accessible is true, the system will invoke this function when the user performs the magic tap gesture.
          */
-        size: string; // enum('small', 'large')
+        onMagicTap?: () => void;
+
+        /**
+         *
+         * In the absence of auto property, none is much like CSS's none value. box-none is as if you had applied the CSS class:
+         *
+         * .box-none {
+         *   pointer-events: none;
+         * }
+         * .box-none * {
+         *   pointer-events: all;
+         * }
+         *
+         * box-only is the equivalent of
+         *
+         * .box-only {
+         *   pointer-events: all;
+         * }
+         * .box-only * {
+         *   pointer-events: none;
+         * }
+         *
+         * But since pointerEvents does not affect layout/appearance, and we are already deviating from the spec by adding additional modes,
+         * we opt to not include pointerEvents on style. On some platforms, we would need to implement it as a className anyways. Using style or not is an implementation detail of the platform.
+         */
+        pointerEvents?: string;
+
+        /**
+         *
+         * This is a special performance property exposed by RCTView and is useful for scrolling content when there are many subviews,
+         * most of which are offscreen. For this property to be effective, it must be applied to a view that contains many subviews that extend outside its bound.
+         * The subviews must also have overflow: hidden, as should the containing view (or one of its superviews).
+         */
+        removeClippedSubviews?: boolean
+
+        style?: ViewStyle;
+
+        /**
+         * Used to locate this view in end-to-end tests.
+         */
+        testID?: string;
     }
 
+    /**
+     * The most fundamental component for building UI, View is a container that supports layout with flexbox, style, some touch handling,
+     * and accessibility controls, and is designed to be nested inside other views and to have 0 to many children of any type.
+     * View maps directly to the native view equivalent on whatever platform React is running on,
+     * whether that is a UIView, <div>, android.view, etc.
+     */
+    export interface ViewStatic extends NativeComponent, React.ComponentClass<ViewProperties> {
+
+    }
+
+    /**
+     * //FIXME: No documentation extracted from code comment on WebView.ios.js
+     */
+    export interface NavState {
+
+        url?: string
+        title?: string
+        loading?: boolean
+        canGoBack?: boolean
+        canGoForward?: boolean;
+
+        [key: string]: any
+    }
+
+    export interface WebViewPropertiesAndroid {
+
+        /**
+         * Used for android only, JS is enabled by default for WebView on iOS
+         */
+        javaScriptEnabledAndroid?: boolean
+    }
+
+    export interface WebViewPropertiesIOS {
+
+        /**
+         * Used for iOS only, sets whether the webpage scales to fit the view and the user can change the scale
+         */
+        scalesPageToFit?: boolean
+    }
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/webview.html#props
+     */
+    export interface WebViewProperties extends WebViewPropertiesAndroid, WebViewPropertiesIOS, React.Props<WebViewStatic> {
+
+        automaticallyAdjustContentInsets?: boolean
+
+        bounces?: boolean
+
+        contentInset?: Insets
+
+        html?: string
+
+        /**
+         * Sets the JS to be injected when the webpage loads.
+         */
+        injectedJavaScript?: string
+
+        onNavigationStateChange?: ( event: NavState ) => void
+
+        /**
+         * Allows custom handling of any webview requests by a JS handler.
+         * Return true or false from this method to continue loading the request.
+         */
+        onShouldStartLoadWithRequest?: () => boolean
+
+        /**
+         * view to show if there's an error
+         */
+        renderError?: () => ViewStatic
+
+        /**
+         * loading indicator to show
+         */
+        renderLoading?: () => ViewStatic
+
+        scrollEnabled?: boolean
+
+        startInLoadingState?: boolean
+
+        style?: ViewStyle
+
+        url: string
+    }
+
+
+    export interface WebViewStatic extends React.ComponentClass<WebViewProperties> {
+
+        goBack: () => void
+        goForward: () => void
+        reload: () => void
+    }
+
+
     /**
      * @see
      */
@@ -721,13 +1070,6 @@ declare namespace  ReactNative {
         /// TODO
     }
 
-    /**
-     * @see
-     */
-    export interface SwitchIOSProperties {
-        /// TODO
-    }
-
 
     export interface NavigatorIOSProperties extends React.Props<NavigatorIOSStatic> {
 
@@ -910,7 +1252,7 @@ declare namespace  ReactNative {
          * This is called when the user changes the date or time in the UI.
          * The first and only argument is a Date object representing the new date and time.
          */
-        onDateChange?: (newDate: Date) => void
+        onDateChange?: ( newDate: Date ) => void
 
         /**
          * Timezone offset in minutes.
@@ -924,54 +1266,106 @@ declare namespace  ReactNative {
     export interface DatePickerIOSStatic extends React.ComponentClass<DatePickerIOSProperties> {
     }
 
+
+    /**
+     * @see PickerIOS.ios.js
+     */
+    export interface PickerIOSItemProperties extends React.Props<PickerIOSItemStatic> {
+        value?: string | number
+        label?: string
+    }
+
+    /**
+     * @see PickerIOS.ios.js
+     */
+    export interface PickerIOSItemStatic extends React.ComponentClass<PickerIOSItemProperties> {
+    }
+
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/pickerios.html
+     * @see PickerIOS.ios.js
+     */
+    export interface PickerIOSProperties extends React.Props<PickerIOSStatic> {
+
+        onValueChange?: ( value: string | number ) => void
+
+        selectedValue?: string | number
+
+        style?: ViewStyle
+    }
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/pickerios.html
+     * @see PickerIOS.ios.js
+     */
+    export interface PickerIOSStatic extends React.ComponentClass<PickerIOSProperties> {
+
+        Item: PickerIOSItemStatic
+    }
+
+
     /**
      * @see https://facebook.github.io/react-native/docs/sliderios.html
      */
     export interface SliderIOSProperties extends React.Props<SliderIOSStatic> {
-        /**
-         maximumTrackTintColor string
-         The color used for the track to the right of the button. Overrides the default blue gradient image.
-         */
-        maximumTrackTintColor?: string;
 
         /**
-         maximumValue number
-
-         Initial maximum value of the slider. Default value is 1.
+         * If true the user won't be able to move the slider. Default value is false.
          */
-        maximumValue?: number;
+        disabled?: boolean
 
         /**
-         minimumTrackTintColor string
-         The color used for the track to the left of the button. Overrides the default blue gradient image.
+         * Initial maximum value of the slider. Default value is 1.
          */
-        minimumTrackTintColor?: string;
+        maximumValue?: number
 
         /**
-         minimumValue number
-         Initial minimum value of the slider. Default value is 0.
+         * The color used for the track to the right of the button. Overrides the default blue gradient image.
          */
-        minimumValue?: number;
+        maximumTrackTintColor?: string
 
         /**
-         onSlidingComplete function
-         Callback called when the user finishes changing the value (e.g. when the slider is released).
+         * Initial minimum value of the slider. Default value is 0.
          */
-        onSlidingComplete?: () => void;
+        minimumValue?: number
 
         /**
-         onValueChange function
-         Callback continuously called while the user is dragging the slider.
+         * The color used for the track to the left of the button. Overrides the default blue gradient image.
          */
-        onValueChange?: ( value: number ) => void;
+        minimumTrackTintColor?: string
 
         /**
-         value number
-         Initial value of the slider. The value should be between minimumValue and maximumValue, which default to 0 and 1 respectively. Default value is 0.
-
-         This is not a controlled component, e.g. if you don't update the value, the component won't be reset to its inital value.
+         * Callback called when the user finishes changing the value (e.g. when the slider is released).
          */
-        value?: number;
+        onSlidingComplete?: () => void
+
+        /**
+         * Callback continuously called while the user is dragging the slider.
+         */
+        onValueChange?: ( value: number ) => void
+
+        /**
+         * Step value of the slider.
+         * The value should be between 0 and (maximumValue - minimumValue).
+         * Default value is 0.
+         */
+        step?: number
+
+        /**
+         * Used to style and layout the Slider.
+         * @see StyleSheet.js and ViewStylePropTypes.js for more info.
+         */
+        style?: ViewStyle
+
+        /**
+         * Initial value of the slider.
+         * The value should be between minimumValue and maximumValue, which default to 0 and 1 respectively.
+         * Default value is 0.
+         *
+         * This is not a controlled component, e.g. if you don't update the value, the component won't be reset to its inital value.
+         */
+        value?: number
     }
 
     export interface SliderIOSStatic extends React.ComponentClass<SliderIOSProperties> {
@@ -979,12 +1373,67 @@ declare namespace  ReactNative {
     }
 
     /**
-     * @see
+     * //FIXME: no dcumentation, inferred
+     * @see SwitchIOS.ios.js
      */
-    export interface CameraRollProperties {
-        /// TODO
+    export interface SwitchIOSStyle extends ViewStyle {
+        height?: number
+        width?: number
     }
 
+
+    /**
+     * https://facebook.github.io/react-native/docs/switchios.html#props
+     */
+    export interface SwitchIOSProperties extends React.Props<SwitchIOSStatic> {
+
+        /**
+         * If true the user won't be able to toggle the switch. Default value is false.
+         */
+        disabled?: boolean
+
+        /**
+         * Background color when the switch is turned on.
+         */
+        onTintColor?: string
+
+        /**
+         * Callback that is called when the user toggles the switch.
+         */
+        onValueChange?: ( value: boolean ) => void
+
+        /**
+         * Background color for the switch round button.
+         */
+        thumbTintColor?: string
+
+        /**
+         * Background color when the switch is turned off.
+         */
+        tintColor?: string
+
+        /**
+         * The value of the switch, if true the switch will be turned on. Default value is false.
+         */
+        value?: boolean
+
+        style?: SwitchIOSStyle
+    }
+
+    /**
+     *
+     * Use SwitchIOS to render a boolean input on iOS.
+     *
+     * This is a controlled component, so you must hook in to the onValueChange callback and update the value prop in order for the component to update,
+     * otherwise the user's change will be reverted immediately to reflect props.value as the source of truth.
+     *
+     * @see https://facebook.github.io/react-native/docs/switchios.html
+     */
+    export interface SwitchIOSStatic extends React.ComponentClass<SwitchIOSProperties> {
+
+    }
+
+
     /**
      * @see ImageResizeMode.js
      */
@@ -1039,7 +1488,7 @@ declare namespace  ReactNative {
          * This is useful for creating resizable rounded buttons, shadows, and other resizable assets.
          * More info on Apple documentation
          */
-        capInsets?: {top: number, left: number, bottom: number, right: number}
+        capInsets?: Insets
 
         /**
          * A static image to display while downloading the final image off the network.
@@ -1195,7 +1644,7 @@ declare namespace  ReactNative {
          * is exactly what was put into the data source, but it's also possible to
          * provide custom extractors.
          */
-        renderRow?: ( rowData: any, sectionID: string, rowID: string, highlightRow?: boolean ) => React.ReactElement<any>
+        renderRow?: ( rowData: any, sectionID: string | number, rowID: string | number, highlightRow?: boolean ) => React.ReactElement<any>
 
 
         /**
@@ -1213,7 +1662,7 @@ declare namespace  ReactNative {
          * stick to the top until it is pushed off the screen by the next section
          * header.
          */
-        renderSectionHeader?: ( sectionData: any, sectionId: string ) => React.ReactElement<any>
+        renderSectionHeader?: ( sectionData: any, sectionId: string | number ) => React.ReactElement<any>
 
 
         /**
@@ -1222,7 +1671,7 @@ declare namespace  ReactNative {
          * but not the last row if there is a section header below.
          * Take a sectionID and rowID of the row above and whether its adjacent row is highlighted.
          */
-        renderSeparator?: ( sectionID: string, rowID: string, adjacentRowHighlighted?: boolean ) => React.ReactElement<any>
+        renderSeparator?: ( sectionID: string | number, rowID: string | number, adjacentRowHighlighted?: boolean ) => React.ReactElement<any>
 
         /**
          * How early to start rendering rows before they come on screen, in
@@ -1236,56 +1685,212 @@ declare namespace  ReactNative {
     }
 
 
-    /**
-     * @see https://facebook.github.io/react-native/docs/touchablewithoutfeedback.html
-     */
-    export interface TouchableWithoutFeedbackProperties {
-        /*
-         accessible bool
+    export interface MapViewAnnotation {
+        latitude?: number
+        longitude?: number
+        animateDrop?: boolean
+        title?: string
+        subtitle?: string
+        hasLeftCallout?: boolean
+        hasRightCallout?: boolean
+        onLeftCalloutPress?: () => void
+        onRightCalloutPress?: () => void
+        id?: string
+    }
 
-         Called when the touch is released, but not if cancelled (e.g. by a scroll that steals the responder lock).
+    export interface MapViewRegion {
+        latitude: number
+        longitude: number
+        latitudeDelta: number
+        longitudeDelta: number
+    }
+
+    export interface MapViewPropertiesIOS {
+
+        /**
+         * If false points of interest won't be displayed on the map.
+         * Default value is true.
          */
-        accessible?: boolean;
-        /*
-         delayLongPress number
+        showsPointsOfInterest?: boolean
+    }
 
-         Delay in ms, from onPressIn, before onLongPress is called.
+    export interface MapViewProperties extends MapViewPropertiesIOS, Touchable, React.Props<MapViewStatic> {
+
+        /**
+         * Map annotations with title/subtitle.
+         */
+        annotations?: MapViewAnnotation[]
+
+        /**
+         * Insets for the map's legal label, originally at bottom left of the map. See EdgeInsetsPropType.js for more information.
+         */
+        legalLabelInsets?: Insets
+
+        /**
+         * The map type to be displayed.
+         *     standard: standard road map (default)
+         *     satellite: satellite view
+         *     hybrid: satellite view with roads and points of interest overlayed
+         *
+         * enum('standard', 'satellite', 'hybrid')
+         */
+        mapType?: string
+
+        /**
+         * Maximum size of area that can be displayed.
+         */
+        maxDelta?: number
+
+        /**
+         * Minimum size of area that can be displayed.
+         */
+        minDelta?: number
+
+        /**
+         * Callback that is called once, when the user taps an annotation.
+         */
+        onAnnotationPress?: () => void
+
+        /**
+         * Callback that is called continuously when the user is dragging the map.
+         */
+        onRegionChange?: ( region: MapViewRegion ) => void
+
+        /**
+         * Callback that is called once, when the user is done moving the map.
+         */
+        onRegionChangeComplete?: ( region: MapViewRegion ) => void
+
+        /**
+         * When this property is set to true and a valid camera is associated with the map,
+         * the camera’s pitch angle is used to tilt the plane of the map.
+         *
+         * When this property is set to false, the camera’s pitch angle is ignored and
+         * the map is always displayed as if the user is looking straight down onto it.
+         */
+        pitchEnabled?: boolean
+
+        /**
+         * The region to be displayed by the map.
+         * The region is defined by the center coordinates and the span of coordinates to display.
+         */
+        region?: MapViewRegion
+
+        /**
+         * When this property is set to true and a valid camera is associated with the map,
+         * the camera’s heading angle is used to rotate the plane of the map around its center point.
+         *
+         * When this property is set to false, the camera’s heading angle is ignored and the map is always oriented
+         * so that true north is situated at the top of the map view
+         */
+        rotateEnabled?: boolean
+
+        /**
+         * If false the user won't be able to change the map region being displayed.
+         * Default value is true.
+         */
+        scrollEnabled?: boolean
+
+        /**
+         * If true the app will ask for the user's location and focus on it.
+         * Default value is false.
+         *
+         * NOTE: You need to add NSLocationWhenInUseUsageDescription key in Info.plist to enable geolocation,
+         * otherwise it is going to fail silently!
+         */
+        showsUserLocation?: boolean
+
+        /**
+         * Used to style and layout the MapView.
+         * See StyleSheet.js and ViewStylePropTypes.js for more info.
+         */
+        style?: ViewStyle
+
+        /**
+         * If false the user won't be able to pinch/zoom the map.
+         * Default value is true.
+         */
+        zoomEnabled?: boolean
+    }
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/mapview.html#content
+     */
+    export interface MapViewStatic extends React.ComponentClass<MapViewProperties> {
+    }
+
+
+    export interface TouchableWithoutFeedbackAndroidProperties {
+
+        /**
+         * Indicates to accessibility services to treat UI component like a native one.
+         * Works for Android only.
+         *
+         * @enum('none', 'button', 'radiobutton_checked', 'radiobutton_unchecked' )
+         */
+        accessibilityComponentType?: string
+    }
+
+    export interface TouchableWithoutFeedbackIOSProperties {
+
+        /**
+         * Provides additional traits to screen reader.
+         * By default no traits are provided unless specified otherwise in element
+         *
+         * @enum('none', 'button', 'link', 'header', 'search', 'image', 'selected', 'plays', 'key', 'text','summary', 'disabled', 'frequentUpdates', 'startsMedia', 'adjustable', 'allowsDirectInteraction', 'pageTurn')
+         */
+        accessibilityTraits?: string | string[];
+
+    }
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/touchablewithoutfeedback.html#props
+     */
+    export interface TouchableWithoutFeedbackProperties extends TouchableWithoutFeedbackAndroidProperties, TouchableWithoutFeedbackIOSProperties {
+
+
+        /**
+         * Called when the touch is released, but not if cancelled (e.g. by a scroll that steals the responder lock).
+         */
+        accessible?: boolean
+
+        /**
+         * Delay in ms, from onPressIn, before onLongPress is called.
          */
         delayLongPress?: number;
 
-        /*
-         delayPressIn number
-
-         Delay in ms, from the start of the touch, before onPressIn is called.
+        /**
+         * Delay in ms, from the start of the touch, before onPressIn is called.
          */
         delayPressIn?: number;
 
-        /*
-         delayPressOut number
-
-         Delay in ms, from the release of the touch, before onPressOut is called.
+        /**
+         * Delay in ms, from the release of the touch, before onPressOut is called.
          */
         delayPressOut?: number;
 
-        /*
-         onLongPress function
+        /**
+         * Invoked on mount and layout changes with
+         * {nativeEvent: {layout: {x, y, width, height}}}
          */
+        onLayout?: ( event: LayoutChangeEvent ) => void
+
         onLongPress?: () => void;
 
-        /*
-         onPress function
+        /**
+         * Called when the touch is released,
+         * but not if cancelled (e.g. by a scroll that steals the responder lock).
          */
         onPress?: () => void;
 
-        /*
-         onPressIn function
-         */
         onPressIn?: () => void;
 
-        /*
-         onPressOut function
-         */
         onPressOut?: () => void;
+
+        /**
+         * //FIXME: not in doc but available in exmaples
+         */
+        style?: ViewStyle
     }
 
 
@@ -1293,6 +1898,13 @@ declare namespace  ReactNative {
 
     }
 
+    /**
+     * Do not use unless you have a very good reason.
+     * All the elements that respond to press should have a visual feedback when touched.
+     * This is one of the primary reason a "web" app doesn't feel "native".
+     *
+     * @see https://facebook.github.io/react-native/docs/touchablewithoutfeedback.html
+     */
     export interface TouchableWithoutFeedbackStatic extends React.ComponentClass<TouchableWithoutFeedbackProps> {
 
     }
@@ -1302,25 +1914,19 @@ declare namespace  ReactNative {
      * @see https://facebook.github.io/react-native/docs/touchablehighlight.html#props
      */
     export interface TouchableHighlightProperties extends TouchableWithoutFeedbackProperties, React.Props<TouchableHighlightStatic> {
+
         /**
-         * activeOpacity number
-         *
          * Determines what the opacity of the wrapped view should be when touch is active.
          */
         activeOpacity?: number
 
         /**
-         * onHideUnderlay function
          *
          * Called immediately after the underlay is hidden
          */
-
         onHideUnderlay?: () => void
 
-
         /**
-         * onShowUnderlay function
-         *
          * Called immediately after the underlay is shown
          */
         onShowUnderlay?: () => void
@@ -1332,14 +1938,24 @@ declare namespace  ReactNative {
 
 
         /**
-         * underlayColor string
-         *
          * The color of the underlay that will show through when the touch is active.
          */
         underlayColor?: string
-
     }
 
+    /**
+     * A wrapper for making views respond properly to touches.
+     * On press down, the opacity of the wrapped view is decreased,
+     * which allows the underlay color to show through, darkening or tinting the view.
+     * The underlay comes from adding a view to the view hierarchy,
+     * which can sometimes cause unwanted visual artifacts if not used correctly,
+     * for example if the backgroundColor of the wrapped view isn't explicitly set to an opaque color.
+     *
+     * NOTE: TouchableHighlight supports only one child
+     * If you wish to have several child components, wrap them in a View.
+     *
+     * @see https://facebook.github.io/react-native/docs/touchablehighlight.html
+     */
     export interface TouchableHighlightStatic extends React.ComponentClass<TouchableHighlightProperties> {
     }
 
@@ -1349,23 +1965,62 @@ declare namespace  ReactNative {
      */
     export interface TouchableOpacityProperties extends TouchableWithoutFeedbackProperties, React.Props<TouchableOpacityStatic> {
         /**
-         * activeOpacity number
-         *
          * Determines what the opacity of the wrapped view should be when touch is active.
+         * Defaults to 0.2
          */
-        activeOpacity?: number;
+        activeOpacity?: number
     }
 
+    /**
+     * A wrapper for making views respond properly to touches.
+     * On press down, the opacity of the wrapped view is decreased, dimming it.
+     * This is done without actually changing the view hierarchy,
+     * and in general is easy to add to an app without weird side-effects.
+     *
+     * @see https://facebook.github.io/react-native/docs/touchableopacity.html
+     */
     export interface TouchableOpacityStatic extends React.ComponentClass<TouchableOpacityProperties> {
     }
 
 
-    export interface LeftToRightGesture {
+    /**
+     * @see https://facebook.github.io/react-native/docs/touchableopacity.html#props
+     */
+    export interface TouchableNativeFeedbackProperties extends TouchableWithoutFeedbackProperties, React.Props<TouchableNativeFeedbackStatic> {
+        /**
+         * Determines the type of background drawable that's going to be used to display feedback.
+         * It takes an object with type property and extra data depending on the type.
+         * It's recommended to use one of the following static methods to generate that dictionary:
+         *      1) TouchableNativeFeedback.SelectableBackground() - will create object that represents android theme's default background for selectable elements (?android:attr/selectableItemBackground)
+         *      2) TouchableNativeFeedback.SelectableBackgroundBorderless() - will create object that represent android theme's default background for borderless selectable elements (?android:attr/selectableItemBackgroundBorderless). Available on android API level 21+
+         *      3) TouchableNativeFeedback.Ripple(color, borderless) - will create object that represents ripple drawable with specified color (as a string). If property borderless evaluates to true the ripple will render outside of the view bounds (see native actionbar buttons as an example of that behavior). This background type is available on Android API level 21+
+         */
+        background?: any
+    }
 
+    /**
+     * A wrapper for making views respond properly to touches (Android only).
+     * On Android this component uses native state drawable to display touch feedback.
+     * At the moment it only supports having a single View instance as a child node,
+     * as it's implemented by replacing that View with another instance of RCTView node with some additional properties set.
+     *
+     * Background drawable of native feedback touchable can be customized with background property.
+     *
+     * @see https://facebook.github.io/react-native/docs/touchablenativefeedback.html#content
+     */
+    export interface TouchableNativeFeedbackStatic extends React.ComponentClass<TouchableNativeFeedbackProperties> {
+        SelectableBackground: () => TouchableNativeFeedbackStatic
+        SelectableBackgroundBorderless: () => TouchableNativeFeedbackStatic
+        Ripple: ( color: string, borderless?: boolean ) => TouchableNativeFeedbackStatic
+    }
+
+
+    export interface LeftToRightGesture {
+        //TODO:
     }
 
     export interface AnimationInterpolator {
-
+        //TODO:
     }
 
     // see /NavigatorSceneConfigs.js
@@ -1668,7 +2323,7 @@ declare namespace  ReactNative {
          * handle merging of old and new data separately and then pass that into
          * this function as the `dataBlob`.
          */
-        cloneWithRows<T>( dataBlob: Array<any> | {[key: string]: any}, rowIdentities?: Array<string> ): ListViewDataSource
+        cloneWithRows<T>( dataBlob: Array<any> | {[key: string ]: any}, rowIdentities?: Array<string | number> ): ListViewDataSource
 
         /**
          * This performs the same function as the `cloneWithRows` function but here
@@ -1681,7 +2336,7 @@ declare namespace  ReactNative {
          *
          * Note: this returns a new object!
          */
-        cloneWithRowsAndSections( dataBlob: Array<any> | {[key: string]: any}, sectionIdentities?: Array<string>, rowIdentities?: Array<Array<string>> ): ListViewDataSource
+        cloneWithRowsAndSections( dataBlob: Array<any> | {[key: string]: any}, sectionIdentities?: Array<string | number>, rowIdentities?: Array<Array<string | number>> ): ListViewDataSource
 
         getRowCount(): number
 
@@ -1719,135 +2374,88 @@ declare namespace  ReactNative {
     }
 
 
-
     /**
-     * @see
+     * @see https://facebook.github.io/react-native/docs/tabbarios-item.html#props
      */
-    export interface TabBarItemProperties {
+    export interface TabBarItemProperties extends React.Props<TabBarItemStatic> {
+
+        /**
+         * Little red bubble that sits at the top right of the icon.
+         */
+        badge?:  string | number
+
+        /**
+         * A custom icon for the tab. It is ignored when a system icon is defined.
+         */
+        icon?: {uri: string} | string
+
+        /**
+         * Callback when this tab is being selected,
+         * you should change the state of your component to set selected={true}.
+         */
+        onPress?: () => void
+
+        /**
+         * It specifies whether the children are visible or not. If you see a blank content, you probably forgot to add a selected one.
+         */
+        selected?: boolean
+
+        /**
+         * A custom icon when the tab is selected.
+         * It is ignored when a system icon is defined. If left empty, the icon will be tinted in blue.
+         */
+        selectedIcon?: {uri: string} | string;
+
+        /**
+         * React style object.
+         */
+        style?: ViewStyle
+
+        /**
+         * Items comes with a few predefined system icons.
+         * Note that if you are using them, the title and selectedIcon will be overriden with the system ones.
+         *
+         *  enum('bookmarks', 'contacts', 'downloads', 'favorites', 'featured', 'history', 'more', 'most-recent', 'most-viewed', 'recents', 'search', 'top-rated')
+         */
+        systemIcon: string
+
+        /**
+         * Text that appears under the icon. It is ignored when a system icon is defined.
+         */
+        title?: string
 
     }
 
-    export interface TabBarItem extends React.ComponentClass<TabBarItemProperties> {
+    export interface TabBarItemStatic extends React.ComponentClass<TabBarItemProperties> {
     }
 
     /**
-     * @see
+     * @see https://facebook.github.io/react-native/docs/tabbarios.html#props
      */
-    export interface TabBarIOSProperties {
+    export interface TabBarIOSProperties extends React.Props<TabBarIOSStatic> {
+
+        /**
+         * Background color of the tab bar
+         */
+        barTintColor?: string
+
+        style?: ViewStyle
+
+        /**
+         * Color of the currently selected tab icon
+         */
+        tintColor?: string
+
+        /**
+         * A Boolean value that indicates whether the tab bar is translucent
+         */
+        translucent?: boolean
     }
 
     export interface TabBarIOSStatic extends React.ComponentClass<TabBarIOSProperties> {
-        Item: TabBarItem;
+        Item: TabBarItemStatic;
     }
 
-    export interface CameraRollFetchParams {
-        first: number;
-        groupTypes: string;
-        after?: string;
-    }
-
-    export interface CameraRollNodeInfo {
-        image: Image;
-        group_name: string;
-        timestamp: number;
-        location: any;
-    }
-
-    export interface CameraRollEdgeInfo {
-        node: CameraRollNodeInfo;
-    }
-
-    export interface CameraRollAssetInfo {
-        edges: CameraRollEdgeInfo[];
-        page_info: {
-            has_next_page: boolean;
-            end_cursor: string;
-        };
-    }
-
-    export interface CameraRollStatic extends React.ComponentClass<CameraRollProperties> {
-        getPhotos( fetch: CameraRollFetchParams,
-                   onAsset: ( assetInfo: CameraRollAssetInfo ) => void,
-                   logError: ()=> void ): void;
-    }
-
-    export interface PanHandlers {
-
-    }
-
-    export interface PanResponderEvent {
-
-    }
-
-    export interface PanResponderGestureState {
-        stateID: number;
-        moveX: number;
-        moveY: number;
-        x0: number;
-        y0: number;
-        dx: number;
-        dy: number;
-        vx: number;
-        vy: number;
-        numberActiveTouches: number;
-        // All `gestureState` accounts for timeStamps up until:
-        _accountsForMovesUpTo: number;
-    }
-
-    /**
-     * @param {object} config Enhanced versions of all of the responder callbacks
-     * that provide not only the typical `ResponderSyntheticEvent`, but also the
-     * `PanResponder` gesture state.  Simply replace the word `Responder` with
-     * `PanResponder` in each of the typical `onResponder*` callbacks. For
-     * example, the `config` object would look like:
-     *
-     *  - `onMoveShouldSetPanResponder: (e, gestureState) => {...}`
-     *  - `onMoveShouldSetPanResponderCapture: (e, gestureState) => {...}`
-     *  - `onStartShouldSetPanResponder: (e, gestureState) => {...}`
-     *  - `onStartShouldSetPanResponderCapture: (e, gestureState) => {...}`
-     *  - `onPanResponderReject: (e, gestureState) => {...}`
-     *  - `onPanResponderGrant: (e, gestureState) => {...}`
-     *  - `onPanResponderStart: (e, gestureState) => {...}`
-     *  - `onPanResponderEnd: (e, gestureState) => {...}`
-     *  - `onPanResponderRelease: (e, gestureState) => {...}`
-     *  - `onPanResponderMove: (e, gestureState) => {...}`
-     *  - `onPanResponderTerminate: (e, gestureState) => {...}`
-     *  - `onPanResponderTerminationRequest: (e, gestureState) => {...}`
-     *
-     *  In general, for events that have capture equivalents, we update the
-     *  gestureState once in the capture phase and can use it in the bubble phase
-     *  as well.
-     *
-     *  Be careful with onStartShould* callbacks. They only reflect updated
-     *  `gestureState` for start/end events that bubble/capture to the Node.
-     *  Once the node is the responder, you can rely on every start/end event
-     *  being processed by the gesture and `gestureState` being updated
-     *  accordingly. (numberActiveTouches) may not be totally accurate unless you
-     *  are the responder.
-     */
-    export interface PanResponderCallbacks {
-        onMoveShouldSetPanResponder?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => boolean;
-        onStartShouldSetPanResponder?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-        onPanResponderGrant?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-        onPanResponderMove?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-        onPanResponderRelease?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-        onPanResponderTerminate?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-
-        onMoveShouldSetPanResponderCapture?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => boolean;
-        onStartShouldSetPanResponderCapture?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => boolean;
-        onPanResponderReject?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-        onPanResponderStart?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-        onPanResponderEnd?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-        onPanResponderTerminationRequest?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-    }
-
-    export interface PanResponderInstance {
-        panHandlers: PanHandlers;
-    }
-
-    export interface PanResponderStatic {
-        create( callbacks: PanResponderCallbacks ): PanResponderInstance;
-    }
 
     export interface PixelRatioStatic {
         get(): number;
@@ -1868,19 +2476,6 @@ declare namespace  ReactNative {
         scale: number;
     }
 
-    // @see https://facebook.github.io/react-native/docs/asyncstorage.html#content
-    export interface AsyncStorageStatic {
-        getItem( key: string, callback?: ( error?: Error, result?: string ) => void ): Promise<string>;
-        setItem( key: string, value: string, callback?: ( error?: Error ) => void ): Promise<string>;
-        removeItem( key: string, callback?: ( error?: Error ) => void ): Promise<string>;
-        mergeItem( key: string, value: string, callback?: ( error?: Error ) => void ): Promise<string>;
-        clear( callback?: ( error?: Error ) => void ): Promise<string>;
-        getAllKeys( callback?: ( error?: Error, keys?: string[] ) => void ): Promise<string>;
-        multiGet( keys: string[], callback?: ( errors?: Error[], result?: string[][] ) => void ): Promise<string>;
-        multiSet( keyValuePairs: string[][], callback?: ( errors?: Error[] ) => void ): Promise<string>;
-        multiRemove( keys: string[], callback?: ( errors?: Error[] ) => void ): Promise<string>;
-        multiMerge( keyValuePairs: string[][], callback?: ( errors?: Error[] ) => void ): Promise<string>;
-    }
 
     export interface InteractionManagerStatic {
         runAfterInteractions( fn: () => void ): void;
@@ -1915,17 +2510,6 @@ declare namespace  ReactNative {
         shadowRadius?: number
     }
 
-    export interface  EdgeInsetsProperties {
-        top: number
-        left: number
-        bottom: number
-        right: number
-    }
-
-    export interface  PointProperties {
-        x: number
-        y: number
-    }
 
     export interface ScrollViewIOSProperties {
 
@@ -1981,7 +2565,7 @@ declare namespace  ReactNative {
          * The amount by which the scroll view content is inset from the edges of the scroll view.
          * Defaults to {0, 0, 0, 0}.
          */
-        contentInset?: EdgeInsetsProperties // zeros
+        contentInset?: Insets // zeros
 
         /**
          * Used to manually set the starting scroll offset.
@@ -2043,7 +2627,7 @@ declare namespace  ReactNative {
          * This should normally be set to the same value as the contentInset.
          * Defaults to {0, 0, 0, 0}.
          */
-        scrollIndicatorInsets?: EdgeInsetsProperties //zeroes
+        scrollIndicatorInsets?: Insets //zeroes
 
         /**
          * When true the scroll view scrolls to top when the status bar is tapped.
@@ -2081,7 +2665,7 @@ declare namespace  ReactNative {
         zoomScale?: number
     }
 
-    export interface ScrollViewProperties extends ScrollViewIOSProperties {
+    export interface ScrollViewProperties extends ScrollViewIOSProperties, Touchable {
 
         /**
          * These styles will be applied to the scroll view content container which
@@ -2188,294 +2772,654 @@ declare namespace  ReactNative {
         zoomScale: number;
     }
 
-    export interface AppStateIOSStatic {
-        currentState: string;
-        addEventListener( type: string, listener: ( state: string ) => void ): void;
-        removeEventListener( type: string, listener: ( state: string ) => void ): void;
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // A P I s
+    //
+    //////////////////////////////////////////////////////////////////////////
+
+    /**
+     * //FIXME: no documentation - inferred from RCTACtionSheetManager.m
+     */
+    export interface ActionSheetIOSOptions {
+        title?: string
+        options?: string[]
+        cancelButtonIndex?: number
+        destructiveButtonIndex?: number
     }
 
-    // exported singletons:
+    /**
+     * //FIXME: no documentation - inferred from RCTACtionSheetManager.m
+     */
+    export interface ShareActionSheetIOSOptions {
+        message?: string
+        url?: string
+    }
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/actionsheetios.html#content
+     * //FIXME: no documentation - inferred from RCTACtionSheetManager.m
+     */
+    export interface ActionSheetIOSStatic {
+        showActionSheetWithOptions: ( options: ActionSheetIOSOptions, callback: ( buttonIndex: number ) => void ) => void
+        showShareActionSheetWithOptions: ( options: ShareActionSheetIOSOptions, failureCallback: ( error: Error ) => void, successCallback: ( success: boolean, method: string ) => void ) => void
+    }
+
+
+    /**
+     * //FIXME: No documentation - inferred from RCTAdSupport.m
+     */
+    export interface AdSupportIOSStatic {
+        getAdvertisingId: ( onSuccess: ( deviceId: string ) => void, onFailure: ( err: Error ) => void ) => void
+        getAdvertisingTrackingEnabled: ( onSuccess: ( hasTracking: boolean ) => void, onFailure: ( err: Error ) => void ) => void
+    }
+
+    interface AlertIOSButton {
+        text: string
+        onPress?: () => void
+    }
+
+    /**
+     * Launches an alert dialog with the specified title and message.
+     *
+     * Optionally provide a list of buttons.
+     * Tapping any button will fire the respective onPress callback and dismiss the alert.
+     * By default, the only button will be an 'OK' button
+     *
+     * The last button in the list will be considered the 'Primary' button and it will appear bold.
+     *
+     * @see https://facebook.github.io/react-native/docs/alertios.html#content
+     */
+    export interface AlertIOSStatic {
+        alert: ( title: string, message?: string, buttons?: Array<AlertIOSButton>, type?: string ) => void
+        prompt: ( title: string, value?: string, buttons?: Array<AlertIOSButton>, callback?: ( value?: string ) => void ) => void
+    }
+
+
+    /**
+     * AppStateIOS can tell you if the app is in the foreground or background,
+     * and notify you when the state changes.
+     *
+     * AppStateIOS is frequently used to determine the intent and proper behavior
+     * when handling push notifications.
+     *
+     * iOS App States
+     *      active - The app is running in the foreground
+     *      background - The app is running in the background. The user is either in another app or on the home screen
+     *      inactive - This is a transition state that currently never happens for typical React Native apps.
+     *
+     * For more information, see Apple's documentation: https://developer.apple.com/library/ios/documentation/iPhone/Conceptual/iPhoneOSProgrammingGuide/TheAppLifeCycle/TheAppLifeCycle.html
+     *
+     * @see https://facebook.github.io/react-native/docs/appstateios.html#content
+     */
+    export interface AppStateIOSStatic {
+        currentState: string
+        addEventListener( type: string, listener: ( state: string ) => void ): void
+        removeEventListener( type: string, listener: ( state: string ) => void ): void
+    }
+
+    /**
+     * AsyncStorage is a simple, asynchronous, persistent, key-value storage system that is global to the app.
+     * It should be used instead of LocalStorage.
+     *
+     * It is recommended that you use an abstraction on top of AsyncStorage
+     * instead of AsyncStorage directly for anything more than light usage since it operates globally.
+     *
+     * @see https://facebook.github.io/react-native/docs/asyncstorage.html#content
+     */
+    export interface AsyncStorageStatic {
+
+        /**
+         * Fetches key and passes the result to callback, along with an Error if there is any.
+         */
+        getItem( key: string, callback?: ( error?: Error, result?: string ) => void ): Promise<string>
+
+        /**
+         * Sets value for key and calls callback on completion, along with an Error if there is any
+         */
+        setItem( key: string, value: string, callback?: ( error?: Error ) => void ): Promise<string>
+
+        removeItem( key: string, callback?: ( error?: Error ) => void ): Promise<string>
+
+        /**
+         * Merges existing value with input value, assuming they are stringified json. Returns a Promise object.
+         * Not supported by all native implementation
+         */
+        mergeItem( key: string, value: string, callback?: ( error?: Error ) => void ): Promise<string>
+
+        /**
+         * Erases all AsyncStorage for all clients, libraries, etc. You probably don't want to call this.
+         * Use removeItem or multiRemove to clear only your own keys instead.
+         */
+        clear( callback?: ( error?: Error ) => void ): Promise<string>
+
+        /**
+         * Gets all keys known to the app, for all callers, libraries, etc
+         */
+        getAllKeys( callback?: ( error?: Error, keys?: string[] ) => void ): Promise<string>
+
+        /**
+         * multiGet invokes callback with an array of key-value pair arrays that matches the input format of multiSet
+         */
+        multiGet( keys: string[], callback?: ( errors?: Error[], result?: string[][] ) => void ): Promise<string>
+
+        /**
+         * multiSet and multiMerge take arrays of key-value array pairs that match the output of multiGet,
+         *
+         * multiSet([['k1', 'val1'], ['k2', 'val2']], cb);
+         */
+        multiSet( keyValuePairs: string[][], callback?: ( errors?: Error[] ) => void ): Promise<string>
+
+        /**
+         * Delete all the keys in the keys array.
+         */
+        multiRemove( keys: string[], callback?: ( errors?: Error[] ) => void ): Promise<string>
+
+        /**
+         * Merges existing values with input values, assuming they are stringified json.
+         * Returns a Promise object.
+         *
+         * Not supported by all native implementations.
+         */
+        multiMerge( keyValuePairs: string[][], callback?: ( errors?: Error[] ) => void ): Promise<string>
+    }
+
+
+    export interface CameraRollFetchParams {
+        first: number;
+        after?: string;
+        groupTypes: string; //  'Album','All','Event','Faces','Library','PhotoStream','SavedPhotos'
+        groupName?: string
+        assetType?: string
+    }
+
+    export interface CameraRollNodeInfo {
+        image: Image;
+        group_name: string;
+        timestamp: number;
+        location: any;
+    }
+
+    export interface CameraRollEdgeInfo {
+        node: CameraRollNodeInfo;
+    }
+
+    export interface CameraRollAssetInfo {
+        edges: CameraRollEdgeInfo[];
+        page_info: {
+            has_next_page: boolean;
+            end_cursor: string;
+        };
+    }
+
+    /**
+     * CameraRoll provides access to the local camera roll / gallery.
+     */
+    export interface CameraRollStatic {
+
+        GroupTypesOptions: string[] //'Album','All','Event','Faces','Library','PhotoStream','SavedPhotos'
+
+        /**
+         * Saves the image to the camera roll / gallery.
+         *
+         * The CameraRoll API is not yet implemented for Android.
+         *
+         * @tag On Android, this is a local URI, such as "file:///sdcard/img.png".
+         * On iOS, the tag can be one of the following:
+         *      local URI
+         *      assets-library tag
+         *      a tag not maching any of the above, which means the image data will be stored in memory (and consume memory as long as the process is alive)
+         *
+         * @param successCallback Invoked with the value of tag on success.
+         * @param errorCallback Invoked with error message on error.
+         */
+        saveImageWithTag( tag: string, successCallback: ( tag?: string ) => void, errorCallback: ( error: Error ) => void ): void
+
+        /**
+         * Invokes callback with photo identifier objects from the local camera roll of the device matching shape defined by getPhotosReturnChecker.
+         *
+         * @param {object} params See getPhotosParamChecker.
+         * @param {function} callback Invoked with arg of shape defined by getPhotosReturnChecker on success.
+         * @param {function} errorCallback Invoked with error message on error.
+         */
+        getPhotos( fetch: CameraRollFetchParams,
+                   callback: ( assetInfo: CameraRollAssetInfo ) => void,
+                   errorCallback: ( error: Error )=> void ): void;
+    }
+
+    export interface FetchableListenable<T> {
+        fetch: () => Promise<T>
+
+        /**
+         * eventName is expected to be `change`
+         * //FIXME: No doc - inferred from NetInfo.js
+         */
+        addEventListener: ( eventName: string, listener: ( result: T ) => void ) => void
+
+        /**
+         * eventName is expected to be `change`
+         * //FIXME: No doc - inferred from NetInfo.js
+         */
+        removeEventListener: ( eventName: string, listener: ( result: T ) => void ) => void
+    }
+
+    /**
+     * NetInfo exposes info about online/offline status
+     *
+     * Asynchronously determine if the device is online and on a cellular network.
+     *
+     * - `none` - device is offline
+     * - `wifi` - device is online and connected via wifi, or is the iOS simulator
+     * - `cell` - device is connected via Edge, 3G, WiMax, or LTE
+     * - `unknown` - error case and the network status is unknown
+
+     * @see https://facebook.github.io/react-native/docs/netinfo.html#content
+     */
+    export interface NetInfoStatic extends FetchableListenable<string> {
+
+        /**
+         *
+         * Available on all platforms.
+         * Asynchronously fetch a boolean to determine internet connectivity.
+         */
+        isConnected: FetchableListenable<boolean>
+
+        //FIXME: Documentation missing
+        isConnectionMetered: any
+    }
+
+
+    export interface PanResponderGestureState {
+
+        /**
+         *  ID of the gestureState- persisted as long as there at least one touch on
+         */
+        stateID: number
+
+        /**
+         *  the latest screen coordinates of the recently-moved touch
+         */
+        moveX: number
+
+        /**
+         *  the latest screen coordinates of the recently-moved touch
+         */
+        moveY: number
+
+        /**
+         * the screen coordinates of the responder grant
+         */
+        x0: number
+
+        /**
+         * the screen coordinates of the responder grant
+         */
+        y0: number
+
+        /**
+         * accumulated distance of the gesture since the touch started
+         */
+        dx: number
+
+        /**
+         * accumulated distance of the gesture since the touch started
+         */
+        dy: number
+
+        /**
+         * current velocity of the gesture
+         */
+        vx: number
+
+        /**
+         * current velocity of the gesture
+         */
+        vy: number
+
+        /**
+         * Number of touches currently on screeen
+         */
+        numberActiveTouches: number
+
+
+        // All `gestureState` accounts for timeStamps up until:
+        _accountsForMovesUpTo: number
+    }
+
+
+    /**
+     * @see documentation of GestureResponderHandlers
+     */
+    export interface PanResponderCallbacks {
+        onMoveShouldSetPanResponder?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => boolean
+        onStartShouldSetPanResponder?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+        onPanResponderGrant?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+        onPanResponderMove?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+        onPanResponderRelease?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+        onPanResponderTerminate?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+
+        onMoveShouldSetPanResponderCapture?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => boolean
+        onStartShouldSetPanResponderCapture?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => boolean
+        onPanResponderReject?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+        onPanResponderStart?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+        onPanResponderEnd?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+        onPanResponderTerminationRequest?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => boolean
+    }
+
+    export interface PanResponderInstance {
+        panHandlers: GestureResponderHandlers
+    }
+
+    /**
+     * PanResponder reconciles several touches into a single gesture.
+     * It makes single-touch gestures resilient to extra touches,
+     * and can be used to recognize simple multi-touch gestures.
+     *
+     * It provides a predictable wrapper of the responder handlers provided by the gesture responder system.
+     * For each handler, it provides a new gestureState object alongside the normal event.
+     */
+    export interface PanResponderStatic {
+        /**
+         * @param config Enhanced versions of all of the responder callbacks
+         * that provide not only the typical `ResponderSyntheticEvent`, but also the
+         * `PanResponder` gesture state.  Simply replace the word `Responder` with
+         * `PanResponder` in each of the typical `onResponder*` callbacks. For
+         * example, the `config` object would look like:
+         *
+         *  - `onMoveShouldSetPanResponder: (e, gestureState) => {...}`
+         *  - `onMoveShouldSetPanResponderCapture: (e, gestureState) => {...}`
+         *  - `onStartShouldSetPanResponder: (e, gestureState) => {...}`
+         *  - `onStartShouldSetPanResponderCapture: (e, gestureState) => {...}`
+         *  - `onPanResponderReject: (e, gestureState) => {...}`
+         *  - `onPanResponderGrant: (e, gestureState) => {...}`
+         *  - `onPanResponderStart: (e, gestureState) => {...}`
+         *  - `onPanResponderEnd: (e, gestureState) => {...}`
+         *  - `onPanResponderRelease: (e, gestureState) => {...}`
+         *  - `onPanResponderMove: (e, gestureState) => {...}`
+         *  - `onPanResponderTerminate: (e, gestureState) => {...}`
+         *  - `onPanResponderTerminationRequest: (e, gestureState) => {...}`
+         *
+         *  In general, for events that have capture equivalents, we update the
+         *  gestureState once in the capture phase and can use it in the bubble phase
+         *  as well.
+         *
+         *  Be careful with onStartShould* callbacks. They only reflect updated
+         *  `gestureState` for start/end events that bubble/capture to the Node.
+         *  Once the node is the responder, you can rely on every start/end event
+         *  being processed by the gesture and `gestureState` being updated
+         *  accordingly. (numberActiveTouches) may not be totally accurate unless you
+         *  are the responder.
+         */
+        create( config: PanResponderCallbacks ): PanResponderInstance
+    }
+
+    export interface PushNotificationPermissions {
+        alert?: boolean
+        badge?: boolean
+        sound?: boolean
+    }
+
+    export interface PushNotification {
+
+
+        /**
+         * An alias for `getAlert` to get the notification's main message string
+         */
+        getMessage(): string | Object
+
+        /**
+         * Gets the sound string from the `aps` object
+         */
+        getSound(): string
+
+        /**
+         * Gets the notification's main message from the `aps` object
+         */
+        getAlert(): string | Object
+
+        /**
+         * Gets the badge count number from the `aps` object
+         */
+        getBadgeCount(): number
+
+        /**
+         * Gets the data object on the notif
+         */
+        getData(): Object
+
+    }
+
+
+    /**
+     * Handle push notifications for your app, including permission handling and icon badge number.
+     * @see https://facebook.github.io/react-native/docs/pushnotificationios.html#content
+     *
+     * //FIXME: BGR: The documentation seems completely off compared to the actual js implementation. I could never get the example to run
+     */
+    export interface PushNotificationIOSStatic {
+
+        /**
+         * Sets the badge number for the app icon on the home screen
+         */
+        setApplicationIconBadgeNumber( number: number ): void
+
+        /**
+         * Gets the current badge number for the app icon on the home screen
+         */
+        getApplicationIconBadgeNumber( callback: ( badge: number ) => void ): void
+
+        /**
+         * Attaches a listener to remote notifications while the app is running in the
+         * foreground or the background.
+         *
+         * The handler will get be invoked with an instance of `PushNotificationIOS`
+         *
+         * The type MUST be 'notification'
+         */
+        addEventListener( type: string, handler: ( notification: PushNotification ) => void ):void
+
+        /**
+         * Requests all notification permissions from iOS, prompting the user's
+         * dialog box.
+         */
+        requestPermissions(): void
+
+        /**
+         * See what push permissions are currently enabled. `callback` will be
+         * invoked with a `permissions` object:
+         *
+         *  - `alert` :boolean
+         *  - `badge` :boolean
+         *  - `sound` :boolean
+         */
+        checkPermissions( callback: ( permissions: PushNotificationPermissions ) => void ): void
+
+        /**
+         * Removes the event listener. Do this in `componentWillUnmount` to prevent
+         * memory leaks
+         */
+        removeEventListener( type: string, handler: ( notification: PushNotification ) => void ): void
+
+        /**
+         * An initial notification will be available if the app was cold-launched
+         * from a notification.
+         *
+         * The first caller of `popInitialNotification` will get the initial
+         * notification object, or `null`. Subsequent invocations will return null.
+         */
+        popInitialNotification(): PushNotification
+    }
+
+
+    /**
+     * @enum('default', 'light-content')
+     */
+    export type StatusBarStyle = string
+
+    /**
+     * @enum('none','fade', 'slide')
+     */
+    type StatusBarAnimation = string
+
+
+    /**
+     * //FIXME: No documentation is available (although this is self explanatory)
+     *
+     * @see https://facebook.github.io/react-native/docs/statusbarios.html#content
+     */
+    export interface StatusBarIOSStatic {
+
+        setStyle(style: StatusBarStyle, animated?: boolean): void
+
+        setHidden(hidden: boolean, animation?: StatusBarAnimation): void
+
+        setNetworkActivityIndicatorVisible(visible: boolean): void
+    }
+
+    /**
+     * The Vibration API is exposed at VibrationIOS.vibrate().
+     * On iOS, calling this function will trigger a one second vibration.
+     * The vibration is asynchronous so this method will return immediately.
+     *
+     * There will be no effect on devices that do not support Vibration, eg. the iOS simulator.
+     *
+     * Vibration patterns are currently unsupported.
+     *
+     * @see https://facebook.github.io/react-native/docs/vibrationios.html#content
+     */
+    export interface VibrationIOSStatic {
+        vibrate(): void
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    //  R E - E X P O R T S
+    //
+    //////////////////////////////////////////////////////////////////////////
+
     // export var AppRegistry: AppRegistryStatic;
 
 
-    export var ActivityIndicatorIOS: ActivityIndicatorIOSStatic;
-    export type ActivityIndicatorIOS = ActivityIndicatorIOSStatic;
-
-    export var AsyncStorage: AsyncStorageStatic;
-    export type AsyncStorage = AsyncStorageStatic;
-
-    export var CameraRoll: CameraRollStatic;
-    export type CameraRoll = CameraRollStatic;
+    export var ActivityIndicatorIOS: ActivityIndicatorIOSStatic
+    export type ActivityIndicatorIOS = ActivityIndicatorIOSStatic
 
     export var DatePickerIOS: DatePickerIOSStatic
     export type DatePickerIOS = DatePickerIOSStatic
 
-    export var Image: ImageStatic;
-    export type Image = ImageStatic;
+    export var Image: ImageStatic
+    export type Image = ImageStatic
 
-    export var ListView: ListViewStatic;
-    export type ListView = ListViewStatic;
+    export var LayoutAnimation: LayoutAnimationStatic
+    export type LayoutAnimation = LayoutAnimationStatic
 
-    export var Navigator: NavigatorStatic;
-    export type Navigator = NavigatorStatic;
+    export var ListView: ListViewStatic
+    export type ListView = ListViewStatic
 
-    export var NavigatorIOS: NavigatorIOSStatic;
-    export type NavigatorIOS = NavigatorIOSStatic;
+    export var MapView: MapViewStatic
+    export type MapView = MapViewStatic
 
-    export var SliderIOS: SliderIOSStatic;
-    export type SliderIOS = SliderIOSStatic;
+    export var Navigator: NavigatorStatic
+    export type Navigator = NavigatorStatic
+
+    export var NavigatorIOS: NavigatorIOSStatic
+    export type NavigatorIOS = NavigatorIOSStatic
+
+    export var PickerIOS: PickerIOSStatic
+    export type PickerIOS = PickerIOSStatic
+
+    export var SliderIOS: SliderIOSStatic
+    export type SliderIOS = SliderIOSStatic
 
     export var ScrollView: ScrollViewStatic
     export type ScrollView = ScrollViewStatic
 
-    export var StyleSheet: StyleSheetStatic;
-    export type StyleSheet = StyleSheetStatic;
+    export var StyleSheet: StyleSheetStatic
+    export type StyleSheet = StyleSheetStatic
 
-    export var TabBarIOS: TabBarIOSStatic;
-    export type TabBarIOS = TabBarIOSStatic;
+    export var SwitchIOS: SwitchIOSStatic
+    export type SwitchIOS = SwitchIOSStatic
 
-    export var Text: TextStatic;
-    export type Text = TextStatic;
+    export var TabBarIOS: TabBarIOSStatic
+    export type TabBarIOS = TabBarIOSStatic
+
+    export var Text: TextStatic
+    export type Text = TextStatic
 
     export var TextInput: TextInputStatic
     export type TextInput = TextInputStatic
 
-    export var TouchableHighlight: TouchableHighlightStatic;
-    export type TouchableHighlight = TouchableHighlightStatic;
+    export var TouchableHighlight: TouchableHighlightStatic
+    export type TouchableHighlight = TouchableHighlightStatic
 
-    export var TouchableOpacity: TouchableOpacityStatic;
-    export type TouchableOpacity = TouchableOpacityStatic;
+    export var TouchableNativeFeedback: TouchableNativeFeedbackStatic
+    export type TouchableNativeFeedback = TouchableNativeFeedbackStatic
 
-    export var TouchableWithoutFeedback: TouchableWithoutFeedbackStatic;
-    export type TouchableWithoutFeedback= TouchableWithoutFeedbackStatic;
+    export var TouchableOpacity: TouchableOpacityStatic
+    export type TouchableOpacity = TouchableOpacityStatic
 
-    export var View: ViewStatic;
-    export type View = ViewStatic;
+    export var TouchableWithoutFeedback: TouchableWithoutFeedbackStatic
+    export type TouchableWithoutFeedback= TouchableWithoutFeedbackStatic
 
-    export var AlertIOS: React.ComponentClass<AlertIOSProperties>;
-    export var SegmentedControlIOS: React.ComponentClass<SegmentedControlIOSProperties>;
-    export var SwitchIOS: React.ComponentClass<SwitchIOSProperties>;
+    export var View: ViewStatic
+    export type View = ViewStatic
 
-    export var PixelRatio: PixelRatioStatic;
-    export var DeviceEventEmitter: DeviceEventEmitterStatic;
-    export var DeviceEventSubscription: DeviceEventSubscriptionStatic;
-    export type DeviceEventSubscription = DeviceEventSubscriptionStatic;
-    export var InteractionManager: InteractionManagerStatic;
-    export var PanResponder: PanResponderStatic;
-    export var AppStateIOS: AppStateIOSStatic;
+    export var WebView: WebViewStatic
+    export type WebView = WebViewStatic
 
 
-    //react re-exported
-    export type ReactType = React.ReactType;
+    //////////// APIS //////////////
+    export var ActionSheetIOS: ActionSheetIOSStatic
+    export type ActionSheetIOS = ActionSheetIOSStatic
 
-    export interface ReactElement<P> extends React.ReactElement<P> {}
+    export var AdSupportIOS: AdSupportIOSStatic
+    export type AdSupportIOS = AdSupportIOSStatic
 
-    export interface ClassicElement<P> extends React.ClassicElement<P> {}
+    export var AlertIOS: AlertIOSStatic
+    export type AlertIOS = AlertIOSStatic
 
-    export interface DOMElement<P> extends React.DOMElement<P> {}
+    export var AppStateIOS: AppStateIOSStatic
+    export type AppStateIOS = AppStateIOSStatic
+
+    export var AsyncStorage: AsyncStorageStatic
+    export type AsyncStorage = AsyncStorageStatic
+
+    export var CameraRoll: CameraRollStatic
+    export type CameraRoll = CameraRollStatic
+
+    export var NetInfo: NetInfoStatic
+    export type NetInfo = NetInfoStatic
+
+    export var PanResponder: PanResponderStatic
+    export type PanResponder = PanResponderStatic
+
+    export var PushNotificationIOS: PushNotificationIOSStatic
+    export type PushNotificationIOS = PushNotificationIOSStatic
+
+    export var StatusBarIOS: StatusBarIOSStatic
+    export type StatusBarIOS = StatusBarIOSStatic
+
+    export var VibrationIOS: VibrationIOSStatic
+    export type VibrationIOS = VibrationIOSStatic
 
-    export type HTMLElement =React.HTMLElement;
-    export type SVGElement = React.SVGElement;
 
     //
-    // Factories
-    // ----------------------------------------------------------------------
-
-    export interface Factory<P> extends React.Factory<P> {}
-
-    export interface ClassicFactory<P> extends React.ClassicFactory<P> {}
-
-    export interface DOMFactory<P> extends React.DOMFactory<P> {}
-
-    export type HTMLFactory = React.HTMLFactory;
-    export type SVGFactory = React.SVGFactory;
-    export type SVGElementFactory = React.SVGElementFactory;
-
+    // /TODO: BGR: These are leftovers of the initial port that must be revisited
     //
-    // React Nodes
-    // http://facebook.github.io/react/docs/glossary.html
-    // ----------------------------------------------------------------------
 
-    export type ReactText = React.ReactText;
-    export type ReactChild = React.ReactChild;
+    export var SegmentedControlIOS: React.ComponentClass<SegmentedControlIOSProperties>
 
-    // Should be Array<ReactNode> but type aliases cannot be recursive
-    export type ReactFragment = React.ReactFragment;
-    export type ReactNode = React.ReactNode;
-
-    //
-    // Top Level API
-    // ----------------------------------------------------------------------
-
-    export function createClass<P, S>( spec: React.ComponentSpec<P, S> ): React.ClassicComponentClass<P>;
-
-    export function createFactory<P>( type: string ): React.DOMFactory<P>;
-    export function createFactory<P>( type: React.ClassicComponentClass<P> | string ): React.ClassicFactory<P>;
-    export function createFactory<P>( type: React.ComponentClass<P> ): React.Factory<P>;
-
-    export function createElement<P>( type: string,
-                                      props?: P,
-                                      ...children: React.ReactNode[] ): React.DOMElement<P>;
-    export function createElement<P>( type: React.ClassicComponentClass<P> | string,
-                                      props?: P,
-                                      ...children: React.ReactNode[] ): React.ClassicElement<P>;
-    export function createElement<P>( type: React.ComponentClass<P>,
-                                      props?: P,
-                                      ...children: React.ReactNode[] ): React.ReactElement<P>;
-
-    export function cloneElement<P>( element: React.DOMElement<P>,
-                                     props?: P,
-                                     ...children: React.ReactNode[] ): React.DOMElement<P>;
-    export function cloneElement<P>( element: React.ClassicElement<P>,
-                                     props?: P,
-                                     ...children: React.ReactNode[] ): React.ClassicElement<P>;
-    export function cloneElement<P>( element: React.ReactElement<P>,
-                                     props?: P,
-                                     ...children: React.ReactNode[] ): React.ReactElement<P>;
-
-    export function isValidElement( object: {} ): boolean;
-
-    export var DOM: React.ReactDOM;
-    export var PropTypes: React.ReactPropTypes;
-    export var Children: React.ReactChildren;
-
-    //
-    // Component API
-    // ----------------------------------------------------------------------
-
-    // Base component for plain JS classes
-    export class Component<P, S> extends React.Component<P,S> {}
-
-    export interface ClassicComponent<P, S> extends React.ClassicComponent<P,S> {}
-
-    export interface DOMComponent<P> extends ClassicComponent<P, any> {
-        tagName: string;
-    }
-
-    export type HTMLComponent = React.HTMLComponent;
-    export type SVGComponent = React.SVGComponent
-
-    export interface ChildContextProvider<CC> extends React.ChildContextProvider<CC> {}
-
-    //
-    // Class Interfaces
-    // ----------------------------------------------------------------------
-
-    export interface ComponentClass<P> extends React.ComponentClass<P> {}
-
-    export interface ClassicComponentClass<P> extends React.ClassicComponentClass<P> {}
-
-    //
-    // Component Specs and Lifecycle
-    // ----------------------------------------------------------------------
-
-    export interface ComponentLifecycle<P, S> extends React.ComponentLifecycle<P,S> {}
-
-    export interface Mixin<P, S> extends React.Mixin<P,S> {}
-
-    export interface ComponentSpec<P, S> extends React.ComponentSpec<P,S> {}
-
-    //
-    // Event System
-    // ----------------------------------------------------------------------
-
-    export interface SyntheticEvent extends React.SyntheticEvent {}
-
-    export interface DragEvent extends React.DragEvent {}
-
-    export interface ClipboardEvent extends React.ClipboardEvent {}
-
-    export interface KeyboardEvent extends React.KeyboardEvent {}
-
-
-    export interface FocusEvent extends React.FocusEvent {}
-
-    export interface FormEvent extends React.FormEvent {}
-
-    export interface MouseEvent extends React.MouseEvent {}
-
-    export interface TouchEvent extends React.TouchEvent {}
-
-    export interface UIEvent extends React.UIEvent {}
-
-    export interface WheelEvent extends React.WheelEvent {}
-
-    //
-    // Event Handler Types
-    // ----------------------------------------------------------------------
-
-    export interface EventHandler<E extends React.SyntheticEvent> extends React.EventHandler<E> {}
-
-    export interface DragEventHandler extends React.DragEventHandler {}
-    export interface ClipboardEventHandler extends React.ClipboardEventHandler {}
-    export interface KeyboardEventHandler extends React.KeyboardEventHandler {}
-    export interface FocusEventHandler extends React.FocusEventHandler {}
-    export interface FormEventHandler extends React.FormEventHandler {}
-    export interface MouseEventHandler extends React.MouseEventHandler {}
-    export interface TouchEventHandler extends React.TouchEventHandler {}
-    export interface UIEventHandler extends React.UIEventHandler {}
-    export interface WheelEventHandler extends React.WheelEventHandler {}
-
-    //
-    // Props / DOM Attributes
-    // ----------------------------------------------------------------------
-
-    export interface Props<T> extends React.Props<T> {}
-
-    export interface DOMAttributesBase<T> extends React.DOMAttributesBase<T> {}
-
-    export interface DOMAttributes extends React.DOMAttributes {}
-
-    // This interface is not complete. Only properties accepting
-    // unitless numbers are listed here (see CSSProperty.js in React)
-    export interface CSSProperties extends React.CSSProperties {}
-
-    export interface HTMLAttributesBase<T> extends React.HTMLAttributesBase<T> {}
-
-    export interface HTMLAttributes extends React.HTMLAttributes {}
-
-    export interface SVGElementAttributes extends React.SVGElementAttributes {}
-
-    export interface SVGAttributes extends React.SVGAttributes {}
-
-    //
-    // React.DOM
-    // ----------------------------------------------------------------------
-
-    export interface ReactDOM extends React.ReactDOM {}
-
-    //
-    // React.PropTypes
-    // ----------------------------------------------------------------------
-
-    export interface Validator<T> extends React.Validator<T> {}
-
-    export interface Requireable<T> extends React.Requireable<T> {}
-
-    export interface ValidationMap<T> extends React.ValidationMap<T> {}
-
-    export interface ReactPropTypes extends React.ReactPropTypes {}
-
-    //
-    // React.Children
-    // ----------------------------------------------------------------------
-
-    export interface ReactChildren extends React.ReactChildren {}
-
-    //
-    // Browser Interfaces
-    // https://github.com/nikeee/2048-typescript/blob/master/2048/js/touch.d.ts
-    // ----------------------------------------------------------------------
-
-    export interface AbstractView extends React.AbstractView {}
-
-    export interface Touch extends React.Touch {}
-
-    export interface TouchList extends React.TouchList {}
+    export var PixelRatio: PixelRatioStatic
+    export var DeviceEventEmitter: DeviceEventEmitterStatic
+    export var DeviceEventSubscription: DeviceEventSubscriptionStatic
+    export type DeviceEventSubscription = DeviceEventSubscriptionStatic
+    export var InteractionManager: InteractionManagerStatic
 
+    //////////////////////////////////////////////////////////////////////////
     //
     // Additional ( and controversial)
     //
+    //////////////////////////////////////////////////////////////////////////
 
     export function __spread( target: any, ...sources: any[] ): any;
 
@@ -2500,8 +3444,8 @@ declare namespace  ReactNative {
         //FIXME: Documentation ?
         export interface TestModuleStatic {
 
-            verifySnapshot: (done: (indicator?: any) => void) => void
-            markTestPassed: (indicator: any) => void
+            verifySnapshot: ( done: ( indicator?: any ) => void ) => void
+            markTestPassed: ( indicator: any ) => void
             markTestCompleted: () => void
         }
 
@@ -2514,10 +3458,16 @@ declare namespace  ReactNative {
 
 declare module "react-native" {
 
+    import ReactNative = __React
     export default ReactNative
 }
 
+declare var global: __React.GlobalStatic
 
+declare function require( name: string ): any
+
+
+//TODO: BGR: this is a left-over from the initial port. Not sure it makes any sense
 declare module "Dimensions" {
     import React from 'react-native';
 
@@ -2528,7 +3478,3 @@ declare module "Dimensions" {
     var ExportDimensions: Dimensions;
     export = ExportDimensions;
 }
-
-declare var global: ReactNative.GlobalStatic
-
-declare function require( name: string ): any
diff --git a/react-redux/react-redux-tests.tsx b/react-redux/react-redux-tests.tsx
index abbacabef..3254e6ec7 100644
--- a/react-redux/react-redux-tests.tsx
+++ b/react-redux/react-redux-tests.tsx
@@ -1,11 +1,13 @@
 /// <reference path="react-redux.d.ts" />
 /// <reference path="../react/react.d.ts"/>
+/// <reference path="../react/react-dom.d.ts"/>
 /// <reference path="../redux/redux.d.ts" />
-/// <reference path="../react-router/react-router.d.ts" />
+/// <reference path="../react-router/react-router-0.13.3.d.ts" />
 /// <reference path="../object-assign/object-assign.d.ts" />
 
 import { Component, ReactElement } from 'react';
 import * as React from 'react';
+import * as ReactDOM from 'react-dom';
 import * as Router from 'react-router';
 import { Route, RouterState } from 'react-router';
 import { Store, Dispatch, bindActionCreators } from 'redux';
@@ -65,7 +67,7 @@ class App extends Component<any, any> {
 
 const targetEl = document.getElementById('root');
 
-React.render((
+ReactDOM.render((
     <Provider store={store}>
         {() => <App />}
     </Provider>
@@ -100,7 +102,7 @@ declare var addTodo: () => { type: string; };
 declare var todoActionCreators: { [type: string]: (...args: any[]) => any; };
 declare var counterActionCreators: { [type: string]: (...args: any[]) => any; };
 
-React.render(
+ReactDOM.render(
   <Provider store={store}>
     {() => <MyRootComponent />}
   </Provider>,
@@ -108,7 +110,7 @@ React.render(
 );
 
 Router.run(routes, Router.HistoryLocation, (Handler, routerState) => { // note "routerState" here
-    React.render(
+    ReactDOM.render(
         <Provider store={store}>
             {/*
              //TODO: error TS2339: Property 'routerState' does not exist on type 'RouteProp'.
@@ -121,7 +123,7 @@ Router.run(routes, Router.HistoryLocation, (Handler, routerState) => { // note "
 
 //TODO: for React Router 1.0
 //TODO: error TS2604: JSX element type 'Router' does not have any construct or call signatures.
-//React.render(
+//ReactDOM.render(
 //    <Provider store={store}>
 //        {() => <Router history={history}>...</Router>}
 //    </Provider>,
diff --git a/react-router/history.d.ts b/react-router/history.d.ts
new file mode 100644
index 000000000..1b5c6dfad
--- /dev/null
+++ b/react-router/history.d.ts
@@ -0,0 +1,192 @@
+// Type definitions for history v1.13.1
+// Project: https://github.com/rackt/history
+// Definitions by: Sergey Buturlakin <http://github.com/sergey-buturlakin>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+declare namespace HistoryModule {
+
+    // types based on https://github.com/rackt/history/blob/master/docs/Terms.md
+
+    type Action = string
+
+    type BeforeUnloadHook = () => string | boolean
+
+    type CreateHistory<T> = (options?: HistoryOptions) => T
+
+    type CreateHistoryEnhancer<T, E> = (createHistory: CreateHistory<T>) => CreateHistory<T & E>
+
+    interface History {
+        listenBefore(hook: TransitionHook): Function
+        listen(listener: LocationListener): Function
+        transitionTo(location: Location): void
+        pushState(state: LocationState, path: Path): void
+        replaceState(state: LocationState, path: Path): void
+        push(path: Path): void
+        replace(path: Path): void
+        go(n: number): void
+        goBack(): void
+        goForward(): void
+        createKey(): LocationKey
+        createPath(path: Path): Path
+        createHref(path: Path): Href
+        createLocation(path?: Path, state?: LocationState, action?: Action, key?: LocationKey): Location
+
+        /** @deprecated use location.key to save state instead */
+        setState(state: LocationState): void
+        /** @deprecated use listenBefore instead */
+        registerTransitionHook(hook: TransitionHook): void
+        /** @deprecated use the callback returned from listenBefore instead */
+        unregisterTransitionHook(hook: TransitionHook): void
+    }
+
+    type HistoryOptions = Object
+
+    type Href = string
+
+    type Location = {
+        pathname: Pathname
+        search: QueryString
+        query: Query
+        state: LocationState
+        action: Action
+        key: LocationKey
+    }
+
+    type LocationKey = string
+
+    type LocationListener = (location: Location) => void
+
+    type LocationState = Object
+
+    type Path = string // Pathname + QueryString
+
+    type Pathname = string
+
+    type Query = Object
+
+    type QueryString = string
+
+    type TransitionHook = (location: Location, callback: Function) => any
+
+
+    interface HistoryBeforeUnload {
+        listenBeforeUnload(hook: BeforeUnloadHook): Function
+    }
+
+    interface HistoryQueries {
+        pushState(state: LocationState, pathname: Pathname | Path, query?: Query): void
+        replaceState(state: LocationState, pathname: Pathname | Path, query?: Query): void
+        createPath(path: Path, query?: Query): Path
+        createHref(path: Path, query?: Query): Href
+    }
+
+
+    // Global usage, without modules, needs the small trick, because lib.d.ts
+    // already has `history` and `History` global definitions:
+    // var createHistory = ((window as any).History as HistoryModule.Module).createHistory;
+    interface Module {
+        createHistory: CreateHistory<History>
+        createHashHistory: CreateHistory<History>
+        createMemoryHistory: CreateHistory<History>
+        createLocation(path?: Path, state?: LocationState, action?: Action, key?: LocationKey): Location
+        useBasename<T>(createHistory: CreateHistory<T>): CreateHistory<T>
+        useBeforeUnload<T>(createHistory: CreateHistory<T>): CreateHistory<T & HistoryBeforeUnload>
+        useQueries<T>(createHistory: CreateHistory<T>): CreateHistory<T & HistoryQueries>
+        actions: {
+            PUSH: string
+            REPLACE: string
+            POP: string
+        }
+    }
+
+}
+
+
+declare module "history/lib/createBrowserHistory" {
+
+    export default function createBrowserHistory(options?: HistoryModule.HistoryOptions): HistoryModule.History
+
+}
+
+
+declare module "history/lib/createHashHistory" {
+
+    export default function createHashHistory(options?: HistoryModule.HistoryOptions): HistoryModule.History
+
+}
+
+
+declare module "history/lib/createMemoryHistory" {
+
+    export default function createMemoryHistory(options?: HistoryModule.HistoryOptions): HistoryModule.History
+
+}
+
+
+declare module "history/lib/createLocation" {
+
+    export default function createLocation(path?: HistoryModule.Path, state?: HistoryModule.LocationState, action?: HistoryModule.Action, key?: HistoryModule.LocationKey): HistoryModule.Location
+
+}
+
+
+declare module "history/lib/useBasename" {
+
+    export default function useBasename<T>(createHistory: HistoryModule.CreateHistory<T>): HistoryModule.CreateHistory<T>
+
+}
+
+
+declare module "history/lib/useBeforeUnload" {
+
+    export default function useBeforeUnload<T>(createHistory: HistoryModule.CreateHistory<T>): HistoryModule.CreateHistory<T & HistoryModule.HistoryBeforeUnload>
+
+}
+
+
+declare module "history/lib/useQueries" {
+
+    export default function useQueries<T>(createHistory: HistoryModule.CreateHistory<T>): HistoryModule.CreateHistory<T & HistoryModule.HistoryQueries>
+
+}
+
+
+declare module "history/lib/actions" {
+
+    export const PUSH: string
+
+    export const REPLACE: string
+
+    export const POP: string
+
+    export default {
+        PUSH,
+        REPLACE,
+        POP
+    }
+
+}
+
+
+declare module "history" {
+
+    export { default as createHistory } from "history/lib/createBrowserHistory"
+
+    export { default as createHashHistory } from "history/lib/createHashHistory"
+
+    export { default as createMemoryHistory } from "history/lib/createMemoryHistory"
+
+    export { default as createLocation } from "history/lib/createLocation"
+
+    export { default as useBasename } from "history/lib/useBasename"
+
+    export { default as useBeforeUnload } from "history/lib/useBeforeUnload"
+
+    export { default as useQueries } from "history/lib/useQueries"
+
+    import * as Actions from "history/lib/actions"
+
+    export { Actions }
+
+}
diff --git a/react-router/react-router-0.13.3.d.ts b/react-router/react-router-0.13.3.d.ts
new file mode 100644
index 000000000..4cebcfab3
--- /dev/null
+++ b/react-router/react-router-0.13.3.d.ts
@@ -0,0 +1,354 @@
+// Type definitions for React Router 0.13.3
+// Project: https://github.com/rackt/react-router
+// Definitions by: Yuichi Murata <https://github.com/mrk21>, Václav Ostrožlík <https://github.com/vasek17>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path='../react/react.d.ts' />
+
+declare module ReactRouter {
+    import React = __React;
+
+    //
+    // Transition
+    // ----------------------------------------------------------------------
+    interface Transition {
+        path: string;
+        abortReason: any;
+        retry(): void;
+        abort(reason?: any): void;
+        redirect(to: string, params?: {}, query?: {}): void;
+        cancel(): void;
+        from: (transition: Transition, routes: Route[], components?: React.ReactElement<any>[], callback?: (error?: any) => void) => void;
+        to: (transition: Transition, routes: Route[], params?: {}, query?: {}, callback?: (error?: any) => void) => void;
+    }
+
+    interface TransitionStaticLifecycle {
+        willTransitionTo?(
+            transition: Transition,
+            params: {},
+            query: {},
+            callback: Function
+        ): void;
+
+        willTransitionFrom?(
+            transition: Transition,
+            component: React.ReactElement<any>,
+            callback: Function
+        ): void;
+    }
+
+    //
+    // Route Configuration
+    // ----------------------------------------------------------------------
+    // DefaultRoute
+    interface DefaultRouteProp {
+        name?: string;
+        handler: React.ComponentClass<any>;
+    }
+    interface DefaultRoute extends React.ReactElement<DefaultRouteProp> {}
+    interface DefaultRouteClass extends React.ComponentClass<DefaultRouteProp> {}
+
+    // NotFoundRoute
+    interface NotFoundRouteProp {
+        name?: string;
+        handler: React.ComponentClass<any>;
+    }
+    interface NotFoundRoute extends React.ReactElement<NotFoundRouteProp> {}
+    interface NotFoundRouteClass extends React.ComponentClass<NotFoundRouteProp> {}
+
+    // Redirect
+    interface RedirectProp {
+        path?: string;
+        from?: string;
+        to?: string;
+    }
+    interface Redirect extends React.ReactElement<RedirectProp> {}
+    interface RedirectClass extends React.ComponentClass<RedirectProp> {}
+
+    // Route
+    interface RouteProp {
+        name?: string;
+        path?: string;
+        handler?: React.ComponentClass<any>;
+        ignoreScrollBehavior?: boolean;
+    }
+    interface Route extends React.ReactElement<RouteProp> {}
+    interface RouteClass extends React.ComponentClass<RouteProp> {}
+
+    var DefaultRoute: DefaultRouteClass;
+    var NotFoundRoute: NotFoundRouteClass;
+    var Redirect: RedirectClass;
+    var Route: RouteClass;
+
+    interface CreateRouteOptions {
+        name?: string;
+        path?: string;
+        ignoreScrollBehavior?: boolean;
+        isDefault?: boolean;
+        isNotFound?: boolean;
+        onEnter?: (transition: Transition, params: {}, query: {}, callback: Function) => void;
+        onLeave?: (transition: Transition, wtf: any, callback: Function) => void;
+        handler?: Function;
+        parentRoute?: Route;
+    }
+
+    type CreateRouteCallback = (route: Route) => void;
+
+    function createRoute(callback: CreateRouteCallback): Route;
+    function createRoute(options: CreateRouteOptions | string, callback: CreateRouteCallback): Route;
+    function createDefaultRoute(options?: CreateRouteOptions | string): Route;
+    function createNotFoundRoute(options?: CreateRouteOptions | string): Route;
+
+    interface CreateRedirectOptions extends CreateRouteOptions {
+        path?: string;
+        from?: string;
+        to: string;
+        params?: {};
+        query?: {};
+    }
+    function createRedirect(options: CreateRedirectOptions): Redirect;
+    function createRoutesFromReactChildren(children: Route): Route[];
+
+    //
+    // Components
+    // ----------------------------------------------------------------------
+    // Link
+    interface LinkProp extends React.HTMLAttributes {
+        activeClassName?: string;
+        activeStyle?: {};
+        to: string;
+        params?: {};
+        query?: {};
+    }
+    interface Link extends React.ReactElement<LinkProp>, Navigation, State {
+        handleClick(event: any): void;
+        getHref(): string;
+        getClassName(): string;
+        getActiveState(): boolean;
+    }
+    interface LinkClass extends React.ComponentClass<LinkProp> {}
+
+    // RouteHandler
+    interface RouteHandlerProp { }
+    interface RouteHandlerChildContext {
+        routeDepth: number;
+    }
+    interface RouteHandler extends React.ReactElement<RouteHandlerProp> {
+        getChildContext(): RouteHandlerChildContext;
+        getRouteDepth(): number;
+        createChildRouteHandler(props: {}): RouteHandler;
+    }
+    interface RouteHandlerClass extends React.ComponentClass<RouteHandlerProp> {}
+
+    var Link: LinkClass;
+    var RouteHandler: RouteHandlerClass;
+
+
+    //
+    // Top-Level
+    // ----------------------------------------------------------------------
+    interface Router extends React.ReactElement<any> {
+        run(callback: RouterRunCallback): void;
+    }
+
+    interface RouterState {
+        path: string;
+        action: string;
+        pathname: string;
+        params: {};
+        query: {};
+        routes: Route[];
+    }
+
+    interface RouterCreateOption {
+        routes: Route;
+        location?: LocationBase;
+        scrollBehavior?: ScrollBehaviorBase;
+        onError?: (error: any) => void;
+        onAbort?: (error: any) => void;
+    }
+
+    type RouterRunCallback = (Handler: RouteClass, state: RouterState) => void;
+
+    function create(options: RouterCreateOption): Router;
+    function run(routes: Route, callback: RouterRunCallback): Router;
+    function run(routes: Route, location: LocationBase | string, callback: RouterRunCallback): Router;
+
+
+    //
+    // Location
+    // ----------------------------------------------------------------------
+    interface LocationBase {
+        getCurrentPath(): void;
+        toString(): string;
+    }
+    interface Location extends LocationBase {
+        push(path: string): void;
+        replace(path: string): void;
+        pop(): void;
+    }
+
+    interface LocationListener {
+        addChangeListener(listener: Function): void;
+        removeChangeListener(listener: Function): void;
+    }
+
+    interface HashLocation extends Location, LocationListener { }
+    interface HistoryLocation extends Location, LocationListener { }
+    interface RefreshLocation extends Location { }
+    interface StaticLocation extends LocationBase { }
+    interface TestLocation extends Location, LocationListener { }
+
+    var HashLocation: HashLocation;
+    var HistoryLocation: HistoryLocation;
+    var RefreshLocation: RefreshLocation;
+    var StaticLocation: StaticLocation;
+    var TestLocation: TestLocation;
+
+
+    //
+    // Behavior
+    // ----------------------------------------------------------------------
+    interface ScrollBehaviorBase {
+        updateScrollPosition(position: { x: number; y: number; }, actionType: string): void;
+    }
+    interface ImitateBrowserBehavior extends ScrollBehaviorBase { }
+    interface ScrollToTopBehavior extends ScrollBehaviorBase { }
+
+    var ImitateBrowserBehavior: ImitateBrowserBehavior;
+    var ScrollToTopBehavior: ScrollToTopBehavior;
+
+
+    //
+    // Mixin
+    // ----------------------------------------------------------------------
+    interface Navigation {
+        makePath(to: string, params?: {}, query?: {}): string;
+        makeHref(to: string, params?: {}, query?: {}): string;
+        transitionTo(to: string, params?: {}, query?: {}): void;
+        replaceWith(to: string, params?: {}, query?: {}): void;
+        goBack(): void;
+    }
+
+    interface State {
+        getPath(): string;
+        getRoutes(): Route[];
+        getPathname(): string;
+        getParams(): {};
+        getQuery(): {};
+        isActive(to: string, params?: {}, query?: {}): boolean;
+    }
+
+    var Navigation: Navigation;
+    var State: State;
+
+
+    //
+    // History
+    // ----------------------------------------------------------------------
+    interface History {
+        back(): void;
+        length: number;
+    }
+    var History: History;
+
+
+    //
+    // Context
+    // ----------------------------------------------------------------------
+    interface Context {
+        makePath(to: string, params?: {}, query?: {}): string;
+        makeHref(to: string, params?: {}, query?: {}): string;
+        transitionTo(to: string, params?: {}, query?: {}): void;
+        replaceWith(to: string, params?: {}, query?: {}): void;
+        goBack(): void;
+
+        getCurrentPath(): string;
+        getCurrentRoutes(): Route[];
+        getCurrentPathname(): string;
+        getCurrentParams(): {};
+        getCurrentQuery(): {};
+        isActive(to: string, params?: {}, query?: {}): boolean;
+    }
+}
+
+declare module "react-router" {
+    export = ReactRouter;
+}
+
+declare module __React {
+
+  // for DefaultRoute
+  function createElement(
+    type: ReactRouter.DefaultRouteClass,
+    props: ReactRouter.DefaultRouteProp,
+    ...children: __React.ReactNode[]): ReactRouter.DefaultRoute;
+
+  // for Link
+  function createElement(
+    type: ReactRouter.LinkClass,
+    props: ReactRouter.LinkProp,
+    ...children: __React.ReactNode[]): ReactRouter.Link;
+
+  // for NotFoundRoute
+  function createElement(
+    type: ReactRouter.NotFoundRouteClass,
+    props: ReactRouter.NotFoundRouteProp,
+    ...children: __React.ReactNode[]): ReactRouter.NotFoundRoute;
+
+  // for Redirect
+  function createElement(
+    type: ReactRouter.RedirectClass,
+    props: ReactRouter.RedirectProp,
+    ...children: __React.ReactNode[]): ReactRouter.Redirect;
+
+  // for Route
+  function createElement(
+    type: ReactRouter.RouteClass,
+    props: ReactRouter.RouteProp,
+    ...children: __React.ReactNode[]): ReactRouter.Route;
+
+  // for RouteHandler
+  function createElement(
+    type: ReactRouter.RouteHandlerClass,
+    props: ReactRouter.RouteHandlerProp,
+    ...children: __React.ReactNode[]): ReactRouter.RouteHandler;
+}
+
+declare module "react/addons" {
+  // for DefaultRoute
+  function createElement(
+    type: ReactRouter.DefaultRouteClass,
+    props: ReactRouter.DefaultRouteProp,
+    ...children: __React.ReactNode[]): ReactRouter.DefaultRoute;
+
+  // for Link
+  function createElement(
+    type: ReactRouter.LinkClass,
+    props: ReactRouter.LinkProp,
+    ...children: __React.ReactNode[]): ReactRouter.Link;
+
+  // for NotFoundRoute
+  function createElement(
+    type: ReactRouter.NotFoundRouteClass,
+    props: ReactRouter.NotFoundRouteProp,
+    ...children: __React.ReactNode[]): ReactRouter.NotFoundRoute;
+
+  // for Redirect
+  function createElement(
+    type: ReactRouter.RedirectClass,
+    props: ReactRouter.RedirectProp,
+    ...children: __React.ReactNode[]): ReactRouter.Redirect;
+
+  // for Route
+  function createElement(
+    type: ReactRouter.RouteClass,
+    props: ReactRouter.RouteProp,
+    ...children: __React.ReactNode[]): ReactRouter.Route;
+
+  // for RouteHandler
+  function createElement(
+    type: ReactRouter.RouteHandlerClass,
+    props: ReactRouter.RouteHandlerProp,
+    ...children: __React.ReactNode[]): ReactRouter.RouteHandler;
+}
diff --git a/react-router/react-router-tests.ts b/react-router/react-router-tests.ts
deleted file mode 100644
index 54b0545e2..000000000
--- a/react-router/react-router-tests.ts
+++ /dev/null
@@ -1,425 +0,0 @@
-///<reference path="react-router.d.ts" />
-"use strict";
-
-import React = require('react');
-import ReactAddons = require('react/addons');
-import Router = require('react-router');
-
-// Mixin
-class NavigationTest<T extends Router.Navigation> {
-    v: T;
-
-    makePath() {
-        var v1: string = this.v.makePath('to');
-        var v2: string = this.v.makePath('to', {id: 1});
-        var v3: string = this.v.makePath('to', {id: 1}, {type: 'json'});
-    }
-    makeHref() {
-        var v1: string = this.v.makeHref('to');
-        var v2: string = this.v.makeHref('to', {id: 1});
-        var v3: string = this.v.makeHref('to', {id: 1}, {type: 'json'});
-    }
-    transitionTo() {
-        var v1: void = this.v.transitionTo('to');
-        var v2: void = this.v.transitionTo('to', {id: 1});
-        var v3: void = this.v.transitionTo('to', {id: 1}, {type: 'json'});
-    }
-    replaceWith() {
-        var v1: void = this.v.replaceWith('to');
-        var v2: void = this.v.replaceWith('to', {id: 1});
-        var v3: void = this.v.replaceWith('to', {id: 1}, {type: 'json'});
-    }
-    goBack() {
-        var v1: void = this.v.goBack();
-    }
-}
-
-class StateTest<T extends Router.State> {
-    v: T;
-
-    getPath() {
-        var v1: string = this.v.getPath();
-    }
-
-    getRoutes() {
-        var v1: Router.Route[] = this.v.getRoutes();
-    }
-
-    getPathname() {
-        var v1: string = this.v.getPathname();
-    }
-
-    getParams() {
-        var v1: {} = this.v.getParams();
-    }
-
-    getQuery() {
-        var v1: {} = this.v.getQuery();
-    }
-
-    isActive() {
-        var v1: boolean = this.v.isActive('to');
-        var v2: boolean = this.v.isActive('to', {id: 1});
-        var v3: boolean = this.v.isActive('to', {id: 1}, {type: 'json'});
-    }
-}
-
-
-// Location
-class LocationTest<T extends Router.Location> {
-    v: T;
-
-    push() {
-        var v1: void = this.v.push('path/to/hoge');
-    }
-
-    replace() {
-        var v1: void = this.v.replace('path/to/hoge');
-    }
-
-    pop() {
-        var v1: void = this.v.pop();
-    }
-
-    getCurrentPath() {
-        var v1: void = this.v.getCurrentPath();
-    }
-}
-new LocationTest<Router.HashLocation>();
-new LocationTest<Router.HistoryLocation>();
-new LocationTest<Router.RefreshLocation>();
-
-class LocationListenerTest<T extends Router.LocationListener> {
-    v: T;
-
-    addChangeListener() {
-        var v1: void = this.v.addChangeListener(() => console.log(1));
-    }
-
-    removeChangeListener() {
-        var v1: void = this.v.removeChangeListener(() => console.log(1));
-    }
-}
-new LocationListenerTest<Router.HashLocation>();
-new LocationListenerTest<Router.HistoryLocation>();
-
-
-// Behavior
-class ScrollBehaviorTest<T extends Router.ScrollBehaviorBase> {
-    v: T;
-
-    updateScrollPosition() {
-        var v1: void = this.v.updateScrollPosition({x: 33, y: 102}, 'scrollTop');
-    }
-}
-new ScrollBehaviorTest<Router.ImitateBrowserBehavior>();
-new ScrollBehaviorTest<Router.ScrollToTopBehavior>();
-
-
-// Component
-class DefaultRouteTest {
-    v: Router.DefaultRoute;
-
-    props() {
-        var name: string = this.v.props.name;
-        var handler: React.ComponentClass<any> = this.v.props.handler;
-    }
-
-    createElement() {
-        var Handler: React.ComponentClass<any>;
-        React.createElement(Router.DefaultRoute, null);
-        React.createElement(Router.DefaultRoute, {name: 'name', handler: Handler});
-
-        ReactAddons.createElement(Router.DefaultRoute, null);
-        ReactAddons.createElement(Router.DefaultRoute, {name: 'name', handler: Handler});
-    }
-}
-
-class LinkTest {
-    v: Router.Link;
-
-    constructor() {
-        new NavigationTest<Router.Link>();
-        new StateTest<Router.Link>();
-    }
-
-    props() {
-        var activeClassName: string = this.v.props.activeClassName;
-        var to: string = this.v.props.to;
-        var params: {} = this.v.props.params;
-        var query: {} = this.v.props.query;
-        var onClick: Function = this.v.props.onClick;
-    }
-
-    getHref() {
-        var v1: string = this.v.getHref();
-    }
-
-    getClassName() {
-        var v1: string = this.v.getClassName();
-    }
-
-    createElement() {
-        React.createElement(Router.Link, null);
-        React.createElement(Router.Link, {to: 'home'});
-        React.createElement(Router.Link, {
-            activeClassName: 'name',
-            to: 'home',
-            params: {},
-            query: {},
-            onClick: () => console.log(1)
-        });
-
-        ReactAddons.createElement(Router.Link, null);
-        ReactAddons.createElement(Router.Link, {to: 'home'});
-        ReactAddons.createElement(Router.Link, {
-            activeClassName: 'name',
-            to: 'home',
-            params: {},
-            query: {},
-            onClick: () => console.log(1)
-        });
-    }
-}
-
-class NotFoundRouteTest {
-    v: Router.NotFoundRoute;
-
-    props() {
-        var name: string = this.v.props.name;
-        var handler: React.ComponentClass<any> = this.v.props.handler;
-    }
-
-    createElement() {
-        var Handler: React.ComponentClass<any>;
-        React.createElement(Router.NotFoundRoute, null);
-        React.createElement(Router.NotFoundRoute, {handler: Handler});
-        React.createElement(Router.NotFoundRoute, {handler: Handler, name: "home"});
-
-        ReactAddons.createElement(Router.NotFoundRoute, null);
-        ReactAddons.createElement(Router.NotFoundRoute, {handler: Handler});
-        ReactAddons.createElement(Router.NotFoundRoute, {handler: Handler, name: "home"});
-    }
-}
-
-class RedirectTest {
-    v: Router.Redirect;
-
-    props() {
-        var path: string = this.v.props.path;
-        var from: string = this.v.props.from;
-        var to: string = this.v.props.to;
-    }
-
-    createElement() {
-        React.createElement(Router.Redirect, null);
-        React.createElement(Router.Redirect, {});
-        React.createElement(Router.Redirect, {path: 'a', from: 'a', to: 'b'});
-
-        ReactAddons.createElement(Router.Redirect, null);
-        ReactAddons.createElement(Router.Redirect, {});
-        ReactAddons.createElement(Router.Redirect, {path: 'a', from: 'a', to: 'b'});
-    }
-}
-
-class RouteTest {
-    v: Router.Route;
-
-    props() {
-        var name: string = this.v.props.name;
-        var path: string = this.v.props.path;
-        var handler: React.ComponentClass<any> = this.v.props.handler;
-        var ignoreScrollBehavior: boolean = this.v.props.ignoreScrollBehavior;
-    }
-
-    createElement() {
-        var Handler: React.ComponentClass<any>;
-        React.createElement(Router.Route, null);
-        React.createElement(Router.Route, {});
-        React.createElement(Router.Route, {name: "home", path: "/", handler: Handler, ignoreScrollBehavior: true});
-
-        ReactAddons.createElement(Router.Route, null);
-        ReactAddons.createElement(Router.Route, {});
-        ReactAddons.createElement(Router.Route, {name: "home", path: "/", handler: Handler, ignoreScrollBehavior: true});
-    }
-}
-
-class RouteHandlerTest {
-    v: Router.RouteHandler;
-
-    createElement() {
-        React.createElement(Router.RouteHandler, null);
-        React.createElement(Router.RouteHandler, {});
-
-        ReactAddons.createElement(Router.RouteHandler, null);
-        ReactAddons.createElement(Router.RouteHandler, {});
-    }
-}
-
-
-// History
-class HistoryTest {
-    v: Router.History;
-
-    length() {
-        var v1: number = this.v.length;
-    }
-
-    back() {
-        var v1: void = this.v.back();
-    }
-}
-
-
-// Router
-class CreateTest {
-    v: Router.Router;
-
-    constructor() {
-        // React.createElement() version
-        this.v = Router.create({
-            routes: React.createElement(Router.Route, null)
-        });
-        this.v = Router.create({
-            routes: React.createElement(Router.Route, null),
-            location: Router.HistoryLocation,
-            scrollBehavior: Router.ImitateBrowserBehavior
-        });
-
-        // React.createFactory() version
-        this.v = Router.create({
-            routes: React.createFactory(Router.Route)()
-        });
-        this.v = Router.create({
-            routes: React.createFactory(Router.Route)(),
-            location: Router.HistoryLocation,
-            scrollBehavior: Router.ImitateBrowserBehavior
-        });
-    }
-
-    run() {
-        this.v.run((Handler) => console.log(Handler));
-        this.v.run((Handler, state) => console.log(Handler, state));
-    }
-}
-
-class RunTest {
-    constructor() {
-        // React.createElement() version
-        var v1: Router.Router = Router.run(React.createElement(Router.Route, null), (Handler) => {
-            React.render(React.createElement(Handler, null), document.body);
-        });
-        var v2: Router.Router = Router.run(React.createElement(Router.Route, null), Router.HistoryLocation, (Handler, state) => {
-            React.render(React.createElement(Handler, null), document.body);
-        });
-        var v3: Router.Router = Router.run(React.createElement(Router.Route, null), '/foo/bar', (Handler, state) => {
-            React.render(React.createElement(Handler, null), document.body);
-        });
-
-        // React.createFactory() version
-        var v4: Router.Router = Router.run(React.createFactory(Router.Route)(), (Handler) => {
-            React.render(React.createElement(Handler, null), document.body);
-        });
-        var v5: Router.Router = Router.run(React.createFactory(Router.Route)(), Router.HistoryLocation, (Handler, state) => {
-            React.render(React.createElement(Handler, null), document.body);
-        });
-        var v6: Router.Router = Router.run(React.createFactory(Router.Route)(), '/foo/bar', (Handler, state) => {
-            React.render(React.createElement(Handler, null), document.body);
-        });
-    }
-}
-
-
-// Transition
-class TransitionTest {
-    constructor() {
-        var v1: Router.TransitionStaticLifecycle = {
-            willTransitionTo: (transition, params, query, callback) => {
-                transition.abort();
-                transition.redirect('to');
-                transition.redirect('to', {id: 1});
-                transition.redirect('to', {id: 1}, {type: 'json'});
-                transition.retry();
-            },
-            willTransitionFrom: (transition, component, callback) => {}
-        };
-        var v2: Router.TransitionStaticLifecycle = {
-            willTransitionTo: (transition, params, query) => {},
-            willTransitionFrom: (transition, component) => {}
-        };
-        var v3: Router.TransitionStaticLifecycle = {
-            willTransitionTo: (transition, params) => {},
-            willTransitionFrom: (transition) => {}
-        };
-        var v4: Router.TransitionStaticLifecycle = {
-            willTransitionTo: (transition) => {},
-            willTransitionFrom: () => {}
-        };
-        var v5: Router.TransitionStaticLifecycle = {
-            willTransitionTo: () => {}
-        };
-        var v6: Router.TransitionStaticLifecycle = {
-            willTransitionFrom: () => {}
-        };
-    }
-}
-
-
-// Context
-class ContextTest {
-    v: Router.Context
-
-    makePath() {
-        var v1: string = this.v.makePath('home');
-        var v2: string = this.v.makePath('home', {p1: 1});
-        var v3: string = this.v.makePath('home', {p1: 1}, {q1: 1});
-    }
-
-    makeHref() {
-        var v1: string = this.v.makeHref('home');
-        var v2: string = this.v.makeHref('home', {p1: 1});
-        var v3: string = this.v.makeHref('home', {p1: 1}, {q1: 1});
-    }
-
-    transitionTo() {
-        var v1: void = this.v.transitionTo('home');
-        var v2: void = this.v.transitionTo('home', {p1: 1});
-        var v3: void = this.v.transitionTo('home', {p1: 1}, {q1: 1});
-    }
-
-    replaceWith() {
-        var v1: void = this.v.replaceWith('home');
-        var v2: void = this.v.replaceWith('home', {p1: 1});
-        var v3: void = this.v.replaceWith('home', {p1: 1}, {q1: 1});
-    }
-
-    goBack() {
-        var v: void = this.v.goBack();
-    }
-
-    getCurrentPath() {
-        var v: string = this.v.getCurrentPath();
-    }
-
-    getCurrentRoutes() {
-        var v: Router.Route[] = this.v.getCurrentRoutes();
-    }
-
-    getCurrentPathname() {
-        var v: string = this.v.getCurrentPathname();
-    }
-
-    getCurrentParams() {
-        var v: {} = this.v.getCurrentParams();
-    }
-
-    getCurrentQuery() {
-        var v: {} = this.v.getCurrentQuery();
-    }
-
-    isActive() {
-        var v1: boolean = this.v.isActive('home');
-        var v2: boolean = this.v.isActive('home', {p1: 1});
-        var v3: boolean = this.v.isActive('home', {p1: 1}, {q1: 1});
-    }
-}
diff --git a/react-router/react-router-tests.tsx b/react-router/react-router-tests.tsx
new file mode 100644
index 000000000..42ee3236f
--- /dev/null
+++ b/react-router/react-router-tests.tsx
@@ -0,0 +1,69 @@
+
+/// <reference path="../react/react.d.ts" />
+/// <reference path="../react/react-dom.d.ts" />
+/// <reference path="./history.d.ts" />
+/// <reference path="./react-router.d.ts" />
+
+
+import * as React from "react"
+import * as ReactDOM from "react-dom"
+
+import { Router, Route, IndexRoute, Link } from "react-router"
+
+import createHistory from "history/lib/createBrowserHistory"
+
+
+class Master extends React.Component<React.Props<{}>, {}> {
+
+	render() {
+		return <div>
+			<h1>Master</h1>
+			<Link to="/">Dashboard</Link> <Link to="/users">Users</Link>
+			<p>{this.props.children}</p>
+		</div>
+	}
+
+}
+
+
+class Dashboard extends React.Component<{}, {}> {
+
+	render() {
+		return <div>
+			This is a dashboard
+		</div>
+	}
+
+}
+
+class NotFound extends React.Component<{}, {}> {
+
+	render() {
+		return <div>
+			This path does not exists
+		</div>
+	}
+
+}
+
+
+class Users extends React.Component<{}, {}> {
+
+	render() {
+		return <div>
+			This is a user list
+		</div>
+	}
+
+}
+
+
+ReactDOM.render((
+	<Router history={createHistory()}>
+		<Route path="/" component={Master}>
+			<IndexRoute component={Dashboard} />
+			<Route path="users" component={Users}/>
+			<Route path="*" component={NotFound}/>
+		</Route>
+	</Router>
+), document.body)
diff --git a/react-router/react-router-tests.tsx.tscparams b/react-router/react-router-tests.tsx.tscparams
new file mode 100644
index 000000000..f47983778
--- /dev/null
+++ b/react-router/react-router-tests.tsx.tscparams
@@ -0,0 +1 @@
+--noImplicitAny -jsx react --target es5
\ No newline at end of file
diff --git a/react-router/react-router.d.ts b/react-router/react-router.d.ts
index 4cebcfab3..2010a1f49 100644
--- a/react-router/react-router.d.ts
+++ b/react-router/react-router.d.ts
@@ -1,354 +1,452 @@
-// Type definitions for React Router 0.13.3
+// Type definitions for react-router v1.0.0
 // Project: https://github.com/rackt/react-router
-// Definitions by: Yuichi Murata <https://github.com/mrk21>, Václav Ostrožlík <https://github.com/vasek17>
+// Definitions by: Sergey Buturlakin <http://github.com/sergey-buturlakin>, Yuichi Murata <https://github.com/mrk21>, Václav Ostrožlík <https://github.com/vasek17>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-///<reference path='../react/react.d.ts' />
 
-declare module ReactRouter {
-    import React = __React;
+/// <reference path="../react/react.d.ts" />
+/// <reference path="./history.d.ts"/>
 
-    //
-    // Transition
-    // ----------------------------------------------------------------------
-    interface Transition {
-        path: string;
-        abortReason: any;
-        retry(): void;
-        abort(reason?: any): void;
-        redirect(to: string, params?: {}, query?: {}): void;
-        cancel(): void;
-        from: (transition: Transition, routes: Route[], components?: React.ReactElement<any>[], callback?: (error?: any) => void) => void;
-        to: (transition: Transition, routes: Route[], params?: {}, query?: {}, callback?: (error?: any) => void) => void;
+
+declare namespace ReactRouter {
+
+    import React = __React
+
+    import H = HistoryModule
+
+    // types based on https://github.com/rackt/react-router/blob/master/docs/Glossary.md
+
+    type Component = React.ReactType
+
+    type EnterHook = (nextState: RouterState, replaceState: RedirectFunction, callback?: Function) => any
+
+    type LeaveHook = () => any
+
+    type Params = Object
+
+    type ParseQueryString = (queryString: H.QueryString) => H.Query
+
+    type RedirectFunction = (state: H.LocationState, pathname: H.Pathname | H.Path, query?: H.Query) => void
+
+    type RouteComponent = Component
+
+    // use the following interface in an app code to get access to route param values, history, location...
+    // interface MyComponentProps extends ReactRouter.RouteComponentProps<{}, { id: number }> {}
+    // somewhere in MyComponent
+    // ...
+    //   let id = this.props.routeParams.id
+    // ...
+    //   this.props.history. ...
+    // ...
+    interface RouteComponentProps<P, R> {
+        history?: History
+        location?: H.Location
+        params?: P
+        route?: PlainRoute
+        routeParams?: R
+        routes?: PlainRoute[]
     }
 
-    interface TransitionStaticLifecycle {
-        willTransitionTo?(
-            transition: Transition,
-            params: {},
-            query: {},
-            callback: Function
-        ): void;
+    type RouteComponents = { [key: string]: RouteComponent }
 
-        willTransitionFrom?(
-            transition: Transition,
-            component: React.ReactElement<any>,
-            callback: Function
-        ): void;
-    }
+    type RouteConfig = React.ReactNode | PlainRoute | PlainRoute[]
 
-    //
-    // Route Configuration
-    // ----------------------------------------------------------------------
-    // DefaultRoute
-    interface DefaultRouteProp {
-        name?: string;
-        handler: React.ComponentClass<any>;
-    }
-    interface DefaultRoute extends React.ReactElement<DefaultRouteProp> {}
-    interface DefaultRouteClass extends React.ComponentClass<DefaultRouteProp> {}
+    type RouteHook = (nextLocation?: H.Location) => any
 
-    // NotFoundRoute
-    interface NotFoundRouteProp {
-        name?: string;
-        handler: React.ComponentClass<any>;
-    }
-    interface NotFoundRoute extends React.ReactElement<NotFoundRouteProp> {}
-    interface NotFoundRouteClass extends React.ComponentClass<NotFoundRouteProp> {}
+    type RoutePattern = string
 
-    // Redirect
-    interface RedirectProp {
-        path?: string;
-        from?: string;
-        to?: string;
-    }
-    interface Redirect extends React.ReactElement<RedirectProp> {}
-    interface RedirectClass extends React.ComponentClass<RedirectProp> {}
+    type StringifyQuery = (queryObject: H.Query) => H.QueryString
 
-    // Route
-    interface RouteProp {
-        name?: string;
-        path?: string;
-        handler?: React.ComponentClass<any>;
-        ignoreScrollBehavior?: boolean;
-    }
-    interface Route extends React.ReactElement<RouteProp> {}
-    interface RouteClass extends React.ComponentClass<RouteProp> {}
-
-    var DefaultRoute: DefaultRouteClass;
-    var NotFoundRoute: NotFoundRouteClass;
-    var Redirect: RedirectClass;
-    var Route: RouteClass;
-
-    interface CreateRouteOptions {
-        name?: string;
-        path?: string;
-        ignoreScrollBehavior?: boolean;
-        isDefault?: boolean;
-        isNotFound?: boolean;
-        onEnter?: (transition: Transition, params: {}, query: {}, callback: Function) => void;
-        onLeave?: (transition: Transition, wtf: any, callback: Function) => void;
-        handler?: Function;
-        parentRoute?: Route;
-    }
-
-    type CreateRouteCallback = (route: Route) => void;
-
-    function createRoute(callback: CreateRouteCallback): Route;
-    function createRoute(options: CreateRouteOptions | string, callback: CreateRouteCallback): Route;
-    function createDefaultRoute(options?: CreateRouteOptions | string): Route;
-    function createNotFoundRoute(options?: CreateRouteOptions | string): Route;
-
-    interface CreateRedirectOptions extends CreateRouteOptions {
-        path?: string;
-        from?: string;
-        to: string;
-        params?: {};
-        query?: {};
-    }
-    function createRedirect(options: CreateRedirectOptions): Redirect;
-    function createRoutesFromReactChildren(children: Route): Route[];
-
-    //
-    // Components
-    // ----------------------------------------------------------------------
-    // Link
-    interface LinkProp extends React.HTMLAttributes {
-        activeClassName?: string;
-        activeStyle?: {};
-        to: string;
-        params?: {};
-        query?: {};
-    }
-    interface Link extends React.ReactElement<LinkProp>, Navigation, State {
-        handleClick(event: any): void;
-        getHref(): string;
-        getClassName(): string;
-        getActiveState(): boolean;
-    }
-    interface LinkClass extends React.ComponentClass<LinkProp> {}
-
-    // RouteHandler
-    interface RouteHandlerProp { }
-    interface RouteHandlerChildContext {
-        routeDepth: number;
-    }
-    interface RouteHandler extends React.ReactElement<RouteHandlerProp> {
-        getChildContext(): RouteHandlerChildContext;
-        getRouteDepth(): number;
-        createChildRouteHandler(props: {}): RouteHandler;
-    }
-    interface RouteHandlerClass extends React.ComponentClass<RouteHandlerProp> {}
-
-    var Link: LinkClass;
-    var RouteHandler: RouteHandlerClass;
-
-
-    //
-    // Top-Level
-    // ----------------------------------------------------------------------
-    interface Router extends React.ReactElement<any> {
-        run(callback: RouterRunCallback): void;
-    }
+    type RouterListener = (error: Error, nextState: RouterState) => void
 
     interface RouterState {
-        path: string;
-        action: string;
-        pathname: string;
-        params: {};
-        query: {};
-        routes: Route[];
+        location: H.Location
+        routes: PlainRoute[]
+        params: Params
+        components: RouteComponent[]
     }
 
-    interface RouterCreateOption {
-        routes: Route;
-        location?: LocationBase;
-        scrollBehavior?: ScrollBehaviorBase;
-        onError?: (error: any) => void;
-        onAbort?: (error: any) => void;
+
+    interface HistoryBase extends H.History {
+        routes: PlainRoute[]
+        parseQueryString?: ParseQueryString
+        stringifyQuery?: StringifyQuery
     }
 
-    type RouterRunCallback = (Handler: RouteClass, state: RouterState) => void;
-
-    function create(options: RouterCreateOption): Router;
-    function run(routes: Route, callback: RouterRunCallback): Router;
-    function run(routes: Route, location: LocationBase | string, callback: RouterRunCallback): Router;
+    type History = HistoryBase & H.HistoryQueries & HistoryRoutes
 
 
-    //
-    // Location
-    // ----------------------------------------------------------------------
-    interface LocationBase {
-        getCurrentPath(): void;
-        toString(): string;
+    /* components */
+
+    interface RouterProps extends React.Props<Router> {
+        history?: H.History
+        routes?: RouteConfig // alias for children
+        createElement?: (component: RouteComponent, props: Object) => any
+        onError?: (error: any) => any
+        onUpdate?: () => any
+        parseQueryString?: ParseQueryString
+        stringifyQuery?: StringifyQuery
     }
-    interface Location extends LocationBase {
-        push(path: string): void;
-        replace(path: string): void;
-        pop(): void;
+    interface Router extends React.ComponentClass<RouterProps> {}
+    interface RouterElement extends React.ReactElement<RouterProps> {}
+    const Router: Router
+
+
+    interface LinkProps extends React.HTMLAttributes, React.Props<Link> {
+        activeStyle?: React.CSSProperties
+        activeClassName?: string
+        onlyActiveOnIndex?: boolean
+        to: RoutePattern
+        query?: H.Query
+        state?: H.LocationState
+    }
+    interface Link extends React.ComponentClass<LinkProps> {}
+    interface LinkElement extends React.ReactElement<LinkProps> {}
+    const Link: Link
+
+
+    const IndexLink: Link
+
+
+    interface RoutingContextProps extends React.Props<RoutingContext> {
+        history: H.History
+        createElement: (component: RouteComponent, props: Object) => any
+        location: H.Location
+        routes: RouteConfig
+        params: Params
+        components?: RouteComponent[]
+    }
+    interface RoutingContext extends React.ComponentClass<RoutingContextProps> {}
+    interface RoutingContextElement extends React.ReactElement<RoutingContextProps> {}
+    const RoutingContext: RoutingContext
+
+
+    /* components (configuration) */
+
+    interface RouteProps extends React.Props<Route> {
+        path?: RoutePattern
+        component?: RouteComponent
+        components?: RouteComponents
+        getComponent?: (location: H.Location, cb: (error: any, component?: RouteComponent) => void) => void
+        getComponents?: (location: H.Location, cb: (error: any, components?: RouteComponents) => void) => void
+        onEnter?: EnterHook
+        onLeave?: LeaveHook
+    }
+    interface Route extends React.ComponentClass<RouteProps> {}
+    interface RouteElement extends React.ReactElement<RouteProps> {}
+    const Route: Route
+
+
+    interface PlainRoute {
+        path?: RoutePattern
+        component?: RouteComponent
+        components?: RouteComponents
+        getComponent?: (location: H.Location, cb: (error: any, component?: RouteComponent) => void) => void
+        getComponents?: (location: H.Location, cb: (error: any, components?: RouteComponents) => void) => void
+        onEnter?: EnterHook
+        onLeave?: LeaveHook
+        indexRoute?: PlainRoute
+        getIndexRoute?: (location: H.Location, cb: (error: any, indexRoute: RouteConfig) => void) => void
+        childRoutes?: PlainRoute[]
+        getChildRoutes?: (location: H.Location, cb: (error: any, childRoutes: RouteConfig) => void) => void
     }
 
-    interface LocationListener {
-        addChangeListener(listener: Function): void;
-        removeChangeListener(listener: Function): void;
+
+    interface RedirectProps extends React.Props<Redirect> {
+        path?: RoutePattern
+        from?: RoutePattern // alias for path
+        to: RoutePattern
+        query?: H.Query
+        state?: H.LocationState
+    }
+    interface Redirect extends React.ComponentClass<RedirectProps> {}
+    interface RedirectElement extends React.ReactElement<RedirectProps> {}
+    const Redirect: Redirect
+
+
+    interface IndexRouteProps extends React.Props<IndexRoute> {
+        component?: RouteComponent
+        components?: RouteComponents
+        getComponent?: (location: H.Location, cb: (error: any, component?: RouteComponent) => void) => void
+        getComponents?: (location: H.Location, cb: (error: any, components?: RouteComponents) => void) => void
+        onEnter?: EnterHook
+        onLeave?: LeaveHook
+    }
+    interface IndexRoute extends React.ComponentClass<IndexRouteProps> {}
+    interface IndexRouteElement extends React.ReactElement<IndexRouteProps> {}
+    const IndexRoute: IndexRoute
+
+
+    interface IndexRedirectProps extends React.Props<IndexRedirect> {
+        to: RoutePattern
+        query?: H.Query
+        state?: H.LocationState
+    }
+    interface IndexRedirect extends React.ComponentClass<IndexRedirectProps> {}
+    interface IndexRedirectElement extends React.ReactElement<IndexRedirectProps> {}
+    const IndexRedirect: IndexRedirect
+
+
+    /* mixins */
+
+    interface HistoryMixin {
+        history: History
+    }
+    const History: React.Mixin<any, any>
+
+
+    interface LifecycleMixin {
+        routerWillLeave(nextLocation: H.Location): string | boolean
+    }
+    const Lifecycle: React.Mixin<any, any>
+
+
+    const RouteContext: React.Mixin<any, any>
+
+
+    /* utils */
+
+    interface HistoryRoutes {
+        listen(listener: RouterListener): Function
+        listenBeforeLeavingRoute(route: PlainRoute, hook: RouteHook): void
+        match(location: H.Location, callback: (error: any, nextState: RouterState, nextLocation: H.Location) => void): void
+        isActive(pathname: H.Pathname, query?: H.Query, indexOnly?: boolean): boolean
     }
 
-    interface HashLocation extends Location, LocationListener { }
-    interface HistoryLocation extends Location, LocationListener { }
-    interface RefreshLocation extends Location { }
-    interface StaticLocation extends LocationBase { }
-    interface TestLocation extends Location, LocationListener { }
-
-    var HashLocation: HashLocation;
-    var HistoryLocation: HistoryLocation;
-    var RefreshLocation: RefreshLocation;
-    var StaticLocation: StaticLocation;
-    var TestLocation: TestLocation;
+    function useRoutes<T>(createHistory: HistoryModule.CreateHistory<T>): HistoryModule.CreateHistory<T & HistoryRoutes>
 
 
-    //
-    // Behavior
-    // ----------------------------------------------------------------------
-    interface ScrollBehaviorBase {
-        updateScrollPosition(position: { x: number; y: number; }, actionType: string): void;
+    function createRoutes(routes: RouteConfig): PlainRoute[]
+
+
+    interface MatchArgs {
+        routes?: RouteConfig
+        history?: H.History
+        location?: H.Location
+        parseQueryString?: ParseQueryString
+        stringifyQuery?: StringifyQuery
     }
-    interface ImitateBrowserBehavior extends ScrollBehaviorBase { }
-    interface ScrollToTopBehavior extends ScrollBehaviorBase { }
-
-    var ImitateBrowserBehavior: ImitateBrowserBehavior;
-    var ScrollToTopBehavior: ScrollToTopBehavior;
-
-
-    //
-    // Mixin
-    // ----------------------------------------------------------------------
-    interface Navigation {
-        makePath(to: string, params?: {}, query?: {}): string;
-        makeHref(to: string, params?: {}, query?: {}): string;
-        transitionTo(to: string, params?: {}, query?: {}): void;
-        replaceWith(to: string, params?: {}, query?: {}): void;
-        goBack(): void;
+    interface MatchState extends RouterState {
+        history: History
     }
+    function match(args: MatchArgs, cb: (error: any, nextLocation: H.Location, nextState: MatchState) => void): void
 
-    interface State {
-        getPath(): string;
-        getRoutes(): Route[];
-        getPathname(): string;
-        getParams(): {};
-        getQuery(): {};
-        isActive(to: string, params?: {}, query?: {}): boolean;
-    }
-
-    var Navigation: Navigation;
-    var State: State;
-
-
-    //
-    // History
-    // ----------------------------------------------------------------------
-    interface History {
-        back(): void;
-        length: number;
-    }
-    var History: History;
-
-
-    //
-    // Context
-    // ----------------------------------------------------------------------
-    interface Context {
-        makePath(to: string, params?: {}, query?: {}): string;
-        makeHref(to: string, params?: {}, query?: {}): string;
-        transitionTo(to: string, params?: {}, query?: {}): void;
-        replaceWith(to: string, params?: {}, query?: {}): void;
-        goBack(): void;
-
-        getCurrentPath(): string;
-        getCurrentRoutes(): Route[];
-        getCurrentPathname(): string;
-        getCurrentParams(): {};
-        getCurrentQuery(): {};
-        isActive(to: string, params?: {}, query?: {}): boolean;
-    }
 }
 
+
+declare module "react-router/lib/Router" {
+
+    export default ReactRouter.Router
+
+}
+
+
+declare module "react-router/lib/Link" {
+
+    export default ReactRouter.Link
+
+}
+
+
+declare module "react-router/lib/IndexLink" {
+
+    export default ReactRouter.IndexLink
+
+}
+
+
+declare module "react-router/lib/IndexRedirect" {
+
+    export default ReactRouter.IndexRedirect
+
+}
+
+
+declare module "react-router/lib/IndexRoute" {
+
+    export default ReactRouter.IndexRoute
+
+}
+
+
+declare module "react-router/lib/Redirect" {
+
+    export default ReactRouter.Redirect
+
+}
+
+
+declare module "react-router/lib/Route" {
+
+    export default ReactRouter.Route
+
+}
+
+
+declare module "react-router/lib/History" {
+
+    export default ReactRouter.History
+
+}
+
+
+declare module "react-router/lib/Lifecycle" {
+
+    export default ReactRouter.Lifecycle
+
+}
+
+
+declare module "react-router/lib/RouteContext" {
+
+    export default ReactRouter.RouteContext
+
+}
+
+
+declare module "react-router/lib/useRoutes" {
+
+    export default ReactRouter.useRoutes
+
+}
+
+declare module "react-router/lib/PatternUtils" {
+
+	export function formatPattern(pattern: string, params: {}): string;
+
+}
+
+declare module "react-router/lib/RouteUtils" {
+
+    type E = __React.ReactElement<any>
+
+    export function isReactChildren(object: E | E[]): boolean
+
+    export function createRouteFromReactElement(element: E): ReactRouter.PlainRoute
+
+    export function createRoutesFromReactChildren(children: E | E[], parentRoute: ReactRouter.PlainRoute): ReactRouter.PlainRoute[]
+
+    export import createRoutes = ReactRouter.createRoutes
+
+}
+
+
+declare module "react-router/lib/RoutingContext" {
+
+    export default ReactRouter.RoutingContext
+
+}
+
+
+declare module "react-router/lib/PropTypes" {
+
+    import React = __React
+
+    export function falsy(props: any, propName: string, componentName: string): Error;
+
+    export const history: React.Requireable<any>
+
+    export const location: React.Requireable<any>
+
+    export const component: React.Requireable<any>
+
+    export const components: React.Requireable<any>
+
+    export const route: React.Requireable<any>
+
+    export const routes: React.Requireable<any>
+
+    export default {
+        falsy,
+        history,
+        location,
+        component,
+        components,
+        route
+    }
+
+}
+
+
+declare module "react-router/lib/match" {
+
+    export default ReactRouter.match
+
+}
+
+
 declare module "react-router" {
-    export = ReactRouter;
-}
-
-declare module __React {
-
-  // for DefaultRoute
-  function createElement(
-    type: ReactRouter.DefaultRouteClass,
-    props: ReactRouter.DefaultRouteProp,
-    ...children: __React.ReactNode[]): ReactRouter.DefaultRoute;
-
-  // for Link
-  function createElement(
-    type: ReactRouter.LinkClass,
-    props: ReactRouter.LinkProp,
-    ...children: __React.ReactNode[]): ReactRouter.Link;
-
-  // for NotFoundRoute
-  function createElement(
-    type: ReactRouter.NotFoundRouteClass,
-    props: ReactRouter.NotFoundRouteProp,
-    ...children: __React.ReactNode[]): ReactRouter.NotFoundRoute;
-
-  // for Redirect
-  function createElement(
-    type: ReactRouter.RedirectClass,
-    props: ReactRouter.RedirectProp,
-    ...children: __React.ReactNode[]): ReactRouter.Redirect;
-
-  // for Route
-  function createElement(
-    type: ReactRouter.RouteClass,
-    props: ReactRouter.RouteProp,
-    ...children: __React.ReactNode[]): ReactRouter.Route;
-
-  // for RouteHandler
-  function createElement(
-    type: ReactRouter.RouteHandlerClass,
-    props: ReactRouter.RouteHandlerProp,
-    ...children: __React.ReactNode[]): ReactRouter.RouteHandler;
-}
-
-declare module "react/addons" {
-  // for DefaultRoute
-  function createElement(
-    type: ReactRouter.DefaultRouteClass,
-    props: ReactRouter.DefaultRouteProp,
-    ...children: __React.ReactNode[]): ReactRouter.DefaultRoute;
-
-  // for Link
-  function createElement(
-    type: ReactRouter.LinkClass,
-    props: ReactRouter.LinkProp,
-    ...children: __React.ReactNode[]): ReactRouter.Link;
-
-  // for NotFoundRoute
-  function createElement(
-    type: ReactRouter.NotFoundRouteClass,
-    props: ReactRouter.NotFoundRouteProp,
-    ...children: __React.ReactNode[]): ReactRouter.NotFoundRoute;
-
-  // for Redirect
-  function createElement(
-    type: ReactRouter.RedirectClass,
-    props: ReactRouter.RedirectProp,
-    ...children: __React.ReactNode[]): ReactRouter.Redirect;
-
-  // for Route
-  function createElement(
-    type: ReactRouter.RouteClass,
-    props: ReactRouter.RouteProp,
-    ...children: __React.ReactNode[]): ReactRouter.Route;
-
-  // for RouteHandler
-  function createElement(
-    type: ReactRouter.RouteHandlerClass,
-    props: ReactRouter.RouteHandlerProp,
-    ...children: __React.ReactNode[]): ReactRouter.RouteHandler;
+
+    import Router from "react-router/lib/Router"
+
+    import Link from "react-router/lib/Link"
+
+    import IndexLink from "react-router/lib/IndexLink"
+
+    import IndexRedirect from "react-router/lib/IndexRedirect"
+
+    import IndexRoute from "react-router/lib/IndexRoute"
+
+    import Redirect from "react-router/lib/Redirect"
+
+    import Route from "react-router/lib/Route"
+
+    import History from "react-router/lib/History"
+
+    import Lifecycle from "react-router/lib/Lifecycle"
+
+    import RouteContext from "react-router/lib/RouteContext"
+
+    import useRoutes from "react-router/lib/useRoutes"
+
+    import { createRoutes } from "react-router/lib/RouteUtils"
+
+    import { formatPattern } from "react-router/lib/PatternUtils"
+
+    import RoutingContext from "react-router/lib/RoutingContext"
+
+    import PropTypes from "react-router/lib/PropTypes"
+
+    import match from "react-router/lib/match"
+
+    // PlainRoute is defined in the API documented at:
+    // https://github.com/rackt/react-router/blob/master/docs/API.md
+    // but not included in any of the .../lib modules above.
+    export type PlainRoute = ReactRouter.PlainRoute
+
+    // The following definitions are also very useful to export
+    // because by using these types lots of potential type errors
+    // can be exposed:
+    export type EnterHook = ReactRouter.EnterHook
+    export type LeaveHook = ReactRouter.LeaveHook
+    export type ParseQueryString = ReactRouter.ParseQueryString
+    export type RedirectFunction = ReactRouter.RedirectFunction
+    export type RouteComponentProps<P,R> = ReactRouter.RouteComponentProps<P,R>;
+    export type RouteHook = ReactRouter.RouteHook
+    export type StringifyQuery = ReactRouter.StringifyQuery
+    export type RouterListener = ReactRouter.RouterListener
+    export type RouterState = ReactRouter.RouterState
+    export type HistoryBase = ReactRouter.HistoryBase
+
+    export {
+        Router,
+        Link,
+        IndexLink,
+        IndexRedirect,
+        IndexRoute,
+        Redirect,
+        Route,
+        History,
+        Lifecycle,
+        RouteContext,
+        useRoutes,
+        createRoutes,
+        formatPattern,
+        RoutingContext,
+        PropTypes,
+        match
+    }
+
+    export default Router
+
 }
diff --git a/react/README.md b/react/README.md
index b7ff4b55e..8990e8a71 100644
--- a/react/README.md
+++ b/react/README.md
@@ -1,5 +1,5 @@
-# React v0.13.3 Type Definitions
+# React v0.14.2 Type Definitions
 
-This folder contains the following `.d.ts` files:
-* `react.d.ts` declares the module `"react"` and `"react/addons"`
-* `react-global.d.ts` declares the global namespace `React` (only include this if you are actually using the global `React`)
+If you are using modules you should use `react.d.ts`, `react-dom.d.ts` and any of the `react-addon-*.d.ts` definition files.
+
+If you are using the global `React` variable, you should use `react-global.d.ts`.
diff --git a/react/react-0.13.3.d.ts b/react/react-0.13.3.d.ts
new file mode 100644
index 000000000..794ec8cc2
--- /dev/null
+++ b/react/react-0.13.3.d.ts
@@ -0,0 +1,2038 @@
+// Type definitions for React v0.13.3
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare namespace __React {
+    //
+    // React Elements
+    // ----------------------------------------------------------------------
+
+    type ReactType = ComponentClass<any> | string;
+
+    interface ReactElement<P> {
+        type: string | ComponentClass<P>;
+        props: P;
+        key: string | number;
+        ref: string | ((component: Component<P, any>) => any);
+    }
+
+    interface ClassicElement<P> extends ReactElement<P> {
+        type: string | ClassicComponentClass<P>;
+        ref: string | ((component: ClassicComponent<P, any>) => any);
+    }
+
+    interface DOMElement<P> extends ClassicElement<P> {
+        type: string;
+        ref: string | ((component: DOMComponent<P>) => any);
+    }
+
+    type HTMLElement = DOMElement<HTMLAttributes>;
+    type SVGElement = DOMElement<SVGAttributes>;
+
+    //
+    // Factories
+    // ----------------------------------------------------------------------
+
+    interface Factory<P> {
+        (props?: P, ...children: ReactNode[]): ReactElement<P>;
+    }
+
+    interface ClassicFactory<P> extends Factory<P> {
+        (props?: P, ...children: ReactNode[]): ClassicElement<P>;
+    }
+
+    interface DOMFactory<P> extends ClassicFactory<P> {
+        (props?: P, ...children: ReactNode[]): DOMElement<P>;
+    }
+
+    type HTMLFactory = DOMFactory<HTMLAttributes>;
+    type SVGFactory = DOMFactory<SVGAttributes>;
+    type SVGElementFactory = DOMFactory<SVGElementAttributes>;
+
+    //
+    // React Nodes
+    // http://facebook.github.io/react/docs/glossary.html
+    // ----------------------------------------------------------------------
+
+    type ReactText = string | number;
+    type ReactChild = ReactElement<any> | ReactText;
+
+    // Should be Array<ReactNode> but type aliases cannot be recursive
+    type ReactFragment = {} | Array<ReactChild | any[] | boolean>;
+    type ReactNode = ReactChild | ReactFragment | boolean;
+
+    //
+    // Top Level API
+    // ----------------------------------------------------------------------
+
+    function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
+
+    function createFactory<P>(type: string): DOMFactory<P>;
+    function createFactory<P>(type: ClassicComponentClass<P> | string): ClassicFactory<P>;
+    function createFactory<P>(type: ComponentClass<P>): Factory<P>;
+
+    function createElement<P>(
+        type: string,
+        props?: P,
+        ...children: ReactNode[]): DOMElement<P>;
+    function createElement<P>(
+        type: ClassicComponentClass<P> | string,
+        props?: P,
+        ...children: ReactNode[]): ClassicElement<P>;
+    function createElement<P>(
+        type: ComponentClass<P>,
+        props?: P,
+        ...children: ReactNode[]): ReactElement<P>;
+
+    function cloneElement<P>(
+        element: DOMElement<P>,
+        props?: P,
+        ...children: ReactNode[]): DOMElement<P>;
+    function cloneElement<P>(
+        element: ClassicElement<P>,
+        props?: P,
+        ...children: ReactNode[]): ClassicElement<P>;
+    function cloneElement<P>(
+        element: ReactElement<P>,
+        props?: P,
+        ...children: ReactNode[]): ReactElement<P>;
+
+    function render<P>(
+        element: DOMElement<P>,
+        container: Element,
+        callback?: () => any): DOMComponent<P>;
+    function render<P, S>(
+        element: ClassicElement<P>,
+        container: Element,
+        callback?: () => any): ClassicComponent<P, S>;
+    function render<P, S>(
+        element: ReactElement<P>,
+        container: Element,
+        callback?: () => any): Component<P, S>;
+
+    function unmountComponentAtNode(container: Element): boolean;
+    function renderToString(element: ReactElement<any>): string;
+    function renderToStaticMarkup(element: ReactElement<any>): string;
+    function isValidElement(object: {}): boolean;
+    function initializeTouchEvents(shouldUseTouch: boolean): void;
+
+    function findDOMNode<TElement extends Element>(
+        componentOrElement: Component<any, any> | Element): TElement;
+    function findDOMNode(
+        componentOrElement: Component<any, any> | Element): Element;
+
+    var DOM: ReactDOM;
+    var PropTypes: ReactPropTypes;
+    var Children: ReactChildren;
+
+    //
+    // Component API
+    // ----------------------------------------------------------------------
+
+    // Base component for plain JS classes
+    class Component<P, S> implements ComponentLifecycle<P, S> {
+        static propTypes: ValidationMap<any>;
+        static contextTypes: ValidationMap<any>;
+        static childContextTypes: ValidationMap<any>;
+        static defaultProps: Props<any>;
+
+        constructor(props?: P, context?: any);
+        setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
+        setState(state: S, callback?: () => any): void;
+        forceUpdate(callBack?: () => any): void;
+        render(): JSX.Element;
+        props: P;
+        state: S;
+        context: {};
+        refs: {
+            [key: string]: Component<any, any>
+        };
+    }
+
+    interface ClassicComponent<P, S> extends Component<P, S> {
+        replaceState(nextState: S, callback?: () => any): void;
+        getDOMNode<TElement extends Element>(): TElement;
+        getDOMNode(): Element;
+        isMounted(): boolean;
+        getInitialState?(): S;
+        setProps(nextProps: P, callback?: () => any): void;
+        replaceProps(nextProps: P, callback?: () => any): void;
+    }
+
+    interface DOMComponent<P> extends ClassicComponent<P, any> {
+        tagName: string;
+    }
+
+    type HTMLComponent = DOMComponent<HTMLAttributes>;
+    type SVGComponent = DOMComponent<SVGAttributes>;
+
+    interface ChildContextProvider<CC> {
+        getChildContext(): CC;
+    }
+
+    //
+    // Class Interfaces
+    // ----------------------------------------------------------------------
+
+    interface ComponentClass<P> {
+        new(props?: P, context?: any): Component<P, any>;
+        propTypes?: ValidationMap<P>;
+        contextTypes?: ValidationMap<any>;
+        childContextTypes?: ValidationMap<any>;
+        defaultProps?: P;
+    }
+
+    interface ClassicComponentClass<P> extends ComponentClass<P> {
+        new(props?: P, context?: any): ClassicComponent<P, any>;
+        getDefaultProps?(): P;
+        displayName?: string;
+    }
+
+    //
+    // Component Specs and Lifecycle
+    // ----------------------------------------------------------------------
+
+    interface ComponentLifecycle<P, S> {
+        componentWillMount?(): void;
+        componentDidMount?(): void;
+        componentWillReceiveProps?(nextProps: P, nextContext: any): void;
+        shouldComponentUpdate?(nextProps: P, nextState: S, nextContext: any): boolean;
+        componentWillUpdate?(nextProps: P, nextState: S, nextContext: any): void;
+        componentDidUpdate?(prevProps: P, prevState: S, prevContext: any): void;
+        componentWillUnmount?(): void;
+    }
+
+    interface Mixin<P, S> extends ComponentLifecycle<P, S> {
+        mixins?: Mixin<P, S>;
+        statics?: {
+            [key: string]: any;
+        };
+
+        displayName?: string;
+        propTypes?: ValidationMap<any>;
+        contextTypes?: ValidationMap<any>;
+        childContextTypes?: ValidationMap<any>;
+
+        getDefaultProps?(): P;
+        getInitialState?(): S;
+    }
+
+    interface ComponentSpec<P, S> extends Mixin<P, S> {
+        render(): ReactElement<any>;
+
+        [propertyName: string]: any;
+    }
+
+    //
+    // Event System
+    // ----------------------------------------------------------------------
+
+    interface SyntheticEvent {
+        bubbles: boolean;
+        cancelable: boolean;
+        currentTarget: EventTarget;
+        defaultPrevented: boolean;
+        eventPhase: number;
+        isTrusted: boolean;
+        nativeEvent: Event;
+        preventDefault(): void;
+        stopPropagation(): void;
+        target: EventTarget;
+        timeStamp: Date;
+        type: string;
+    }
+
+    interface DragEvent extends SyntheticEvent {
+        dataTransfer: DataTransfer;
+    }
+
+    interface ClipboardEvent extends SyntheticEvent {
+        clipboardData: DataTransfer;
+    }
+
+    interface KeyboardEvent extends SyntheticEvent {
+        altKey: boolean;
+        charCode: number;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        key: string;
+        keyCode: number;
+        locale: string;
+        location: number;
+        metaKey: boolean;
+        repeat: boolean;
+        shiftKey: boolean;
+        which: number;
+    }
+
+    interface FocusEvent extends SyntheticEvent {
+        relatedTarget: EventTarget;
+    }
+
+    interface FormEvent extends SyntheticEvent {
+    }
+
+    interface MouseEvent extends SyntheticEvent {
+        altKey: boolean;
+        button: number;
+        buttons: number;
+        clientX: number;
+        clientY: number;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        metaKey: boolean;
+        pageX: number;
+        pageY: number;
+        relatedTarget: EventTarget;
+        screenX: number;
+        screenY: number;
+        shiftKey: boolean;
+    }
+
+    interface TouchEvent extends SyntheticEvent {
+        altKey: boolean;
+        changedTouches: TouchList;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        metaKey: boolean;
+        shiftKey: boolean;
+        targetTouches: TouchList;
+        touches: TouchList;
+    }
+
+    interface UIEvent extends SyntheticEvent {
+        detail: number;
+        view: AbstractView;
+    }
+
+    interface WheelEvent extends SyntheticEvent {
+        deltaMode: number;
+        deltaX: number;
+        deltaY: number;
+        deltaZ: number;
+    }
+
+    //
+    // Event Handler Types
+    // ----------------------------------------------------------------------
+
+    interface EventHandler<E extends SyntheticEvent> {
+        (event: E): void;
+    }
+
+    interface DragEventHandler extends EventHandler<DragEvent> {}
+    interface ClipboardEventHandler extends EventHandler<ClipboardEvent> {}
+    interface KeyboardEventHandler extends EventHandler<KeyboardEvent> {}
+    interface FocusEventHandler extends EventHandler<FocusEvent> {}
+    interface FormEventHandler extends EventHandler<FormEvent> {}
+    interface MouseEventHandler extends EventHandler<MouseEvent> {}
+    interface TouchEventHandler extends EventHandler<TouchEvent> {}
+    interface UIEventHandler extends EventHandler<UIEvent> {}
+    interface WheelEventHandler extends EventHandler<WheelEvent> {}
+
+    //
+    // Props / DOM Attributes
+    // ----------------------------------------------------------------------
+
+    interface Props<T> {
+        children?: ReactNode;
+        key?: string | number;
+        ref?: string | ((component: T) => any);
+    }
+
+    interface DOMAttributesBase<T> extends Props<T> {
+        onCopy?: ClipboardEventHandler;
+        onCut?: ClipboardEventHandler;
+        onPaste?: ClipboardEventHandler;
+        onKeyDown?: KeyboardEventHandler;
+        onKeyPress?: KeyboardEventHandler;
+        onKeyUp?: KeyboardEventHandler;
+        onFocus?: FocusEventHandler;
+        onBlur?: FocusEventHandler;
+        onChange?: FormEventHandler;
+        onInput?: FormEventHandler;
+        onSubmit?: FormEventHandler;
+        onClick?: MouseEventHandler;
+        onContextMenu?: MouseEventHandler;
+        onDoubleClick?: MouseEventHandler;
+        onDrag?: DragEventHandler;
+        onDragEnd?: DragEventHandler;
+        onDragEnter?: DragEventHandler;
+        onDragExit?: DragEventHandler;
+        onDragLeave?: DragEventHandler;
+        onDragOver?: DragEventHandler;
+        onDragStart?: DragEventHandler;
+        onDrop?: DragEventHandler;
+        onMouseDown?: MouseEventHandler;
+        onMouseEnter?: MouseEventHandler;
+        onMouseLeave?: MouseEventHandler;
+        onMouseMove?: MouseEventHandler;
+        onMouseOut?: MouseEventHandler;
+        onMouseOver?: MouseEventHandler;
+        onMouseUp?: MouseEventHandler;
+        onTouchCancel?: TouchEventHandler;
+        onTouchEnd?: TouchEventHandler;
+        onTouchMove?: TouchEventHandler;
+        onTouchStart?: TouchEventHandler;
+        onScroll?: UIEventHandler;
+        onWheel?: WheelEventHandler;
+
+        className?: string;
+        id?: string;
+
+        dangerouslySetInnerHTML?: {
+            __html: string;
+        };
+    }
+
+    interface DOMAttributes extends DOMAttributesBase<DOMComponent<any>> {
+    }
+
+    // This interface is not complete. Only properties accepting
+    // unitless numbers are listed here (see CSSProperty.js in React)
+    interface CSSProperties {
+        boxFlex?: number;
+        boxFlexGroup?: number;
+        columnCount?: number;
+        flex?: number | string;
+        flexGrow?: number;
+        flexShrink?: number;
+        fontWeight?: number | string;
+        lineClamp?: number;
+        lineHeight?: number | string;
+        opacity?: number;
+        order?: number;
+        orphans?: number;
+        widows?: number;
+        zIndex?: number;
+        zoom?: number;
+
+        fontSize?: number | string;
+
+        // SVG-related properties
+        fillOpacity?: number;
+        strokeOpacity?: number;
+        strokeWidth?: number;
+
+        [propertyName: string]: any;
+    }
+
+    interface HTMLAttributesBase<T> extends DOMAttributesBase<T> {
+        accept?: string;
+        acceptCharset?: string;
+        accessKey?: string;
+        action?: string;
+        allowFullScreen?: boolean;
+        allowTransparency?: boolean;
+        alt?: string;
+        async?: boolean;
+        autoComplete?: boolean;
+        autoFocus?: boolean;
+        autoPlay?: boolean;
+        cellPadding?: number | string;
+        cellSpacing?: number | string;
+        charSet?: string;
+        checked?: boolean;
+        classID?: string;
+        cols?: number;
+        colSpan?: number;
+        content?: string;
+        contentEditable?: boolean;
+        contextMenu?: string;
+        controls?: any;
+        coords?: string;
+        crossOrigin?: string;
+        data?: string;
+        dateTime?: string;
+        defaultChecked?: boolean;
+        defaultValue?: string;
+        defer?: boolean;
+        dir?: string;
+        disabled?: boolean;
+        download?: any;
+        draggable?: boolean;
+        encType?: string;
+        form?: string;
+        formAction?: string;
+        formEncType?: string;
+        formMethod?: string;
+        formNoValidate?: boolean;
+        formTarget?: string;
+        frameBorder?: number | string;
+        headers?: string;
+        height?: number | string;
+        hidden?: boolean;
+        high?: number;
+        href?: string;
+        hrefLang?: string;
+        htmlFor?: string;
+        httpEquiv?: string;
+        icon?: string;
+        label?: string;
+        lang?: string;
+        list?: string;
+        loop?: boolean;
+        low?: number;
+        manifest?: string;
+        marginHeight?: number;
+        marginWidth?: number;
+        max?: number | string;
+        maxLength?: number;
+        media?: string;
+        mediaGroup?: string;
+        method?: string;
+        min?: number | string;
+        multiple?: boolean;
+        muted?: boolean;
+        name?: string;
+        noValidate?: boolean;
+        open?: boolean;
+        optimum?: number;
+        pattern?: string;
+        placeholder?: string;
+        poster?: string;
+        preload?: string;
+        radioGroup?: string;
+        readOnly?: boolean;
+        rel?: string;
+        required?: boolean;
+        role?: string;
+        rows?: number;
+        rowSpan?: number;
+        sandbox?: string;
+        scope?: string;
+        scoped?: boolean;
+        scrolling?: string;
+        seamless?: boolean;
+        selected?: boolean;
+        shape?: string;
+        size?: number;
+        sizes?: string;
+        span?: number;
+        spellCheck?: boolean;
+        src?: string;
+        srcDoc?: string;
+        srcSet?: string;
+        start?: number;
+        step?: number | string;
+        style?: CSSProperties;
+        tabIndex?: number;
+        target?: string;
+        title?: string;
+        type?: string;
+        useMap?: string;
+        value?: string;
+        width?: number | string;
+        wmode?: string;
+
+        // Non-standard Attributes
+        autoCapitalize?: boolean;
+        autoCorrect?: boolean;
+        property?: string;
+        itemProp?: string;
+        itemScope?: boolean;
+        itemType?: string;
+        unselectable?: boolean;
+    }
+
+    interface HTMLAttributes extends HTMLAttributesBase<HTMLComponent> {
+    }
+
+    interface SVGElementAttributes extends HTMLAttributes {
+        viewBox?: string;
+        preserveAspectRatio?: string;
+    }
+
+    interface SVGAttributes extends DOMAttributes {
+        ref?: string | ((component: SVGComponent) => void);
+
+        cx?: number | string;
+        cy?: number | string;
+        d?: string;
+        dx?: number | string;
+        dy?: number | string;
+        fill?: string;
+        fillOpacity?: number | string;
+        fontFamily?: string;
+        fontSize?: number | string;
+        fx?: number | string;
+        fy?: number | string;
+        gradientTransform?: string;
+        gradientUnits?: string;
+        height?: number | string;
+        markerEnd?: string;
+        markerMid?: string;
+        markerStart?: string;
+        offset?: number | string;
+        opacity?: number | string;
+        patternContentUnits?: string;
+        patternUnits?: string;
+        points?: string;
+        preserveAspectRatio?: string;
+        r?: number | string;
+        rx?: number | string;
+        ry?: number | string;
+        spreadMethod?: string;
+        stopColor?: string;
+        stopOpacity?: number | string;
+        stroke?: string;
+        strokeDasharray?: string;
+        strokeLinecap?: string;
+        strokeMiterlimit?: string;
+        strokeOpacity?: number | string;
+        strokeWidth?: number | string;
+        textAnchor?: string;
+        transform?: string;
+        version?: string;
+        viewBox?: string;
+        width?: number | string;
+        x1?: number | string;
+        x2?: number | string;
+        x?: number | string;
+        y1?: number | string;
+        y2?: number | string;
+        y?: number | string;
+    }
+
+    //
+    // React.DOM
+    // ----------------------------------------------------------------------
+
+    interface ReactDOM {
+        // HTML
+        a: HTMLFactory;
+        abbr: HTMLFactory;
+        address: HTMLFactory;
+        area: HTMLFactory;
+        article: HTMLFactory;
+        aside: HTMLFactory;
+        audio: HTMLFactory;
+        b: HTMLFactory;
+        base: HTMLFactory;
+        bdi: HTMLFactory;
+        bdo: HTMLFactory;
+        big: HTMLFactory;
+        blockquote: HTMLFactory;
+        body: HTMLFactory;
+        br: HTMLFactory;
+        button: HTMLFactory;
+        canvas: HTMLFactory;
+        caption: HTMLFactory;
+        cite: HTMLFactory;
+        code: HTMLFactory;
+        col: HTMLFactory;
+        colgroup: HTMLFactory;
+        data: HTMLFactory;
+        datalist: HTMLFactory;
+        dd: HTMLFactory;
+        del: HTMLFactory;
+        details: HTMLFactory;
+        dfn: HTMLFactory;
+        dialog: HTMLFactory;
+        div: HTMLFactory;
+        dl: HTMLFactory;
+        dt: HTMLFactory;
+        em: HTMLFactory;
+        embed: HTMLFactory;
+        fieldset: HTMLFactory;
+        figcaption: HTMLFactory;
+        figure: HTMLFactory;
+        footer: HTMLFactory;
+        form: HTMLFactory;
+        h1: HTMLFactory;
+        h2: HTMLFactory;
+        h3: HTMLFactory;
+        h4: HTMLFactory;
+        h5: HTMLFactory;
+        h6: HTMLFactory;
+        head: HTMLFactory;
+        header: HTMLFactory;
+        hr: HTMLFactory;
+        html: HTMLFactory;
+        i: HTMLFactory;
+        iframe: HTMLFactory;
+        img: HTMLFactory;
+        input: HTMLFactory;
+        ins: HTMLFactory;
+        kbd: HTMLFactory;
+        keygen: HTMLFactory;
+        label: HTMLFactory;
+        legend: HTMLFactory;
+        li: HTMLFactory;
+        link: HTMLFactory;
+        main: HTMLFactory;
+        map: HTMLFactory;
+        mark: HTMLFactory;
+        menu: HTMLFactory;
+        menuitem: HTMLFactory;
+        meta: HTMLFactory;
+        meter: HTMLFactory;
+        nav: HTMLFactory;
+        noscript: HTMLFactory;
+        object: HTMLFactory;
+        ol: HTMLFactory;
+        optgroup: HTMLFactory;
+        option: HTMLFactory;
+        output: HTMLFactory;
+        p: HTMLFactory;
+        param: HTMLFactory;
+        picture: HTMLFactory;
+        pre: HTMLFactory;
+        progress: HTMLFactory;
+        q: HTMLFactory;
+        rp: HTMLFactory;
+        rt: HTMLFactory;
+        ruby: HTMLFactory;
+        s: HTMLFactory;
+        samp: HTMLFactory;
+        script: HTMLFactory;
+        section: HTMLFactory;
+        select: HTMLFactory;
+        small: HTMLFactory;
+        source: HTMLFactory;
+        span: HTMLFactory;
+        strong: HTMLFactory;
+        style: HTMLFactory;
+        sub: HTMLFactory;
+        summary: HTMLFactory;
+        sup: HTMLFactory;
+        table: HTMLFactory;
+        tbody: HTMLFactory;
+        td: HTMLFactory;
+        textarea: HTMLFactory;
+        tfoot: HTMLFactory;
+        th: HTMLFactory;
+        thead: HTMLFactory;
+        time: HTMLFactory;
+        title: HTMLFactory;
+        tr: HTMLFactory;
+        track: HTMLFactory;
+        u: HTMLFactory;
+        ul: HTMLFactory;
+        "var": HTMLFactory;
+        video: HTMLFactory;
+        wbr: HTMLFactory;
+
+        // SVG
+        svg: SVGElementFactory;
+        circle: SVGFactory;
+        defs: SVGFactory;
+        ellipse: SVGFactory;
+        g: SVGFactory;
+        line: SVGFactory;
+        linearGradient: SVGFactory;
+        mask: SVGFactory;
+        path: SVGFactory;
+        pattern: SVGFactory;
+        polygon: SVGFactory;
+        polyline: SVGFactory;
+        radialGradient: SVGFactory;
+        rect: SVGFactory;
+        stop: SVGFactory;
+        text: SVGFactory;
+        tspan: SVGFactory;
+    }
+
+    //
+    // React.PropTypes
+    // ----------------------------------------------------------------------
+
+    interface Validator<T> {
+        (object: T, key: string, componentName: string): Error;
+    }
+
+    interface Requireable<T> extends Validator<T> {
+        isRequired: Validator<T>;
+    }
+
+    interface ValidationMap<T> {
+        [key: string]: Validator<T>;
+    }
+
+    interface ReactPropTypes {
+        any: Requireable<any>;
+        array: Requireable<any>;
+        bool: Requireable<any>;
+        func: Requireable<any>;
+        number: Requireable<any>;
+        object: Requireable<any>;
+        string: Requireable<any>;
+        node: Requireable<any>;
+        element: Requireable<any>;
+        instanceOf(expectedClass: {}): Requireable<any>;
+        oneOf(types: any[]): Requireable<any>;
+        oneOfType(types: Validator<any>[]): Requireable<any>;
+        arrayOf(type: Validator<any>): Requireable<any>;
+        objectOf(type: Validator<any>): Requireable<any>;
+        shape(type: ValidationMap<any>): Requireable<any>;
+    }
+
+    //
+    // React.Children
+    // ----------------------------------------------------------------------
+
+    interface ReactChildren {
+        map<T>(children: ReactNode, fn: (child: ReactChild, index: number) => T): { [key:string]: T };
+        forEach(children: ReactNode, fn: (child: ReactChild, index: number) => any): void;
+        count(children: ReactNode): number;
+        only(children: ReactNode): ReactChild;
+    }
+
+    //
+    // Browser Interfaces
+    // https://github.com/nikeee/2048-typescript/blob/master/2048/js/touch.d.ts
+    // ----------------------------------------------------------------------
+
+    interface AbstractView {
+        styleMedia: StyleMedia;
+        document: Document;
+    }
+
+    interface Touch {
+        identifier: number;
+        target: EventTarget;
+        screenX: number;
+        screenY: number;
+        clientX: number;
+        clientY: number;
+        pageX: number;
+        pageY: number;
+    }
+
+    interface TouchList {
+        [index: number]: Touch;
+        length: number;
+        item(index: number): Touch;
+        identifiedTouch(identifier: number): Touch;
+    }
+}
+
+declare module "react" {
+    export = __React;
+}
+
+declare module "react/addons" {
+    //
+    // React Elements
+    // ----------------------------------------------------------------------
+
+    type ReactType = ComponentClass<any> | string;
+
+    interface ReactElement<P> {
+        type: string | ComponentClass<P>;
+        props: P;
+        key: string | number;
+        ref: string | ((component: Component<P, any>) => any);
+    }
+
+    interface ClassicElement<P> extends ReactElement<P> {
+        type: string | ClassicComponentClass<P>;
+        ref: string | ((component: ClassicComponent<P, any>) => any);
+    }
+
+    interface DOMElement<P> extends ClassicElement<P> {
+        type: string;
+        ref: string | ((component: DOMComponent<P>) => any);
+    }
+
+    type HTMLElement = DOMElement<HTMLAttributes>;
+    type SVGElement = DOMElement<SVGAttributes>;
+
+    //
+    // Factories
+    // ----------------------------------------------------------------------
+
+    interface Factory<P> {
+        (props?: P, ...children: ReactNode[]): ReactElement<P>;
+    }
+
+    interface ClassicFactory<P> extends Factory<P> {
+        (props?: P, ...children: ReactNode[]): ClassicElement<P>;
+    }
+
+    interface DOMFactory<P> extends ClassicFactory<P> {
+        (props?: P, ...children: ReactNode[]): DOMElement<P>;
+    }
+
+    type HTMLFactory = DOMFactory<HTMLAttributes>;
+    type SVGFactory = DOMFactory<SVGAttributes>;
+    type SVGElementFactory = DOMFactory<SVGElementAttributes>;
+
+    //
+    // React Nodes
+    // http://facebook.github.io/react/docs/glossary.html
+    // ----------------------------------------------------------------------
+
+    type ReactText = string | number;
+    type ReactChild = ReactElement<any> | ReactText;
+
+    // Should be Array<ReactNode> but type aliases cannot be recursive
+    type ReactFragment = {} | Array<ReactChild | any[] | boolean>;
+    type ReactNode = ReactChild | ReactFragment | boolean;
+
+    //
+    // Top Level API
+    // ----------------------------------------------------------------------
+
+    function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
+
+    function createFactory<P>(type: string): DOMFactory<P>;
+    function createFactory<P>(type: ClassicComponentClass<P> | string): ClassicFactory<P>;
+    function createFactory<P>(type: ComponentClass<P>): Factory<P>;
+
+    function createElement<P>(
+        type: string,
+        props?: P,
+        ...children: ReactNode[]): DOMElement<P>;
+    function createElement<P>(
+        type: ClassicComponentClass<P> | string,
+        props?: P,
+        ...children: ReactNode[]): ClassicElement<P>;
+    function createElement<P>(
+        type: ComponentClass<P>,
+        props?: P,
+        ...children: ReactNode[]): ReactElement<P>;
+
+    function cloneElement<P>(
+        element: DOMElement<P>,
+        props?: P,
+        ...children: ReactNode[]): DOMElement<P>;
+    function cloneElement<P>(
+        element: ClassicElement<P>,
+        props?: P,
+        ...children: ReactNode[]): ClassicElement<P>;
+    function cloneElement<P>(
+        element: ReactElement<P>,
+        props?: P,
+        ...children: ReactNode[]): ReactElement<P>;
+
+    function render<P>(
+        element: DOMElement<P>,
+        container: Element,
+        callback?: () => any): DOMComponent<P>;
+    function render<P, S>(
+        element: ClassicElement<P>,
+        container: Element,
+        callback?: () => any): ClassicComponent<P, S>;
+    function render<P, S>(
+        element: ReactElement<P>,
+        container: Element,
+        callback?: () => any): Component<P, S>;
+
+    function unmountComponentAtNode(container: Element): boolean;
+    function renderToString(element: ReactElement<any>): string;
+    function renderToStaticMarkup(element: ReactElement<any>): string;
+    function isValidElement(object: {}): boolean;
+    function initializeTouchEvents(shouldUseTouch: boolean): void;
+
+    function findDOMNode<TElement extends Element>(
+        componentOrElement: Component<any, any> | Element): TElement;
+    function findDOMNode(
+        componentOrElement: Component<any, any> | Element): Element;
+
+    var DOM: ReactDOM;
+    var PropTypes: ReactPropTypes;
+    var Children: ReactChildren;
+
+    //
+    // Component API
+    // ----------------------------------------------------------------------
+
+    // Base component for plain JS classes
+    class Component<P, S> implements ComponentLifecycle<P, S> {
+        static propTypes: ValidationMap<any>;
+        static contextTypes: ValidationMap<any>;
+        static childContextTypes: ValidationMap<any>;
+        static defaultProps: Props<any>;
+
+        constructor(props?: P, context?: any);
+        setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
+        setState(state: S, callback?: () => any): void;
+        forceUpdate(callBack?: () => any): void;
+        render(): JSX.Element;
+        props: P;
+        state: S;
+        context: {};
+        refs: {
+            [key: string]: Component<any, any>
+        };
+    }
+
+    interface ClassicComponent<P, S> extends Component<P, S> {
+        replaceState(nextState: S, callback?: () => any): void;
+        getDOMNode<TElement extends Element>(): TElement;
+        getDOMNode(): Element;
+        isMounted(): boolean;
+        getInitialState?(): S;
+        setProps(nextProps: P, callback?: () => any): void;
+        replaceProps(nextProps: P, callback?: () => any): void;
+    }
+
+    interface DOMComponent<P> extends ClassicComponent<P, any> {
+        tagName: string;
+    }
+
+    type HTMLComponent = DOMComponent<HTMLAttributes>;
+    type SVGComponent = DOMComponent<SVGAttributes>;
+
+    interface ChildContextProvider<CC> {
+        getChildContext(): CC;
+    }
+
+    //
+    // Class Interfaces
+    // ----------------------------------------------------------------------
+
+    interface ComponentClass<P> {
+        new(props?: P, context?: any): Component<P, any>;
+        propTypes?: ValidationMap<P>;
+        contextTypes?: ValidationMap<any>;
+        childContextTypes?: ValidationMap<any>;
+        defaultProps?: P;
+    }
+
+    interface ClassicComponentClass<P> extends ComponentClass<P> {
+        new(props?: P, context?: any): ClassicComponent<P, any>;
+        getDefaultProps?(): P;
+        displayName?: string;
+    }
+
+    //
+    // Component Specs and Lifecycle
+    // ----------------------------------------------------------------------
+
+    interface ComponentLifecycle<P, S> {
+        componentWillMount?(): void;
+        componentDidMount?(): void;
+        componentWillReceiveProps?(nextProps: P, nextContext: any): void;
+        shouldComponentUpdate?(nextProps: P, nextState: S, nextContext: any): boolean;
+        componentWillUpdate?(nextProps: P, nextState: S, nextContext: any): void;
+        componentDidUpdate?(prevProps: P, prevState: S, prevContext: any): void;
+        componentWillUnmount?(): void;
+    }
+
+    interface Mixin<P, S> extends ComponentLifecycle<P, S> {
+        mixins?: Mixin<P, S>;
+        statics?: {
+            [key: string]: any;
+        };
+
+        displayName?: string;
+        propTypes?: ValidationMap<any>;
+        contextTypes?: ValidationMap<any>;
+        childContextTypes?: ValidationMap<any>;
+
+        getDefaultProps?(): P;
+        getInitialState?(): S;
+    }
+
+    interface ComponentSpec<P, S> extends Mixin<P, S> {
+        render(): ReactElement<any>;
+
+        [propertyName: string]: any;
+    }
+
+    //
+    // Event System
+    // ----------------------------------------------------------------------
+
+    interface SyntheticEvent {
+        bubbles: boolean;
+        cancelable: boolean;
+        currentTarget: EventTarget;
+        defaultPrevented: boolean;
+        eventPhase: number;
+        isTrusted: boolean;
+        nativeEvent: Event;
+        preventDefault(): void;
+        stopPropagation(): void;
+        target: EventTarget;
+        timeStamp: Date;
+        type: string;
+    }
+
+    interface DragEvent extends SyntheticEvent {
+        dataTransfer: DataTransfer;
+    }
+
+    interface ClipboardEvent extends SyntheticEvent {
+        clipboardData: DataTransfer;
+    }
+
+    interface KeyboardEvent extends SyntheticEvent {
+        altKey: boolean;
+        charCode: number;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        key: string;
+        keyCode: number;
+        locale: string;
+        location: number;
+        metaKey: boolean;
+        repeat: boolean;
+        shiftKey: boolean;
+        which: number;
+    }
+
+    interface FocusEvent extends SyntheticEvent {
+        relatedTarget: EventTarget;
+    }
+
+    interface FormEvent extends SyntheticEvent {
+    }
+
+    interface MouseEvent extends SyntheticEvent {
+        altKey: boolean;
+        button: number;
+        buttons: number;
+        clientX: number;
+        clientY: number;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        metaKey: boolean;
+        pageX: number;
+        pageY: number;
+        relatedTarget: EventTarget;
+        screenX: number;
+        screenY: number;
+        shiftKey: boolean;
+    }
+
+    interface TouchEvent extends SyntheticEvent {
+        altKey: boolean;
+        changedTouches: TouchList;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        metaKey: boolean;
+        shiftKey: boolean;
+        targetTouches: TouchList;
+        touches: TouchList;
+    }
+
+    interface UIEvent extends SyntheticEvent {
+        detail: number;
+        view: AbstractView;
+    }
+
+    interface WheelEvent extends SyntheticEvent {
+        deltaMode: number;
+        deltaX: number;
+        deltaY: number;
+        deltaZ: number;
+    }
+
+    //
+    // Event Handler Types
+    // ----------------------------------------------------------------------
+
+    interface EventHandler<E extends SyntheticEvent> {
+        (event: E): void;
+    }
+
+    interface DragEventHandler extends EventHandler<DragEvent> {}
+    interface ClipboardEventHandler extends EventHandler<ClipboardEvent> {}
+    interface KeyboardEventHandler extends EventHandler<KeyboardEvent> {}
+    interface FocusEventHandler extends EventHandler<FocusEvent> {}
+    interface FormEventHandler extends EventHandler<FormEvent> {}
+    interface MouseEventHandler extends EventHandler<MouseEvent> {}
+    interface TouchEventHandler extends EventHandler<TouchEvent> {}
+    interface UIEventHandler extends EventHandler<UIEvent> {}
+    interface WheelEventHandler extends EventHandler<WheelEvent> {}
+
+    //
+    // Props / DOM Attributes
+    // ----------------------------------------------------------------------
+
+    interface Props<T> {
+        children?: ReactNode;
+        key?: string | number;
+        ref?: string | ((component: T) => any);
+    }
+
+    interface DOMAttributesBase<T> extends Props<T> {
+        onCopy?: ClipboardEventHandler;
+        onCut?: ClipboardEventHandler;
+        onPaste?: ClipboardEventHandler;
+        onKeyDown?: KeyboardEventHandler;
+        onKeyPress?: KeyboardEventHandler;
+        onKeyUp?: KeyboardEventHandler;
+        onFocus?: FocusEventHandler;
+        onBlur?: FocusEventHandler;
+        onChange?: FormEventHandler;
+        onInput?: FormEventHandler;
+        onSubmit?: FormEventHandler;
+        onClick?: MouseEventHandler;
+        onDoubleClick?: MouseEventHandler;
+        onDrag?: DragEventHandler;
+        onDragEnd?: DragEventHandler;
+        onDragEnter?: DragEventHandler;
+        onDragExit?: DragEventHandler;
+        onDragLeave?: DragEventHandler;
+        onDragOver?: DragEventHandler;
+        onDragStart?: DragEventHandler;
+        onDrop?: DragEventHandler;
+        onMouseDown?: MouseEventHandler;
+        onMouseEnter?: MouseEventHandler;
+        onMouseLeave?: MouseEventHandler;
+        onMouseMove?: MouseEventHandler;
+        onMouseOut?: MouseEventHandler;
+        onMouseOver?: MouseEventHandler;
+        onMouseUp?: MouseEventHandler;
+        onTouchCancel?: TouchEventHandler;
+        onTouchEnd?: TouchEventHandler;
+        onTouchMove?: TouchEventHandler;
+        onTouchStart?: TouchEventHandler;
+        onScroll?: UIEventHandler;
+        onWheel?: WheelEventHandler;
+
+        className?: string;
+        id?: string;
+
+        dangerouslySetInnerHTML?: {
+            __html: string;
+        };
+    }
+
+    interface DOMAttributes extends DOMAttributesBase<DOMComponent<any>> {
+    }
+
+    // This interface is not complete. Only properties accepting
+    // unitless numbers are listed here (see CSSProperty.js in React)
+    interface CSSProperties {
+        boxFlex?: number;
+        boxFlexGroup?: number;
+        columnCount?: number;
+        flex?: number | string;
+        flexGrow?: number;
+        flexShrink?: number;
+        fontWeight?: number | string;
+        lineClamp?: number;
+        lineHeight?: number | string;
+        opacity?: number;
+        order?: number;
+        orphans?: number;
+        widows?: number;
+        zIndex?: number;
+        zoom?: number;
+
+        fontSize?: number | string;
+
+        // SVG-related properties
+        fillOpacity?: number;
+        strokeOpacity?: number;
+        strokeWidth?: number;
+
+        [propertyName: string]: any;
+    }
+
+    interface HTMLAttributesBase<T> extends DOMAttributesBase<T> {
+        accept?: string;
+        acceptCharset?: string;
+        accessKey?: string;
+        action?: string;
+        allowFullScreen?: boolean;
+        allowTransparency?: boolean;
+        alt?: string;
+        async?: boolean;
+        autoComplete?: boolean;
+        autoFocus?: boolean;
+        autoPlay?: boolean;
+        cellPadding?: number | string;
+        cellSpacing?: number | string;
+        charSet?: string;
+        checked?: boolean;
+        classID?: string;
+        cols?: number;
+        colSpan?: number;
+        content?: string;
+        contentEditable?: boolean;
+        contextMenu?: string;
+        controls?: any;
+        coords?: string;
+        crossOrigin?: string;
+        data?: string;
+        dateTime?: string;
+        defaultChecked?: boolean;
+        defaultValue?: string;
+        defer?: boolean;
+        dir?: string;
+        disabled?: boolean;
+        download?: any;
+        draggable?: boolean;
+        encType?: string;
+        form?: string;
+        formAction?: string;
+        formEncType?: string;
+        formMethod?: string;
+        formNoValidate?: boolean;
+        formTarget?: string;
+        frameBorder?: number | string;
+        headers?: string;
+        height?: number | string;
+        hidden?: boolean;
+        high?: number;
+        href?: string;
+        hrefLang?: string;
+        htmlFor?: string;
+        httpEquiv?: string;
+        icon?: string;
+        label?: string;
+        lang?: string;
+        list?: string;
+        loop?: boolean;
+        low?: number;
+        manifest?: string;
+        marginHeight?: number;
+        marginWidth?: number;
+        max?: number | string;
+        maxLength?: number;
+        media?: string;
+        mediaGroup?: string;
+        method?: string;
+        min?: number | string;
+        multiple?: boolean;
+        muted?: boolean;
+        name?: string;
+        noValidate?: boolean;
+        open?: boolean;
+        optimum?: number;
+        pattern?: string;
+        placeholder?: string;
+        poster?: string;
+        preload?: string;
+        radioGroup?: string;
+        readOnly?: boolean;
+        rel?: string;
+        required?: boolean;
+        role?: string;
+        rows?: number;
+        rowSpan?: number;
+        sandbox?: string;
+        scope?: string;
+        scoped?: boolean;
+        scrolling?: string;
+        seamless?: boolean;
+        selected?: boolean;
+        shape?: string;
+        size?: number;
+        sizes?: string;
+        span?: number;
+        spellCheck?: boolean;
+        src?: string;
+        srcDoc?: string;
+        srcSet?: string;
+        start?: number;
+        step?: number | string;
+        style?: CSSProperties;
+        tabIndex?: number;
+        target?: string;
+        title?: string;
+        type?: string;
+        useMap?: string;
+        value?: string;
+        width?: number | string;
+        wmode?: string;
+
+        // Non-standard Attributes
+        autoCapitalize?: boolean;
+        autoCorrect?: boolean;
+        property?: string;
+        itemProp?: string;
+        itemScope?: boolean;
+        itemType?: string;
+        unselectable?: boolean;
+    }
+
+    interface HTMLAttributes extends HTMLAttributesBase<HTMLComponent> {
+    }
+
+    interface SVGElementAttributes extends HTMLAttributes {
+        viewBox?: string;
+        preserveAspectRatio?: string;
+    }
+
+    interface SVGAttributes extends DOMAttributes {
+        ref?: string | ((component: SVGComponent) => void);
+
+        cx?: number | string;
+        cy?: number | string;
+        d?: string;
+        dx?: number | string;
+        dy?: number | string;
+        fill?: string;
+        fillOpacity?: number | string;
+        fontFamily?: string;
+        fontSize?: number | string;
+        fx?: number | string;
+        fy?: number | string;
+        gradientTransform?: string;
+        gradientUnits?: string;
+        height?: number | string;
+        markerEnd?: string;
+        markerMid?: string;
+        markerStart?: string;
+        offset?: number | string;
+        opacity?: number | string;
+        patternContentUnits?: string;
+        patternUnits?: string;
+        points?: string;
+        preserveAspectRatio?: string;
+        r?: number | string;
+        rx?: number | string;
+        ry?: number | string;
+        spreadMethod?: string;
+        stopColor?: string;
+        stopOpacity?: number | string;
+        stroke?: string;
+        strokeDasharray?: string;
+        strokeLinecap?: string;
+        strokeMiterlimit?: string;
+        strokeOpacity?: number | string;
+        strokeWidth?: number | string;
+        textAnchor?: string;
+        transform?: string;
+        version?: string;
+        viewBox?: string;
+        width?: number | string;
+        x1?: number | string;
+        x2?: number | string;
+        x?: number | string;
+        y1?: number | string;
+        y2?: number | string;
+        y?: number | string;
+    }
+
+    //
+    // React.DOM
+    // ----------------------------------------------------------------------
+
+    interface ReactDOM {
+        // HTML
+        a: HTMLFactory;
+        abbr: HTMLFactory;
+        address: HTMLFactory;
+        area: HTMLFactory;
+        article: HTMLFactory;
+        aside: HTMLFactory;
+        audio: HTMLFactory;
+        b: HTMLFactory;
+        base: HTMLFactory;
+        bdi: HTMLFactory;
+        bdo: HTMLFactory;
+        big: HTMLFactory;
+        blockquote: HTMLFactory;
+        body: HTMLFactory;
+        br: HTMLFactory;
+        button: HTMLFactory;
+        canvas: HTMLFactory;
+        caption: HTMLFactory;
+        cite: HTMLFactory;
+        code: HTMLFactory;
+        col: HTMLFactory;
+        colgroup: HTMLFactory;
+        data: HTMLFactory;
+        datalist: HTMLFactory;
+        dd: HTMLFactory;
+        del: HTMLFactory;
+        details: HTMLFactory;
+        dfn: HTMLFactory;
+        dialog: HTMLFactory;
+        div: HTMLFactory;
+        dl: HTMLFactory;
+        dt: HTMLFactory;
+        em: HTMLFactory;
+        embed: HTMLFactory;
+        fieldset: HTMLFactory;
+        figcaption: HTMLFactory;
+        figure: HTMLFactory;
+        footer: HTMLFactory;
+        form: HTMLFactory;
+        h1: HTMLFactory;
+        h2: HTMLFactory;
+        h3: HTMLFactory;
+        h4: HTMLFactory;
+        h5: HTMLFactory;
+        h6: HTMLFactory;
+        head: HTMLFactory;
+        header: HTMLFactory;
+        hr: HTMLFactory;
+        html: HTMLFactory;
+        i: HTMLFactory;
+        iframe: HTMLFactory;
+        img: HTMLFactory;
+        input: HTMLFactory;
+        ins: HTMLFactory;
+        kbd: HTMLFactory;
+        keygen: HTMLFactory;
+        label: HTMLFactory;
+        legend: HTMLFactory;
+        li: HTMLFactory;
+        link: HTMLFactory;
+        main: HTMLFactory;
+        map: HTMLFactory;
+        mark: HTMLFactory;
+        menu: HTMLFactory;
+        menuitem: HTMLFactory;
+        meta: HTMLFactory;
+        meter: HTMLFactory;
+        nav: HTMLFactory;
+        noscript: HTMLFactory;
+        object: HTMLFactory;
+        ol: HTMLFactory;
+        optgroup: HTMLFactory;
+        option: HTMLFactory;
+        output: HTMLFactory;
+        p: HTMLFactory;
+        param: HTMLFactory;
+        picture: HTMLFactory;
+        pre: HTMLFactory;
+        progress: HTMLFactory;
+        q: HTMLFactory;
+        rp: HTMLFactory;
+        rt: HTMLFactory;
+        ruby: HTMLFactory;
+        s: HTMLFactory;
+        samp: HTMLFactory;
+        script: HTMLFactory;
+        section: HTMLFactory;
+        select: HTMLFactory;
+        small: HTMLFactory;
+        source: HTMLFactory;
+        span: HTMLFactory;
+        strong: HTMLFactory;
+        style: HTMLFactory;
+        sub: HTMLFactory;
+        summary: HTMLFactory;
+        sup: HTMLFactory;
+        table: HTMLFactory;
+        tbody: HTMLFactory;
+        td: HTMLFactory;
+        textarea: HTMLFactory;
+        tfoot: HTMLFactory;
+        th: HTMLFactory;
+        thead: HTMLFactory;
+        time: HTMLFactory;
+        title: HTMLFactory;
+        tr: HTMLFactory;
+        track: HTMLFactory;
+        u: HTMLFactory;
+        ul: HTMLFactory;
+        "var": HTMLFactory;
+        video: HTMLFactory;
+        wbr: HTMLFactory;
+
+        // SVG
+        svg: SVGElementFactory;
+        circle: SVGFactory;
+        defs: SVGFactory;
+        ellipse: SVGFactory;
+        g: SVGFactory;
+        line: SVGFactory;
+        linearGradient: SVGFactory;
+        mask: SVGFactory;
+        path: SVGFactory;
+        pattern: SVGFactory;
+        polygon: SVGFactory;
+        polyline: SVGFactory;
+        radialGradient: SVGFactory;
+        rect: SVGFactory;
+        stop: SVGFactory;
+        text: SVGFactory;
+        tspan: SVGFactory;
+    }
+
+    //
+    // React.PropTypes
+    // ----------------------------------------------------------------------
+
+    interface Validator<T> {
+        (object: T, key: string, componentName: string): Error;
+    }
+
+    interface Requireable<T> extends Validator<T> {
+        isRequired: Validator<T>;
+    }
+
+    interface ValidationMap<T> {
+        [key: string]: Validator<T>;
+    }
+
+    interface ReactPropTypes {
+        any: Requireable<any>;
+        array: Requireable<any>;
+        bool: Requireable<any>;
+        func: Requireable<any>;
+        number: Requireable<any>;
+        object: Requireable<any>;
+        string: Requireable<any>;
+        node: Requireable<any>;
+        element: Requireable<any>;
+        instanceOf(expectedClass: {}): Requireable<any>;
+        oneOf(types: any[]): Requireable<any>;
+        oneOfType(types: Validator<any>[]): Requireable<any>;
+        arrayOf(type: Validator<any>): Requireable<any>;
+        objectOf(type: Validator<any>): Requireable<any>;
+        shape(type: ValidationMap<any>): Requireable<any>;
+    }
+
+    //
+    // React.Children
+    // ----------------------------------------------------------------------
+
+    interface ReactChildren {
+        map<T>(children: ReactNode, fn: (child: ReactChild, index: number) => T): { [key:string]: T };
+        forEach(children: ReactNode, fn: (child: ReactChild, index: number) => any): void;
+        count(children: ReactNode): number;
+        only(children: ReactNode): ReactChild;
+    }
+
+    //
+    // Browser Interfaces
+    // https://github.com/nikeee/2048-typescript/blob/master/2048/js/touch.d.ts
+    // ----------------------------------------------------------------------
+
+    interface AbstractView {
+        styleMedia: StyleMedia;
+        document: Document;
+    }
+
+    interface Touch {
+        identifier: number;
+        target: EventTarget;
+        screenX: number;
+        screenY: number;
+        clientX: number;
+        clientY: number;
+        pageX: number;
+        pageY: number;
+    }
+
+    interface TouchList {
+        [index: number]: Touch;
+        length: number;
+        item(index: number): Touch;
+        identifiedTouch(identifier: number): Touch;
+    }
+
+    //
+    // React.addons
+    // ----------------------------------------------------------------------
+
+    export module addons {
+        export var CSSTransitionGroup: CSSTransitionGroup;
+        export var TransitionGroup: TransitionGroup;
+
+        export var LinkedStateMixin: LinkedStateMixin;
+        export var PureRenderMixin: PureRenderMixin;
+
+        export function batchedUpdates<A, B>(
+            callback: (a: A, b: B) => any, a: A, b: B): void;
+        export function batchedUpdates<A>(callback: (a: A) => any, a: A): void;
+        export function batchedUpdates(callback: () => any): void;
+
+        // deprecated: use petehunt/react-classset or JedWatson/classnames
+        export function classSet(cx: { [key: string]: boolean }): string;
+        export function classSet(...classList: string[]): string;
+
+        export function cloneWithProps<P>(
+            element: DOMElement<P>, props: P): DOMElement<P>;
+        export function cloneWithProps<P>(
+            element: ClassicElement<P>, props: P): ClassicElement<P>;
+        export function cloneWithProps<P>(
+            element: ReactElement<P>, props: P): ReactElement<P>;
+
+        export function createFragment(
+            object: { [key: string]: ReactNode }): ReactFragment;
+
+        export function update(value: any[], spec: UpdateArraySpec): any[];
+        export function update(value: {}, spec: UpdateSpec): any;
+
+        // Development tools
+        export import Perf = ReactPerf;
+        export import TestUtils = ReactTestUtils;
+    }
+
+    //
+    // React.addons (Transitions)
+    // ----------------------------------------------------------------------
+
+    interface TransitionGroupProps {
+        component?: ReactType;
+        childFactory?: (child: ReactElement<any>) => ReactElement<any>;
+    }
+
+    interface CSSTransitionGroupProps extends TransitionGroupProps {
+        transitionName: string;
+        transitionAppear?: boolean;
+        transitionEnter?: boolean;
+        transitionLeave?: boolean;
+    }
+
+    type CSSTransitionGroup = ComponentClass<CSSTransitionGroupProps>;
+    type TransitionGroup = ComponentClass<TransitionGroupProps>;
+
+    //
+    // React.addons (Mixins)
+    // ----------------------------------------------------------------------
+
+    interface ReactLink<T> {
+        value: T;
+        requestChange(newValue: T): void;
+    }
+
+    interface LinkedStateMixin extends Mixin<any, any> {
+        linkState<T>(key: string): ReactLink<T>;
+    }
+
+    interface PureRenderMixin extends Mixin<any, any> {
+    }
+
+    //
+    // Reat.addons.update
+    // ----------------------------------------------------------------------
+
+    interface UpdateSpecCommand {
+        $set?: any;
+        $merge?: {};
+        $apply?(value: any): any;
+    }
+
+    interface UpdateSpecPath {
+        [key: string]: UpdateSpec;
+    }
+
+    type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
+
+    interface UpdateArraySpec extends UpdateSpecCommand {
+        $push?: any[];
+        $unshift?: any[];
+        $splice?: any[][];
+    }
+
+    //
+    // React.addons.Perf
+    // ----------------------------------------------------------------------
+
+    interface ComponentPerfContext {
+        current: string;
+        owner: string;
+    }
+
+    interface NumericPerfContext {
+        [key: string]: number;
+    }
+
+    interface Measurements {
+        exclusive: NumericPerfContext;
+        inclusive: NumericPerfContext;
+        render: NumericPerfContext;
+        counts: NumericPerfContext;
+        writes: NumericPerfContext;
+        displayNames: {
+            [key: string]: ComponentPerfContext;
+        };
+        totalTime: number;
+    }
+
+    module ReactPerf {
+        export function start(): void;
+        export function stop(): void;
+        export function printInclusive(measurements: Measurements[]): void;
+        export function printExclusive(measurements: Measurements[]): void;
+        export function printWasted(measurements: Measurements[]): void;
+        export function printDOM(measurements: Measurements[]): void;
+        export function getLastMeasurements(): Measurements[];
+    }
+
+    //
+    // React.addons.TestUtils
+    // ----------------------------------------------------------------------
+
+    interface MockedComponentClass {
+        new(): any;
+    }
+
+    module ReactTestUtils {
+        export import Simulate = ReactSimulate;
+
+        export function renderIntoDocument<P>(
+            element: ReactElement<P>): Component<P, any>;
+        export function renderIntoDocument<C extends Component<any, any>>(
+            element: ReactElement<any>): C;
+
+        export function mockComponent(
+            mocked: MockedComponentClass, mockTagName?: string): typeof ReactTestUtils;
+
+        export function isElementOfType(
+            element: ReactElement<any>, type: ReactType): boolean;
+        export function isTextComponent(instance: Component<any, any>): boolean;
+        export function isDOMComponent(instance: Component<any, any>): boolean;
+        export function isCompositeComponent(instance: Component<any, any>): boolean;
+        export function isCompositeComponentWithType(
+            instance: Component<any, any>,
+            type: ComponentClass<any>): boolean;
+
+        export function findAllInRenderedTree(
+            tree: Component<any, any>,
+            fn: (i: Component<any, any>) => boolean): Component<any, any>;
+
+        export function scryRenderedDOMComponentsWithClass(
+            tree: Component<any, any>,
+            className: string): DOMComponent<any>[];
+        export function findRenderedDOMComponentWithClass(
+            tree: Component<any, any>,
+            className: string): DOMComponent<any>;
+
+        export function scryRenderedDOMComponentsWithTag(
+            tree: Component<any, any>,
+            tagName: string): DOMComponent<any>[];
+        export function findRenderedDOMComponentWithTag(
+            tree: Component<any, any>,
+            tagName: string): DOMComponent<any>;
+
+        export function scryRenderedComponentsWithType<P>(
+            tree: Component<any, any>,
+            type: ComponentClass<P>): Component<P, {}>[];
+        export function scryRenderedComponentsWithType<C extends Component<any, any>>(
+            tree: Component<any, any>,
+            type: ComponentClass<any>): C[];
+
+        export function findRenderedComponentWithType<P>(
+            tree: Component<any, any>,
+            type: ComponentClass<P>): Component<P, {}>;
+        export function findRenderedComponentWithType<C extends Component<any, any>>(
+            tree: Component<any, any>,
+            type: ComponentClass<any>): C;
+
+        export function createRenderer(): ShallowRenderer;
+    }
+
+    interface SyntheticEventData {
+        altKey?: boolean;
+        button?: number;
+        buttons?: number;
+        clientX?: number;
+        clientY?: number;
+        changedTouches?: TouchList;
+        charCode?: boolean;
+        clipboardData?: DataTransfer;
+        ctrlKey?: boolean;
+        deltaMode?: number;
+        deltaX?: number;
+        deltaY?: number;
+        deltaZ?: number;
+        detail?: number;
+        getModifierState?(key: string): boolean;
+        key?: string;
+        keyCode?: number;
+        locale?: string;
+        location?: number;
+        metaKey?: boolean;
+        pageX?: number;
+        pageY?: number;
+        relatedTarget?: EventTarget;
+        repeat?: boolean;
+        screenX?: number;
+        screenY?: number;
+        shiftKey?: boolean;
+        targetTouches?: TouchList;
+        touches?: TouchList;
+        view?: AbstractView;
+        which?: number;
+    }
+
+    interface EventSimulator {
+        (element: Element, eventData?: SyntheticEventData): void;
+        (component: Component<any, any>, eventData?: SyntheticEventData): void;
+    }
+
+    module ReactSimulate {
+        export var blur: EventSimulator;
+        export var change: EventSimulator;
+        export var click: EventSimulator;
+        export var cut: EventSimulator;
+        export var doubleClick: EventSimulator;
+        export var drag: EventSimulator;
+        export var dragEnd: EventSimulator;
+        export var dragEnter: EventSimulator;
+        export var dragExit: EventSimulator;
+        export var dragLeave: EventSimulator;
+        export var dragOver: EventSimulator;
+        export var dragStart: EventSimulator;
+        export var drop: EventSimulator;
+        export var focus: EventSimulator;
+        export var input: EventSimulator;
+        export var keyDown: EventSimulator;
+        export var keyPress: EventSimulator;
+        export var keyUp: EventSimulator;
+        export var mouseDown: EventSimulator;
+        export var mouseEnter: EventSimulator;
+        export var mouseLeave: EventSimulator;
+        export var mouseMove: EventSimulator;
+        export var mouseOut: EventSimulator;
+        export var mouseOver: EventSimulator;
+        export var mouseUp: EventSimulator;
+        export var paste: EventSimulator;
+        export var scroll: EventSimulator;
+        export var submit: EventSimulator;
+        export var touchCancel: EventSimulator;
+        export var touchEnd: EventSimulator;
+        export var touchMove: EventSimulator;
+        export var touchStart: EventSimulator;
+        export var wheel: EventSimulator;
+    }
+
+    class ShallowRenderer {
+        getRenderOutput<E extends ReactElement<any>>(): E;
+        getRenderOutput(): ReactElement<any>;
+        render(element: ReactElement<any>, context?: any): void;
+        unmount(): void;
+    }
+}
+
+declare namespace JSX {
+    import React = __React;
+
+    interface Element extends React.ReactElement<any> { }
+    interface ElementClass extends React.Component<any, any> {
+        render(): JSX.Element;
+    }
+    interface ElementAttributesProperty { props: {}; }
+
+    interface IntrinsicElements {
+        // HTML
+        a: React.HTMLAttributes;
+        abbr: React.HTMLAttributes;
+        address: React.HTMLAttributes;
+        area: React.HTMLAttributes;
+        article: React.HTMLAttributes;
+        aside: React.HTMLAttributes;
+        audio: React.HTMLAttributes;
+        b: React.HTMLAttributes;
+        base: React.HTMLAttributes;
+        bdi: React.HTMLAttributes;
+        bdo: React.HTMLAttributes;
+        big: React.HTMLAttributes;
+        blockquote: React.HTMLAttributes;
+        body: React.HTMLAttributes;
+        br: React.HTMLAttributes;
+        button: React.HTMLAttributes;
+        canvas: React.HTMLAttributes;
+        caption: React.HTMLAttributes;
+        cite: React.HTMLAttributes;
+        code: React.HTMLAttributes;
+        col: React.HTMLAttributes;
+        colgroup: React.HTMLAttributes;
+        data: React.HTMLAttributes;
+        datalist: React.HTMLAttributes;
+        dd: React.HTMLAttributes;
+        del: React.HTMLAttributes;
+        details: React.HTMLAttributes;
+        dfn: React.HTMLAttributes;
+        dialog: React.HTMLAttributes;
+        div: React.HTMLAttributes;
+        dl: React.HTMLAttributes;
+        dt: React.HTMLAttributes;
+        em: React.HTMLAttributes;
+        embed: React.HTMLAttributes;
+        fieldset: React.HTMLAttributes;
+        figcaption: React.HTMLAttributes;
+        figure: React.HTMLAttributes;
+        footer: React.HTMLAttributes;
+        form: React.HTMLAttributes;
+        h1: React.HTMLAttributes;
+        h2: React.HTMLAttributes;
+        h3: React.HTMLAttributes;
+        h4: React.HTMLAttributes;
+        h5: React.HTMLAttributes;
+        h6: React.HTMLAttributes;
+        head: React.HTMLAttributes;
+        header: React.HTMLAttributes;
+        hr: React.HTMLAttributes;
+        html: React.HTMLAttributes;
+        i: React.HTMLAttributes;
+        iframe: React.HTMLAttributes;
+        img: React.HTMLAttributes;
+        input: React.HTMLAttributes;
+        ins: React.HTMLAttributes;
+        kbd: React.HTMLAttributes;
+        keygen: React.HTMLAttributes;
+        label: React.HTMLAttributes;
+        legend: React.HTMLAttributes;
+        li: React.HTMLAttributes;
+        link: React.HTMLAttributes;
+        main: React.HTMLAttributes;
+        map: React.HTMLAttributes;
+        mark: React.HTMLAttributes;
+        menu: React.HTMLAttributes;
+        menuitem: React.HTMLAttributes;
+        meta: React.HTMLAttributes;
+        meter: React.HTMLAttributes;
+        nav: React.HTMLAttributes;
+        noscript: React.HTMLAttributes;
+        object: React.HTMLAttributes;
+        ol: React.HTMLAttributes;
+        optgroup: React.HTMLAttributes;
+        option: React.HTMLAttributes;
+        output: React.HTMLAttributes;
+        p: React.HTMLAttributes;
+        param: React.HTMLAttributes;
+        picture: React.HTMLAttributes;
+        pre: React.HTMLAttributes;
+        progress: React.HTMLAttributes;
+        q: React.HTMLAttributes;
+        rp: React.HTMLAttributes;
+        rt: React.HTMLAttributes;
+        ruby: React.HTMLAttributes;
+        s: React.HTMLAttributes;
+        samp: React.HTMLAttributes;
+        script: React.HTMLAttributes;
+        section: React.HTMLAttributes;
+        select: React.HTMLAttributes;
+        small: React.HTMLAttributes;
+        source: React.HTMLAttributes;
+        span: React.HTMLAttributes;
+        strong: React.HTMLAttributes;
+        style: React.HTMLAttributes;
+        sub: React.HTMLAttributes;
+        summary: React.HTMLAttributes;
+        sup: React.HTMLAttributes;
+        table: React.HTMLAttributes;
+        tbody: React.HTMLAttributes;
+        td: React.HTMLAttributes;
+        textarea: React.HTMLAttributes;
+        tfoot: React.HTMLAttributes;
+        th: React.HTMLAttributes;
+        thead: React.HTMLAttributes;
+        time: React.HTMLAttributes;
+        title: React.HTMLAttributes;
+        tr: React.HTMLAttributes;
+        track: React.HTMLAttributes;
+        u: React.HTMLAttributes;
+        ul: React.HTMLAttributes;
+        "var": React.HTMLAttributes;
+        video: React.HTMLAttributes;
+        wbr: React.HTMLAttributes;
+
+        // SVG
+        svg: React.SVGElementAttributes;
+
+        circle: React.SVGAttributes;
+        defs: React.SVGAttributes;
+        ellipse: React.SVGAttributes;
+        g: React.SVGAttributes;
+        line: React.SVGAttributes;
+        linearGradient: React.SVGAttributes;
+        mask: React.SVGAttributes;
+        path: React.SVGAttributes;
+        pattern: React.SVGAttributes;
+        polygon: React.SVGAttributes;
+        polyline: React.SVGAttributes;
+        radialGradient: React.SVGAttributes;
+        rect: React.SVGAttributes;
+        stop: React.SVGAttributes;
+        text: React.SVGAttributes;
+        tspan: React.SVGAttributes;
+    }
+}
diff --git a/react/react-addons-create-fragment.d.ts b/react/react-addons-create-fragment.d.ts
new file mode 100644
index 000000000..b2332eae1
--- /dev/null
+++ b/react/react-addons-create-fragment.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for React v0.14 (react-addons-create-fragment)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="react.d.ts" />
+
+declare namespace __React {
+    namespace __Addons {
+        export function createFragment(object: { [key: string]: ReactNode }): ReactFragment;
+    }
+}
+
+declare module "react-addons-create-fragment" {
+    export = __React.__Addons.createFragment;
+}
diff --git a/react/react-addons-css-transition-group.d.ts b/react/react-addons-css-transition-group.d.ts
new file mode 100644
index 000000000..f55335ccb
--- /dev/null
+++ b/react/react-addons-css-transition-group.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for React v0.14 (react-addons-css-transition-group)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="react.d.ts" />
+/// <reference path="react-addons-transition-group.d.ts" />
+
+declare namespace __React {
+    interface CSSTransitionGroupTransitionName {
+        enter: string;
+        enterActive?: string;
+        leave: string;
+        leaveActive?: string;
+        appear?: string;
+        appearActive?: string;
+    }
+
+    interface CSSTransitionGroupProps extends TransitionGroupProps {
+        transitionName: string | CSSTransitionGroupTransitionName;
+        transitionAppear?: boolean;
+        transitionAppearTimeout?: number;
+        transitionEnter?: boolean;
+        transitionEnterTimeout?: number;
+        transitionLeave?: boolean;
+        transitionLeaveTimeout?: number;
+    }
+
+    type CSSTransitionGroup = ComponentClass<CSSTransitionGroupProps>;
+
+    namespace __Addons {
+        export var CSSTransitionGroup: __React.CSSTransitionGroup;
+    }
+}
+
+declare module "react-addons-css-transition-group" {
+    var CSSTransitionGroup: __React.CSSTransitionGroup;
+    type CSSTransitionGroup = __React.CSSTransitionGroup;
+    export = CSSTransitionGroup;
+}
diff --git a/react/react-addons-linked-state-mixin.d.ts b/react/react-addons-linked-state-mixin.d.ts
new file mode 100644
index 000000000..52fd17930
--- /dev/null
+++ b/react/react-addons-linked-state-mixin.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for React v0.14 (react-addons-linked-state-mixin)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="react.d.ts" />
+
+declare namespace __React {
+    interface ReactLink<T> {
+        value: T;
+        requestChange(newValue: T): void;
+    }
+
+    interface LinkedStateMixin extends Mixin<any, any> {
+        linkState<T>(key: string): ReactLink<T>;
+    }
+
+    interface HTMLAttributes {
+        checkedLink?: ReactLink<boolean>;
+        valueLink?: ReactLink<boolean | string | number>;
+    }
+
+    namespace __Addons {
+        export var LinkedStateMixin: LinkedStateMixin;
+    }
+}
+
+declare module "react-addons-linked-state-mixin" {
+    var LinkedStateMixin: __React.LinkedStateMixin;
+    type LinkedStateMixin = __React.LinkedStateMixin;
+    export = LinkedStateMixin;
+}
diff --git a/react/react-addons-perf.d.ts b/react/react-addons-perf.d.ts
new file mode 100644
index 000000000..20416a060
--- /dev/null
+++ b/react/react-addons-perf.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for React v0.14 (react-addons-perf)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="react.d.ts" />
+
+declare namespace __React {
+    interface ComponentPerfContext {
+        current: string;
+        owner: string;
+    }
+
+    interface NumericPerfContext {
+        [key: string]: number;
+    }
+
+    interface Measurements {
+        exclusive: NumericPerfContext;
+        inclusive: NumericPerfContext;
+        render: NumericPerfContext;
+        counts: NumericPerfContext;
+        writes: NumericPerfContext;
+        displayNames: {
+            [key: string]: ComponentPerfContext;
+        };
+        totalTime: number;
+    }
+
+    namespace __Addons {
+        namespace Perf {
+            export function start(): void;
+            export function stop(): void;
+            export function printInclusive(measurements: Measurements[]): void;
+            export function printExclusive(measurements: Measurements[]): void;
+            export function printWasted(measurements: Measurements[]): void;
+            export function printDOM(measurements: Measurements[]): void;
+            export function getLastMeasurements(): Measurements[];
+        }
+    }
+}
+
+declare module "react-addons-perf" {
+    import Perf = __React.__Addons.Perf;
+    export = Perf;
+}
diff --git a/react/react-addons-pure-render-mixin.d.ts b/react/react-addons-pure-render-mixin.d.ts
new file mode 100644
index 000000000..3c154e6b5
--- /dev/null
+++ b/react/react-addons-pure-render-mixin.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for React v0.14 (react-addons-pure-render-mixin)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="react.d.ts" />
+
+declare namespace __React {
+    interface PureRenderMixin extends Mixin<any, any> {}
+
+    namespace __Addons {
+        export var PureRenderMixin: PureRenderMixin;
+    }
+}
+
+declare module "react-addons-pure-render-mixin" {
+    var PureRenderMixin: __React.PureRenderMixin;
+    type PureRenderMixin = __React.PureRenderMixin;
+    export = PureRenderMixin;
+}
diff --git a/react/react-addons-shallow-compare.d.ts b/react/react-addons-shallow-compare.d.ts
new file mode 100644
index 000000000..2b5a4dba2
--- /dev/null
+++ b/react/react-addons-shallow-compare.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for React v0.14 (react-addons-css-transition-group)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="react.d.ts" />
+
+declare namespace __React {
+    namespace __Addons {
+        export function shallowCompare<P, S>(
+            component: __React.Component<P, S>,
+            nextProps: P,
+            nextState: S): boolean;
+    }
+}
+
+declare module "react-addons-shallow-compare" {
+    export = __React.__Addons.shallowCompare;
+}
diff --git a/react/react-addons-test-utils.d.ts b/react/react-addons-test-utils.d.ts
new file mode 100644
index 000000000..3b77ac4c5
--- /dev/null
+++ b/react/react-addons-test-utils.d.ts
@@ -0,0 +1,155 @@
+// Type definitions for React v0.14 (react-addons-test-utils)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="react.d.ts" />
+
+declare namespace __React {
+    interface SyntheticEventData {
+        altKey?: boolean;
+        button?: number;
+        buttons?: number;
+        clientX?: number;
+        clientY?: number;
+        changedTouches?: TouchList;
+        charCode?: boolean;
+        clipboardData?: DataTransfer;
+        ctrlKey?: boolean;
+        deltaMode?: number;
+        deltaX?: number;
+        deltaY?: number;
+        deltaZ?: number;
+        detail?: number;
+        getModifierState?(key: string): boolean;
+        key?: string;
+        keyCode?: number;
+        locale?: string;
+        location?: number;
+        metaKey?: boolean;
+        pageX?: number;
+        pageY?: number;
+        relatedTarget?: EventTarget;
+        repeat?: boolean;
+        screenX?: number;
+        screenY?: number;
+        shiftKey?: boolean;
+        targetTouches?: TouchList;
+        touches?: TouchList;
+        view?: AbstractView;
+        which?: number;
+    }
+
+    interface EventSimulator {
+        (element: Element, eventData?: SyntheticEventData): void;
+        (component: Component<any, any>, eventData?: SyntheticEventData): void;
+    }
+
+    interface MockedComponentClass {
+        new(): any;
+    }
+
+    class ShallowRenderer {
+        getRenderOutput<E extends ReactElement<any>>(): E;
+        getRenderOutput(): ReactElement<any>;
+        render(element: ReactElement<any>, context?: any): void;
+        unmount(): void;
+    }
+
+    namespace __Addons {
+        namespace TestUtils {
+            namespace Simulate {
+                export var blur: EventSimulator;
+                export var change: EventSimulator;
+                export var click: EventSimulator;
+                export var cut: EventSimulator;
+                export var doubleClick: EventSimulator;
+                export var drag: EventSimulator;
+                export var dragEnd: EventSimulator;
+                export var dragEnter: EventSimulator;
+                export var dragExit: EventSimulator;
+                export var dragLeave: EventSimulator;
+                export var dragOver: EventSimulator;
+                export var dragStart: EventSimulator;
+                export var drop: EventSimulator;
+                export var focus: EventSimulator;
+                export var input: EventSimulator;
+                export var keyDown: EventSimulator;
+                export var keyPress: EventSimulator;
+                export var keyUp: EventSimulator;
+                export var mouseDown: EventSimulator;
+                export var mouseEnter: EventSimulator;
+                export var mouseLeave: EventSimulator;
+                export var mouseMove: EventSimulator;
+                export var mouseOut: EventSimulator;
+                export var mouseOver: EventSimulator;
+                export var mouseUp: EventSimulator;
+                export var paste: EventSimulator;
+                export var scroll: EventSimulator;
+                export var submit: EventSimulator;
+                export var touchCancel: EventSimulator;
+                export var touchEnd: EventSimulator;
+                export var touchMove: EventSimulator;
+                export var touchStart: EventSimulator;
+                export var wheel: EventSimulator;
+            }
+
+            export function renderIntoDocument(
+                element: DOMElement<any>): Element;
+            export function renderIntoDocument<P>(
+                element: ReactElement<P>): Component<P, any>;
+            export function renderIntoDocument<C extends Component<any, any>>(
+                element: ReactElement<any>): C;
+
+            export function mockComponent(
+                mocked: MockedComponentClass, mockTagName?: string): typeof TestUtils;
+
+            export function isElementOfType(
+                element: ReactElement<any>, type: ReactType): boolean;
+            export function isDOMComponent(instance: ReactInstance): boolean;
+            export function isCompositeComponent(instance: ReactInstance): boolean;
+            export function isCompositeComponentWithType(
+                instance: ReactInstance,
+                type: ComponentClass<any>): boolean;
+
+            export function findAllInRenderedTree(
+                root: Component<any, any>,
+                fn: (i: ReactInstance) => boolean): ReactInstance[];
+
+            export function scryRenderedDOMComponentsWithClass(
+                root: Component<any, any>,
+                className: string): Element[];
+            export function findRenderedDOMComponentWithClass(
+                root: Component<any, any>,
+                className: string): Element;
+
+            export function scryRenderedDOMComponentsWithTag(
+                root: Component<any, any>,
+                tagName: string): Element[];
+            export function findRenderedDOMComponentWithTag(
+                root: Component<any, any>,
+                tagName: string): Element;
+
+            export function scryRenderedComponentsWithType<P>(
+                root: Component<any, any>,
+                type: ComponentClass<P>): Component<P, {}>[];
+            export function scryRenderedComponentsWithType<C extends Component<any, any>>(
+                root: Component<any, any>,
+                type: ComponentClass<any>): C[];
+
+            export function findRenderedComponentWithType<P>(
+                root: Component<any, any>,
+                type: ComponentClass<P>): Component<P, {}>;
+            export function findRenderedComponentWithType<C extends Component<any, any>>(
+                root: Component<any, any>,
+                type: ComponentClass<any>): C;
+
+            export function createRenderer(): ShallowRenderer;
+        }
+    }
+}
+
+declare module "react-addons-test-utils" {
+    import TestUtils = __React.__Addons.TestUtils;
+    export = TestUtils;
+}
diff --git a/react/react-addons-tests.ts b/react/react-addons-tests.ts
deleted file mode 100644
index 668c7d7d2..000000000
--- a/react/react-addons-tests.ts
+++ /dev/null
@@ -1,2506 +0,0 @@
-// Type definitions for react-native 0.14
-// Project: https://github.com/facebook/react-native
-// Definitions by: Bruno Grieder <https://github.com/bgrieder>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// These definitions are meant to be used with the TSC compiler target set to ES6
-//
-// This work is based on an original work made by Bernd Paradies: https://github.com/bparadie
-//
-// WARNING: this work is very much beta:
-//            -it is still missing react-native definitions
-//            -it re-exports the whole of react 0.14 which may not be what react-native actually does
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/// <reference path="../react/react.d.ts" />
-
-import React = __React;
-
-declare namespace  ReactNative {
-
-
-    /**
-     * Represents the completion of an asynchronous operation
-     * @see lib.es6.d.ts
-     */
-    export 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 | Promise<TResult>, onrejected?: ( reason: any ) => TResult | Promise<TResult> ): 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 | Promise<T> ): Promise<T>;
-
-
-        // not in lib.es6.d.ts but called by react-native
-        done(): void;
-    }
-
-    export interface PromiseConstructor {
-        /**
-         * A reference to the prototype.
-         */
-        prototype: Promise<any>;
-
-        /**
-         * Creates a new Promise.
-         * @param init 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>( init: ( resolve: ( value?: T | Promise<T> ) => void, reject: ( reason?: any ) => void ) => void ): Promise<T>;
-
-        <T>( init: ( resolve: ( value?: T | Promise<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<T>( values: (T | Promise<T>)[] ): 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 values.
-         * @returns A new Promise.
-         */
-        all( values: Promise<void>[] ): Promise<void>;
-
-        /**
-         * 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: (T | Promise<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 | Promise<T> ): Promise<T>;
-
-        /**
-         * Creates a new resolved promise .
-         * @returns A resolved promise.
-         */
-        resolve(): Promise<void>;
-    }
-
-    // @see lib.es6.d.ts
-    export var Promise: PromiseConstructor;
-
-    // node_modules/react-tools/src/classic/class/ReactClass.js
-    export interface ReactClass<D, P, S> {
-        // TODO:
-    }
-
-    // see react-jsx.d.ts
-    export function createElement<P>( type: React.ReactType,
-                                      props?: P,
-                                      ...children: React.ReactNode[] ): React.ReactElement<P>;
-
-
-    export type Runnable = ( appParameters: any ) => void;
-
-    export type AppConfig = {
-        appKey: string;
-        component: ReactClass<any, any, any>;
-        run?: Runnable;
-    }
-
-    // https://github.com/facebook/react-native/blob/master/Libraries/AppRegistry/AppRegistry.js
-    export class AppRegistry {
-        static registerConfig( config: AppConfig[] ): void;
-
-        static registerComponent( appKey: string, getComponentFunc: () => React.ComponentClass<any> ): string;
-
-        static registerRunnable( appKey: string, func: Runnable ): string;
-
-        static runApplication( appKey: string, appParameters: any ): void;
-    }
-
-    /*
-     export interface ReactPropTypes extends React.ReactPropTypes
-     {
-
-     }
-
-     export interface PropTypes
-     {
-     [key:string]: React.Requireable<any>;
-     }
-     */
-
-    /**
-     * Flex Prop Types
-     * @see https://facebook.github.io/react-native/docs/flexbox.html#proptypes
-     * @see LayoutPropTypes.js
-     */
-    export interface FlexStyle {
-
-        alignItems?: string;  //enum('flex-start', 'flex-end', 'center', 'stretch')
-        alignSelf?: string// enum('auto', 'flex-start', 'flex-end', 'center', 'stretch')
-        borderBottomWidth?: number
-        borderLeftWidth?: number
-        borderRightWidth?: number
-        borderTopWidth?: number
-        borderWidth?: number
-        bottom?: number
-        flex?: number
-        flexDirection?: string // enum('row', 'column')
-        flexWrap?: string // enum('wrap', 'nowrap')
-        height?: number
-        justifyContent?: string // enum('flex-start', 'flex-end', 'center', 'space-between', 'space-around')
-        left?: number
-        margin?: number
-        marginBottom?: number
-        marginHorizontal?: number
-        marginLeft?: number
-        marginRight?: number
-        marginTop?: number
-        marginVertical?: number
-        padding?: number
-        paddingBottom?: number
-        paddingHorizontal?: number
-        paddingLeft?: number
-        paddingRight?: number
-        paddingTop?: number
-        paddingVertical?: number
-        position?: string // enum('absolute', 'relative')
-        right?: number
-        top?: number
-        width?: number
-    }
-
-
-    export interface TransformsStyle {
-
-        transform?: [{perspective: number}, {rotate: string}, {rotateX: string}, {rotateY: string}, {rotateZ: string}, {scale: number}, {scaleX: number}, {scaleY: number}, {translateX: number}, {translateY: number}, {skewX: string}, {skewY: string}]
-        transformMatrix?: Array<number>
-        rotation?: number
-        scaleX?: number
-        scaleY?: number
-        translateX?: number
-        translateY?: number
-
-    }
-
-
-    export interface StyleSheetProperties {
-        // TODO:
-    }
-
-    export interface LayoutRectangle {
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-    }
-
-    // @see TextProperties.onLayout
-    export interface LayoutChangeEvent {
-        nativeEvent: {
-            layout: LayoutRectangle
-        }
-    }
-
-    // @see https://facebook.github.io/react-native/docs/text.html#style
-    export interface TextStyle extends FlexStyle {
-        color?: string;
-        containerBackgroundColor?: string;
-        fontFamily?: string;
-        fontSize?: number;
-        fontStyle?: string; // 'normal' | 'italic';
-        fontWeight?: string; // enum("normal", 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900')
-        letterSpacing?: number;
-        lineHeight?: number;
-        textAlign?: string; // enum("auto", 'left', 'right', 'center')
-        writingDirection?: string; //enum("auto", 'ltr', 'rtl')
-    }
-
-    // https://facebook.github.io/react-native/docs/text.html#props
-    export interface TextProperties extends React.Props<TextProperties> {
-        /**
-         * numberOfLines number
-         *
-         * Used to truncate the text with an elipsis after computing the text layout, including line wrapping, such that the total number of lines does not exceed this number.
-         */
-        numberOfLines?: number;
-
-        /**
-         * onLayout function
-         *
-         * Invoked on mount and layout changes with
-         *
-         * {nativeEvent: { layout: {x, y, width, height}}}.
-         */
-        onLayout?: ( event: LayoutChangeEvent ) => void;
-
-        /**
-         * onPress function
-         *
-         * This function is called on press. Text intrinsically supports press handling with a default highlight state (which can be disabled with suppressHighlighting).
-         */
-        onPress?: () => void;
-
-        /**
-         * @see https://facebook.github.io/react-native/docs/text.html#style
-         */
-        style?: TextStyle;
-    }
-
-    export interface TextStatic extends React.ComponentClass<TextProperties> {
-
-    }
-
-
-    /**
-     * IOS Specific properties for TextInput
-     * @see https://facebook.github.io/react-native/docs/textinput.html#props
-     */
-    export interface TextInputIOSProperties {
-
-        /**
-         * If true, the text field will blur when submitted.
-         * The default value is true.
-         */
-        blurOnSubmit?: boolean
-
-        /**
-         * enum('never', 'while-editing', 'unless-editing', 'always')
-         * When the clear button should appear on the right side of the text view
-         */
-        clearButtonMode?: string
-
-        /**
-         * If true, clears the text field automatically when editing begins
-         */
-        clearTextOnFocus?: boolean
-
-        /**
-         * If true, the keyboard disables the return key when there is no text and automatically enables it when there is text.
-         * The default value is false.
-         */
-        enablesReturnKeyAutomatically?: boolean
-
-        /**
-         * Callback that is called when a key is pressed.
-         * Pressed key value is passed as an argument to the callback handler.
-         * Fires before onChange callbacks.
-         */
-        onKeyPress?: () => void
-
-        /**
-         * enum('default', 'go', 'google', 'join', 'next', 'route', 'search', 'send', 'yahoo', 'done', 'emergency-call')
-         * Determines how the return key should look.
-         */
-        returnKeyType?: string
-
-        /**
-         * If true, all text will automatically be selected on focus
-         */
-        selectTextOnFocus?: boolean
-
-        /**
-         * //FIXME: require typing
-         * See DocumentSelectionState.js, some state that is responsible for maintaining selection information for a document
-         */
-        selectionState?: any
-
-
-    }
-
-    /**
-     * Android Specific properties for TextInput
-     * @see https://facebook.github.io/react-native/docs/textinput.html#props
-     */
-    export interface TextInputAndroidProperties {
-
-        /**
-         * Sets the number of lines for a TextInput.
-         * Use it with multiline set to true to be able to fill the lines.
-         */
-        numberOfLines?: number
-
-        /**
-         * enum('start', 'center', 'end')
-         * Set the position of the cursor from where editing will begin.
-         */
-        textAlign?: string
-
-        /**
-         * enum('top', 'center', 'bottom')
-         * Aligns text vertically within the TextInput.
-         */
-        textAlignVertical?: string
-
-        /**
-         * The color of the textInput underline.
-         */
-        underlineColorAndroid?: string
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/textinput.html#props
-     */
-    export interface TextInputProperties extends TextInputIOSProperties, TextInputAndroidProperties, React.Props<TextInputStatic> {
-
-        /**
-         * Can tell TextInput to automatically capitalize certain characters.
-         *      characters: all characters,
-         *      words: first letter of each word
-         *      sentences: first letter of each sentence (default)
-         *      none: don't auto capitalize anything
-         *
-         * https://facebook.github.io/react-native/docs/textinput.html#autocapitalize
-         */
-        autoCapitalize?: string
-
-        /**
-         * If false, disables auto-correct.
-         * The default value is true.
-         */
-        autoCorrect?: boolean
-
-        /**
-         * If true, focuses the input on componentDidMount.
-         * The default value is false.
-         */
-        autoFocus?: boolean
-
-        /**
-         * Provides an initial value that will change when the user starts typing.
-         * Useful for simple use-cases where you don't want to deal with listening to events
-         * and updating the value prop to keep the controlled state in sync.
-         */
-        defaultValue?: string
-
-        /**
-         * If false, text is not editable. The default value is true.
-         */
-        editable?: boolean
-
-        /**
-         * enum("default", 'numeric', 'email-address', "ascii-capable", 'numbers-and-punctuation', 'url', 'number-pad', 'phone-pad', 'name-phone-pad', 'decimal-pad', 'twitter', 'web-search')
-         * Determines which keyboard to open, e.g.numeric.
-         * The following values work across platforms: - default - numeric - email-address
-         */
-        keyboardType?: string
-
-        /**
-         * Limits the maximum number of characters that can be entered.
-         * Use this instead of implementing the logic in JS to avoid flicker.
-         */
-        maxLength?: number
-
-        /**
-         * If true, the text input can be multiple lines. The default value is false.
-         */
-        multiline?: boolean
-
-        /**
-         * Callback that is called when the text input is blurred
-         */
-        onBlur?: () => void
-
-        /**
-         * Callback that is called when the text input's text changes.
-         */
-        onChange?: (event: {nativeEvent: {text: string}}) => void
-
-        /**
-         * Callback that is called when the text input's text changes.
-         * Changed text is passed as an argument to the callback handler.
-         */
-        onChangeText?: ( text: string ) => void
-
-        /**
-         * Callback that is called when text input ends.
-         */
-        onEndEditing?: (event: {nativeEvent: {text: string}}) => void
-
-        /**
-         * Callback that is called when the text input is focused
-         */
-        onFocus?: () => void
-
-        /**
-         * Invoked on mount and layout changes with {x, y, width, height}.
-         */
-        onLayout?: (event: {nativeEvent: {x: number, y: number, width: number, height: number}}) => void
-
-        /**
-         * Callback that is called when the text input's submit button is pressed.
-         */
-        onSubmitEditing?: (event: {nativeEvent: {text: string}}) => void
-
-        /**
-         * The string that will be rendered before text input has been entered
-         */
-        placeholder?: string
-
-        /**
-         * The text color of the placeholder string
-         */
-        placeholderTextColor?: string
-
-        /**
-         * If true, the text input obscures the text entered so that sensitive text like passwords stay secure.
-         * The default value is false.
-         */
-        secureTextEntry?: boolean
-
-        /**
-         * Styles
-         */
-        style?: TextStyle
-
-        /**
-         * Used to locate this view in end-to-end tests
-         */
-        testID?: string
-
-        /**
-         * The value to show for the text input. TextInput is a controlled component,
-         * which means the native value will be forced to match this value prop if provided.
-         * For most uses this works great, but in some cases this may cause flickering - one common cause is preventing edits by keeping value the same.
-         * In addition to simply setting the same value, either set editable={false},
-         * or set/update maxLength to prevent unwanted edits without flicker.
-         */
-        value?: string
-    }
-
-    export interface TextInputStatic extends React.ComponentClass<TextInputProperties> {
-
-    }
-
-    export interface AccessibilityTraits {
-        // TODO
-    }
-
-    // @see https://facebook.github.io/react-native/docs/view.html#style
-    export interface ViewStyle extends FlexStyle, TransformsStyle {
-        backgroundColor?: string;
-        borderBottomColor?: string;
-        borderBottomLeftRadius?: number;
-        borderBottomRightRadius?: number;
-        borderColor?: string;
-        borderLeftColor?: string;
-        borderRadius?: number;
-        borderRightColor?: string;
-        borderTopColor?: string;
-        borderTopLeftRadius?: number;
-        borderTopRightRadius?: number;
-        opacity?: number;
-        overflow?: string; // enum('visible', 'hidden')
-        shadowColor?: string;
-        shadowOffset?: {width: number, height: number};
-        shadowOpacity?: number;
-        shadowRadius?: number;
-    }
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/view.html#props
-     */
-    export interface ViewProperties extends React.Props<ViewStatic> {
-        /**
-         * accessibilityLabel string
-         *
-         * Overrides the text that's read by the screen reader when the user interacts with the element. By default, the label is constructed by traversing all the children and accumulating all the Text nodes separated by space.
-         *
-         */
-
-        accessibilityLabel?: string;
-
-
-        /**
-         * accessibilityTraits AccessibilityTraits, [AccessibilityTraits]
-         * Provides additional traits to screen reader. By default no traits are provided unless specified otherwise in element
-         */
-
-        accessibilityTraits?: AccessibilityTraits;
-
-        /**
-         * accessible bool
-         *
-         * When true, indicates that the view is an accessibility element. By default, all the touchable elements are accessible.
-         */
-
-        accessible?: boolean;
-
-        /**
-         * onAcccessibilityTap function
-         * When accessible is true, the system will try to invoke this function when the user performs accessibility tap gesture.
-         *
-         */
-
-        onAcccessibilityTap?: () => void;
-
-        /**
-         * onLayout function
-         *
-         * Invoked on mount and layout changes with
-         *
-         * {nativeEvent: { layout: {x, y, width, height}}}.
-         */
-        onLayout?: ( event: LayoutChangeEvent ) => void;
-
-        /**
-         * onMagicTap function
-         *
-         * When accessible is true, the system will invoke this function when the user performs the magic tap gesture.
-         */
-
-        onMagicTap?: () => void;
-
-        /**
-         * onMoveShouldSetResponder function
-         *
-         * For most touch interactions, you'll simply want to wrap your component in TouchableHighlight or TouchableOpacity. Check out Touchable.js, ScrollResponder.js and ResponderEventPlugin.js for more discussion.
-         */
-        onMoveShouldSetResponder?: () => void;
-
-        onResponderGrant?: () => void;
-
-        onResponderMove?: () => void;
-
-        onResponderReject?: () => void;
-
-        onResponderRelease?: () => void;
-
-        onResponderTerminate?: () => void;
-
-        onResponderTerminationRequest?: () => void;
-
-        onStartShouldSetResponder?: () => void;
-
-        onStartShouldSetResponderCapture?: () => void;
-
-        /**
-         * pointerEvents enum('box-none', 'none', 'box-only', 'auto')
-         *
-         * In the absence of auto property, none is much like CSS's none value. box-none is as if you had applied the CSS class:
-         *
-         * .box-none {
-     *   pointer-events: none;
-     * }
-         * .box-none * {
-     *   pointer-events: all;
-     * }
-         *
-         * box-only is the equivalent of
-         *
-         * .box-only {
-     *   pointer-events: all;
-     * }
-         * .box-only * {
-     *   pointer-events: none;
-     * }
-         *
-         * But since pointerEvents does not affect layout/appearance, and we are already deviating from the spec by adding additional modes,
-         * we opt to not include pointerEvents on style. On some platforms, we would need to implement it as a className anyways. Using style or not is an implementation detail of the platform.
-         */
-
-        pointerEvents?: string;
-
-        /**
-         * removeClippedSubviews bool
-         *
-         * This is a special performance property exposed by RCTView and is useful for scrolling content when there are many subviews,
-         * most of which are offscreen. For this property to be effective, it must be applied to a view that contains many subviews that extend outside its bound.
-         * The subviews must also have overflow: hidden, as should the containing view (or one of its superviews).
-         */
-
-        removeClippedSubviews?: boolean
-
-        /**
-         * renderToHardwareTextureAndroid bool
-         *
-         * Whether this view should render itself (and all of its children) into a single hardware texture on the GPU.
-         *
-         * On Android, this is useful for animations and interactions that only modify opacity, rotation, translation, and/or scale:
-         * in those cases, the view doesn't have to be redrawn and display lists don't need to be re-executed. The texture can just be
-         * re-used and re-composited with different parameters. The downside is that this can use up limited video memory, so this prop should be set back to false at the end of the interaction/animation.
-         */
-
-        renderToHardwareTextureAndroid?: boolean;
-
-        style?: ViewStyle;
-
-        /**
-         * testID string
-         *
-         * Used to locate this view in end-to-end tests.
-         */
-
-        testID?: string;
-    }
-
-    export interface ViewStatic extends React.ComponentClass<ViewProperties> {
-
-    }
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/activityindicatorios.html#props
-     */
-    export interface AlertIOSProperties {
-        /**
-         * animating bool
-         *
-         * Whether to show the indicator (true, the default) or hide it (false).
-         */
-        animating?: boolean;
-
-        /**
-         * color string
-         *
-         * The foreground color of the spinner (default is gray).
-         */
-
-        color?: string;
-
-        /**
-         * hidesWhenStopped bool
-         *
-         * Whether the indicator should hide when not animating (true by default).
-         */
-
-        hidesWhenStopped?: boolean;
-
-        /**
-         * onLayout function
-         *
-         * Invoked on mount and layout changes with
-         *
-         * {nativeEvent: { layout: {x, y, width, height}}}.
-         */
-        onLayout?: ( event: LayoutChangeEvent ) => void;
-
-        /**
-         * size enum('small', 'large')
-         *
-         * Size of the indicator. Small has a height of 20, large has a height of 36.
-         */
-        size: string; // enum('small', 'large')
-    }
-
-    /**
-     * @see
-     */
-    export interface SegmentedControlIOSProperties {
-        /// TODO
-    }
-
-    /**
-     * @see
-     */
-    export interface SwitchIOSProperties {
-        /// TODO
-    }
-
-
-    export interface NavigatorIOSProperties extends React.Props<NavigatorIOSStatic> {
-
-        /**
-         * NavigatorIOS uses "route" objects to identify child views, their props, and navigation bar configuration.
-         * "push" and all the other navigation operations expect routes to be like this
-         */
-        initialRoute?: Route
-
-        /**
-         * The default wrapper style for components in the navigator.
-         * A common use case is to set the backgroundColor for every page
-         */
-        itemWrapperStyle?: ViewStyle
-
-        /**
-         * A Boolean value that indicates whether the navigation bar is hidden
-         */
-        navigationBarHidden?: boolean
-
-        /**
-         * A Boolean value that indicates whether to hide the 1px hairline shadow
-         */
-        shadowHidden?: boolean
-
-        /**
-         * The color used for buttons in the navigation bar
-         */
-        tintColor?: string
-
-        /**
-         * The text color of the navigation bar title
-         */
-        titleTextColor?: string
-
-        /**
-         * A Boolean value that indicates whether the navigation bar is translucent
-         */
-        translucent?: boolean
-
-        /**
-         * NOT IN THE DOC BUT IN THE EXAMPLES
-         */
-        style?: ViewStyle
-    }
-
-    /**
-     * A navigator is an object of navigation functions that a view can call.
-     * It is passed as a prop to any component rendered by NavigatorIOS.
-     *
-     * Navigator functions are also available on the NavigatorIOS component:
-     *
-     * @see https://facebook.github.io/react-native/docs/navigatorios.html#navigator
-     */
-    export interface NavigationIOS {
-        /**
-         * Navigate forward to a new route
-         */
-        push: ( route: Route ) => void
-
-        /**
-         * Go back one page
-         */
-        pop: () => void
-
-        /**
-         * Go back N pages at once. When N=1, behavior matches pop()
-         */
-        popN: ( n: number ) => void
-
-        /**
-         * Replace the route for the current page and immediately load the view for the new route
-         */
-        replace: ( route: Route ) => void
-
-        /**
-         * Replace the route/view for the previous page
-         */
-        replacePrevious: ( route: Route ) => void
-
-        /**
-         * Replaces the previous route/view and transitions back to it
-         */
-        replacePreviousAndPop: ( route: Route ) => void
-
-        /**
-         * Replaces the top item and popToTop
-         */
-        resetTo: ( route: Route ) => void
-
-        /**
-         * Go back to the item for a particular route object
-         */
-        popToRoute( route: Route ): void
-
-        /**
-         * Go back to the top item
-         */
-        popToTop(): void
-    }
-
-    export interface NavigatorIOSStatic extends NavigationIOS, React.ComponentClass<NavigatorIOSProperties> {
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/activityindicatorios.html#props
-     */
-    export interface ActivityIndicatorIOSProperties extends React.Props<ActivityIndicatorIOSStatic> {
-
-        /**
-         * Whether to show the indicator (true, the default) or hide it (false).
-         */
-        animating?: boolean
-
-        /**
-         * The foreground color of the spinner (default is gray).
-         */
-        color?: string
-
-        /**
-         * Whether the indicator should hide when not animating (true by default).
-         */
-        hidesWhenStopped?: boolean
-
-        /**
-         * Invoked on mount and layout changes with
-         */
-        onLayout?: ( event: {nativeEvent: { layout: {x: number, y: number , width: number, height: number}}} ) => void
-
-        /**
-         * Size of the indicator.
-         * Small has a height of 20, large has a height of 36.
-         *
-         * enum('small', 'large')
-         */
-        size?: string
-
-        style?: ViewStyle
-    }
-
-    export interface ActivityIndicatorIOSStatic extends React.ComponentClass<ActivityIndicatorIOSProperties> {
-    }
-
-
-    export interface DatePickerIOSProperties extends React.Props<DatePickerIOSStatic> {
-
-        /**
-         * The currently selected date.
-         */
-        date?: Date
-
-
-        /**
-         * Maximum date.
-         * Restricts the range of possible date/time values.
-         */
-        maximumDate?: Date
-
-        /**
-         * Maximum date.
-         * Restricts the range of possible date/time values.
-         */
-        minimumDate?: Date
-
-        /**
-         *  enum(1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30)
-         *  The interval at which minutes can be selected.
-         */
-        minuteInterval?: number
-
-        /**
-         *  enum('date', 'time', 'datetime')
-         *  The date picker mode.
-         */
-        mode?: string
-
-        /**
-         * Date change handler.
-         * This is called when the user changes the date or time in the UI.
-         * The first and only argument is a Date object representing the new date and time.
-         */
-        onDateChange?: (newDate: Date) => void
-
-        /**
-         * Timezone offset in minutes.
-         * By default, the date picker will use the device's timezone. With this parameter, it is possible to force a certain timezone offset.
-         * For instance, to show times in Pacific Standard Time, pass -7 * 60.
-         */
-        timeZoneOffsetInMinutes?: number
-
-    }
-
-    export interface DatePickerIOSStatic extends React.ComponentClass<DatePickerIOSProperties> {
-    }
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/sliderios.html
-     */
-    export interface SliderIOSProperties extends React.Props<SliderIOSStatic> {
-        /**
-         maximumTrackTintColor string
-         The color used for the track to the right of the button. Overrides the default blue gradient image.
-         */
-        maximumTrackTintColor?: string;
-
-        /**
-         maximumValue number
-
-         Initial maximum value of the slider. Default value is 1.
-         */
-        maximumValue?: number;
-
-        /**
-         minimumTrackTintColor string
-         The color used for the track to the left of the button. Overrides the default blue gradient image.
-         */
-        minimumTrackTintColor?: string;
-
-        /**
-         minimumValue number
-         Initial minimum value of the slider. Default value is 0.
-         */
-        minimumValue?: number;
-
-        /**
-         onSlidingComplete function
-         Callback called when the user finishes changing the value (e.g. when the slider is released).
-         */
-        onSlidingComplete?: () => void;
-
-        /**
-         onValueChange function
-         Callback continuously called while the user is dragging the slider.
-         */
-        onValueChange?: ( value: number ) => void;
-
-        /**
-         value number
-         Initial value of the slider. The value should be between minimumValue and maximumValue, which default to 0 and 1 respectively. Default value is 0.
-
-         This is not a controlled component, e.g. if you don't update the value, the component won't be reset to its inital value.
-         */
-        value?: number;
-    }
-
-    export interface SliderIOSStatic extends React.ComponentClass<SliderIOSProperties> {
-
-    }
-
-    /**
-     * @see
-     */
-    export interface CameraRollProperties {
-        /// TODO
-    }
-
-    /**
-     * Image style
-     * @see https://facebook.github.io/react-native/docs/image.html#style
-     */
-    export interface ImageStyle extends FlexStyle {
-        color?: string;
-        containerBackgroundColor?: string;
-        fontFamily?: string;
-        fontSize?: number;
-        fontStyle?: string; // 'normal' | 'italic';
-        fontWeight?: string; // enum("normal", 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900')
-        letterSpacing?: number;
-        lineHeight?: number;
-        textAlign?: string; // enum("auto", 'left', 'right', 'center')
-        writingDirection?: string; //enum("auto", 'ltr', 'rtl')
-    }
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/image.html
-     */
-    export interface ImageProperties extends React.Props<Image> {
-        /**
-         * onLayout function
-         *
-         * Invoked on mount and layout changes with
-         *
-         * {nativeEvent: { layout: {x, y, width, height}}}.
-         */
-        onLayout?: ( event: LayoutChangeEvent ) => void;
-
-
-        /**
-         * Determines how to resize the image when the frame doesn't match the raw image dimensions.
-         */
-        resizeMode?: string; // enum('cover', 'contain', 'stretch')
-
-        /**
-         * uri is a string representing the resource identifier for the image,
-         * which could be an http address, a local file path,
-         * or the name of a static image resource (which should be wrapped in the require('image!name') function).
-         */
-        source: {uri: string} | string;
-
-        /**
-         *
-         * Style
-         */
-        style?:  ImageStyle;
-
-        /**
-         * A unique identifier for this element to be used in UI Automation testing scripts.
-         */
-        testID?: string;
-
-        /**
-         * The text that's read by the screen reader when the user interacts with the image.
-         */
-        iosaccessibilityLabel?: string;
-
-        /**
-         * When true, indicates the image is an accessibility element.
-         */
-        iosaccessible?: boolean;
-
-        /**
-         * When the image is resized, the corners of the size specified by capInsets will stay a fixed size,
-         * but the center content and borders of the image will be stretched.
-         * This is useful for creating resizable rounded buttons, shadows, and other resizable assets.
-         * More info on Apple documentation
-         */
-        ioscapInsets?: {top: number, left: number, bottom: number, right: number}
-
-        /**
-         * A static image to display while downloading the final image off the network.
-         */
-        iosdefaultSource?: {uri: string}
-
-        /**
-         * Invoked on load error with {nativeEvent: {error}}
-         */
-        iosonError?: ( error: {nativeEvent: any} ) => void
-
-        /**
-         * Invoked when load completes successfully
-         */
-        iosonLoad?: () => void
-
-        /**
-         * Invoked when load either succeeds or fails
-         */
-        iosonLoadEnd?: () => void
-
-        /**
-         * Invoked on load start
-         */
-        iosonLoadStart?: () => void
-
-        /**
-         * Invoked on download progress with {nativeEvent: {loaded, total}}
-         */
-        iosonProgress?: ()=> void
-    }
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/listview.html#props
-     */
-    export interface ListViewProperties extends ScrollViewProperties, React.Props<ListViewStatic> {
-
-        dataSource?: ListViewDataSource
-
-        /**
-         * How many rows to render on initial component mount.  Use this to make
-         * it so that the first screen worth of data apears at one time instead of
-         * over the course of multiple frames.
-         */
-        initialListSize?: number
-
-        /**
-         * (visibleRows, changedRows) => void
-         *
-         * Called when the set of visible rows changes.  `visibleRows` maps
-         * { sectionID: { rowID: true }} for all the visible rows, and
-         * `changedRows` maps { sectionID: { rowID: true | false }} for the rows
-         * that have changed their visibility, with true indicating visible, and
-         * false indicating the view has moved out of view.
-         */
-        onChangeVisibleRows?: ( visibleRows: Array<{[sectionId: string]: {[rowID: string]: boolean}}>, changedRows: Array<{[sectionId: string]: {[rowID: string]: boolean}}> ) => void
-
-        /**
-         * Called when all rows have been rendered and the list has been scrolled
-         * to within onEndReachedThreshold of the bottom.  The native scroll
-         * event is provided.
-         */
-        onEndReached?: () => void
-
-        /**
-         * Threshold in pixels for onEndReached.
-         */
-        onEndReachedThreshold?: number
-
-        /**
-         * Number of rows to render per event loop.
-         */
-        pageSize?: number
-
-        /**
-         * An experimental performance optimization for improving scroll perf of
-         * large lists, used in conjunction with overflow: 'hidden' on the row
-         * containers.  Use at your own risk.
-         */
-        removeClippedSubviews?: boolean
-
-        /**
-         * () => renderable
-         *
-         * The header and footer are always rendered (if these props are provided)
-         * on every render pass.  If they are expensive to re-render, wrap them
-         * in StaticContainer or other mechanism as appropriate.  Footer is always
-         * at the bottom of the list, and header at the top, on every render pass.
-         */
-        renderFooter?: () => React.ReactElement<any>
-
-        /**
-         * () => renderable
-         *
-         * The header and footer are always rendered (if these props are provided)
-         * on every render pass.  If they are expensive to re-render, wrap them
-         * in StaticContainer or other mechanism as appropriate.  Footer is always
-         * at the bottom of the list, and header at the top, on every render pass.
-         */
-        renderHeader?: () => React.ReactElement<any>
-
-        /**
-         * (rowData, sectionID, rowID) => renderable
-         * Takes a data entry from the data source and its ids and should return
-         * a renderable component to be rendered as the row.  By default the data
-         * is exactly what was put into the data source, but it's also possible to
-         * provide custom extractors.
-         */
-        renderRow?: ( rowData: any, sectionID: string, rowID: string, highlightRow?: boolean ) => React.ReactElement<any>
-
-
-        /**
-         * A function that returns the scrollable component in which the list rows are rendered.
-         * Defaults to returning a ScrollView with the given props.
-         */
-        renderScrollComponent?: ( props: ScrollViewProperties ) => React.ReactElement<ScrollViewProperties>
-
-        /**
-         * (sectionData, sectionID) => renderable
-         *
-         * If provided, a sticky header is rendered for this section.  The sticky
-         * behavior means that it will scroll with the content at the top of the
-         * section until it reaches the top of the screen, at which point it will
-         * stick to the top until it is pushed off the screen by the next section
-         * header.
-         */
-        renderSectionHeader?: ( sectionData: any, sectionId: string ) => React.ReactElement<any>
-
-
-        /**
-         * (sectionID, rowID, adjacentRowHighlighted) => renderable
-         * If provided, a renderable component to be rendered as the separator below each row
-         * but not the last row if there is a section header below.
-         * Take a sectionID and rowID of the row above and whether its adjacent row is highlighted.
-         */
-        renderSeparator?: ( sectionID: string, rowID: string, adjacentRowHighlighted?: boolean ) => React.ReactElement<any>
-
-        /**
-         * How early to start rendering rows before they come on screen, in
-         * pixels.
-         */
-        scrollRenderAheadDistance?: number
-    }
-
-    export interface ListViewStatic extends React.ComponentClass<ListViewProperties> {
-        DataSource: ListViewDataSource;
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/touchablewithoutfeedback.html
-     */
-    export interface TouchableWithoutFeedbackProperties {
-        /*
-         accessible bool
-
-         Called when the touch is released, but not if cancelled (e.g. by a scroll that steals the responder lock).
-         */
-        accessible?: boolean;
-        /*
-         delayLongPress number
-
-         Delay in ms, from onPressIn, before onLongPress is called.
-         */
-        delayLongPress?: number;
-
-        /*
-         delayPressIn number
-
-         Delay in ms, from the start of the touch, before onPressIn is called.
-         */
-        delayPressIn?: number;
-
-        /*
-         delayPressOut number
-
-         Delay in ms, from the release of the touch, before onPressOut is called.
-         */
-        delayPressOut?: number;
-
-        /*
-         onLongPress function
-         */
-        onLongPress?: () => void;
-
-        /*
-         onPress function
-         */
-        onPress?: () => void;
-
-        /*
-         onPressIn function
-         */
-        onPressIn?: () => void;
-
-        /*
-         onPressOut function
-         */
-        onPressOut?: () => void;
-    }
-
-
-    export interface TouchableWithoutFeedbackProps extends TouchableWithoutFeedbackProperties, React.Props<TouchableWithoutFeedbackStatic> {
-
-    }
-
-    export interface TouchableWithoutFeedbackStatic extends React.ComponentClass<TouchableWithoutFeedbackProps> {
-
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/touchablehighlight.html#props
-     */
-    export interface TouchableHighlightProperties extends TouchableWithoutFeedbackProperties, React.Props<TouchableHighlightStatic> {
-        /**
-         * activeOpacity number
-         *
-         * Determines what the opacity of the wrapped view should be when touch is active.
-         */
-        activeOpacity?: number
-
-        /**
-         * onHideUnderlay function
-         *
-         * Called immediately after the underlay is hidden
-         */
-
-        onHideUnderlay?: () => void
-
-
-        /**
-         * onShowUnderlay function
-         *
-         * Called immediately after the underlay is shown
-         */
-        onShowUnderlay?: () => void
-
-        /**
-         * @see https://facebook.github.io/react-native/docs/view.html#style
-         */
-        style?: ViewStyle
-
-
-        /**
-         * underlayColor string
-         *
-         * The color of the underlay that will show through when the touch is active.
-         */
-        underlayColor?: string
-
-    }
-
-    export interface TouchableHighlightStatic extends React.ComponentClass<TouchableHighlightProperties> {
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/touchableopacity.html#props
-     */
-    export interface TouchableOpacityProperties extends TouchableWithoutFeedbackProperties, React.Props<TouchableOpacityStatic> {
-        /**
-         * activeOpacity number
-         *
-         * Determines what the opacity of the wrapped view should be when touch is active.
-         */
-        activeOpacity?: number;
-    }
-
-    export interface TouchableOpacityStatic extends React.ComponentClass<TouchableOpacityProperties> {
-    }
-
-
-    export interface LeftToRightGesture {
-
-    }
-
-    export interface AnimationInterpolator {
-
-    }
-
-    // see /NavigatorSceneConfigs.js
-    export interface SceneConfig {
-        // A list of all gestures that are enabled on this scene
-        gestures: {
-            pop: LeftToRightGesture,
-        },
-
-        // Rebound spring parameters when transitioning FROM this scene
-        springFriction: number;
-        springTension: number;
-
-        // Velocity to start at when transitioning without gesture
-        defaultTransitionVelocity: number;
-
-        // Animation interpolators for horizontal transitioning:
-        animationInterpolators: {
-            into: AnimationInterpolator,
-            out: AnimationInterpolator
-        };
-
-    }
-
-    // see /NavigatorSceneConfigs.js
-    export interface SceneConfigs {
-        FloatFromBottom: SceneConfig;
-        FloatFromRight: SceneConfig;
-        PushFromRight: SceneConfig;
-        FloatFromLeft: SceneConfig;
-        HorizontalSwipeJump: SceneConfig;
-    }
-
-    export interface Route {
-        component?: ComponentClass<ViewProperties>
-        id?: string
-        title?: string
-        passProps?: Object;
-
-        //anything else
-        [key: string]: any
-
-        //Commonly found properties
-        backButtonTitle?: string
-        content?: string
-        message?: string;
-        index?: number
-        onRightButtonPress?: () => void
-        rightButtonTitle?: string
-        sceneConfig?: SceneConfig
-        wrapperStyle?: any
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/navigator.html#content
-     */
-    export interface NavigatorProperties extends React.Props<Navigator> {
-        /**
-         * Optional function that allows configuration about scene animations and gestures.
-         * Will be invoked with the route and should return a scene configuration object
-         * @param route
-         */
-        configureScene?: ( route: Route ) => SceneConfig
-        /**
-         * Specify a route to start on.
-         * A route is an object that the navigator will use to identify each scene to render.
-         * initialRoute must be a route in the initialRouteStack if both props are provided.
-         * The initialRoute will default to the last item in the initialRouteStack.
-         */
-        initialRoute?: Route
-        /**
-         * Provide a set of routes to initially mount.
-         * Required if no initialRoute is provided.
-         * Otherwise, it will default to an array containing only the initialRoute
-         */
-        initialRouteStack?: Route[]
-
-        /**
-         * Optionally provide a navigation bar that persists across scene transitions
-         */
-        navigationBar?: React.ReactElement<NavigatorStatic.NavigationBarProperties>
-
-        /**
-         * Optionally provide the navigator object from a parent Navigator
-         */
-        navigator?: Navigator
-
-        /**
-         * @deprecated Use navigationContext.addListener('willfocus', callback) instead.
-         */
-        onDidFocus?: Function
-
-        /**
-         * @deprecated Use navigationContext.addListener('willfocus', callback) instead.
-         */
-        onWillFocus?: Function
-
-        /**
-         * Required function which renders the scene for a given route.
-         * Will be invoked with the route and the navigator object
-         * @param route
-         * @param navigator
-         */
-        renderScene?: ( route: Route, navigator: Navigator ) => React.ReactElement<ViewProperties>
-
-        /**
-         * Styles to apply to the container of each scene
-         */
-        sceneStyle?: ViewStyle
-
-        /**
-         * //FIXME: not found in doc but found in examples
-         */
-        debugOverlay?: boolean
-
-    }
-
-    /**
-     * Use Navigator to transition between different scenes in your app.
-     * To accomplish this, provide route objects to the navigator to identify each scene,
-     * and also a renderScene function that the navigator can use to render the scene for a given route.
-     *
-     * To change the animation or gesture properties of the scene, provide a configureScene prop to get the config object for a given route.
-     * See Navigator.SceneConfigs for default animations and more info on scene config options.
-     * @see https://facebook.github.io/react-native/docs/navigator.html
-     */
-    export interface NavigatorStatic extends React.ComponentClass<NavigatorProperties> {
-        SceneConfigs: SceneConfigs;
-        NavigationBar: NavigatorStatic.NavigationBarStatic;
-        BreadcrumbNavigationBar: NavigatorStatic.BreadcrumbNavigationBarStatic
-
-        getContext( self: any ): NavigatorStatic;
-
-        /**
-         * returns the current list of routes
-         */
-        getCurrentRoutes(): Route[];
-
-        /**
-         * Jump backward without unmounting the current scen
-         */
-        jumpBack(): void;
-
-        /**
-         * Jump forward to the next scene in the route stack
-         */
-        jumpForward(): void;
-
-        /**
-         * Transition to an existing scene without unmounting
-         */
-        jumpTo( route: Route ): void;
-
-        /**
-         * Navigate forward to a new scene, squashing any scenes that you could jumpForward to
-         */
-        push( route: Route ): void;
-
-        /**
-         * Transition back and unmount the current scene
-         */
-        pop(): void;
-
-        /**
-         * Replace the current scene with a new route
-         */
-        replace( route: Route ): void;
-
-        /**
-         * Replace a scene as specified by an index
-         */
-        replaceAtIndex( route: Route, index: number ): void;
-
-        /**
-         *  Replace the previous scene
-         */
-        replacePrevious( route: Route ): void;
-
-        /**
-         * Reset every scene with an array of routes
-         */
-        immediatelyResetRouteStack( routes: Route[] ): void;
-
-        /**
-         * Pop to a particular scene, as specified by its route. All scenes after it will be unmounted
-         */
-        popToRoute( route: Route ): void;
-
-        /**
-         * Pop to the first scene in the stack, unmounting every other scene
-         */
-        popToTop(): void;
-
-    }
-
-    namespace NavigatorStatic {
-
-
-        export interface NavState {
-            routeStack: Route[]
-            idStack: number[]
-            presentedIndex: number
-        }
-
-        export interface NavigationBarStyle {
-            //TODO @see NavigationBarStyle.ios.js
-        }
-
-
-        export interface NavigationBarRouteMapper {
-            Title: ( route: Route, nav: Navigator, index: number, navState: NavState ) => React.ReactElement<any>;
-            LeftButton: ( route: Route, nav: Navigator, index: number, navState: NavState )=> React.ReactElement<any>;
-            RightButton: ( route: Route, nav: Navigator, index: number, navState: NavState )=> React.ReactElement<any>;
-        }
-
-        /**
-         * @see NavigatorNavigationBar.js
-         */
-        export interface NavigationBarProperties extends React.Props<NavigationBarStatic> {
-            navigator?: Navigator
-            routeMapper?: NavigationBarRouteMapper
-            navState?: NavState
-            style?: ViewStyle
-        }
-
-        export interface NavigationBarStatic extends React.ComponentClass<NavigationBarProperties> {
-            Styles: NavigationBarStyle
-
-        }
-
-        export type NavigationBar = NavigationBarStatic
-        export var NavigationBar: NavigationBarStatic
-
-
-        export interface BreadcrumbNavigationBarStyle {
-            //TODO &see NavigatorBreadcrumbNavigationBar.js
-        }
-
-        export interface BreadcrumbNavigationBarRouteMapper {
-            rightContentForRoute: ( route: Route, navigator: Navigator ) => React.ReactElement<any>
-            titleContentForRoute: ( route: Route, navigator: Navigator ) => React.ReactElement<any>
-            iconForRoute: ( route: Route, navigator: Navigator ) => React.ReactElement<any>
-            //in samples...
-            separatorForRoute: ( route: Route, navigator: Navigator ) => React.ReactElement<any>
-        }
-
-        /**
-         * @see NavigatorNavigationBar.js
-         */
-        export interface BreadcrumbNavigationBarProperties extends React.Props<BreadcrumbNavigationBarStatic> {
-            navigator?: Navigator
-            routeMapper?: BreadcrumbNavigationBarRouteMapper
-            navState?: NavState
-            style?: ViewStyle
-        }
-
-        export interface BreadcrumbNavigationBarStatic extends React.ComponentClass<BreadcrumbNavigationBarProperties> {
-            Styles: BreadcrumbNavigationBarStyle
-        }
-
-        export type BreadcrumbNavigationBar = BreadcrumbNavigationBarStatic
-        var BreadcrumbNavigationBar: BreadcrumbNavigationBarStatic
-
-    }
-
-
-    export interface StyleSheetStatic extends React.ComponentClass<StyleSheetProperties> {
-        create<T>( styles: T ): T;
-    }
-
-    /**
-     * //FIXME: Could not find docs. Inferred from examples and jscode : ListViewDataSource.js
-     */
-    export interface DataSourceAssetCallback {
-        rowHasChanged?: ( r1: any, r2: any ) => boolean
-        sectionHeaderHasChanged?: ( h1: any, h2: any ) => boolean
-        getRowData?: <T>( dataBlob: any, sectionID: number | string, rowID: number | string ) => T
-        getSectionHeaderData?: <T>( dataBlob: any, sectionID: number | string ) => T
-    }
-
-    /**
-     * //FIXME: Could not find docs. Inferred from examples and js code: ListViewDataSource.js
-     */
-    export interface ListViewDataSource {
-        new( onAsset: DataSourceAssetCallback ): ListViewDataSource;
-        /**
-         * Clones this `ListViewDataSource` with the specified `dataBlob` and
-         * `rowIdentities`. The `dataBlob` is just an aribitrary blob of data. At
-         * construction an extractor to get the interesting informatoin was defined
-         * (or the default was used).
-         *
-         * The `rowIdentities` is is a 2D array of identifiers for rows.
-         * ie. [['a1', 'a2'], ['b1', 'b2', 'b3'], ...].  If not provided, it's
-         * assumed that the keys of the section data are the row identities.
-         *
-         * Note: This function does NOT clone the data in this data source. It simply
-         * passes the functions defined at construction to a new data source with
-         * the data specified. If you wish to maintain the existing data you must
-         * handle merging of old and new data separately and then pass that into
-         * this function as the `dataBlob`.
-         */
-        cloneWithRows<T>( dataBlob: Array<any> | {[key: string]: any}, rowIdentities?: Array<string> ): ListViewDataSource
-
-        /**
-         * This performs the same function as the `cloneWithRows` function but here
-         * you also specify what your `sectionIdentities` are. If you don't care
-         * about sections you should safely be able to use `cloneWithRows`.
-         *
-         * `sectionIdentities` is an array of identifiers for  sections.
-         * ie. ['s1', 's2', ...].  If not provided, it's assumed that the
-         * keys of dataBlob are the section identities.
-         *
-         * Note: this returns a new object!
-         */
-        cloneWithRowsAndSections( dataBlob: Array<any> | {[key: string]: any}, sectionIdentities?: Array<string>, rowIdentities?: Array<Array<string>> ): ListViewDataSource
-
-        getRowCount(): number
-
-        /**
-         * Gets the data required to render the row.
-         */
-        getRowData( sectionIndex: number, rowIndex: number ): any
-
-        /**
-         * Gets the rowID at index provided if the dataSource arrays were flattened,
-         * or null of out of range indexes.
-         */
-        getRowIDForFlatIndex( index: number ): string
-
-        /**
-         * Gets the sectionID at index provided if the dataSource arrays were flattened,
-         * or null for out of range indexes.
-         */
-        getSectionIDForFlatIndex( index: number ): string
-
-        /**
-         * Returns an array containing the number of rows in each section
-         */
-        getSectionLengths(): Array<number>
-
-        /**
-         * Returns if the section header is dirtied and needs to be rerendered
-         */
-        sectionHeaderShouldUpdate( sectionIndex: number ): boolean
-
-        /**
-         * Gets the data required to render the section header
-         */
-        getSectionHeaderData( sectionIndex: number ): any
-    }
-
-
-    export interface ImageStatic extends React.ComponentClass<ImageProperties> {
-        uri: string;
-    }
-
-    /**
-     * @see
-     */
-    export interface TabBarItemProperties {
-
-    }
-
-    export interface TabBarItem extends React.ComponentClass<TabBarItemProperties> {
-    }
-
-    /**
-     * @see
-     */
-    export interface TabBarIOSProperties {
-    }
-
-    export interface TabBarIOSStatic extends React.ComponentClass<TabBarIOSProperties> {
-        Item: TabBarItem;
-    }
-
-    export interface CameraRollFetchParams {
-        first: number;
-        groupTypes: string;
-        after?: string;
-    }
-
-    export interface CameraRollNodeInfo {
-        image: Image;
-        group_name: string;
-        timestamp: number;
-        location: any;
-    }
-
-    export interface CameraRollEdgeInfo {
-        node: CameraRollNodeInfo;
-    }
-
-    export interface CameraRollAssetInfo {
-        edges: CameraRollEdgeInfo[];
-        page_info: {
-            has_next_page: boolean;
-            end_cursor: string;
-        };
-    }
-
-    export interface CameraRollStatic extends React.ComponentClass<CameraRollProperties> {
-        getPhotos( fetch: CameraRollFetchParams,
-                   onAsset: ( assetInfo: CameraRollAssetInfo ) => void,
-                   logError: ()=> void ): void;
-    }
-
-    export interface PanHandlers {
-
-    }
-
-    export interface PanResponderEvent {
-
-    }
-
-    export interface PanResponderGestureState {
-        stateID: number;
-        moveX: number;
-        moveY: number;
-        x0: number;
-        y0: number;
-        dx: number;
-        dy: number;
-        vx: number;
-        vy: number;
-        numberActiveTouches: number;
-        // All `gestureState` accounts for timeStamps up until:
-        _accountsForMovesUpTo: number;
-    }
-
-    /**
-     * @param {object} config Enhanced versions of all of the responder callbacks
-     * that provide not only the typical `ResponderSyntheticEvent`, but also the
-     * `PanResponder` gesture state.  Simply replace the word `Responder` with
-     * `PanResponder` in each of the typical `onResponder*` callbacks. For
-     * example, the `config` object would look like:
-     *
-     *  - `onMoveShouldSetPanResponder: (e, gestureState) => {...}`
-     *  - `onMoveShouldSetPanResponderCapture: (e, gestureState) => {...}`
-     *  - `onStartShouldSetPanResponder: (e, gestureState) => {...}`
-     *  - `onStartShouldSetPanResponderCapture: (e, gestureState) => {...}`
-     *  - `onPanResponderReject: (e, gestureState) => {...}`
-     *  - `onPanResponderGrant: (e, gestureState) => {...}`
-     *  - `onPanResponderStart: (e, gestureState) => {...}`
-     *  - `onPanResponderEnd: (e, gestureState) => {...}`
-     *  - `onPanResponderRelease: (e, gestureState) => {...}`
-     *  - `onPanResponderMove: (e, gestureState) => {...}`
-     *  - `onPanResponderTerminate: (e, gestureState) => {...}`
-     *  - `onPanResponderTerminationRequest: (e, gestureState) => {...}`
-     *
-     *  In general, for events that have capture equivalents, we update the
-     *  gestureState once in the capture phase and can use it in the bubble phase
-     *  as well.
-     *
-     *  Be careful with onStartShould* callbacks. They only reflect updated
-     *  `gestureState` for start/end events that bubble/capture to the Node.
-     *  Once the node is the responder, you can rely on every start/end event
-     *  being processed by the gesture and `gestureState` being updated
-     *  accordingly. (numberActiveTouches) may not be totally accurate unless you
-     *  are the responder.
-     */
-    export interface PanResponderCallbacks {
-        onMoveShouldSetPanResponder?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => boolean;
-        onStartShouldSetPanResponder?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-        onPanResponderGrant?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-        onPanResponderMove?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-        onPanResponderRelease?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-        onPanResponderTerminate?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-
-        onMoveShouldSetPanResponderCapture?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => boolean;
-        onStartShouldSetPanResponderCapture?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => boolean;
-        onPanResponderReject?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-        onPanResponderStart?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-        onPanResponderEnd?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-        onPanResponderTerminationRequest?: ( e: PanResponderEvent, gestureState: PanResponderGestureState ) => void;
-    }
-
-    export interface PanResponderInstance {
-        panHandlers: PanHandlers;
-    }
-
-    export interface PanResponderStatic {
-        create( callbacks: PanResponderCallbacks ): PanResponderInstance;
-    }
-
-    export interface PixelRatioStatic {
-        get(): number;
-    }
-
-    export interface DeviceEventSubscriptionStatic {
-        remove(): void;
-    }
-
-    export interface DeviceEventEmitterStatic {
-        addListener<T>( type: string, onReceived: ( data: T ) => void ): DeviceEventSubscription;
-    }
-
-    // Used by Dimensions below
-    export interface ScaledSize {
-        width: number;
-        height: number;
-        scale: number;
-    }
-
-    // @see https://facebook.github.io/react-native/docs/asyncstorage.html#content
-    export interface AsyncStorageStatic {
-        getItem( key: string, callback?: ( error?: Error, result?: string ) => void ): Promise<string>;
-        setItem( key: string, value: string, callback?: ( error?: Error ) => void ): Promise<string>;
-        removeItem( key: string, callback?: ( error?: Error ) => void ): Promise<string>;
-        mergeItem( key: string, value: string, callback?: ( error?: Error ) => void ): Promise<string>;
-        clear( callback?: ( error?: Error ) => void ): Promise<string>;
-        getAllKeys( callback?: ( error?: Error, keys?: string[] ) => void ): Promise<string>;
-        multiGet( keys: string[], callback?: ( errors?: Error[], result?: string[][] ) => void ): Promise<string>;
-        multiSet( keyValuePairs: string[][], callback?: ( errors?: Error[] ) => void ): Promise<string>;
-        multiRemove( keys: string[], callback?: ( errors?: Error[] ) => void ): Promise<string>;
-        multiMerge( keyValuePairs: string[][], callback?: ( errors?: Error[] ) => void ): Promise<string>;
-    }
-
-    export interface InteractionManagerStatic {
-        runAfterInteractions( fn: () => void ): void;
-    }
-
-
-    export interface ScrollViewStyle extends FlexStyle, TransformsStyle {
-
-        backfaceVisibility?:string //enum('visible', 'hidden')
-        backgroundColor?: string
-        borderColor?: string
-        borderTopColor?: string
-        borderRightColor?: string
-        borderBottomColor?: string
-        borderLeftColor?: string
-        borderRadius?: number
-        borderTopLeftRadius?: number
-        borderTopRightRadius?: number
-        borderBottomLeftRadius?: number
-        borderBottomRightRadius?: number
-        borderStyle?: string //enum('solid', 'dotted', 'dashed')
-        borderWidth?: number
-        borderTopWidth?: number
-        borderRightWidth?: number
-        borderBottomWidth?: number
-        borderLeftWidth?: number
-        opacity?: number
-        overflow?: string //enum('visible', 'hidden')
-        shadowColor?: string
-        shadowOffset?: {width: number; height: number}
-        shadowOpacity?: number
-        shadowRadius?: number
-    }
-
-    export interface  EdgeInsetsProperties {
-        top: number
-        left: number
-        bottom: number
-        right: number
-    }
-
-    export interface  PointProperties {
-        x: number
-        y: number
-    }
-
-    export interface ScrollViewIOSProperties {
-
-        /**
-         * When true the scroll view bounces horizontally when it reaches the end
-         * even if the content is smaller than the scroll view itself. The default
-         * value is true when `horizontal={true}` and false otherwise.
-         */
-        alwaysBounceHorizontal?: boolean
-        /**
-         * When true the scroll view bounces vertically when it reaches the end
-         * even if the content is smaller than the scroll view itself. The default
-         * value is false when `horizontal={true}` and true otherwise.
-         */
-        alwaysBounceVertical?: boolean
-
-        /**
-         * Controls whether iOS should automatically adjust the content inset for scroll views that are placed behind a navigation bar or tab bar/ toolbar.
-         * The default value is true.
-         */
-        automaticallyAdjustContentInsets?: boolean // true
-
-        /**
-         * When true the scroll view bounces when it reaches the end of the
-         * content if the content is larger then the scroll view along the axis of
-         * the scroll direction. When false it disables all bouncing even if
-         * the `alwaysBounce*` props are true. The default value is true.
-         */
-        bounces?: boolean
-        /**
-         * When true gestures can drive zoom past min/max and the zoom will animate
-         * to the min/max value at gesture end otherwise the zoom will not exceed
-         * the limits.
-         */
-        bouncesZoom?: boolean
-
-        /**
-         * When false once tracking starts won't try to drag if the touch moves.
-         * The default value is true.
-         */
-        canCancelContentTouches?: boolean
-
-        /**
-         * When true the scroll view automatically centers the content when the
-         * content is smaller than the scroll view bounds; when the content is
-         * larger than the scroll view this property has no effect. The default
-         * value is false.
-         */
-        centerContent?: boolean
-
-
-        /**
-         * The amount by which the scroll view content is inset from the edges of the scroll view.
-         * Defaults to {0, 0, 0, 0}.
-         */
-        contentInset?: EdgeInsetsProperties // zeros
-
-        /**
-         * Used to manually set the starting scroll offset.
-         * The default value is {x: 0, y: 0}
-         */
-        contentOffset?: PointProperties // zeros
-
-        /**
-         * A floating-point number that determines how quickly the scroll view
-         * decelerates after the user lifts their finger. Reasonable choices include
-         *   - Normal: 0.998 (the default)
-         *   - Fast: 0.9
-         */
-        decelerationRate?: number
-
-        /**
-         * When true the ScrollView will try to lock to only vertical or horizontal
-         * scrolling while dragging.  The default value is false.
-         */
-        directionalLockEnabled?: boolean
-
-        /**
-         * The maximum allowed zoom scale. The default value is 1.0.
-         */
-        maximumZoomScale?: number
-
-        /**
-         * The minimum allowed zoom scale. The default value is 1.0.
-         */
-        minimumZoomScale?: number
-
-        /**
-         * Called when a scrolling animation ends.
-         */
-        onScrollAnimationEnd?: () => void
-
-        /**
-         * When true the scroll view stops on multiples of the scroll view's size
-         * when scrolling. This can be used for horizontal pagination. The default
-         * value is false.
-         */
-        pagingEnabled?: boolean
-
-        /**
-         * When false, the content does not scroll. The default value is true
-         */
-        scrollEnabled?: boolean // true
-
-        /**
-         * This controls how often the scroll event will be fired while scrolling (in events per seconds).
-         * A higher number yields better accuracy for code that is tracking the scroll position,
-         * but can lead to scroll performance problems due to the volume of information being send over the bridge.
-         * The default value is zero, which means the scroll event will be sent only once each time the view is scrolled.
-         */
-        scrollEventThrottle?: number // null
-
-        /**
-         * The amount by which the scroll view indicators are inset from the edges of the scroll view.
-         * This should normally be set to the same value as the contentInset.
-         * Defaults to {0, 0, 0, 0}.
-         */
-        scrollIndicatorInsets?: EdgeInsetsProperties //zeroes
-
-        /**
-         * When true the scroll view scrolls to top when the status bar is tapped.
-         * The default value is true.
-         */
-        scrollsToTop?: boolean
-
-        /**
-         * When snapToInterval is set, snapToAlignment will define the relationship of the the snapping to the scroll view.
-         *      - start (the default) will align the snap at the left (horizontal) or top (vertical)
-         *      - center will align the snap in the center
-         *      - end will align the snap at the right (horizontal) or bottom (vertical)
-         */
-        snapToAlignment?: string
-
-        /**
-         * When set, causes the scroll view to stop at multiples of the value of snapToInterval.
-         * This can be used for paginating through children that have lengths smaller than the scroll view.
-         * Used in combination with snapToAlignment.
-         */
-        snapToInterval?: number
-
-        /**
-         * An array of child indices determining which children get docked to the
-         * top of the screen when scrolling. For example passing
-         * `stickyHeaderIndices={[0]}` will cause the first child to be fixed to the
-         * top of the scroll view. This property is not supported in conjunction
-         * with `horizontal={true}`.
-         */
-        stickyHeaderIndices?: number[]
-
-        /**
-         * The current scale of the scroll view content. The default value is 1.0.
-         */
-        zoomScale?: number
-    }
-
-    export interface ScrollViewProperties extends ScrollViewIOSProperties {
-
-        /**
-         * These styles will be applied to the scroll view content container which
-         * wraps all of the child views. Example:
-         *
-         *   return (
-         *     <ScrollView contentContainerStyle={styles.contentContainer}>
-         *     </ScrollView>
-         *   );
-         *   ...
-         *   var styles = StyleSheet.create({
-         *     contentContainer: {
-         *       paddingVertical: 20
-         *     }
-         *   });
-         */
-        contentContainerStyle?: ViewStyle
-
-        /**
-         * When true the scroll view's children are arranged horizontally in a row
-         * instead of vertically in a column. The default value is false.
-         */
-        horizontal?: boolean
-
-        /**
-         * Determines whether the keyboard gets dismissed in response to a drag.
-         *   - 'none' (the default) drags do not dismiss the keyboard.
-         *   - 'onDrag' the keyboard is dismissed when a drag begins.
-         *   - 'interactive' the keyboard is dismissed interactively with the drag
-         *     and moves in synchrony with the touch; dragging upwards cancels the
-         *     dismissal.
-         */
-        keyboardDismissMode?: string
-
-        /**
-         * When false tapping outside of the focused text input when the keyboard
-         * is up dismisses the keyboard. When true the scroll view will not catch
-         * taps and the keyboard will not dismiss automatically. The default value
-         * is false.
-         */
-        keyboardShouldPersistTaps?: boolean
-
-        /**
-         * Fires at most once per frame during scrolling.
-         * The frequency of the events can be contolled using the scrollEventThrottle prop.
-         */
-        onScroll?: () => void
-
-        /**
-         * Experimental: When true offscreen child views (whose `overflow` value is
-         * `hidden`) are removed from their native backing superview when offscreen.
-         * This canimprove scrolling performance on long lists. The default value is
-         * false.
-         */
-        removeClippedSubviews?: boolean
-
-        /**
-         * When true, shows a horizontal scroll indicator.
-         */
-        showsHorizontalScrollIndicator?: boolean
-
-        /**
-         * When true, shows a vertical scroll indicator.
-         */
-        showsVerticalScrollIndicator?: boolean
-
-        /**
-         * Style
-         */
-        style?: ScrollViewStyle
-    }
-
-    export interface ScrollViewProps extends ScrollViewProperties, React.Props<ScrollViewStatic> {
-
-    }
-
-    interface ScrollViewStatic extends React.ComponentClass<ScrollViewProps> {
-
-    }
-
-
-    export interface NativeScrollRectangle {
-        left: number;
-        top: number;
-        bottom: number;
-        right: number;
-    }
-
-    export interface NativeScrollPoint {
-        x: number;
-        y: number;
-    }
-
-    export interface NativeScrollSize {
-        height: number;
-        width: number;
-    }
-
-    export interface NativeScrollEvent {
-        contentInset: NativeScrollRectangle;
-        contentOffset: NativeScrollPoint;
-        contentSize: NativeScrollSize;
-        layoutMeasurement: NativeScrollSize;
-        zoomScale: number;
-    }
-
-    export interface AppStateIOSStatic {
-        currentState: string;
-        addEventListener( type: string, listener: ( state: string ) => void ): void;
-        removeEventListener( type: string, listener: ( state: string ) => void ): void;
-    }
-
-    // exported singletons:
-    // export var AppRegistry: AppRegistryStatic;
-
-
-    export var ActivityIndicatorIOS: ActivityIndicatorIOSStatic;
-    export type ActivityIndicatorIOS = ActivityIndicatorIOSStatic;
-
-    export var AsyncStorage: AsyncStorageStatic;
-    export type AsyncStorage = AsyncStorageStatic;
-
-    export var CameraRoll: CameraRollStatic;
-    export type CameraRoll = CameraRollStatic;
-
-    export var DatePickerIOS: DatePickerIOSStatic
-    export type DatePickerIOS = DatePickerIOSStatic
-
-    export var Image: ImageStatic;
-    export type Image = ImageStatic;
-
-    export var ListView: ListViewStatic;
-    export type ListView = ListViewStatic;
-
-    export var Navigator: NavigatorStatic;
-    export type Navigator = NavigatorStatic;
-
-    export var NavigatorIOS: NavigatorIOSStatic;
-    export type NavigatorIOS = NavigatorIOSStatic;
-
-    export var SliderIOS: SliderIOSStatic;
-    export type SliderIOS = SliderIOSStatic;
-
-    export var ScrollView: ScrollViewStatic
-    export type ScrollView = ScrollViewStatic
-
-    export var StyleSheet: StyleSheetStatic;
-    export type StyleSheet = StyleSheetStatic;
-
-    export var TabBarIOS: TabBarIOSStatic;
-    export type TabBarIOS = TabBarIOSStatic;
-
-    export var Text: TextStatic;
-    export type Text = TextStatic;
-
-    export var TextInput: TextInputStatic
-    export type TextInput = TextInputStatic
-
-    export var TouchableHighlight: TouchableHighlightStatic;
-    export type TouchableHighlight = TouchableHighlightStatic;
-
-    export var TouchableOpacity: TouchableOpacityStatic;
-    export type TouchableOpacity = TouchableOpacityStatic;
-
-    export var TouchableWithoutFeedback: TouchableWithoutFeedbackStatic;
-    export type TouchableWithoutFeedback= TouchableWithoutFeedbackStatic;
-
-    export var View: ViewStatic;
-    export type View = ViewStatic;
-
-    export var AlertIOS: React.ComponentClass<AlertIOSProperties>;
-    export var SegmentedControlIOS: React.ComponentClass<SegmentedControlIOSProperties>;
-    export var SwitchIOS: React.ComponentClass<SwitchIOSProperties>;
-
-    export var PixelRatio: PixelRatioStatic;
-    export var DeviceEventEmitter: DeviceEventEmitterStatic;
-    export var DeviceEventSubscription: DeviceEventSubscriptionStatic;
-    export type DeviceEventSubscription = DeviceEventSubscriptionStatic;
-    export var InteractionManager: InteractionManagerStatic;
-    export var PanResponder: PanResponderStatic;
-    export var AppStateIOS: AppStateIOSStatic;
-
-
-    //react re-exported
-    export type ReactType = React.ReactType;
-
-    export interface ReactElement<P> extends React.ReactElement<P> {}
-
-    export interface ClassicElement<P> extends React.ClassicElement<P> {}
-
-    export interface DOMElement<P> extends React.DOMElement<P> {}
-
-    export type HTMLElement =React.HTMLElement;
-    export type SVGElement = React.SVGElement;
-
-    //
-    // Factories
-    // ----------------------------------------------------------------------
-
-    export interface Factory<P> extends React.Factory<P> {}
-
-    export interface ClassicFactory<P> extends React.ClassicFactory<P> {}
-
-    export interface DOMFactory<P> extends React.DOMFactory<P> {}
-
-    export type HTMLFactory = React.HTMLFactory;
-    export type SVGFactory = React.SVGFactory;
-    export type SVGElementFactory = React.SVGElementFactory;
-
-    //
-    // React Nodes
-    // http://facebook.github.io/react/docs/glossary.html
-    // ----------------------------------------------------------------------
-
-    export type ReactText = React.ReactText;
-    export type ReactChild = React.ReactChild;
-
-    // Should be Array<ReactNode> but type aliases cannot be recursive
-    export type ReactFragment = React.ReactFragment;
-    export type ReactNode = React.ReactNode;
-
-    //
-    // Top Level API
-    // ----------------------------------------------------------------------
-
-    export function createClass<P, S>( spec: React.ComponentSpec<P, S> ): React.ClassicComponentClass<P>;
-
-    export function createFactory<P>( type: string ): React.DOMFactory<P>;
-    export function createFactory<P>( type: React.ClassicComponentClass<P> | string ): React.ClassicFactory<P>;
-    export function createFactory<P>( type: React.ComponentClass<P> ): React.Factory<P>;
-
-    export function createElement<P>( type: string,
-                                      props?: P,
-                                      ...children: React.ReactNode[] ): React.DOMElement<P>;
-    export function createElement<P>( type: React.ClassicComponentClass<P> | string,
-                                      props?: P,
-                                      ...children: React.ReactNode[] ): React.ClassicElement<P>;
-    export function createElement<P>( type: React.ComponentClass<P>,
-                                      props?: P,
-                                      ...children: React.ReactNode[] ): React.ReactElement<P>;
-
-    export function cloneElement<P>( element: React.DOMElement<P>,
-                                     props?: P,
-                                     ...children: React.ReactNode[] ): React.DOMElement<P>;
-    export function cloneElement<P>( element: React.ClassicElement<P>,
-                                     props?: P,
-                                     ...children: React.ReactNode[] ): React.ClassicElement<P>;
-    export function cloneElement<P>( element: React.ReactElement<P>,
-                                     props?: P,
-                                     ...children: React.ReactNode[] ): React.ReactElement<P>;
-
-    export function isValidElement( object: {} ): boolean;
-
-    export var DOM: React.ReactDOM;
-    export var PropTypes: React.ReactPropTypes;
-    export var Children: React.ReactChildren;
-
-    //
-    // Component API
-    // ----------------------------------------------------------------------
-
-    // Base component for plain JS classes
-    export class Component<P, S> extends React.Component<P,S> {}
-
-    export interface ClassicComponent<P, S> extends React.ClassicComponent<P,S> {}
-
-    export interface DOMComponent<P> extends ClassicComponent<P, any> {
-        tagName: string;
-    }
-
-    export type HTMLComponent = React.HTMLComponent;
-    export type SVGComponent = React.SVGComponent
-
-    export interface ChildContextProvider<CC> extends React.ChildContextProvider<CC> {}
-
-    //
-    // Class Interfaces
-    // ----------------------------------------------------------------------
-
-    export interface ComponentClass<P> extends React.ComponentClass<P> {}
-
-    export interface ClassicComponentClass<P> extends React.ClassicComponentClass<P> {}
-
-    //
-    // Component Specs and Lifecycle
-    // ----------------------------------------------------------------------
-
-    export interface ComponentLifecycle<P, S> extends React.ComponentLifecycle<P,S> {}
-
-    export interface Mixin<P, S> extends React.Mixin<P,S> {}
-
-    export interface ComponentSpec<P, S> extends React.ComponentSpec<P,S> {}
-
-    //
-    // Event System
-    // ----------------------------------------------------------------------
-
-    export interface SyntheticEvent extends React.SyntheticEvent {}
-
-    export interface DragEvent extends React.DragEvent {}
-
-    export interface ClipboardEvent extends React.ClipboardEvent {}
-
-    export interface KeyboardEvent extends React.KeyboardEvent {}
-
-
-    export interface FocusEvent extends React.FocusEvent {}
-
-    export interface FormEvent extends React.FormEvent {}
-
-    export interface MouseEvent extends React.MouseEvent {}
-
-    export interface TouchEvent extends React.TouchEvent {}
-
-    export interface UIEvent extends React.UIEvent {}
-
-    export interface WheelEvent extends React.WheelEvent {}
-
-    //
-    // Event Handler Types
-    // ----------------------------------------------------------------------
-
-    export interface EventHandler<E extends React.SyntheticEvent> extends React.EventHandler<E> {}
-
-    export interface DragEventHandler extends React.DragEventHandler {}
-    export interface ClipboardEventHandler extends React.ClipboardEventHandler {}
-    export interface KeyboardEventHandler extends React.KeyboardEventHandler {}
-    export interface FocusEventHandler extends React.FocusEventHandler {}
-    export interface FormEventHandler extends React.FormEventHandler {}
-    export interface MouseEventHandler extends React.MouseEventHandler {}
-    export interface TouchEventHandler extends React.TouchEventHandler {}
-    export interface UIEventHandler extends React.UIEventHandler {}
-    export interface WheelEventHandler extends React.WheelEventHandler {}
-
-    //
-    // Props / DOM Attributes
-    // ----------------------------------------------------------------------
-
-    export interface Props<T> extends React.Props<T> {}
-
-    export interface DOMAttributesBase<T> extends React.DOMAttributesBase<T> {}
-
-    export interface DOMAttributes extends React.DOMAttributes {}
-
-    // This interface is not complete. Only properties accepting
-    // unitless numbers are listed here (see CSSProperty.js in React)
-    export interface CSSProperties extends React.CSSProperties {}
-
-    export interface HTMLAttributesBase<T> extends React.HTMLAttributesBase<T> {}
-
-    export interface HTMLAttributes extends React.HTMLAttributes {}
-
-    export interface SVGElementAttributes extends React.SVGElementAttributes {}
-
-    export interface SVGAttributes extends React.SVGAttributes {}
-
-    //
-    // React.DOM
-    // ----------------------------------------------------------------------
-
-    export interface ReactDOM extends React.ReactDOM {}
-
-    //
-    // React.PropTypes
-    // ----------------------------------------------------------------------
-
-    export interface Validator<T> extends React.Validator<T> {}
-
-    export interface Requireable<T> extends React.Requireable<T> {}
-
-    export interface ValidationMap<T> extends React.ValidationMap<T> {}
-
-    export interface ReactPropTypes extends React.ReactPropTypes {}
-
-    //
-    // React.Children
-    // ----------------------------------------------------------------------
-
-    export interface ReactChildren extends React.ReactChildren {}
-
-    //
-    // Browser Interfaces
-    // https://github.com/nikeee/2048-typescript/blob/master/2048/js/touch.d.ts
-    // ----------------------------------------------------------------------
-
-    export interface AbstractView extends React.AbstractView {}
-
-    export interface Touch extends React.Touch {}
-
-    export interface TouchList extends React.TouchList {}
-
-    //
-    // Additional ( and controversial)
-    //
-
-    export function __spread( target: any, ...sources: any[] ): any;
-
-
-    export interface GlobalStatic {
-
-        /**
-         * Accepts a function as its only argument and calls that function before the next repaint.
-         * It is an essential building block for animations that underlies all of the JavaScript-based animation APIs.
-         * In general, you shouldn't need to call this yourself - the animation API's will manage frame updates for you.
-         * @see https://facebook.github.io/react-native/docs/animations.html#requestanimationframe
-         */
-        requestAnimationFrame( fn: () => void ) : void;
-
-    }
-
-    //
-    // Add-Ons
-    //
-    namespace addons {
-
-        //FIXME: Documentation ?
-        export interface TestModuleStatic {
-
-            verifySnapshot: (done: (indicator?: any) => void) => void
-            markTestPassed: (indicator: any) => void
-            markTestCompleted: () => void
-        }
-
-        export var TestModule: TestModuleStatic
-        export type TestModule = TestModuleStatic
-    }
-
-
-}
-
-declare module "react-native" {
-
-    export default ReactNative
-}
-
-
-declare module "Dimensions" {
-    import React from 'react-native';
-
-    interface Dimensions {
-        get( what: string ): React.ScaledSize;
-    }
-
-    var ExportDimensions: Dimensions;
-    export = ExportDimensions;
-}
-
-declare var global: ReactNative.GlobalStatic
-
-declare function require( name: string ): any
diff --git a/react/react-addons-transition-group.d.ts b/react/react-addons-transition-group.d.ts
new file mode 100644
index 000000000..728c52aa8
--- /dev/null
+++ b/react/react-addons-transition-group.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for React v0.14 (react-addons-transition-group)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="react.d.ts" />
+
+declare namespace __React {
+    
+    interface TransitionGroupProps {
+        component?: ReactType;
+        childFactory?: (child: ReactElement<any>) => ReactElement<any>;
+    }
+    
+    type TransitionGroup = ComponentClass<TransitionGroupProps>;
+    
+    namespace __Addons {
+        export var TransitionGroup: __React.TransitionGroup;
+    }
+}
+
+declare module "react-addons-transition-group" {
+    var TransitionGroup: __React.TransitionGroup;
+    type TransitionGroup = __React.TransitionGroup;
+    export = TransitionGroup;
+}
\ No newline at end of file
diff --git a/react/react-addons-update.d.ts b/react/react-addons-update.d.ts
new file mode 100644
index 000000000..11649799d
--- /dev/null
+++ b/react/react-addons-update.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for React v0.14 (react-addons-update)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="react.d.ts" />
+
+declare namespace __React {
+    interface UpdateSpecCommand {
+        $set?: any;
+        $merge?: {};
+        $apply?(value: any): any;
+    }
+
+    interface UpdateSpecPath {
+        [key: string]: UpdateSpec;
+    }
+
+    type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
+
+    interface UpdateArraySpec extends UpdateSpecCommand {
+        $push?: any[];
+        $unshift?: any[];
+        $splice?: any[][];
+    }
+
+    namespace __Addons {
+        export function update(value: any[], spec: UpdateArraySpec): any[];
+        export function update(value: {}, spec: UpdateSpec): any;
+    }
+}
+
+declare module "react-addons-update" {
+    export = __React.__Addons.update;
+}
diff --git a/react/react-dom.d.ts b/react/react-dom.d.ts
new file mode 100644
index 000000000..80a0c604e
--- /dev/null
+++ b/react/react-dom.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for React v0.14 (react-dom)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="react.d.ts" />
+
+declare namespace __React {
+    namespace __DOM {
+        function findDOMNode<E extends Element>(instance: ReactInstance): E;
+        function findDOMNode(instance: ReactInstance): Element;
+
+        function render<P>(
+            element: DOMElement<P>,
+            container: Element,
+            callback?: (element: Element) => any): Element;
+        function render<P, S>(
+            element: ClassicElement<P>,
+            container: Element,
+            callback?: (component: ClassicComponent<P, S>) => any): ClassicComponent<P, S>;
+        function render<P, S>(
+            element: ReactElement<P>,
+            container: Element,
+            callback?: (component: Component<P, S>) => any): Component<P, S>;
+
+        function unmountComponentAtNode(container: Element): boolean;
+
+        var version: string;
+
+        function unstable_batchedUpdates<A, B>(callback: (a: A, b: B) => any, a: A, b: B): void;
+        function unstable_batchedUpdates<A>(callback: (a: A) => any, a: A): void;
+        function unstable_batchedUpdates(callback: () => any): void;
+
+        function unstable_renderSubtreeIntoContainer<P>(
+            parentComponent: Component<any, any>,
+            nextElement: DOMElement<P>,
+            container: Element,
+            callback?: (element: Element) => any): Element;
+        function unstable_renderSubtreeIntoContainer<P, S>(
+            parentComponent: Component<any, any>,
+            nextElement: ClassicElement<P>,
+            container: Element,
+            callback?: (component: ClassicComponent<P, S>) => any): ClassicComponent<P, S>;
+        function unstable_renderSubtreeIntoContainer<P, S>(
+            parentComponent: Component<any, any>,
+            nextElement: ReactElement<P>,
+            container: Element,
+            callback?: (component: Component<P, S>) => any): Component<P, S>;
+    }
+
+    namespace __DOMServer {
+        function renderToString(element: ReactElement<any>): string;
+        function renderToStaticMarkup(element: ReactElement<any>): string;
+        var version: string;
+    }
+}
+
+declare module "react-dom" {
+    import DOM = __React.__DOM;
+    export = DOM;
+}
+
+declare module "react-dom/server" {
+    import DOMServer = __React.__DOMServer;
+    export = DOMServer;
+}
diff --git a/react/react-global-0.13.3.d.ts b/react/react-global-0.13.3.d.ts
new file mode 100644
index 000000000..13d114892
--- /dev/null
+++ b/react/react-global-0.13.3.d.ts
@@ -0,0 +1,285 @@
+// Type definitions for React v0.13.3 (namespace)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="react-0.13.3.d.ts" />
+
+import React = __React;
+
+declare namespace __React {
+    //
+    // React.addons
+    // ----------------------------------------------------------------------
+
+    export module addons {
+        export var CSSTransitionGroup: CSSTransitionGroup;
+        export var TransitionGroup: TransitionGroup;
+
+        export var LinkedStateMixin: LinkedStateMixin;
+        export var PureRenderMixin: PureRenderMixin;
+
+        export function batchedUpdates<A, B>(
+            callback: (a: A, b: B) => any, a: A, b: B): void;
+        export function batchedUpdates<A>(callback: (a: A) => any, a: A): void;
+        export function batchedUpdates(callback: () => any): void;
+
+        // deprecated: use petehunt/react-classset or JedWatson/classnames
+        export function classSet(cx: { [key: string]: boolean }): string;
+        export function classSet(...classList: string[]): string;
+
+        export function cloneWithProps<P>(
+            element: DOMElement<P>, props: P): DOMElement<P>;
+        export function cloneWithProps<P>(
+            element: ClassicElement<P>, props: P): ClassicElement<P>;
+        export function cloneWithProps<P>(
+            element: ReactElement<P>, props: P): ReactElement<P>;
+
+        export function createFragment(
+            object: { [key: string]: ReactNode }): ReactFragment;
+
+        export function update(value: any[], spec: UpdateArraySpec): any[];
+        export function update(value: {}, spec: UpdateSpec): any;
+
+        // Development tools
+        export import Perf = ReactPerf;
+        export import TestUtils = ReactTestUtils;
+    }
+
+    //
+    // React.addons (Transitions)
+    // ----------------------------------------------------------------------
+
+    interface TransitionGroupProps {
+        component?: ReactType;
+        childFactory?: (child: ReactElement<any>) => ReactElement<any>;
+    }
+
+    interface CSSTransitionGroupProps extends TransitionGroupProps {
+        transitionName: string;
+        transitionAppear?: boolean;
+        transitionEnter?: boolean;
+        transitionLeave?: boolean;
+    }
+
+    type CSSTransitionGroup = ComponentClass<CSSTransitionGroupProps>;
+    type TransitionGroup = ComponentClass<TransitionGroupProps>;
+
+    //
+    // React.addons (Mixins)
+    // ----------------------------------------------------------------------
+
+    interface ReactLink<T> {
+        value: T;
+        requestChange(newValue: T): void;
+    }
+
+    interface LinkedStateMixin extends Mixin<any, any> {
+        linkState<T>(key: string): ReactLink<T>;
+    }
+
+    interface PureRenderMixin extends Mixin<any, any> {
+    }
+
+    //
+    // Reat.addons.update
+    // ----------------------------------------------------------------------
+
+    interface UpdateSpecCommand {
+        $set?: any;
+        $merge?: {};
+        $apply?(value: any): any;
+    }
+
+    interface UpdateSpecPath {
+        [key: string]: UpdateSpec;
+    }
+
+    type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
+
+    interface UpdateArraySpec extends UpdateSpecCommand {
+        $push?: any[];
+        $unshift?: any[];
+        $splice?: any[][];
+    }
+
+    //
+    // React.addons.Perf
+    // ----------------------------------------------------------------------
+
+    interface ComponentPerfContext {
+        current: string;
+        owner: string;
+    }
+
+    interface NumericPerfContext {
+        [key: string]: number;
+    }
+
+    interface Measurements {
+        exclusive: NumericPerfContext;
+        inclusive: NumericPerfContext;
+        render: NumericPerfContext;
+        counts: NumericPerfContext;
+        writes: NumericPerfContext;
+        displayNames: {
+            [key: string]: ComponentPerfContext;
+        };
+        totalTime: number;
+    }
+
+    module ReactPerf {
+        export function start(): void;
+        export function stop(): void;
+        export function printInclusive(measurements: Measurements[]): void;
+        export function printExclusive(measurements: Measurements[]): void;
+        export function printWasted(measurements: Measurements[]): void;
+        export function printDOM(measurements: Measurements[]): void;
+        export function getLastMeasurements(): Measurements[];
+    }
+
+    //
+    // React.addons.TestUtils
+    // ----------------------------------------------------------------------
+
+    interface MockedComponentClass {
+        new(): any;
+    }
+
+    module ReactTestUtils {
+        export import Simulate = ReactSimulate;
+
+        export function renderIntoDocument<P>(
+            element: ReactElement<P>): Component<P, any>;
+        export function renderIntoDocument<C extends Component<any, any>>(
+            element: ReactElement<any>): C;
+
+        export function mockComponent(
+            mocked: MockedComponentClass, mockTagName?: string): typeof ReactTestUtils;
+
+        export function isElementOfType(
+            element: ReactElement<any>, type: ReactType): boolean;
+        export function isTextComponent(instance: Component<any, any>): boolean;
+        export function isDOMComponent(instance: Component<any, any>): boolean;
+        export function isCompositeComponent(instance: Component<any, any>): boolean;
+        export function isCompositeComponentWithType(
+            instance: Component<any, any>,
+            type: ComponentClass<any>): boolean;
+
+        export function findAllInRenderedTree(
+            tree: Component<any, any>,
+            fn: (i: Component<any, any>) => boolean): Component<any, any>;
+
+        export function scryRenderedDOMComponentsWithClass(
+            tree: Component<any, any>,
+            className: string): DOMComponent<any>[];
+        export function findRenderedDOMComponentWithClass(
+            tree: Component<any, any>,
+            className: string): DOMComponent<any>;
+
+        export function scryRenderedDOMComponentsWithTag(
+            tree: Component<any, any>,
+            tagName: string): DOMComponent<any>[];
+        export function findRenderedDOMComponentWithTag(
+            tree: Component<any, any>,
+            tagName: string): DOMComponent<any>;
+
+        export function scryRenderedComponentsWithType<P>(
+            tree: Component<any, any>,
+            type: ComponentClass<P>): Component<P, {}>[];
+        export function scryRenderedComponentsWithType<C extends Component<any, any>>(
+            tree: Component<any, any>,
+            type: ComponentClass<any>): C[];
+
+        export function findRenderedComponentWithType<P>(
+            tree: Component<any, any>,
+            type: ComponentClass<P>): Component<P, {}>;
+        export function findRenderedComponentWithType<C extends Component<any, any>>(
+            tree: Component<any, any>,
+            type: ComponentClass<any>): C;
+
+        export function createRenderer(): ShallowRenderer;
+    }
+
+    interface SyntheticEventData {
+        altKey?: boolean;
+        button?: number;
+        buttons?: number;
+        clientX?: number;
+        clientY?: number;
+        changedTouches?: TouchList;
+        charCode?: boolean;
+        clipboardData?: DataTransfer;
+        ctrlKey?: boolean;
+        deltaMode?: number;
+        deltaX?: number;
+        deltaY?: number;
+        deltaZ?: number;
+        detail?: number;
+        getModifierState?(key: string): boolean;
+        key?: string;
+        keyCode?: number;
+        locale?: string;
+        location?: number;
+        metaKey?: boolean;
+        pageX?: number;
+        pageY?: number;
+        relatedTarget?: EventTarget;
+        repeat?: boolean;
+        screenX?: number;
+        screenY?: number;
+        shiftKey?: boolean;
+        targetTouches?: TouchList;
+        touches?: TouchList;
+        view?: AbstractView;
+        which?: number;
+    }
+
+    interface EventSimulator {
+        (element: Element, eventData?: SyntheticEventData): void;
+        (component: Component<any, any>, eventData?: SyntheticEventData): void;
+    }
+
+    module ReactSimulate {
+        export var blur: EventSimulator;
+        export var change: EventSimulator;
+        export var click: EventSimulator;
+        export var cut: EventSimulator;
+        export var doubleClick: EventSimulator;
+        export var drag: EventSimulator;
+        export var dragEnd: EventSimulator;
+        export var dragEnter: EventSimulator;
+        export var dragExit: EventSimulator;
+        export var dragLeave: EventSimulator;
+        export var dragOver: EventSimulator;
+        export var dragStart: EventSimulator;
+        export var drop: EventSimulator;
+        export var focus: EventSimulator;
+        export var input: EventSimulator;
+        export var keyDown: EventSimulator;
+        export var keyPress: EventSimulator;
+        export var keyUp: EventSimulator;
+        export var mouseDown: EventSimulator;
+        export var mouseEnter: EventSimulator;
+        export var mouseLeave: EventSimulator;
+        export var mouseMove: EventSimulator;
+        export var mouseOut: EventSimulator;
+        export var mouseOver: EventSimulator;
+        export var mouseUp: EventSimulator;
+        export var paste: EventSimulator;
+        export var scroll: EventSimulator;
+        export var submit: EventSimulator;
+        export var touchCancel: EventSimulator;
+        export var touchEnd: EventSimulator;
+        export var touchMove: EventSimulator;
+        export var touchStart: EventSimulator;
+        export var wheel: EventSimulator;
+    }
+
+    class ShallowRenderer {
+        getRenderOutput<E extends ReactElement<any>>(): E;
+        getRenderOutput(): ReactElement<any>;
+        render(element: ReactElement<any>, context?: any): void;
+        unmount(): void;
+    }
+}
diff --git a/react/react-global-tests.ts b/react/react-global-tests.ts
index 0b20e4650..ac8b85116 100644
--- a/react/react-global-tests.ts
+++ b/react/react-global-tests.ts
@@ -68,34 +68,34 @@ var ClassicComponent: React.ClassicComponentClass<Props> =
 
 class ModernComponent extends React.Component<Props, State>
     implements React.ChildContextProvider<ChildContext> {
-    
+
     static propTypes: React.ValidationMap<Props> = {
         foo: React.PropTypes.number
-    }
-    
+    };
+
     static contextTypes: React.ValidationMap<Context> = {
         someValue: React.PropTypes.string
-    }
-    
+    };
+
     static childContextTypes: React.ValidationMap<ChildContext> = {
         someOtherValue: React.PropTypes.string
-    }
-    
+    };
+
     static defaultProps: Props;
-    
+
     context: Context;
-    
+
     getChildContext() {
         return {
-            someOtherValue: 'foo'
-        }
+            someOtherValue: "foo"
+        };
     }
-    
+
     state = {
         inputValue: this.context.someValue,
         seconds: this.props.foo
-    }
-    
+    };
+
     reset() {
         this.setState({
             inputValue: this.context.someValue,
@@ -103,12 +103,12 @@ class ModernComponent extends React.Component<Props, State>
         });
     }
 
-    private _input: React.HTMLComponent;
-    
+    private _input: HTMLInputElement;
+
     render() {
         return React.DOM.div(null,
             React.DOM.input({
-                ref: input => this._input = input,
+                ref: input => this._input = <HTMLInputElement>input,
                 value: this.state.inputValue
             }));
     }
@@ -135,7 +135,7 @@ var element: React.ReactElement<Props> =
     React.createElement(ModernComponent, props);
 var classicElement: React.ClassicElement<Props> =
     React.createElement(ClassicComponent, props);
-var domElement: React.HTMLElement =
+var domElement: React.ReactHTMLElement =
     React.createElement("div");
 
 // React.cloneElement
@@ -143,26 +143,27 @@ var clonedElement: React.ReactElement<Props> =
     React.cloneElement(element, props);
 var clonedClassicElement: React.ClassicElement<Props> =
     React.cloneElement(classicElement, props);
-var clonedDOMElement: React.HTMLElement =
+var clonedDOMElement: React.ReactHTMLElement =
     React.cloneElement(domElement);
 
 // React.render
 var component: React.Component<Props, any> =
-    React.render(element, container);
+    ReactDOM.render(element, container);
 var classicComponent: React.ClassicComponent<Props, any> =
-    React.render(classicElement, container);
-var domComponent: React.DOMComponent<any> =
-    React.render(domElement, container);
+    ReactDOM.render(classicElement, container);
+var domComponent: Element =
+    ReactDOM.render(domElement, container);
 
 // Other Top-Level API
-var unmounted: boolean = React.unmountComponentAtNode(container);
-var str: string = React.renderToString(element);
-var markup: string = React.renderToStaticMarkup(element);
+var unmounted: boolean = ReactDOM.unmountComponentAtNode(container);
+
+// ReactDOMServer is not supported in global version
+// var str: string = ReactDOMServer.renderToString(element);
+// var markup: string = ReactDOMServer.renderToStaticMarkup(element);
 var notValid: boolean = React.isValidElement(props); // false
 var isValid = React.isValidElement(element); // true
-React.initializeTouchEvents(true);
-var domNode: Element = React.findDOMNode(component);
-domNode = React.findDOMNode(domNode);
+var domNode: Element = ReactDOM.findDOMNode(component);
+domNode = ReactDOM.findDOMNode(domNode);
 
 //
 // React Elements
@@ -190,11 +191,7 @@ component.setState({ inputValue: "!!!" });
 component.forceUpdate();
 
 // classic
-var htmlElement: Element = classicComponent.getDOMNode();
-var divElement: HTMLDivElement = classicComponent.getDOMNode<HTMLDivElement>();
 var isMounted: boolean = classicComponent.isMounted();
-classicComponent.setProps(elementProps);
-classicComponent.replaceProps(props);
 classicComponent.replaceState({ inputValue: "???", seconds: 60 });
 
 var myComponent = <MyComponent>component;
@@ -209,7 +206,7 @@ var divStyle: React.CSSProperties = { // CSSProperties
     flex: "1 1 main-size",
     backgroundImage: "url('hello.png')"
 };
-var htmlAttr: React.HTMLAttributes = {
+var htmlAttr: React.HTMLProps<any> = {
     key: 36,
     ref: "htmlComponent",
     children: children,
@@ -328,11 +325,12 @@ var ContextTypesSpecification: React.ComponentSpec<any, any> = {
 // React.Children
 // --------------------------------------------------------------------------
 
-var childMap: { [key: string]: number } =
+var mappedChildrenArray: number[] =
     React.Children.map<number>(children, (child) => { return 42; });
 React.Children.forEach(children, (child) => {});
 var nChildren: number = React.Children.count(children);
 var onlyChild = React.Children.only([null, [[["Hallo"], true]], false]);
+var childrenToArray: React.ReactChild[] = React.Children.toArray(children);
 
 //
 // Example from http://facebook.github.io/react/
@@ -344,7 +342,7 @@ interface TimerState {
 class Timer extends React.Component<{}, TimerState> {
     state = {
         secondsElapsed: 0
-    }
+    };
     private _interval: number;
     tick() {
         this.setState((prevState, props) => ({
@@ -365,5 +363,93 @@ class Timer extends React.Component<{}, TimerState> {
         );
     }
 }
-React.render(React.createElement(Timer), container);
+ReactDOM.render(React.createElement(Timer), container);
 
+//
+// createFragment addon
+// --------------------------------------------------------------------------
+React.addons.createFragment({
+    a: React.DOM.div(),
+    b: ["a", false, React.createElement("span")]
+});
+
+//
+// CSSTransitionGroup addon
+// --------------------------------------------------------------------------
+React.createFactory(React.addons.CSSTransitionGroup)({
+    component: React.createClass({
+        render: (): React.ReactElement<any> => null
+    }),
+    childFactory: (c) => c,
+    transitionName: "transition",
+    transitionAppear: false,
+    transitionEnter: true,
+    transitionLeave: true
+});
+
+//
+// LinkedStateMixin addon
+// --------------------------------------------------------------------------
+React.createClass({
+  mixins: [React.addons.LinkedStateMixin],
+  render: function() { return React.DOM.div(null); }
+});
+
+//
+// Perf addon
+// --------------------------------------------------------------------------
+React.addons.Perf.start();
+React.addons.Perf.stop();
+var measurements = React.addons.Perf.getLastMeasurements();
+React.addons.Perf.printInclusive(measurements);
+React.addons.Perf.printExclusive(measurements);
+React.addons.Perf.printWasted(measurements);
+React.addons.Perf.printDOM(measurements);
+
+//
+// PureRenderMixin addon
+// --------------------------------------------------------------------------
+React.createClass({
+  mixins: [React.addons.PureRenderMixin],
+  render: function() { return React.DOM.div(null); }
+});
+
+//
+// TestUtils addon
+// --------------------------------------------------------------------------
+var node: Element;
+React.addons.TestUtils.Simulate.click(node);
+React.addons.TestUtils.Simulate.change(node);
+React.addons.TestUtils.Simulate.keyDown(node, { key: "Enter" });
+
+var renderer: React.ShallowRenderer =
+    React.addons.TestUtils.createRenderer();
+renderer.render(React.createElement(Timer));
+var output: React.ReactElement<React.Props<Timer>> =
+    renderer.getRenderOutput();
+
+//
+// TransitionGroup addon
+// --------------------------------------------------------------------------
+React.createFactory(React.addons.TransitionGroup)({ component: "div" });
+
+//
+// update addon
+// --------------------------------------------------------------------------
+{
+// These are copied from https://facebook.github.io/react/docs/update.html
+let initialArray = [1, 2, 3];
+let newArray = React.addons.update(initialArray, {$push: [4]}); // => [1, 2, 3, 4]
+
+let collection = [1, 2, {a: [12, 17, 15]}];
+let newCollection = React.addons.update(collection, {2: {a: {$splice: [[1, 1, 13, 14]]}}});
+// => [1, 2, {a: [12, 13, 14, 15]}]
+
+let obj = {a: 5, b: 3};
+let newObj = React.addons.update(obj, {b: {$apply: function(x) {return x * 2;}}});
+// => {a: 5, b: 6}
+let newObj2 = React.addons.update(obj, {b: {$set: obj.b * 2}});
+
+let objShallow = {a: 5, b: 3};
+let newObjShallow = React.addons.update(obj, {$merge: {b: 6, c: 7}}); // => {a: 5, b: 6, c: 7}
+}
diff --git a/react/react-global.d.ts b/react/react-global.d.ts
index 1728ba2fc..1c50ce7e4 100644
--- a/react/react-global.d.ts
+++ b/react/react-global.d.ts
@@ -1,285 +1,22 @@
-// Type definitions for React v0.13.3 (namespace)
+// Type definitions for React v0.14 (namespace)
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="react.d.ts" />
+/// <reference path="react-dom.d.ts" />
+/// <reference path="react-addons-create-fragment.d.ts" />
+/// <reference path="react-addons-css-transition-group.d.ts" />
+/// <reference path="react-addons-linked-state-mixin.d.ts" />
+/// <reference path="react-addons-perf.d.ts" />
+/// <reference path="react-addons-pure-render-mixin.d.ts" />
+/// <reference path="react-addons-test-utils.d.ts" />
+/// <reference path="react-addons-transition-group.d.ts" />
+/// <reference path="react-addons-update.d.ts" />
 
 import React = __React;
+import ReactDOM = __React.__DOM;
 
 declare namespace __React {
-    //
-    // React.addons
-    // ----------------------------------------------------------------------
-
-    export module addons {
-        export var CSSTransitionGroup: CSSTransitionGroup;
-        export var TransitionGroup: TransitionGroup;
-
-        export var LinkedStateMixin: LinkedStateMixin;
-        export var PureRenderMixin: PureRenderMixin;
-
-        export function batchedUpdates<A, B>(
-            callback: (a: A, b: B) => any, a: A, b: B): void;
-        export function batchedUpdates<A>(callback: (a: A) => any, a: A): void;
-        export function batchedUpdates(callback: () => any): void;
-
-        // deprecated: use petehunt/react-classset or JedWatson/classnames
-        export function classSet(cx: { [key: string]: boolean }): string;
-        export function classSet(...classList: string[]): string;
-
-        export function cloneWithProps<P>(
-            element: DOMElement<P>, props: P): DOMElement<P>;
-        export function cloneWithProps<P>(
-            element: ClassicElement<P>, props: P): ClassicElement<P>;
-        export function cloneWithProps<P>(
-            element: ReactElement<P>, props: P): ReactElement<P>;
-
-        export function createFragment(
-            object: { [key: string]: ReactNode }): ReactFragment;
-
-        export function update(value: any[], spec: UpdateArraySpec): any[];
-        export function update(value: {}, spec: UpdateSpec): any;
-
-        // Development tools
-        export import Perf = ReactPerf;
-        export import TestUtils = ReactTestUtils;
-    }
-
-    //
-    // React.addons (Transitions)
-    // ----------------------------------------------------------------------
-
-    interface TransitionGroupProps {
-        component?: ReactType;
-        childFactory?: (child: ReactElement<any>) => ReactElement<any>;
-    }
-
-    interface CSSTransitionGroupProps extends TransitionGroupProps {
-        transitionName: string;
-        transitionAppear?: boolean;
-        transitionEnter?: boolean;
-        transitionLeave?: boolean;
-    }
-
-    type CSSTransitionGroup = ComponentClass<CSSTransitionGroupProps>;
-    type TransitionGroup = ComponentClass<TransitionGroupProps>;
-
-    //
-    // React.addons (Mixins)
-    // ----------------------------------------------------------------------
-
-    interface ReactLink<T> {
-        value: T;
-        requestChange(newValue: T): void;
-    }
-
-    interface LinkedStateMixin extends Mixin<any, any> {
-        linkState<T>(key: string): ReactLink<T>;
-    }
-
-    interface PureRenderMixin extends Mixin<any, any> {
-    }
-
-    //
-    // Reat.addons.update
-    // ----------------------------------------------------------------------
-
-    interface UpdateSpecCommand {
-        $set?: any;
-        $merge?: {};
-        $apply?(value: any): any;
-    }
-
-    interface UpdateSpecPath {
-        [key: string]: UpdateSpec;
-    }
-
-    type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
-
-    interface UpdateArraySpec extends UpdateSpecCommand {
-        $push?: any[];
-        $unshift?: any[];
-        $splice?: any[][];
-    }
-
-    //
-    // React.addons.Perf
-    // ----------------------------------------------------------------------
-
-    interface ComponentPerfContext {
-        current: string;
-        owner: string;
-    }
-
-    interface NumericPerfContext {
-        [key: string]: number;
-    }
-
-    interface Measurements {
-        exclusive: NumericPerfContext;
-        inclusive: NumericPerfContext;
-        render: NumericPerfContext;
-        counts: NumericPerfContext;
-        writes: NumericPerfContext;
-        displayNames: {
-            [key: string]: ComponentPerfContext;
-        };
-        totalTime: number;
-    }
-
-    module ReactPerf {
-        export function start(): void;
-        export function stop(): void;
-        export function printInclusive(measurements: Measurements[]): void;
-        export function printExclusive(measurements: Measurements[]): void;
-        export function printWasted(measurements: Measurements[]): void;
-        export function printDOM(measurements: Measurements[]): void;
-        export function getLastMeasurements(): Measurements[];
-    }
-
-    //
-    // React.addons.TestUtils
-    // ----------------------------------------------------------------------
-
-    interface MockedComponentClass {
-        new(): any;
-    }
-
-    module ReactTestUtils {
-        export import Simulate = ReactSimulate;
-
-        export function renderIntoDocument<P>(
-            element: ReactElement<P>): Component<P, any>;
-        export function renderIntoDocument<C extends Component<any, any>>(
-            element: ReactElement<any>): C;
-
-        export function mockComponent(
-            mocked: MockedComponentClass, mockTagName?: string): typeof ReactTestUtils;
-
-        export function isElementOfType(
-            element: ReactElement<any>, type: ReactType): boolean;
-        export function isTextComponent(instance: Component<any, any>): boolean;
-        export function isDOMComponent(instance: Component<any, any>): boolean;
-        export function isCompositeComponent(instance: Component<any, any>): boolean;
-        export function isCompositeComponentWithType(
-            instance: Component<any, any>,
-            type: ComponentClass<any>): boolean;
-
-        export function findAllInRenderedTree(
-            tree: Component<any, any>,
-            fn: (i: Component<any, any>) => boolean): Component<any, any>;
-
-        export function scryRenderedDOMComponentsWithClass(
-            tree: Component<any, any>,
-            className: string): DOMComponent<any>[];
-        export function findRenderedDOMComponentWithClass(
-            tree: Component<any, any>,
-            className: string): DOMComponent<any>;
-
-        export function scryRenderedDOMComponentsWithTag(
-            tree: Component<any, any>,
-            tagName: string): DOMComponent<any>[];
-        export function findRenderedDOMComponentWithTag(
-            tree: Component<any, any>,
-            tagName: string): DOMComponent<any>;
-
-        export function scryRenderedComponentsWithType<P>(
-            tree: Component<any, any>,
-            type: ComponentClass<P>): Component<P, {}>[];
-        export function scryRenderedComponentsWithType<C extends Component<any, any>>(
-            tree: Component<any, any>,
-            type: ComponentClass<any>): C[];
-
-        export function findRenderedComponentWithType<P>(
-            tree: Component<any, any>,
-            type: ComponentClass<P>): Component<P, {}>;
-        export function findRenderedComponentWithType<C extends Component<any, any>>(
-            tree: Component<any, any>,
-            type: ComponentClass<any>): C;
-
-        export function createRenderer(): ShallowRenderer;
-    }
-
-    interface SyntheticEventData {
-        altKey?: boolean;
-        button?: number;
-        buttons?: number;
-        clientX?: number;
-        clientY?: number;
-        changedTouches?: TouchList;
-        charCode?: boolean;
-        clipboardData?: DataTransfer;
-        ctrlKey?: boolean;
-        deltaMode?: number;
-        deltaX?: number;
-        deltaY?: number;
-        deltaZ?: number;
-        detail?: number;
-        getModifierState?(key: string): boolean;
-        key?: string;
-        keyCode?: number;
-        locale?: string;
-        location?: number;
-        metaKey?: boolean;
-        pageX?: number;
-        pageY?: number;
-        relatedTarget?: EventTarget;
-        repeat?: boolean;
-        screenX?: number;
-        screenY?: number;
-        shiftKey?: boolean;
-        targetTouches?: TouchList;
-        touches?: TouchList;
-        view?: AbstractView;
-        which?: number;
-    }
-
-    interface EventSimulator {
-        (element: Element, eventData?: SyntheticEventData): void;
-        (component: Component<any, any>, eventData?: SyntheticEventData): void;
-    }
-
-    module ReactSimulate {
-        export var blur: EventSimulator;
-        export var change: EventSimulator;
-        export var click: EventSimulator;
-        export var cut: EventSimulator;
-        export var doubleClick: EventSimulator;
-        export var drag: EventSimulator;
-        export var dragEnd: EventSimulator;
-        export var dragEnter: EventSimulator;
-        export var dragExit: EventSimulator;
-        export var dragLeave: EventSimulator;
-        export var dragOver: EventSimulator;
-        export var dragStart: EventSimulator;
-        export var drop: EventSimulator;
-        export var focus: EventSimulator;
-        export var input: EventSimulator;
-        export var keyDown: EventSimulator;
-        export var keyPress: EventSimulator;
-        export var keyUp: EventSimulator;
-        export var mouseDown: EventSimulator;
-        export var mouseEnter: EventSimulator;
-        export var mouseLeave: EventSimulator;
-        export var mouseMove: EventSimulator;
-        export var mouseOut: EventSimulator;
-        export var mouseOver: EventSimulator;
-        export var mouseUp: EventSimulator;
-        export var paste: EventSimulator;
-        export var scroll: EventSimulator;
-        export var submit: EventSimulator;
-        export var touchCancel: EventSimulator;
-        export var touchEnd: EventSimulator;
-        export var touchMove: EventSimulator;
-        export var touchStart: EventSimulator;
-        export var wheel: EventSimulator;
-    }
-
-    class ShallowRenderer {
-        getRenderOutput<E extends ReactElement<any>>(): E;
-        getRenderOutput(): ReactElement<any>;
-        render(element: ReactElement<any>, context?: any): void;
-        unmount(): void;
-    }
+    export import addons = __React.__Addons;
 }
diff --git a/react/react-tests.ts b/react/react-tests.ts
index 053a17eb9..53861d35c 100644
--- a/react/react-tests.ts
+++ b/react/react-tests.ts
@@ -1,11 +1,32 @@
 /// <reference path="react.d.ts" />
+/// <reference path="react-dom.d.ts" />
+/// <reference path="react-addons-create-fragment.d.ts" />
+/// <reference path="react-addons-css-transition-group.d.ts" />
+/// <reference path="react-addons-linked-state-mixin.d.ts" />
+/// <reference path="react-addons-perf.d.ts" />
+/// <reference path="react-addons-pure-render-mixin.d.ts" />
+/// <reference path="react-addons-shallow-compare.d.ts" />
+/// <reference path="react-addons-test-utils.d.ts" />
+/// <reference path="react-addons-transition-group.d.ts" />
+/// <reference path="react-addons-update.d.ts" />
+
 import React = require("react");
+import ReactDOM = require("react-dom");
+import ReactDOMServer = require("react-dom/server");
+import createFragment = require("react-addons-create-fragment");
+import CSSTransitionGroup = require("react-addons-css-transition-group");
+import LinkedStateMixin = require("react-addons-linked-state-mixin");
+import Perf = require("react-addons-perf");
+import PureRenderMixin = require("react-addons-pure-render-mixin");
+import shallowCompare = require("react-addons-shallow-compare");
+import TestUtils = require("react-addons-test-utils");
+import TransitionGroup = require("react-addons-transition-group");
+import update = require("react-addons-update");
 
 interface Props extends React.Props<MyComponent> {
     hello: string;
     world?: string;
     foo: number;
-    bar: boolean;
 }
 
 interface State {
@@ -29,8 +50,7 @@ var props: Props = {
     key: 42,
     ref: "myComponent42",
     hello: "world",
-    foo: 42,
-    bar: true
+    foo: 42
 };
 
 var container: Element;
@@ -42,11 +62,10 @@ var container: Element;
 var ClassicComponent: React.ClassicComponentClass<Props> =
     React.createClass<Props, State>({
         getDefaultProps() {
-            return <Props>{
+            return {
                 hello: undefined,
                 world: "peace",
-                foo: undefined,
-                bar: undefined,
+                foo: undefined
             };
         },
         getInitialState() {
@@ -68,59 +87,83 @@ var ClassicComponent: React.ClassicComponentClass<Props> =
     });
 
 class ModernComponent extends React.Component<Props, State>
-    implements React.ChildContextProvider<ChildContext> {
-    
+    implements MyComponent, React.ChildContextProvider<ChildContext> {
+
     static propTypes: React.ValidationMap<Props> = {
         foo: React.PropTypes.number
-    }
-    
+    };
+
     static contextTypes: React.ValidationMap<Context> = {
         someValue: React.PropTypes.string
-    }
-    
+    };
+
     static childContextTypes: React.ValidationMap<ChildContext> = {
         someOtherValue: React.PropTypes.string
-    }
-    
-    static defaultProps: Props;
-    
+    };
+
     context: Context;
-    
+
     getChildContext() {
         return {
-            someOtherValue: 'foo'
-        }
+            someOtherValue: "foo"
+        };
     }
-    
+
     state = {
         inputValue: this.context.someValue,
         seconds: this.props.foo
-    }
-    
+    };
+
     reset() {
+        this._myComponent.reset();
         this.setState({
             inputValue: this.context.someValue,
             seconds: this.props.foo
         });
     }
 
-    private _input: React.HTMLComponent;
-    
+    private _myComponent: MyComponent;
+    private _input: HTMLInputElement;
+
     render() {
         return React.DOM.div(null,
             React.DOM.input({
-                ref: input => this._input = input,
+                ref: input => this._input = <HTMLInputElement>input,
                 value: this.state.inputValue
             }));
     }
+
+    shouldComponentUpdate(nextProps: Props, nextState: State, nextContext: any): boolean {
+        return shallowCompare(this, nextProps, nextState);
+    }
 }
 
+interface SCProps extends React.Props<{}> {
+    foo?: number;
+}
+
+var StatelessComponent = (props: SCProps) => {
+    return React.DOM.div(null, props.foo);
+};
+
+// Must explicitly type-annotate to add defaultProps/contextTypes
+var StatelessComponent2: React.StatelessComponent<SCProps> =
+    (props: SCProps) => React.DOM.div(null, props.foo);
+StatelessComponent2.defaultProps = {
+    foo: 42
+};
+
 // React.createFactory
 var factory: React.Factory<Props> =
     React.createFactory(ModernComponent);
 var factoryElement: React.ReactElement<Props> =
     factory(props);
 
+var statelessFactory: React.Factory<SCProps> =
+    React.createFactory(StatelessComponent);
+var statelessElement: React.ReactElement<SCProps> =
+    statelessFactory(props);
+
 var classicFactory: React.ClassicFactory<Props> =
     React.createFactory(ClassicComponent);
 var classicFactoryElement: React.ClassicElement<Props> =
@@ -134,36 +177,39 @@ var domFactoryElement: React.DOMElement<any> =
 // React.createElement
 var element: React.ReactElement<Props> =
     React.createElement(ModernComponent, props);
+var statelessElement: React.ReactElement<SCProps> =
+    React.createElement(StatelessComponent, props);
 var classicElement: React.ClassicElement<Props> =
     React.createElement(ClassicComponent, props);
-var domElement: React.HTMLElement =
+var domElement: React.ReactHTMLElement =
     React.createElement("div");
 
 // React.cloneElement
 var clonedElement: React.ReactElement<Props> =
     React.cloneElement(element, props);
+var clonedStatelessElement: React.ReactElement<SCProps> =
+    React.cloneElement(statelessElement, props);
 var clonedClassicElement: React.ClassicElement<Props> =
     React.cloneElement(classicElement, props);
-var clonedDOMElement: React.HTMLElement =
+var clonedDOMElement: React.ReactHTMLElement =
     React.cloneElement(domElement);
 
 // React.render
 var component: React.Component<Props, any> =
-    React.render(element, container);
+    ReactDOM.render(element, container);
 var classicComponent: React.ClassicComponent<Props, any> =
-    React.render(classicElement, container);
-var domComponent: React.DOMComponent<any> =
-    React.render(domElement, container);
+    ReactDOM.render(classicElement, container);
+var domComponent: Element =
+    ReactDOM.render(domElement, container);
 
 // Other Top-Level API
-var unmounted: boolean = React.unmountComponentAtNode(container);
-var str: string = React.renderToString(element);
-var markup: string = React.renderToStaticMarkup(element);
+var unmounted: boolean = ReactDOM.unmountComponentAtNode(container);
+var str: string = ReactDOMServer.renderToString(element);
+var markup: string = ReactDOMServer.renderToStaticMarkup(element);
 var notValid: boolean = React.isValidElement(props); // false
 var isValid = React.isValidElement(element); // true
-React.initializeTouchEvents(true);
-var domNode: Element = React.findDOMNode(component);
-domNode = React.findDOMNode(domNode);
+var domNode: Element = ReactDOM.findDOMNode(component);
+domNode = ReactDOM.findDOMNode(domNode);
 
 //
 // React Elements
@@ -191,16 +237,42 @@ component.setState({ inputValue: "!!!" });
 component.forceUpdate();
 
 // classic
-var htmlElement: Element = classicComponent.getDOMNode();
-var divElement: HTMLDivElement = classicComponent.getDOMNode<HTMLDivElement>();
 var isMounted: boolean = classicComponent.isMounted();
-classicComponent.setProps(elementProps);
-classicComponent.replaceProps(props);
 classicComponent.replaceState({ inputValue: "???", seconds: 60 });
 
 var myComponent = <MyComponent>component;
 myComponent.reset();
 
+//
+// Refs
+// NB: to infer the correct type for callback refs, your component's Props
+// interface must extend React.Props<T> where T is your component type (or
+// an interface that it implements).
+// --------------------------------------------------------------------------
+
+interface RCProps extends React.Props<RefComponent> {
+}
+
+class RefComponent extends React.Component<RCProps, {}> {
+    static create = React.createFactory(RefComponent);
+    refMethod() {
+    }
+}
+
+var componentRef: RefComponent;
+RefComponent.create({ ref: "componentRef" });
+// type of c should be inferred
+RefComponent.create({ ref: c => componentRef = c });
+componentRef.refMethod();
+
+var domNodeRef: Element;
+React.DOM.div({ ref: "domRef" });
+// type of node should be inferred
+React.DOM.div({ ref: node => domNodeRef = node });
+
+var inputNodeRef: HTMLInputElement;
+React.DOM.input({ ref: node => inputNodeRef = <HTMLInputElement>node });
+
 //
 // Attributes
 // --------------------------------------------------------------------------
@@ -210,7 +282,7 @@ var divStyle: React.CSSProperties = { // CSSProperties
     flex: "1 1 main-size",
     backgroundImage: "url('hello.png')"
 };
-var htmlAttr: React.HTMLAttributes = {
+var htmlAttr: React.HTMLProps<HTMLElement> = {
     key: 36,
     ref: "htmlComponent",
     children: children,
@@ -329,11 +401,12 @@ var ContextTypesSpecification: React.ComponentSpec<any, any> = {
 // React.Children
 // --------------------------------------------------------------------------
 
-var childMap: { [key: string]: number } =
+var mappedChildrenArray: number[] =
     React.Children.map<number>(children, (child) => { return 42; });
 React.Children.forEach(children, (child) => {});
 var nChildren: number = React.Children.count(children);
 var onlyChild = React.Children.only([null, [[["Hallo"], true]], false]);
+var childrenToArray: React.ReactChild[] = React.Children.toArray(children);
 
 //
 // Example from http://facebook.github.io/react/
@@ -345,7 +418,7 @@ interface TimerState {
 class Timer extends React.Component<{}, TimerState> {
     state = {
         secondsElapsed: 0
-    }
+    };
     private _interval: number;
     tick() {
         this.setState((prevState, props) => ({
@@ -366,5 +439,121 @@ class Timer extends React.Component<{}, TimerState> {
         );
     }
 }
-React.render(React.createElement(Timer), container);
+ReactDOM.render(React.createElement(Timer), container);
 
+//
+// createFragment addon
+// --------------------------------------------------------------------------
+createFragment({
+    a: React.DOM.div(),
+    b: ["a", false, React.createElement("span")]
+});
+
+//
+// CSSTransitionGroup addon
+// --------------------------------------------------------------------------
+React.createFactory(CSSTransitionGroup)({
+    component: React.createClass({
+        render: (): React.ReactElement<any> => null
+    }),
+    childFactory: (c) => c,
+    transitionName: "transition",
+    transitionAppear: false,
+    transitionEnter: true,
+    transitionLeave: true
+});
+
+React.createFactory(CSSTransitionGroup)({
+    transitionName: {
+        enter: "enter",
+        enterActive: "enterActive",
+        leave: "leave",
+        leaveActive: "leaveActive",
+        appear: "appear",
+        appearActive: "appearActive"
+    }
+});
+
+//
+// LinkedStateMixin addon
+// --------------------------------------------------------------------------
+React.createClass({
+    mixins: [LinkedStateMixin],
+    getInitialState: function() {
+        return {
+            isChecked: false,
+            message: "hello!"
+        };
+    },
+    render: function() {
+        return React.DOM.div(null,
+            React.DOM.input({
+                type: "checkbox",
+                checkedLink: this.linkState("isChecked")
+            }),
+            React.DOM.input({
+                type: "text",
+                valueLink: this.linkState("message")
+            })
+        );
+    }
+});
+
+//
+// Perf addon
+// --------------------------------------------------------------------------
+Perf.start();
+Perf.stop();
+var measurements = Perf.getLastMeasurements();
+Perf.printInclusive(measurements);
+Perf.printExclusive(measurements);
+Perf.printWasted(measurements);
+Perf.printDOM(measurements);
+
+//
+// PureRenderMixin addon
+// --------------------------------------------------------------------------
+React.createClass({
+  mixins: [PureRenderMixin],
+  render: function() { return React.DOM.div(null); }
+});
+
+//
+// TestUtils addon
+// --------------------------------------------------------------------------
+var node: Element;
+TestUtils.Simulate.click(node);
+TestUtils.Simulate.change(node);
+TestUtils.Simulate.keyDown(node, { key: "Enter" });
+
+var renderer: React.ShallowRenderer =
+    TestUtils.createRenderer();
+renderer.render(React.createElement(Timer));
+var output: React.ReactElement<React.Props<Timer>> =
+    renderer.getRenderOutput();
+
+//
+// TransitionGroup addon
+// --------------------------------------------------------------------------
+React.createFactory(TransitionGroup)({ component: "div" });
+
+//
+// update addon
+// --------------------------------------------------------------------------
+{
+// These are copied from https://facebook.github.io/react/docs/update.html
+let initialArray = [1, 2, 3];
+let newArray = update(initialArray, {$push: [4]}); // => [1, 2, 3, 4]
+
+let collection = [1, 2, {a: [12, 17, 15]}];
+let newCollection = update(collection, {2: {a: {$splice: [[1, 1, 13, 14]]}}});
+// => [1, 2, {a: [12, 13, 14, 15]}]
+
+let obj = {a: 5, b: 3};
+let newObj = update(obj, {b: {$apply: function(x) {return x * 2;}}});
+// => {a: 5, b: 6}
+let newObj2 = update(obj, {b: {$set: obj.b * 2}});
+
+let objShallow = {a: 5, b: 3};
+let newObjShallow = update(obj, {$merge: {b: 6, c: 7}}); // => {a: 5, b: 6, c: 7}
+}
diff --git a/react/react.d.ts b/react/react.d.ts
index 25a3a30b9..fb04cf0f5 100644
--- a/react/react.d.ts
+++ b/react/react.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for React v0.13.3
+// Type definitions for React v0.14
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -8,27 +8,32 @@ declare namespace __React {
     // React Elements
     // ----------------------------------------------------------------------
 
-    type ReactType = ComponentClass<any> | string;
+    type ReactType = string | ComponentClass<any> | StatelessComponent<any>;
 
-    interface ReactElement<P> {
-        type: string | ComponentClass<P>;
+    interface ReactElement<P extends Props<any>> {
+        type: string | ComponentClass<P> | StatelessComponent<P>;
         props: P;
         key: string | number;
-        ref: string | ((component: Component<P, any>) => any);
+        ref: string | ((component: Component<P, any> | Element) => any);
     }
 
     interface ClassicElement<P> extends ReactElement<P> {
-        type: string | ClassicComponentClass<P>;
+        type: ClassicComponentClass<P>;
         ref: string | ((component: ClassicComponent<P, any>) => any);
     }
 
-    interface DOMElement<P> extends ClassicElement<P> {
+    interface DOMElement<P extends Props<Element>> extends ReactElement<P> {
         type: string;
-        ref: string | ((component: DOMComponent<P>) => any);
+        ref: string | ((element: Element) => any);
     }
 
-    type HTMLElement = DOMElement<HTMLAttributes>;
-    type SVGElement = DOMElement<SVGAttributes>;
+    interface ReactHTMLElement extends DOMElement<HTMLProps<HTMLElement>> {
+        ref: string | ((element: HTMLElement) => any);
+    }
+
+    interface ReactSVGElement extends DOMElement<SVGProps> {
+        ref: string | ((element: SVGElement) => any);
+    }
 
     //
     // Factories
@@ -42,13 +47,12 @@ declare namespace __React {
         (props?: P, ...children: ReactNode[]): ClassicElement<P>;
     }
 
-    interface DOMFactory<P> extends ClassicFactory<P> {
+    interface DOMFactory<P extends Props<Element>> extends Factory<P> {
         (props?: P, ...children: ReactNode[]): DOMElement<P>;
     }
 
-    type HTMLFactory = DOMFactory<HTMLAttributes>;
-    type SVGFactory = DOMFactory<SVGAttributes>;
-    type SVGElementFactory = DOMFactory<SVGElementAttributes>;
+    type HTMLFactory = DOMFactory<HTMLProps<HTMLElement>>;
+    type SVGFactory = DOMFactory<SVGProps>;
 
     //
     // React Nodes
@@ -69,19 +73,19 @@ declare namespace __React {
     function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
 
     function createFactory<P>(type: string): DOMFactory<P>;
-    function createFactory<P>(type: ClassicComponentClass<P> | string): ClassicFactory<P>;
-    function createFactory<P>(type: ComponentClass<P>): Factory<P>;
+    function createFactory<P>(type: ClassicComponentClass<P>): ClassicFactory<P>;
+    function createFactory<P>(type: ComponentClass<P> | StatelessComponent<P>): Factory<P>;
 
     function createElement<P>(
         type: string,
         props?: P,
         ...children: ReactNode[]): DOMElement<P>;
     function createElement<P>(
-        type: ClassicComponentClass<P> | string,
+        type: ClassicComponentClass<P>,
         props?: P,
         ...children: ReactNode[]): ClassicElement<P>;
     function createElement<P>(
-        type: ComponentClass<P>,
+        type: ComponentClass<P> | StatelessComponent<P>,
         props?: P,
         ...children: ReactNode[]): ReactElement<P>;
 
@@ -98,29 +102,7 @@ declare namespace __React {
         props?: P,
         ...children: ReactNode[]): ReactElement<P>;
 
-    function render<P>(
-        element: DOMElement<P>,
-        container: Element,
-        callback?: () => any): DOMComponent<P>;
-    function render<P, S>(
-        element: ClassicElement<P>,
-        container: Element,
-        callback?: () => any): ClassicComponent<P, S>;
-    function render<P, S>(
-        element: ReactElement<P>,
-        container: Element,
-        callback?: () => any): Component<P, S>;
-
-    function unmountComponentAtNode(container: Element): boolean;
-    function renderToString(element: ReactElement<any>): string;
-    function renderToStaticMarkup(element: ReactElement<any>): string;
     function isValidElement(object: {}): boolean;
-    function initializeTouchEvents(shouldUseTouch: boolean): void;
-
-    function findDOMNode<TElement extends Element>(
-        componentOrElement: Component<any, any> | Element): TElement;
-    function findDOMNode(
-        componentOrElement: Component<any, any> | Element): Element;
 
     var DOM: ReactDOM;
     var PropTypes: ReactPropTypes;
@@ -130,13 +112,10 @@ declare namespace __React {
     // Component API
     // ----------------------------------------------------------------------
 
+    type ReactInstance = Component<any, any> | Element;
+
     // Base component for plain JS classes
     class Component<P, S> implements ComponentLifecycle<P, S> {
-        static propTypes: ValidationMap<any>;
-        static contextTypes: ValidationMap<any>;
-        static childContextTypes: ValidationMap<any>;
-        static defaultProps: Props<any>;
-
         constructor(props?: P, context?: any);
         setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
         setState(state: S, callback?: () => any): void;
@@ -146,27 +125,16 @@ declare namespace __React {
         state: S;
         context: {};
         refs: {
-            [key: string]: Component<any, any>
+            [key: string]: ReactInstance
         };
     }
 
     interface ClassicComponent<P, S> extends Component<P, S> {
         replaceState(nextState: S, callback?: () => any): void;
-        getDOMNode<TElement extends Element>(): TElement;
-        getDOMNode(): Element;
         isMounted(): boolean;
         getInitialState?(): S;
-        setProps(nextProps: P, callback?: () => any): void;
-        replaceProps(nextProps: P, callback?: () => any): void;
     }
 
-    interface DOMComponent<P> extends ClassicComponent<P, any> {
-        tagName: string;
-    }
-
-    type HTMLComponent = DOMComponent<HTMLAttributes>;
-    type SVGComponent = DOMComponent<SVGAttributes>;
-
     interface ChildContextProvider<CC> {
         getChildContext(): CC;
     }
@@ -175,6 +143,13 @@ declare namespace __React {
     // Class Interfaces
     // ----------------------------------------------------------------------
 
+    interface StatelessComponent<P> {
+        (props?: P, context?: any): ReactElement<any>;
+        propTypes?: ValidationMap<P>;
+        contextTypes?: ValidationMap<any>;
+        defaultProps?: P;
+    }
+
     interface ComponentClass<P> {
         new(props?: P, context?: any): Component<P, any>;
         propTypes?: ValidationMap<P>;
@@ -212,7 +187,7 @@ declare namespace __React {
         displayName?: string;
         propTypes?: ValidationMap<any>;
         contextTypes?: ValidationMap<any>;
-        childContextTypes?: ValidationMap<any>
+        childContextTypes?: ValidationMap<any>;
 
         getDefaultProps?(): P;
         getInitialState?(): S;
@@ -243,12 +218,23 @@ declare namespace __React {
         type: string;
     }
 
+    interface ClipboardEvent extends SyntheticEvent {
+        clipboardData: DataTransfer;
+    }
+
+    interface CompositionEvent extends SyntheticEvent {
+        data: string;
+    }
+
     interface DragEvent extends SyntheticEvent {
         dataTransfer: DataTransfer;
     }
 
-    interface ClipboardEvent extends SyntheticEvent {
-        clipboardData: DataTransfer;
+    interface FocusEvent extends SyntheticEvent {
+        relatedTarget: EventTarget;
+    }
+
+    interface FormEvent extends SyntheticEvent {
     }
 
     interface KeyboardEvent extends SyntheticEvent {
@@ -266,13 +252,6 @@ declare namespace __React {
         which: number;
     }
 
-    interface FocusEvent extends SyntheticEvent {
-        relatedTarget: EventTarget;
-    }
-
-    interface FormEvent extends SyntheticEvent {
-    }
-
     interface MouseEvent extends SyntheticEvent {
         altKey: boolean;
         button: number;
@@ -313,8 +292,6 @@ declare namespace __React {
         deltaZ: number;
     }
 
-    interface LoadEvent extends SyntheticEvent {}
-
     //
     // Event Handler Types
     // ----------------------------------------------------------------------
@@ -323,16 +300,18 @@ declare namespace __React {
         (event: E): void;
     }
 
-    interface DragEventHandler extends EventHandler<DragEvent> {}
-    interface ClipboardEventHandler extends EventHandler<ClipboardEvent> {}
-    interface KeyboardEventHandler extends EventHandler<KeyboardEvent> {}
-    interface FocusEventHandler extends EventHandler<FocusEvent> {}
-    interface FormEventHandler extends EventHandler<FormEvent> {}
-    interface MouseEventHandler extends EventHandler<MouseEvent> {}
-    interface TouchEventHandler extends EventHandler<TouchEvent> {}
-    interface UIEventHandler extends EventHandler<UIEvent> {}
-    interface WheelEventHandler extends EventHandler<WheelEvent> {}
-    interface LoadEventHandler extends EventHandler<LoadEvent> {}
+    type ReactEventHandler = EventHandler<SyntheticEvent>;
+
+    type ClipboardEventHandler = EventHandler<ClipboardEvent>;
+    type CompositionEventHandler = EventHandler<CompositionEvent>;
+    type DragEventHandler = EventHandler<DragEvent>;
+    type FocusEventHandler = EventHandler<FocusEvent>;
+    type FormEventHandler = EventHandler<FormEvent>;
+    type KeyboardEventHandler = EventHandler<KeyboardEvent>;
+    type MouseEventHandler = EventHandler<MouseEvent>;
+    type TouchEventHandler = EventHandler<TouchEvent>;
+    type UIEventHandler = EventHandler<UIEvent>;
+    type WheelEventHandler = EventHandler<WheelEvent>;
 
     //
     // Props / DOM Attributes
@@ -344,18 +323,70 @@ declare namespace __React {
         ref?: string | ((component: T) => any);
     }
 
-    interface DOMAttributesBase<T> extends Props<T> {
+    interface HTMLProps<T> extends HTMLAttributes, Props<T> {
+    }
+
+    interface SVGProps extends SVGAttributes, Props<SVGElement> {
+    }
+
+    interface DOMAttributes {
+        dangerouslySetInnerHTML?: {
+            __html: string;
+        };
+
+        // Clipboard Events
         onCopy?: ClipboardEventHandler;
         onCut?: ClipboardEventHandler;
         onPaste?: ClipboardEventHandler;
-        onKeyDown?: KeyboardEventHandler;
-        onKeyPress?: KeyboardEventHandler;
-        onKeyUp?: KeyboardEventHandler;
+
+        // Composition Events
+        onCompositionEnd?: CompositionEventHandler;
+        onCompositionStart?: CompositionEventHandler;
+        onCompositionUpdate?: CompositionEventHandler;
+
+        // Focus Events
         onFocus?: FocusEventHandler;
         onBlur?: FocusEventHandler;
+
+        // Form Events
         onChange?: FormEventHandler;
         onInput?: FormEventHandler;
         onSubmit?: FormEventHandler;
+
+        // Image Events
+        onLoad?: ReactEventHandler;
+        onError?: ReactEventHandler; // also a Media Event
+
+        // Keyboard Events
+        onKeyDown?: KeyboardEventHandler;
+        onKeyPress?: KeyboardEventHandler;
+        onKeyUp?: KeyboardEventHandler;
+
+        // Media Events
+        onAbort?: ReactEventHandler;
+        onCanPlay?: ReactEventHandler;
+        onCanPlayThrough?: ReactEventHandler;
+        onDurationChange?: ReactEventHandler;
+        onEmptied?: ReactEventHandler;
+        onEncrypted?: ReactEventHandler;
+        onEnded?: ReactEventHandler;
+        onLoadedData?: ReactEventHandler;
+        onLoadedMetadata?: ReactEventHandler;
+        onLoadStart?: ReactEventHandler;
+        onPause?: ReactEventHandler;
+        onPlay?: ReactEventHandler;
+        onPlaying?: ReactEventHandler;
+        onProgress?: ReactEventHandler;
+        onRateChange?: ReactEventHandler;
+        onSeeked?: ReactEventHandler;
+        onSeeking?: ReactEventHandler;
+        onStalled?: ReactEventHandler;
+        onSuspend?: ReactEventHandler;
+        onTimeUpdate?: ReactEventHandler;
+        onVolumeChange?: ReactEventHandler;
+        onWaiting?: ReactEventHandler;
+
+        // MouseEvents
         onClick?: MouseEventHandler;
         onContextMenu?: MouseEventHandler;
         onDoubleClick?: MouseEventHandler;
@@ -374,23 +405,21 @@ declare namespace __React {
         onMouseOut?: MouseEventHandler;
         onMouseOver?: MouseEventHandler;
         onMouseUp?: MouseEventHandler;
+
+        // Selection Events
+        onSelect?: ReactEventHandler;
+
+        // Touch Events
         onTouchCancel?: TouchEventHandler;
         onTouchEnd?: TouchEventHandler;
         onTouchMove?: TouchEventHandler;
         onTouchStart?: TouchEventHandler;
+
+        // UI Events
         onScroll?: UIEventHandler;
+
+        // Wheel Events
         onWheel?: WheelEventHandler;
-        onLoad?: LoadEventHandler;
-
-        className?: string;
-        id?: string;
-
-        dangerouslySetInnerHTML?: {
-            __html: string;
-        };
-    }
-
-    interface DOMAttributes extends DOMAttributesBase<DOMComponent<any>> {
     }
 
     // This interface is not complete. Only properties accepting
@@ -419,10 +448,1244 @@ declare namespace __React {
         strokeOpacity?: number;
         strokeWidth?: number;
 
+        // Remaining properties auto-extracted from http://docs.webplatform.org.
+        // License: http://docs.webplatform.org/wiki/Template:CC-by-3.0
+        /**
+         * Aligns a flex container's lines within the flex container when there is extra space in the cross-axis, similar to how justify-content aligns individual items within the main-axis.
+         */
+        alignContent?: any;
+
+        /**
+         * Sets the default alignment in the cross axis for all of the flex container's items, including anonymous flex items, similarly to how justify-content aligns items along the main axis.
+         */
+        alignItems?: any;
+
+        /**
+         * Allows the default alignment to be overridden for individual flex items.
+         */
+        alignSelf?: any;
+
+        /**
+         * This property allows precise alignment of elements, such as graphics, that do not have a baseline-table or lack the desired baseline in their baseline-table. With the alignment-adjust property, the position of the baseline identified by the alignment-baseline can be explicitly determined. It also determines precisely the alignment point for each glyph within a textual element.
+         */
+        alignmentAdjust?: any;
+
+        alignmentBaseline?: any;
+
+        /**
+         * Defines a length of time to elapse before an animation starts, allowing an animation to begin execution some time after it is applied.
+         */
+        animationDelay?: any;
+
+        /**
+         * Defines whether an animation should run in reverse on some or all cycles.
+         */
+        animationDirection?: any;
+
+        /**
+         * Specifies how many times an animation cycle should play.
+         */
+        animationIterationCount?: any;
+
+        /**
+         * Defines the list of animations that apply to the element.
+         */
+        animationName?: any;
+
+        /**
+         * Defines whether an animation is running or paused.
+         */
+        animationPlayState?: any;
+
+        /**
+         * Allows changing the style of any element to platform-based interface elements or vice versa.
+         */
+        appearance?: any;
+
+        /**
+         * Determines whether or not the “back” side of a transformed element is visible when facing the viewer.
+         */
+        backfaceVisibility?: any;
+
+        /**
+         * This property describes how the element's background images should blend with each other and the element's background color.
+         * The value is a list of blend modes that corresponds to each background image. Each element in the list will apply to the corresponding element of background-image. If a property doesn’t have enough comma-separated values to match the number of layers, the UA must calculate its used value by repeating the list of values until there are enough.
+         */
+        backgroundBlendMode?: any;
+
+        backgroundComposite?: any;
+
+        /**
+         * Applies one or more background images to an element. These can be any valid CSS image, including url() paths to image files or CSS gradients.
+         */
+        backgroundImage?: any;
+
+        /**
+         * Specifies what the background-position property is relative to.
+         */
+        backgroundOrigin?: any;
+
+        /**
+         * Sets the horizontal position of a background image.
+         */
+        backgroundPositionX?: any;
+
+        /**
+         * Background-repeat defines if and how background images will be repeated after they have been sized and positioned
+         */
+        backgroundRepeat?: any;
+
+        /**
+         * Obsolete - spec retired, not implemented.
+         */
+        baselineShift?: any;
+
+        /**
+         * Non standard. Sets or retrieves the location of the Dynamic HTML (DHTML) behavior.
+         */
+        behavior?: any;
+
+        /**
+         * Shorthand property that defines the different properties of all four sides of an element's border in a single declaration. It can be used to set border-width, border-style and border-color, or a subset of these.
+         */
+        border?: any;
+
+        /**
+         * Defines the shape of the border of the bottom-left corner.
+         */
+        borderBottomLeftRadius?: any;
+
+        /**
+         * Defines the shape of the border of the bottom-right corner.
+         */
+        borderBottomRightRadius?: any;
+
+        /**
+         * Sets the width of an element's bottom border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         */
+        borderBottomWidth?: any;
+
+        /**
+         * Border-collapse can be used for collapsing the borders between table cells
+         */
+        borderCollapse?: any;
+
+        /**
+         * The CSS border-color property sets the color of an element's four borders. This property can have from one to four values, made up of the elementary properties:     •       border-top-color
+         *      •       border-right-color
+         *      •       border-bottom-color
+         *      •       border-left-color The default color is the currentColor of each of these values.
+         * If you provide one value, it sets the color for the element. Two values set the horizontal and vertical values, respectively. Providing three values sets the top, vertical, and bottom values, in that order. Four values set all for sides: top, right, bottom, and left, in that order.
+         */
+        borderColor?: any;
+
+        /**
+         * Specifies different corner clipping effects, such as scoop (inner curves), bevel (straight cuts) or notch (cut-off rectangles). Works along with border-radius to specify the size of each corner effect.
+         */
+        borderCornerShape?: any;
+
+        /**
+         * The property border-image-source is used to set the image to be used instead of the border style. If this is set to none the border-style is used instead.
+         */
+        borderImageSource?: any;
+
+        /**
+         * The border-image-width CSS property defines the offset to use for dividing the border image in nine parts, the top-left corner, central top edge, top-right-corner, central right edge, bottom-right corner, central bottom edge, bottom-left corner, and central right edge. They represent inward distance from the top, right, bottom, and left edges.
+         */
+        borderImageWidth?: any;
+
+        /**
+         * Shorthand property that defines the border-width, border-style and border-color of an element's left border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the left border — border-left-width, border-left-style and border-left-color.
+         */
+        borderLeft?: any;
+
+        /**
+         * The CSS border-left-color property sets the color of an element's left border. This page explains the border-left-color value, but often you will find it more convenient to fix the border's left color as part of a shorthand set, either border-left or border-color.
+         * Colors can be defined several ways. For more information, see Usage.
+         */
+        borderLeftColor?: any;
+
+        /**
+         * Sets the style of an element's left border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
+         */
+        borderLeftStyle?: any;
+
+        /**
+         * Sets the width of an element's left border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         */
+        borderLeftWidth?: any;
+
+        /**
+         * Shorthand property that defines the border-width, border-style and border-color of an element's right border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the right border — border-right-width, border-right-style and border-right-color.
+         */
+        borderRight?: any;
+
+        /**
+         * Sets the color of an element's right border. This page explains the border-right-color value, but often you will find it more convenient to fix the border's right color as part of a shorthand set, either border-right or border-color.
+         * Colors can be defined several ways. For more information, see Usage.
+         */
+        borderRightColor?: any;
+
+        /**
+         * Sets the style of an element's right border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
+         */
+        borderRightStyle?: any;
+
+        /**
+         * Sets the width of an element's right border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         */
+        borderRightWidth?: any;
+
+        /**
+         * Specifies the distance between the borders of adjacent cells.
+         */
+        borderSpacing?: any;
+
+        /**
+         * Sets the style of an element's four borders. This property can have from one to four values. With only one value, the value will be applied to all four borders; otherwise, this works as a shorthand property for each of border-top-style, border-right-style, border-bottom-style, border-left-style, where each border style may be assigned a separate value.
+         */
+        borderStyle?: any;
+
+        /**
+         * Shorthand property that defines the border-width, border-style and border-color of an element's top border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the top border — border-top-width, border-top-style and border-top-color.
+         */
+        borderTop?: any;
+
+        /**
+         * Sets the color of an element's top border. This page explains the border-top-color value, but often you will find it more convenient to fix the border's top color as part of a shorthand set, either border-top or border-color.
+         * Colors can be defined several ways. For more information, see Usage.
+         */
+        borderTopColor?: any;
+
+        /**
+         * Sets the rounding of the top-left corner of the element.
+         */
+        borderTopLeftRadius?: any;
+
+        /**
+         * Sets the rounding of the top-right corner of the element.
+         */
+        borderTopRightRadius?: any;
+
+        /**
+         * Sets the style of an element's top border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
+         */
+        borderTopStyle?: any;
+
+        /**
+         * Sets the width of an element's top border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         */
+        borderTopWidth?: any;
+
+        /**
+         * Sets the width of an element's four borders. This property can have from one to four values. This is a shorthand property for setting values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         */
+        borderWidth?: any;
+
+        /**
+         * Obsolete.
+         */
+        boxAlign?: any;
+
+        /**
+         * Breaks a box into fragments creating new borders, padding and repeating backgrounds or lets it stay as a continuous box on a page break, column break, or, for inline elements, at a line break.
+         */
+        boxDecorationBreak?: any;
+
+        /**
+         * Deprecated
+         */
+        boxDirection?: any;
+
+        /**
+         * Do not use. This property has been replaced by the flex-wrap property.
+         * Gets or sets a value that specifies the direction to add successive rows or columns when the value of box-lines is set to multiple.
+         */
+        boxLineProgression?: any;
+
+        /**
+         * Do not use. This property has been replaced by the flex-wrap property.
+         * Gets or sets a value that specifies whether child elements wrap onto multiple lines or columns based on the space available in the object.
+         */
+        boxLines?: any;
+
+        /**
+         * Do not use. This property has been replaced by flex-order.
+         * Specifies the ordinal group that a child element of the object belongs to. This ordinal value identifies the display order (along the axis defined by the box-orient property) for the group.
+         */
+        boxOrdinalGroup?: 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.
+         */
+        breakAfter?: any;
+
+        /**
+         * Control page/column/region breaks that fall above a block of content
+         */
+        breakBefore?: any;
+
+        /**
+         * Control page/column/region breaks that fall within a block of content
+         */
+        breakInside?: any;
+
+        /**
+         * The clear CSS property specifies if an element can be positioned next to or must be positioned below the floating elements that precede it in the markup.
+         */
+        clear?: any;
+
+        /**
+         * Deprecated; see clip-path.
+         * Lets you specify the dimensions of an absolutely positioned element that should be visible, and the element is clipped into this shape, and displayed.
+         */
+        clip?: any;
+
+        /**
+         * Clipping crops an graphic, so that only a portion of the graphic is rendered, or filled. This clip-rule property, when used with the clip-path property, defines which clip rule, or algorithm, to use when filling the different parts of a graphics.
+         */
+        clipRule?: any;
+
+        /**
+         * The color property sets the color of an element's foreground content (usually text), accepting any standard CSS color from keywords and hex values to RGB(a) and HSL(a).
+         */
+        color?: any;
+
+        /**
+         * Specifies how to fill columns (balanced or sequential).
+         */
+        columnFill?: any;
+
+        /**
+         * The column-gap property controls the width of the gap between columns in multi-column elements.
+         */
+        columnGap?: any;
+
+        /**
+         * Sets the width, style, and color of the rule between columns.
+         */
+        columnRule?: any;
+
+        /**
+         * Specifies the color of the rule between columns.
+         */
+        columnRuleColor?: any;
+
+        /**
+         * Specifies the width of the rule between columns.
+         */
+        columnRuleWidth?: any;
+
+        /**
+         * The column-span CSS property makes it possible for an element to span across all columns when its value is set to all. An element that spans more than one column is called a spanning element.
+         */
+        columnSpan?: any;
+
+        /**
+         * Specifies the width of columns in multi-column elements.
+         */
+        columnWidth?: any;
+
+        /**
+         * This property is a shorthand property for setting column-width and/or column-count.
+         */
+        columns?: any;
+
+        /**
+         * The counter-increment property accepts one or more names of counters (identifiers), each one optionally followed by an integer which specifies the value by which the counter should be incremented (e.g. if the value is 2, the counter increases by 2 each time it is invoked).
+         */
+        counterIncrement?: any;
+
+        /**
+         * The counter-reset property contains a list of one or more names of counters, each one optionally followed by an integer (otherwise, the integer defaults to 0.) Each time the given element is invoked, the counters specified by the property are set to the given integer.
+         */
+        counterReset?: any;
+
+        /**
+         * The cue property specifies sound files (known as an "auditory icon") to be played by speech media agents before and after presenting an element's content; if only one file is specified, it is played both before and after. The volume at which the file(s) should be played, relative to the volume of the main element, may also be specified. The icon files may also be set separately with the cue-before and cue-after properties.
+         */
+        cue?: any;
+
+        /**
+         * The cue-after property specifies a sound file (known as an "auditory icon") to be played by speech media agents after presenting an element's content; the volume at which the file should be played may also be specified. The shorthand property cue sets cue sounds for both before and after the element is presented.
+         */
+        cueAfter?: any;
+
+        /**
+         * The direction CSS property specifies the text direction/writing direction. The rtl is used for Hebrew or Arabic text, the ltr is for other languages.
+         */
+        direction?: any;
+
+        /**
+         * This property specifies the type of rendering box used for an element. It is a shorthand property for many other display properties.
+         */
+        display?: any;
+
+        /**
+         * The ‘fill’ property paints the interior of the given graphical element. The area to be painted consists of any areas inside the outline of the shape. To determine the inside of the shape, all subpaths are considered, and the interior is determined according to the rules associated with the current value of the ‘fill-rule’ property. The zero-width geometric outline of a shape is included in the area to be painted.
+         */
+        fill?: any;
+
+        /**
+         * The ‘fill-rule’ property indicates the algorithm which is to be used to determine what parts of the canvas are included inside the shape. For a simple, non-intersecting path, it is intuitively clear what region lies "inside"; however, for a more complex path, such as a path that intersects itself or where one subpath encloses another, the interpretation of "inside" is not so obvious.
+         * The ‘fill-rule’ property provides two options for how the inside of a shape is determined:
+         */
+        fillRule?: any;
+
+        /**
+         * Applies various image processing effects. This property is largely unsupported. See Compatibility section for more information.
+         */
+        filter?: any;
+
+        /**
+         * Obsolete, do not use. This property has been renamed to align-items.
+         * Specifies the alignment (perpendicular to the layout axis defined by the flex-direction property) of child elements of the object.
+         */
+        flexAlign?: any;
+
+        /**
+         * The flex-basis CSS property describes the initial main size of the flex item before any free space is distributed according to the flex factors described in the flex property (flex-grow and flex-shrink).
+         */
+        flexBasis?: any;
+
+        /**
+         * The flex-direction CSS property describes how flex items are placed in the flex container, by setting the direction of the flex container's main axis.
+         */
+        flexDirection?: any;
+
+        /**
+         * The flex-flow CSS property defines the flex container's main and cross axis. It is a shorthand property for the flex-direction and flex-wrap properties.
+         */
+        flexFlow?: any;
+
+        /**
+         * Do not use. This property has been renamed to align-self
+         * Specifies the alignment (perpendicular to the layout axis defined by flex-direction) of child elements of the object.
+         */
+        flexItemAlign?: any;
+
+        /**
+         * Do not use. This property has been renamed to align-content.
+         * Specifies how a flexbox's lines align within the flexbox when there is extra space along the axis that is perpendicular to the axis defined by the flex-direction property.
+         */
+        flexLinePack?: any;
+
+        /**
+         * Gets or sets a value that specifies the ordinal group that a flexbox element belongs to. This ordinal value identifies the display order for the group.
+         */
+        flexOrder?: any;
+
+        /**
+         * Elements which have the style float are floated horizontally. These elements can move as far to the left or right of the containing element. All elements after the floating element will flow around it, but elements before the floating element are not impacted. If several floating elements are placed after each other, they will float next to each other as long as there is room.
+         */
+        float?: any;
+
+        /**
+         * Flows content from a named flow (specified by a corresponding flow-into) through selected elements to form a dynamic chain of layout regions.
+         */
+        flowFrom?: any;
+
+        /**
+         * The font property is shorthand that allows you to do one of two things: you can either set up six of the most mature font properties in one line, or you can set one of a choice of keywords to adopt a system font setting.
+         */
+        font?: any;
+
+        /**
+         * The font-family property allows one or more font family names and/or generic family names to be specified for usage on the selected element(s)' text. The browser then goes through the list; for each character in the selection it applies the first font family that has an available glyph for that character.
+         */
+        fontFamily?: any;
+
+        /**
+         * The font-kerning property allows contextual adjustment of inter-glyph spacing, i.e. the spaces between the characters in text. This property controls <bold>metric kerning</bold> - that utilizes adjustment data contained in the font. Optical Kerning is not supported as yet.
+         */
+        fontKerning?: any;
+
+        /**
+         * The font-size-adjust property adjusts the font-size of the fallback fonts defined with font-family, so that the x-height is the same no matter what font is used. This preserves the readability of the text when fallback happens.
+         */
+        fontSizeAdjust?: any;
+
+        /**
+         * Allows you to expand or condense the widths for a normal, condensed, or expanded font face.
+         */
+        fontStretch?: any;
+
+        /**
+         * The font-style property allows normal, italic, or oblique faces to be selected. Italic forms are generally cursive in nature while oblique faces are typically sloped versions of the regular face. Oblique faces can be simulated by artificially sloping the glyphs of the regular face.
+         */
+        fontStyle?: any;
+
+        /**
+         * This value specifies whether the user agent is allowed to synthesize bold or oblique font faces when a font family lacks bold or italic faces.
+         */
+        fontSynthesis?: any;
+
+        /**
+         * The font-variant property enables you to select the small-caps font within a font family.
+         */
+        fontVariant?: any;
+
+        /**
+         * Fonts can provide alternate glyphs in addition to default glyph for a character. This property provides control over the selection of these alternate glyphs.
+         */
+        fontVariantAlternates?: any;
+
+        /**
+         * Lays out one or more grid items bound by 4 grid lines. Shorthand for setting grid-column-start, grid-column-end, grid-row-start, and grid-row-end in a single declaration.
+         */
+        gridArea?: any;
+
+        /**
+         * Controls a grid item's placement in a grid area, particularly grid position and a grid span. Shorthand for setting grid-column-start and grid-column-end in a single declaration.
+         */
+        gridColumn?: any;
+
+        /**
+         * Controls a grid item's placement in a grid area as well as grid position and a grid span. The grid-column-end property (with grid-row-start, grid-row-end, and grid-column-start) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
+         */
+        gridColumnEnd?: any;
+
+        /**
+         * Determines a grid item's placement by specifying the starting grid lines of a grid item's grid area . A grid item's placement in a grid area consists of a grid position and a grid span. See also ( grid-row-start, grid-row-end, and grid-column-end)
+         */
+        gridColumnStart?: any;
+
+        /**
+         * Gets or sets a value that indicates which row an element within a Grid should appear in. Shorthand for setting grid-row-start and grid-row-end in a single declaration.
+         */
+        gridRow?: any;
+
+        /**
+         * Determines a grid item’s placement by specifying the block-end. A grid item's placement in a grid area consists of a grid position and a grid span. The grid-row-end property (with grid-row-start, grid-column-start, and grid-column-end) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
+         */
+        gridRowEnd?: any;
+
+        /**
+         * Specifies a row position based upon an integer location, string value, or desired row size.
+         * css/properties/grid-row is used as short-hand for grid-row-position and grid-row-position
+         */
+        gridRowPosition?: any;
+
+        gridRowSpan?: any;
+
+        /**
+         * Specifies named grid areas which are not associated with any particular grid item, but can be referenced from the grid-placement properties. The syntax of the grid-template-areas property also provides a visualization of the structure of the grid, making the overall layout of the grid container easier to understand.
+         */
+        gridTemplateAreas?: any;
+
+        /**
+         * Specifies (with grid-template-rows) the line names and track sizing functions of the grid. Each sizing function can be specified as a length, a percentage of the grid container’s size, a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
+         */
+        gridTemplateColumns?: any;
+
+        /**
+         * Specifies (with grid-template-columns) the line names and track sizing functions of the grid. Each sizing function can be specified as a length, a percentage of the grid container’s size, a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
+         */
+        gridTemplateRows?: any;
+
+        /**
+         * Sets the height of an element. The content area of the element height does not include the padding, border, and margin of the element.
+         */
+        height?: any;
+
+        /**
+         * Specifies the minimum number of characters in a hyphenated word
+         */
+        hyphenateLimitChars?: any;
+
+        /**
+         * Indicates the maximum number of successive hyphenated lines in an element. The ‘no-limit’ value means that there is no limit.
+         */
+        hyphenateLimitLines?: any;
+
+        /**
+         * Specifies the maximum amount of trailing whitespace (before justification) that may be left in a line before hyphenation is triggered to pull part of a word from the next line back up into the current one.
+         */
+        hyphenateLimitZone?: any;
+
+        /**
+         * Specifies whether or not words in a sentence can be split by the use of a manual or automatic hyphenation mechanism.
+         */
+        hyphens?: any;
+
+        imeMode?: any;
+
+        layoutGrid?: any;
+
+        layoutGridChar?: any;
+
+        layoutGridLine?: any;
+
+        layoutGridMode?: any;
+
+        layoutGridType?: any;
+
+        /**
+         * Sets the left edge of an element
+         */
+        left?: any;
+
+        /**
+         * The letter-spacing CSS property specifies the spacing behavior between text characters.
+         */
+        letterSpacing?: any;
+
+        /**
+         * Deprecated. Gets or sets line-breaking rules for text in selected languages such as Japanese, Chinese, and Korean.
+         */
+        lineBreak?: any;
+
+        /**
+         * Shorthand property that sets the list-style-type, list-style-position and list-style-image properties in one declaration.
+         */
+        listStyle?: any;
+
+        /**
+         * This property sets the image that will be used as the list item marker. When the image is available, it will replace the marker set with the 'list-style-type' marker. That also means that if the image is not available, it will show the style specified by list-style-property
+         */
+        listStyleImage?: any;
+
+        /**
+         * Specifies if the list-item markers should appear inside or outside the content flow.
+         */
+        listStylePosition?: any;
+
+        /**
+         * Specifies the type of list-item marker in a list.
+         */
+        listStyleType?: any;
+
+        /**
+         * The margin property is shorthand to allow you to set all four margins of an element at once. Its equivalent longhand properties are margin-top, margin-right, margin-bottom and margin-left. Negative values are also allowed.
+         */
+        margin?: any;
+
+        /**
+         * margin-bottom sets the bottom margin of an element.
+         */
+        marginBottom?: any;
+
+        /**
+         * margin-left sets the left margin of an element.
+         */
+        marginLeft?: any;
+
+        /**
+         * margin-right sets the right margin of an element.
+         */
+        marginRight?: any;
+
+        /**
+         * margin-top sets the top margin of an element.
+         */
+        marginTop?: any;
+
+        /**
+         * The marquee-direction determines the initial direction in which the marquee content moves.
+         */
+        marqueeDirection?: any;
+
+        /**
+         * The 'marquee-style' property determines a marquee's scrolling behavior.
+         */
+        marqueeStyle?: any;
+
+        /**
+         * This property is shorthand for setting mask-image, mask-mode, mask-repeat, mask-position, mask-clip, mask-origin, mask-composite and mask-size. Omitted values are set to their original properties' initial values.
+         */
+        mask?: any;
+
+        /**
+         * This property is shorthand for setting mask-border-source, mask-border-slice, mask-border-width, mask-border-outset, and mask-border-repeat. Omitted values are set to their original properties' initial values.
+         */
+        maskBorder?: any;
+
+        /**
+         * This property specifies how the images for the sides and the middle part of the mask image are scaled and tiled. The first keyword applies to the horizontal sides, the second one applies to the vertical ones. If the second keyword is absent, it is assumed to be the same as the first, similar to the CSS border-image-repeat property.
+         */
+        maskBorderRepeat?: any;
+
+        /**
+         * This property specifies inward offsets from the top, right, bottom, and left edges of the mask image, dividing it into nine regions: four corners, four edges, and a middle. The middle image part is discarded and treated as fully transparent black unless the fill keyword is present. The four values set the top, right, bottom and left offsets in that order, similar to the CSS border-image-slice property.
+         */
+        maskBorderSlice?: any;
+
+        /**
+         * Specifies an image to be used as a mask. An image that is empty, fails to download, is non-existent, or cannot be displayed is ignored and does not mask the element.
+         */
+        maskBorderSource?: any;
+
+        /**
+         * This property sets the width of the mask box image, similar to the CSS border-image-width property.
+         */
+        maskBorderWidth?: any;
+
+        /**
+         * Determines the mask painting area, which defines the area that is affected by the mask. The painted content of an element may be restricted to this area.
+         */
+        maskClip?: any;
+
+        /**
+         * For elements rendered as a single box, specifies the mask positioning area. For elements rendered as multiple boxes (e.g., inline boxes on several lines, boxes on several pages) specifies which boxes box-decoration-break operates on to determine the mask positioning area(s).
+         */
+        maskOrigin?: any;
+
+        /**
+         * This property must not be used. It is no longer included in any standard or standard track specification, nor is it implemented in any browser. It is only used when the text-align-last property is set to size. It controls allowed adjustments of font-size to fit line content.
+         */
+        maxFontSize?: any;
+
+        /**
+         * Sets the maximum height for an element. It prevents the height of the element to exceed the specified value. If min-height is specified and is greater than max-height, max-height is overridden.
+         */
+        maxHeight?: any;
+
+        /**
+         * Sets the maximum width for an element. It limits the width property to be larger than the value specified in max-width.
+         */
+        maxWidth?: any;
+
+        /**
+         * Sets the minimum width of an element. It limits the width property to be not smaller than the value specified in min-width.
+         */
+        minWidth?: any;
+
+        /**
+         * The CSS outline property is a shorthand property for setting one or more of the individual outline properties outline-style, outline-width and outline-color in a single rule. In most cases the use of this shortcut is preferable and more convenient.
+         * Outlines differ from borders in the following ways:  •       Outlines do not take up space, they are drawn above the content.
+         *      •       Outlines may be non-rectangular. They are rectangular in Gecko/Firefox. Internet Explorer attempts to place the smallest contiguous outline around all elements or shapes that are indicated to have an outline. Opera draws a non-rectangular shape around a construct.
+         */
+        outline?: any;
+
+        /**
+         * The outline-color property sets the color of the outline of an element. An outline is a line that is drawn around elements, outside the border edge, to make the element stand out.
+         */
+        outlineColor?: any;
+
+        /**
+         * The outline-offset property offsets the outline and draw it beyond the border edge.
+         */
+        outlineOffset?: any;
+
+        /**
+         * The overflow property controls how extra content exceeding the bounding box of an element is rendered. It can be used in conjunction with an element that has a fixed width and height, to eliminate text-induced page distortion.
+         */
+        overflow?: any;
+
+        /**
+         * Specifies the preferred scrolling methods for elements that overflow.
+         */
+        overflowStyle?: any;
+
+        /**
+         * The overflow-x property is a specific case of the generic overflow property. It controls how extra content exceeding the x-axis of the bounding box of an element is rendered.
+         */
+        overflowX?: any;
+
+        /**
+         * The padding optional CSS property sets the required padding space on one to four sides of an element. The padding area is the space between an element and its border. Negative values are not allowed but decimal values are permitted. The element size is treated as fixed, and the content of the element shifts toward the center as padding is increased.
+         * The padding property is a shorthand to avoid setting each side separately (padding-top, padding-right, padding-bottom, padding-left).
+         */
+        padding?: any;
+
+        /**
+         * The padding-bottom CSS property of an element sets the padding space required on the bottom of an element. The padding area is the space between the content of the element and its border. Contrary to margin-bottom values, negative values of padding-bottom are invalid.
+         */
+        paddingBottom?: any;
+
+        /**
+         * The padding-left CSS property of an element sets the padding space required on the left side of an element. The padding area is the space between the content of the element and its border. Contrary to margin-left values, negative values of padding-left are invalid.
+         */
+        paddingLeft?: any;
+
+        /**
+         * The padding-right CSS property of an element sets the padding space required on the right side of an element. The padding area is the space between the content of the element and its border. Contrary to margin-right values, negative values of padding-right are invalid.
+         */
+        paddingRight?: any;
+
+        /**
+         * The padding-top CSS property of an element sets the padding space required on the top of an element. The padding area is the space between the content of the element and its border. Contrary to margin-top values, negative values of padding-top are invalid.
+         */
+        paddingTop?: any;
+
+        /**
+         * The page-break-after property is supported in all major browsers. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
+         */
+        pageBreakAfter?: any;
+
+        /**
+         * The page-break-before property sets the page-breaking behavior before an element. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
+         */
+        pageBreakBefore?: any;
+
+        /**
+         * Sets the page-breaking behavior inside an element. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
+         */
+        pageBreakInside?: any;
+
+        /**
+         * The pause property determines how long a speech media agent should pause before and after presenting an element. It is a shorthand for the pause-before and pause-after properties.
+         */
+        pause?: any;
+
+        /**
+         * The pause-after property determines how long a speech media agent should pause after presenting an element. It may be replaced by the shorthand property pause, which sets pause time before and after.
+         */
+        pauseAfter?: any;
+
+        /**
+         * The pause-before property determines how long a speech media agent should pause before presenting an element. It may be replaced by the shorthand property pause, which sets pause time before and after.
+         */
+        pauseBefore?: any;
+
+        /**
+         * The perspective property defines how far an element is placed from the view on the z-axis, from the screen to the viewer.
+         * Perspective defines how an object is viewed. In graphic arts, perspective is the representation on a flat surface of what the viewer's eye would see in a 3D space. (See Wikipedia for more information about graphical perspective and for related illustrations.)
+         * The illusion of perspective on a flat surface, such as a computer screen, is created by projecting points on the flat surface as they would appear if the flat surface were a window through which the viewer was looking at the object. In discussion of virtual environments, this flat surface is called a projection plane.
+         */
+        perspective?: any;
+
+        /**
+         * The perspective-origin property establishes the origin for the perspective property. It effectively sets the X and Y position at which the viewer appears to be looking at the children of the element.
+         * When used with perspective, perspective-origin changes the appearance of an object, as if a viewer were looking at it from a different origin. An object appears differently if a viewer is looking directly at it versus looking at it from below, above, or from the side. Thus, the perspective-origin is like a vanishing point.
+         * The default value of perspective-origin is 50% 50%. This displays an object as if the viewer's eye were positioned directly at the center of the screen, both top-to-bottom and left-to-right. A value of 0% 0% changes the object as if the viewer was looking toward the top left angle. A value of 100% 100% changes the appearance as if viewed toward the bottom right angle.
+         */
+        perspectiveOrigin?: any;
+
+        /**
+         * The pointer-events property allows you to control whether an element can be the target for the pointing device (e.g, mouse, pen) events.
+         */
+        pointerEvents?: any;
+
+        /**
+         * The position property controls the type of positioning used by an element within its parent elements. The effect of the position property depends on a lot of factors, for example the position property of parent elements.
+         */
+        position?: any;
+
+        /**
+         * Obsolete: unsupported.
+         * This property determines whether or not a full-width punctuation mark character should be trimmed if it appears at the beginning of a line, so that its "ink" lines up with the first glyph in the line above and below.
+         */
+        punctuationTrim?: any;
+
+        /**
+         * Sets the type of quotation marks for embedded quotations.
+         */
+        quotes?: any;
+
+        /**
+         * Controls whether the last region in a chain displays additional 'overset' content according its default overflow property, or if it displays a fragment of content as if it were flowing into a subsequent region.
+         */
+        regionFragment?: any;
+
+        /**
+         * The rest-after property determines how long a speech media agent should pause after presenting an element's main content, before presenting that element's exit cue sound. It may be replaced by the shorthand property rest, which sets rest time before and after.
+         */
+        restAfter?: any;
+
+        /**
+         * The rest-before property determines how long a speech media agent should pause after presenting an intro cue sound for an element, before presenting that element's main content. It may be replaced by the shorthand property rest, which sets rest time before and after.
+         */
+        restBefore?: any;
+
+        /**
+         * Specifies the position an element in relation to the right side of the containing element.
+         */
+        right?: any;
+
+        rubyAlign?: any;
+
+        rubyPosition?: any;
+
+        /**
+         * Defines the alpha channel threshold used to extract a shape from an image. Can be thought of as a "minimum opacity" threshold; that is, a value of 0.5 means that the shape will enclose all the pixels that are more than 50% opaque.
+         */
+        shapeImageThreshold?: any;
+
+        /**
+         * A future level of CSS Shapes will define a shape-inside property, which will define a shape to wrap content within the element. See Editor's Draft <http://dev.w3.org/csswg/css-shapes/> and CSSWG wiki page on next-level plans <http://wiki.csswg.org/spec/css-shapes>
+         */
+        shapeInside?: any;
+
+        /**
+         * Adds a margin to a shape-outside. In effect, defines a new shape that is the smallest contour around all the points that are the shape-margin distance outward perpendicular to each point on the underlying shape. For points where a perpendicular direction is not defined (e.g., a triangle corner), takes all points on a circle centered at the point and with a radius of the shape-margin distance. This property accepts only non-negative values.
+         */
+        shapeMargin?: any;
+
+        /**
+         * Declares a shape around which text should be wrapped, with possible modifications from the shape-margin property. The shape defined by shape-outside and shape-margin changes the geometry of a float element's float area.
+         */
+        shapeOutside?: any;
+
+        /**
+         * The speak property determines whether or not a speech synthesizer will read aloud the contents of an element.
+         */
+        speak?: any;
+
+        /**
+         * The speak-as property determines how the speech synthesizer interprets the content: words as whole words or as a sequence of letters, numbers as a numerical value or a sequence of digits, punctuation as pauses in speech or named punctuation characters.
+         */
+        speakAs?: any;
+
+        /**
+         * The tab-size CSS property is used to customise the width of a tab (U+0009) character.
+         */
+        tabSize?: any;
+
+        /**
+         * The 'table-layout' property controls the algorithm used to lay out the table cells, rows, and columns.
+         */
+        tableLayout?: any;
+
+        /**
+         * The text-align CSS property describes how inline content like text is aligned in its parent block element. text-align does not control the alignment of block elements itself, only their inline content.
+         */
+        textAlign?: any;
+
+        /**
+         * The text-align-last CSS property describes how the last line of a block element or a line before line break is aligned in its parent block element.
+         */
+        textAlignLast?: any;
+
+        /**
+         * The text-decoration CSS property is used to set the text formatting to underline, overline, line-through or blink. 
+         * underline and overline decorations are positioned under the text, line-through over it.
+         */
+        textDecoration?: any;
+
+        /**
+         * Sets the color of any text decoration, such as underlines, overlines, and strike throughs.
+         */
+        textDecorationColor?: any;
+
+        /**
+         * Sets what kind of line decorations are added to an element, such as underlines, overlines, etc.
+         */
+        textDecorationLine?: any;
+
+        textDecorationLineThrough?: any;
+
+        textDecorationNone?: any;
+
+        textDecorationOverline?: any;
+
+        /**
+         * Specifies what parts of an element’s content are skipped over when applying any text decoration.
+         */
+        textDecorationSkip?: any;
+
+        /**
+         * This property specifies the style of the text decoration line drawn on the specified element. The intended meaning for the values are the same as those of the border-style-properties.
+         */
+        textDecorationStyle?: any;
+
+        textDecorationUnderline?: any;
+
+        /**
+         * The text-emphasis property will apply special emphasis marks to the elements text. Slightly similar to the text-decoration property only that this property can have affect on the line-height. It also is noted that this is shorthand for text-emphasis-style and for text-emphasis-color.
+         */
+        textEmphasis?: any;
+
+        /**
+         * The text-emphasis-color property specifies the foreground color of the emphasis marks.
+         */
+        textEmphasisColor?: any;
+
+        /**
+         * The text-emphasis-style property applies special emphasis marks to an element's text.
+         */
+        textEmphasisStyle?: any;
+
+        /**
+         * This property helps determine an inline box's block-progression dimension, derived from the text-height and font-size properties for non-replaced elements, the height or the width for replaced elements, and the stacked block-progression dimension for inline-block elements. The block-progression dimension determines the position of the padding, border and margin for the element.
+         */
+        textHeight?: any;
+
+        /**
+         * Specifies the amount of space horizontally that should be left on the first line of the text of an element. This horizontal spacing is at the beginning of the first line and is in respect to the left edge of the containing block box.
+         */
+        textIndent?: any;
+
+        textJustifyTrim?: any;
+
+        textKashidaSpace?: any;
+
+        /**
+         * The text-line-through property is a shorthand property for text-line-through-style, text-line-through-color and text-line-through-mode. (Considered obsolete; use text-decoration instead.)
+         */
+        textLineThrough?: any;
+
+        /**
+         * Specifies the line colors for the line-through text decoration.
+         * (Considered obsolete; use text-decoration-color instead.)
+         */
+        textLineThroughColor?: any;
+
+        /**
+         * Sets the mode for the line-through text decoration, determining whether the text decoration affects the space characters or not.
+         * (Considered obsolete; use text-decoration-skip instead.)
+         */
+        textLineThroughMode?: any;
+
+        /**
+         * Specifies the line style for line-through text decoration.
+         * (Considered obsolete; use text-decoration-style instead.)
+         */
+        textLineThroughStyle?: any;
+
+        /**
+         * Specifies the line width for the line-through text decoration.
+         */
+        textLineThroughWidth?: any;
+
+        /**
+         * The text-overflow shorthand CSS property determines how overflowed content that is not displayed is signaled to the users. It can be clipped, display an ellipsis ('…', U+2026 HORIZONTAL ELLIPSIS) or a Web author-defined string. It covers the two long-hand properties text-overflow-mode and text-overflow-ellipsis
+         */
+        textOverflow?: any;
+
+        /**
+         * The text-overline property is the shorthand for the text-overline-style, text-overline-width, text-overline-color, and text-overline-mode properties.
+         */
+        textOverline?: any;
+
+        /**
+         * Specifies the line color for the overline text decoration.
+         */
+        textOverlineColor?: any;
+
+        /**
+         * Sets the mode for the overline text decoration, determining whether the text decoration affects the space characters or not.
+         */
+        textOverlineMode?: any;
+
+        /**
+         * Specifies the line style for overline text decoration.
+         */
+        textOverlineStyle?: any;
+
+        /**
+         * Specifies the line width for the overline text decoration.
+         */
+        textOverlineWidth?: any;
+
+        /**
+         * The text-rendering CSS property provides information to the browser about how to optimize when rendering text. Options are: legibility, speed or geometric precision.
+         */
+        textRendering?: any;
+
+        /**
+         * Obsolete: unsupported.
+         */
+        textScript?: any;
+
+        /**
+         * The CSS text-shadow property applies one or more drop shadows to the text and <text-decorations> of an element. Each shadow is specified as an offset from the text, along with optional color and blur radius values.
+         */
+        textShadow?: any;
+
+        /**
+         * This property transforms text for styling purposes. (It has no effect on the underlying content.)
+         */
+        textTransform?: any;
+
+        /**
+         * Unsupported.
+         * This property will add a underline position value to the element that has an underline defined.
+         */
+        textUnderlinePosition?: any;
+
+        /**
+         * After review this should be replaced by text-decoration should it not?
+         * This property will set the underline style for text with a line value for underline, overline, and line-through.
+         */
+        textUnderlineStyle?: any;
+
+        /**
+         * This property specifies how far an absolutely positioned box's top margin edge is offset below the top edge of the box's containing block. For relatively positioned boxes, the offset is with respect to the top edges of the box itself (i.e., the box is given a position in the normal flow, then offset from that position according to these properties).
+         */
+        top?: any;
+
+        /**
+         * Determines whether touch input may trigger default behavior supplied by the user agent, such as panning or zooming.
+         */
+        touchAction?: any;
+
+        /**
+         * CSS transforms allow elements styled with CSS to be transformed in two-dimensional or three-dimensional space. Using this property, elements can be translated, rotated, scaled, and skewed. The value list may consist of 2D and/or 3D transform values.
+         */
+        transform?: any;
+
+        /**
+         * This property defines the origin of the transformation axes relative to the element to which the transformation is applied.
+         */
+        transformOrigin?: any;
+
+        /**
+         * This property allows you to define the relative position of the origin of the transformation grid along the z-axis.
+         */
+        transformOriginZ?: any;
+
+        /**
+         * This property specifies how nested elements are rendered in 3D space relative to their parent.
+         */
+        transformStyle?: any;
+
+        /**
+         * The transition CSS property is a shorthand property for transition-property, transition-duration, transition-timing-function, and transition-delay. It allows to define the transition between two states of an element.
+         */
+        transition?: any;
+
+        /**
+         * Defines when the transition will start. A value of ‘0s’ means the transition will execute as soon as the property is changed. Otherwise, the value specifies an offset from the moment the property is changed, and the transition will delay execution by that offset.
+         */
+        transitionDelay?: any;
+
+        /**
+         * The 'transition-duration' property specifies the length of time a transition animation takes to complete.
+         */
+        transitionDuration?: any;
+
+        /**
+         * The 'transition-property' property specifies the name of the CSS property to which the transition is applied.
+         */
+        transitionProperty?: any;
+
+        /**
+         * Sets the pace of action within a transition
+         */
+        transitionTimingFunction?: any;
+
+        /**
+         * The unicode-bidi CSS property specifies the level of embedding with respect to the bidirectional algorithm.
+         */
+        unicodeBidi?: any;
+
+        /**
+         * unicode-range allows you to set a specific range of characters to be downloaded from a font (embedded using @font-face) and made available for use on the current page.
+         */
+        unicodeRange?: any;
+
+        /**
+         * This is for all the high level UX stuff.
+         */
+        userFocus?: any;
+
+        /**
+         * For inputing user content
+         */
+        userInput?: any;
+
+        /**
+         * The vertical-align property controls how inline elements or text are vertically aligned compared to the baseline. If this property is used on table-cells it controls the vertical alignment of content of the table cell.
+         */
+        verticalAlign?: any;
+
+        /**
+         * The visibility property specifies whether the boxes generated by an element are rendered.
+         */
+        visibility?: any;
+
+        /**
+         * The voice-balance property sets the apparent position (in stereo sound) of the synthesized voice for spoken media.
+         */
+        voiceBalance?: any;
+
+        /**
+         * The voice-duration property allows the author to explicitly set the amount of time it should take a speech synthesizer to read an element's content, for example to allow the speech to be synchronized with other media. With a value of auto (the default) the length of time it takes to read the content is determined by the content itself and the voice-rate property.
+         */
+        voiceDuration?: any;
+
+        /**
+         * The voice-family property sets the speaker's voice used by a speech media agent to read an element. The speaker may be specified as a named character (to match a voice option in the speech reading software) or as a generic description of the age and gender of the voice. Similar to the font-family property for visual media, a comma-separated list of fallback options may be given in case the speech reader does not recognize the character name or cannot synthesize the requested combination of generic properties.
+         */
+        voiceFamily?: any;
+
+        /**
+         * The voice-pitch property sets pitch or tone (high or low) for the synthesized speech when reading an element; the pitch may be specified absolutely or relative to the normal pitch for the voice-family used to read the text.
+         */
+        voicePitch?: any;
+
+        /**
+         * The voice-range property determines how much variation in pitch or tone will be created by the speech synthesize when reading an element. Emphasized text, grammatical structures and punctuation may all be rendered as changes in pitch, this property determines how strong or obvious those changes are; large ranges are associated with enthusiastic or emotional speech, while small ranges are associated with flat or mechanical speech.
+         */
+        voiceRange?: any;
+
+        /**
+         * The voice-rate property sets the speed at which the voice synthesized by a speech media agent will read content.
+         */
+        voiceRate?: any;
+
+        /**
+         * The voice-stress property sets the level of vocal emphasis to be used for synthesized speech reading the element.
+         */
+        voiceStress?: any;
+
+        /**
+         * The voice-volume property sets the volume for spoken content in speech media. It replaces the deprecated volume property.
+         */
+        voiceVolume?: any;
+
+        /**
+         * The white-space property controls whether and how white space inside the element is collapsed, and whether lines may wrap at unforced "soft wrap" opportunities.
+         */
+        whiteSpace?: any;
+
+        /**
+         * Obsolete: unsupported.
+         */
+        whiteSpaceTreatment?: any;
+
+        /**
+         * Specifies the width of the content area of an element. The content area of the element width does not include the padding, border, and margin of the element.
+         */
+        width?: any;
+
+        /**
+         * The word-break property is often used when there is long generated content that is strung together without and spaces or hyphens to beak apart. A common case of this is when there is a long URL that does not have any hyphens. This case could potentially cause the breaking of the layout as it could extend past the parent element.
+         */
+        wordBreak?: any;
+
+        /**
+         * The word-spacing CSS property specifies the spacing behavior between "words".
+         */
+        wordSpacing?: any;
+
+        /**
+         * An alias of css/properties/overflow-wrap, word-wrap defines whether to break words when the content exceeds the boundaries of its container.
+         */
+        wordWrap?: any;
+
+        /**
+         * Specifies how exclusions affect inline content within block-level elements. Elements lay out their inline content in their content area but wrap around exclusion areas.
+         */
+        wrapFlow?: any;
+
+        /**
+         * Set the value that is used to offset the inner wrap shape from other shapes. Inline content that intersects a shape with this property will be pushed by this shape's margin.
+         */
+        wrapMargin?: any;
+
+        /**
+         * Obsolete and unsupported. Do not use.
+         * This CSS property controls the text when it reaches the end of the block in which it is enclosed.
+         */
+        wrapOption?: any;
+
+        /**
+         * writing-mode specifies if lines of text are laid out horizontally or vertically, and the direction which lines of text and blocks progress.
+         */
+        writingMode?: any;
+
+
         [propertyName: string]: any;
     }
 
-    interface HTMLAttributesBase<T> extends DOMAttributesBase<T> {
+    interface HTMLAttributes extends DOMAttributes {
+        // React-specific Attributes
+        defaultChecked?: boolean;
+        defaultValue?: string | string[];
+
+        // Standard HTML Attributes
         accept?: string;
         acceptCharset?: string;
         accessKey?: string;
@@ -434,23 +1697,25 @@ declare namespace __React {
         autoComplete?: string;
         autoFocus?: boolean;
         autoPlay?: boolean;
+        capture?: boolean;
         cellPadding?: number | string;
         cellSpacing?: number | string;
         charSet?: string;
+        challenge?: string;
         checked?: boolean;
         classID?: string;
+        className?: string;
         cols?: number;
         colSpan?: number;
         content?: string;
         contentEditable?: boolean;
         contextMenu?: string;
-        controls?: any;
+        controls?: boolean;
         coords?: string;
         crossOrigin?: string;
         data?: string;
         dateTime?: string;
-        defaultChecked?: boolean;
-        defaultValue?: string;
+        default?: boolean;
         defer?: boolean;
         dir?: string;
         disabled?: boolean;
@@ -473,6 +1738,13 @@ declare namespace __React {
         htmlFor?: string;
         httpEquiv?: string;
         icon?: string;
+        id?: string;
+        inputMode?: string;
+        integrity?: string;
+        is?: string;
+        keyParams?: string;
+        keyType?: string;
+        kind?: string;
         label?: string;
         lang?: string;
         list?: string;
@@ -487,6 +1759,7 @@ declare namespace __React {
         mediaGroup?: string;
         method?: string;
         min?: number | string;
+        minLength?: number;
         multiple?: boolean;
         muted?: boolean;
         name?: string;
@@ -517,40 +1790,49 @@ declare namespace __React {
         spellCheck?: boolean;
         src?: string;
         srcDoc?: string;
+        srcLang?: string;
         srcSet?: string;
         start?: number;
         step?: number | string;
         style?: CSSProperties;
+        summary?: string;
         tabIndex?: number;
         target?: string;
         title?: string;
         type?: string;
         useMap?: string;
-        value?: string;
+        value?: string | string[];
         width?: number | string;
         wmode?: string;
+        wrap?: string;
+
+        // RDFa Attributes
+        about?: string;
+        datatype?: string;
+        inlist?: any;
+        prefix?: string;
+        property?: string;
+        resource?: string;
+        typeof?: string;
+        vocab?: string;
 
         // Non-standard Attributes
         autoCapitalize?: boolean;
-        autoCorrect?: boolean;
-        property?: string;
+        autoCorrect?: string;
+        autoSave?: string;
+        color?: string;
         itemProp?: string;
         itemScope?: boolean;
         itemType?: string;
+        itemID?: string;
+        itemRef?: string;
+        results?: number;
+        security?: string;
         unselectable?: boolean;
     }
 
-    interface HTMLAttributes extends HTMLAttributesBase<HTMLComponent> {
-    }
-
-    interface SVGElementAttributes extends HTMLAttributes {
-        viewBox?: string;
-        preserveAspectRatio?: string;
-    }
-
-    interface SVGAttributes extends DOMAttributes {
-        ref?: string | ((component: SVGComponent) => void);
-
+    interface SVGAttributes extends HTMLAttributes {
+        clipPath?: string;
         cx?: number | string;
         cy?: number | string;
         d?: string;
@@ -564,7 +1846,6 @@ declare namespace __React {
         fy?: number | string;
         gradientTransform?: string;
         gradientUnits?: string;
-        height?: number | string;
         markerEnd?: string;
         markerMid?: string;
         markerStart?: string;
@@ -583,19 +1864,27 @@ declare namespace __React {
         stroke?: string;
         strokeDasharray?: string;
         strokeLinecap?: string;
-        strokeMiterlimit?: string;
         strokeOpacity?: number | string;
         strokeWidth?: number | string;
         textAnchor?: string;
         transform?: string;
         version?: string;
         viewBox?: string;
-        width?: number | string;
         x1?: number | string;
         x2?: number | string;
         x?: number | string;
+        xlinkActuate?: string;
+        xlinkArcrole?: string;
+        xlinkHref?: string;
+        xlinkRole?: string;
+        xlinkShow?: string;
+        xlinkTitle?: string;
+        xlinkType?: string;
+        xmlBase?: string;
+        xmlLang?: string;
+        xmlSpace?: string;
         y1?: number | string;
-        y2?: number | string
+        y2?: number | string;
         y?: number | string;
     }
 
@@ -719,11 +2008,12 @@ declare namespace __React {
         wbr: HTMLFactory;
 
         // SVG
-        svg: SVGElementFactory;
+        svg: SVGFactory;
         circle: SVGFactory;
         defs: SVGFactory;
         ellipse: SVGFactory;
         g: SVGFactory;
+        image: SVGFactory;
         line: SVGFactory;
         linearGradient: SVGFactory;
         mask: SVGFactory;
@@ -777,10 +2067,11 @@ declare namespace __React {
     // ----------------------------------------------------------------------
 
     interface ReactChildren {
-        map<T>(children: ReactNode, fn: (child: ReactChild, index: number) => T): { [key:string]: T };
+        map<T>(children: ReactNode, fn: (child: ReactChild, index: number) => T): T[];
         forEach(children: ReactNode, fn: (child: ReactChild, index: number) => any): void;
         count(children: ReactNode): number;
         only(children: ReactNode): ReactChild;
+        toArray(children: ReactNode): ReactChild[];
     }
 
     //
@@ -816,1085 +2107,6 @@ declare module "react" {
     export = __React;
 }
 
-declare module "react/addons" {
-    //
-    // React Elements
-    // ----------------------------------------------------------------------
-
-    type ReactType = ComponentClass<any> | string;
-
-    interface ReactElement<P> {
-        type: string | ComponentClass<P>;
-        props: P;
-        key: string | number;
-        ref: string | ((component: Component<P, any>) => any);
-    }
-
-    interface ClassicElement<P> extends ReactElement<P> {
-        type: string | ClassicComponentClass<P>;
-        ref: string | ((component: ClassicComponent<P, any>) => any);
-    }
-
-    interface DOMElement<P> extends ClassicElement<P> {
-        type: string;
-        ref: string | ((component: DOMComponent<P>) => any);
-    }
-
-    type HTMLElement = DOMElement<HTMLAttributes>;
-    type SVGElement = DOMElement<SVGAttributes>;
-
-    //
-    // Factories
-    // ----------------------------------------------------------------------
-
-    interface Factory<P> {
-        (props?: P, ...children: ReactNode[]): ReactElement<P>;
-    }
-
-    interface ClassicFactory<P> extends Factory<P> {
-        (props?: P, ...children: ReactNode[]): ClassicElement<P>;
-    }
-
-    interface DOMFactory<P> extends ClassicFactory<P> {
-        (props?: P, ...children: ReactNode[]): DOMElement<P>;
-    }
-
-    type HTMLFactory = DOMFactory<HTMLAttributes>;
-    type SVGFactory = DOMFactory<SVGAttributes>;
-    type SVGElementFactory = DOMFactory<SVGElementAttributes>;
-
-    //
-    // React Nodes
-    // http://facebook.github.io/react/docs/glossary.html
-    // ----------------------------------------------------------------------
-
-    type ReactText = string | number;
-    type ReactChild = ReactElement<any> | ReactText;
-
-    // Should be Array<ReactNode> but type aliases cannot be recursive
-    type ReactFragment = {} | Array<ReactChild | any[] | boolean>;
-    type ReactNode = ReactChild | ReactFragment | boolean;
-
-    //
-    // Top Level API
-    // ----------------------------------------------------------------------
-
-    function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
-
-    function createFactory<P>(type: string): DOMFactory<P>;
-    function createFactory<P>(type: ClassicComponentClass<P> | string): ClassicFactory<P>;
-    function createFactory<P>(type: ComponentClass<P>): Factory<P>;
-
-    function createElement<P>(
-        type: string,
-        props?: P,
-        ...children: ReactNode[]): DOMElement<P>;
-    function createElement<P>(
-        type: ClassicComponentClass<P> | string,
-        props?: P,
-        ...children: ReactNode[]): ClassicElement<P>;
-    function createElement<P>(
-        type: ComponentClass<P>,
-        props?: P,
-        ...children: ReactNode[]): ReactElement<P>;
-
-    function cloneElement<P>(
-        element: DOMElement<P>,
-        props?: P,
-        ...children: ReactNode[]): DOMElement<P>;
-    function cloneElement<P>(
-        element: ClassicElement<P>,
-        props?: P,
-        ...children: ReactNode[]): ClassicElement<P>;
-    function cloneElement<P>(
-        element: ReactElement<P>,
-        props?: P,
-        ...children: ReactNode[]): ReactElement<P>;
-
-    function render<P>(
-        element: DOMElement<P>,
-        container: Element,
-        callback?: () => any): DOMComponent<P>;
-    function render<P, S>(
-        element: ClassicElement<P>,
-        container: Element,
-        callback?: () => any): ClassicComponent<P, S>;
-    function render<P, S>(
-        element: ReactElement<P>,
-        container: Element,
-        callback?: () => any): Component<P, S>;
-
-    function unmountComponentAtNode(container: Element): boolean;
-    function renderToString(element: ReactElement<any>): string;
-    function renderToStaticMarkup(element: ReactElement<any>): string;
-    function isValidElement(object: {}): boolean;
-    function initializeTouchEvents(shouldUseTouch: boolean): void;
-
-    function findDOMNode<TElement extends Element>(
-        componentOrElement: Component<any, any> | Element): TElement;
-    function findDOMNode(
-        componentOrElement: Component<any, any> | Element): Element;
-
-    var DOM: ReactDOM;
-    var PropTypes: ReactPropTypes;
-    var Children: ReactChildren;
-
-    //
-    // Component API
-    // ----------------------------------------------------------------------
-
-    // Base component for plain JS classes
-    class Component<P, S> implements ComponentLifecycle<P, S> {
-        static propTypes: ValidationMap<any>;
-        static contextTypes: ValidationMap<any>;
-        static childContextTypes: ValidationMap<any>;
-        static defaultProps: Props<any>;
-
-        constructor(props?: P, context?: any);
-        setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
-        setState(state: S, callback?: () => any): void;
-        forceUpdate(callBack?: () => any): void;
-        render(): JSX.Element;
-        props: P;
-        state: S;
-        context: {};
-        refs: {
-            [key: string]: Component<any, any>
-        };
-    }
-
-    interface ClassicComponent<P, S> extends Component<P, S> {
-        replaceState(nextState: S, callback?: () => any): void;
-        getDOMNode<TElement extends Element>(): TElement;
-        getDOMNode(): Element;
-        isMounted(): boolean;
-        getInitialState?(): S;
-        setProps(nextProps: P, callback?: () => any): void;
-        replaceProps(nextProps: P, callback?: () => any): void;
-    }
-
-    interface DOMComponent<P> extends ClassicComponent<P, any> {
-        tagName: string;
-    }
-
-    type HTMLComponent = DOMComponent<HTMLAttributes>;
-    type SVGComponent = DOMComponent<SVGAttributes>;
-
-    interface ChildContextProvider<CC> {
-        getChildContext(): CC;
-    }
-
-    //
-    // Class Interfaces
-    // ----------------------------------------------------------------------
-
-    interface ComponentClass<P> {
-        new(props?: P, context?: any): Component<P, any>;
-        propTypes?: ValidationMap<P>;
-        contextTypes?: ValidationMap<any>;
-        childContextTypes?: ValidationMap<any>;
-        defaultProps?: P;
-    }
-
-    interface ClassicComponentClass<P> extends ComponentClass<P> {
-        new(props?: P, context?: any): ClassicComponent<P, any>;
-        getDefaultProps?(): P;
-        displayName?: string;
-    }
-
-    //
-    // Component Specs and Lifecycle
-    // ----------------------------------------------------------------------
-
-    interface ComponentLifecycle<P, S> {
-        componentWillMount?(): void;
-        componentDidMount?(): void;
-        componentWillReceiveProps?(nextProps: P, nextContext: any): void;
-        shouldComponentUpdate?(nextProps: P, nextState: S, nextContext: any): boolean;
-        componentWillUpdate?(nextProps: P, nextState: S, nextContext: any): void;
-        componentDidUpdate?(prevProps: P, prevState: S, prevContext: any): void;
-        componentWillUnmount?(): void;
-    }
-
-    interface Mixin<P, S> extends ComponentLifecycle<P, S> {
-        mixins?: Mixin<P, S>;
-        statics?: {
-            [key: string]: any;
-        };
-
-        displayName?: string;
-        propTypes?: ValidationMap<any>;
-        contextTypes?: ValidationMap<any>;
-        childContextTypes?: ValidationMap<any>
-
-        getDefaultProps?(): P;
-        getInitialState?(): S;
-    }
-
-    interface ComponentSpec<P, S> extends Mixin<P, S> {
-        render(): ReactElement<any>;
-
-        [propertyName: string]: any;
-    }
-
-    //
-    // Event System
-    // ----------------------------------------------------------------------
-
-    interface SyntheticEvent {
-        bubbles: boolean;
-        cancelable: boolean;
-        currentTarget: EventTarget;
-        defaultPrevented: boolean;
-        eventPhase: number;
-        isTrusted: boolean;
-        nativeEvent: Event;
-        preventDefault(): void;
-        stopPropagation(): void;
-        target: EventTarget;
-        timeStamp: Date;
-        type: string;
-    }
-
-    interface DragEvent extends SyntheticEvent {
-        dataTransfer: DataTransfer;
-    }
-
-    interface ClipboardEvent extends SyntheticEvent {
-        clipboardData: DataTransfer;
-    }
-
-    interface KeyboardEvent extends SyntheticEvent {
-        altKey: boolean;
-        charCode: number;
-        ctrlKey: boolean;
-        getModifierState(key: string): boolean;
-        key: string;
-        keyCode: number;
-        locale: string;
-        location: number;
-        metaKey: boolean;
-        repeat: boolean;
-        shiftKey: boolean;
-        which: number;
-    }
-
-    interface FocusEvent extends SyntheticEvent {
-        relatedTarget: EventTarget;
-    }
-
-    interface FormEvent extends SyntheticEvent {
-    }
-
-    interface MouseEvent extends SyntheticEvent {
-        altKey: boolean;
-        button: number;
-        buttons: number;
-        clientX: number;
-        clientY: number;
-        ctrlKey: boolean;
-        getModifierState(key: string): boolean;
-        metaKey: boolean;
-        pageX: number;
-        pageY: number;
-        relatedTarget: EventTarget;
-        screenX: number;
-        screenY: number;
-        shiftKey: boolean;
-    }
-
-    interface TouchEvent extends SyntheticEvent {
-        altKey: boolean;
-        changedTouches: TouchList;
-        ctrlKey: boolean;
-        getModifierState(key: string): boolean;
-        metaKey: boolean;
-        shiftKey: boolean;
-        targetTouches: TouchList;
-        touches: TouchList;
-    }
-
-    interface UIEvent extends SyntheticEvent {
-        detail: number;
-        view: AbstractView;
-    }
-
-    interface WheelEvent extends SyntheticEvent {
-        deltaMode: number;
-        deltaX: number;
-        deltaY: number;
-        deltaZ: number;
-    }
-
-    //
-    // Event Handler Types
-    // ----------------------------------------------------------------------
-
-    interface EventHandler<E extends SyntheticEvent> {
-        (event: E): void;
-    }
-
-    interface DragEventHandler extends EventHandler<DragEvent> {}
-    interface ClipboardEventHandler extends EventHandler<ClipboardEvent> {}
-    interface KeyboardEventHandler extends EventHandler<KeyboardEvent> {}
-    interface FocusEventHandler extends EventHandler<FocusEvent> {}
-    interface FormEventHandler extends EventHandler<FormEvent> {}
-    interface MouseEventHandler extends EventHandler<MouseEvent> {}
-    interface TouchEventHandler extends EventHandler<TouchEvent> {}
-    interface UIEventHandler extends EventHandler<UIEvent> {}
-    interface WheelEventHandler extends EventHandler<WheelEvent> {}
-
-    //
-    // Props / DOM Attributes
-    // ----------------------------------------------------------------------
-
-    interface Props<T> {
-        children?: ReactNode;
-        key?: string | number;
-        ref?: string | ((component: T) => any);
-    }
-
-    interface DOMAttributesBase<T> extends Props<T> {
-        onCopy?: ClipboardEventHandler;
-        onCut?: ClipboardEventHandler;
-        onPaste?: ClipboardEventHandler;
-        onKeyDown?: KeyboardEventHandler;
-        onKeyPress?: KeyboardEventHandler;
-        onKeyUp?: KeyboardEventHandler;
-        onFocus?: FocusEventHandler;
-        onBlur?: FocusEventHandler;
-        onChange?: FormEventHandler;
-        onInput?: FormEventHandler;
-        onSubmit?: FormEventHandler;
-        onClick?: MouseEventHandler;
-        onDoubleClick?: MouseEventHandler;
-        onDrag?: DragEventHandler;
-        onDragEnd?: DragEventHandler;
-        onDragEnter?: DragEventHandler;
-        onDragExit?: DragEventHandler;
-        onDragLeave?: DragEventHandler;
-        onDragOver?: DragEventHandler;
-        onDragStart?: DragEventHandler;
-        onDrop?: DragEventHandler;
-        onMouseDown?: MouseEventHandler;
-        onMouseEnter?: MouseEventHandler;
-        onMouseLeave?: MouseEventHandler;
-        onMouseMove?: MouseEventHandler;
-        onMouseOut?: MouseEventHandler;
-        onMouseOver?: MouseEventHandler;
-        onMouseUp?: MouseEventHandler;
-        onTouchCancel?: TouchEventHandler;
-        onTouchEnd?: TouchEventHandler;
-        onTouchMove?: TouchEventHandler;
-        onTouchStart?: TouchEventHandler;
-        onScroll?: UIEventHandler;
-        onWheel?: WheelEventHandler;
-
-        className?: string;
-        id?: string;
-
-        dangerouslySetInnerHTML?: {
-            __html: string;
-        };
-    }
-
-    interface DOMAttributes extends DOMAttributesBase<DOMComponent<any>> {
-    }
-
-    // This interface is not complete. Only properties accepting
-    // unitless numbers are listed here (see CSSProperty.js in React)
-    interface CSSProperties {
-        boxFlex?: number;
-        boxFlexGroup?: number;
-        columnCount?: number;
-        flex?: number | string;
-        flexGrow?: number;
-        flexShrink?: number;
-        fontWeight?: number | string;
-        lineClamp?: number;
-        lineHeight?: number | string;
-        opacity?: number;
-        order?: number;
-        orphans?: number;
-        widows?: number;
-        zIndex?: number;
-        zoom?: number;
-
-        fontSize?: number | string;
-
-        // SVG-related properties
-        fillOpacity?: number;
-        strokeOpacity?: number;
-        strokeWidth?: number;
-
-        [propertyName: string]: any;
-    }
-
-    interface HTMLAttributesBase<T> extends DOMAttributesBase<T> {
-        accept?: string;
-        acceptCharset?: string;
-        accessKey?: string;
-        action?: string;
-        allowFullScreen?: boolean;
-        allowTransparency?: boolean;
-        alt?: string;
-        async?: boolean;
-        autoComplete?: boolean;
-        autoFocus?: boolean;
-        autoPlay?: boolean;
-        cellPadding?: number | string;
-        cellSpacing?: number | string;
-        charSet?: string;
-        checked?: boolean;
-        classID?: string;
-        cols?: number;
-        colSpan?: number;
-        content?: string;
-        contentEditable?: boolean;
-        contextMenu?: string;
-        controls?: any;
-        coords?: string;
-        crossOrigin?: string;
-        data?: string;
-        dateTime?: string;
-        defaultChecked?: boolean;
-        defaultValue?: string;
-        defer?: boolean;
-        dir?: string;
-        disabled?: boolean;
-        download?: any;
-        draggable?: boolean;
-        encType?: string;
-        form?: string;
-        formAction?: string;
-        formEncType?: string;
-        formMethod?: string;
-        formNoValidate?: boolean;
-        formTarget?: string;
-        frameBorder?: number | string;
-        headers?: string;
-        height?: number | string;
-        hidden?: boolean;
-        high?: number;
-        href?: string;
-        hrefLang?: string;
-        htmlFor?: string;
-        httpEquiv?: string;
-        icon?: string;
-        label?: string;
-        lang?: string;
-        list?: string;
-        loop?: boolean;
-        low?: number;
-        manifest?: string;
-        marginHeight?: number;
-        marginWidth?: number;
-        max?: number | string;
-        maxLength?: number;
-        media?: string;
-        mediaGroup?: string;
-        method?: string;
-        min?: number | string;
-        multiple?: boolean;
-        muted?: boolean;
-        name?: string;
-        noValidate?: boolean;
-        open?: boolean;
-        optimum?: number;
-        pattern?: string;
-        placeholder?: string;
-        poster?: string;
-        preload?: string;
-        radioGroup?: string;
-        readOnly?: boolean;
-        rel?: string;
-        required?: boolean;
-        role?: string;
-        rows?: number;
-        rowSpan?: number;
-        sandbox?: string;
-        scope?: string;
-        scoped?: boolean;
-        scrolling?: string;
-        seamless?: boolean;
-        selected?: boolean;
-        shape?: string;
-        size?: number;
-        sizes?: string;
-        span?: number;
-        spellCheck?: boolean;
-        src?: string;
-        srcDoc?: string;
-        srcSet?: string;
-        start?: number;
-        step?: number | string;
-        style?: CSSProperties;
-        tabIndex?: number;
-        target?: string;
-        title?: string;
-        type?: string;
-        useMap?: string;
-        value?: string;
-        width?: number | string;
-        wmode?: string;
-
-        // Non-standard Attributes
-        autoCapitalize?: boolean;
-        autoCorrect?: boolean;
-        property?: string;
-        itemProp?: string;
-        itemScope?: boolean;
-        itemType?: string;
-        unselectable?: boolean;
-    }
-
-    interface HTMLAttributes extends HTMLAttributesBase<HTMLComponent> {
-    }
-
-    interface SVGElementAttributes extends HTMLAttributes {
-        viewBox?: string;
-        preserveAspectRatio?: string;
-    }
-
-    interface SVGAttributes extends DOMAttributes {
-        ref?: string | ((component: SVGComponent) => void);
-
-        cx?: number | string;
-        cy?: number | string;
-        d?: string;
-        dx?: number | string;
-        dy?: number | string;
-        fill?: string;
-        fillOpacity?: number | string;
-        fontFamily?: string;
-        fontSize?: number | string;
-        fx?: number | string;
-        fy?: number | string;
-        gradientTransform?: string;
-        gradientUnits?: string;
-        height?: number | string;
-        markerEnd?: string;
-        markerMid?: string;
-        markerStart?: string;
-        offset?: number | string;
-        opacity?: number | string;
-        patternContentUnits?: string;
-        patternUnits?: string;
-        points?: string;
-        preserveAspectRatio?: string;
-        r?: number | string;
-        rx?: number | string;
-        ry?: number | string;
-        spreadMethod?: string;
-        stopColor?: string;
-        stopOpacity?: number | string;
-        stroke?: string;
-        strokeDasharray?: string;
-        strokeLinecap?: string;
-        strokeMiterlimit?: string;
-        strokeOpacity?: number | string;
-        strokeWidth?: number | string;
-        textAnchor?: string;
-        transform?: string;
-        version?: string;
-        viewBox?: string;
-        width?: number | string;
-        x1?: number | string;
-        x2?: number | string;
-        x?: number | string;
-        y1?: number | string;
-        y2?: number | string
-        y?: number | string;
-    }
-
-    //
-    // React.DOM
-    // ----------------------------------------------------------------------
-
-    interface ReactDOM {
-        // HTML
-        a: HTMLFactory;
-        abbr: HTMLFactory;
-        address: HTMLFactory;
-        area: HTMLFactory;
-        article: HTMLFactory;
-        aside: HTMLFactory;
-        audio: HTMLFactory;
-        b: HTMLFactory;
-        base: HTMLFactory;
-        bdi: HTMLFactory;
-        bdo: HTMLFactory;
-        big: HTMLFactory;
-        blockquote: HTMLFactory;
-        body: HTMLFactory;
-        br: HTMLFactory;
-        button: HTMLFactory;
-        canvas: HTMLFactory;
-        caption: HTMLFactory;
-        cite: HTMLFactory;
-        code: HTMLFactory;
-        col: HTMLFactory;
-        colgroup: HTMLFactory;
-        data: HTMLFactory;
-        datalist: HTMLFactory;
-        dd: HTMLFactory;
-        del: HTMLFactory;
-        details: HTMLFactory;
-        dfn: HTMLFactory;
-        dialog: HTMLFactory;
-        div: HTMLFactory;
-        dl: HTMLFactory;
-        dt: HTMLFactory;
-        em: HTMLFactory;
-        embed: HTMLFactory;
-        fieldset: HTMLFactory;
-        figcaption: HTMLFactory;
-        figure: HTMLFactory;
-        footer: HTMLFactory;
-        form: HTMLFactory;
-        h1: HTMLFactory;
-        h2: HTMLFactory;
-        h3: HTMLFactory;
-        h4: HTMLFactory;
-        h5: HTMLFactory;
-        h6: HTMLFactory;
-        head: HTMLFactory;
-        header: HTMLFactory;
-        hr: HTMLFactory;
-        html: HTMLFactory;
-        i: HTMLFactory;
-        iframe: HTMLFactory;
-        img: HTMLFactory;
-        input: HTMLFactory;
-        ins: HTMLFactory;
-        kbd: HTMLFactory;
-        keygen: HTMLFactory;
-        label: HTMLFactory;
-        legend: HTMLFactory;
-        li: HTMLFactory;
-        link: HTMLFactory;
-        main: HTMLFactory;
-        map: HTMLFactory;
-        mark: HTMLFactory;
-        menu: HTMLFactory;
-        menuitem: HTMLFactory;
-        meta: HTMLFactory;
-        meter: HTMLFactory;
-        nav: HTMLFactory;
-        noscript: HTMLFactory;
-        object: HTMLFactory;
-        ol: HTMLFactory;
-        optgroup: HTMLFactory;
-        option: HTMLFactory;
-        output: HTMLFactory;
-        p: HTMLFactory;
-        param: HTMLFactory;
-        picture: HTMLFactory;
-        pre: HTMLFactory;
-        progress: HTMLFactory;
-        q: HTMLFactory;
-        rp: HTMLFactory;
-        rt: HTMLFactory;
-        ruby: HTMLFactory;
-        s: HTMLFactory;
-        samp: HTMLFactory;
-        script: HTMLFactory;
-        section: HTMLFactory;
-        select: HTMLFactory;
-        small: HTMLFactory;
-        source: HTMLFactory;
-        span: HTMLFactory;
-        strong: HTMLFactory;
-        style: HTMLFactory;
-        sub: HTMLFactory;
-        summary: HTMLFactory;
-        sup: HTMLFactory;
-        table: HTMLFactory;
-        tbody: HTMLFactory;
-        td: HTMLFactory;
-        textarea: HTMLFactory;
-        tfoot: HTMLFactory;
-        th: HTMLFactory;
-        thead: HTMLFactory;
-        time: HTMLFactory;
-        title: HTMLFactory;
-        tr: HTMLFactory;
-        track: HTMLFactory;
-        u: HTMLFactory;
-        ul: HTMLFactory;
-        "var": HTMLFactory;
-        video: HTMLFactory;
-        wbr: HTMLFactory;
-
-        // SVG
-        svg: SVGElementFactory;
-        circle: SVGFactory;
-        defs: SVGFactory;
-        ellipse: SVGFactory;
-        g: SVGFactory;
-        line: SVGFactory;
-        linearGradient: SVGFactory;
-        mask: SVGFactory;
-        path: SVGFactory;
-        pattern: SVGFactory;
-        polygon: SVGFactory;
-        polyline: SVGFactory;
-        radialGradient: SVGFactory;
-        rect: SVGFactory;
-        stop: SVGFactory;
-        text: SVGFactory;
-        tspan: SVGFactory;
-    }
-
-    //
-    // React.PropTypes
-    // ----------------------------------------------------------------------
-
-    interface Validator<T> {
-        (object: T, key: string, componentName: string): Error;
-    }
-
-    interface Requireable<T> extends Validator<T> {
-        isRequired: Validator<T>;
-    }
-
-    interface ValidationMap<T> {
-        [key: string]: Validator<T>;
-    }
-
-    interface ReactPropTypes {
-        any: Requireable<any>;
-        array: Requireable<any>;
-        bool: Requireable<any>;
-        func: Requireable<any>;
-        number: Requireable<any>;
-        object: Requireable<any>;
-        string: Requireable<any>;
-        node: Requireable<any>;
-        element: Requireable<any>;
-        instanceOf(expectedClass: {}): Requireable<any>;
-        oneOf(types: any[]): Requireable<any>;
-        oneOfType(types: Validator<any>[]): Requireable<any>;
-        arrayOf(type: Validator<any>): Requireable<any>;
-        objectOf(type: Validator<any>): Requireable<any>;
-        shape(type: ValidationMap<any>): Requireable<any>;
-    }
-
-    //
-    // React.Children
-    // ----------------------------------------------------------------------
-
-    interface ReactChildren {
-        map<T>(children: ReactNode, fn: (child: ReactChild, index: number) => T): { [key:string]: T };
-        forEach(children: ReactNode, fn: (child: ReactChild, index: number) => any): void;
-        count(children: ReactNode): number;
-        only(children: ReactNode): ReactChild;
-    }
-
-    //
-    // Browser Interfaces
-    // https://github.com/nikeee/2048-typescript/blob/master/2048/js/touch.d.ts
-    // ----------------------------------------------------------------------
-
-    interface AbstractView {
-        styleMedia: StyleMedia;
-        document: Document;
-    }
-
-    interface Touch {
-        identifier: number;
-        target: EventTarget;
-        screenX: number;
-        screenY: number;
-        clientX: number;
-        clientY: number;
-        pageX: number;
-        pageY: number;
-    }
-
-    interface TouchList {
-        [index: number]: Touch;
-        length: number;
-        item(index: number): Touch;
-        identifiedTouch(identifier: number): Touch;
-    }
-
-    //
-    // React.addons
-    // ----------------------------------------------------------------------
-
-    export module addons {
-        export var CSSTransitionGroup: CSSTransitionGroup;
-        export var TransitionGroup: TransitionGroup;
-
-        export var LinkedStateMixin: LinkedStateMixin;
-        export var PureRenderMixin: PureRenderMixin;
-
-        export function batchedUpdates<A, B>(
-            callback: (a: A, b: B) => any, a: A, b: B): void;
-        export function batchedUpdates<A>(callback: (a: A) => any, a: A): void;
-        export function batchedUpdates(callback: () => any): void;
-
-        // deprecated: use petehunt/react-classset or JedWatson/classnames
-        export function classSet(cx: { [key: string]: boolean }): string;
-        export function classSet(...classList: string[]): string;
-
-        export function cloneWithProps<P>(
-            element: DOMElement<P>, props: P): DOMElement<P>;
-        export function cloneWithProps<P>(
-            element: ClassicElement<P>, props: P): ClassicElement<P>;
-        export function cloneWithProps<P>(
-            element: ReactElement<P>, props: P): ReactElement<P>;
-
-        export function createFragment(
-            object: { [key: string]: ReactNode }): ReactFragment;
-
-        export function update(value: any[], spec: UpdateArraySpec): any[];
-        export function update(value: {}, spec: UpdateSpec): any;
-
-        // Development tools
-        export import Perf = ReactPerf;
-        export import TestUtils = ReactTestUtils;
-    }
-
-    //
-    // React.addons (Transitions)
-    // ----------------------------------------------------------------------
-
-    interface TransitionGroupProps {
-        component?: ReactType;
-        childFactory?: (child: ReactElement<any>) => ReactElement<any>;
-    }
-
-    interface CSSTransitionGroupProps extends TransitionGroupProps {
-        transitionName: string;
-        transitionAppear?: boolean;
-        transitionEnter?: boolean;
-        transitionLeave?: boolean;
-    }
-
-    type CSSTransitionGroup = ComponentClass<CSSTransitionGroupProps>;
-    type TransitionGroup = ComponentClass<TransitionGroupProps>;
-
-    //
-    // React.addons (Mixins)
-    // ----------------------------------------------------------------------
-
-    interface ReactLink<T> {
-        value: T;
-        requestChange(newValue: T): void;
-    }
-
-    interface LinkedStateMixin extends Mixin<any, any> {
-        linkState<T>(key: string): ReactLink<T>;
-    }
-
-    interface PureRenderMixin extends Mixin<any, any> {
-    }
-
-    //
-    // Reat.addons.update
-    // ----------------------------------------------------------------------
-
-    interface UpdateSpecCommand {
-        $set?: any;
-        $merge?: {};
-        $apply?(value: any): any;
-    }
-
-    interface UpdateSpecPath {
-        [key: string]: UpdateSpec;
-    }
-
-    type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
-
-    interface UpdateArraySpec extends UpdateSpecCommand {
-        $push?: any[];
-        $unshift?: any[];
-        $splice?: any[][];
-    }
-
-    //
-    // React.addons.Perf
-    // ----------------------------------------------------------------------
-
-    interface ComponentPerfContext {
-        current: string;
-        owner: string;
-    }
-
-    interface NumericPerfContext {
-        [key: string]: number;
-    }
-
-    interface Measurements {
-        exclusive: NumericPerfContext;
-        inclusive: NumericPerfContext;
-        render: NumericPerfContext;
-        counts: NumericPerfContext;
-        writes: NumericPerfContext;
-        displayNames: {
-            [key: string]: ComponentPerfContext;
-        };
-        totalTime: number;
-    }
-
-    module ReactPerf {
-        export function start(): void;
-        export function stop(): void;
-        export function printInclusive(measurements: Measurements[]): void;
-        export function printExclusive(measurements: Measurements[]): void;
-        export function printWasted(measurements: Measurements[]): void;
-        export function printDOM(measurements: Measurements[]): void;
-        export function getLastMeasurements(): Measurements[];
-    }
-
-    //
-    // React.addons.TestUtils
-    // ----------------------------------------------------------------------
-
-    interface MockedComponentClass {
-        new(): any;
-    }
-
-    module ReactTestUtils {
-        export import Simulate = ReactSimulate;
-
-        export function renderIntoDocument<P>(
-            element: ReactElement<P>): Component<P, any>;
-        export function renderIntoDocument<C extends Component<any, any>>(
-            element: ReactElement<any>): C;
-
-        export function mockComponent(
-            mocked: MockedComponentClass, mockTagName?: string): typeof ReactTestUtils;
-
-        export function isElementOfType(
-            element: ReactElement<any>, type: ReactType): boolean;
-        export function isTextComponent(instance: Component<any, any>): boolean;
-        export function isDOMComponent(instance: Component<any, any>): boolean;
-        export function isCompositeComponent(instance: Component<any, any>): boolean;
-        export function isCompositeComponentWithType(
-            instance: Component<any, any>,
-            type: ComponentClass<any>): boolean;
-
-        export function findAllInRenderedTree(
-            tree: Component<any, any>,
-            fn: (i: Component<any, any>) => boolean): Component<any, any>;
-
-        export function scryRenderedDOMComponentsWithClass(
-            tree: Component<any, any>,
-            className: string): DOMComponent<any>[];
-        export function findRenderedDOMComponentWithClass(
-            tree: Component<any, any>,
-            className: string): DOMComponent<any>;
-
-        export function scryRenderedDOMComponentsWithTag(
-            tree: Component<any, any>,
-            tagName: string): DOMComponent<any>[];
-        export function findRenderedDOMComponentWithTag(
-            tree: Component<any, any>,
-            tagName: string): DOMComponent<any>;
-
-        export function scryRenderedComponentsWithType<P>(
-            tree: Component<any, any>,
-            type: ComponentClass<P>): Component<P, {}>[];
-        export function scryRenderedComponentsWithType<C extends Component<any, any>>(
-            tree: Component<any, any>,
-            type: ComponentClass<any>): C[];
-
-        export function findRenderedComponentWithType<P>(
-            tree: Component<any, any>,
-            type: ComponentClass<P>): Component<P, {}>;
-        export function findRenderedComponentWithType<C extends Component<any, any>>(
-            tree: Component<any, any>,
-            type: ComponentClass<any>): C;
-
-        export function createRenderer(): ShallowRenderer;
-    }
-
-    interface SyntheticEventData {
-        altKey?: boolean;
-        button?: number;
-        buttons?: number;
-        clientX?: number;
-        clientY?: number;
-        changedTouches?: TouchList;
-        charCode?: boolean;
-        clipboardData?: DataTransfer;
-        ctrlKey?: boolean;
-        deltaMode?: number;
-        deltaX?: number;
-        deltaY?: number;
-        deltaZ?: number;
-        detail?: number;
-        getModifierState?(key: string): boolean;
-        key?: string;
-        keyCode?: number;
-        locale?: string;
-        location?: number;
-        metaKey?: boolean;
-        pageX?: number;
-        pageY?: number;
-        relatedTarget?: EventTarget;
-        repeat?: boolean;
-        screenX?: number;
-        screenY?: number;
-        shiftKey?: boolean;
-        targetTouches?: TouchList;
-        touches?: TouchList;
-        view?: AbstractView;
-        which?: number;
-    }
-
-    interface EventSimulator {
-        (element: Element, eventData?: SyntheticEventData): void;
-        (component: Component<any, any>, eventData?: SyntheticEventData): void;
-    }
-
-    module ReactSimulate {
-        export var blur: EventSimulator;
-        export var change: EventSimulator;
-        export var click: EventSimulator;
-        export var cut: EventSimulator;
-        export var doubleClick: EventSimulator;
-        export var drag: EventSimulator;
-        export var dragEnd: EventSimulator;
-        export var dragEnter: EventSimulator;
-        export var dragExit: EventSimulator;
-        export var dragLeave: EventSimulator;
-        export var dragOver: EventSimulator;
-        export var dragStart: EventSimulator;
-        export var drop: EventSimulator;
-        export var focus: EventSimulator;
-        export var input: EventSimulator;
-        export var keyDown: EventSimulator;
-        export var keyPress: EventSimulator;
-        export var keyUp: EventSimulator;
-        export var mouseDown: EventSimulator;
-        export var mouseEnter: EventSimulator;
-        export var mouseLeave: EventSimulator;
-        export var mouseMove: EventSimulator;
-        export var mouseOut: EventSimulator;
-        export var mouseOver: EventSimulator;
-        export var mouseUp: EventSimulator;
-        export var paste: EventSimulator;
-        export var scroll: EventSimulator;
-        export var submit: EventSimulator;
-        export var touchCancel: EventSimulator;
-        export var touchEnd: EventSimulator;
-        export var touchMove: EventSimulator;
-        export var touchStart: EventSimulator;
-        export var wheel: EventSimulator;
-    }
-
-    class ShallowRenderer {
-        getRenderOutput<E extends ReactElement<any>>(): E;
-        getRenderOutput(): ReactElement<any>;
-        render(element: ReactElement<any>, context?: any): void;
-        unmount(): void;
-    }
-}
-
 declare namespace JSX {
     import React = __React;
 
@@ -1904,139 +2116,148 @@ declare namespace JSX {
     }
     interface ElementAttributesProperty { props: {}; }
 
+    interface IntrinsicAttributes {
+        key?: string | number;
+    }
+
+    interface IntrinsicClassAttributes<T> {
+        ref?: string | ((classInstance: T) => void);
+    }
+
     interface IntrinsicElements {
         // HTML
-        a: React.HTMLAttributes;
-        abbr: React.HTMLAttributes;
-        address: React.HTMLAttributes;
-        area: React.HTMLAttributes;
-        article: React.HTMLAttributes;
-        aside: React.HTMLAttributes;
-        audio: React.HTMLAttributes;
-        b: React.HTMLAttributes;
-        base: React.HTMLAttributes;
-        bdi: React.HTMLAttributes;
-        bdo: React.HTMLAttributes;
-        big: React.HTMLAttributes;
-        blockquote: React.HTMLAttributes;
-        body: React.HTMLAttributes;
-        br: React.HTMLAttributes;
-        button: React.HTMLAttributes;
-        canvas: React.HTMLAttributes;
-        caption: React.HTMLAttributes;
-        cite: React.HTMLAttributes;
-        code: React.HTMLAttributes;
-        col: React.HTMLAttributes;
-        colgroup: React.HTMLAttributes;
-        data: React.HTMLAttributes;
-        datalist: React.HTMLAttributes;
-        dd: React.HTMLAttributes;
-        del: React.HTMLAttributes;
-        details: React.HTMLAttributes;
-        dfn: React.HTMLAttributes;
-        dialog: React.HTMLAttributes;
-        div: React.HTMLAttributes;
-        dl: React.HTMLAttributes;
-        dt: React.HTMLAttributes;
-        em: React.HTMLAttributes;
-        embed: React.HTMLAttributes;
-        fieldset: React.HTMLAttributes;
-        figcaption: React.HTMLAttributes;
-        figure: React.HTMLAttributes;
-        footer: React.HTMLAttributes;
-        form: React.HTMLAttributes;
-        h1: React.HTMLAttributes;
-        h2: React.HTMLAttributes;
-        h3: React.HTMLAttributes;
-        h4: React.HTMLAttributes;
-        h5: React.HTMLAttributes;
-        h6: React.HTMLAttributes;
-        head: React.HTMLAttributes;
-        header: React.HTMLAttributes;
-        hr: React.HTMLAttributes;
-        html: React.HTMLAttributes;
-        i: React.HTMLAttributes;
-        iframe: React.HTMLAttributes;
-        img: React.HTMLAttributes;
-        input: React.HTMLAttributes;
-        ins: React.HTMLAttributes;
-        kbd: React.HTMLAttributes;
-        keygen: React.HTMLAttributes;
-        label: React.HTMLAttributes;
-        legend: React.HTMLAttributes;
-        li: React.HTMLAttributes;
-        link: React.HTMLAttributes;
-        main: React.HTMLAttributes;
-        map: React.HTMLAttributes;
-        mark: React.HTMLAttributes;
-        menu: React.HTMLAttributes;
-        menuitem: React.HTMLAttributes;
-        meta: React.HTMLAttributes;
-        meter: React.HTMLAttributes;
-        nav: React.HTMLAttributes;
-        noscript: React.HTMLAttributes;
-        object: React.HTMLAttributes;
-        ol: React.HTMLAttributes;
-        optgroup: React.HTMLAttributes;
-        option: React.HTMLAttributes;
-        output: React.HTMLAttributes;
-        p: React.HTMLAttributes;
-        param: React.HTMLAttributes;
-        picture: React.HTMLAttributes;
-        pre: React.HTMLAttributes;
-        progress: React.HTMLAttributes;
-        q: React.HTMLAttributes;
-        rp: React.HTMLAttributes;
-        rt: React.HTMLAttributes;
-        ruby: React.HTMLAttributes;
-        s: React.HTMLAttributes;
-        samp: React.HTMLAttributes;
-        script: React.HTMLAttributes;
-        section: React.HTMLAttributes;
-        select: React.HTMLAttributes;
-        small: React.HTMLAttributes;
-        source: React.HTMLAttributes;
-        span: React.HTMLAttributes;
-        strong: React.HTMLAttributes;
-        style: React.HTMLAttributes;
-        sub: React.HTMLAttributes;
-        summary: React.HTMLAttributes;
-        sup: React.HTMLAttributes;
-        table: React.HTMLAttributes;
-        tbody: React.HTMLAttributes;
-        td: React.HTMLAttributes;
-        textarea: React.HTMLAttributes;
-        tfoot: React.HTMLAttributes;
-        th: React.HTMLAttributes;
-        thead: React.HTMLAttributes;
-        time: React.HTMLAttributes;
-        title: React.HTMLAttributes;
-        tr: React.HTMLAttributes;
-        track: React.HTMLAttributes;
-        u: React.HTMLAttributes;
-        ul: React.HTMLAttributes;
-        "var": React.HTMLAttributes;
-        video: React.HTMLAttributes;
-        wbr: React.HTMLAttributes;
+        a: React.HTMLProps<HTMLAnchorElement>;
+        abbr: React.HTMLProps<HTMLElement>;
+        address: React.HTMLProps<HTMLElement>;
+        area: React.HTMLProps<HTMLAreaElement>;
+        article: React.HTMLProps<HTMLElement>;
+        aside: React.HTMLProps<HTMLElement>;
+        audio: React.HTMLProps<HTMLAudioElement>;
+        b: React.HTMLProps<HTMLElement>;
+        base: React.HTMLProps<HTMLBaseElement>;
+        bdi: React.HTMLProps<HTMLElement>;
+        bdo: React.HTMLProps<HTMLElement>;
+        big: React.HTMLProps<HTMLElement>;
+        blockquote: React.HTMLProps<HTMLElement>;
+        body: React.HTMLProps<HTMLBodyElement>;
+        br: React.HTMLProps<HTMLBRElement>;
+        button: React.HTMLProps<HTMLButtonElement>;
+        canvas: React.HTMLProps<HTMLCanvasElement>;
+        caption: React.HTMLProps<HTMLElement>;
+        cite: React.HTMLProps<HTMLElement>;
+        code: React.HTMLProps<HTMLElement>;
+        col: React.HTMLProps<HTMLTableColElement>;
+        colgroup: React.HTMLProps<HTMLTableColElement>;
+        data: React.HTMLProps<HTMLElement>;
+        datalist: React.HTMLProps<HTMLDataListElement>;
+        dd: React.HTMLProps<HTMLElement>;
+        del: React.HTMLProps<HTMLElement>;
+        details: React.HTMLProps<HTMLElement>;
+        dfn: React.HTMLProps<HTMLElement>;
+        dialog: React.HTMLProps<HTMLElement>;
+        div: React.HTMLProps<HTMLDivElement>;
+        dl: React.HTMLProps<HTMLDListElement>;
+        dt: React.HTMLProps<HTMLElement>;
+        em: React.HTMLProps<HTMLElement>;
+        embed: React.HTMLProps<HTMLEmbedElement>;
+        fieldset: React.HTMLProps<HTMLFieldSetElement>;
+        figcaption: React.HTMLProps<HTMLElement>;
+        figure: React.HTMLProps<HTMLElement>;
+        footer: React.HTMLProps<HTMLElement>;
+        form: React.HTMLProps<HTMLFormElement>;
+        h1: React.HTMLProps<HTMLHeadingElement>;
+        h2: React.HTMLProps<HTMLHeadingElement>;
+        h3: React.HTMLProps<HTMLHeadingElement>;
+        h4: React.HTMLProps<HTMLHeadingElement>;
+        h5: React.HTMLProps<HTMLHeadingElement>;
+        h6: React.HTMLProps<HTMLHeadingElement>;
+        head: React.HTMLProps<HTMLHeadElement>;
+        header: React.HTMLProps<HTMLElement>;
+        hr: React.HTMLProps<HTMLHRElement>;
+        html: React.HTMLProps<HTMLHtmlElement>;
+        i: React.HTMLProps<HTMLElement>;
+        iframe: React.HTMLProps<HTMLIFrameElement>;
+        img: React.HTMLProps<HTMLImageElement>;
+        input: React.HTMLProps<HTMLInputElement>;
+        ins: React.HTMLProps<HTMLModElement>;
+        kbd: React.HTMLProps<HTMLElement>;
+        keygen: React.HTMLProps<HTMLElement>;
+        label: React.HTMLProps<HTMLLabelElement>;
+        legend: React.HTMLProps<HTMLLegendElement>;
+        li: React.HTMLProps<HTMLLIElement>;
+        link: React.HTMLProps<HTMLLinkElement>;
+        main: React.HTMLProps<HTMLElement>;
+        map: React.HTMLProps<HTMLMapElement>;
+        mark: React.HTMLProps<HTMLElement>;
+        menu: React.HTMLProps<HTMLElement>;
+        menuitem: React.HTMLProps<HTMLElement>;
+        meta: React.HTMLProps<HTMLMetaElement>;
+        meter: React.HTMLProps<HTMLElement>;
+        nav: React.HTMLProps<HTMLElement>;
+        noscript: React.HTMLProps<HTMLElement>;
+        object: React.HTMLProps<HTMLObjectElement>;
+        ol: React.HTMLProps<HTMLOListElement>;
+        optgroup: React.HTMLProps<HTMLOptGroupElement>;
+        option: React.HTMLProps<HTMLOptionElement>;
+        output: React.HTMLProps<HTMLElement>;
+        p: React.HTMLProps<HTMLParagraphElement>;
+        param: React.HTMLProps<HTMLParamElement>;
+        picture: React.HTMLProps<HTMLElement>;
+        pre: React.HTMLProps<HTMLPreElement>;
+        progress: React.HTMLProps<HTMLProgressElement>;
+        q: React.HTMLProps<HTMLQuoteElement>;
+        rp: React.HTMLProps<HTMLElement>;
+        rt: React.HTMLProps<HTMLElement>;
+        ruby: React.HTMLProps<HTMLElement>;
+        s: React.HTMLProps<HTMLElement>;
+        samp: React.HTMLProps<HTMLElement>;
+        script: React.HTMLProps<HTMLElement>;
+        section: React.HTMLProps<HTMLElement>;
+        select: React.HTMLProps<HTMLSelectElement>;
+        small: React.HTMLProps<HTMLElement>;
+        source: React.HTMLProps<HTMLSourceElement>;
+        span: React.HTMLProps<HTMLSpanElement>;
+        strong: React.HTMLProps<HTMLElement>;
+        style: React.HTMLProps<HTMLStyleElement>;
+        sub: React.HTMLProps<HTMLElement>;
+        summary: React.HTMLProps<HTMLElement>;
+        sup: React.HTMLProps<HTMLElement>;
+        table: React.HTMLProps<HTMLTableElement>;
+        tbody: React.HTMLProps<HTMLTableSectionElement>;
+        td: React.HTMLProps<HTMLTableDataCellElement>;
+        textarea: React.HTMLProps<HTMLTextAreaElement>;
+        tfoot: React.HTMLProps<HTMLTableSectionElement>;
+        th: React.HTMLProps<HTMLTableHeaderCellElement>;
+        thead: React.HTMLProps<HTMLTableSectionElement>;
+        time: React.HTMLProps<HTMLElement>;
+        title: React.HTMLProps<HTMLTitleElement>;
+        tr: React.HTMLProps<HTMLTableRowElement>;
+        track: React.HTMLProps<HTMLTrackElement>;
+        u: React.HTMLProps<HTMLElement>;
+        ul: React.HTMLProps<HTMLUListElement>;
+        "var": React.HTMLProps<HTMLElement>;
+        video: React.HTMLProps<HTMLVideoElement>;
+        wbr: React.HTMLProps<HTMLElement>;
 
         // SVG
-        svg: React.SVGElementAttributes;
+        svg: React.SVGProps;
 
-        circle: React.SVGAttributes;
-        defs: React.SVGAttributes;
-        ellipse: React.SVGAttributes;
-        g: React.SVGAttributes;
-        line: React.SVGAttributes;
-        linearGradient: React.SVGAttributes;
-        mask: React.SVGAttributes;
-        path: React.SVGAttributes;
-        pattern: React.SVGAttributes;
-        polygon: React.SVGAttributes;
-        polyline: React.SVGAttributes;
-        radialGradient: React.SVGAttributes;
-        rect: React.SVGAttributes;
-        stop: React.SVGAttributes;
-        text: React.SVGAttributes;
-        tspan: React.SVGAttributes;
+        circle: React.SVGProps;
+        defs: React.SVGProps;
+        ellipse: React.SVGProps;
+        g: React.SVGProps;
+        image: React.SVGProps;
+        line: React.SVGProps;
+        linearGradient: React.SVGProps;
+        mask: React.SVGProps;
+        path: React.SVGProps;
+        pattern: React.SVGProps;
+        polygon: React.SVGProps;
+        polyline: React.SVGProps;
+        radialGradient: React.SVGProps;
+        rect: React.SVGProps;
+        stop: React.SVGProps;
+        text: React.SVGProps;
+        tspan: React.SVGProps;
     }
 }
diff --git a/reflux/reflux.d.ts b/reflux/reflux.d.ts
index 035bca7f3..d0d79a67c 100644
--- a/reflux/reflux.d.ts
+++ b/reflux/reflux.d.ts
@@ -52,6 +52,7 @@ declare module  RefluxCore {
     function createActions(definition: ActionsDefinition): any;
     function createActions(definitions: string[]): any;
 
+    function connect(store: Store, key?: string):void;
     function listenTo(store: Store, handler: string):void;
     function setState(state: any):void;
 }
diff --git a/request-promise/request-promise-tests.ts b/request-promise/request-promise-tests.ts
index 347cca818..8c7840ad4 100644
--- a/request-promise/request-promise-tests.ts
+++ b/request-promise/request-promise-tests.ts
@@ -20,6 +20,21 @@ rp(options)
 
 // --> Displays length of response from server after post
 
+//Defaults tests
+(() => {
+  const githubUrl = 'https://github.com';
+  const defaultJarRequest = rp.defaults({ jar: true });
+  defaultJarRequest.get(githubUrl).then(() => {});
+  //defaultJarRequest(); //this line doesn't compile (and shouldn't)
+  const defaultUrlRequest = rp.defaults({ url: githubUrl });
+  defaultUrlRequest().then(() => {});
+  defaultUrlRequest.get().then(() => {});
+  const defaultBodyRequest = defaultUrlRequest.defaults({body: '{}', json: true});
+  defaultBodyRequest.get().then(() => {});
+  defaultBodyRequest.post().then(() => {});
+  defaultBodyRequest.put().then(() => {});
+})();
+
 // Get full response after DELETE
 options = {
     method: 'DELETE',
diff --git a/request-promise/request-promise.d.ts b/request-promise/request-promise.d.ts
index 94e3d3152..d442e527f 100644
--- a/request-promise/request-promise.d.ts
+++ b/request-promise/request-promise.d.ts
@@ -19,12 +19,12 @@ declare module 'request-promise' {
         promise(): Promise<any>;
     }
     
-    interface RequestPromiseOptions extends request.OptionalOptions {
+    interface RequestPromiseOptions extends request.CoreOptions {
         simple?: boolean;
         transform?: (body: any, response: http.IncomingMessage) => any;
         resolveWithFullResponse?: boolean;
     }
     
-    var requestPromise: request.RequestAPI<RequestPromise, RequestPromiseOptions>;
+    var requestPromise: request.RequestAPI<RequestPromise, RequestPromiseOptions, request.RequiredUriUrl>;
 	export = requestPromise;
 }
diff --git a/request/request-tests.ts b/request/request-tests.ts
index 2e878893b..1f638d864 100644
--- a/request/request-tests.ts
+++ b/request/request-tests.ts
@@ -31,6 +31,22 @@ var bodyArr: request.RequestPart[] = [{
 	body: value
 }];
 
+//Defaults tests
+(() => {
+  const githubUrl = 'https://github.com';
+  const defaultJarRequest = request.defaults({ jar: true });
+  defaultJarRequest.get(githubUrl);
+  //defaultJarRequest(); //this line doesn't compile (and shouldn't)
+  const defaultUrlRequest = request.defaults({ url: githubUrl });
+  defaultUrlRequest();
+  defaultUrlRequest.get();
+  const defaultBodyRequest = defaultUrlRequest.defaults({body: '{}', json: true});
+  defaultBodyRequest.get();
+  defaultBodyRequest.post();
+  defaultBodyRequest.put();
+})();
+
+
 // --- --- --- --- --- --- --- --- --- --- --- ---
 
 obj = req.toJSON();
@@ -526,6 +542,9 @@ var specialRequest = baseRequest.defaults({
   headers: {special: 'special value'}
 });
 
+const urlRequest = specialRequest.defaults({url: 'https://github.com'});
+urlRequest({}, function(error, response, body) {console.log(body);});
+
 request.put(url);
 request.patch(url);
 request.post(url);
diff --git a/request/request.d.ts b/request/request.d.ts
index bba684856..d47ed5f9a 100644
--- a/request/request.d.ts
+++ b/request/request.d.ts
@@ -16,35 +16,40 @@ declare module 'request' {
 	import fs = require('fs');
 
 	namespace request {
-		export interface RequestAPI<TRequest extends Request, TOptions extends OptionalOptions> {
-			defaults(options: TOptions): RequestAPI<TRequest, TOptions>;
+		export interface RequestAPI<TRequest extends Request,
+			TOptions extends CoreOptions,
+			TUriUrlOptions> {
+
+			defaults(options: TOptions): RequestAPI<TRequest, TOptions, RequiredUriUrl>;
+			defaults(options: RequiredUriUrl & TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
+
 			(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
 			(uri: string, callback?: RequestCallback): TRequest;
-			(options?: RequiredOptions & TOptions, callback?: RequestCallback): TRequest;
+			(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
 			get(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
 			get(uri: string, callback?: RequestCallback): TRequest;
-			get(options: RequiredOptions & TOptions, callback?: RequestCallback): TRequest;
+			get(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
 			post(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
 			post(uri: string, callback?: RequestCallback): TRequest;
-			post(options: RequiredOptions & TOptions, callback?: RequestCallback): TRequest;
+			post(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
 			put(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
 			put(uri: string, callback?: RequestCallback): TRequest;
-			put(options: RequiredOptions & TOptions, callback?: RequestCallback): TRequest;
+			put(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
 			head(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
 			head(uri: string, callback?: RequestCallback): TRequest;
-			head(options: RequiredOptions & TOptions, callback?: RequestCallback): TRequest;
+			head(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
 			patch(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
 			patch(uri: string, callback?: RequestCallback): TRequest;
-			patch(options: RequiredOptions & TOptions, callback?: RequestCallback): TRequest;
+			patch(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
 			del(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
 			del(uri: string, callback?: RequestCallback): TRequest;
-			del(options: RequiredOptions & TOptions, callback?: RequestCallback): TRequest;
+			del(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
 			forever(agentOptions: any, optionsArg: any): TRequest;
 			jar(): CookieJar;
@@ -54,15 +59,22 @@ declare module 'request' {
 			debug: boolean;
 		}
 
-		interface UriOptions {
-			uri: string;
+		interface DefaultUriUrlRequestApi<TRequest extends Request,
+			TOptions extends CoreOptions,
+			TUriUrlOptions>	extends RequestAPI<TRequest, TOptions, TUriUrlOptions> {
+				
+			defaults(options: TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
+			(): TRequest;
+			get(): TRequest;
+			post(): TRequest;
+			put(): TRequest;
+			head(): TRequest;
+			patch(): TRequest;
+			del(): TRequest;
 		}
 
-		interface UrlOptions {
-			url: string;
-		}
-
-		interface OptionalOptions {
+		interface CoreOptions {
+			baseUrl?: string;
 			callback?: (error: any, response: http.IncomingMessage, body: any) => void;
 			jar?: any; // CookieJar
 			formData?: any; // Object
@@ -100,8 +112,19 @@ declare module 'request' {
 			har?: HttpArchiveRequest;
 		}
 
-		export type RequiredOptions = UriOptions | UrlOptions;
-		export type Options = RequiredOptions & OptionalOptions;
+		interface UriOptions {
+			uri: string;
+		}
+		interface UrlOptions {
+			url: string;
+		}
+		export type RequiredUriUrl = UriOptions | UrlOptions;
+
+		interface OptionalUriUrl {
+			uri?: string;
+			url?: string;
+		}
+		export type Options = RequiredUriUrl & CoreOptions;
 
 		export interface RequestCallback {
 			(error: any, response: http.IncomingMessage, body: any): void;
@@ -223,6 +246,6 @@ declare module 'request' {
 			toString(): string;
 		}
 	}
-	var request: request.RequestAPI<request.Request, request.OptionalOptions>;
+	var request: request.RequestAPI<request.Request, request.CoreOptions, request.RequiredUriUrl>;
 	export = request;
 }
diff --git a/restangular/restangular-tests.ts b/restangular/restangular-tests.ts
index 9b5a9c30b..dba7099da 100644
--- a/restangular/restangular-tests.ts
+++ b/restangular/restangular-tests.ts
@@ -50,7 +50,7 @@ myApp.config((RestangularProvider: restangular.IProvider) => {
 });
 
 
-interface MyAppScope extends ng.IScope {
+interface MyAppScope extends angular.IScope {
 	accounts: string[];
   allAccounts: any[];
   account: any;
diff --git a/restangular/restangular.d.ts b/restangular/restangular.d.ts
index b09e4affd..db17e51cf 100644
--- a/restangular/restangular.d.ts
+++ b/restangular/restangular.d.ts
@@ -16,30 +16,19 @@ declare module 'restangular' {
 
 declare module restangular {
 
-  interface IPromise<T> extends ng.IPromise<T> {
+  interface IPromise<T> extends angular.IPromise<T> {
     call(methodName: string, params?: any): IPromise<T>;
     get(fieldName: string): IPromise<T>;
     $object: T;
 }
 
-  interface ICollectionPromise<T> extends ng.IPromise<T[]> {
+  interface ICollectionPromise<T> extends angular.IPromise<T[]> {
     push(object: any): ICollectionPromise<T>;
     call(methodName: string, params?: any): ICollectionPromise<T>;
     get(fieldName: string): ICollectionPromise<T>;
     $object: T[];
   }
 
-  interface IRequestConfig {
-    params?: any;
-    headers?: any;
-    cache?: any;
-    withCredentials?: boolean;
-    data?: any;
-    transformRequest?: any;
-    transformResponse?: any;
-    timeout?: any; // number | promise
-  }
-
   interface IResponse {
     status: number;
     data: any;
@@ -60,14 +49,14 @@ declare module restangular {
     addElementTransformer(route: string, isCollection: boolean, transformer: Function): void;
     setTransformOnlyServerElements(active: boolean): void;
     setOnElemRestangularized(callback: (elem: any, isCollection: boolean, what: string, restangular: IService) => any): void;
-    setResponseInterceptor(responseInterceptor: (data: any, operation: string, what: string, url: string, response: IResponse, deferred: ng.IDeferred<any>) => any): void;
-    setResponseExtractor(responseInterceptor: (data: any, operation: string, what: string, url: string, response: IResponse, deferred: ng.IDeferred<any>) => any): void;
-    addResponseInterceptor(responseInterceptor: (data: any, operation: string, what: string, url: string, response: IResponse, deferred: ng.IDeferred<any>) => any): void;
+    setResponseInterceptor(responseInterceptor: (data: any, operation: string, what: string, url: string, response: IResponse, deferred: angular.IDeferred<any>) => any): void;
+    setResponseExtractor(responseInterceptor: (data: any, operation: string, what: string, url: string, response: IResponse, deferred: angular.IDeferred<any>) => any): void;
+    addResponseInterceptor(responseInterceptor: (data: any, operation: string, what: string, url: string, response: IResponse, deferred: angular.IDeferred<any>) => any): void;
     setRequestInterceptor(requestInterceptor: (element: any, operation: string, what: string, url: string) => any): void;
     addRequestInterceptor(requestInterceptor: (element: any, operation: string, what: string, url: string) => any): void;
-    setFullRequestInterceptor(fullRequestInterceptor: (element: any, operation: string, what: string, url: string, headers: any, params: any, httpConfig: IRequestConfig) => {element: any; headers: any; params: any}): void;
-    addFullRequestInterceptor(requestInterceptor: (element: any, operation: string, what: string, url: string, headers: any, params: any, httpConfig: IRequestConfig) => {headers: any; params: any; element: any; httpConfig: IRequestConfig}): void;
-    setErrorInterceptor(errorInterceptor: (response: IResponse, deferred: ng.IDeferred<any>) => any): void;
+    setFullRequestInterceptor(fullRequestInterceptor: (element: any, operation: string, what: string, url: string, headers: any, params: any, httpConfig: angular.IRequestShortcutConfig) => {element: any; headers: any; params: any}): void;
+    addFullRequestInterceptor(requestInterceptor: (element: any, operation: string, what: string, url: string, headers: any, params: any, httpConfig: angular.IRequestShortcutConfig) => {headers: any; params: any; element: any; httpConfig: angular.IRequestShortcutConfig}): void;
+    setErrorInterceptor(errorInterceptor: (response: IResponse, deferred: angular.IDeferred<any>) => any): void;
     setRestangularFields(fields: {[fieldName: string]: string}): void;
     setMethodOverriders(overriders: string[]): void;
     setJsonp(jsonp: boolean): void;
@@ -124,7 +113,7 @@ declare module restangular {
     clone(): IElement;
     plain(): any;
     plain<T>(): T;
-    withHttpConfig(httpConfig: IRequestConfig): IElement;
+    withHttpConfig(httpConfig: angular.IRequestShortcutConfig): IElement;
     save(queryParams?: any, headers?: any): IPromise<any>;
     getRestangularUrl(): string;
   }
@@ -139,7 +128,7 @@ declare module restangular {
     options(queryParams?: any, headers?: any): IPromise<any>;
     patch(queryParams?: any, headers?: any): IPromise<any>;
     putElement(idx: any, params: any, headers: any): IPromise<any>;
-    withHttpConfig(httpConfig: IRequestConfig): ICollection;
+    withHttpConfig(httpConfig: angular.IRequestShortcutConfig): ICollection;
     clone(): ICollection;
     plain(): any;
     plain<T>(): T[];
diff --git a/restify/restify.d.ts b/restify/restify.d.ts
index 596637f23..d3e5e35f8 100644
--- a/restify/restify.d.ts
+++ b/restify/restify.d.ts
@@ -110,6 +110,7 @@ declare module "restify" {
     version ?: string;
     responseTimeHeader ?: string;
     responseTimeFormatter ?: (durationInMilliseconds: number) => any;
+    handleUpgrades ?: boolean;
   }
 
   interface ClientOptions {
diff --git a/rivets/rivets-tests.ts b/rivets/rivets-tests.ts
index fec282046..f23772094 100644
--- a/rivets/rivets-tests.ts
+++ b/rivets/rivets-tests.ts
@@ -1,18 +1,22 @@
 /// <reference path="rivets.d.ts" />
 
-Rivets.configure({
-		  // Attribute prefix in templates
-		  prefix: 'rv',
-		  // Preload templates with initial data on bind
-		  preloadData: true,
-		  // Root sightglass interface for keypaths
-		  rootInterface: '.',
-		  // Template delimiters for text bindings
-		  templateDelimiters: ['[[', ']]'],
-		  // Augment the event handler of the on-* binder
-		  handler: function(target:any, event:any, binding:any) {
-		    this.call(target, event, binding.view.models)
-		  }
-		})
+rivets.configure({
+    // Attribute prefix in templates
+    prefix: 'rv',
+    // Preload templates with initial data on bind
+    preloadData: true,
+    // Root sightglass interface for keypaths
+    rootInterface: '.',
+    // Template delimiters for text bindings
+    templateDelimiters: ['[[', ']]'],
+    // Augment the event handler of the on-* binder
+    handler: function(target:any, event:any, binding:any) {
+        this.call(target, event, binding.view.models)
+    }
+});
+
 var t = {test: ["hello", "one", "two"]}
-Rivets.bind(document.getElementById("para1"), t)
\ No newline at end of file
+var opts = {bar: "foo"};
+rivets.bind(document.getElementById("para1"), t);
+rivets.bind(document.getElementById("para1"), t, opts);
+rivets.bind([document.getElementById("para1"), document.getElementById("para2")], t);
diff --git a/rivets/rivets.d.ts b/rivets/rivets.d.ts
index 2b04653ec..de3ebf47b 100644
--- a/rivets/rivets.d.ts
+++ b/rivets/rivets.d.ts
@@ -3,33 +3,65 @@
 // Definitions by: Trevor Baron <https://github.com/TrevorDev>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-interface FinchStatic {
-    configure(options?: {
-        /**
-         * Attribute prefix in templates
-         */
-        prefix?: string;
-        /**
-         * Preload templates with initial data on bind
-         */
-        preloadData?: boolean;
-        /**
-         * Root sightglass interface for keypaths
-         */
-        rootInterface?: string;
-        /**
-         * Template delimiters for text bindings
-         */
-        templateDelimiters?: Array<string>
-        /**
-         * Augment the event handler of the on-* binder
-         */
-        handler?: Function;
-    }):void;
-    bind(element:any, template:any):void;
+/// <reference path="../jquery/jquery.d.ts" />
+
+declare module Rivets {
+
+    interface View {
+        build(): void;
+        bind(): void;
+        unbind(): void;
+    }
+
+    interface Rivets {
+        // Global binders.
+        binders: Object;
+
+        // Global components.
+        components: Object;
+
+        // Global formatters.
+        formatters: Object;
+
+        // Global sightglass adapters.
+        adapters: Object;
+
+        // Default attribute prefix.
+        prefix: string;
+
+        // Default template delimiters.
+        templateDelimiters: Array<string>;
+
+        // Default sightglass root interface.
+        rootInterface: string;
+
+        // Preload data by default.
+        preloadData: boolean;
+
+        handler(context: any, ev: Event, biding: any): void;
+
+        configure(options?: {
+
+            // Attribute prefix in templates
+            prefix?: string;
+
+            //Preload templates with initial data on bind
+            preloadData?: boolean;
+
+            //Root sightglass interface for keypaths
+            rootInterface?: string;
+
+            // Template delimiters for text bindings
+            templateDelimiters?: Array<string>
+
+            // Augment the event handler of the on-* binder
+            handler?: Function;
+        }): void;
+
+        bind(element: HTMLElement, models: Object, options?: Object): View;
+        bind(element: JQuery, models: Object, options?: Object): View;
+        bind(element: Array<HTMLElement>, models: Object, options?: Object): View;
+    }
 }
 
-declare var Rivets: FinchStatic;
-declare module "rivets" {
-    export = Rivets;
-}
+declare var rivets: Rivets.Rivets;
diff --git a/scalike/scalike-tests.ts b/scalike/scalike-tests.ts
new file mode 100644
index 000000000..6f2057468
--- /dev/null
+++ b/scalike/scalike-tests.ts
@@ -0,0 +1,29 @@
+/// <reference path="scalike.d.ts" />
+
+import {Optional, Some, None, Try, Right, Left, Either, Future} from "scalike";
+
+// Optional
+Optional(1).map(x => x + 1); // Some(2)
+Optional(null).map(x => x + 1); // None
+Optional(undefined).map(x => x + 1); // None
+Optional(1).flatMap(x => Some(x + 1)).fold(0, x => x + 1); // 3
+
+// Try
+function something() { return 1; }
+Try(something); // Success(1)
+function throwError() { throw new Error; }
+Try(throwError); // Failure(Error)
+Try(() => 1).map(x => x + 1); // Success(2)
+
+// Either
+function validate(x: number): Either<string, number> {
+  return x !== 1 ? Left<string, number>('this is not 1') : Right<string, number>(x);
+}
+validate(1).right().getOrElse(0); // 1
+validate(2).left().getOrElse("err"); // "this is not 1"
+
+// Future
+Future(something).map(x => x + 1); // Future(2)
+Future.successful(1).value; // Optional(Success(1)
+const fu = Future(something);
+Future.sequence([fu, fu, fu]); // Future([1, 1, 1])
diff --git a/scalike/scalike.d.ts b/scalike/scalike.d.ts
new file mode 100644
index 000000000..1c14a1dc3
--- /dev/null
+++ b/scalike/scalike.d.ts
@@ -0,0 +1,271 @@
+// Type definitions for scalike API
+// Project: https://github.com/ryoppy/scalike-typescript
+// Definitions by: ryoppy <https://github.com/ryoppy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../es6-promise/es6-promise.d.ts" />
+
+declare module scalike {
+
+    export interface Either<A, B> {
+        value: A | B;
+        isLeft: boolean;
+        isRight: boolean;
+        left(): LeftProjection<A, B>;
+        right(): RightProjection<A, B>;
+        fold<X>(fa: (a: A) => X, fb: (b: B) => X): X;
+        swap(): Either<B, A>;
+    }
+    export function Right<A, B>(b: B): Either<A, B>;
+    export function Left<A, B>(a: A): Either<A, B>;
+    export class LeftProjection<A, B> {
+        private self;
+        constructor(self: Either<A, B>);
+        toString(): string;
+        get(): A;
+        foreach(f: (a: A) => void): void;
+        getOrElse<X extends A>(x: X): A;
+        forall(f: (a: A) => boolean): boolean;
+        exists(f: (a: A) => boolean): boolean;
+        filter(f: (a: A) => boolean): Optional<Either<A, B>>;
+        map<X>(f: (a: A) => X): Either<X | A, B>;
+        flatMap<X>(f: (a: A) => Either<X, B>): Either<X | A, B>;
+        toOptional(): Optional<A>;
+    }
+    export class RightProjection<A, B> {
+        private self;
+        constructor(self: Either<A, B>);
+        toString(): string;
+        get(): B;
+        foreach(f: (b: B) => void): void;
+        getOrElse<X extends B>(x: X): B;
+        forall(f: (b: B) => boolean): boolean;
+        exists(f: (b: B) => boolean): boolean;
+        filter(f: (b: B) => boolean): Optional<Either<A, B>>;
+        map<X>(f: (b: B) => X): Either<A, X | B>;
+        flatMap<X>(f: (a: B) => Either<A, X>): Either<A, X | B>;
+        toOptional(): Optional<B>;
+    }
+
+    export interface Optional<A> {
+        isEmpty: boolean;
+        nonEmpty: boolean;
+        get(): A;
+        getOrElse<B extends A>(a: B): A;
+        map<B>(f: (a: A) => B): Optional<B>;
+        fold<B>(ifEmpty: B, f: (a: A) => B): B;
+        flatten(): Optional<A>;
+        filter(f: (a: A) => boolean): Optional<A>;
+        contains<B extends A>(b: B): boolean;
+        exists(f: (a: A) => boolean): boolean;
+        forall(f: (a: A) => boolean): boolean;
+        flatMap<B>(f: (a: A) => Optional<B>): Optional<B>;
+        foreach(f: (a: A) => void): void;
+        orElse<B extends A>(ob: Optional<B>): Optional<A>;
+        apply1<B, C>(ob: Optional<B>, f: (a: A, b: B) => C): Optional<C>;
+        apply2<B, C, D>(ob: Optional<B>, oc: Optional<C>, f: (a: A, b: B, c: C) => D): Optional<D>;
+        chain<B>(ob: Optional<B>): OptionalBuilder1<A, B>;
+    }
+    export const None: Optional<any>;
+    export function Optional<A>(a: A): Optional<A>;
+    export function Some<A>(a: A): Optional<A>;
+    export class OptionalBuilder1<A, B> {
+        private oa;
+        private ob;
+        constructor(oa: Optional<A>, ob: Optional<B>);
+        run<C>(f: (a: A, b: B) => C): Optional<C>;
+        chain<C>(oc: Optional<C>): OptionalBuilder2<A, B, C>;
+    }
+    export class OptionalBuilder2<A, B, C> {
+        private oa;
+        private ob;
+        private oc;
+        constructor(oa: Optional<A>, ob: Optional<B>, oc: Optional<C>);
+        run<D>(f: (a: A, b: B, c: C) => D): Optional<D>;
+        chain<D>(od: Optional<D>): OptionalBuilder3<A, B, C, D>;
+    }
+    export class OptionalBuilder3<A, B, C, D> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        constructor(oa: Optional<A>, ob: Optional<B>, oc: Optional<C>, od: Optional<D>);
+        run<E>(f: (a: A, b: B, c: C, d: D) => E): Optional<E>;
+        chain<E>(oe: Optional<E>): OptionalBuilder4<A, B, C, D, E>;
+    }
+    export class OptionalBuilder4<A, B, C, D, E> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        private oe;
+        constructor(oa: Optional<A>, ob: Optional<B>, oc: Optional<C>, od: Optional<D>, oe: Optional<E>);
+        run<F>(f: (a: A, b: B, c: C, d: D, e: E) => F): Optional<F>;
+        chain<F>(of: Optional<F>): OptionalBuilder5<A, B, C, D, E, F>;
+    }
+    export class OptionalBuilder5<A, B, C, D, E, F> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        private oe;
+        private of;
+        constructor(oa: Optional<A>, ob: Optional<B>, oc: Optional<C>, od: Optional<D>, oe: Optional<E>, of: Optional<F>);
+        run<G>(f: (a: A, b: B, c: C, d: D, e: E, f: F) => G): Optional<G>;
+    }
+
+    export interface Try<A> {
+        isSuccess: boolean;
+        isFailure: boolean;
+        get(): A;
+        getError(): Error;
+        fold<B>(fe: (e: Error) => B, ff: (a: A) => B): B;
+        getOrElse<B extends A>(a: B): A;
+        orElse<B extends A>(a: Try<B>): Try<A>;
+        foreach<B>(f: (a: A) => void): void;
+        flatMap<B>(f: (a: A) => Try<B>): Try<B>;
+        map<B>(f: (a: A) => B): Try<B>;
+        filter(f: (a: A) => boolean): Try<A>;
+        toOptional(): Optional<A>;
+        failed(): Try<A>;
+        transform<B>(fs: (a: A) => Try<B>, ff: (e: Error) => Try<B>): Try<B>;
+        recover<B extends A>(f: (e: Error) => Optional<Try<B>>): Try<A>;
+        apply1<B, C>(ob: Try<B>, f: (a: A, b: B) => C): Try<C>;
+        apply2<B, C, D>(ob: Try<B>, oc: Try<C>, f: (a: A, b: B, c: C) => D): Try<D>;
+        chain<B>(ob: Try<B>): TryBuilder1<A, B>;
+    }
+    export function Try<A>(f: () => A): Try<A>;
+    export function Success<A>(a: A): Try<A>;
+    export function Failure<A>(e: Error): Try<A>;
+
+    export class TryBuilder1<A, B> {
+        private oa;
+        private ob;
+        constructor(oa: Try<A>, ob: Try<B>);
+        run<C>(f: (a: A, b: B) => C): Try<C>;
+        chain<C>(oc: Try<C>): TryBuilder2<A, B, C>;
+    }
+    export class TryBuilder2<A, B, C> {
+        private oa;
+        private ob;
+        private oc;
+        constructor(oa: Try<A>, ob: Try<B>, oc: Try<C>);
+        run<D>(f: (a: A, b: B, c: C) => D): Try<D>;
+        chain<D>(od: Try<D>): TryBuilder3<A, B, C, D>;
+    }
+    export class TryBuilder3<A, B, C, D> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        constructor(oa: Try<A>, ob: Try<B>, oc: Try<C>, od: Try<D>);
+        run<E>(f: (a: A, b: B, c: C, d: D) => E): Try<E>;
+        chain<E>(oe: Try<E>): TryBuilder4<A, B, C, D, E>;
+    }
+    export class TryBuilder4<A, B, C, D, E> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        private oe;
+        constructor(oa: Try<A>, ob: Try<B>, oc: Try<C>, od: Try<D>, oe: Try<E>);
+        run<F>(f: (a: A, b: B, c: C, d: D, e: E) => F): Try<F>;
+        chain<F>(of: Try<F>): TryBuilder5<A, B, C, D, E, F>;
+    }
+    export class TryBuilder5<A, B, C, D, E, F> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        private oe;
+        private of;
+        constructor(oa: Try<A>, ob: Try<B>, oc: Try<C>, od: Try<D>, oe: Try<E>, of: Try<F>);
+        run<G>(f: (a: A, b: B, c: C, d: D, e: E, f: F) => G): Try<G>;
+    }
+
+    export interface Future<A> {
+        getPromise(): Promise<A>;
+        onComplete<B>(f: (t: Try<A>) => B): void;
+        isCompleted(): boolean;
+        value(): Optional<Try<A>>;
+        failed(): Future<Error>;
+        foreach<B>(f: (a: A) => B): void;
+        transform<B>(f: (t: Try<A>) => Try<B>): Future<B>;
+        transform1<B>(fs: (a: A) => B, ff: (e: Error) => Error): Future<B>;
+        transformWith<B>(f: (t: Try<A>) => Future<B>): Future<B>;
+        map<B>(f: (a: A) => B): Future<B>;
+        flatMap<B>(f: (a: A) => Future<B>): Future<B>;
+        filter(f: (a: A) => boolean): Future<A>;
+        recover<B extends A>(f: (e: Error) => Optional<B>): Future<A>;
+        recoverWith<B extends A>(f: (e: Error) => Optional<Future<B>>): Future<A>;
+        zip<B>(fu: Future<B>): Future<[A, B]>;
+        zipWith<B, C>(fu: Future<B>, f: (a: A, b: B) => C): Future<C>;
+        fallbackTo<B extends A>(fu: Future<B>): Future<A>;
+        andThen<B>(f: (t: Try<A>) => B): Future<A>;
+        apply1<B, C>(ob: Future<B>, f: (a: A, b: B) => C): Future<C>;
+        apply2<B, C, D>(ob: Future<B>, oc: Future<C>, f: (a: A, b: B, c: C) => D): Future<D>;
+        chain<B>(ob: Future<B>): FutureBuilder1<A, B>;
+    }
+    export function Future<A>(f: Promise<A> | (() => A)): Future<A>;
+    export namespace Future {
+        function fromPromise<A>(p: Promise<A>): Future<A>;
+        function unit(): Future<void>;
+        function failed<A>(e: Error): Future<A>;
+        function successful<A>(a: A): Future<A>;
+        function fromTry<A>(t: Try<A>): Future<A>;
+        function sequence<A>(fus: Array<Future<A>>): Future<Array<A>>;
+        function firstCompletedOf<A>(fus: Array<Future<A>>): Future<A>;
+        function find<A>(fus: Array<Future<A>>, f: (a: A) => boolean): Future<Optional<A>>;
+        function foldLeft<A, B>(fu: Array<Future<A>>, zero: B, f: (b: B, a: A) => B): Future<B>;
+        function reduceLeft<A, B>(fu: Array<Future<A>>, f: (b: B, a: A) => B): Future<B>;
+        function traverse<A, B>(fu: Array<A>, f: (a: A) => Future<B>): Future<Array<B>>;
+    }
+    export class FutureBuilder1<A, B> {
+        private oa;
+        private ob;
+        constructor(oa: Future<A>, ob: Future<B>);
+        run<C>(f: (a: A, b: B) => C): Future<C>;
+        chain<C>(oc: Future<C>): FutureBuilder2<A, B, C>;
+    }
+    export class FutureBuilder2<A, B, C> {
+        private oa;
+        private ob;
+        private oc;
+        constructor(oa: Future<A>, ob: Future<B>, oc: Future<C>);
+        run<D>(f: (a: A, b: B, c: C) => D): Future<D>;
+        chain<D>(od: Future<D>): FutureBuilder3<A, B, C, D>;
+    }
+    export class FutureBuilder3<A, B, C, D> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        constructor(oa: Future<A>, ob: Future<B>, oc: Future<C>, od: Future<D>);
+        run<E>(f: (a: A, b: B, c: C, d: D) => E): Future<E>;
+        chain<E>(oe: Future<E>): FutureBuilder4<A, B, C, D, E>;
+    }
+    export class FutureBuilder4<A, B, C, D, E> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        private oe;
+        constructor(oa: Future<A>, ob: Future<B>, oc: Future<C>, od: Future<D>, oe: Future<E>);
+        run<F>(f: (a: A, b: B, c: C, d: D, e: E) => F): Future<F>;
+        chain<F>(of: Future<F>): FutureBuilder5<A, B, C, D, E, F>;
+    }
+    export class FutureBuilder5<A, B, C, D, E, F> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        private oe;
+        private of;
+        constructor(oa: Future<A>, ob: Future<B>, oc: Future<C>, od: Future<D>, oe: Future<E>, of: Future<F>);
+        run<G>(f: (a: A, b: B, c: C, d: D, e: E, f: F) => G): Future<G>;
+    }
+}
+
+declare module "scalike" {
+    export = scalike
+}
diff --git a/sequelize/sequelize.d.ts b/sequelize/sequelize.d.ts
index 0a151c60f..9b5e935bf 100644
--- a/sequelize/sequelize.d.ts
+++ b/sequelize/sequelize.d.ts
@@ -1994,7 +1994,7 @@ declare module "sequelize" {
             INITIALLY_IMMEDIATE: DeferrableInitiallyImmediate;
             NOT: DeferrableNot;
             SET_DEFERRED: DeferrableSetDeferred;
-            SET_IMMEDIATE: DeferrableSetImmediate
+            SET_IMMEDIATE: DeferrableSetImmediate;
         }
 
         //
@@ -2007,7 +2007,7 @@ declare module "sequelize" {
         /**
          * The Base Error all Sequelize Errors inherit from.
          */
-        interface BaseError extends ErrorConstructor { }
+        interface BaseError extends Error, ErrorConstructor { }
 
         interface ValidationError extends BaseError {
 
@@ -2026,7 +2026,10 @@ declare module "sequelize" {
              * @param path The path to be checked for error items
              */
             get( path : string ) : Array<ValidationErrorItem>;
-
+            
+            /** Array of ValidationErrorItem objects describing the validation errors */
+            errors : Array<ValidationErrorItem>;
+            
         }
 
         interface ValidationErrorItem extends BaseError {
@@ -2041,7 +2044,19 @@ declare module "sequelize" {
              * @param value The value that generated the error
              */
             new ( message : string, type : string, path : string, value : string ) : ValidationErrorItem;
-
+            
+            /** An error message */
+            message : string;
+            
+            /** The type of the validation error */
+            type : string;
+            
+            /** The field that triggered the validation error */
+            path : string;
+            
+            /** The value that generated the error */
+            value : string;
+            
         }
 
         interface DatabaseError extends BaseError {
@@ -2790,7 +2805,7 @@ declare module "sequelize" {
              *
              * @param options.skip An array of strings. All properties that are in this array will not be validated
              */
-            validate( options? : { skip?: Array<string> } ) : Promise<void>;
+            validate( options? : { skip?: Array<string> } ) : Promise<ValidationError>;
 
             /**
              * This is the same as calling `set` and then calling `save`.
@@ -5571,7 +5586,7 @@ declare module "sequelize" {
              * @param options Query Options for authentication
              */
             authenticate( options? : QueryOptions ) : Promise<void>;
-            validate( options? : QueryOptions ) : Promise<void>;
+            validate( options? : QueryOptions ) : Promise<ValidationError>;
 
             /**
              * Start a transaction. When using transactions, you should pass the transaction in the options argument
diff --git a/signalr/signalr.d.ts b/signalr/signalr.d.ts
index e890c8f42..515b1864f 100644
--- a/signalr/signalr.d.ts
+++ b/signalr/signalr.d.ts
@@ -60,7 +60,7 @@ interface SignalR {
 
     starting(handler: () => void ): SignalR;
     received(handler: (data: any) => void ): SignalR;
-    error(handler: (error: string) => void ): SignalR;
+    error(handler: (error: Error) => void ): SignalR;
     stateChanged(handler: (change: SignalRStateChange) => void ): SignalR;
     disconnected(handler: () => void ): SignalR;
     connectionSlow(handler: () => void ): SignalR;
diff --git a/snapsvg/snapsvg.d.ts b/snapsvg/snapsvg.d.ts
index aff964a6d..d4d6ba7a7 100644
--- a/snapsvg/snapsvg.d.ts
+++ b/snapsvg/snapsvg.d.ts
@@ -264,6 +264,7 @@ declare module Snap {
         undrag(onMove:  (dx: number, dy: number, event: MouseEvent) => void,
                onStart: (x: number, y: number, event: MouseEvent) => void,
                onEnd:   (event: MouseEvent) => void): Snap.Element;
+	undrag(): Snap.Element;
 	}
 
 	export interface Fragment {
diff --git a/source-map/source-map.d.ts b/source-map/source-map.d.ts
index 3ddd49b53..34aae2b6a 100644
--- a/source-map/source-map.d.ts
+++ b/source-map/source-map.d.ts
@@ -73,8 +73,8 @@ declare module SourceMap {
         constructor(line: number, column: number, source: string);
         constructor(line: number, column: number, source: string, chunk?: string, name?: string);
         public static fromStringWithSourceMap(code: string, sourceMapConsumer: SourceMapConsumer, relativePath?: string): SourceNode;
-        public add(chunk: string): void;
-        public prepend(chunk: string): void;
+        public add(chunk: any): SourceNode;
+        public prepend(chunk: any): SourceNode;
         public setSourceContent(sourceFile: string, sourceContent: string): void;
         public walk(fn: (chunk: string, mapping: MappedPosition) => void): void;
         public walkSourceContents(fn: (file: string, content: string) => void): void;
diff --git a/srp/srp-tests.ts b/srp/srp-tests.ts
new file mode 100644
index 000000000..002a652d3
--- /dev/null
+++ b/srp/srp-tests.ts
@@ -0,0 +1,45 @@
+/// <reference path="srp.d.ts" />
+
+var srp = require('srp');
+
+
+// Test the `params` variable.
+var params = srp.params['1024'];
+
+
+// Test the `genKey` function.
+srp.genKey(function (err: Error, buf: Buffer): void {});
+srp.genKey(16, function (err: Error, buf: Buffer): void {});
+
+
+// Test the `computeVerifier` function.
+var salt = new Buffer('deadbeef', 'hex');
+var identifier = new Buffer('AzureDiamond');
+var password = new Buffer('hunter2');
+
+var verifier = srp.computeVerifier(params, salt, identifier, password);
+
+
+// Test the `Client` class.
+var secret1 = new Buffer(32);
+var client = new srp.Client(params, salt, identifier, password, secret1);
+
+
+// Test the `Server` class.
+var secret2 = new Buffer(32);
+var server = new srp.Server(params, verifier, secret2);
+
+
+// Test handshake protocol.
+var A = client.computeA();
+server.setA(A);
+
+var B = server.computeB();
+client.setB(B);
+
+var M1 = client.computeM1();
+var M2 = server.checkM1(M1);
+client.checkM2(M2);
+
+client.computeK();
+server.computeK();
diff --git a/srp/srp.d.ts b/srp/srp.d.ts
new file mode 100644
index 000000000..040c1ace6
--- /dev/null
+++ b/srp/srp.d.ts
@@ -0,0 +1,75 @@
+// Type definitions for node-srp
+// Project: https://github.com/mozilla/node-srp
+// Definitions by: Pat Smuk <https://github.com/Patman64>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../bignum/bignum.d.ts" />
+/// <reference path="../node/node.d.ts" />
+
+declare namespace SRP {
+    export interface Params {
+        N_length_bits: number;
+        N: BigNum;
+        g: BigNum;
+        hash: string;
+    }
+    
+    export var params: {
+        [bits: string]: Params;
+    };
+    
+    /**
+     * The verifier is calculated as described in Section 3 of [SRP-RFC].
+     * We give the algorithm here for convenience.
+     *
+     * The verifier (v) is computed based on the salt (s), user name (I),
+     * password (P), and group parameters (N, g).
+     *
+     *         x = H(s | H(I | ":" | P))
+     *         v = g^x % N
+     *
+     * @param {Params} params group parameters, with .N, .g, .hash
+     * @param {Buffer} salt salt
+     * @param {Buffer} I user identity
+     * @param {Buffer} P user password
+     * 
+     * @returns {Buffer}
+     */
+    export function computeVerifier(params: Params, salt: Buffer, I: Buffer, P: Buffer): Buffer;
+    
+    /**
+     * Generate a random key.
+     *
+     * @param {number} bytes length of key (default=32)
+     * @param {function} callback function to call with err,key
+     */
+    export function genKey(bytes: number, callback: (error: Error, key: Buffer) => void): void;
+    
+    /**
+     * Generate a random 32-byte key.
+     *
+     * @param {function} callback function to call with err,key
+     */
+    export function genKey(callback: (error: Error, key: Buffer) => void): void;
+    
+    export class Client {
+        constructor(params: Params, salt: Buffer, identity: Buffer, password: Buffer, secret1: Buffer);
+        computeA(): Buffer;
+        setB(B: Buffer): void;
+        computeM1(): Buffer;
+        checkM2(M2: Buffer): void;
+        computeK(): Buffer;
+    }
+    
+    export class Server {
+        constructor(params: Params, verifier: Buffer, secret2: Buffer);
+        computeB(): Buffer;
+        setA(A: Buffer): void;
+        checkM1(M1: Buffer): Buffer;
+        computeK(): Buffer;
+    }
+}
+
+declare module "srp" {
+    export = SRP;
+}
diff --git a/statuses/statuses.d.ts b/statuses/statuses.d.ts
index 7aacc2f61..2347eba0e 100644
--- a/statuses/statuses.d.ts
+++ b/statuses/statuses.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for http-errors v1.2.1
+// Type definitions for statuses v1.2.1
 // Project: https://github.com/jshttp/statuses
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
diff --git a/superagent/superagent-tests.ts b/superagent/superagent-tests.ts
index 466fc33a1..58b684044 100644
--- a/superagent/superagent-tests.ts
+++ b/superagent/superagent-tests.ts
@@ -1,17 +1,20 @@
-/// <reference path="./superagent.d.ts" />
+/// <reference path="superagent.d.ts" />
 /// <reference path="../node/node.d.ts" />
 
 // via: http://visionmedia.github.io/superagent/
 
-import request = require('superagent')
-import fs = require('fs');
+import * as request from 'superagent';
+import * as fs from 'fs';
+
+// Examples taken from https://github.com/visionmedia/superagent/blob/gh-pages/docs/index.md
+// and https://github.com/visionmedia/superagent/blob/master/Readme.md
 
 request
   .post('/api/pet')
   .send({ name: 'Manny', species: 'cat' })
   .set('X-API-Key', 'foobar')
   .set('Accept', 'application/json')
-  .end((res: request.Response) => {
+  .end((err, res) => {
     if (res.ok) {
       console.log('yay got ' + JSON.stringify(res.body));
     } else {
@@ -25,7 +28,7 @@ agent
   .send({ name: 'Manny', species: 'cat' })
   .set('X-API-Key', 'foobar')
   .set('Accept', 'application/json')
-  .end((res: request.Response) => {
+  .end((err, res) => {
     if (res.error) {
       console.log('oh no ' + res.error.message);
     } else {
@@ -33,8 +36,19 @@ agent
     }
   });
 
+// Plugins
+var nocache = require('superagent-no-cache');
+var prefix = require('superagent-prefix')('/static');
 
-var callback = (res: request.Response) => {};
+request
+  .get('/some-url')
+  .use(prefix) // Prefixes *only* this request
+  .use(nocache) // Prevents caching of *only* this request
+  .end(function(err, res){
+      // Do something
+  });
+
+var callback = (err: any, res: request.Response) => {};
 
 // Request basics
 request
@@ -44,6 +58,10 @@ request
 request('GET', '/search')
   .end(callback);
 
+request
+   .get('http://example.com/search')
+   .end(callback);
+
 request
   .head('/favicon.ico')
   .end(callback);
@@ -100,6 +118,12 @@ request
   .query('range=1..5')
   .end(callback);
 
+// HEAD requests
+request
+  .head('/users')
+  .query({ email: 'joe@smith.com' })
+  .end(callback);
+
 // POST / PUT requests
 request.post('/user')
   .set('Content-Type', 'application/json')
@@ -139,6 +163,7 @@ request.post('/user')
 request.post('/user')
   .type('png');
 
+// Setting Accept
 request.get('/user')
   .accept('application/json');
 
@@ -254,5 +279,3 @@ request
   .attach('image', 'path/to/tobi.png')
   .on('error', (err: any) => {})
   .end(callback);
-
-
diff --git a/superagent/superagent.d.ts b/superagent/superagent.d.ts
index a5118a764..493d287ef 100644
--- a/superagent/superagent.d.ts
+++ b/superagent/superagent.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for SuperAgent 0.15.4
+// Type definitions for SuperAgent v1.4.0
 // Project: https://github.com/visionmedia/superagent
 // Definitions by: Alex Varju <https://github.com/varju/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -8,7 +8,7 @@
 declare module "superagent" {
   import stream = require('stream');
 
-  type CallbackHandler = { (err: any, res: request.Response): void; }|{ (res: request.Response): void; };
+  type CallbackHandler = (err: any, res: request.Response) => void;
 
   var request: request.SuperAgentStatic;
 
@@ -102,6 +102,7 @@ declare module "superagent" {
       set(field: Object): Req;
       timeout(ms: number): Req;
       type(val: string): Req;
+      use(fn: Function): Req;
       withCredentials(): Req;
       write(data: string, encoding?: string): Req;
       write(data: Buffer, encoding?: string): Req;
diff --git a/supertest-as-promised/supertest-as-promised-tests.ts b/supertest-as-promised/supertest-as-promised-tests.ts
new file mode 100644
index 000000000..2b79abd07
--- /dev/null
+++ b/supertest-as-promised/supertest-as-promised-tests.ts
@@ -0,0 +1,64 @@
+/// <reference path="supertest-as-promised.d.ts" />
+/// <reference path="../express/express.d.ts" />
+/// <reference path="../jasmine/jasmine.d.ts" />
+
+import * as request from 'supertest-as-promised';
+import * as express from 'express';
+
+var app = express();
+
+// chain your requests like you were promised:
+request(app)
+  .get("/user")
+  .expect(200)
+  .then(function (res) {
+    return request(app)
+      .post("/kittens")
+      .send({ userId: res})
+      .expect(201);
+  })
+  .then(function (res) {
+    // ...
+  });
+
+
+// Usage
+request(app)
+  .get("/kittens")
+  .expect(200)
+  .then(function (res) {
+    // ...
+  });
+
+describe("GET /kittens", function () {
+  it("should work", function () {
+    return request(app).get("/kittens").expect(200);
+  });
+});
+
+
+// Agents
+var agent = request.agent(app);
+agent
+  .get("/ugly-kitteh")
+  .expect(404)
+  .then(function () {
+    // ...
+  })
+
+
+// Promisey goodness
+request(app)
+  .get("/kittens")
+  .expect(201)
+  .then(function (res) { /* ... */ })
+  // I'm a real promise now!
+  .catch(function (err) { /* ... */ })
+
+request(app)
+  .get("/kittens")
+  .expect(201)
+  .toPromise()
+  // I'm a real promise now!
+  .delay(10)
+  .then(function (res) { /* ... */ })
diff --git a/supertest-as-promised/supertest-as-promised.d.ts b/supertest-as-promised/supertest-as-promised.d.ts
new file mode 100644
index 000000000..2c035848f
--- /dev/null
+++ b/supertest-as-promised/supertest-as-promised.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for SuperTest as Promised v2.0.2
+// Project: https://github.com/WhoopInc/supertest-as-promised
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path='../superagent/superagent.d.ts' />
+/// <reference path="../bluebird/bluebird.d.ts" />
+
+declare module "supertest-as-promised" {
+  // Mostly copy-pasted from supertest.d.ts
+
+  import * as superagent from 'superagent';
+  import * as PromiseBluebird from 'bluebird';
+
+  function supertest(app: any): supertest.SuperTest;
+
+  module supertest {
+    function agent(app?: any): supertest.SuperTest;
+
+    interface SuperTest extends superagent.SuperAgent<Test> {
+    }
+
+    interface Promise<T> extends PromiseBluebird<T> {
+      toPromise(): PromiseBluebird<T>;
+    }
+
+    interface Test extends superagent.Request<Test> {
+      url: string;
+      serverAddress(app: any, path: string): string;
+      expect(status: number): Promise<supertest.Response>;
+      expect(status: number, body: string): Promise<supertest.Response>;
+      expect(body: string): Promise<supertest.Response>;
+      expect(body: RegExp): Promise<supertest.Response>;
+      expect(body: Object): Promise<supertest.Response>;
+      expect(field: string, val: string): Promise<supertest.Response>;
+      expect(field: string, val: RegExp): Promise<supertest.Response>;
+      expect(checker: (res: Response) => any): Promise<supertest.Response>;
+    }
+
+    interface Response extends superagent.Response {
+    }
+  }
+
+  export = supertest;
+}
diff --git a/supertest/supertest-tests.ts b/supertest/supertest-tests.ts
index d76c97ea4..5e0de8ad8 100644
--- a/supertest/supertest-tests.ts
+++ b/supertest/supertest-tests.ts
@@ -1,8 +1,8 @@
 /// <reference path="supertest.d.ts" />
 /// <reference path="../express/express.d.ts" />
 
-import supertest = require('supertest')
-import express = require('express');
+import * as supertest from 'supertest';
+import * as express from 'express';
 
 var app = express();
 
@@ -11,7 +11,7 @@ supertest(app)
   .expect('Content-Type', /json/)
   .expect('Content-Length', '20')
   .expect(201)
-  .end((err: any, res: supertest.Response) => {
+  .end((err, res) => {
     if (err) throw err;
   });
 
@@ -56,4 +56,3 @@ function hasPreviousAndNextKeys(res: supertest.Response) {
   if (!('next' in res.body)) return "missing next key";
   if (!('prev' in res.body)) throw new Error("missing prev key");
 }
-
diff --git a/supertest/supertest.d.ts b/supertest/supertest.d.ts
index dccbd47c8..9ca154e2f 100644
--- a/supertest/supertest.d.ts
+++ b/supertest/supertest.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for SuperTest 0.14.0
+// Type definitions for SuperTest v1.1.0
 // Project: https://github.com/visionmedia/supertest
 // Definitions by: Alex Varju <https://github.com/varju/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -8,7 +8,7 @@
 declare module "supertest" {
   import superagent = require('superagent');
 
-  type CallbackHandler = { (err: any, res: supertest.Response): void; }|{ (res: supertest.Response): void; };
+  type CallbackHandler = (err: any, res: supertest.Response) => void;
 
   function supertest(app: any): supertest.SuperTest;
 
@@ -29,6 +29,7 @@ declare module "supertest" {
       expect(field: string, val: string, callback?: CallbackHandler): Test;
       expect(field: string, val: RegExp, callback?: CallbackHandler): Test;
       expect(checker: (res: Response) => any): Test;
+      end(callback?: CallbackHandler): Test;
     }
 
     interface Response extends superagent.Response {
diff --git a/threejs/tests/webgl/webgl_animation_skinning_morph.ts b/threejs/tests/webgl/webgl_animation_skinning_morph.ts
index f38376efb..7c65905ae 100644
--- a/threejs/tests/webgl/webgl_animation_skinning_morph.ts
+++ b/threejs/tests/webgl/webgl_animation_skinning_morph.ts
@@ -11,13 +11,15 @@
     var SCREEN_HEIGHT = window.innerHeight;
     var FLOOR = -250;
 
-    var container, stats;
+    var container,stats;
 
     var camera, scene;
     var renderer;
 
     var mesh, helper;
 
+    var mixer;
+
     var mouseX = 0, mouseY = 0;
 
     var windowHalfX = window.innerWidth / 2;
@@ -25,51 +27,49 @@
 
     var clock = new THREE.Clock();
 
-    document.addEventListener('mousemove', onDocumentMouseMove, false);
+    document.addEventListener( 'mousemove', onDocumentMouseMove, false );
 
     init();
     animate();
 
     function init() {
 
-        container = document.getElementById('container');
+        container = document.getElementById( 'container' );
 
-        camera = new THREE.PerspectiveCamera(30, SCREEN_WIDTH / SCREEN_HEIGHT, 1, 10000);
+        camera = new THREE.PerspectiveCamera( 30, SCREEN_WIDTH / SCREEN_HEIGHT, 1, 10000 );
         camera.position.z = 2200;
 
         scene = new THREE.Scene();
 
-        scene.fog = new THREE.Fog(0xffffff, 2000, 10000);
+        scene.fog = new THREE.Fog( 0xffffff, 2000, 10000 );
 
-        scene.add(camera);
+        scene.add( camera );
 
         // GROUND
 
-        var geometry = new THREE.PlaneBufferGeometry(16000, 16000);
-        var material = new THREE.MeshPhongMaterial({ emissive: 0xbbbbbb });
+        var geometry = new THREE.PlaneBufferGeometry( 16000, 16000 );
+        var material = new THREE.MeshPhongMaterial( { emissive: 0x888888 } );
 
-        var ground = new THREE.Mesh(geometry, material);
-        ground.position.set(0, FLOOR, 0);
-        ground.rotation.x = -Math.PI / 2;
-        scene.add(ground);
+        var ground = new THREE.Mesh( geometry, material );
+        ground.position.set( 0, FLOOR, 0 );
+        ground.rotation.x = -Math.PI/2;
+        scene.add( ground );
 
         ground.receiveShadow = true;
 
 
         // LIGHTS
 
-        var ambient = new THREE.AmbientLight(0x222222);
-        scene.add(ambient);
+        scene.add( new THREE.HemisphereLight( 0x111111, 0x444444 ) );
 
-
-        var light = new THREE.DirectionalLight(0xebf3ff, 1.6);
-        light.position.set(0, 140, 500).multiplyScalar(1.1);
-        scene.add(light);
+        var light = new THREE.DirectionalLight( 0xebf3ff, 1.5 );
+        light.position.set( 0, 140, 500 ).multiplyScalar( 1.1 );
+        scene.add( light );
 
         light.castShadow = true;
 
         light.shadowMapWidth = 1024;
-        light.shadowMapHeight = 2048;
+        light.shadowMapHeight = 1024;
 
         var d = 390;
 
@@ -81,41 +81,35 @@
         light.shadowCameraFar = 3500;
         //light.shadowCameraVisible = true;
 
-        //
-
-        var light = new THREE.DirectionalLight(0x497f13, 1);
-        light.position.set(0, -1, 0);
-        scene.add(light);
-
         // RENDERER
 
-        renderer = new THREE.WebGLRenderer({ antialias: true });
-        renderer.setClearColor(scene.fog.color);
-        renderer.setPixelRatio(window.devicePixelRatio);
-        renderer.setSize(SCREEN_WIDTH, SCREEN_HEIGHT);
+        renderer = new THREE.WebGLRenderer( { antialias: true } );
+        renderer.setClearColor( scene.fog.color );
+        renderer.setPixelRatio( window.devicePixelRatio );
+        renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
         renderer.domElement.style.position = "relative";
 
-        container.appendChild(renderer.domElement);
+        container.appendChild( renderer.domElement );
 
         renderer.gammaInput = true;
         renderer.gammaOutput = true;
 
-        renderer.shadowMapEnabled = true;
+        renderer.shadowMap.enabled = true;
 
 
         // STATS
 
         stats = new Stats();
-        container.appendChild(stats.domElement);
+        container.appendChild( stats.domElement );
 
         //
 
         var loader = new THREE.JSONLoader();
-        loader.load("models/skinned/knight.js", function (geometry, materials) {
+        loader.load( "models/skinned/knight.js", function ( geometry, materials ) {
 
-            createScene(geometry, materials, 0, FLOOR, -300, 60)
+            createScene( geometry, materials, 0, FLOOR, -300, 60 )
 
-				});
+        } );
 
         // GUI
 
@@ -123,7 +117,7 @@
 
         //
 
-        window.addEventListener('resize', onWindowResize, false);
+        window.addEventListener( 'resize', onWindowResize, false );
 
     }
 
@@ -135,30 +129,13 @@
         camera.aspect = window.innerWidth / window.innerHeight;
         camera.updateProjectionMatrix();
 
-        renderer.setSize(window.innerWidth, window.innerHeight);
+        renderer.setSize( window.innerWidth, window.innerHeight );
 
     }
 
-    function ensureLoop(animation) {
+    function createScene( geometry, materials, x, y, z, s ) {
 
-        for (var i = 0; i < animation.hierarchy.length; i++) {
-
-            var bone = animation.hierarchy[i];
-
-            var first = bone.keys[0];
-            var last = bone.keys[bone.keys.length - 1];
-
-            last.pos = first.pos;
-            last.rot = first.rot;
-            last.scl = first.scl;
-
-        }
-
-    }
-
-    function createScene(geometry, materials, x, y, z, s) {
-
-        ensureLoop(geometry.animation);
+        //ensureLoop( geometry.animation );
 
         geometry.computeBoundingBox();
         var bb = geometry.boundingBox;
@@ -171,24 +148,15 @@
             path + 'posz' + format, path + 'negz' + format
         ];
 
+        for ( var i = 0; i < materials.length; i ++ ) {
 
-        //var envMap = THREE.ImageUtils.loadTextureCube( urls );
-
-        //var map = THREE.ImageUtils.loadTexture( "textures/UV_Grid_Sm.jpg" );
-
-        //var bumpMap = THREE.ImageUtils.generateDataTexture( 1, 1, new THREE.Color() );
-        //var bumpMap = THREE.ImageUtils.loadTexture( "textures/water.jpg" );
-
-        for (var i = 0; i < materials.length; i++) {
-
-            var m = materials[i];
+            var m = materials[ i ];
             m.skinning = true;
             m.morphTargets = true;
 
-            m.specular.setHSL(0, 0, 0.1);
+            m.specular.setHSL( 0, 0, 0.1 );
 
-            m.color.setHSL(0.6, 0, 0.6);
-            m.ambient.copy(m.color);
+            m.color.setHSL( 0.6, 0, 0.6 );
 
             //m.map = map;
             //m.envMap = envMap;
@@ -198,47 +166,49 @@
             //m.combine = THREE.MixOperation;
             //m.reflectivity = 0.75;
 
-            m.wrapAround = true;
-
         }
 
-        mesh = new THREE.SkinnedMesh(geometry, new THREE.MeshFaceMaterial(materials));
-        mesh.position.set(x, y - bb.min.y * s, z);
-        mesh.scale.set(s, s, s);
-        scene.add(mesh);
+        mesh = new THREE.SkinnedMesh( geometry, new THREE.MeshFaceMaterial( materials ) );
+        mesh.position.set( x, y - bb.min.y * s, z );
+        mesh.scale.set( s, s, s );
+        scene.add( mesh );
 
         mesh.castShadow = true;
         mesh.receiveShadow = true;
 
-        helper = new THREE.SkeletonHelper(mesh);
+        helper = new THREE.SkeletonHelper( mesh );
         helper.material.linewidth = 3;
         helper.visible = false;
-        scene.add(helper);
+        scene.add( helper );
 
-        var animation = new THREE.Animation(mesh, geometry.animation);
-        animation.play();
 
+        var clipMorpher = THREE.AnimationClip.CreateFromMorphTargetSequence( 'facialExpressions', mesh.geometry.morphTargets, 3 );
+        var clipBones = geometry.animations[0];
+
+        mixer = new THREE.AnimationMixer( mesh );
+        mixer.addAction( new THREE.AnimationAction( clipMorpher ) );
+        mixer.addAction( new THREE.AnimationAction( clipBones ) );
     }
 
     function initGUI() {
 
         var API = {
-            'show model': true,
-            'show skeleton': false
+            'show model'    : true,
+            'show skeleton' : false
         };
 
         var gui = new dat.GUI();
 
-        gui.add(API, 'show model').onChange(function () { mesh.visible = API['show model']; });
+        gui.add( API, 'show model' ).onChange( function() { mesh.visible = API[ 'show model' ]; } );
 
-        gui.add(API, 'show skeleton').onChange(function () { helper.visible = API['show skeleton']; });
+        gui.add( API, 'show skeleton' ).onChange( function() { helper.visible = API[ 'show skeleton' ]; } );
 
     }
 
-    function onDocumentMouseMove(event) {
+    function onDocumentMouseMove( event ) {
 
-        mouseX = (event.clientX - windowHalfX);
-        mouseY = (event.clientY - windowHalfY);
+        mouseX = ( event.clientX - windowHalfX );
+        mouseY = ( event.clientY - windowHalfY );
 
     }
 
@@ -246,7 +216,7 @@
 
     function animate() {
 
-        requestAnimationFrame(animate);
+        requestAnimationFrame( animate );
 
         render();
         stats.update();
@@ -257,38 +227,17 @@
 
         var delta = 0.75 * clock.getDelta();
 
-        camera.position.x += (mouseX - camera.position.x) * .05;
-        camera.position.y = THREE.Math.clamp(camera.position.y + (- mouseY - camera.position.y) * .05, 0, 1000);
+        camera.position.x += ( mouseX - camera.position.x ) * .05;
+        camera.position.y = THREE.Math.clamp( camera.position.y + ( - mouseY - camera.position.y ) * .05, 0, 1000 );
 
-        camera.lookAt(scene.position);
-
-        // update skinning
-
-        THREE.AnimationHandler.update(delta);
-
-        if (helper !== undefined) helper.update();
-
-        // update morphs
-
-        if (mesh) {
-
-            var time = Date.now() * 0.001;
-
-            // mouth
-
-            mesh.morphTargetInfluences[1] = (1 + Math.sin(4 * time)) / 2;
-
-            // frown ?
-
-            mesh.morphTargetInfluences[2] = (1 + Math.sin(2 * time)) / 2;
-
-            // eyes
-
-            mesh.morphTargetInfluences[3] = (1 + Math.cos(4 * time)) / 2;
+        camera.lookAt( scene.position );
 
+        if( mixer ) {
+            mixer.update( delta );
+            helper.update();
         }
 
-        renderer.render(scene, camera);
+        renderer.render( scene, camera );
 
     }
 }
\ No newline at end of file
diff --git a/threejs/tests/webgl/webgl_buffergeometry.ts b/threejs/tests/webgl/webgl_buffergeometry.ts
index cedd78d9c..c01b0dfe6 100644
--- a/threejs/tests/webgl/webgl_buffergeometry.ts
+++ b/threejs/tests/webgl/webgl_buffergeometry.ts
@@ -8,7 +8,7 @@
 
     // -------
 
-    if (!Detector.webgl) Detector.addGetWebGLMessage();
+    if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
 
     var container, stats;
 
@@ -21,27 +21,27 @@
 
     function init() {
 
-        container = document.getElementById('container');
+        container = document.getElementById( 'container' );
 
         //
 
-        camera = new THREE.PerspectiveCamera(27, window.innerWidth / window.innerHeight, 1, 3500);
+        camera = new THREE.PerspectiveCamera( 27, window.innerWidth / window.innerHeight, 1, 3500 );
         camera.position.z = 2750;
 
         scene = new THREE.Scene();
-        scene.fog = new THREE.Fog(0x050505, 2000, 3500);
+        scene.fog = new THREE.Fog( 0x050505, 2000, 3500 );
 
         //
 
-        scene.add(new THREE.AmbientLight(0x444444));
+        scene.add( new THREE.AmbientLight( 0x444444 ) );
 
-        var light1 = new THREE.DirectionalLight(0xffffff, 0.5);
-        light1.position.set(1, 1, 1);
-        scene.add(light1);
+        var light1 = new THREE.DirectionalLight( 0xffffff, 0.5 );
+        light1.position.set( 1, 1, 1 );
+        scene.add( light1 );
 
-        var light2 = new THREE.DirectionalLight(0xffffff, 1.5);
-        light2.position.set(0, -1, 0);
-        scene.add(light2);
+        var light2 = new THREE.DirectionalLight( 0xffffff, 1.5 );
+        light2.position.set( 0, -1, 0 );
+        scene.add( light2 );
 
         //
 
@@ -49,29 +49,14 @@
 
         var geometry = new THREE.BufferGeometry();
 
-        // break geometry into
-        // chunks of 21,845 triangles (3 unique vertices per triangle)
-        // for indices to fit into 16 bit integer number
-        // floor(2^16 / 3) = 21845
-
-        var chunkSize = 21845;
-
-        var indices = new Uint16Array(triangles * 3);
-
-        for (var i = 0; i < indices.length; i++) {
-
-            indices[i] = i % (3 * chunkSize);
-
-        }
-
-        var positions = new Float32Array(triangles * 3 * 3);
-        var normals = new Float32Array(triangles * 3 * 3);
-        var colors = new Float32Array(triangles * 3 * 3);
+        var positions = new Float32Array( triangles * 3 * 3 );
+        var normals = new Float32Array( triangles * 3 * 3 );
+        var colors = new Float32Array( triangles * 3 * 3 );
 
         var color = new THREE.Color();
 
-        var n = 800, n2 = n / 2;	// triangles spread in the cube
-        var d = 12, d2 = d / 2;	// individual triangle size
+        var n = 800, n2 = n/2;	// triangles spread in the cube
+        var d = 12, d2 = d/2;	// individual triangle size
 
         var pA = new THREE.Vector3();
         var pB = new THREE.Vector3();
@@ -80,7 +65,7 @@
         var cb = new THREE.Vector3();
         var ab = new THREE.Vector3();
 
-        for (var i = 0; i < positions.length; i += 9) {
+        for ( var i = 0; i < positions.length; i += 9 ) {
 
             // positions
 
@@ -100,27 +85,27 @@
             var cy = y + Math.random() * d - d2;
             var cz = z + Math.random() * d - d2;
 
-            positions[i] = ax;
-            positions[i + 1] = ay;
-            positions[i + 2] = az;
+            positions[ i ]     = ax;
+            positions[ i + 1 ] = ay;
+            positions[ i + 2 ] = az;
 
-            positions[i + 3] = bx;
-            positions[i + 4] = by;
-            positions[i + 5] = bz;
+            positions[ i + 3 ] = bx;
+            positions[ i + 4 ] = by;
+            positions[ i + 5 ] = bz;
 
-            positions[i + 6] = cx;
-            positions[i + 7] = cy;
-            positions[i + 8] = cz;
+            positions[ i + 6 ] = cx;
+            positions[ i + 7 ] = cy;
+            positions[ i + 8 ] = cz;
 
             // flat face normals
 
-            pA.set(ax, ay, az);
-            pB.set(bx, by, bz);
-            pC.set(cx, cy, cz);
+            pA.set( ax, ay, az );
+            pB.set( bx, by, bz );
+            pC.set( cx, cy, cz );
 
-            cb.subVectors(pC, pB);
-            ab.subVectors(pA, pB);
-            cb.cross(ab);
+            cb.subVectors( pC, pB );
+            ab.subVectors( pA, pB );
+            cb.cross( ab );
 
             cb.normalize();
 
@@ -128,91 +113,76 @@
             var ny = cb.y;
             var nz = cb.z;
 
-            normals[i] = nx;
-            normals[i + 1] = ny;
-            normals[i + 2] = nz;
+            normals[ i ]     = nx;
+            normals[ i + 1 ] = ny;
+            normals[ i + 2 ] = nz;
 
-            normals[i + 3] = nx;
-            normals[i + 4] = ny;
-            normals[i + 5] = nz;
+            normals[ i + 3 ] = nx;
+            normals[ i + 4 ] = ny;
+            normals[ i + 5 ] = nz;
 
-            normals[i + 6] = nx;
-            normals[i + 7] = ny;
-            normals[i + 8] = nz;
+            normals[ i + 6 ] = nx;
+            normals[ i + 7 ] = ny;
+            normals[ i + 8 ] = nz;
 
             // colors
 
-            var vx = (x / n) + 0.5;
-            var vy = (y / n) + 0.5;
-            var vz = (z / n) + 0.5;
+            var vx = ( x / n ) + 0.5;
+            var vy = ( y / n ) + 0.5;
+            var vz = ( z / n ) + 0.5;
 
-            color.setRGB(vx, vy, vz);
+            color.setRGB( vx, vy, vz );
 
-            colors[i] = color.r;
-            colors[i + 1] = color.g;
-            colors[i + 2] = color.b;
+            colors[ i ]     = color.r;
+            colors[ i + 1 ] = color.g;
+            colors[ i + 2 ] = color.b;
 
-            colors[i + 3] = color.r;
-            colors[i + 4] = color.g;
-            colors[i + 5] = color.b;
+            colors[ i + 3 ] = color.r;
+            colors[ i + 4 ] = color.g;
+            colors[ i + 5 ] = color.b;
 
-            colors[i + 6] = color.r;
-            colors[i + 7] = color.g;
-            colors[i + 8] = color.b;
+            colors[ i + 6 ] = color.r;
+            colors[ i + 7 ] = color.g;
+            colors[ i + 8 ] = color.b;
 
         }
 
-        geometry.addAttribute('index', new THREE.BufferAttribute(indices, 1));
-        geometry.addAttribute('position', new THREE.BufferAttribute(positions, 3));
-        geometry.addAttribute('normal', new THREE.BufferAttribute(normals, 3));
-        geometry.addAttribute('color', new THREE.BufferAttribute(colors, 3));
-
-        var offsets = triangles / chunkSize;
-
-        for (var i = 0; i < offsets; i++) {
-
-            var offset = {
-                start: i * chunkSize * 3,
-                index: i * chunkSize * 3,
-                count: Math.min(triangles - (i * chunkSize), chunkSize) * 3
-            };
-
-            geometry.offsets.push(offset);
-
-        }
+        geometry.addAttribute( 'position', new THREE.BufferAttribute( positions, 3 ) );
+        geometry.addAttribute( 'normal', new THREE.BufferAttribute( normals, 3 ) );
+        geometry.addAttribute( 'color', new THREE.BufferAttribute( colors, 3 ) );
 
         geometry.computeBoundingSphere();
 
-        var material = new THREE.MeshPhongMaterial({
+        var material = new THREE.MeshPhongMaterial( {
             color: 0xaaaaaa, specular: 0xffffff, shininess: 250,
             side: THREE.DoubleSide, vertexColors: THREE.VertexColors
-        });
+        } );
 
-        mesh = new THREE.Mesh(geometry, material);
-        scene.add(mesh);
+        mesh = new THREE.Mesh( geometry, material );
+        scene.add( mesh );
 
         //
 
-        renderer = new THREE.WebGLRenderer({ antialias: false });
-        renderer.setClearColor(scene.fog.color);
-        renderer.setPixelRatio(window.devicePixelRatio);
-        renderer.setSize(window.innerWidth, window.innerHeight);
+        renderer = new THREE.WebGLRenderer( { antialias: false } );
+        renderer.setClearColor( scene.fog.color );
+        renderer.setPixelRatio( window.devicePixelRatio );
+        renderer.setSize( window.innerWidth, window.innerHeight );
 
         renderer.gammaInput = true;
         renderer.gammaOutput = true;
 
-        container.appendChild(renderer.domElement);
+        container.appendChild( renderer.domElement );
 
         //
 
         stats = new Stats();
         stats.domElement.style.position = 'absolute';
         stats.domElement.style.top = '0px';
-        container.appendChild(stats.domElement);
+        container.appendChild( stats.domElement );
 
         //
 
-        window.addEventListener('resize', onWindowResize, false);
+        window.addEventListener( 'resize', onWindowResize, false );
 
     }
 
@@ -221,7 +191,7 @@
         camera.aspect = window.innerWidth / window.innerHeight;
         camera.updateProjectionMatrix();
 
-        renderer.setSize(window.innerWidth, window.innerHeight);
+        renderer.setSize( window.innerWidth, window.innerHeight );
 
     }
 
@@ -229,7 +199,7 @@
 
     function animate() {
 
-        requestAnimationFrame(animate);
+        requestAnimationFrame( animate );
 
         render();
         stats.update();
@@ -243,7 +213,7 @@
         mesh.rotation.x = time * 0.25;
         mesh.rotation.y = time * 0.5;
 
-        renderer.render(scene, camera);
+        renderer.render( scene, camera );
 
     }
 }
\ No newline at end of file
diff --git a/threejs/tests/webgl/webgl_camera.ts b/threejs/tests/webgl/webgl_camera.ts
index 4ebb7f7bb..a10a4ad0d 100644
--- a/threejs/tests/webgl/webgl_camera.ts
+++ b/threejs/tests/webgl/webgl_camera.ts
@@ -18,27 +18,27 @@
 
     function init() {
 
-        container = document.createElement('div');
-        document.body.appendChild(container);
+        container = document.createElement( 'div' );
+        document.body.appendChild( container );
 
         scene = new THREE.Scene();
 
         //
 
-        camera = new THREE.PerspectiveCamera(50, 0.5 * SCREEN_WIDTH / SCREEN_HEIGHT, 1, 10000);
+        camera = new THREE.PerspectiveCamera( 50, 0.5 * SCREEN_WIDTH / SCREEN_HEIGHT, 1, 10000 );
         camera.position.z = 2500;
 
-        cameraPerspective = new THREE.PerspectiveCamera(50, 0.5 * SCREEN_WIDTH / SCREEN_HEIGHT, 150, 1000);
+        cameraPerspective = new THREE.PerspectiveCamera( 50, 0.5 * SCREEN_WIDTH / SCREEN_HEIGHT, 150, 1000 );
 
-        cameraPerspectiveHelper = new THREE.CameraHelper(cameraPerspective);
-        scene.add(cameraPerspectiveHelper);
+        cameraPerspectiveHelper = new THREE.CameraHelper( cameraPerspective );
+        scene.add( cameraPerspectiveHelper );
 
         //
 
-        cameraOrtho = new THREE.OrthographicCamera(0.5 * SCREEN_WIDTH / - 2, 0.5 * SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, SCREEN_HEIGHT / - 2, 150, 1000);
+        cameraOrtho = new THREE.OrthographicCamera( 0.5 * SCREEN_WIDTH / - 2, 0.5 * SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, SCREEN_HEIGHT / - 2, 150, 1000 );
 
-        cameraOrthoHelper = new THREE.CameraHelper(cameraOrtho);
-        scene.add(cameraOrthoHelper);
+        cameraOrthoHelper = new THREE.CameraHelper( cameraOrtho );
+        scene.add( cameraOrthoHelper );
 
         //
 
@@ -51,72 +51,81 @@
         cameraOrtho.rotation.y = Math.PI;
         cameraPerspective.rotation.y = Math.PI;
 
-        cameraRig = new THREE.Object3D();
+        cameraRig = new THREE.Group();
 
-        cameraRig.add(cameraPerspective);
-        cameraRig.add(cameraOrtho);
+        cameraRig.add( cameraPerspective );
+        cameraRig.add( cameraOrtho );
 
-        scene.add(cameraRig);
+        scene.add( cameraRig );
 
         //
 
-        mesh = new THREE.Mesh(new THREE.SphereGeometry(100, 16, 8), new THREE.MeshBasicMaterial({ color: 0xffffff, wireframe: true }));
-        scene.add(mesh);
+        mesh = new THREE.Mesh(
+            new THREE.SphereBufferGeometry( 100, 16, 8 ),
+            new THREE.MeshBasicMaterial( { color: 0xffffff, wireframe: true } )
+        );
+        scene.add( mesh );
 
-        var mesh2 = new THREE.Mesh(new THREE.SphereGeometry(50, 16, 8), new THREE.MeshBasicMaterial({ color: 0x00ff00, wireframe: true }));
+        var mesh2 = new THREE.Mesh(
+            new THREE.SphereBufferGeometry( 50, 16, 8 ),
+            new THREE.MeshBasicMaterial( { color: 0x00ff00, wireframe: true } )
+        );
         mesh2.position.y = 150;
-        mesh.add(mesh2);
+        mesh.add( mesh2 );
 
-        var mesh3 = new THREE.Mesh(new THREE.SphereGeometry(5, 16, 8), new THREE.MeshBasicMaterial({ color: 0x0000ff, wireframe: true }));
+        var mesh3 = new THREE.Mesh(
+            new THREE.SphereBufferGeometry( 5, 16, 8 ),
+            new THREE.MeshBasicMaterial( { color: 0x0000ff, wireframe: true } )
+        );
         mesh3.position.z = 150;
-        cameraRig.add(mesh3);
+        cameraRig.add( mesh3 );
 
         //
 
         var geometry = new THREE.Geometry();
 
-        for (var i = 0; i < 10000; i++) {
+        for ( var i = 0; i < 10000; i ++ ) {
 
             var vertex = new THREE.Vector3();
-            vertex.x = THREE.Math.randFloatSpread(2000);
-            vertex.y = THREE.Math.randFloatSpread(2000);
-            vertex.z = THREE.Math.randFloatSpread(2000);
+            vertex.x = THREE.Math.randFloatSpread( 2000 );
+            vertex.y = THREE.Math.randFloatSpread( 2000 );
+            vertex.z = THREE.Math.randFloatSpread( 2000 );
 
-            geometry.vertices.push(vertex);
+            geometry.vertices.push( vertex );
 
         }
 
-        var particles = new THREE.PointCloud(geometry, new THREE.PointCloudMaterial({ color: 0x888888 }));
-        scene.add(particles);
+        var particles = new THREE.Points( geometry, new THREE.PointsMaterial( { color: 0x888888 } ) );
+        scene.add( particles );
 
         //
 
 
-        renderer = new THREE.WebGLRenderer({ antialias: true });
-        renderer.setPixelRatio(window.devicePixelRatio);
-        renderer.setSize(SCREEN_WIDTH, SCREEN_HEIGHT);
+        renderer = new THREE.WebGLRenderer( { antialias: true } );
+        renderer.setPixelRatio( window.devicePixelRatio );
+        renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
         renderer.domElement.style.position = "relative";
-        container.appendChild(renderer.domElement);
+        container.appendChild( renderer.domElement );
 
         renderer.autoClear = false;
 
         //
 
         stats = new Stats();
-        container.appendChild(stats.domElement);
+        container.appendChild( stats.domElement );
 
         //
 
-        window.addEventListener('resize', onWindowResize, false);
-        document.addEventListener('keydown', onKeyDown, false);
+        window.addEventListener( 'resize', onWindowResize, false );
+        document.addEventListener( 'keydown', onKeyDown, false );
 
     }
 
     //
 
-    function onKeyDown(event) {
+    function onKeyDown ( event ) {
 
-        switch (event.keyCode) {
+        switch( event.keyCode ) {
 
             case 79: /*O*/
 
@@ -134,16 +143,16 @@
 
         }
 
-    };
+    }
 
     //
 
-    function onWindowResize(event) {
+    function onWindowResize( event ) {
 
         SCREEN_WIDTH = window.innerWidth;
         SCREEN_HEIGHT = window.innerHeight;
 
-        renderer.setSize(SCREEN_WIDTH, SCREEN_HEIGHT);
+        renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
 
         camera.aspect = 0.5 * SCREEN_WIDTH / SCREEN_HEIGHT;
         camera.updateProjectionMatrix();
@@ -151,9 +160,9 @@
         cameraPerspective.aspect = 0.5 * SCREEN_WIDTH / SCREEN_HEIGHT;
         cameraPerspective.updateProjectionMatrix();
 
-        cameraOrtho.left = - 0.5 * SCREEN_WIDTH / 2;
-        cameraOrtho.right = 0.5 * SCREEN_WIDTH / 2;
-        cameraOrtho.top = SCREEN_HEIGHT / 2;
+        cameraOrtho.left   = - 0.5 * SCREEN_WIDTH / 2;
+        cameraOrtho.right  =   0.5 * SCREEN_WIDTH / 2;
+        cameraOrtho.top    =   SCREEN_HEIGHT / 2;
         cameraOrtho.bottom = - SCREEN_HEIGHT / 2;
         cameraOrtho.updateProjectionMatrix();
 
@@ -163,7 +172,7 @@
 
     function animate() {
 
-        requestAnimationFrame(animate);
+        requestAnimationFrame( animate );
 
         render();
         stats.update();
@@ -175,16 +184,16 @@
 
         var r = Date.now() * 0.0005;
 
-        mesh.position.x = 700 * Math.cos(r);
-        mesh.position.z = 700 * Math.sin(r);
-        mesh.position.y = 700 * Math.sin(r);
+        mesh.position.x = 700 * Math.cos( r );
+        mesh.position.z = 700 * Math.sin( r );
+        mesh.position.y = 700 * Math.sin( r );
 
-        mesh.children[0].position.x = 70 * Math.cos(2 * r);
-        mesh.children[0].position.z = 70 * Math.sin(r);
+        mesh.children[ 0 ].position.x = 70 * Math.cos( 2 * r );
+        mesh.children[ 0 ].position.z = 70 * Math.sin( r );
 
-        if (activeCamera === cameraPerspective) {
+        if ( activeCamera === cameraPerspective ) {
 
-            cameraPerspective.fov = 35 + 30 * Math.sin(0.5 * r);
+            cameraPerspective.fov = 35 + 30 * Math.sin( 0.5 * r );
             cameraPerspective.far = mesh.position.length();
             cameraPerspective.updateProjectionMatrix();
 
@@ -205,19 +214,19 @@
 
         }
 
-        cameraRig.lookAt(mesh.position);
+        cameraRig.lookAt( mesh.position );
 
         renderer.clear();
 
         activeHelper.visible = false;
 
-        renderer.setViewport(0, 0, SCREEN_WIDTH / 2, SCREEN_HEIGHT);
-        renderer.render(scene, activeCamera);
+        renderer.setViewport( 0, 0, SCREEN_WIDTH/2, SCREEN_HEIGHT );
+        renderer.render( scene, activeCamera );
 
         activeHelper.visible = true;
 
-        renderer.setViewport(SCREEN_WIDTH / 2, 0, SCREEN_WIDTH / 2, SCREEN_HEIGHT);
-        renderer.render(scene, camera);
+        renderer.setViewport( SCREEN_WIDTH/2, 0, SCREEN_WIDTH/2, SCREEN_HEIGHT );
+        renderer.render( scene, camera );
 
     }
 }
\ No newline at end of file
diff --git a/threejs/tests/webgl/webgl_interactive_raycasting_pointcloud.ts b/threejs/tests/webgl/webgl_interactive_raycasting_points.ts
similarity index 76%
rename from threejs/tests/webgl/webgl_interactive_raycasting_pointcloud.ts
rename to threejs/tests/webgl/webgl_interactive_raycasting_points.ts
index 980109f70..550d4b4b9 100644
--- a/threejs/tests/webgl/webgl_interactive_raycasting_pointcloud.ts
+++ b/threejs/tests/webgl/webgl_interactive_raycasting_points.ts
@@ -5,17 +5,17 @@
 
 () => {
     // ------- variable definitions that does not exist in the original code. These are for typescript.
-    var material: THREE.SpriteMaterial;
-    var container: HTMLElement;
-    var pcBuffer: THREE.PointCloud;
-    var v: any;
+    var material:THREE.SpriteMaterial;
+    var container:HTMLElement;
+    var pcBuffer:THREE.Points;
+    var v:any;
     // -------
 
     if (!Detector.webgl) Detector.addGetWebGLMessage();
 
     var renderer, scene, camera, stats;
     var pointclouds;
-    var raycaster, intersects;
+    var raycaster;
     var mouse = new THREE.Vector2();
     var intersection = null;
     var spheres = [];
@@ -48,14 +48,14 @@
                 var u = i / width;
                 var v = j / length;
                 var x = u - 0.5;
-                var y = (Math.cos(u * Math.PI * 8) + Math.sin(v * Math.PI * 8)) / 20;
+                var y = ( Math.cos(u * Math.PI * 8) + Math.sin(v * Math.PI * 8) ) / 20;
                 var z = v - 0.5;
 
                 positions[3 * k] = x;
                 positions[3 * k + 1] = y;
                 positions[3 * k + 2] = z;
 
-                var intensity = (y + 0.1) * 5;
+                var intensity = ( y + 0.1 ) * 5;
                 colors[3 * k] = color.r * intensity;
                 colors[3 * k + 1] = color.g * intensity;
                 colors[3 * k + 2] = color.b * intensity;
@@ -78,8 +78,8 @@
 
         var geometry = generatePointCloudGeometry(color, width, length);
 
-        var material = new THREE.PointCloudMaterial({ size: pointSize, vertexColors: THREE.VertexColors });
-        var pointcloud = new THREE.PointCloud(geometry, material);
+        var material = new THREE.PointsMaterial({size: pointSize, vertexColors: THREE.VertexColors});
+        var pointcloud = new THREE.Points(geometry, material);
 
         return pointcloud;
 
@@ -104,10 +104,10 @@
 
         }
 
-        geometry.addAttribute('index', new THREE.BufferAttribute(indices, 1));
+        geometry.setIndex(new THREE.BufferAttribute(indices, 1));
 
-        var material = new THREE.PointCloudMaterial({ size: pointSize, vertexColors: THREE.VertexColors });
-        var pointcloud = new THREE.PointCloud(geometry, material);
+        var material = new THREE.PointsMaterial({size: pointSize, vertexColors: THREE.VertexColors});
+        var pointcloud = new THREE.Points(geometry, material);
 
         return pointcloud;
 
@@ -132,13 +132,11 @@
 
         }
 
-        geometry.addAttribute('index', new THREE.BufferAttribute(indices, 1));
+        geometry.setIndex(new THREE.BufferAttribute(indices, 1));
+        geometry.addDrawCall(0, indices.length);
 
-        var offset = { start: 0, count: indices.length, index: 0 };
-        geometry.offsets.push(offset);
-
-        var material = new THREE.PointCloudMaterial({ size: pointSize, vertexColors: THREE.VertexColors });
-        var pointcloud = new THREE.PointCloud(geometry, material);
+        var material = new THREE.PointsMaterial({size: pointSize, vertexColors: THREE.VertexColors});
+        var pointcloud = new THREE.Points(geometry, material);
 
         return pointcloud;
 
@@ -147,7 +145,6 @@
     function generateRegularPointcloud(color, width, length) {
 
         var geometry = new THREE.Geometry();
-        var numPoints = width * length;
 
         var colors = [];
 
@@ -160,17 +157,17 @@
                 var u = i / width;
                 var v = j / length;
                 var x = u - 0.5;
-                var y = (Math.cos(u * Math.PI * 8) + Math.sin(v * Math.PI * 8)) / 20;
+                var y = ( Math.cos(u * Math.PI * 8) + Math.sin(v * Math.PI * 8) ) / 20;
                 var z = v - 0.5;
-                var vec = new THREE.Vector3(x, y, z);
+                var v2 = new THREE.Vector3(x, y, z);
 
-                var intensity = (y + 0.1) * 7;
+                var intensity = ( y + 0.1 ) * 7;
                 colors[3 * k] = color.r * intensity;
                 colors[3 * k + 1] = color.g * intensity;
                 colors[3 * k + 2] = color.b * intensity;
 
-                geometry.vertices.push(vec);
-                colors[k] = (color.clone().multiplyScalar(intensity));
+                geometry.vertices.push(v2);
+                colors[k] = ( color.clone().multiplyScalar(intensity) );
 
                 k++;
 
@@ -181,8 +178,8 @@
         geometry.colors = colors;
         geometry.computeBoundingBox();
 
-        var material = new THREE.PointCloudMaterial({ size: pointSize, vertexColors: THREE.VertexColors });
-        var pointcloud = new THREE.PointCloud(geometry, material);
+        var material = new THREE.PointsMaterial({size: pointSize, vertexColors: THREE.VertexColors});
+        var pointcloud = new THREE.Points(geometry, material);
 
         return pointcloud;
 
@@ -190,7 +187,7 @@
 
     function init() {
 
-        container = document.getElementById('container');
+        var container = document.getElementById('container');
 
         scene = new THREE.Scene();
 
@@ -202,7 +199,7 @@
 
         //
 
-        pcBuffer = generatePointcloud(new THREE.Color(1, 0, 0), width, length);
+        var pcBuffer = generatePointcloud(new THREE.Color(1, 0, 0), width, length);
         pcBuffer.scale.set(10, 10, 10);
         pcBuffer.position.set(-5, 0, 5);
         scene.add(pcBuffer);
@@ -227,7 +224,7 @@
         //
 
         var sphereGeometry = new THREE.SphereGeometry(0.1, 32, 32);
-        var sphereMaterial = new THREE.MeshBasicMaterial({ color: 0xff0000, shading: THREE.FlatShading });
+        var sphereMaterial = new THREE.MeshBasicMaterial({color: 0xff0000, shading: THREE.FlatShading});
 
         for (var i = 0; i < 40; i++) {
 
@@ -247,7 +244,7 @@
         //
 
         raycaster = new THREE.Raycaster();
-        raycaster.params.PointCloud.threshold = threshold;
+        raycaster.params.Points.threshold = threshold;
 
         //
 
@@ -267,8 +264,8 @@
 
         event.preventDefault();
 
-        mouse.x = (event.clientX / window.innerWidth) * 2 - 1;
-        mouse.y = - (event.clientY / window.innerHeight) * 2 + 1;
+        mouse.x = ( event.clientX / window.innerWidth ) * 2 - 1;
+        mouse.y = -( event.clientY / window.innerHeight ) * 2 + 1;
 
     }
 
@@ -300,13 +297,13 @@
         raycaster.setFromCamera(mouse, camera);
 
         var intersections = raycaster.intersectObjects(pointclouds);
-        intersection = (intersections.length) > 0 ? intersections[0] : null;
+        intersection = ( intersections.length ) > 0 ? intersections[0] : null;
 
         if (toggle > 0.02 && intersection !== null) {
 
             spheres[spheresIndex].position.copy(intersection.point);
             spheres[spheresIndex].scale.set(1, 1, 1);
-            spheresIndex = (spheresIndex + 1) % spheres.length;
+            spheresIndex = ( spheresIndex + 1 ) % spheres.length;
 
             toggle = 0;
 
diff --git a/threejs/tests/webgl/webgl_lights_heimsphere.ts b/threejs/tests/webgl/webgl_lights_heimsphere.ts
index a8cf0a7d1..fd2118e62 100644
--- a/threejs/tests/webgl/webgl_lights_heimsphere.ts
+++ b/threejs/tests/webgl/webgl_lights_heimsphere.ts
@@ -7,10 +7,11 @@
     // ------- variable definitions that does not exist in the original code. These are for typescript.
     var morph: any;
     // -------
-    if (!Detector.webgl) Detector.addGetWebGLMessage();
+
+    if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
 
     var camera, scene, renderer, dirLight, hemiLight;
-    var morphs = [];
+    var mixers = [];
     var stats;
 
     var clock = new THREE.Clock();
@@ -20,45 +21,45 @@
 
     function init() {
 
-        var container = document.getElementById('container');
+        var container = document.getElementById( 'container' );
 
-        camera = new THREE.PerspectiveCamera(30, window.innerWidth / window.innerHeight, 1, 5000);
-        camera.position.set(0, 0, 250);
+        camera = new THREE.PerspectiveCamera( 30, window.innerWidth / window.innerHeight, 1, 5000 );
+        camera.position.set( 0, 0, 250 );
 
         scene = new THREE.Scene();
 
-        scene.fog = new THREE.Fog(0xffffff, 1, 5000);
-        scene.fog.color.setHSL(0.6, 0, 1);
+        scene.fog = new THREE.Fog( 0xffffff, 1, 5000 );
+        scene.fog.color.setHSL( 0.6, 0, 1 );
 
         /*
-        controls = new THREE.TrackballControls( camera );
+         controls = new THREE.TrackballControls( camera );
 
-        controls.rotateSpeed = 1.0;
-        controls.zoomSpeed = 1.2;
-        controls.panSpeed = 0.8;
+         controls.rotateSpeed = 1.0;
+         controls.zoomSpeed = 1.2;
+         controls.panSpeed = 0.8;
 
-        controls.noZoom = false;
-        controls.noPan = false;
+         controls.noZoom = false;
+         controls.noPan = false;
 
-        controls.staticMoving = true;
-        controls.dynamicDampingFactor = 0.15;
-        */
+         controls.staticMoving = true;
+         controls.dynamicDampingFactor = 0.15;
+         */
 
         // LIGHTS
 
-        hemiLight = new THREE.HemisphereLight(0xffffff, 0xffffff, 0.6);
-        hemiLight.color.setHSL(0.6, 1, 0.6);
-        hemiLight.groundColor.setHSL(0.095, 1, 0.75);
-        hemiLight.position.set(0, 500, 0);
-        scene.add(hemiLight);
+        hemiLight = new THREE.HemisphereLight( 0xffffff, 0xffffff, 0.6 );
+        hemiLight.color.setHSL( 0.6, 1, 0.6 );
+        hemiLight.groundColor.setHSL( 0.095, 1, 0.75 );
+        hemiLight.position.set( 0, 500, 0 );
+        scene.add( hemiLight );
 
         //
 
-        dirLight = new THREE.DirectionalLight(0xffffff, 1);
-        dirLight.color.setHSL(0.1, 1, 0.95);
-        dirLight.position.set(-1, 1.75, 1);
-        dirLight.position.multiplyScalar(50);
-        scene.add(dirLight);
+        dirLight = new THREE.DirectionalLight( 0xffffff, 1 );
+        dirLight.color.setHSL( 0.1, 1, 0.95 );
+        dirLight.position.set( -1, 1.75, 1 );
+        dirLight.position.multiplyScalar( 50 );
+        scene.add( dirLight );
 
         dirLight.castShadow = true;
 
@@ -74,108 +75,89 @@
 
         dirLight.shadowCameraFar = 3500;
         dirLight.shadowBias = -0.0001;
-        dirLight.shadowDarkness = 0.35;
         //dirLight.shadowCameraVisible = true;
 
         // GROUND
 
-        var groundGeo = new THREE.PlaneBufferGeometry(10000, 10000);
-        var groundMat = new THREE.MeshPhongMaterial({ color: 0xffffff, specular: 0x050505 });
-        groundMat.color.setHSL(0.095, 1, 0.75);
+        var groundGeo = new THREE.PlaneBufferGeometry( 10000, 10000 );
+        var groundMat = new THREE.MeshPhongMaterial( { color: 0xffffff, specular: 0x050505 } );
+        groundMat.color.setHSL( 0.095, 1, 0.75 );
 
-        var ground = new THREE.Mesh(groundGeo, groundMat);
-        ground.rotation.x = -Math.PI / 2;
+        var ground = new THREE.Mesh( groundGeo, groundMat );
+        ground.rotation.x = -Math.PI/2;
         ground.position.y = -33;
-        scene.add(ground);
+        scene.add( ground );
 
         ground.receiveShadow = true;
 
         // SKYDOME
 
-        var vertexShader = document.getElementById('vertexShader').textContent;
-        var fragmentShader = document.getElementById('fragmentShader').textContent;
+        var vertexShader = document.getElementById( 'vertexShader' ).textContent;
+        var fragmentShader = document.getElementById( 'fragmentShader' ).textContent;
         var uniforms = {
-            topColor: { type: "c", value: new THREE.Color(0x0077ff) },
-            bottomColor: { type: "c", value: new THREE.Color(0xffffff) },
-            offset: { type: "f", value: 33 },
-            exponent: { type: "f", value: 0.6 }
-        }
-				uniforms.topColor.value.copy(hemiLight.color);
+            topColor: 	 { type: "c", value: new THREE.Color( 0x0077ff ) },
+            bottomColor: { type: "c", value: new THREE.Color( 0xffffff ) },
+            offset:		 { type: "f", value: 33 },
+            exponent:	 { type: "f", value: 0.6 }
+        };
+        uniforms.topColor.value.copy( hemiLight.color );
 
-        scene.fog.color.copy(uniforms.bottomColor.value);
+        scene.fog.color.copy( uniforms.bottomColor.value );
 
-        var skyGeo = new THREE.SphereGeometry(4000, 32, 15);
-        var skyMat = new THREE.ShaderMaterial({ vertexShader: vertexShader, fragmentShader: fragmentShader, uniforms: uniforms, side: THREE.BackSide });
+        var skyGeo = new THREE.SphereGeometry( 4000, 32, 15 );
+        var skyMat = new THREE.ShaderMaterial( { vertexShader: vertexShader, fragmentShader: fragmentShader, uniforms: uniforms, side: THREE.BackSide } );
 
-        var sky = new THREE.Mesh(skyGeo, skyMat);
-        scene.add(sky);
+        var sky = new THREE.Mesh( skyGeo, skyMat );
+        scene.add( sky );
 
         // MODEL
 
         var loader = new THREE.JSONLoader();
 
-        loader.load("models/animated/flamingo.js", function (geometry) {
+        loader.load( "models/animated/flamingo.js", function( geometry ) {
 
-            morphColorsToFaceColors(geometry);
-            geometry.computeMorphNormals();
-
-            var material = new THREE.MeshPhongMaterial({ color: 0xffffff, specular: 0xffffff, shininess: 20, morphTargets: true, morphNormals: true, vertexColors: THREE.FaceColors, shading: THREE.FlatShading });
-            var meshAnim = new THREE.MorphAnimMesh(geometry, material);
-
-            meshAnim.duration = 1000;
+            var material = new THREE.MeshPhongMaterial( { color: 0xffffff, specular: 0xffffff, shininess: 20, morphTargets: true, vertexColors: THREE.FaceColors, shading: THREE.FlatShading } );
+            var mesh = new THREE.Mesh( geometry, material );
 
             var s = 0.35;
-            meshAnim.scale.set(s, s, s);
-            meshAnim.position.y = 15;
-            meshAnim.rotation.y = -1;
+            mesh.scale.set( s, s, s );
+            mesh.position.y = 15;
+            mesh.rotation.y = -1;
 
-            meshAnim.castShadow = true;
-            meshAnim.receiveShadow = true;
+            mesh.castShadow = true;
+            mesh.receiveShadow = true;
 
-            scene.add(meshAnim);
-            morphs.push(meshAnim);
+            scene.add( mesh );
 
-        });
+            var mixer = new THREE.AnimationMixer( mesh );
+            mixer.addAction( new THREE.AnimationAction( geometry.animations[ 0 ] ).warpToDuration( 1 ) );
+            mixers.push( mixer );
+
+        } );
 
         // RENDERER
 
-        renderer = new THREE.WebGLRenderer({ antialias: true });
-        renderer.setClearColor(scene.fog.color);
-        renderer.setPixelRatio(window.devicePixelRatio);
-        renderer.setSize(window.innerWidth, window.innerHeight);
-        container.appendChild(renderer.domElement);
+        renderer = new THREE.WebGLRenderer( { antialias: true } );
+        renderer.setClearColor( scene.fog.color );
+        renderer.setPixelRatio( window.devicePixelRatio );
+        renderer.setSize( window.innerWidth, window.innerHeight );
+        container.appendChild( renderer.domElement );
 
         renderer.gammaInput = true;
         renderer.gammaOutput = true;
 
-        renderer.shadowMapEnabled = true;
-        renderer.shadowMapCullFace = THREE.CullFaceBack;
+        renderer.shadowMap.enabled = true;
+        renderer.shadowMap.cullFace = THREE.CullFaceBack;
 
         // STATS
 
         stats = new Stats();
-        container.appendChild(stats.domElement);
+        container.appendChild( stats.domElement );
 
         //
 
-        window.addEventListener('resize', onWindowResize, false);
-        document.addEventListener('keydown', onKeyDown, false);
-
-    }
-
-    function morphColorsToFaceColors(geometry) {
-
-        if (geometry.morphColors && geometry.morphColors.length) {
-
-            var colorMap = geometry.morphColors[0];
-
-            for (var i = 0; i < colorMap.colors.length; i++) {
-
-                geometry.faces[i].color = colorMap.colors[i];
-
-            }
-
-        }
+        window.addEventListener( 'resize', onWindowResize, false );
+        document.addEventListener( 'keydown', onKeyDown, false );
 
     }
 
@@ -184,20 +166,20 @@
         camera.aspect = window.innerWidth / window.innerHeight;
         camera.updateProjectionMatrix();
 
-        renderer.setSize(window.innerWidth, window.innerHeight);
+        renderer.setSize( window.innerWidth, window.innerHeight );
 
     }
 
-    function onKeyDown(event) {
+    function onKeyDown ( event ) {
 
-        switch (event.keyCode) {
+        switch ( event.keyCode ) {
 
-            case 72: /*h*/
+            case 72: // h
 
                 hemiLight.visible = !hemiLight.visible;
                 break;
 
-            case 68: /*d*/
+            case 68: // d
 
                 dirLight.visible = !dirLight.visible;
                 break;
@@ -210,7 +192,7 @@
 
     function animate() {
 
-        requestAnimationFrame(animate);
+        requestAnimationFrame( animate );
 
         render();
         stats.update();
@@ -223,14 +205,13 @@
 
         //controls.update();
 
-        for (var i = 0; i < morphs.length; i++) {
+        for ( var i = 0; i < mixers.length; i ++ ) {
 
-            morph = morphs[i];
-            morph.updateAnimation(1000 * delta);
+            mixers[ i ].update( delta );
 
         }
 
-        renderer.render(scene, camera);
+        renderer.render( scene, camera );
 
     }
 }
diff --git a/threejs/tests/webgl/webgl_particles_billboards.ts b/threejs/tests/webgl/webgl_particles_billboards.ts
deleted file mode 100644
index 96b77588c..000000000
--- a/threejs/tests/webgl/webgl_particles_billboards.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-/// <reference path="../../three.d.ts" />
-/// <reference path="../three-tests-setup.ts" />
-
-// https://github.com/mrdoob/three.js/blob/master/examples/webgl_particles_billboards.html
-
-() => {
-    if (!Detector.webgl) Detector.addGetWebGLMessage();
-
-    var container, stats;
-    var camera, scene, renderer, particles, geometry, material, i, h, color, sprite, size;
-    var mouseX = 0, mouseY = 0;
-
-    var windowHalfX = window.innerWidth / 2;
-    var windowHalfY = window.innerHeight / 2;
-
-    init();
-    animate();
-
-    function init() {
-
-        container = document.createElement('div');
-        document.body.appendChild(container);
-
-        camera = new THREE.PerspectiveCamera(55, window.innerWidth / window.innerHeight, 2, 2000);
-        camera.position.z = 1000;
-
-        scene = new THREE.Scene();
-        scene.fog = new THREE.FogExp2(0x000000, 0.001);
-
-        geometry = new THREE.Geometry();
-
-        sprite = THREE.ImageUtils.loadTexture("textures/sprites/disc.png");
-
-        for (i = 0; i < 10000; i++) {
-
-            var vertex = new THREE.Vector3();
-            vertex.x = 2000 * Math.random() - 1000;
-            vertex.y = 2000 * Math.random() - 1000;
-            vertex.z = 2000 * Math.random() - 1000;
-
-            geometry.vertices.push(vertex);
-
-        }
-
-        material = new THREE.PointCloudMaterial({ size: 35, sizeAttenuation: false, map: sprite, alphaTest: 0.5, transparent: true });
-        material.color.setHSL(1.0, 0.3, 0.7);
-
-        particles = new THREE.PointCloud(geometry, material);
-        scene.add(particles);
-
-        //
-
-        renderer = new THREE.WebGLRenderer();
-        renderer.setPixelRatio(window.devicePixelRatio);
-        renderer.setSize(window.innerWidth, window.innerHeight);
-        container.appendChild(renderer.domElement);
-
-        //
-
-        stats = new Stats();
-        stats.domElement.style.position = 'absolute';
-        stats.domElement.style.top = '0px';
-        container.appendChild(stats.domElement);
-
-        //
-
-        document.addEventListener('mousemove', onDocumentMouseMove, false);
-        document.addEventListener('touchstart', onDocumentTouchStart, false);
-        document.addEventListener('touchmove', onDocumentTouchMove, false);
-
-        //
-
-        window.addEventListener('resize', onWindowResize, false);
-
-    }
-
-    function onWindowResize() {
-
-        windowHalfX = window.innerWidth / 2;
-        windowHalfY = window.innerHeight / 2;
-
-        camera.aspect = window.innerWidth / window.innerHeight;
-        camera.updateProjectionMatrix();
-
-        renderer.setSize(window.innerWidth, window.innerHeight);
-
-    }
-
-    function onDocumentMouseMove(event) {
-
-        mouseX = event.clientX - windowHalfX;
-        mouseY = event.clientY - windowHalfY;
-
-    }
-
-    function onDocumentTouchStart(event) {
-
-        if (event.touches.length == 1) {
-
-            event.preventDefault();
-
-            mouseX = event.touches[0].pageX - windowHalfX;
-            mouseY = event.touches[0].pageY - windowHalfY;
-
-        }
-    }
-
-    function onDocumentTouchMove(event) {
-
-        if (event.touches.length == 1) {
-
-            event.preventDefault();
-
-            mouseX = event.touches[0].pageX - windowHalfX;
-            mouseY = event.touches[0].pageY - windowHalfY;
-
-        }
-
-    }
-
-    //
-
-    function animate() {
-
-        requestAnimationFrame(animate);
-
-        render();
-        stats.update();
-
-    }
-
-    function render() {
-
-        var time = Date.now() * 0.00005;
-
-        camera.position.x += (mouseX - camera.position.x) * 0.05;
-        camera.position.y += (- mouseY - camera.position.y) * 0.05;
-
-        camera.lookAt(scene.position);
-
-        h = (360 * (1.0 + time) % 360) / 360;
-        material.color.setHSL(h, 0.5, 0.5);
-
-        renderer.render(scene, camera);
-
-    }
-}
\ No newline at end of file
diff --git a/threejs/tests/webgl/webgl_points_billboards.ts b/threejs/tests/webgl/webgl_points_billboards.ts
new file mode 100644
index 000000000..37c41424b
--- /dev/null
+++ b/threejs/tests/webgl/webgl_points_billboards.ts
@@ -0,0 +1,147 @@
+/// <reference path="../../three.d.ts" />
+/// <reference path="../three-tests-setup.ts" />
+
+// https://github.com/mrdoob/three.js/blob/master/examples/webgl_particles_billboards.html
+
+() => {
+    if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
+
+    var container, stats;
+    var camera, scene, renderer, particles, geometry, material, i, h, color, sprite, size;
+    var mouseX = 0, mouseY = 0;
+
+    var windowHalfX = window.innerWidth / 2;
+    var windowHalfY = window.innerHeight / 2;
+
+    init();
+    animate();
+
+    function init() {
+
+        container = document.createElement( 'div' );
+        document.body.appendChild( container );
+
+        camera = new THREE.PerspectiveCamera( 55, window.innerWidth / window.innerHeight, 2, 2000 );
+        camera.position.z = 1000;
+
+        scene = new THREE.Scene();
+        scene.fog = new THREE.FogExp2( 0x000000, 0.001 );
+
+        geometry = new THREE.Geometry();
+
+        sprite = THREE.ImageUtils.loadTexture( "textures/sprites/disc.png" );
+
+        for ( i = 0; i < 10000; i ++ ) {
+
+            var vertex = new THREE.Vector3();
+            vertex.x = 2000 * Math.random() - 1000;
+            vertex.y = 2000 * Math.random() - 1000;
+            vertex.z = 2000 * Math.random() - 1000;
+
+            geometry.vertices.push( vertex );
+
+        }
+
+        material = new THREE.PointsMaterial( { size: 35, sizeAttenuation: false, map: sprite, alphaTest: 0.5, transparent: true } );
+        material.color.setHSL( 1.0, 0.3, 0.7 );
+
+        particles = new THREE.Points( geometry, material );
+        scene.add( particles );
+
+        //
+
+        renderer = new THREE.WebGLRenderer();
+        renderer.setPixelRatio( window.devicePixelRatio );
+        renderer.setSize( window.innerWidth, window.innerHeight );
+        container.appendChild( renderer.domElement );
+
+        //
+
+        stats = new Stats();
+        stats.domElement.style.position = 'absolute';
+        stats.domElement.style.top = '0px';
+        container.appendChild( stats.domElement );
+
+        //
+
+        document.addEventListener( 'mousemove', onDocumentMouseMove, false );
+        document.addEventListener( 'touchstart', onDocumentTouchStart, false );
+        document.addEventListener( 'touchmove', onDocumentTouchMove, false );
+
+        //
+
+        window.addEventListener( 'resize', onWindowResize, false );
+
+    }
+
+    function onWindowResize() {
+
+        windowHalfX = window.innerWidth / 2;
+        windowHalfY = window.innerHeight / 2;
+
+        camera.aspect = window.innerWidth / window.innerHeight;
+        camera.updateProjectionMatrix();
+
+        renderer.setSize( window.innerWidth, window.innerHeight );
+
+    }
+
+    function onDocumentMouseMove( event ) {
+
+        mouseX = event.clientX - windowHalfX;
+        mouseY = event.clientY - windowHalfY;
+
+    }
+
+    function onDocumentTouchStart( event ) {
+
+        if ( event.touches.length == 1 ) {
+
+            event.preventDefault();
+
+            mouseX = event.touches[ 0 ].pageX - windowHalfX;
+            mouseY = event.touches[ 0 ].pageY - windowHalfY;
+
+        }
+    }
+
+    function onDocumentTouchMove( event ) {
+
+        if ( event.touches.length == 1 ) {
+
+            event.preventDefault();
+
+            mouseX = event.touches[ 0 ].pageX - windowHalfX;
+            mouseY = event.touches[ 0 ].pageY - windowHalfY;
+
+        }
+
+    }
+
+    //
+
+    function animate() {
+
+        requestAnimationFrame( animate );
+
+        render();
+        stats.update();
+
+    }
+
+    function render() {
+
+        var time = Date.now() * 0.00005;
+
+        camera.position.x += ( mouseX - camera.position.x ) * 0.05;
+        camera.position.y += ( - mouseY - camera.position.y ) * 0.05;
+
+        camera.lookAt( scene.position );
+
+        h = ( 360 * ( 1.0 + time ) % 360 ) / 360;
+        material.color.setHSL( h, 0.5, 0.5 );
+
+        renderer.render( scene, camera );
+
+    }
+}
\ No newline at end of file
diff --git a/threejs/tests/webgl/webgl_sprites.ts b/threejs/tests/webgl/webgl_sprites.ts
index c7e2d4f84..3ec84bba1 100644
--- a/threejs/tests/webgl/webgl_sprites.ts
+++ b/threejs/tests/webgl/webgl_sprites.ts
@@ -25,14 +25,14 @@
         var width = window.innerWidth;
         var height = window.innerHeight;
 
-        camera = new THREE.PerspectiveCamera(60, width / height, 1, 2100);
+        camera = new THREE.PerspectiveCamera( 60, width / height, 1, 2100 );
         camera.position.z = 1500;
 
-        cameraOrtho = new THREE.OrthographicCamera(- width / 2, width / 2, height / 2, - height / 2, 1, 10);
+        cameraOrtho = new THREE.OrthographicCamera( - width / 2, width / 2, height / 2, - height / 2, 1, 10 );
         cameraOrtho.position.z = 10;
 
         scene = new THREE.Scene();
-        scene.fog = new THREE.Fog(0x000000, 1500, 2100);
+        scene.fog = new THREE.Fog( 0x000000, 1500, 2100 );
 
         sceneOrtho = new THREE.Scene();
 
@@ -41,93 +41,93 @@
         var amount = 200;
         var radius = 500;
 
-        var mapA = THREE.ImageUtils.loadTexture("textures/sprite0.png", undefined, createHUDSprites);
-        var mapB = THREE.ImageUtils.loadTexture("textures/sprite1.png");
-        mapC = THREE.ImageUtils.loadTexture("textures/sprite2.png");
+        var mapA = THREE.ImageUtils.loadTexture( "textures/sprite0.png", undefined, createHUDSprites );
+        var mapB = THREE.ImageUtils.loadTexture( "textures/sprite1.png" );
+        mapC = THREE.ImageUtils.loadTexture( "textures/sprite2.png" );
 
         group = new THREE.Group();
 
-        var materialC = new THREE.SpriteMaterial({ map: mapC, color: 0xffffff, fog: true });
-        var materialB = new THREE.SpriteMaterial({ map: mapB, color: 0xffffff, fog: true });
+        var materialC = new THREE.SpriteMaterial( { map: mapC, color: 0xffffff, fog: true } );
+        var materialB = new THREE.SpriteMaterial( { map: mapB, color: 0xffffff, fog: true } );
 
-        for (var a = 0; a < amount; a++) {
+        for ( var a = 0; a < amount; a ++ ) {
 
             var x = Math.random() - 0.5;
             var y = Math.random() - 0.5;
             var z = Math.random() - 0.5;
 
-            if (z < 0) {
+            if ( z < 0 ) {
 
                 material = materialB.clone();
 
             } else {
 
                 material = materialC.clone();
-                material.color.setHSL(0.5 * Math.random(), 0.75, 0.5);
-                material.map.offset.set(-0.5, -0.5);
-                material.map.repeat.set(2, 2);
+                material.color.setHSL( 0.5 * Math.random(), 0.75, 0.5 );
+                material.map.offset.set( -0.5, -0.5 );
+                material.map.repeat.set( 2, 2 );
 
             }
 
-            var sprite = new THREE.Sprite(material);
+            var sprite = new THREE.Sprite( material );
 
-            sprite.position.set(x, y, z);
+            sprite.position.set( x, y, z );
             sprite.position.normalize();
-            sprite.position.multiplyScalar(radius);
+            sprite.position.multiplyScalar( radius );
 
-            group.add(sprite);
+            group.add( sprite );
 
         }
 
-        scene.add(group);
+        scene.add( group );
 
         // renderer
 
         renderer = new THREE.WebGLRenderer();
-        renderer.setPixelRatio(window.devicePixelRatio);
-        renderer.setSize(window.innerWidth, window.innerHeight);
+        renderer.setPixelRatio( window.devicePixelRatio );
+        renderer.setSize( window.innerWidth, window.innerHeight );
         renderer.autoClear = false; // To allow render overlay on top of sprited sphere
 
-        document.body.appendChild(renderer.domElement);
+        document.body.appendChild( renderer.domElement );
 
         //
 
-        window.addEventListener('resize', onWindowResize, false);
+        window.addEventListener( 'resize', onWindowResize, false );
 
     }
 
-    function createHUDSprites(texture) {
+    function createHUDSprites ( texture ) {
 
-        var material = new THREE.SpriteMaterial({ map: texture });
+        var material = new THREE.SpriteMaterial( { map: texture } );
 
         var width = material.map.image.width;
         var height = material.map.image.height;
 
-        spriteTL = new THREE.Sprite(material);
-        spriteTL.scale.set(width, height, 1);
-        sceneOrtho.add(spriteTL);
+        spriteTL = new THREE.Sprite( material );
+        spriteTL.scale.set( width, height, 1 );
+        sceneOrtho.add( spriteTL );
 
-        spriteTR = new THREE.Sprite(material);
-        spriteTR.scale.set(width, height, 1);
-        sceneOrtho.add(spriteTR);
+        spriteTR = new THREE.Sprite( material );
+        spriteTR.scale.set( width, height, 1 );
+        sceneOrtho.add( spriteTR );
 
-        spriteBL = new THREE.Sprite(material);
-        spriteBL.scale.set(width, height, 1);
-        sceneOrtho.add(spriteBL);
+        spriteBL = new THREE.Sprite( material );
+        spriteBL.scale.set( width, height, 1 );
+        sceneOrtho.add( spriteBL );
 
-        spriteBR = new THREE.Sprite(material);
-        spriteBR.scale.set(width, height, 1);
-        sceneOrtho.add(spriteBR);
+        spriteBR = new THREE.Sprite( material );
+        spriteBR.scale.set( width, height, 1 );
+        sceneOrtho.add( spriteBR );
 
-        spriteC = new THREE.Sprite(material);
-        spriteC.scale.set(width, height, 1);
-        sceneOrtho.add(spriteC);
+        spriteC = new THREE.Sprite( material );
+        spriteC.scale.set( width, height, 1 );
+        sceneOrtho.add( spriteC );
 
         updateHUDSprites();
 
-    };
+    }
 
-    function updateHUDSprites() {
+    function updateHUDSprites () {
 
         var width = window.innerWidth / 2;
         var height = window.innerHeight / 2;
@@ -137,13 +137,13 @@
         var imageWidth = material.map.image.width / 2;
         var imageHeight = material.map.image.height / 2;
 
-        spriteTL.position.set(- width + imageWidth, height - imageHeight, 1); // top left
-        spriteTR.position.set(width - imageWidth, height - imageHeight, 1); // top right
-        spriteBL.position.set(- width + imageWidth, - height + imageHeight, 1); // bottom left
-        spriteBR.position.set(width - imageWidth, - height + imageHeight, 1); // bottom right
-        spriteC.position.set(0, 0, 1); // center
+        spriteTL.position.set( - width + imageWidth,   height - imageHeight, 1 ); // top left
+        spriteTR.position.set(   width - imageWidth,   height - imageHeight, 1 ); // top right
+        spriteBL.position.set( - width + imageWidth, - height + imageHeight, 1 ); // bottom left
+        spriteBR.position.set(   width - imageWidth, - height + imageHeight, 1 ); // bottom right
+        spriteC.position.set( 0, 0, 1 ); // center
 
-    };
+    }
 
     function onWindowResize() {
 
@@ -161,13 +161,13 @@
 
         updateHUDSprites();
 
-        renderer.setSize(window.innerWidth, window.innerHeight);
+        renderer.setSize( window.innerWidth, window.innerHeight );
 
     }
 
     function animate() {
 
-        requestAnimationFrame(animate);
+        requestAnimationFrame( animate );
         render();
 
     }
@@ -176,28 +176,28 @@
 
         var time = Date.now() / 1000;
 
-        for (var i = 0, l = group.children.length; i < l; i++) {
+        for ( var i = 0, l = group.children.length; i < l; i ++ ) {
 
-            var sprite = group.children[i];
+            var sprite = group.children[ i ];
             var material = sprite.material;
-            var scale = Math.sin(time + sprite.position.x * 0.01) * 0.3 + 1.0;
+            var scale = Math.sin( time + sprite.position.x * 0.01 ) * 0.3 + 1.0;
 
             var imageWidth = 1;
             var imageHeight = 1;
 
-            if (material.map && material.map.image && material.map.image.width) {
+            if ( material.map && material.map.image && material.map.image.width ) {
 
                 imageWidth = material.map.image.width;
                 imageHeight = material.map.image.height;
 
             }
 
-            sprite.material.rotation += 0.1 * (i / l);
-            sprite.scale.set(scale * imageWidth, scale * imageHeight, 1.0);
+            sprite.material.rotation += 0.1 * ( i / l );
+            sprite.scale.set( scale * imageWidth, scale * imageHeight, 1.0 );
 
-            if (material.map !== mapC) {
+            if ( material.map !== mapC ) {
 
-                material.opacity = Math.sin(time + sprite.position.x * 0.01) * 0.4 + 0.6;
+                material.opacity = Math.sin( time + sprite.position.x * 0.01 ) * 0.4 + 0.6;
 
             }
 
@@ -208,9 +208,9 @@
         group.rotation.z = time * 1.0;
 
         renderer.clear();
-        renderer.render(scene, camera);
+        renderer.render( scene, camera );
         renderer.clearDepth();
-        renderer.render(sceneOrtho, cameraOrtho);
+        renderer.render( sceneOrtho, cameraOrtho );
 
     }
 }
\ No newline at end of file
diff --git a/threejs/three-tests.ts b/threejs/three-tests.ts
index ff97df43f..2e9f37b10 100644
--- a/threejs/three-tests.ts
+++ b/threejs/three-tests.ts
@@ -33,14 +33,14 @@ THE SOFTWARE.
 /// <reference path="./tests/webgl/webgl_geometries.ts" />
 /// <reference path="./tests/webgl/webgl_helpers.ts" />
 /// <reference path="./tests/webgl/webgl_interactive_cubes.ts" />
-/// <reference path="./tests/webgl/webgl_interactive_raycasting_pointcloud.ts" />
+/// <reference path="./tests/webgl/webgl_interactive_raycasting_points.ts" />
 /// <reference path="./tests/webgl/webgl_lensflares.ts" />
 /// <reference path="./tests/webgl/webgl_lights_heimsphere.ts" />
 /// <reference path="./tests/webgl/webgl_lines_colors.ts" />
 /// <reference path="./tests/webgl/webgl_loader_awd.ts" />
 /// <reference path="./tests/webgl/webgl_materials.ts" />
 /// <reference path="./tests/webgl/webgl_morphtargets.ts" />
-/// <reference path="./tests/webgl/webgl_particles_billboards.ts" />
+/// <reference path="./tests/webgl/webgl_points_billboards.ts" />
 /// <reference path="./tests/webgl/webgl_postprocessing.ts" />
 /// <reference path="./tests/webgl/webgl_shader.ts" />
 /// <reference path="./tests/webgl/webgl_sprites.ts" />
diff --git a/threejs/three.d.ts b/threejs/three.d.ts
index 433f17078..fb890afe6 100644
--- a/threejs/three.d.ts
+++ b/threejs/three.d.ts
@@ -82,6 +82,17 @@ declare module THREE {
     export var OneMinusDstColorFactor: BlendingSrcFactor;
     export var SrcAlphaSaturateFactor: BlendingSrcFactor;
 
+    // depth modes
+    export enum DepthModes { }
+    export var NeverDepth: DepthModes;
+    export var AlwaysDepth: DepthModes;
+    export var LessDepth: DepthModes;
+    export var LessEqualDepth: DepthModes;
+    export var EqualDepth: DepthModes;
+    export var GreaterEqualDepth: DepthModes;
+    export var GreaterDepth: DepthModes;
+    export var NotEqualDepth: DepthModes;
+
     // TEXTURE CONSTANTS
     // Operations
     export enum Combine { }
@@ -153,11 +164,213 @@ declare module THREE {
     export var RGBA_PVRTC_4BPPV1_Format: CompressedPixelFormat;
     export var RGBA_PVRTC_2BPPV1_Format: CompressedPixelFormat;
 
+    // Loop styles for AnimationAction
+    export enum AnimationActionLoopStyles { }
+    export var LoopOnce: AnimationActionLoopStyles;
+    export var LoopRepeat: AnimationActionLoopStyles;
+    export var LoopPingPong: AnimationActionLoopStyles;
+
     // log handlers
     export function warn(message?: any, ...optionalParams: any[]): void;
     export function error(message?: any, ...optionalParams: any[]): void;
     export function log(message?: any, ...optionalParams: any[]): void;
 
+    // Animation ////////////////////////////////////////////////////////////////////////////////////////
+    export class AnimationAction {
+        constructor(clip: AnimationClip, startTime?: number, timeScale?: number, weight?: number, loop?: boolean);
+
+        clip: AnimationClip
+        localRoot: Mesh;
+        startTime: number;
+        timeScale: number;
+        weight: number;
+        loop: AnimationActionLoopStyles;
+        loopCount: number;
+        enabled: boolean;
+        actionTime: number;
+        clipTime: number;
+        propertyBindings: PropertyBinding[];
+
+        setLocalRoot( localRoot: Mesh ): AnimationAction;
+        updateTime( clipDeltaTime: number ): number;
+        syncWith( action: AnimationAction ): AnimationAction;
+        warpToDuration( duration: number ): AnimationAction;
+        init( time: number ): AnimationAction;
+        update( clipDeltaTime: number ): any[];
+        getTimeScaleAt( time: number ): number;
+        getWeightAt( time: number ): number;
+    }
+
+    export class AnimationClip {
+        constructor( name: string, duration?: number, tracks?: KeyframeTrack[] );
+
+        name: string;
+        tracks: KeyframeTrack[];
+        duration: number;
+        results: any[];
+
+        getAt(clipTime: number): any[];
+        trim(): AnimationClip;
+        optimize(): AnimationClip;
+
+        static CreateFromMorphTargetSequence( name: string, morphTargetSequence: MorphTarget[], fps: number ): AnimationClip;
+        findByName( clipArray: AnimationClip, name: string ): AnimationClip;
+        static CreateClipsFromMorphTargetSequences( morphTargets: MorphTarget[], fps: number ): AnimationClip[];
+        parse( json: any ): AnimationClip;
+        parseAnimation( animation: any, bones: Bone[], nodeName: string ): AnimationClip;
+    }
+
+    export class AnimationMixer {
+        constructor( root: any );
+
+        root: any;
+        time: number;
+        timeScale: number;
+        actions: AnimationAction;
+        propertyBindingMap: any;
+
+        addAction( action: AnimationAction ): void;
+        removeAllActions(): AnimationMixer;
+        removeAction( action: AnimationAction ): AnimationMixer;
+        findActionByName( name: string ): AnimationAction;
+        play( action: AnimationAction, optionalFadeInDuration?: number ): AnimationMixer;
+        fadeOut( action: AnimationAction, duration: number ): AnimationMixer;
+        fadeIn( action: AnimationAction, duration: number ): AnimationMixer;
+        warp( action: AnimationAction, startTimeScale: NumberKeyframeTrack, endTimeScale: NumberKeyframeTrack, duration: number ): AnimationMixer;
+        crossFade( fadeOutAction: AnimationAction, fadeInAction: AnimationAction, duration: number, warp: boolean ): AnimationMixer;
+        update( deltaTime: number ): AnimationMixer;
+    }
+
+    export var AnimationUtils: {
+        getEqualsFunc( exemplarValue: any ): boolean;
+        clone<T>(exemplarValue: T): T;
+        lerp( a: any, b: any, alpha: number, interTrack: boolean ): any;
+        lerp_object( a: any, b: any, alpha: number ): any;
+        slerp_object( a: any, b: any, alpha: number ): any;
+        lerp_number( a: any, b: any, alpha: number ): any;
+        lerp_boolean( a: any, b: any, alpha: number ): any;
+        lerp_boolean_immediate( a: any, b: any, alpha: number ): any;
+        lerp_string( a: any, b: any, alpha: number ): any;
+        lerp_string_immediate( a: any, b: any, alpha: number ): any;
+        getLerpFunc( exemplarValue: any, interTrack: boolean ): Function;
+    };
+
+    export class KeyframeTrack {
+        constructor(name: string, keys: any[]);
+
+        name: string;
+        keys: any[];
+        lastIndex: number;
+
+        getAt( time: number ): any;
+        shift( timeOffset: number ): KeyframeTrack;
+        scale( timeScale: number ): KeyframeTrack;
+        trim( startTime: number, endTime: number ): KeyframeTrack;
+        validate(): KeyframeTrack;
+        optimize(): KeyframeTrack;
+
+        keyComparator(key0: KeyframeTrack, key1: KeyframeTrack): number;
+        parse( json: any ): KeyframeTrack;
+        GetTrackTypeForTypeName( typeName: string ): any;
+    }
+
+    export class PropertyBinding {
+        constructor( rootNode: any, trackName: string );
+
+        rootNode: any;
+        trackName: string;
+        referenceCount: number;
+        originalValue: any;
+        directoryName: string;
+        nodeName: string;
+        objectName: string;
+        objectIndex: number;
+        propertyName: string;
+        propertyIndex: number;
+        node: any;
+        cumulativeValue: number;
+        cumulativeWeight: number;
+
+        reset(): void;
+        accumulate( value: any, weight: number ): void;
+        unbind(): void;
+        bind(): void;
+        apply(): void;
+        parseTrackName( trackName: string ): any;
+        findNode( root: any, nodeName: string ): any;
+    }
+
+    export class BooleanKeyframeTrack extends KeyframeTrack {
+        constructor(name: string, keys: any[]);
+
+        result: any;
+
+        setResult( value: any ): void;
+        lerpValues( value0: any, value1: any, alpha: number ): any;
+        compareValues( value0: any, value1: any ): boolean;
+        clone(): BooleanKeyframeTrack;
+        parse( json: any ): BooleanKeyframeTrack;
+    }
+
+    export class ColorKeyframeTrack extends KeyframeTrack {
+        constructor(name: string, keys: any[]);
+
+        result: any;
+
+        setResult( value: any ): void;
+        lerpValues( value0: any, value1: any, alpha: number ): any;
+        compareValues( value0: any, value1: any ): boolean;
+        clone(): ColorKeyframeTrack;
+        parse( json: any ): ColorKeyframeTrack;
+    }
+
+    export class NumberKeyframeTrack {
+        constructor();
+
+        result: any;
+
+        setResult( value: any ): void;
+        lerpValues( value0: any, value1: any, alpha: number ): any;
+        compareValues( value0: any, value1: any ): boolean;
+        clone(): NumberKeyframeTrack;
+        parse( json: any ): NumberKeyframeTrack;
+    }
+
+    export class QuaternionKeyframeTrack {
+        constructor();
+
+        result: any;
+
+        setResult( value: any ): void;
+        lerpValues( value0: any, value1: any, alpha: number ): any;
+        compareValues( value0: any, value1: any ): boolean;
+        clone(): QuaternionKeyframeTrack;
+        parse( json: any ): QuaternionKeyframeTrack;
+    }
+
+    export class StringKeyframeTrack {
+        constructor();
+
+        result: any;
+
+        setResult( value: any ): void;
+        lerpValues( value0: any, value1: any, alpha: number ): any;
+        compareValues( value0: any, value1: any ): boolean;
+        clone(): StringKeyframeTrack;
+        parse( json: any ): StringKeyframeTrack;
+    }
+
+    export class VectorKeyframeTrack {
+        constructor();
+
+        result: any;
+
+        setResult( value: any ): void;
+        lerpValues( value0: any, value1: any, alpha: number ): any;
+        compareValues( value0: any, value1: any ): boolean;
+        clone(): VectorKeyframeTrack;
+        parse( json: any ): VectorKeyframeTrack;
+    }
 
     // Cameras ////////////////////////////////////////////////////////////////////////////////////////
 
@@ -188,7 +401,8 @@ declare module THREE {
          */
         lookAt(vector: Vector3): void;
 
-        clone(camera?: Camera): Camera;
+        clone(): Camera;
+        copy(camera?: Camera): Camera;
     }
 
     export class CubeCamera extends Object3D {
@@ -256,8 +470,9 @@ declare module THREE {
          * Updates the camera projection matrix. Must be called after change of parameters.
          */
         updateProjectionMatrix(): void;
-
         clone(): OrthographicCamera;
+        copy( source: OrthographicCamera ): OrthographicCamera;
+        toJSON( meta?: any ): any;
     }
 
     /**
@@ -352,60 +567,36 @@ declare module THREE {
          */
         updateProjectionMatrix(): void;
         clone(): PerspectiveCamera;
+        copy( source: PerspectiveCamera ): PerspectiveCamera;
+        toJSON( meta?: any ): any;
     }
 
     // Core ///////////////////////////////////////////////////////////////////////////////////////////////
 
-    /**
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InterleavedBuffer.js">src/core/InterleavedBuffer.js</a>
-     */
-    export class InterleavedBuffer {
-        constructor(array: ArrayLike<number>, stride: number);
-        array: ArrayLike<number>;
-        stride: number;
-        dynamic: boolean;
-        updateRange: {offset:number, count:number};
-        version: number;
-        length: number;
-        count: number;
-        needsUpdate: boolean;
-
-        setDynamic(dynamic: boolean): InterleavedBuffer;
-        copy(source: InterleavedBuffer): void;
-        copyAt(index1: number, attribute: InterleavedBufferAttribute, index2: number): InterleavedBuffer;
-        set(value: ArrayLike<number>, index: number): InterleavedBuffer;
-        clone(): InterleavedBuffer;
-    }
-
-    /**
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InstancedInterleavedBuffer.js">src/core/InstancedInterleavedBuffer.js</a>
-     */
-    export class InstancedInterleavedBuffer extends InterleavedBuffer {
-        constructor(array: ArrayLike<number>, stride: number, meshPerAttribute?: number);
-        meshPerAttribute: number;
-        copy(source: InstancedInterleavedBuffer): InstancedInterleavedBuffer;
-    }
-
     /**
      * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/BufferAttribute.js">src/core/BufferAttribute.js</a>
      */
     export class BufferAttribute {
         constructor(array: ArrayLike<number>, itemSize: number); // array parameter should be TypedArray.
 
+        uuid: string;
         array: ArrayLike<number>;
         itemSize: number;
         dynamic: boolean;
         updateRange: {offset:number, count:number};
+        version: number;
+
         needsUpdate: boolean;
         /** Deprecated, use count instead */
         length: number;
         count: number;
 
         setDynamic(dynamic: boolean): BufferAttribute;
+        clone(): BufferAttribute;
         copy(source: BufferAttribute): BufferAttribute;
         copyAt(index1: number, attribute: BufferAttribute, index2: number): BufferAttribute;
         copyArray(array: ArrayLike<number>): BufferAttribute;
-        copyColorArray(colors: {r:number, g:number, b:number}[]): BufferAttribute;
+        copyColorsArray(colors: {r:number, g:number, b:number}[]): BufferAttribute;
         copyIndicesArray(indices: {a:number, b:number, c:number}[]): BufferAttribute;
         copyVector2sArray(vectors: {x:number, y:number}[]): BufferAttribute;
         copyVector3sArray(vectors: {x:number, y:number, z:number}[]): BufferAttribute;
@@ -427,83 +618,47 @@ declare module THREE {
 
     // deprecated (are these actually deprecated?)
     export class Int8Attribute extends BufferAttribute{
-        constructor(data: any, itemSize: number);
+        constructor(array: any, itemSize: number);
     }
 
     // deprecated
     export class Uint8Attribute extends BufferAttribute {
-        constructor(data: any, itemSize: number);
+        constructor(array: any, itemSize: number);
     }
 
     // deprecated
     export class Uint8ClampedAttribute extends BufferAttribute {
-        constructor(data: any, itemSize: number);
+        constructor(array: any, itemSize: number);
     }
 
     // deprecated
     export class Int16Attribute extends BufferAttribute {
-        constructor(data: any, itemSize: number);
+        constructor(array: any, itemSize: number);
     }
 
     // deprecated
     export class Uint16Attribute extends BufferAttribute {
-        constructor(data: any, itemSize: number);
+        constructor(array: any, itemSize: number);
     }
 
     // deprecated
     export class Int32Attribute extends BufferAttribute {
-        constructor(data: any, itemSize: number);
+        constructor(array: any, itemSize: number);
     }
 
     // deprecated
     export class Uint32Attribute extends BufferAttribute {
-        constructor(data: any, itemSize: number);
+        constructor(array: any, itemSize: number);
     }
 
     // deprecated
     export class Float32Attribute extends BufferAttribute {
-        constructor(data: any, itemSize: number);
+        constructor(array: any, itemSize: number);
     }
 
     // deprecated
     export class Float64Attribute extends BufferAttribute {
-        constructor(data: any, itemSize: number);
-    }
-
-    /**
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InstancedBufferAttribute.js">src/core/InstancedBufferAttribute.js</a>
-     */
-    export class InstancedBufferAttribute extends BufferAttribute {
-        constructor(data: ArrayLike<number>, itemSize: number, meshPerAttribute?: number);
-        meshPerAttribute: number;
-        copy(source: InstancedBufferAttribute): InstancedBufferAttribute;
-    }
-
-    /**
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InterleavedBufferAttribute.js">src/core/InterleavedBufferAttribute.js</a>
-     */
-    export class InterleavedBufferAttribute {
-        constructor(interleavedBuffer: InterleavedBuffer, itemSize: number, offset: number);
-
-        uuid: string;
-        data: InterleavedBuffer;
-        itemSize: number;
-        offset: number;
-        /** Deprecated, use count instead */
-        length: number;
-        count: number;
-
-        getX(index: number): number;
-        setX(index: number, x: number): InterleavedBufferAttribute;
-        getY(index: number): number;
-        setY(index: number, y: number): InterleavedBufferAttribute;
-        getZ(index: number): number;
-        setZ(index: number, z: number): InterleavedBufferAttribute;
-        getW(index: number): number;
-        setW(index: number, z: number): InterleavedBufferAttribute;
-        setXY(index: number, x: number, y: number): InterleavedBufferAttribute;
-        setXYZ(index: number, x: number, y: number, z: number): InterleavedBufferAttribute;
-        setXYZW(index: number, x: number, y: number, z: number, w: number): InterleavedBufferAttribute;
+        constructor(array: any, itemSize: number);
     }
 
     /**
@@ -528,17 +683,19 @@ declare module THREE {
         uuid: string;
         name: string;
         type: string;
+        index: BufferAttribute;
         attributes: BufferAttribute|InterleavedBufferAttribute[];
-        /** Deprecated. Use groups instead. */
-        drawcalls: { start: number; count: number; index: number; }[];
-        /** Deprecated. Use groups instead. */
-        offsets: { start: number; count: number; index: number; }[];
-        groups: { start: number, count: number, materialIndex?: number }[];
+        morphAttributes: any;
+        groups: {start: number, count: number, materialIndex?: number}[];
         boundingBox: Box3;
         boundingSphere: BoundingSphere;
+        drawRange: { start: number, count: number };
 
-        addIndex(index: BufferAttribute): void;
-        setIndex(index: BufferAttribute): void;
+        /** Deprecated. */
+        addIndex( index: BufferAttribute ): void;
+
+        getIndex(): BufferAttribute;
+        setIndex( index: BufferAttribute ): void;
 
         /** Deprecated. This overloaded method is deprecated. */
         addAttribute(name: string, array: any, itemSize: number): any;
@@ -546,11 +703,15 @@ declare module THREE {
         getAttribute(name: string): BufferAttribute|InterleavedBufferAttribute;
         removeAttribute(name: string): void;
 
-        setIndex(index: BufferAttribute): void;
-        getIndex(): BufferAttribute;
+        /** Deprecated. */
+        drawcalls(): any;
+        /** Deprecated. */
+        offsets(): any;
 
         /** Deprecated. Use addGroup */
-        addDrawCall(start: number, count: number, index: number): void;
+        addDrawCall(start: number, count: number, index?: number): void;
+        /** Deprecated. */
+        clearDrawCalls(): void;
         addGroup(start: number, count: number, materialIndex?: number): void;
         clearGroups(): void;
 
@@ -575,6 +736,8 @@ declare module THREE {
 
         fromGeometry(geometry: Geometry, settings?: any): BufferGeometry;
 
+        fromDirectGeometry( geometry: DirectGeometry ): BufferGeometry;
+
         /**
          * Computes bounding box of the geometry, updating Geometry.boundingBox attribute.
          * Bounding boxes aren't computed by default. They need to be explicitly computed, otherwise they are null.
@@ -616,47 +779,15 @@ declare module THREE {
         dispatchEvent(event: { type: string; target: any; }): void;
     }
 
-    /**
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InstancedBufferGeometry.js">src/core/InstancedBufferGeometry.js</a>
-     */
-    export class InstancedBufferGeometry extends BufferGeometry {
+    export class Channels {
         constructor();
-        groups: {start:number, count:number, instances:number}[];
-        addGroup(start: number, count: number, instances: number): void;
-        copy(source: InstancedBufferGeometry): InstancedBufferGeometry;
-    }
 
-    /**
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/DirectGeometry.js">src/core/DirectGeometry.js</a>
-     */
-    export class DirectGeometry {
-        constructor();
-        id: number;
-        uuid: string;
-        name: string;
-        type: string;
-        indices: number[];
-        vertices: Vector3[];
-        normals: Vector3[];
-        colors: Color[];
-        uvs: Vector2[];
-        uvs2: Vector2[];
-        groups: {start: number, materialIndex: number}[];
-        morphTargets: MorphTarget[];
-        skinWeights: number[];
-        skinIndices: number[];
-        boundingBox: Box3;
-        boundingSphere: BoundingSphere;
-        verticesNeedUpdate: boolean;
-        normalsNeedUpdate: boolean;
-        colorsNeedUpdate: boolean;
-        uvsNeedUpdate: boolean;
-        groupsNeedUpdate: boolean;
-        computeBoundingBox(): void;
-        computeBoundingSphere(): void;
-        computeGroups(geometry: Geometry): void;
-        fromGeometry(geometry: Geometry): DirectGeometry;
-        dispose(): void;
+        mask: number;
+
+        set( channel: number ): void;
+        enable( channel: number ): void;
+        toggle( channel: number ): void;
+        disable( channel: number ): void;
     }
 
     /**
@@ -720,17 +851,44 @@ declare module THREE {
     }
 
     /**
-     * Deprecated. Use new THREE.BufferAttribute().setDynamic(true) instead.
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/DirectGeometry.js">src/core/DirectGeometry.js</a>
      */
-    export class DynamicBufferAttribute extends BufferAttribute {
-        constructor(array: any, itemSize: number);
+    export class DirectGeometry {
+        constructor();
 
-        updateRange: {
-            offset: number;
-            count: number;
-        }
+        id: number;
+        uuid: string;
+        name: string;
+        type: string;
+        indices: number[];
+        vertices: Vector3[];
+        normals: Vector3[];
+        colors: Color[];
+        uvs: Vector2[];
+        uvs2: Vector2[];
+        groups: {start: number, materialIndex: number}[];
+        morphTargets: MorphTarget[];
+        skinWeights: number[];
+        skinIndices: number[];
+        boundingBox: Box3;
+        boundingSphere: BoundingSphere;
+        verticesNeedUpdate: boolean;
+        normalsNeedUpdate: boolean;
+        colorsNeedUpdate: boolean;
+        uvsNeedUpdate: boolean;
+        groupsNeedUpdate: boolean;
 
-        clone(): DynamicBufferAttribute;
+        computeBoundingBox(): void;
+        computeBoundingSphere(): void;
+        computeGroups(geometry: Geometry): void;
+        fromGeometry(geometry: Geometry): DirectGeometry;
+        dispose(): void;
+
+        // EventDispatcher mixins
+        addEventListener(type: string, listener: (event: any) => void ): void;
+        hasEventListener(type: string, listener: (event: any) => void): void;
+        removeEventListener(type: string, listener: (event: any) => void): void;
+        dispatchEvent(event: { type: string; target: any; }): void;
     }
 
     /**
@@ -883,7 +1041,6 @@ declare module THREE {
         radius: number;
     }
 
-
     /**
      * Base class for geometries
      *
@@ -983,13 +1140,6 @@ declare module THREE {
          */
         boundingSphere: BoundingSphere;
 
-        /**
-         * Set to true if attribute buffers will need to change in runtime (using "dirty" flags).
-         * Unless set to true internal typed arrays corresponding to buffers will be deleted once sent to GPU.
-         * Defaults to true.
-         */
-        dynamic: boolean;
-
         /**
          * Set to true if the vertices array has been updated.
          */
@@ -1010,11 +1160,6 @@ declare module THREE {
          */
         normalsNeedUpdate: boolean;
 
-        /**
-         * Set to true if the tangents in the faces has been updated.
-         */
-        tangentsNeedUpdate: boolean;
-
         /**
          * Set to true if the colors array has been updated.
          */
@@ -1035,6 +1180,15 @@ declare module THREE {
          */
         applyMatrix(matrix: Matrix4): void;
 
+        rotateX(angle: number): Geometry;
+        rotateY(angle: number): Geometry;
+        rotateZ(angle: number): Geometry;
+
+        translate(x: number, y: number, z: number): Geometry;
+        scale(x: number, y: number, z: number): Geometry;
+        lookAt( vector: Vector3 ): void;
+
+
         fromBufferGeometry(geometry: BufferGeometry): Geometry;
 
         /**
@@ -1042,6 +1196,8 @@ declare module THREE {
          */
         center(): Vector3;
 
+        normalize(): Geometry;
+
         /**
          * Computes face normals.
          */
@@ -1090,6 +1246,8 @@ declare module THREE {
          */
         clone(): Geometry;
 
+        copy(source: Geometry): Geometry;
+
         /**
          * Removes The object from memory.
          * Don't forget to call this method when you remove an geometry because it can cuase meomory leaks.
@@ -1099,8 +1257,8 @@ declare module THREE {
 
         //These properties do not exist in a normal Geometry class, but if you use the instance that was passed by JSONLoader, it will be added.
         bones: Bone[];
-        animation: AnimationData;
-        animations: AnimationData[];
+        animation: AnimationClip;
+        animations: AnimationClip[];
 
         // EventDispatcher mixins
         addEventListener(type: string, listener: (event: any) => void ): void;
@@ -1109,6 +1267,89 @@ declare module THREE {
         dispatchEvent(event: { type: string; target: any; }): void;
     }
 
+    /**
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InstancedBufferAttribute.js">src/core/InstancedBufferAttribute.js</a>
+     */
+    export class InstancedBufferAttribute extends BufferAttribute {
+        constructor(data: ArrayLike<number>, itemSize: number, meshPerAttribute?: number);
+        meshPerAttribute: number;
+
+        clone(): InstancedBufferAttribute;
+        copy(source: InstancedBufferAttribute): InstancedBufferAttribute;
+    }
+
+    /**
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InstancedBufferGeometry.js">src/core/InstancedBufferGeometry.js</a>
+     */
+    export class InstancedBufferGeometry extends BufferGeometry {
+        constructor();
+        groups: {start:number, count:number, instances:number}[];
+        addGroup(start: number, count: number, instances: number): void;
+
+        clone(): InstancedBufferGeometry;
+        copy(source: InstancedBufferGeometry): InstancedBufferGeometry;
+    }
+
+    /**
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InstancedInterleavedBuffer.js">src/core/InstancedInterleavedBuffer.js</a>
+     */
+    export class InstancedInterleavedBuffer extends InterleavedBuffer {
+        constructor(array: ArrayLike<number>, stride: number, meshPerAttribute?: number);
+        meshPerAttribute: number;
+
+        clone(): InstancedInterleavedBuffer;
+        copy(source: InstancedInterleavedBuffer): InstancedInterleavedBuffer;
+    }
+
+    /**
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InterleavedBuffer.js">src/core/InterleavedBuffer.js</a>
+     */
+    export class InterleavedBuffer {
+        constructor(array: ArrayLike<number>, stride: number);
+        array: ArrayLike<number>;
+        stride: number;
+        dynamic: boolean;
+        updateRange: {offset:number, count:number};
+        version: number;
+        length: number;
+        count: number;
+        needsUpdate: boolean;
+
+        setDynamic(dynamic: boolean): InterleavedBuffer;
+        clone(): InterleavedBuffer;
+        copy(source: InterleavedBuffer): InterleavedBuffer;
+        copyAt(index1: number, attribute: InterleavedBufferAttribute, index2: number): InterleavedBuffer;
+        set(value: ArrayLike<number>, index: number): InterleavedBuffer;
+        clone(): InterleavedBuffer;
+    }
+
+    /**
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InterleavedBufferAttribute.js">src/core/InterleavedBufferAttribute.js</a>
+     */
+    export class InterleavedBufferAttribute {
+        constructor(interleavedBuffer: InterleavedBuffer, itemSize: number, offset: number);
+
+        uuid: string;
+        data: InterleavedBuffer;
+        itemSize: number;
+        offset: number;
+        /** Deprecated, use count instead */
+        length: number;
+        count: number;
+
+        getX(index: number): number;
+        setX(index: number, x: number): InterleavedBufferAttribute;
+        getY(index: number): number;
+        setY(index: number, y: number): InterleavedBufferAttribute;
+        getZ(index: number): number;
+        setZ(index: number, z: number): InterleavedBufferAttribute;
+        getW(index: number): number;
+        setW(index: number, z: number): InterleavedBufferAttribute;
+        setXY(index: number, x: number, y: number): InterleavedBufferAttribute;
+        setXYZ(index: number, x: number, y: number, z: number): InterleavedBufferAttribute;
+        setXYZW(index: number, x: number, y: number, z: number, w: number): InterleavedBufferAttribute;
+    }
+
     /**
      * Base class for scene graph objects
      */
@@ -1137,6 +1378,8 @@ declare module THREE {
          */
         parent: Object3D;
 
+        channels: Channels;
+
         /**
          * Array with object's children.
          */
@@ -1167,6 +1410,10 @@ declare module THREE {
          */
         scale: Vector3;
 
+        modelViewMatrix: { value: Matrix4 };
+
+        normalMatrix: { value: Matrix3 };
+
         /**
          * When this is set, then the rotationMatrix gets calculated every frame.
          */
@@ -1223,14 +1470,7 @@ declare module THREE {
          *
          */
         static DefaultUp: Vector3;
-        static DefaultMatrixAutoUpdate: boolean;
-
-        /**
-         * Order of axis for Euler angles.
-         */
-        // deprecated
-        eulerOrder: string;
-
+        static DefaultMatrixAutoUpdate: Vector3;
 
         /**
          * This updates the position, rotation and scale with the matrix.
@@ -1364,11 +1604,8 @@ declare module THREE {
         getWorldScale(optionalTarget?: Vector3): Vector3;
         getWorldDirection(optionalTarget?: Vector3): Vector3;
 
-        /**
-         * Translates object along arbitrary axis by distance.
-         * @param distance Distance.
-         * @param axis Translation direction.
-         */
+        raycast(raycaster: Raycaster, intersects: any): void;
+
         traverse(callback: (object: Object3D) => any): void;
 
         traverseVisible(callback: (object: Object3D) => any): void;
@@ -1385,14 +1622,16 @@ declare module THREE {
          */
         updateMatrixWorld(force: boolean): void;
 
-        toJSON(): any;
+        toJSON(meta?: any): any;
+
+        clone(recursive?: boolean): Object3D;
 
         /**
          *
          * @param object
          * @param recursive
          */
-        clone(object?: Object3D, recursive?: boolean): Object3D;
+        copy(source: Object3D, recursive?: boolean): Object3D;
 
         // EventDispatcher mixins
         addEventListener(type: string, listener: (event: any) => void ): void;
@@ -1410,13 +1649,11 @@ declare module THREE {
     }
 
     export interface RaycasterParameters {
-        Sprite?: any;
         Mesh?: any;
-        Points?: any;
-        /** Deprecated, use Points */
-        PointCloud?: any;
-        LOD?: any;
         Line?: any;
+        LOD?: any;
+        Points?: any;
+        Sprite?: any;
     }
 
     export class Raycaster {
@@ -1443,42 +1680,36 @@ declare module THREE {
         constructor(hex?: number);
 
         color: Color;
+        receiveShadow: boolean;
 
-        shadow: LightShadow;
-
-        /** Deprecated, use shadow */
         shadowCameraFov: number;
-        shadowCameraNear: number;
-        shadowCameraFar: number;
         shadowCameraLeft: number;
         shadowCameraRight: number;
         shadowCameraTop: number;
         shadowCameraBottom: number;
+        shadowCameraNear: number;
+        shadowCameraFar: number;
         shadowBias: number;
         shadowDarkness: number;
         shadowMapWidth: number;
         shadowMapHeight: number;
-        shadowMap: RenderTarget;
-        shadowMapSize: number;
-        shadowCamera: Camera;
-        shadowMatrix: Matrix4;
 
-        clone(light?: Light): Light;
+        clone(recursive?: boolean): Light;
+        copy( source: Light ): Light;
+        toJSON( meta: any ): any;
     }
-    
+
     export class LightShadow {
         constructor(camera: Camera);
 
-        camera: THREE.Camera;
-
+        camera: Camera;
         bias: number;
         darkness: number;
+        mapSize: Vector2;
+        map: RenderTarget;
+        matrix: Matrix4;
 
-        mapSize: THREE.Vector2;
-
-        map: any;
-        matrix: THREE.Matrix4;
-        
+        copy(source: LightShadow): void;
         clone(): LightShadow;
     }
 
@@ -1498,7 +1729,8 @@ declare module THREE {
          */
         constructor(hex?: number);
 
-        clone(): AmbientLight;
+        clone(recursive?: boolean): AmbientLight;
+        copy(source: AmbientLight): AmbientLight;
     }
 
     /**
@@ -1527,7 +1759,10 @@ declare module THREE {
          */
         intensity: number;
 
-        clone(): DirectionalLight;
+        shadow: LightShadow;
+
+        clone(recursive?: boolean): DirectionalLight;
+        copy(source: DirectionalLight): DirectionalLight;
     }
 
     export class HemisphereLight extends Light {
@@ -1536,7 +1771,8 @@ declare module THREE {
         groundColor: Color;
         intensity: number;
 
-        clone(): HemisphereLight;
+        clone(recursive?: boolean): HemisphereLight;
+        copy(source: HemisphereLight): HemisphereLight;
     }
 
     /**
@@ -1564,7 +1800,10 @@ declare module THREE {
 
         decay: number;
 
-        clone(): PointLight;
+        shadow: LightShadow;
+
+        clone(recursive?: boolean): PointLight;
+        copy(source: PointLight): PointLight;
     }
 
     /**
@@ -1605,7 +1844,10 @@ declare module THREE {
 
         decay: number;
 
-        clone(): SpotLight;
+        shadow: LightShadow;
+
+        clone(recursive?: boolean): SpotLight;
+        copy(source: PointLight): SpotLight;
     }
 
     // Loaders //////////////////////////////////////////////////////////////////////////////////
@@ -1631,8 +1873,6 @@ declare module THREE {
     export class Loader {
         constructor();
 
-        imageLoader: ImageLoader;
-
         /**
          * Will be called when load starts.
          * The default is a function with empty body.
@@ -1659,22 +1899,32 @@ declare module THREE {
 
         extractUrlBase(url: string): string;
         initMaterials(materials: Material[], texturePath: string): Material[];
-        needsTangents(materials: Material[]): boolean;
-        createMaterial(m: Material, texturePath: string): boolean;
+        createMaterial(m: Material, texturePath: string, crossOrigin?: string): boolean;
 
         static Handlers: LoaderHandler;
     }
 
-    export interface LoaderHandler {
-        handlers: any[];
-        add(regex: string, loader: Loader): void;
-        get(file: string): Loader;
+    export interface LoaderHandler{
+        handlers:any[];
+        add(regex:string, loader:Loader):void;
+        get(file: string):Loader;
+    }
+
+    export class AnimationLoader {
+        constructor(manager?: LoadingManager);
+
+        manager: LoadingManager;
+        load(url: string, onLoad: (animations: AnimationClip[]) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
+        setCrossOrigin(crossOrigin: string): void;
+        parse(json: any, onLoad: (animations: AnimationClip[])=>void): void;
     }
 
     export class BinaryTextureLoader {
-        constructor();
+        constructor(manager?: LoadingManager);
 
+        manager: LoadingManager;
         load(url: string, onLoad: (dataTexture: DataTexture) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
+        setCrossOrigin(crossOrigin: string): void;
     }
 
     export class BufferGeometryLoader {
@@ -1697,24 +1947,23 @@ declare module THREE {
     }
     export var Cache: Cache;
 
-    export class CompressedTextureLoader {
-        constructor();
+    export class CompressedTextureLoader{
+        constructor(manager?: LoadingManager);
 
-        load(url: string, onLoad: (bufferGeometry: BufferGeometry) => void, onError?: (event: any) => void): void;
+        manager: LoadingManager;
+        load(url: string, onLoad: (texture: CompressedTexture) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
+        setCrossOrigin(crossOrigin: string): void;
     }
 
-    export class DataTextureLoader extends BinaryTextureLoader {
-        // alias for BinaryTextureLoader.
+    export class CubeTextureLoader {
+        constructor(manager?: LoadingManager);
+
+        manager: LoadingManager;
+        load(url: string, onLoad: (texture: CubeTexture) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
+        setCrossOrigin(crossOrigin: string): void;
+
     }
 
-    /*
-     * GeometryLoader class is experimental, and it is not yet included in the compiled source code.
-     *
-     export class GeometryLoader {
-
-     }
-     */
-
     /**
      * A loader for loading an image.
      * Unlike other loaders, this one emits events instead of using predefined callbacks. So if you're interested in getting notified when things happen, you need to add listeners to the object.
@@ -1739,19 +1988,14 @@ declare module THREE {
      * A loader for loading objects in JSON format.
      */
     export class JSONLoader extends Loader {
-        constructor();
-
+        constructor(manager?: LoadingManager);
+        manager: LoadingManager;
         withCredentials: boolean;
 
-        /**
-         * @param url
-         * @param callback. This function will be called with the loaded model as an instance of geometry when the load is completed.
-         * @param texturePath If not specified, textures will be assumed to be in the same folder as the Javascript model file.
-         */
-        load(url: string, callback: (geometry: Geometry, materials: Material[]) => void , texturePath?: string): void;
-
-        loadAjaxJSON(context: JSONLoader, url: string, callback: (geometry: Geometry, materials: Material[]) => void , texturePath?: string, callbackProgress?: (progress: Progress) => void ): void;
+        load(url: string, onLoad?: (geometry: Geometry, materials: Material[]) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
 
+        setCrossOrigin(crossOrigin: string): void;
+        setTexturePath( value: string ): void;
         parse(json: any, texturePath?: string): { geometry: Geometry; materials?: Material[] };
     }
 
@@ -1783,16 +2027,19 @@ declare module THREE {
 
         itemStart(url: string): void;
         itemEnd(url: string): void;
-
+        itemError(url: string): void;
     }
 
     export class MaterialLoader {
         constructor(manager?: LoadingManager);
 
         manager: LoadingManager;
+        textures: { [key:string]:Texture };
 
         load(url: string, onLoad: (material: Material) => void): void;
         setCrossOrigin(crossOrigin: string): void;
+        setTextures(textures: { [key:string]:Texture }): void;
+        getTexture( name: string ):Texture;
         parse(json: any): Material;
     }
 
@@ -1829,7 +2076,7 @@ declare module THREE {
          *
          * @param url
          */
-        load(url: string, onLoad: (texture: Texture) => void): void;
+        load(url: string, onLoad: (texture: Texture) => void): Texture;
         setCrossOrigin(crossOrigin: string): void;
     }
 
@@ -1841,9 +2088,10 @@ declare module THREE {
         responseType: string;
         crossOrigin: string;
 
-        load(url: string, onLoad?: (responseText: string) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
+        load(url: string, onLoad?: (responseText: string) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): any;
         setResponseType(responseType: string): void;
         setCrossOrigin(crossOrigin: string): void;
+        setWithCredentials( withCredentials: string ): void;
     }
 
     // Materials //////////////////////////////////////////////////////////////////////////////////
@@ -1928,7 +2176,7 @@ declare module THREE {
         blendDstAlpha: number;
         blendEquationAlpha: number;
 
-        depthFunc: Function;
+        depthFunc: DepthModes;
 
         /**
          * Whether to have depth test enabled when rendering this material. Default is true.
@@ -1943,6 +2191,8 @@ declare module THREE {
 
         colorWrite: boolean;
 
+        precision: any;
+
         /**
          * Whether to use polygon offset. Default is false. This corresponds to the POLYGON_OFFSET_FILL WebGL feature.
          */
@@ -1980,8 +2230,9 @@ declare module THREE {
         needsUpdate: boolean;
 
         setValues(values: Object): void;
-        toJSON(): any;
-        clone(material?:Material): Material;
+        toJSON(meta?: any): any;
+        clone(): Material;
+        clone(source?:Material): Material;
         update(): void;
         dispose(): void;
 
@@ -2012,6 +2263,7 @@ declare module THREE {
         fog: boolean;
 
         clone(): LineBasicMaterial;
+        copy(source: LineBasicMaterial): LineBasicMaterial;
     }
 
     export interface LineDashedMaterialParameters extends MaterialParameters {
@@ -2036,6 +2288,7 @@ declare module THREE {
         fog: boolean;
 
         clone(): LineDashedMaterial;
+        copy(source: LineDashedMaterial): LineDashedMaterial;
     }
 
     /**
@@ -2043,6 +2296,7 @@ declare module THREE {
      */
     export interface MeshBasicMaterialParameters extends MaterialParameters{
         color?: number;
+        opacity?: number;
         map?: Texture;
         aoMap?: Texture;
         aoMapIntensity?: number;
@@ -2052,15 +2306,16 @@ declare module THREE {
         combine?: Combine;
         reflectivity?: number;
         refractionRatio?: number;
-        fog?: boolean;
         shading?: Shading;
+        blending?: Blending;
+        depthTest?: boolean;
+        depthWrite?: boolean;
         wireframe?: boolean;
         wireframeLinewidth?: number;
-        wireframeLinecap?: string;
-        wireframeLinejoin?: string;
         vertexColors?: Colors;
         skinning?: boolean;
         morphTargets?: boolean;
+        fog?: boolean;
     }
 
     export class MeshBasicMaterial extends Material {
@@ -2087,6 +2342,7 @@ declare module THREE {
         morphTargets: boolean;
 
         clone(): MeshBasicMaterial;
+        copy(source: MeshBasicMaterial): MeshBasicMaterial;
     }
 
     export interface MeshDepthMaterialParameters extends MaterialParameters{
@@ -2101,21 +2357,13 @@ declare module THREE {
         wireframeLinewidth: number;
 
         clone(): MeshDepthMaterial;
-    }
-
-    // MeshFaceMaterial does not inherit the Material class in the original code. However, it should treat as Material class.
-    // See tests/canvas/canvas_materials.ts.
-    export class MeshFaceMaterial extends Material {
-        constructor(materials?: Material[]);
-        materials: Material[];
-
-        toJSON(): any;
-        clone(): MeshFaceMaterial;
+        copy(source: MeshDepthMaterial): MeshDepthMaterial;
     }
 
     export interface MeshLambertMaterialParameters extends MaterialParameters{
         color?: number;
         emissive?: number;
+        opacity?: number;
         map?: Texture;
         specularMap?: Texture;
         alphaMap?: Texture;
@@ -2126,8 +2374,6 @@ declare module THREE {
         fog?: boolean;
         wireframe?: boolean;
         wireframeLinewidth?: number;
-        wireframeLinecap?: string;
-        wireframeLinejoin?: string;
         vertexColors?: Colors;
         skinning?: boolean;
         morphTargets?: boolean;
@@ -2136,6 +2382,7 @@ declare module THREE {
 
     export class MeshLambertMaterial extends Material {
         constructor(parameters?: MeshLambertMaterialParameters);
+
         color: Color;
         emissive: Color;
         map: Texture;
@@ -2156,39 +2403,21 @@ declare module THREE {
         morphNormals: boolean;
 
         clone(): MeshLambertMaterial;
+        copy(source: MeshLambertMaterial): MeshLambertMaterial;
     }
 
     export interface MeshNormalMaterialParameters extends MaterialParameters{
-        /** Line color in hexadecimal. Default is 0xffffff. */
-        color?: number;
-        /** Sets the texture map. Default is null  */
-        map?: Texture;
-        /** Set light map. Default is null. */
-        lightMap?: Texture;
-        /** Set specular map. Default is null. */
-        specularMap?: Texture;
-        /** Set alpha map. Default is null. */
-        alphaMap?: Texture;
-        /** Set env map. Default is null. */
-        envMap?: Texture;
-        /** Define whether the material color is affected by global fog settings. Default is false. */
-        fog?: boolean;
-        /** How the triangles of a curved surface are rendered. Default is THREE.SmoothShading. */
+        opacity?: number;
         shading?: Shading;
+        blending?: Blending;
+        depthTest?: boolean;
+        depthWrite?: boolean;
+
         /** Render geometry as wireframe. Default is false (i.e. render as smooth shaded). */
         wireframe?: boolean;
         /** Controls wireframe thickness. Default is 1. */
         wireframeLinewidth?: number;
-        /** Define appearance of line ends. Default is 'round'. */
-        wireframeLinecap?: string;
-        /** Define appearance of line joints. Default is 'round'. */
-        wireframeLinejoin?: string;
-        /** Define how the vertices gets colored. Default is THREE.NoColors. */
-        vertexColors?: Colors;
-        /** Define whether the material uses skinning. Default is false. */
-        skinning?: boolean;
-        /** Define whether the material uses morphTargets. Default is false. */
-        morphTargets?: boolean;
+
     }
 
     export class MeshNormalMaterial extends Material {
@@ -2199,51 +2428,22 @@ declare module THREE {
         morphTargets: boolean;
 
         clone(): MeshNormalMaterial;
+        copy(source: MeshNormalMaterial): MeshNormalMaterial;
     }
 
     export interface MeshPhongMaterialParameters extends MaterialParameters {
         /** geometry color in hexadecimal. Default is 0xffffff. */
         color?: number;
-        /** Sets the texture map. Default is null */
-        map?: Texture;
-        /** Set light map. Default is null */
-        lightMap?: Texture;
-        lightMapIntensity?: number;
-
-        aoMap?: Texture;
-        aoMapIntensity?: number;
-        emissiveMap?: Texture;
-
-        /** Set specular map. Default is null */
-        specularMap?: Texture;
-        /** Set alpha map. Default is null */
-        alphaMap?: Texture;
-        /** Set env map. Default is null */
-        envMap?: Texture;
-        /** Define whether the material color is affected by global fog settings. Default is true */
-        fog?: boolean;
-        /** Define shading type. Default is THREE.SmoothShading */
-        shading?: Shading;
-        /** render geometry as wireframe. Default is false */
-        wireframe?: string;
-        /** Line thickness. Default is 1. */
-        wireframeLinewidth?: number;
-        /** Define appearance of line ends. Default is 'round' */
-        wireframeLinecap?: string;
-        /** Define appearance of line joints. Default is 'round'. */
-        wireframeLinejoin?: string;
-        /** Define how the vertices gets colored. Default is THREE.NoColors. */
-        vertexColors?: Colors;
-        /** Define whether the material uses skinning. Default is false. */
-        skinning?: boolean;
-
-        /** Define whether the material uses morphTargets. Default is false. */
-        morphTargets?: boolean;
-
         emissive?: number;
         specular?: number;
         shininess?: number;
-        metal?: boolean;
+        opacity?: number;
+        map?: Texture;
+        lightMap?: Texture;
+        lightMapIntensity?: number;
+        aoMap?: Texture;
+        aoMapIntensity?: number;
+        emissiveMap?: Texture;
         bumpMap?: Texture;
         bumpScale?: number;
         normalMap?: Texture;
@@ -2251,10 +2451,23 @@ declare module THREE {
         displacementMap?: Texture;
         displacementScale?: number;
         displacementBias?: number;
+        specularMap?: Texture;
+        alphaMap?: Texture;
+        envMap?: Texture;
         combine?: Combine;
         reflectivity?: number;
         refractionRatio?: number;
+        shading?: Shading;
+        blending?: Blending;
+        depthTest?: boolean;
+        depthWrite?: boolean;
+        wireframe?: string;
+        wireframeLinewidth?: number;
+        vertexColors?: Colors;
+        skinning?: boolean;
+        morphTargets?: boolean;
         morphNormals?: boolean;
+        fog?: boolean;
     }
 
     export class MeshPhongMaterial extends Material {
@@ -2296,19 +2509,39 @@ declare module THREE {
         morphNormals: boolean;
 
         clone(): MeshPhongMaterial;
+        copy(source: MeshPhongMaterial): MeshPhongMaterial;
     }
 
-    export interface PointCloudMaterialParameters extends MaterialParameters{
+    // MultiMaterial does not inherit the Material class in the original code. However, it should treat as Material class.
+    // See tests/canvas/canvas_materials.ts.
+    export class MultiMaterial extends Material {
+        constructor(materials?: Material[]);
+        materials: Material[];
+
+        toJSON(): any;
+        clone(): MultiMaterial;
+    }
+
+    // deprecated
+    export class MeshFaceMaterial extends MultiMaterial {
+
+    }
+
+    export interface PointsMaterialParameters extends MaterialParameters{
         color?: number;
+        opacity?: number;
         map?: Texture;
         size?: number;
         sizeAttenuation?: boolean;
+        blending?: Blending,
+        depthTest?: boolean;
+        depthWrite?: boolean;
         vertexColors?: Colors;
         fog?: boolean;
     }
 
-    export class PointCloudMaterial extends Material {
-        constructor(parameters?: PointCloudMaterialParameters);
+    export class PointsMaterial extends Material {
+        constructor(parameters?: PointsMaterialParameters);
 
         color: Color;
         map: Texture;
@@ -2317,39 +2550,31 @@ declare module THREE {
         vertexColors: boolean;
         fog: boolean;
 
-        clone(): PointCloudMaterial;
-    }
-
-    // deprecated
-    export class ParticleBasicMaterial extends PointCloudMaterial{
-
-    }
-
-    // deprecated
-    export class ParticleSystemMaterial extends PointCloudMaterial{
-
+        clone(): PointsMaterial;
+        copy(source: PointsMaterial): PointsMaterial;
     }
 
     export class RawShaderMaterial extends ShaderMaterial {
         constructor(parameters?: ShaderMaterialParameters);
-
     }
 
     export interface ShaderMaterialParameters extends MaterialParameters {
         defines?: any;
         uniforms?: any;
-        vertexShader?: string;
         fragmentShader?: string;
+        vertexShader?: string;
         shading?: Shading;
-        linewidth?: number;
+        blending?: Blending;
+        depthTest?: boolean;
+        depthWrite?: boolean;
         wireframe?: boolean;
         wireframeLinewidth?: number;
-        fog?: boolean;
         lights?: boolean;
         vertexColors?: Colors;
         skinning?: boolean;
         morphTargets?: boolean;
         morphNormals?: boolean;
+        fog?: boolean;
     }
 
     export class ShaderMaterial extends Material {
@@ -2369,14 +2594,24 @@ declare module THREE {
         skinning: boolean;
         morphTargets: boolean;
         morphNormals: boolean;
+        derivatives: boolean;
+        defaultAttributeValues: any;
+        index0AttributeName: string;
 
         clone(): ShaderMaterial;
+        copy(source: ShaderMaterial): ShaderMaterial;
+        toJSON(meta: any): any;
     }
 
     export interface SpriteMaterialParameters extends MaterialParameters {
         color?: number;
+        opacity?: number;
         map?: Texture;
-        rotation?: number;
+        blending?: Blending;
+        depthTest?: boolean;
+        depthWrite?: boolean;
+        uvOffset?: Vector2;
+        uvScale?: Vector2;
         fog?: boolean;
     }
 
@@ -2389,6 +2624,7 @@ declare module THREE {
         fog: boolean;
 
         clone(): SpriteMaterial;
+        copy(source: SpriteMaterial): SpriteMaterial;
     }
 
     // Math //////////////////////////////////////////////////////////////////////////////////
@@ -2402,6 +2638,7 @@ declare module THREE {
         set(min: Vector2, max: Vector2): Box2;
         setFromPoints(points: Vector2[]): Box2;
         setFromCenterAndSize(center: Vector2, size: Vector2): Box2;
+        clone(): Box2;
         copy(box: Box2): Box2;
         makeEmpty(): Box2;
         empty(): boolean;
@@ -2420,7 +2657,6 @@ declare module THREE {
         union(box: Box2): Box2;
         translate(offset: Vector2): Box2;
         equals(box: Box2): boolean;
-        clone(): Box2;
     }
 
     export class Box3 {
@@ -2433,6 +2669,7 @@ declare module THREE {
         setFromPoints(points: Vector3[]): Box3;
         setFromCenterAndSize(center: Vector3, size: Vector3): Box3;
         setFromObject(object: Object3D): Box3;
+        clone(): Box3;
         copy(box: Box3): Box3;
         makeEmpty(): Box3;
         empty(): boolean;
@@ -2453,7 +2690,6 @@ declare module THREE {
         applyMatrix4(matrix: Matrix4): Box3;
         translate(offset: Vector3): Box3;
         equals(box: Box3): boolean;
-        clone(): Box3;
     }
 
     export interface HSL {
@@ -2520,6 +2756,11 @@ declare module THREE {
          */
         setStyle(style: string): Color;
 
+        /**
+         * Clones this color.
+         */
+        clone(): Color;
+
         /**
          * Copies given color.
          * @param color Color to copy.
@@ -2575,13 +2816,8 @@ declare module THREE {
         multiplyScalar(s: number): Color;
         lerp(color: Color, alpha: number): Color;
         equals(color: Color): boolean;
-        fromArray(rgb: number[]): Color;
+        fromArray(rgb: number[], offset?: number): Color;
         toArray(array?: number[], offset?: number): number[];
-
-        /**
-         * Clones this color.
-         */
-        clone(): Color;
     }
 
     export class ColorKeywords {
@@ -2743,6 +2979,7 @@ declare module THREE {
         order: string;
 
         set(x: number, y: number, z: number, order?: string): Euler;
+        clone(): Euler;
         copy(euler: Euler): Euler;
         setFromRotationMatrix(m: Matrix4, order?: string, update?: boolean): Euler;
         setFromQuaternion(q:Quaternion, order?: string, update?: boolean): Euler;
@@ -2753,8 +2990,6 @@ declare module THREE {
         toArray(array?: number[], offset?: number): number[];
         toVector3(optionalResult?: Vector3): Vector3;
         onChange: () => void;
-
-        clone(): Euler;
     }
 
     /**
@@ -2769,14 +3004,13 @@ declare module THREE {
         planes: Plane[];
 
         set(p0?: number, p1?: number, p2?: number, p3?: number, p4?: number, p5?: number): Frustum;
+        clone(): Frustum;
         copy(frustum: Frustum): Frustum;
         setFromMatrix(m: Matrix4): Frustum;
         intersectsObject(object: Object3D): boolean;
         intersectsSphere(sphere: Sphere): boolean;
         intersectsBox(box: Box3): boolean;
         containsPoint(point: Vector3): boolean;
-        clone(): Frustum;
-
     }
 
     export class Line3 {
@@ -2785,6 +3019,7 @@ declare module THREE {
         end: Vector3;
 
         set(start?: Vector3, end?: Vector3): Line3;
+        clone(): Line3;
         copy(line: Line3): Line3;
         center(optionalTarget?: Vector3): Vector3;
         delta(optionalTarget?: Vector3): Vector3;
@@ -2795,7 +3030,6 @@ declare module THREE {
         closestPointToPoint(point: Vector3, clampToLine?: boolean, optionalTarget?: Vector3): Vector3;
         applyMatrix4(matrix: Matrix4): Line3;
         equals(line: Line3): boolean;
-        clone(): Line3;
     }
 
     interface Math {
@@ -2804,12 +3038,12 @@ declare module THREE {
         /**
          * Clamps the x to be between a and b.
          *
-         * @param x Value to be clamped.
-         * @param a Minimum value
-         * @param b Maximum value.
+         * @param value Value to be clamped.
+         * @param min Minimum value
+         * @param max Maximum value.
          */
-        clamp(x: number, a: number, b: number): number;
-
+        clamp(value: number, min: number, max: number): number;
+        euclideanModulo( n: number, m: number ): number;
 
         /**
          * Linear mapping of x from range [a1, a2] to range [b1, b2].
@@ -2853,6 +3087,8 @@ declare module THREE {
 
         isPowerOfTwo(value: number): boolean;
 
+        nearestPowerOfTwo(value: number): number;
+
         nextPowerOfTwo(value: number): number;
     }
 
@@ -2925,8 +3161,10 @@ declare module THREE {
 
         set(n11: number, n12: number, n13: number, n21: number, n22: number, n23: number, n31: number, n32: number, n33: number): Matrix3;
         identity(): Matrix3;
+        clone(): Matrix3;
         copy(m: Matrix3): Matrix3;
         applyToVector3Array(array: number[], offset?: number, length?: number): number[];
+        applyToBuffer( buffer: BufferAttribute, offset?: number, length?: number): BufferAttribute;
         multiplyScalar(s: number): Matrix3;
         determinant(): number;
         getInverse(matrix: Matrix3, throwOnInvertible?: boolean): Matrix3;
@@ -2945,7 +3183,7 @@ declare module THREE {
         transposeIntoArray(r: number[]): number[];
         fromArray(array: number[]): Matrix3;
         toArray(): number[];
-        clone(): Matrix3;
+
     }
 
     /**
@@ -2986,13 +3224,9 @@ declare module THREE {
          * Resets this matrix to identity.
          */
         identity(): Matrix4;
-
-        /**
-         * Copies a matrix m into this matrix.
-         */
+        clone(): Matrix4;
         copy(m: Matrix4): Matrix4;
         copyPosition(m: Matrix4): Matrix4;
-
         extractBasis( xAxis: Vector3, yAxis: Vector3, zAxis: Vector3): Matrix4;
         makeBasis( xAxis: Vector3, yAxis: Vector3, zAxis: Vector3): Matrix4;
 
@@ -3028,7 +3262,7 @@ declare module THREE {
          */
         multiplyScalar(s: number): Matrix4;
         applyToVector3Array(array: number[], offset?: number, length?: number): number[];
-
+        applyToBuffer( buffer: BufferAttribute, offset?: number, length?: number): BufferAttribute;
         /**
          * Computes determinant of this matrix.
          * Based on http://www.euclideanspace.com/maths/algebra/matrix/functions/inverse/fourD/index.htm
@@ -3127,12 +3361,9 @@ declare module THREE {
          * Creates an orthographic projection matrix.
          */
         makeOrthographic(left: number, right: number, top: number, bottom: number, near: number, far: number): Matrix4;
+        equals( matrix: Matrix4 ): boolean;
         fromArray(array: number[]): Matrix4;
         toArray(): number[];
-        /**
-         * Clones this matrix.
-         */
-        clone(): Matrix4;
     }
 
     export class Plane {
@@ -3145,6 +3376,7 @@ declare module THREE {
         setComponents(x: number, y: number, z: number, w: number): Plane;
         setFromNormalAndCoplanarPoint(normal: Vector3, point: Vector3): Plane;
         setFromCoplanarPoints(a: Vector3, b: Vector3, c: Vector3): Plane;
+        clone(): Plane;
         copy(plane: Plane): Plane;
         normalize(): Plane;
         negate(): Plane;
@@ -3158,7 +3390,6 @@ declare module THREE {
         applyMatrix4(matrix: Matrix4, optionalNormalMatrix?: Matrix3): Plane;
         translate(offset: Vector3): Plane;
         equals(plane: Plane): boolean;
-        clone(): Plane;
     }
 
     /**
@@ -3189,6 +3420,11 @@ declare module THREE {
          */
         set(x: number, y: number, z: number, w: number): Quaternion;
 
+        /**
+         * Clones this quaternion.
+         */
+        clone(): Quaternion;
+
         /**
          * Copies values of q to this quaternion.
          */
@@ -3255,11 +3491,6 @@ declare module THREE {
 
         onChange: () => void;
 
-        /**
-         * Clones this quaternion.
-         */
-        clone(): Quaternion;
-
         /**
          * Adapted from http://www.euclideanspace.com/maths/algebra/realNormedAlgebra/quaternions/slerp/.
          */
@@ -3273,6 +3504,7 @@ declare module THREE {
         direction: Vector3;
 
         set(origin: Vector3, direction: Vector3): Ray;
+        clone(): Ray;
         copy(ray: Ray): Ray;
         at(t: number, optionalTarget?: Vector3): Vector3;
         recast(t: number): Ray;
@@ -3290,7 +3522,6 @@ declare module THREE {
         intersectTriangle(a: Vector3, b: Vector3, c: Vector3, backfaceCulling: boolean, optionalTarget?: Vector3): Vector3;
         applyMatrix4(matrix4: Matrix4): Ray;
         equals(ray: Ray): boolean;
-        clone(): Ray;
     }
 
     export class Sphere {
@@ -3301,6 +3532,7 @@ declare module THREE {
 
         set(center: Vector3, radius: number): Sphere;
         setFromPoints(points: Vector3[], optionalCenter?: Vector3): Sphere;
+        clone(): Sphere;
         copy(sphere: Sphere): Sphere;
         empty(): boolean;
         containsPoint(point: Vector3): boolean;
@@ -3311,8 +3543,6 @@ declare module THREE {
         applyMatrix4(matrix: Matrix4): Sphere;
         translate(offset: Vector3): Sphere;
         equals(sphere: Sphere): boolean;
-
-        clone(): Sphere;
     }
 
     export interface SplineControlPoint {
@@ -3377,6 +3607,7 @@ declare module THREE {
 
         set(a: Vector3, b: Vector3, c: Vector3): Triangle;
         setFromPointsAndIndices(points: Vector3[], i0: number, i1: number, i2: number): Triangle;
+        clone(): Triangle;
         copy(triangle: Triangle): Triangle;
         area(): number;
         midpoint(optionalTarget?: Vector3): Vector3;
@@ -3385,7 +3616,6 @@ declare module THREE {
         barycoordFromPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
         containsPoint(point: Vector3): boolean;
         equals(triangle: Triangle): boolean;
-        clone(): Triangle;
 
         static normal(a: Vector3, b: Vector3, c: Vector3, optionalTarget?: Vector3): Vector3;
         static barycoordFromPoint(point: Vector3, a: Vector3, b: Vector3, c: Vector3, optionalTarget: Vector3): Vector3;
@@ -3515,6 +3745,9 @@ declare module THREE {
         x: number;
         y: number;
 
+        width: number;
+        height: number;
+
         /**
          * Sets value of this vector.
          */
@@ -3539,7 +3772,10 @@ declare module THREE {
          * Gets a component of this vector.
          */
         getComponent(index: number): number;
-
+        /**
+         * Clones this vector.
+         */
+        clone(): Vector2;
         /**
          * Copies value of v to this vector.
          */
@@ -3555,8 +3791,7 @@ declare module THREE {
          */
         addScalar(s: number): Vector2;
         addVectors(a: Vector2, b: Vector2): Vector2;
-        addScaledVector(v: Vector2, s: number): Vector2;
-
+        addScaledVector( v: Vector2, s: number ): Vector2;
         /**
          * Subtracts v from this vector.
          */
@@ -3571,7 +3806,7 @@ declare module THREE {
         /**
          * Multiplies this vector by scalar s.
          */
-        multiplyScalar(s: number): Vector2;
+        multiplyScalar(scalar: number): Vector2;
 
         divide(v: Vector2): Vector2;
         /**
@@ -3610,10 +3845,6 @@ declare module THREE {
          * Computes length of this vector.
          */
         length(): number;
-
-        /**
-         * Computes Manhattan length of this vector.
-         */
         lengthManhattan(): number;
 
         /**
@@ -3634,7 +3865,7 @@ declare module THREE {
         /**
          * Normalizes this vector and multiplies it by l.
          */
-        setLength(l: number): Vector2;
+        setLength(length: number): Vector2;
 
         lerp(v: Vector2, alpha: number): Vector2;
 
@@ -3651,12 +3882,7 @@ declare module THREE {
 
         fromAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector2;
 
-        rotateAround(center: Vector2, angle: number): Vector2;
-
-        /**
-         * Clones this vector.
-         */
-        clone(): Vector2;
+        rotateAround( center: Vector2, angle: number ): Vector2;
     }
 
     /**
@@ -3702,7 +3928,10 @@ declare module THREE {
 
         setComponent(index: number, value: number): void;
         getComponent(index: number): number;
-
+        /**
+         * Clones this vector.
+         */
+        clone(): Vector3;
         /**
          * Copies value of v to this vector.
          */
@@ -3719,6 +3948,7 @@ declare module THREE {
          * Sets this vector to a + b.
          */
         addVectors(a: Vector3, b: Vector3): Vector3;
+        addScaledVector( v: Vector3, s: number ): Vector3;
 
         /**
          * Subtracts v from this vector.
@@ -3841,11 +4071,6 @@ declare module THREE {
         toArray(xyz?: number[], offset?: number): number[];
 
         fromAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector3;
-
-        /**
-         * Clones this vector.
-         */
-        clone(): Vector3;
     }
 
     /**
@@ -3887,7 +4112,10 @@ declare module THREE {
 
         setComponent(index: number, value: number): void;
         getComponent(index: number): number;
-
+        /**
+         * Clones this vector.
+         */
+        clone(): Vector4;
         /**
          * Copies value of v to this vector.
          */
@@ -3903,8 +4131,7 @@ declare module THREE {
          * Sets this vector to a + b.
          */
         addVectors(a: Vector4, b: Vector4): Vector4;
-        addScaledVector(v: Vector4, s: number): Vector4;
-
+        addScaledVector( v: Vector4, s: number ): Vector4;
         /**
          * Subtracts v from this vector.
          */
@@ -3978,7 +4205,7 @@ declare module THREE {
         /**
          * Normalizes this vector and multiplies it by l.
          */
-        setLength(l: number): Vector4;
+        setLength(length: number): Vector4;
 
         /**
          * Linearly interpolate between this vector and v with alpha factor.
@@ -3997,11 +4224,6 @@ declare module THREE {
         toArray(xyzw?: number[], offset?: number): number[];
 
         fromAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector4;
-
-        /**
-         * Clones this vector.
-         */
-        clone(): Vector4;
     }
 
     // Objects //////////////////////////////////////////////////////////////////////////////////
@@ -4010,12 +4232,30 @@ declare module THREE {
         constructor(skin: SkinnedMesh);
 
         skin: SkinnedMesh;
+
+        clone(): Bone;
+        copy(source: Bone): Bone;
     }
 
     export class Group extends Object3D {
         constructor();
     }
 
+    export class LOD extends Object3D {
+        constructor();
+
+        levels: any[];
+
+        addLevel(object: Object3D, distance?: number): void;
+        getObjectForDistance(distance: number): Object3D;
+        raycast(raycaster: Raycaster, intersects: any): void;
+        update(camera: Camera): void;
+
+        clone(): LOD;
+        copy(source: LOD): LOD;
+        toJSON(meta: any): any;
+    }
+
     export interface LensFlareProperty {
         texture: Texture;             // Texture
         size: number;             // size in pixels (-1 = use texture.width)
@@ -4040,58 +4280,42 @@ declare module THREE {
         add(texture: Texture, size?: number, distance?: number, blending?: Blending, color?: Color): void;
         add(obj: Object3D): void;
 
-
         updateLensFlares(): void;
+
+        clone(): LensFlare;
+        copy(source: LensFlare): LensFlare;
     }
 
     export class Line extends Object3D {
-        constructor(geometry?: Geometry, material?: LineDashedMaterial, mode?: number);
-        constructor(geometry?: Geometry, material?: LineBasicMaterial, mode?: number);
-        constructor(geometry?: Geometry, material?: ShaderMaterial, mode?: number);
-        constructor(geometry?: BufferGeometry, material?: LineDashedMaterial, mode?: number);
-        constructor(geometry?: BufferGeometry, material?: LineBasicMaterial, mode?: number);
-        constructor(geometry?: BufferGeometry, material?: ShaderMaterial, mode?: number);
+        constructor(
+            geometry?: Geometry | BufferGeometry,
+            material?: LineDashedMaterial | LineBasicMaterial | ShaderMaterial,
+            mode?: number
+        );
 
         geometry: Geometry|BufferGeometry;
         material: Material; // LineDashedMaterial or LineBasicMaterial or ShaderMaterial
 
         raycast(raycaster: Raycaster, intersects: any): void;
-        clone(object?: Line): Line;
+        clone(): Line;
+        copy(source: Line): Line;
     }
 
     export class LineSegments extends Line {
-        constructor(geometry?: Geometry, material?: LineDashedMaterial);
-        constructor(geometry?: Geometry, material?: LineBasicMaterial);
-        constructor(geometry?: Geometry, material?: ShaderMaterial);
-        constructor(geometry?: BufferGeometry, material?: LineDashedMaterial);
-        constructor(geometry?: BufferGeometry, material?: LineBasicMaterial);
-        constructor(geometry?: BufferGeometry, material?: ShaderMaterial);
+        constructor(
+            geometry?: Geometry | BufferGeometry,
+            material?: LineDashedMaterial | LineBasicMaterial | ShaderMaterial,
+            mode?: number
+        );
 
-        geometry: Geometry|BufferGeometry;
-        material: Material; // LineDashedMaterial or LineBasicMaterial or ShaderMaterial
-
-        raycast(raycaster: Raycaster, intersects: any): void;
-        clone(object?: LineSegments): LineSegments;
+        clone(): LineSegments;
+        copy(source: LineSegments): LineSegments;
     }
 
     enum LineMode{}
     var LineStrip: LineMode;
     var LinePieces: LineMode;
 
-    export class LOD extends Object3D {
-        constructor();
-
-        levels: any[];
-        /** Deprecated, use levels instead */
-        objects: any[];
-
-        addLevel(object: Object3D, distance?: number): void;
-        getObjectForDistance(distance: number): Object3D;
-        raycast(raycaster: Raycaster, intersects: any): void;
-        update(camera: Camera): void;
-        clone(object?: LOD): LOD;
-    }
-
     export class Mesh extends Object3D {
         constructor(geometry?: Geometry, material?: Material);
         constructor(geometry?: BufferGeometry, material?: Material);
@@ -4102,39 +4326,8 @@ declare module THREE {
         updateMorphTargets(): void;
         getMorphTargetIndexByName(name: string): number;
         raycast(raycaster: Raycaster, intersects: any): void;
-        clone(object?: Mesh): Mesh;
-    }
-
-    export class MorphAnimMesh extends Mesh {
-        constructor(geometry?: Geometry, material?: MeshBasicMaterial);
-        constructor(geometry?: Geometry, material?: MeshDepthMaterial);
-        constructor(geometry?: Geometry, material?: MeshFaceMaterial);
-        constructor(geometry?: Geometry, material?: MeshLambertMaterial);
-        constructor(geometry?: Geometry, material?: MeshNormalMaterial);
-        constructor(geometry?: Geometry, material?: MeshPhongMaterial);
-        constructor(geometry?: Geometry, material?: ShaderMaterial);
-
-        duration: number; // milliseconds
-        mirroredLoop: boolean;
-        time: number;
-        lastKeyframe: number;
-        currentKeyframe: number;
-        direction: number;
-        directionBackwards: boolean;
-
-        startKeyframe: number;
-        endKeyframe: number;
-        length: number;
-
-        setFrameRange(start: number, end: number): void;
-        setDirectionForward(): void;
-        setDirectionBackward(): void;
-        parseAnimations(): void;
-        setAnimationLabel(label: string, start: number, end: number): void;
-        playAnimation(label: string, fps: number): void;
-        updateAnimation(delta: number): void;
-        interpolateTargets( a: number, b: number, t: number ): void;
-        clone(object?: MorphAnimMesh): MorphAnimMesh;
+        clone(): Mesh;
+        copy(source: Mesh): Mesh;
     }
 
     /**
@@ -4142,16 +4335,16 @@ declare module THREE {
      *
      * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/objects/ParticleSystem.js">src/objects/ParticleSystem.js</a>
      */
-    export class PointCloud extends Object3D {
+    export class Points extends Object3D {
 
         /**
          * @param geometry An instance of Geometry.
          * @param material An instance of Material (optional).
          */
-        constructor(geometry: Geometry, material?: PointCloudMaterial);
-        constructor(geometry: Geometry, material?: ShaderMaterial);
-        constructor(geometry: BufferGeometry, material?: PointCloudMaterial);
-        constructor(geometry: BufferGeometry, material?: ShaderMaterial);
+        constructor(
+            geometry: Geometry | BufferGeometry,
+            material?: PointsMaterial | ShaderMaterial
+        );
 
         /**
          * An instance of Geometry, where each vertex designates the position of a particle in the system.
@@ -4164,7 +4357,8 @@ declare module THREE {
         material: Material;
 
         raycast(raycaster: Raycaster, intersects: any): void;
-        clone(object?: PointCloud): PointCloud;
+        clone(): Points;
+        copy(source: Points): Points;
     }
 
     export class Skeleton {
@@ -4183,6 +4377,7 @@ declare module THREE {
         pose(): void;
         update(): void;
         clone(): Skeleton;
+
     }
 
     export class SkinnedMesh extends Mesh {
@@ -4202,7 +4397,8 @@ declare module THREE {
         pose(): void;
         normalizeSkinWeights(): void;
         updateMatrixWorld(force?: boolean): void;
-        clone(object?: SkinnedMesh): SkinnedMesh;
+        clone(): SkinnedMesh;
+        copy(source?: SkinnedMesh): SkinnedMesh;
 
         skeleton: Skeleton;
     }
@@ -4214,7 +4410,8 @@ declare module THREE {
         material: SpriteMaterial;
 
         raycast(raycaster: Raycaster, intersects: any): void;
-        clone(object?: Sprite): Sprite;
+        clone(): Sprite;
+        copy(source?: Sprite): Sprite;
     }
 
 
@@ -4391,7 +4588,7 @@ declare module THREE {
             };
         };
 
-        shadowMap: WebGLShadowMap;
+        shadowMap: WebGLShadowMapInstance;
 
         /**
          * Return the WebGL context.
@@ -4518,24 +4715,7 @@ declare module THREE {
         setRenderTarget(renderTarget: RenderTarget): void;
         readRenderTargetPixels( renderTarget: RenderTarget, x: number, y: number, width: number, height: number, buffer: any ): void;
     }
-    
-    export interface WebGLCapabilities {
-        getMaxPrecision(precision: string): string;
-        precision: string;
-        logarithmicDepthBuffer: boolean;
-        maxTextures: number;
-        maxVertexTextures: number;
-        maxTextureSize: number;
-        maxCubemapSize: number;
-        maxAttributes: number;
-        maxVertexUniforms: number;
-        maxVaryings: number;
-        maxFragmentUniforms: number;
-        vertexTextures: boolean;
-        floatFragmentTextures: boolean;
-        floatVertexTextures: boolean;
-    }
-  
+
     export interface RenderTarget {
     }
 
@@ -4554,6 +4734,7 @@ declare module THREE {
     export class WebGLRenderTarget implements RenderTarget {
         constructor(width: number, height: number, options?: WebGLRenderTargetOptions);
 
+        uuid: string;
         width: number;
         height: number;
         wrapS: Wrapping;
@@ -4572,6 +4753,7 @@ declare module THREE {
 
         setSize(width: number, height: number): void;
         clone(): WebGLRenderTarget;
+        copy(source: WebGLRenderTarget): WebGLRenderTarget;
         dispose(): void;
 
 
@@ -4593,27 +4775,33 @@ declare module THREE {
         [name: string]: string;
 
         common: string;
+
         alphamap_fragment: string;
         alphamap_pars_fragment: string;
         alphatest_fragment: string;
+        aomap_fragment: string;
+        aomap_pars_fragment: string;
+        begin_vertex: string;
+        beginnormal_vertex: string;
         bumpmap_pars_fragment: string;
         color_fragment: string;
         color_pars_fragment: string;
         color_pars_vertex: string;
         color_vertex: string;
-        default_vertex: string;
         defaultnormal_vertex: string;
+        displacementmap_pars_vertex: string;
+        displacementmap_vertex: string;
+        emissivemap_fragment: string;
+        emissivemap_pars_fragment: string;
         envmap_fragment: string;
         envmap_pars_fragment: string;
         envmap_pars_vertex: string;
         envmap_vertex: string;
         fog_fragment: string;
         fog_pars_fragment: string;
-
+        hemilight_fragment: string;
         lightmap_fragment: string;
         lightmap_pars_fragment: string;
-        lightmap_pars_vertex: string;
-        lightmap_vertex: string;
         lights_lambert_pars_vertex: string;
         lights_lambert_vertex: string;
         lights_phong_fragment: string;
@@ -4627,14 +4815,14 @@ declare module THREE {
         logdepthbuf_vertex: string;
         map_fragment: string;
         map_pars_fragment: string;
-        map_pars_vertex: string;
         map_particle_fragment: string;
         map_particle_pars_fragment: string;
-        map_vertex: string;
         morphnormal_vertex: string;
         morphtarget_pars_vertex: string;
         morphtarget_vertex: string;
+        normal_phong_fragment: string;
         normalmap_pars_fragment: string;
+        project_vertex: string;
         shadowmap_fragment: string;
         shadowmap_pars_fragment: string;
         shadowmap_pars_vertex: string;
@@ -4645,6 +4833,12 @@ declare module THREE {
         skinnormal_vertex: string;
         specularmap_fragment: string;
         specularmap_pars_fragment: string;
+        uv2_pars_fragment: string;
+        uv2_pars_vertex: string;
+        uv2_vertex: string;
+        uv_pars_fragment: string;
+        uv_pars_vertex: string;
+        uv_vertex: string;
         worldpos_vertex: string;
     }
 
@@ -4673,11 +4867,15 @@ declare module THREE {
 
     export var UniformsLib: {
         common: any;
-        bump: any;
+        aomap: any;
+        lightmap: any;
+        emissivemap: any;
+        bumpmap: any;
         normalmap: any;
+        displacementmap: any;
         fog: any;
         lights: any;
-        particle: any;
+        points: any;
         shadowmap: any;
     };
 
@@ -4687,13 +4885,73 @@ declare module THREE {
     };
 
     // Renderers / WebGL /////////////////////////////////////////////////////////////////////
-    export class WebGLExtensions {
-        constructor(gl: WebGLRenderingContext);
+    export class WebGLBufferRenderer{
+        constructor(_gl: any, extensions: any, _infoRender: any); // WebGLRenderingContext
+
+        setMode( value: any ): void;
+        render( start: any, count: any ): void;
+        renderInstances( geometry: any ): void;
+    }
+
+    export class WebGLCapabilities{
+        constructor(gl: any, extensions: any, parameters: any); // WebGLRenderingContext
+
+        getMaxPrecision: any;
+        precision: any;
+        maxTextures: any;
+        maxVertexTextures: any;
+        maxTextureSize: any;
+        maxCubemapSize: any;
+        maxAttributes: any;
+        maxVertexUniforms: any;
+        maxVaryings: any;
+        maxFragmentUniforms: any;
+        vertexTextures: any;
+        floatFragmentTextures: any;
+        floatVertexTextures: any;
+    }
+
+    export class WebGLExtensions{
+        constructor(gl: any); // WebGLRenderingContext
 
         get(name: string): any;
     }
 
-    export class WebGLProgram {
+    interface WebGLGeometriesInstance {
+        new (gl: any, properties: any, info: any): void;
+        get( object: any ): any;
+    }
+    interface WebGLGeometriesStatic{
+        (_gl: any, extensions: any, _infoRender: any): WebGLGeometriesInstance;
+    }
+    export var WebGLGeometries: WebGLGeometriesStatic;
+
+
+    interface WebGLIndexedBufferRendererInstance {
+        new (gl: any, properties: any, info: any): void;
+        setMode( value: any ): void;
+        setIndex( index: any ): void;
+        render( start: any, count: any ): void;
+        renderInstances( geometry: any ): void;
+    }
+    interface WebGLIndexedBufferRendererStatic{
+        (_gl: any, extensions: any, _infoRender: any): WebGLIndexedBufferRendererInstance;
+    }
+    export var WebGLIndexedBufferRenderer: WebGLIndexedBufferRendererStatic;
+
+
+    interface WebGLObjectsInstance {
+        new (gl: any, properties: any, info: any): void;
+        getAttributeBuffer( attribute: any ): any;
+        getWireframeAttribute(geometry: any): any;
+        update(object: any): void;
+    }
+    interface WebGLObjectsStatic{
+        (gl: any, properties: any, info: any): WebGLObjectsInstance;
+    }
+    export var WebGLObjects: WebGLObjectsStatic;
+
+    export class WebGLProgram{
         constructor(renderer: WebGLRenderer, code: string, material: ShaderMaterial, parameters: WebGLRendererParameters);
         
         getUniforms(): any;
@@ -4712,44 +4970,82 @@ declare module THREE {
         fragmentShader: WebGLShader;
     }
 
-    export class WebGLShader {
-        constructor(gl: WebGLRenderingContext, type: string, string: string);
+    interface WebGLProgramsInstance {
+        new (renderer: WebGLRenderer, capabilities: any): void;
+
+        getParameters( material: any, lights: any, fog: any, object: any ): any[];
+        getProgramCode( material: any, parameters: any ): any;
+        acquireProgram( material: any, parameters: any, code: any ): any;
+        releaseProgram( program: any ): void;
+    }
+    interface WebGLProgramsStatic{
+        (): WebGLProgramsInstance;
+    }
+    export var WebGLPrograms: WebGLProgramsStatic;
+
+    interface WebGLPropertiesInstance {
+        new (): void;
+
+        get(object: any): any;
+        delete(object: any): void;
+        clear(): void;
+    }
+    interface WebGLPropertiesStatic{
+        (): WebGLPropertiesInstance;
+    }
+    export var WebGLProperties: WebGLPropertiesStatic;
+
+    export class WebGLShader{
+        constructor(gl: any, type: string, string: string);
     }
 
-    interface WebGLStateInstance {
-        new(gl: WebGLRenderingContext, paramThreeToGL: Function): void;
+    interface WebGLShadowMapInstance{
+        new ( _renderer: Renderer, _lights: any[], _objects: any[] ): void;
+
+        enabled: boolean;
+        autoUpdate: boolean;
+        needsUpdate: boolean;
+        type: ShadowMapType;
+        cullFace: CullFace;
+
+        render( scene: Scene ): void;
+    }
+    interface WebGLShadowMapStatic{
+        ( _renderer: Renderer, _lights: any[], _objects: any[] ): WebGLStateInstance;
+    }
+    export var WebGLShadowMap: WebGLShadowMapStatic;
+
+    interface WebGLStateInstance{
+        new ( gl: any, extensions: any, paramThreeToGL: Function ): void;
+        init(): void;
         initAttributes(): void;
         enableAttribute(attribute: string): void;
+        enableAttributeAndDivisor( attribute: string, meshPerAttribute: any, extension: any ): void;
         disableUnusedAttributes(): void;
-        setBlending(blending: number, blendEquation: number, blendSrc: number, blendDst: number, blendEquationAlpha: number, blendSrcAlpha: number, blendDstAlpha: number): void;
-        setDepthTest(depthTest: number): void;
-        setDepthWrite(depthWrite: number): void;
-        setColorWrite(colorWrite: number): void;
-        setDoubleSided(doubleSided: number): void;
-        setFlipSided(flipSided: number): void;
-        setLineWidth(width: number): void;
+        enable( id: string ): void;
+        disable( id: string ): void;
+        getCompressedTextureFormats(): any;
+        setBlending( blending: number, blendEquation: number, blendSrc: number, blendDst: number, blendEquationAlpha: number, blendSrcAlpha: number, blendDstAlpha: number ): void;
+        setDepthFunc( func: Function): void;
+        setDepthTest( depthTest: number ): void;
+        setDepthWrite( depthWrite: number ): void;
+        setColorWrite( colorWrite: number ): void;
+        setFlipSided( flipSided: number ): void;
+        setLineWidth( width: number ): void;
         setPolygonOffset(polygonoffset: number, factor: number, units: number): void;
+        setScissorTest( scissorTest: boolean ): void;
+        activeTexture( webglSlot: any ): void;
+        bindTexture( webglType: any, webglTexture: any ): void;
+        compressedTexImage2D(): void;
+        texImage2D(): void;
         reset(): void;
     }
-    interface WebGLStateStatic {
-        (gl: WebGLRenderingContext, paramThreeToGL: Function): WebGLStateInstance;
+    interface WebGLStateStatic{
+        ( gl: any, extensions: any, paramThreeToGL: Function ): WebGLStateInstance;
     }
     export var WebGLState: WebGLStateStatic;
 
 
-    interface WebGLTexturesInstance{
-        new (webgglcontext: any): WebGLTexturesInstance;
-
-        get(texture: Texture): any; // it will return result of gl.createTexture().
-        create(texture: Texture): any; // it will return result of gl.createTexture().
-        delete(texture: Texture): void;
-    }
-    interface WebGLTexturesStatic{
-        (webgglcontext: any): WebGLTexturesInstance;
-    }
-    export var WebGLTextures: WebGLTexturesStatic;
-
-
     // Renderers / WebGL / Plugins /////////////////////////////////////////////////////////////////////
     export interface RendererPlugin {
         init(renderer: WebGLRenderer): void;
@@ -4763,18 +5059,6 @@ declare module THREE {
         render(scene: Scene, camera: Camera, viewportWidth: number, viewportHeight: number): void;
     }
 
-    export class WebGLShadowMap implements RendererPlugin {
-        constructor();
-
-        enabled: boolean;
-        type: ShadowMapType;
-        cullFace: CullFace;
-
-        init(renderer: Renderer): void;
-        render(scene: Scene, camera: Camera): void;
-        update(scene: Scene, camera: Camera): void;
-    }
-
     export class SpritePlugin implements RendererPlugin {
         constructor();
 
@@ -4853,13 +5137,13 @@ declare module THREE {
         overrideMaterial: Material;
         autoUpdate: boolean;
 
-        clone(): Scene;
+        copy(source: Scene): Scene;
     }
 
     // Textures /////////////////////////////////////////////////////////////////////
     export class CanvasTexture extends Texture {
         constructor(
-            canvas?: HTMLCanvasElement,
+            canvas: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement,
             mapping?: Mapping,
             wrapS?: Wrapping,
             wrapT?: Wrapping,
@@ -4869,6 +5153,8 @@ declare module THREE {
             type?: TextureDataType,
             anisotropy?: number
         );
+
+        needsUpdate: boolean;
     }
 
     export class CompressedTexture extends Texture {
@@ -4890,8 +5176,6 @@ declare module THREE {
         mipmaps: ImageData[];
         flipY: boolean;
         generateMipmaps: boolean;
-
-        clone(): CompressedTexture;
     }
 
     export class CubeTexture extends Texture {
@@ -4909,7 +5193,7 @@ declare module THREE {
 
         images: any[];
 
-        clone(texture?: CubeTexture): CubeTexture;
+        copy(source: CubeTexture): CubeTexture;
     }
 
     export class DataTexture extends Texture {
@@ -4928,8 +5212,10 @@ declare module THREE {
         );
 
         image: { data: ImageData; width: number; height: number; };
-
-        clone(): DataTexture;
+        magFilter: TextureFilter;
+        minFilter: TextureFilter;
+        flipY: boolean;
+        generateMipmaps: boolean;
     }
 
     export class Texture {
@@ -4965,15 +5251,17 @@ declare module THREE {
         premultiplyAlpha: boolean;
         flipY: boolean;
         unpackAlignment: number;
+        version: number;
         needsUpdate: boolean;
         onUpdate: () => void;
         static DEFAULT_IMAGE: any;
         static DEFAULT_MAPPING: any;
 
         clone(): Texture;
-        update(): void;
-        toJSON(): any;
+        copy(source: Texture): Texture;
+        toJSON(meta: any): any;
         dispose(): void;
+        transformUv( uv: Vector ): void;
 
         // EventDispatcher mixins
         addEventListener(type: string, listener: (event: any) => void ): void;
@@ -4999,50 +5287,27 @@ declare module THREE {
     }
 
     // Extras /////////////////////////////////////////////////////////////////////
-
-    export interface TypefaceData {
-        familyName: string;
-        cssFontWeight: string;
-        cssFontStyle: string;
+    export var CurveUtils: {
+        tangentQuadraticBezier(t: number, p0: number, p1: number, p2: number): number;
+        tangentCubicBezier(t: number, p0: number, p1: number, p2: number, p3: number): number;
+        tangentSpline(t: number, p0: number, p1: number, p2: number, p3: number): number;
+        interpolate(p0: number, p1: number, p2: number, p3: number, t: number): number;
     }
 
-    export var FontUtils: {
-        faces: { [weight: string]: { [style: string]: Face3; }; };
-        face: string;
-        weight: string;
-        style: string;
-        size: number;
-        divisions: number;
-
-        getFace(): Face3;
-        loadFace(data: TypefaceData): TypefaceData;
-        drawText(text: string): { paths: Path[]; offset: number; };
-        extractGlyphPoints(c: string, face: Face3, scale: number, offset: number, path: Path): { offset: number; path: Path; };
-
-        generateShapes(text: string, parameters?: { size?: number; curveSegments?: number; font?: string; weight?: string; style?: string; }): Shape[];
-        Triangulate: {
-            (contour: Vector2[], indices: boolean): Vector2[];
-            area(contour: Vector2[]): number;
-        };
-    };
-
-    export var GeometryUtils: {
-        // DEPRECATED
-        merge(geometry1: Geometry, object2: Mesh, materialIndexOffset?: number): void;
-
-        // DEPRECATED
-        merge(geometry1: Geometry, object2: Geometry, materialIndexOffset?: number): void;
-
-        // DEPRECATED
-        center(geometry: Geometry): Vector3;
-    };
-
+    // deprecated.
     export var ImageUtils: {
         crossOrigin: string;
 
+        // deprecated.
         loadTexture(url: string, mapping?: Mapping, onLoad?: (texture: Texture) => void, onError?: (message: string) => void): Texture;
+
+        // deprecated.
         loadTextureCube(array: string[], mapping?: Mapping, onLoad?: (texture: Texture) => void , onError?: (message: string) => void ): Texture;
+
+        // deprecated.
         getNormalMap(image: HTMLImageElement, depth?: number): HTMLCanvasElement;
+
+        // deprecated.
         generateDataTexture(width: number, height: number, color: Color): DataTexture;
     };
 
@@ -5052,100 +5317,15 @@ declare module THREE {
         attach(child: Object3D, scene: Scene, parent: Object3D): void;
     };
 
-    // Extras / Animation /////////////////////////////////////////////////////////////////////
-
-    export interface KeyFrame {
-        pos: number[];
-        rot: number[];
-        scl: number[];
-        time: number;
-    }
-
-    export interface KeyFrames {
-        keys: KeyFrame[];
-        parent: number;
-    }
-
-    export interface AnimationData {
-        JIT: number;
-        fps: number;
-        hierarchy: KeyFrames[];
-        length: number;
-        name: string;
-    }
-
-    export class Animation {
-        constructor(root: Mesh, data: AnimationData);
-
-        root: Mesh;
-        data: AnimationData;
-        hierarchy: Bone[];
-        currentTime: number;
-        timeScale: number;
-        isPlaying: boolean;
-        loop: boolean;
-        weight: number;
-        interpolationType: number;
-
-        play(startTime?: number, weight?: number): void;
-        stop(): void;
-        reset(): void;
-        resetBlendWeights(): void;
-        update(delta: number): void;
-        getNextKeyWith(type: string, h: number, key: number): KeyFrame;
-        getPrevKeyWith(type: string, h: number, key: number): KeyFrame;
-    }
-
-    export var AnimationHandler: {
-        LINEAR: number;
-        CATMULLROM: number;
-        CATMULLROM_FORWARD: number;
-
-        animations: any[];
-
-        init(data: AnimationData): AnimationData;
-        parse(root: Mesh): Object3D[];
-        play(animation: Animation): void;
-        stop(animation: Animation): void;
-        update(deltaTimeMS: number): void;
+    export var ShapeUtils: {
+        area( contour: number[] ): number;
+        triangulate( contour: number[], indices: boolean ): number[];
+        triangulateShape( contour: number[], holes: any[] ): number[];
+        isClockWise( pts: number[] ): boolean;
+        b2( t: number, p0: number, p1: number, p2: number ): number;
+        b3( t: number, p0: number, p1: number, p2: number, p3: number ): number;
     };
 
-    export class KeyFrameAnimation {
-        constructor(data: any);
-
-        root: Mesh;
-        data: AnimationData;
-        hierarchy: KeyFrames[];
-        currentTime: number;
-        timeScale: number;
-        isPlaying: boolean;
-        isPaused: boolean;
-        loop: boolean;
-
-        play(startTime?: number): void;
-        stop(): void;
-        update(delta: number): void;
-        getNextKeyWith(type: string, h: number, key: number): KeyFrame;
-        getPrevKeyWith(type: string, h: number, key: number): KeyFrame;
-    }
-
-    export class MorphAnimation {
-        constructor(mesh: Mesh);
-
-        mesh: Mesh;
-        frames: number;
-        currentTime: number;
-        duration: number;
-        loop: boolean;
-        lastFrame: number;
-        currentFrame: number;
-        isPlaying: boolean;
-
-        play(): void;
-        pause(): void;
-        update(delta: number): void;
-    }
-
     // Extras / Audio /////////////////////////////////////////////////////////////////////
 
     export class Audio extends Object3D {
@@ -5157,16 +5337,28 @@ declare module THREE {
         panner: PannerNode;
         autoplay: boolean;
         startTime: number;
+        playbackRate: number;
         isPlaying: boolean;
 
         load(file: string): Audio;
         play(): void;
         pause(): void;
         stop(): void;
+        connect(): void;
+        disconnect(): void;
+        setFilter(value: any): void;
+        getFilter(): any;
+        setPlaybackRate(value: number): void;
+        getPlaybackRate(): number;
+
         setLoop(value: boolean): void;
+        getLoop(): boolean;
         setRefDistance(value: number): void;
+        getRefDistance(): number;
         setRolloffFactor(value: number): void;
+        getRolloffFactor(): number;
         setVolume(value: number): void;
+        getVolume(): number;
         updateMatrixWorld(force?: boolean): void;
     }
 
@@ -5265,28 +5457,17 @@ declare module THREE {
         constructor();
 
         curves: Curve<T>[];
-        bends: Path[];
         autoClose: boolean;
 
         add(curve: Curve<T>): void;
         checkConnection(): boolean;
         closePath(): void;
+        getPoint(t: number): T;
         getLength(): number;
         getCurveLengths(): number[];
-        getBoundingBox(): BoundingBox;
         createPointsGeometry(divisions: number): Geometry;
         createSpacedPointsGeometry(divisions: number): Geometry;
         createGeometry(points: T[]): Geometry;
-        addWrapPath(bendpath: Path): void;
-        getTransformedPoints(segments: number, bends?: Path[]): T[];
-        getTransformedSpacedPoints(segments: number, bends?: Path[]): T[];
-        getWrapPoints(oldPts: T[], path: Path): T[];
-    }
-
-    export class Gyroscope extends Object3D {
-        constructor();
-
-        updateMatrixWorld(force?: boolean): void;
     }
 
     export enum PathActions {
@@ -5338,28 +5519,21 @@ declare module THREE {
         extrude(options?: any): ExtrudeGeometry;
         makeGeometry(options?: any): ShapeGeometry;
         getPointsHoles(divisions: number): Vector2[][];
-        getSpacedPointsHoles(divisions: number): Vector2[][];
         extractAllPoints(divisions: number): {
             shape: Vector2[];
             holes: Vector2[][];
         };
         extractPoints(divisions: number): Vector2[];
-        extractAllSpacedPoints(divisions: Vector2): {
-            shape: Vector2[];
-            holes: Vector2[][];
-        };
 
     }
 
     // Extras / Curves /////////////////////////////////////////////////////////////////////
     export class ArcCurve extends EllipseCurve {
-        constructor(aX: number, aY: number, aRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean, aRotation: number);
+        constructor(aX: number, aY: number, aRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean );
     }
 
     export class CatmullRomCurve3 extends Curve<Vector3> {
-        constructor(points?: Vector3[]);
-
-        points: Vector3[];
+        constructor();
     }
 
     export class ClosedSplineCurve3 extends Curve<Vector3> {
@@ -5457,9 +5631,11 @@ declare module THREE {
             heightSegments: number;
             depthSegments: number;
         };
+
+        clone(): BoxGeometry;
     }
 
-    export class CircleBufferGeometry extends BufferGeometry {
+    export class CircleBufferGeometry extends Geometry {
         constructor(radius?: number, segments?: number, thetaStart?: number, thetaLength?: number);
 
         parameters: {
@@ -5468,6 +5644,8 @@ declare module THREE {
             thetaStart: number;
             thetaLength: number;
         };
+
+        clone(): CircleBufferGeometry;
     }
 
     export class CircleGeometry extends Geometry {
@@ -5479,6 +5657,8 @@ declare module THREE {
             thetaStart: number;
             thetaLength: number;
         };
+
+        clone(): CircleGeometry;
     }
 
     // deprecated
@@ -5506,6 +5686,8 @@ declare module THREE {
             thetaStart: number;
             thetaLength: number;
         };
+
+        clone(): CylinderGeometry;
     }
 
     export class DodecahedronGeometry extends Geometry {
@@ -5515,10 +5697,14 @@ declare module THREE {
             radius: number;
             detail: number;
         };
+
+        clone(): DodecahedronGeometry;
     }
 
     export class EdgesGeometry extends BufferGeometry {
-        constructor(geometry: Geometry|BufferGeometry, thresholdAngle?: number);
+        constructor(geometry: BufferGeometry, thresholdAngle: number);
+
+        clone(): EdgesGeometry;
     }
 
     export class ExtrudeGeometry extends Geometry {
@@ -5536,6 +5722,8 @@ declare module THREE {
 
     export class IcosahedronGeometry extends PolyhedronGeometry {
         constructor(radius: number, detail: number);
+
+        clone(): IcosahedronGeometry;
     }
 
     export class LatheGeometry extends Geometry {
@@ -5551,6 +5739,8 @@ declare module THREE {
 
     export class OctahedronGeometry extends PolyhedronGeometry {
         constructor(radius: number, detail: number);
+
+        clone(): OctahedronGeometry;
     }
 
     export class ParametricGeometry extends Geometry {
@@ -5572,6 +5762,8 @@ declare module THREE {
             widthSegments: number;
             heightSegments: number;
         };
+
+        clone(): PlaneBufferGeometry;
     }
 
     export class PlaneGeometry extends Geometry {
@@ -5583,6 +5775,8 @@ declare module THREE {
             widthSegments: number;
             heightSegments: number;
         };
+
+        clone(): PlaneGeometry;
     }
 
     export class PolyhedronGeometry extends Geometry {
@@ -5594,6 +5788,8 @@ declare module THREE {
             radius: number;
             detail: number;
         };
+
+        clone(): PolyhedronGeometry;
     }
 
     export class RingGeometry extends Geometry {
@@ -5607,6 +5803,8 @@ declare module THREE {
             thetaStart: number;
             thetaLength: number;
         };
+
+        clone(): RingGeometry;
     }
 
     export class ShapeGeometry extends Geometry {
@@ -5618,21 +5816,21 @@ declare module THREE {
         addShape(shape: Shape, options?: any): void;
     }
 
-    interface SphereParameters {
-        radius: number;
-        widthSegments: number;
-        heightSegments: number;
-        phiStart: number;
-        phiLength: number;
-        thetaStart: number;
-        thetaLength: number;
-    }
 
     export class SphereBufferGeometry extends BufferGeometry {
         constructor(radius: number, widthSegments?: number, heightSegments?: number, phiStart?: number, phiLength?: number, thetaStart?: number, thetaLength?: number);
 
-        parameters: SphereParameters;
+        parameters: {
+            radius: number;
+            widthSegments: number;
+            heightSegments: number;
+            phiStart: number;
+            phiLength: number;
+            thetaStart: number;
+            thetaLength: number;
+        };
 
+        clone(): SphereBufferGeometry;
     }
 
     /**
@@ -5652,27 +5850,21 @@ declare module THREE {
          */
         constructor(radius: number, widthSegments?: number, heightSegments?: number, phiStart?: number, phiLength?: number, thetaStart?: number, thetaLength?: number);
 
-        parameters: SphereParameters;
+        parameters: {
+            radius: number;
+            widthSegments: number;
+            heightSegments: number;
+            phiStart: number;
+            phiLength: number;
+            thetaStart: number;
+            thetaLength: number;
+        };
     }
 
     export class TetrahedronGeometry extends PolyhedronGeometry {
         constructor(radius?: number, detail?: number);
-    }
 
-    export interface TextGeometryParameters {
-        size?: number; // size of the text
-        height?: number; // thickness to extrude text
-        curveSegments?: number; // number of points on the curves
-        font?: string; // font name
-        weight?: string; // font weight (normal, bold)
-        style?: string; // font style  (normal, italics)
-        bevelEnabled?: boolean;   // turn on bevel
-        bevelThickness?: number; // how deep into text bevel goes
-        bevelSize?: number; // how far from text outline is bevel
-    }
-
-    export class TextGeometry extends ExtrudeGeometry {
-        constructor(text: string, TextGeometryParameters?: TextGeometryParameters);
+        clone(): TetrahedronGeometry;
     }
 
     export class TorusGeometry extends Geometry {
@@ -5685,6 +5877,8 @@ declare module THREE {
             tubularSegments: number;
             arc: number;
         };
+
+        clone(): TorusGeometry;
     }
 
     export class TorusKnotGeometry extends Geometry {
@@ -5699,6 +5893,8 @@ declare module THREE {
             q: number;
             heightScale: number;
         };
+
+        clone(): TorusKnotGeometry;
     }
 
 
@@ -5719,10 +5915,13 @@ declare module THREE {
 
         static NoTaper(u?: number): number;
         static SinusoidalTaper(u: number): number;
+        static FrenetFrames(path: Path, segments: number, closed: boolean): void;
+
+        clone(): TubeGeometry;
     }
 
-    export class WireframeGeometry extends BufferGeometry {
-        constructor(geometry: Geometry|BufferGeometry);
+    export class WireframeGeometry extends BufferGeometry{
+        constructor(geometry: Geometry | BufferGeometry);
     }
 
     // Extras / Helpers /////////////////////////////////////////////////////////////////////
@@ -5738,7 +5937,7 @@ declare module THREE {
         setColor(hex: number): void;
     }
 
-    export class AxisHelper extends Line {
+    export class AxisHelper extends LineSegments {
         constructor(size?: number);
     }
 
@@ -5751,13 +5950,13 @@ declare module THREE {
         update(): void;
     }
 
-    export class BoxHelper extends Line {
+    export class BoxHelper extends LineSegments {
         constructor(object?: Object3D);
 
         update(object?: Object3D): void;
     }
 
-    export class CameraHelper extends Line {
+    export class CameraHelper extends LineSegments {
         constructor(camera: Camera);
 
         camera: Camera;
@@ -5777,22 +5976,21 @@ declare module THREE {
         update(): void;
     }
 
-    export class EdgesHelper extends Line {
+    export class EdgesHelper extends LineSegments {
         constructor(object: Object3D, hex?: number, thresholdAngle?: number);
 
     }
 
-    export class FaceNormalsHelper extends Line {
+    export class FaceNormalsHelper extends LineSegments {
         constructor(object: Object3D, size?: number, hex?: number, linewidth?: number);
 
         object: Object3D;
         size: number;
-        normalMatrix: Matrix3;
 
         update(object?: Object3D): void;
     }
 
-    export class GridHelper extends Line {
+    export class GridHelper extends LineSegments {
         constructor(size: number, step: number);
 
         color1: Color;
@@ -5820,7 +6018,7 @@ declare module THREE {
         update(): void;
     }
 
-    export class SkeletonHelper extends Line {
+    export class SkeletonHelper extends LineSegments {
         constructor(bone: Object3D);
 
         bones: Bone[];
@@ -5840,17 +6038,7 @@ declare module THREE {
         update(): void;
     }
 
-    export class VertexNormalsHelper extends Line {
-        constructor(object: Object3D, size?: number, hex?: number, linewidth?: number);
-
-        object: Object3D;
-        size: number;
-        normalMatrix: Matrix3;
-
-        update(object?: Object3D): void;
-    }
-
-    export class VertexTangentsHelper extends Line {
+    export class VertexNormalsHelper extends LineSegments {
         constructor(object: Object3D, size?: number, hex?: number, linewidth?: number);
 
         object: Object3D;
@@ -5859,7 +6047,7 @@ declare module THREE {
         update(object?: Object3D): void;
     }
 
-    export class WireframeHelper extends Line {
+    export class WireframeHelper extends LineSegments {
         constructor(object: Object3D, hex?: number);
 
     }
@@ -5870,13 +6058,12 @@ declare module THREE {
         constructor(material: Material);
 
         material: Material;
-
-        render(renderCallback: Function): void;
+        render(renderCallback:Function): void;
     }
 
     export interface MorphBlendMeshAnimation {
-        startFrame: number;
-        endFrame: number;
+        start: number;
+        end: number;
         length: number;
         fps: number;
         duration: number;
diff --git a/typeahead/typeahead-tests.ts b/typeahead/typeahead-tests.ts
index 2bcb016c0..ec2b2e2f3 100644
--- a/typeahead/typeahead-tests.ts
+++ b/typeahead/typeahead-tests.ts
@@ -6,14 +6,10 @@
 //
 
 var substringMatcher = function (strs: any) {
-    return function findMatches(q: any, cb: any) {
-        var matches: any, substrRegex: any;
-
-        // an array that will be populated with substring matches
-        matches = [];
-
+    return function findMatches(q: string, syncResults: (x: Array<any>) => void) {
+        var matches: Array<{ value: string }> = [];
         // regex used to determine if a string contains the substring `q`
-        substrRegex = new RegExp(q, 'i');
+        var substrRegex = new RegExp(q, 'i');
 
         // iterate through the pool of strings and for any string that
         // contains the substring `q`, add it to the `matches` array
@@ -25,7 +21,7 @@ var substringMatcher = function (strs: any) {
             }
         });
 
-        cb(matches);
+        syncResults(matches);
     }
 }
 
@@ -46,14 +42,14 @@ function test_method_names() {
     $('#the-basics .typeahead').typeahead('open');
     $('#the-basics .typeahead').typeahead('close');
     $('#the-basics .typeahead').typeahead('val');
-    $('#the-basics .typeahead').typeahead('val', 'test value');    
+    $('#the-basics .typeahead').typeahead('val', 'test value');
 }
 
 
 function test_options() {
 
     var dataSets: Twitter.Typeahead.Dataset[] = [];
-    
+
     function with_empty_options() {
         $('#the-basics .typeahead').typeahead({}, dataSets);
     }
@@ -72,10 +68,10 @@ function test_options() {
 
     function with_all_options() {
         $('#the-basics .typeahead').typeahead({
-                hint: true,
-                highlight: true,
-                minLength: 1
-            },
+            hint: true,
+            highlight: true,
+            minLength: 1
+        },
             dataSets
         );
     }
@@ -101,41 +97,41 @@ function test_datasets_array() {
 
     function with_displayKey_option() {
         $('#the-basics .typeahead').typeahead(options, [{
-                displayKey: 'value',
-                source: substringMatcher(states)
-            }]
+            display: 'value',
+            source: substringMatcher(states)
+        }]
         );
     }
 
     function with_templates_option() {
         $('#the-basics .typeahead').typeahead(options, [{
-                templates: {},
-                source: substringMatcher(states)
-            }]
+            templates: {},
+            source: substringMatcher(states)
+        }]
         );
     }
 
     function with_all_options() {
         $('#the-basics .typeahead').typeahead(options, [{
-                name: 'states',
-                displayKey: 'value',
-                templates: {},
-                source: substringMatcher(states)
-            }]
+            name: 'states',
+            display: 'value',
+            templates: {},
+            source: substringMatcher(states)
+        }]
         );
     }
 
     function with_multiple_datasets() {
         $('#the-basics .typeahead').typeahead(options, [
-             {
+            {
                 name: 'states',
-                displayKey: 'value',
+                display: 'value',
                 templates: {},
                 source: substringMatcher(states)
             },
             {
                 name: 'states alternative',
-                displayKey: 'value',
+                display: 'value',
                 templates: {},
                 source: substringMatcher(states)
             }
@@ -165,7 +161,7 @@ function test_datasets_objects() {
     function with_displayKey_option() {
         $('#the-basics .typeahead').typeahead(options,
             {
-                displayKey: 'value',
+                display: 'value',
                 source: substringMatcher(states)
             }
         );
@@ -184,7 +180,7 @@ function test_datasets_objects() {
         $('#the-basics .typeahead').typeahead(options,
             {
                 name: 'states',
-                displayKey: 'value',
+                display: x => x.value,
                 templates: {},
                 source: substringMatcher(states)
             }
@@ -192,16 +188,16 @@ function test_datasets_objects() {
     }
 
     function with_multiple_objects() {
-        $('#the-basics .typeahead').typeahead(options, 
+        $('#the-basics .typeahead').typeahead(options,
             {
                 name: 'states',
-                displayKey: 'value',
+                display: 'value',
                 templates: {},
                 source: substringMatcher(states)
             },
             {
                 name: 'states alternative',
-                displayKey: 'value',
+                display: 'value',
                 templates: {},
                 source: substringMatcher(states)
             }
@@ -231,7 +227,7 @@ function test_dataset_templates() {
         $('#the-basics .typeahead').typeahead(options, {
             source: substringMatcher(states),
             templates: {
-                empty: function(context: any) {
+                empty: function (context: any) {
                     return context.name;
                 }
             }
@@ -249,7 +245,7 @@ function test_dataset_templates() {
         $('#the-basics .typeahead').typeahead(options, {
             source: substringMatcher(states),
             templates: {
-                footer: function(context: any) {
+                footer: function (context: any) {
                     return context.name;
                 }
             }
@@ -267,7 +263,7 @@ function test_dataset_templates() {
         $('#the-basics .typeahead').typeahead(options, {
             source: substringMatcher(states),
             templates: {
-                header: function(context: any) {
+                header: function (context: any) {
                     return context.name;
                 }
             }
@@ -277,8 +273,8 @@ function test_dataset_templates() {
     function with_suggestion_option() {
         $('#the-basics .typeahead').typeahead(options, {
             source: substringMatcher(states),
-            templates: {               
-                suggestion: function(context) {
+            templates: {
+                suggestion: function (context) {
                     return context.name;
                 }
             }
@@ -289,13 +285,13 @@ function test_dataset_templates() {
         $('#the-basics .typeahead').typeahead(options, {
             source: substringMatcher(states),
             templates: {
-                empty: 'no results',        
+                empty: 'no results',
                 footer: 'custom footer',
                 header: 'custom header',
-                suggestion: function(context) {
+                suggestion: function (context) {
                     return context.name;
                 }
-            }
+            },
         });
     }
 }
diff --git a/typeahead/typeahead.d.ts b/typeahead/typeahead.d.ts
index 49538fbd9..e01e0d509 100644
--- a/typeahead/typeahead.d.ts
+++ b/typeahead/typeahead.d.ts
@@ -87,7 +87,67 @@ interface JQuery {
       * @param options ('hint' or 'highlight' or 'minLength' all of which are optional)
       * @param datasets One or more datasets passed in as arguments.
       */
-    typeahead(options: Twitter.Typeahead.Options, ... datasets: Twitter.Typeahead.Dataset[]): JQuery;
+    typeahead(options: Twitter.Typeahead.Options, ...datasets: Twitter.Typeahead.Dataset[]): JQuery;
+
+    on(events: "typeahead:active", selector: string, data: any, handler: (ev: JQueryEventObject) => any): JQuery;
+    on(events: "typeahead:active", selector: string, handler: (ev: JQueryEventObject) => any): JQuery;
+    on(events: "typeahead:active", handler: (ev: JQueryEventObject) => any): JQuery;
+    off(events: "typeahead:active", handler: (ev: JQueryEventObject) => any): JQuery;
+
+    on(events: "typeahead:idle", selector: string, data: any, handler: (ev: JQueryEventObject) => any): JQuery;
+    on(events: "typeahead:idle", selector: string, handler: (ev: JQueryEventObject) => any): JQuery;
+    on(events: "typeahead:idle", handler: (ev: JQueryEventObject) => any): JQuery;
+    off(events: "typeahead:idle", handler: (ev: JQueryEventObject) => any): JQuery;
+
+    on(events: "typeahead:open", selector: string, data: any, handler: (ev: JQueryEventObject) => any): JQuery;
+    on(events: "typeahead:open", selector: string, handler: (ev: JQueryEventObject) => any): JQuery;
+    on(events: "typeahead:open", handler: (ev: JQueryEventObject) => any): JQuery;
+    off(events: "typeahead:open", handler: (ev: JQueryEventObject) => any): JQuery;
+
+    on(events: "typeahead:close", selector: string, data: any, handler: (ev: JQueryEventObject) => any): JQuery;
+    on(events: "typeahead:close", selector: string, handler: (ev: JQueryEventObject) => any): JQuery;
+    on(events: "typeahead:close", handler: (ev: JQueryEventObject) => any): JQuery;
+    off(events: "typeahead:close", handler: (ev: JQueryEventObject) => any): JQuery;
+
+    on(events: "typeahead:change", selector: string, data: any, handler: (ev: JQueryEventObject) => any): JQuery;
+    on(events: "typeahead:change", selector: string, handler: (ev: JQueryEventObject) => any): JQuery;
+    on(events: "typeahead:change", handler: (ev: JQueryEventObject) => any): JQuery;
+    off(events: "typeahead:change", handler: (ev: JQueryEventObject) => any): JQuery;
+
+    on(events: "typeahead:render", selector: string, data: any, handler: (ev: JQueryEventObject, suggestions: Array<any>, async: boolean, datasetName: string) => any): JQuery;
+    on(events: "typeahead:render", selector: string, handler: (ev: JQueryEventObject, suggestions: Array<any>, async: boolean, datasetName: string) => any): JQuery;
+    on(events: "typeahead:render", handler: (ev: JQueryEventObject, suggestions: Array<any>, async: boolean, datasetName: string) => any): JQuery;
+    off(events: "typeahead:render", handler: (ev: JQueryEventObject, suggestions: Array<any>, async: boolean, datasetName: string) => any): JQuery;
+
+    on(events: "typeahead:select", selector: string, data: any, handler: (ev: JQueryEventObject, suggestion: any) => any): JQuery;
+    on(events: "typeahead:select", selector: string, handler: (ev: JQueryEventObject, suggestion: any) => any): JQuery;
+    on(events: "typeahead:select", handler: (ev: JQueryEventObject, suggestion: any) => any): JQuery;
+    off(events: "typeahead:select", handler: (ev: JQueryEventObject, suggestion: any) => any): JQuery;
+
+    on(events: "typeahead:autocomplete", selector: string, data: any, handler: (ev: JQueryEventObject, suggestion: any) => any): JQuery;
+    on(events: "typeahead:autocomplete", selector: string, handler: (ev: JQueryEventObject, suggestion: any) => any): JQuery;
+    on(events: "typeahead:autocomplete", handler: (ev: JQueryEventObject, suggestion: any) => any): JQuery;
+    off(events: "typeahead:autocomplete", handler: (ev: JQueryEventObject, suggestion: any) => any): JQuery;
+
+    on(events: "typeahead:cursorchange", selector: string, data: any, handler: (ev: JQueryEventObject, suggestion: any) => any): JQuery;
+    on(events: "typeahead:cursorchange", selector: string, handler: (ev: JQueryEventObject, suggestion: any) => any): JQuery;
+    on(events: "typeahead:cursorchange", handler: (ev: JQueryEventObject, suggestion: any) => any): JQuery;
+    off(events: "typeahead:cursorchange", handler: (ev: JQueryEventObject, suggestion: any) => any): JQuery;
+
+    on(events: "typeahead:asyncrequest", selector: string, data: any, handler: (ev: JQueryEventObject, query: string, datasetName: string) => any): JQuery;
+    on(events: "typeahead:asyncrequest", selector: string, handler: (ev: JQueryEventObject, query: string, datasetName: string) => any): JQuery;
+    on(events: "typeahead:asyncrequest", handler: (ev: JQueryEventObject, query: string, datasetName: string) => any): JQuery;
+    off(events: "typeahead:asyncrequest", handler: (ev: JQueryEventObject, query: string, datasetName: string) => any): JQuery;
+
+    on(events: "typeahead:asynccancel", selector: string, data: any, handler: (ev: JQueryEventObject, query: string, datasetName: string) => any): JQuery;
+    on(events: "typeahead:asynccancel", selector: string, handler: (ev: JQueryEventObject, query: string, datasetName: string) => any): JQuery;
+    on(events: "typeahead:asynccancel", handler: (ev: JQueryEventObject, query: string, datasetName: string) => any): JQuery;
+    off(events: "typeahead:asynccancel", handler: (ev: JQueryEventObject, query: string, datasetName: string) => any): JQuery;
+
+    on(events: "typeahead:asyncreceive", selector: string, data: any, handler: (ev: JQueryEventObject, query: string, datasetName: string) => any): JQuery;
+    on(events: "typeahead:asyncreceive", selector: string, handler: (ev: JQueryEventObject, query: string, datasetName: string) => any): JQuery;
+    on(events: "typeahead:asyncreceive", handler: (ev: JQueryEventObject, query: string, datasetName: string) => any): JQuery;
+    off(events: "typeahead:asyncreceive", handler: (ev: JQueryEventObject, query: string, datasetName: string) => any): JQuery;
 }
 
 declare module Twitter.Typeahead {
@@ -105,7 +165,7 @@ declare module Twitter.Typeahead {
          * cb can be invoked synchronously or asynchronously.
          *
           */
-        source: (query: string, cb: (result: any) => void) => void;
+        source: ((query: string, syncResults: (result: Array<any>) => void, asyncResults?: (result: Array<any>) => void) => void);
 
         /**
           * The name of the dataset.
@@ -120,18 +180,18 @@ declare module Twitter.Typeahead {
          * This will be used when setting the value of the input control after a suggestion is selected. Can be either a key string or a function that transforms a suggestion object into a string.
          * Defaults to value.
          */
-        displayKey?: string | ((obj: any) => string);
+        display?: string | ((obj: any) => string);
 
         /**
          * A hash of templates to be used when rendering the dataset.
          * Note a precompiled template is a function that takes a JavaScript object as its first argument and returns a HTML string.
           */
         templates?: Templates;
+        async?: boolean;
     }
 
 
     interface Templates {
-
         /**
          * Rendered when 0 suggestions are available for the given query.
          * Can be either a HTML string or a precompiled template.
@@ -178,267 +238,261 @@ declare module Twitter.Typeahead {
     }
 
 
-     /**
-      * When initializing a typeahead, there are a number of options you can configure.
-      */
+    /**
+     * When initializing a typeahead, there are a number of options you can configure.
+     */
     interface Options {
-      /**
-        * highlight:  If true, when suggestions are rendered,
-        * pattern matches for the current query in text nodes will be wrapped in a strong element.
-        * Defaults to false.
-        */
-      highlight?: boolean;
+        /**
+          * highlight:  If true, when suggestions are rendered,
+          * pattern matches for the current query in text nodes will be wrapped in a strong element.
+          * Defaults to false.
+          */
+        highlight?: boolean;
 
-      /**
-        * If false, the typeahead will not show a hint. Defaults to true.
-        */
-      hint?: boolean;
+        /**
+          * If false, the typeahead will not show a hint. Defaults to true.
+          */
+        hint?: boolean;
 
-      /**
-        * The minimum character length needed before suggestions start getting rendered. Defaults to 1.
-        */
-      minLength?: number;
+        /**
+          * The minimum character length needed before suggestions start getting rendered. Defaults to 1.
+          */
+        minLength?: number;
     }
 }
 
-declare module Bloodhound
-{
-  interface BloodhoundOptions<T>
-  {
-    /**
-    * Transforms a datum into an array of string tokens
-    *
-    * @constructor
-    * @param datum individual units that compose the dataset
-    */
-    datumTokenizer?: any;
-    /**
-    * Transforms a query into an array of string tokens
-    *
-    * @constructor
-    * @param query tokenizer query
-    */
-    queryTokenizer?: any;
-    /**
-    *  The max number of suggestions to return from Bloodhound#get.
-    * If not reached, the data source will attempt to backfill the suggestions from remote. Defaults to 5
-    */
-    limit?: number;
-    /**
-    *  If set, this is expected to be a function with the signature (remoteMatch, localMatch) that returns true if the datums are duplicates or false otherwise.
-    *  If not set, duplicate detection will not be performed.
-    */
-    dupDetector?: (remoteMatch: T, localMatch: T) => boolean;
-    /**
-    * A compare function used to sort matched datums for a given query.
-    */
-    sorter?: (a: T, b: T) => number;
-    /**
-    *An array of datums or a function that returns an array of datums.
-    */
-    local?: () => T[];
-    /**
-    * Can be a URL to a JSON file containing an array of datums or, if more configurability is needed, a prefetch options hash.
-    */
-    prefetch?: PrefetchOptions<T>;
-    /**
-    *  Can be a URL to fetch suggestions from when the data provided by local and prefetch is insufficient or, if more configurability is needed, a remote options hash.
-    */
-    remote?: RemoteOptions<T>;
-  }
-
-  /**
-  * Prefetched data is fetched and processed on initialization.
-  * If the browser supports localStorage, the processed data will be cached
-  * there to prevent additional network requests on subsequent page loads.
-  */
-  interface PrefetchOptions<T>
-  {
-    /**
-    * A URL to a JSON file containing an array of datums. Required.
-    */
-    url: string;
-    /**
-    * The time (in milliseconds) the prefetched data should be cached
-    * in localStorage. Defaults to 86400000 (1 day).
-    */
-    ttl?: number;
-    /**
-    * A function that transforms the response body into an array of datums.
-    *
-    * @param parsedResponse Response body
-    */
-    filter?: (parsedResponse: any) => T[];
-    /** The key that data will be stored in local storage under. Defaults to value of url.
-    *
-    */
-    cacheKey?: string;
-    /**
-    * A string used for thumbprinting prefetched data. If this doesn't match what's stored in local storage, the data will be refetched.
-    */
-    thumbprint?: string;
-    /**
-    * The ajax settings object passed to jQuery.ajax.
-    */
-    ajax?: JQueryAjaxSettings;
-  }
-
-  /**
-  * Remote data is only used when the data provided by local and prefetch
-  * is insufficient. In order to prevent an obscene number of requests
-  * being made to remote endpoint, typeahead.js rate-limits remote requests.
-  */
-  interface RemoteOptions<T>
-  {
-    /**
-    * A URL to make requests to when the data provided by local and
-    * prefetch is insufficient. Required.
-    */
-    url: string;
-    /**
-    * The pattern in url that will be replaced with the user's query
-    * when a request is made. Defaults to %QUERY.
-    */
-    wildcard?: string;
-    /**
-    * Overrides the request URL. If set, no wildcard substitution will
-    * be performed on url.
-    *
-    * @param url Replacement URL
-    * @param uriEncodedQuery Encoded query
-    * @returns A valid URL
-    */
-    replace?: (url: string, uriEncodedQuery: string) => string;
-    /**
-    * The function used for rate-limiting network requests.
-    * Can be either 'debounce' or 'throttle'. Defaults to 'debounce'.
-    */
-    rateLimitby?: string;
-    /**
-    * The time interval in milliseconds that will be used by rateLimitFn.
-    * Defaults to 300.
-    */
-    rateLimitWait?: number;
+declare module Bloodhound {
+    interface BloodhoundOptions<T> {
+        /**
+        * Transforms a datum into an array of string tokens
+        *
+        * @constructor
+        * @param datum individual units that compose the dataset
+        */
+        datumTokenizer?: any;
+        /**
+        * Transforms a query into an array of string tokens
+        *
+        * @constructor
+        * @param query tokenizer query
+        */
+        queryTokenizer?: any;
+        /**
+        * The max number of suggestions to return from Bloodhound#get.
+        * If not reached, the data source will attempt to backfill the suggestions from remote. Defaults to 5
+        */
+        limit?: number;
+        /**
+        * If set, this is expected to be a function with the signature (remoteMatch, localMatch) that returns true if the datums are duplicates or false otherwise.
+        * If not set, duplicate detection will not be performed.
+        */
+        dupDetector?: (remoteMatch: T, localMatch: T) => boolean;
+        /**
+        * A compare function used to sort matched datums for a given query.
+        */
+        sorter?: (a: T, b: T) => number;
+        /**
+        * An array of datums or a function that returns an array of datums.
+        */
+        local?: () => T[];
+        /**
+        * Can be a URL to a JSON file containing an array of datums or, if more configurability is needed, a prefetch options hash.
+        */
+        prefetch?: PrefetchOptions<T>;
+        /**
+        *  Can be a URL to fetch suggestions from when the data provided by local and prefetch is insufficient or, if more configurability is needed, a remote options hash.
+        */
+        remote?: RemoteOptions<T>;
+    }
 
     /**
-    * Transforms the response body into an array of datums.
-    *
-    * @param parsedResponse Response body
+    * Prefetched data is fetched and processed on initialization.
+    * If the browser supports localStorage, the processed data will be cached
+    * there to prevent additional network requests on subsequent page loads.
     */
-    filter?: (parsedResponse: any) => T[];
+    interface PrefetchOptions<T> {
+        /**
+        * A URL to a JSON file containing an array of datums. Required.
+        */
+        url: string;
+        /**
+        * The time (in milliseconds) the prefetched data should be cached
+        * in localStorage. Defaults to 86400000 (1 day).
+        */
+        ttl?: number;
+        /**
+        * A function that transforms the response body into an array of datums.
+        *
+        * @param parsedResponse Response body
+        */
+        filter?: (parsedResponse: any) => T[];
+        /** The key that data will be stored in local storage under. Defaults to value of url.
+        *
+        */
+        cacheKey?: string;
+        /**
+        * A string used for thumbprinting prefetched data. If this doesn't match what's stored in local storage, the data will be refetched.
+        */
+        thumbprint?: string;
+        /**
+        * The ajax settings object passed to jQuery.ajax.
+        */
+        ajax?: JQueryAjaxSettings;
+    }
+
     /**
-    * The ajax settings object passed to jQuery.ajax.
+    * Remote data is only used when the data provided by local and prefetch
+    * is insufficient. In order to prevent an obscene number of requests
+    * being made to remote endpoint, typeahead.js rate-limits remote requests.
     */
-    ajax?: JQueryAjaxSettings;
+    interface RemoteOptions<T> {
+        /**
+        * A URL to make requests to when the data provided by local and
+        * prefetch is insufficient. Required.
+        */
+        url: string;
+        /**
+        * The pattern in url that will be replaced with the user's query
+        * when a request is made. Defaults to %QUERY.
+        */
+        wildcard?: string;
+        /**
+        * Overrides the request URL. If set, no wildcard substitution will
+        * be performed on url.
+        *
+        * @param url Replacement URL
+        * @param uriEncodedQuery Encoded query
+        * @returns A valid URL
+        */
+        replace?: (url: string, uriEncodedQuery: string) => string;
+        /**
+        * The function used for rate-limiting network requests.
+        * Can be either 'debounce' or 'throttle'. Defaults to 'debounce'.
+        */
+        rateLimitby?: string;
+        /**
+        * The time interval in milliseconds that will be used by rateLimitFn.
+        * Defaults to 300.
+        */
+        rateLimitWait?: number;
+
+        /**
+        * Transforms the response body into an array of datums.
+        *
+        * @param parsedResponse Response body
+        */
+        filter?: (parsedResponse: any) => T[];
+        /**
+        * The ajax settings object passed to jQuery.ajax.
+        */
+        ajax?: JQueryAjaxSettings;
     
-    /**
-     * A function that provides a hook to allow you to prepare the settings object passed to transport
-     * when a request is about to be made. The function signature should be prepare(query, settings),
-     * where query is the query #search was called with and settings is the default settings object 
-     * created internally by the Bloodhound instance. The prepare function should return a settings object.
-     * [Note: Added in 0.11.1]
-     * 
-     * @param query The query #search was called with.
-     * @param settings The default settings object created internally by Bloodhound.
-     * @returns A JqueryAjaxSettings object.
-     */
-    prepare?: (query: string, settings: JQueryAjaxSettings) => JQueryAjaxSettings;
-  }
+        /**
+         * A function that provides a hook to allow you to prepare the settings object passed to transport
+         * when a request is about to be made. The function signature should be prepare(query, settings),
+         * where query is the query #search was called with and settings is the default settings object 
+         * created internally by the Bloodhound instance. The prepare function should return a settings object.
+         * [Note: Added in 0.11.1]
+         * 
+         * @param query The query #search was called with.
+         * @param settings The default settings object created internally by Bloodhound.
+         * @returns A JqueryAjaxSettings object.
+         */
+        prepare?: (query: string, settings: JQueryAjaxSettings) => JQueryAjaxSettings;
+    }
 
-  /**
-  * The most common tokenization methods.
-  */
-  interface Tokenizers
-  {
     /**
-    * Split a given string on whitespace characters.
+    * The most common tokenization methods.
     */
-    whitespace(query: string): string[];
-    /**
-    * Split a given string on non-word characters.
-    */
-    nonword(query: string): string[];
+    interface Tokenizers {
+        /**
+        * Split a given string on whitespace characters.
+        */
+        whitespace(query: string): string[];
+        /**
+        * Split a given string on non-word characters.
+        */
+        nonword(query: string): string[];
 
-   /**
-   * Instances of the most common tokenization methods.
-   */
-    obj: ObjTokenizer;
-  }
+        /**
+        * Instances of the most common tokenization methods.
+        */
+        obj: ObjTokenizer;
+    }
 
-  interface ObjTokenizer
-  {
-    /**
-    * Split a given string on whitespace characters.
-    */
-    whitespace(query: string): string[];
-    /**
-    * Split a given string on non-word characters.
-    */
-    nonword(query: string): string[];
-  }
+    interface ObjTokenizer {
+        /**
+        * Split a given string on whitespace characters.
+        */
+        whitespace(query: string): string[];
+        /**
+        * Split a given string on non-word characters.
+        */
+        nonword(query: string): string[];
+    }
 }
 
 declare class Bloodhound<T> {
-  constructor(options: Bloodhound.BloodhoundOptions<T>);
-  /**
-  * wraps the suggestion engine in an adapter that is compatible with the typeahead jQuery plugin
-  */
-  public ttAdapter(): any;
-  /**
-  * Kicks off the initialization of the suggestion engine. This includes processing the data provided through local and fetching/processing the data provided through prefetch.
-  * Until initialized, all other methods will behave as no-ops.
-  * Returns a jQuery promise which is resolved when engine has been initialized.
-  *
-  * After the initial call of initialize, how subsequent invocations of the method behave depends on the reinitialize argument.
-  * If reinitialize is falsy, the method will not execute the initialization logic and will just return the same jQuery promise returned by the initial invocation.
-  * If reinitialize is truthy, the method will behave as if it were being called for the first time.
-  *
-  * var promise1 = engine.initialize();
-  * var promise2 = engine.initialize();
-  * var promise3 = engine.initialize(true);
-  *
-  * promise1 === promise2;
-  * promise3 !== promise1 && promise3 !== promise2;
-  */
-  public initialize(reinitialize?: boolean): JQueryPromise<any>;
-  /**
-  * Takes one argument, datums, which is expected to be an array of datums.
-  * The passed in datums will get added to the search index that powers the suggestion engine.
-  */
-  public add(datums: T[]): void;
-  /**
-  * Removes all suggestions from the search index.
-  */
-  public clear(): void;
-  /**
-  * If you're using prefetch, data gets cached in local storage in an effort to cut down on unnecessary network requests.
-  * clearPrefetchCache offers a way to programmatically clear said cache.
-  */
-  public clearPrefetchCache(): void;
-  /**
-  * If you're using remote, Bloodhound will cache the 10 most recent responses in an effort to provide a better user experience.
-  * clearRemoteCache offers a way to programmatically clear said cache.
-  */
-  public clearRemoteCache(): void;
-  /**
-  * Returns a reference to the Bloodhound constructor and reverts window.Bloodhound to its previous value. Can be used to avoid naming collisions.
-  */
-  public noConflict(): any;
+    constructor(options: Bloodhound.BloodhoundOptions<T>);
+    /**
+    * wraps the suggestion engine in an adapter that is compatible with the typeahead jQuery plugin
+    */
+    public ttAdapter(): any;
+    /**
+    * Kicks off the initialization of the suggestion engine. This includes processing the data provided through local and fetching/processing the data provided through prefetch.
+    * Until initialized, all other methods will behave as no-ops.
+    * Returns a jQuery promise which is resolved when engine has been initialized.
+    *
+    * After the initial call of initialize, how subsequent invocations of the method behave depends on the reinitialize argument.
+    * If reinitialize is falsy, the method will not execute the initialization logic and will just return the same jQuery promise returned by the initial invocation.
+    * If reinitialize is truthy, the method will behave as if it were being called for the first time.
+    *
+    * var promise1 = engine.initialize();
+    * var promise2 = engine.initialize();
+    * var promise3 = engine.initialize(true);
+    *
+    * promise1 === promise2;
+    * promise3 !== promise1 && promise3 !== promise2;
+    */
+    public initialize(reinitialize?: boolean): JQueryPromise<any>;
+    /**
+    * Takes one argument, datums, which is expected to be an array of datums.
+    * The passed in datums will get added to the search index that powers the suggestion engine.
+    */
+    public add(datums: T[]): void;
+    /**
+    * Removes all suggestions from the search index.
+    */
+    public clear(): void;
+    /**
+    * If you're using prefetch, data gets cached in local storage in an effort to cut down on unnecessary network requests.
+    * clearPrefetchCache offers a way to programmatically clear said cache.
+    */
+    public clearPrefetchCache(): void;
+    /**
+    * If you're using remote, Bloodhound will cache the 10 most recent responses in an effort to provide a better user experience.
+    * clearRemoteCache offers a way to programmatically clear said cache.
+    */
+    public clearRemoteCache(): void;
+    /**
+    * Returns a reference to the Bloodhound constructor and reverts window.Bloodhound to its previous value. Can be used to avoid naming collisions.
+    */
+    public noConflict(): any;
 
-  /**
-  * Computes a set of suggestions for query. cb will be invoked with an array of datums that represent said set.
-  * cb will always be invoked once synchronously with suggestions that were available on the client.
-  * If those suggestions are insufficient (# of suggestions is less than limit) and remote was configured, cb may also be invoked asynchronously with the suggestions available on the client mixed with suggestions from the remote source.
-  */
-  public get(query: string, cb: (datums: T[]) => void): void;
+    /**
+    * Computes a set of suggestions for query. cb will be invoked with an array of datums that represent said set.
+    * cb will always be invoked once synchronously with suggestions that were available on the client.
+    * If those suggestions are insufficient (# of suggestions is less than limit) and remote was configured, cb may also be invoked asynchronously with the suggestions available on the client mixed with suggestions from the remote source.
+    */
+    public get(query: string, cb: (datums: T[]) => void): void;
 
-  /**
-  * The Bloodhound suggestion engine is token-based, so how datums and queries are tokenized plays a vital role in the quality of search results.
-  * Specify how you want datums and queries tokenized.
-  */
-  public static tokenizers: Bloodhound.Tokenizers;
+    /**
+    * The Bloodhound suggestion engine is token-based, so how datums and queries are tokenized plays a vital role in the quality of search results.
+    * Specify how you want datums and queries tokenized.
+    */
+    public static tokenizers: Bloodhound.Tokenizers;
 }
 
 declare module "bloodhound" {
-  export = Bloodhound;
+    export = Bloodhound;
 }
diff --git a/ui-grid/ui-grid-tests.ts b/ui-grid/ui-grid-tests.ts
index fe88fec4f..e89f180b9 100644
--- a/ui-grid/ui-grid-tests.ts
+++ b/ui-grid/ui-grid-tests.ts
@@ -130,3 +130,14 @@ anotherGridInstance.scrollTo(rowEntityToScrollTo, columnDefToScrollTo);
 
 var selectedRowEntities: Array<IMyEntity> = gridApi.selection.getSelectedRows();
 var selectedGridRows: Array<uiGrid.IGridRow> = gridApi.selection.getSelectedGridRows();
+
+gridApi.expandable.on.rowExpandedStateChanged(null, (row) => {
+    if (row.isExpanded) {
+        console.log('expanded', row.entity);
+    } else {
+        gridApi.expandable.toggleRowExpansion(row.entity);
+    }
+});
+gridApi.expandable.expandAllRows();
+gridApi.expandable.collapseAllRows();
+gridApi.expandable.toggleAllRows();
diff --git a/ui-grid/ui-grid.d.ts b/ui-grid/ui-grid.d.ts
index cba3c69ac..e6dd7468d 100644
--- a/ui-grid/ui-grid.d.ts
+++ b/ui-grid/ui-grid.d.ts
@@ -1558,6 +1558,18 @@ declare module uiGrid {
              */
             (row: IGridRowOf<TEntity>): void;
         }
+        
+        /**
+         * GridRow settings for expandable
+         */
+        export interface IGridRow {
+            /**
+             * If set to true, the row is expanded and the expanded view is visible
+             * Defaults to false
+             * @default false
+             */
+            isExpanded?: boolean;
+        }
     }
 
     export module exporter {
@@ -3418,7 +3430,7 @@ declare module uiGrid {
     }
     export type IGridRow = IGridRowOf<any>;
     export interface IGridRowOf<TEntity> extends cellNav.IGridRow, edit.IGridRow, exporter.IGridRow, 
-        selection.IGridRow {
+        selection.IGridRow, expandable.IGridRow {
         /** A reference to an item in gridOptions.data[] */
         entity: TEntity;
         /** A reference back to the grid */
@@ -3527,6 +3539,8 @@ declare module uiGrid {
         filter?: IFilterOptions;
         /** Filters for this column. Includes 'term' property bound to filter input elements */
         filters?: Array<IFilterOptions>;
+        /** Reference to grid containing the column */
+        grid: IGridInstanceOf<TEntity>;
         name?: string;
         /** Sort on this column */
         sort?: ISortInfo;
@@ -3843,7 +3857,7 @@ declare module uiGrid {
          * defaults to uiGridConstants.filter.INPUT, which gives a text box. If set to uiGridConstants.filter.SELECT
          * then a select box will be shown with options selectOptions
          */
-        type?: number;
+        type?: number | string;
         /**
          * options in the format [{ value: 1, label: 'male' }]. No i18n filter is provided, you need to perform the i18n
          * on the values before you provide them
@@ -3856,7 +3870,7 @@ declare module uiGrid {
         disableCancelButton?: boolean;
     }
     export interface ISelectOption {
-        value: number;
+        value: number | string;
         label: string;
     }
 
diff --git a/umzug/umzug-tests.ts b/umzug/umzug-tests.ts
new file mode 100644
index 000000000..95d7521fd
--- /dev/null
+++ b/umzug/umzug-tests.ts
@@ -0,0 +1,134 @@
+/// <reference path="./umzug.d.ts" />
+/// <reference path="../sequelize/sequelize.d.ts" />
+/// <reference path="../node/node.d.ts" />
+
+import Umzug = require("umzug");
+import Sequelize = require("sequelize");
+
+
+var umzug = new Umzug({});
+
+umzug.up().then(function (result) {
+  // do something with the result
+});
+
+umzug.execute({
+  migrations: ['some-id', 'some-other-id'],
+  method: 'up'
+}).then(function (migrations) {
+  // "migrations" will be an Array of all executed/reverted migrations.
+});
+
+umzug.pending().then(function (migrations) {
+  // "migrations" will be an Array with the names of
+  // pending migrations.
+});
+
+umzug.executed().then(function (migrations) {
+  // "migrations" will be an Array of already executed migrations.
+});
+
+umzug.up().then(function (migrations) {
+  // "migrations" will be an Array with the names of the
+  // executed migrations.
+});
+
+umzug.up({ to: '20141101203500-task' }).then(function (migrations) {});
+
+umzug.up({ migrations: ['20141101203500-task', '20141101203501-task-2'] });
+
+umzug.up('20141101203500-task'); // Runs just the passed migration
+umzug.up(['20141101203500-task', '20141101203501-task-2']);
+
+umzug.down().then(function (migration) {
+  // "migration" will the name of the reverted migration.
+});
+
+umzug.down({ to: '20141031080000-task' }).then(function (migrations) {
+  // "migrations" will be an Array with the names of all reverted migrations.
+});
+
+umzug.down({ migrations: ['20141101203500-task', '20141101203501-task-2'] });
+
+umzug.down('20141101203500-task'); // Runs just the passed migration
+umzug.down(['20141101203500-task', '20141101203501-task-2']);
+
+var AnotherUmzug = new Umzug({
+  // The storage.
+  // Possible values: 'json', 'sequelize', an object
+  storage: 'json',
+
+  // The options for the storage.
+  // Check the available storages for further details.
+  storageOptions: {},
+
+  // The logging function.
+  // A function that gets executed everytime migrations start and have ended.
+  logging: false,
+
+  // The name of the positive method in migrations.
+  upName: 'up',
+
+  // The name of the negative method in migrations.
+  downName: 'down',
+
+  migrations: {
+    // The params that gets passed to the migrations.
+    // Might be an array or a synchronous function which returns an array.
+    params: [],
+
+    // The path to the migrations directory.
+    path: 'migrations',
+
+    // The pattern that determines whether or not a file is a migration.
+    pattern: /^\d+[\w-]+\.js$/,
+
+    // A function that receives and returns the to be executed function.
+    // This can be used to modify the function.
+    wrap: function (fun : Function) { return fun; }
+  }
+});
+
+var AnotherUmzug = new Umzug({
+  // The storage.
+  // Possible values: 'json', 'sequelize', an object
+  storage: 'json',
+  storageOptions: {
+      path: process.cwd() + '/db/sequelize-meta.json'
+  }
+});
+
+var sequelize = new Sequelize('');
+
+var AnotherUmzug = new Umzug({
+  // The storage.
+  // Possible values: 'json', 'sequelize', an object
+  storage: 'sequelize',
+  storageOptions: {
+    // The configured instance of Sequelize.
+    // Optional if `model` is passed.
+    sequelize: sequelize,
+
+    // The to be used Sequelize model.
+    // Must have column name matching `columnName` option
+    // Optional of `sequelize` is passed.
+    model: sequelize.define<any, any>( 'model', {} ),
+
+    // The name of the to be used model.
+    // Defaults to 'SequelizeMeta'
+    modelName: 'Schema',
+
+    // The name of table to create if `model` option is not supplied
+    // Defaults to `modelName`
+    tableName: 'Schema',
+
+    // The name of table column holding migration name.
+    // Defaults to 'name'.
+    columnName: 'migration',
+
+    // The type of the column holding migration name.
+    // Defaults to `Sequelize.STRING`
+    columnType: Sequelize.STRING(100)
+  }
+
+});
diff --git a/umzug/umzug.d.ts b/umzug/umzug.d.ts
new file mode 100644
index 000000000..2e2b20a7c
--- /dev/null
+++ b/umzug/umzug.d.ts
@@ -0,0 +1,188 @@
+// Type definitions for Umzug v1.7.0
+// Project: https://github.com/sequelize/umzug
+// Definitions by: Ivan Drinchev <https://github.com/drinchev/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../bluebird/bluebird.d.ts" />
+/// <reference path="../sequelize/sequelize.d.ts" />
+
+declare module "umzug" {
+
+      import Sequelize = require("sequelize");
+
+      interface MigrationOptions {
+
+            /*
+             * The params that gets passed to the migrations.
+             * Might be an array or a synchronous function which returns an array.
+             */
+            params?: Array<any>;
+
+            /** The path to the migrations directory. */
+            path?: string;
+
+            /** The pattern that determines whether or not a file is a migration. */
+            pattern?: RegExp;
+
+            /**
+             * A function that receives and returns the to be executed function.
+             * This can be used to modify the function.
+             */
+            wrap?: <T>( fn : T ) => T;
+
+      }
+
+      interface JSONStorageOptions {
+
+            /**
+             * The path to the json storage.
+             * Defaults to process.cwd() + '/umzug.json';
+             */
+            path?: string;
+
+      }
+
+      interface SequelizeStorageOptions {
+
+          /**
+           * The configured instance of Sequelize.
+           * Optional if `model` is passed.
+           */
+          sequelize?: Sequelize.Sequelize;
+
+          /**
+           * The to be used Sequelize model.
+           * Must have column name matching `columnName` option
+           * Optional of `sequelize` is passed.
+           */
+          model?: Sequelize.Model<any, any>;
+
+          /**
+           * The name of the to be used model.
+           * Defaults to 'SequelizeMeta'
+           */
+          modelName?: string;
+
+          /**
+           * The name of table to create if `model` option is not supplied
+           * Defaults to `modelName`
+           */
+          tableName?: string;
+
+          /**
+           * The name of table column holding migration name.
+           * Defaults to 'name'.
+           */
+          columnName: string;
+
+          /**
+           * The type of the column holding migration name.
+           * Defaults to `Sequelize.STRING`
+           */
+          columnType: Sequelize.DataTypeAbstract;
+
+      }
+
+      interface ExecuteOptions {
+            migrations?: Array<string>;
+            method?: string;
+      }
+
+      interface UmzugOptions {
+
+            /**
+             * The storage.
+             * Possible values: 'json', 'sequelize', an object
+             */
+            storage?: string;
+
+            /**
+             * The options for the storage.
+             */
+            storageOptions?: JSONStorageOptions | SequelizeStorageOptions | Object;
+
+            /**
+             * The logging function.
+             * A function that gets executed everytime migrations start and have ended.
+             */
+            logging? : boolean | Function;
+
+            /**
+             * The name of the positive method in migrations.
+             */
+            upName? : string;
+
+            /**
+             * The name of the negative method in migrations.
+             */
+            downName? : string;
+
+            /**
+             * Options for defined migration
+             */
+            migrations? : MigrationOptions;
+
+      }
+
+      interface UpDownToOptions {
+
+          /**
+           * It is also possible to pass the name of a migration in order to
+           * just run the migrations from the current state to the passed
+           * migration name.
+           */
+          to: string;
+
+      }
+
+      interface UpDownMigrationsOptions {
+
+          /**
+           * Running specific migrations while ignoring the right order, can be
+           * done like this:
+           */
+          migrations: Array<string>;
+
+      }
+
+      class Umzug {
+
+          constructor(options?: UmzugOptions);
+
+          /**
+           * The execute method is a general purpose function that runs for
+           * every specified migrations the respective function.
+           */
+          execute(options? : ExecuteOptions) : Promise<Array<string>>;
+
+          /**
+           * You can get a list of pending/not yet executed migrations like this:
+           */
+          pending() : Promise<Array<string>>;
+
+          /**
+           * You can get a list of already executed migrations like this:
+           */
+          executed() : Promise<Array<string>>;
+
+          /**
+           * The up method can be used to execute all pending migrations.
+           */
+          up(migration?: string) : Promise<string>;
+          up(migrations?: Array<string>) : Promise<Array<string>>;
+          up(options?: UpDownToOptions | UpDownMigrationsOptions ) : Promise<Array<string>>;
+
+          /**
+           * The down method can be used to revert the last executed migration.
+           */
+          down(migration?: string) : Promise<string>;
+          down(migrations?: Array<string>) : Promise<Array<string>>;
+          down(options?: UpDownToOptions | UpDownMigrationsOptions ) : Promise<Array<string>>;
+
+      }
+
+      var umzug : typeof Umzug;
+
+      export = umzug;
+
+}
diff --git a/underscore/underscore-tests.ts b/underscore/underscore-tests.ts
index 13410c23b..051e000d0 100644
--- a/underscore/underscore-tests.ts
+++ b/underscore/underscore-tests.ts
@@ -17,9 +17,135 @@ var list = [[0, 1], [2, 3], [4, 5]];
 //var flat = _.reduceRight(list, (a, b) => a.concat(b), []);	// https://typescript.codeplex.com/workitem/1960
 var flat = _.reduceRight<number[], number[]>(list, (a, b) => a.concat(b), []);
 
-var even = _.find([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
+module TestFind {
+	let array: {a: string}[] = [{a: 'a'}, {a: 'b'}];
+	let list: _.List<{a: string}> = {0: {a: 'a'}, 1: {a: 'b'}, length: 2};
+	let dict: _.Dictionary<{a: string}> = {a: {a: 'a'}, b: {a: 'b'}};
+	let context = {};
 
-var firstCapitalLetter = _.find({ a: 'a', b: 'B', c: 'C', d: 'd' }, l => l === l.toUpperCase());
+	{
+		let iterator = (value: {a: string}, index: number, list: _.List<{a: string}>) => value.a === 'b';
+		let result: {a: string};
+
+		result = _.find<{a: string}>(array, iterator);
+		result = _.find<{a: string}>(array, iterator, context);
+		result = _.find<{a: string}, {a: string}>(array, {a: 'b'});
+		result = _.find<{a: string}>(array, 'a');
+
+		result = _(array).find<{a: string}>(iterator);
+		result = _(array).find<{a: string}>(iterator, context);
+		result = _(array).find<{a: string}, {a: string}>({a: 'b'});
+		result = _(array).find<{a: string}>('a');
+
+		result = _(array).chain().find<{a: string}>(iterator).value();
+		result = _(array).chain().find<{a: string}>(iterator, context).value();
+		result = _(array).chain().find<{a: string}, {a: string}>({a: 'b'}).value();
+		result = _(array).chain().find<{a: string}>('a').value();
+
+		result = _.find<{a: string}>(list, iterator);
+		result = _.find<{a: string}>(list, iterator, context);
+		result = _.find<{a: string}, {a: string}>(list, {a: 'b'});
+		result = _.find<{a: string}>(list, 'a');
+
+		result = _(list).find<{a: string}>(iterator);
+		result = _(list).find<{a: string}>(iterator, context);
+		result = _(list).find<{a: string}, {a: string}>({a: 'b'});
+		result = _(list).find<{a: string}>('a');
+
+		result = _(list).chain().find<{a: string}>(iterator).value();
+		result = _(list).chain().find<{a: string}>(iterator, context).value();
+		result = _(list).chain().find<{a: string}, {a: string}>({a: 'b'}).value();
+		result = _(list).chain().find<{a: string}>('a').value();
+
+		result = _.detect<{a: string}>(array, iterator);
+		result = _.detect<{a: string}>(array, iterator, context);
+		result = _.detect<{a: string}, {a: string}>(array, {a: 'b'});
+		result = _.detect<{a: string}>(array, 'a');
+
+		result = _(array).detect<{a: string}>(iterator);
+		result = _(array).detect<{a: string}>(iterator, context);
+		result = _(array).detect<{a: string}, {a: string}>({a: 'b'});
+		result = _(array).detect<{a: string}>('a');
+
+		result = _(array).chain().detect<{a: string}>(iterator).value();
+		result = _(array).chain().detect<{a: string}>(iterator, context).value();
+		result = _(array).chain().detect<{a: string}, {a: string}>({a: 'b'}).value();
+		result = _(array).chain().detect<{a: string}>('a').value();
+
+		result = _.detect<{a: string}>(list, iterator);
+		result = _.detect<{a: string}>(list, iterator, context);
+		result = _.detect<{a: string}, {a: string}>(list, {a: 'b'});
+		result = _.detect<{a: string}>(list, 'a');
+
+		result = _(list).detect<{a: string}>(iterator);
+		result = _(list).detect<{a: string}>(iterator, context);
+		result = _(list).detect<{a: string}, {a: string}>({a: 'b'});
+		result = _(list).detect<{a: string}>('a');
+
+		result = _(list).chain().detect<{a: string}>(iterator).value();
+		result = _(list).chain().detect<{a: string}>(iterator, context).value();
+		result = _(list).chain().detect<{a: string}, {a: string}>({a: 'b'}).value();
+		result = _(list).chain().detect<{a: string}>('a').value();
+	}
+
+	{
+		let iterator = (element: {a: string}, key: string, list: _.Dictionary<{a: string}>) => element.a === 'b';
+		let result: {a: string};
+
+		result = _.find<{a: string}>(dict, iterator);
+		result = _.find<{a: string}>(dict, iterator, context);
+		result = _.find<{a: string}, {a: string}>(dict, {a: 'b'});
+		result = _.find<{a: string}>(dict, 'a');
+
+		result = _(dict).find<{a: string}>(iterator);
+		result = _(dict).find<{a: string}>(iterator, context);
+		result = _(dict).find<{a: string}, {a: string}>({a: 'b'});
+		result = _(dict).find<{a: string}>('a');
+
+		result = _(dict).chain().find<{a: string}>(iterator).value();
+		result = _(dict).chain().find<{a: string}>(iterator, context).value();
+		result = _(dict).chain().find<{a: string}, {a: string}>({a: 'b'}).value();
+		result = _(dict).chain().find<{a: string}>('a').value();
+
+		result = _.detect<{a: string}>(dict, iterator);
+		result = _.detect<{a: string}>(dict, iterator, context);
+		result = _.detect<{a: string}, {a: string}>(dict, {a: 'b'});
+		result = _.detect<{a: string}>(dict, 'a');
+
+		result = _(dict).detect<{a: string}>(iterator);
+		result = _(dict).detect<{a: string}>(iterator, context);
+		result = _(dict).detect<{a: string}, {a: string}>({a: 'b'});
+		result = _(dict).detect<{a: string}>('a');
+
+		result = _(dict).chain().detect<{a: string}>(iterator).value();
+		result = _(dict).chain().detect<{a: string}>(iterator, context).value();
+		result = _(dict).chain().detect<{a: string}, {a: string}>({a: 'b'}).value();
+		result = _(dict).chain().detect<{a: string}>('a').value();
+	}
+
+	{
+		let iterator = (value: string, index: number, list: _.List<string>) => value === 'b';
+		let result: string;
+
+		result = _.find<string>('abc', iterator);
+		result = _.find<string>('abc', iterator, context);
+
+		result = _('abc').find<string>(iterator);
+		result = _('abc').find<string>(iterator, context);
+
+		result = _('abc').chain().find<string>(iterator).value();
+		result = _('abc').chain().find<string>(iterator, context).value();
+
+		result = _.detect<string>('abc', iterator);
+		result = _.detect<string>('abc', iterator, context);
+
+		result = _('abc').detect<string>(iterator);
+		result = _('abc').detect<string>(iterator, context);
+
+		result = _('abc').chain().detect<string>(iterator).value();
+		result = _('abc').chain().detect<string>(iterator, context).value();
+	}
+}
 
 var evens = _.filter([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
 
diff --git a/underscore/underscore.d.ts b/underscore/underscore.d.ts
index 7dea66a84..8cf98071b 100644
--- a/underscore/underscore.d.ts
+++ b/underscore/underscore.d.ts
@@ -254,6 +254,20 @@ interface UnderscoreStatic {
 		iterator: _.ObjectIterator<T, boolean>,
 		context?: any): T;
 
+	/**
+	* @see _.find
+	**/
+	find<T, U extends {}>(
+		object: _.List<T>|_.Dictionary<T>,
+		iterator: U): T;
+
+	/**
+	* @see _.find
+	**/
+	find<T>(
+		object: _.List<T>|_.Dictionary<T>,
+		iterator: string): T;
+
 	/**
 	* @see _.find
 	**/
@@ -270,6 +284,20 @@ interface UnderscoreStatic {
 		iterator: _.ObjectIterator<T, boolean>,
         context?: any): T;
 
+	/**
+	* @see _.find
+	**/
+	detect<T, U extends {}>(
+		object: _.List<T>|_.Dictionary<T>,
+		iterator: U): T;
+
+	/**
+	* @see _.find
+	**/
+	detect<T>(
+		object: _.List<T>|_.Dictionary<T>,
+		iterator: string): T;
+
     /**
 	* Looks through each value in the list, returning the index of the first one that passes a truth
 	* test (iterator). The function returns as soon as it finds an acceptable element,
@@ -1696,12 +1724,32 @@ interface Underscore<T> {
 	* Wrapped type `any[]`.
 	* @see _.find
 	**/
-	find(iterator: _.ListIterator<T, boolean>, context?: any): T;
+	find<T>(iterator: _.ListIterator<T, boolean>|_.ObjectIterator<T, boolean>, context?: any): T;
 
 	/**
 	* @see _.find
 	**/
-	detect(iterator: _.ListIterator<T, boolean>, context?: any): T;
+	find<T, U extends {}>(interator: U): T;
+
+	/**
+	* @see _.find
+	**/
+	find<T>(interator: string): T;
+
+	/**
+	* @see _.find
+	**/
+	detect<T>(iterator: _.ListIterator<T, boolean>|_.ObjectIterator<T, boolean>, context?: any): T;
+
+	/**
+	* @see _.find
+	**/
+	detect<T, U extends {}>(interator?: U): T;
+
+	/**
+	* @see _.find
+	**/
+	detect<T>(interator?: string): T;
 
 	/**
 	* Wrapped type `any[]`.
@@ -2554,12 +2602,32 @@ interface _Chain<T> {
 	* Wrapped type `any[]`.
 	* @see _.find
 	**/
-	find(iterator: _.ListIterator<T, boolean>, context?: any): _ChainSingle<T>;
+	find<T>(iterator: _.ListIterator<T, boolean>|_.ObjectIterator<T, boolean>, context?: any): _ChainSingle<T>;
 
 	/**
 	* @see _.find
 	**/
-	detect(iterator: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
+	find<T, U extends {}>(interator: U): _ChainSingle<T>;
+
+	/**
+	* @see _.find
+	**/
+	find<T>(interator: string): _ChainSingle<T>;
+
+	/**
+	* @see _.find
+	**/
+	detect<T>(iterator: _.ListIterator<T, boolean>|_.ObjectIterator<T, boolean>, context?: any): _ChainSingle<T>;
+
+	/**
+	* @see _.find
+	**/
+	detect<T, U extends {}>(interator: U): _ChainSingle<T>;
+
+	/**
+	* @see _.find
+	**/
+	detect<T>(interator: string): _ChainSingle<T>;
 
 	/**
 	* Wrapped type `any[]`.
diff --git a/wake_on_lan/wake_on_lan-tests.ts b/wake_on_lan/wake_on_lan-tests.ts
new file mode 100644
index 000000000..35c8754cd
--- /dev/null
+++ b/wake_on_lan/wake_on_lan-tests.ts
@@ -0,0 +1,39 @@
+/// <reference path="wake_on_lan.d.ts" />
+/// <reference path="../node/node.d.ts" />
+
+import wol = require('wake_on_lan');
+
+wol.wake("20:DE:20:DE:20:DE");
+
+let errFunc:wol.ErrorCallback = function(error:any) {
+  if (error) {
+    // handle error
+  } else {
+    // done sending packets
+  }
+};
+
+var opts:wol.WakeOptions = { address: "192.168.1.1" };
+var opts1:wol.WakeOptions = { address: "192.168.1.1", num_packets: 3 };
+var opts2:wol.WakeOptions = { address: "192.168.1.1", num_packets: 3, interval: 4 };
+var opts3:wol.WakeOptions = { address: "192.168.1.1", num_packets: 3, interval: 4, port: 5 };
+var opts4:wol.WakeOptions = { address: "192.168.1.1" };
+var opts5:wol.WakeOptions = { address: "192.168.1.1", interval: 4 };
+var opts6:wol.WakeOptions = { address: "192.168.1.1", port: 5 };
+var opts7:wol.WakeOptions = { address: "192.168.1.1", interval: 4, port: 5 };
+var opts8:wol.WakeOptions = { num_packets: 3 };
+var opts9:wol.WakeOptions = { num_packets: 3, interval: 4 };
+var opts10:wol.WakeOptions = { num_packets: 3, port: 5 };
+var opts11:wol.WakeOptions = { num_packets: 3, interval: 4, port: 5 };
+var opts12:wol.WakeOptions = { interval: 4 };
+var opts13:wol.WakeOptions = { interval: 4, port: 5 };
+var opts14:wol.WakeOptions = { port: 5 };
+var opts15:wol.WakeOptions = { };
+
+wol.wake('20:DE:20:DE:20:DE');
+wol.wake('20:DE:20:DE:20:DE', opts);
+wol.wake('20:DE:20:DE:20:DE', errFunc);
+wol.wake('20:DE:20:DE:20:DE', opts, errFunc);
+
+
+var magic_packet:Buffer = wol.createMagicPacket('20:DE:20:DE:20:DE');
\ No newline at end of file
diff --git a/wake_on_lan/wake_on_lan.d.ts b/wake_on_lan/wake_on_lan.d.ts
new file mode 100644
index 000000000..97e4a7177
--- /dev/null
+++ b/wake_on_lan/wake_on_lan.d.ts
@@ -0,0 +1,73 @@
+// Type definitions for wake_on_lan
+// Project: https://github.com/agnat/node_wake_on_lan
+// Definitions by: Tobias Kahlert <https://github.com/SrTobi>
+// Definitions: https://github.com/SrTobi/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts"/>
+
+declare module wol {
+
+	export interface WakeOptions {
+		
+		/**
+		 * The ip address to which the packet is send  (default: 255.255.255.255)
+		 */
+		address?:string;
+		
+		/**
+		 * Number of packets to send (default: 3)
+		 */
+		num_packets?:number;
+		
+		/**
+		 * The interval between packets (default: 100ms)
+		 */
+		interval?:number;
+		
+		/**
+		 * The port to send to (default: 9)
+		 */
+		port?:number;
+	}
+	
+	type ErrorCallback = (Error:any) => void;
+	
+	export interface Wol {
+		/**
+		 * Send a sequence of Wake-on-LAN magic packets to the given MAC address.
+		 *
+		 * @param {string} macAddress the mac address of the target device
+		 */
+		wake(macAddress:string):void;
+		
+		/**
+		 * Send a sequence of Wake-on-LAN magic packets to the given MAC address.
+		 *
+		 * @param {string} macAddress the mac address of the target device
+		 * @param {ErrorCallback} callback is called when all packets have been sent or an error occurs.
+		 */
+		wake(macAddress:string, callback:ErrorCallback):void;
+		
+		/**
+		 * Send a sequence of Wake-on-LAN magic packets to the given MAC address.
+		 *
+		 * @param {string} macAddress the mac address of the target device
+		 * @param {WakeOptions} opts additional options to send the packet
+		 * @param {ErrorCallback} callback is called when all packets have been sent or an error occurs.
+		 */
+		wake(macAddress:string, opts:WakeOptions, callback?:Function):void;
+		
+		/**
+		 * Creates a buffer with a magic packet for the given MAC address.
+		 * 
+		 * @param {string} macAddress mac address of the target device
+		 * @return {Buffer} the magic packet
+		 */
+		createMagicPacket(macAddress:string):Buffer;
+	}
+}
+
+declare module 'wake_on_lan' {
+	var wol: wol.Wol;
+	export = wol;
+}
diff --git a/whatwg-fetch/whatwg-fetch-tests.ts b/whatwg-fetch/whatwg-fetch-tests.ts
index b6bae3066..75fead12d 100644
--- a/whatwg-fetch/whatwg-fetch-tests.ts
+++ b/whatwg-fetch/whatwg-fetch-tests.ts
@@ -39,6 +39,13 @@ function test_fetchUrlWithRequestObject() {
 	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') {
diff --git a/whatwg-fetch/whatwg-fetch.d.ts b/whatwg-fetch/whatwg-fetch.d.ts
index c6d95e87a..a1d82c55f 100644
--- a/whatwg-fetch/whatwg-fetch.d.ts
+++ b/whatwg-fetch/whatwg-fetch.d.ts
@@ -83,3 +83,5 @@ declare type RequestInfo = Request|string;
 interface Window {
 	fetch(url: string|Request, init?: RequestInit): Promise<Response>;
 }
+
+declare var fetch: typeof window.fetch;
diff --git a/winjs/winjs.d.ts b/winjs/winjs.d.ts
index 903019698..5f6309b23 100644
--- a/winjs/winjs.d.ts
+++ b/winjs/winjs.d.ts
@@ -10620,3 +10620,7 @@ declare module WinJS.Utilities.Scheduler {
     //#endregion Functions
 
 }
+
+declare module 'winjs' {
+    export = WinJS;
+}
diff --git a/wordcloud/wordcloud-tests.ts b/wordcloud/wordcloud-tests.ts
new file mode 100644
index 000000000..2eecca3b8
--- /dev/null
+++ b/wordcloud/wordcloud-tests.ts
@@ -0,0 +1,196 @@
+/// <reference path="wordcloud.d.ts" />
+/// <reference path="../qunit/qunit.d.ts" />
+
+'use strict';
+//declare function test(name: string, test: Function);
+var element: HTMLElement | HTMLElement[];
+
+if (!WordCloud.isSupported)
+  console.log('WordCloud is not supported.');
+  
+WordCloud.miniumFontSize = 20;
+
+var list = (function () {
+  var string = 'Grumpy wizards make toxic brew for the evil Queen and Jack';
+
+  var list: WordCloud.ListEntry[] = [];
+  string.split(' ').forEach(function(word) {
+    list.push([word, word.length * 5]);
+  });
+
+  return list;
+})();
+
+function getTestOptions(): WordCloud.Options {
+  return {
+    shuffle: false,
+    rotateRatio: 0,
+    color: '#000',
+    fontFamily: 'sans-serif',
+    list: list
+  };
+};
+
+test('Test runs without any extra parameters.', function() {
+  var options = getTestOptions();
+  WordCloud(element, options);
+});
+
+test('Empty list results no output.', function() {
+  var options = getTestOptions();
+  options.list = [];
+
+  WordCloud(element, options);
+});
+
+test('gridSize can be set', function() {
+  var options = getTestOptions();
+  options.gridSize = 15;
+
+  WordCloud(element, options);
+});
+
+test('ellipticity can be set', function() {
+  var options = getTestOptions();
+  options.ellipticity = 1.5;
+
+  WordCloud(element, options);
+});
+
+test('origin can be set', function() {
+  var options = getTestOptions();
+  options.origin = [300, 0];
+
+  WordCloud(element, options);
+});
+
+test('minSize can be set', function() {
+  var options = getTestOptions();
+  options.minSize = 10;
+
+  WordCloud(element, options);
+});
+
+test('rotation can be set and locked', function() {
+  var options = getTestOptions();
+  options.rotateRatio = 1;
+  options.minRotation = options.maxRotation = Math.PI / 6;
+
+  WordCloud(element, options);
+});
+
+test('drawMask can be set', function() {
+  var options = getTestOptions();
+  options.drawMask = true;
+
+  WordCloud(element, options);
+});
+
+test('maskColor can be set', function() {
+  var options = getTestOptions();
+  options.drawMask = true;
+  options.maskColor = 'rgba(0, 0, 255, 0.8)';
+
+  WordCloud(element, options);
+});
+
+test('backgroundColor can be set', function() {
+  var options = getTestOptions();
+  options.backgroundColor = 'rgb(0, 0, 255)';
+
+  WordCloud(element, options);
+});
+
+test('semi-transparent backgroundColor can be set', function() {
+  var options = getTestOptions();
+  options.backgroundColor = 'rgba(0, 0, 255, 0.3)';
+
+  WordCloud(element, options);
+});
+
+test('weightFactor can be set', function() {
+  var options = getTestOptions();
+  options.weightFactor = 2;
+
+  WordCloud(element, options);
+});
+
+test('weightFactor can be set as a function', function() {
+  var options = getTestOptions();
+  options.weightFactor = function (w) { return Math.sqrt(w); };
+
+  WordCloud(element, options);
+});
+
+test('color can be set as a function', function() {
+  var options = getTestOptions();
+  options.color = function (word, weight, fontSize, radius, theta) {
+    if (theta < 2*Math.PI/3) {
+      return '#600';
+    } else if (theta < 2*Math.PI*2/3) {
+      return '#060';
+    } else {
+      return '#006';
+    }
+  };
+
+  WordCloud(element, options);
+});
+
+test('shape can be set to circle', function() {
+  var options = getTestOptions();
+  options.shape = 'circle';
+
+  WordCloud(element, options);
+});
+
+test('shape can be set to cardioid', function() {
+  var options = getTestOptions();
+  options.shape = 'cardioid';
+
+  WordCloud(element, options);
+});
+
+test('shape can be set to diamond', function() {
+  var options = getTestOptions();
+  options.shape = 'diamond';
+
+  WordCloud(element, options);
+});
+
+test('shape can be set to triangle', function() {
+  var options = getTestOptions();
+  options.shape = 'triangle';
+
+  WordCloud(element, options);
+});
+
+test('shape can be set to triangle-forward', function() {
+  var options = getTestOptions();
+  options.shape = 'triangle-forward';
+
+  WordCloud(element, options);
+});
+
+test('shape can be set to pentagon', function() {
+  var options = getTestOptions();
+  options.shape = 'pentagon';
+
+  WordCloud(element, options);
+});
+
+test('shape can be set to star', function() {
+  var options = getTestOptions();
+  options.shape = 'star';
+
+  WordCloud(element, options);
+});
+
+test('shape can be set to a given polar equation', function() {
+  var options = getTestOptions();
+  options.shape = function (theta) {
+    return theta / (2 * Math.PI);
+  };
+
+  WordCloud(element, options);
+});
\ No newline at end of file
diff --git a/wordcloud/wordcloud.d.ts b/wordcloud/wordcloud.d.ts
new file mode 100644
index 000000000..61c7003a4
--- /dev/null
+++ b/wordcloud/wordcloud.d.ts
@@ -0,0 +1,105 @@
+// Type definitions for wordcloud
+// Project: https://github.com/timdream/wordcloud2.js
+// Definitions by: Joe Skeen <http://github.com/joeskeen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function WordCloud(elements: HTMLElement | HTMLElement[], options: WordCloud.Options): void;
+
+declare namespace WordCloud {
+	var isSupported: boolean;
+	var miniumFontSize: number;
+	
+	interface Options {
+		/** 
+		 * List of words/text to paint on the canvas in a 2-d array, in the form of [word, size], 
+		 * e.g. [['foo', 12] , ['bar', 6]]. 
+		 */
+		list?: Array<ListEntry> | any[];
+		/** font to use. */
+		fontFamily?: string;
+		/** font weight to use, e.g. normal, bold or 600 */
+		fontWeight?: string | number;
+		/** 
+		 * color of the text, can be any CSS color, or a callback(word, weight, fontSize, distance, theta) 
+		 * specifies  different color for each item in the list. You may also specify colors with built-in 
+		 * keywords: random-dark and random-light. 
+		 */
+		color?: string | ((word: string, weight: string | number, fontSize: number, distance: number, theta: number) => string);
+		/** minimum font size to draw on the canvas. */
+		minSize?: number;
+		/** function to call or number to multiply for size of each word in the list. */
+		weightFactor?: number | ((weight: number) => number);
+		/** paint the entire canvas with background color and consider it empty before start. */
+		clearCanvas?: boolean;
+		/** color of the background. */
+		backgroundColor?: string;
+		
+		/** 
+		 * size of the grid in pixels for marking the availability of the canvas — the larger the grid size, 
+		 * the  bigger the gap between words. 
+		 */
+		gridSize?: number;
+		/** origin of the “cloud” in [x, y]. */
+		origin?: [number, number];
+		
+		/** visualize the grid by draw squares to mask the drawn areas. */
+		drawMask?: boolean;
+		/** color of the mask squares. */
+		maskColor?: string;
+		/** width of the gaps between mask squares. */
+		maskGapWidth?: number;
+		
+		/** Wait for x milliseconds before start drawn the next item using setTimeout. */
+		wait?: number;
+		/** If the call with in the loop takes more than x milliseconds (and blocks the browser), abort immediately. */
+		abortThreshold?: number;
+		/** callback function to call when abort. */
+		abort?: Function;
+		
+		/** If the word should rotate, the minimum rotation (in rad) the text should rotate. */
+		minRotation?: number;
+		/** 
+		 * If the word should rotate, the maximum rotation (in rad) the text should rotate. Set the two value equal 
+		 * to  keep all text in one angle. 
+		 */
+		maxRotation?: number;
+		
+		/** Shuffle the points to draw so the result will be different each time for the same list and settings. */
+		shuffle?: boolean;
+		/** Probability for the word to rotate. Set the number to 1 to always rotate. */
+		rotateRatio?: number;
+		
+		/** 
+		 * The shape of the "cloud" to draw. Can be any polar equation represented as a callback function, or a
+		 * keyword present. Available presents are circle (default), cardioid (apple or heart shape curve, the most
+		 * known polar equation), diamond (alias of square), triangle-forward, triangle, (alias of triangle-upright,
+		 * pentagon, and star. 
+		 */
+		shape?: string | ((theta: number) => number);
+		/** degree of "flatness" of the shape wordcloud2.js should draw. */
+		ellipticity?: number;
+		
+		/** 
+		 * callback to call when the cursor enters or leaves a region occupied by a word. The callback will take
+		 * arugments callback(item, dimension, event), where event is the original mousemove event. This only will work
+		 * on HTML5 canvas word clouds. 
+		 */
+		hover?: EventCallback;
+		/** 
+		 * callback to call when the user clicks on a word. The callback will take arugments 
+		 * callback(item, dimension,  event), where event is the original click event. This only will work on HTML5
+		 * canvas word clouds. 
+		 */
+		click?: EventCallback;
+	}
+	
+	interface Dimension {
+		x: number;
+		y: number;
+		w: number;
+		h: number;
+	}
+	
+	type ListEntry = [string, number];
+	type EventCallback = (item: ListEntry, dimension: Dimension, event: MouseEvent) => void;
+}
\ No newline at end of file
diff --git a/wreck/wreck-tests.ts b/wreck/wreck-tests.ts
new file mode 100644
index 000000000..6e7abab0e
--- /dev/null
+++ b/wreck/wreck-tests.ts
@@ -0,0 +1,39 @@
+/// <reference path="wreck.d.ts" />
+
+import Wreck = require('wreck');
+
+Wreck.get('https://google.com/', {}, function (err: any, res: any, payload: any) {
+    /* do stuff */
+});
+
+
+var method = 'GET'; // GET, POST, PUT, DELETE
+var uri    = 'https://google.com/';
+var readableStream = Wreck.toReadableStream('foo=bar');
+
+var wreck = Wreck.defaults({
+    headers: { 'x-foo-bar': 123 }
+});
+
+// cascading example -- does not alter `wreck`
+var wreckWithTimeout = wreck.defaults({
+    timeout: 5
+});
+
+// all attributes are optional
+var options = {
+    maxBytes:  1048576, // 1 MB, default: unlimited
+    rejectUnauthorized: true
+};
+
+var optionalCallback = function (err: any, res: any) {
+
+    /* handle err if it exists, in which case res will be undefined */
+
+    // buffer the response stream
+    Wreck.read(res, null, function (err: any, body: any) {
+        /* do stuff */
+    });
+};
+
+var req = wreck.request(method, uri, options, optionalCallback);
diff --git a/wreck/wreck.d.ts b/wreck/wreck.d.ts
new file mode 100644
index 000000000..8bc7b2d24
--- /dev/null
+++ b/wreck/wreck.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for wreck 7.0.0
+// Project: https://github.com/hapijs/wreck
+// Definitions by: Marcin Porębski <http://github.com/marcinporebski>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "wreck"
+{
+    import http = require('http');
+    import stream = require('stream');
+
+
+    interface WreckObject
+    {
+        defaults: (options: any) => WreckObject;
+
+        request: (method: string, uri: string, options: any, callback?: (err: any, response: http.IncomingMessage) => void) => http.ClientRequest;
+
+        read: (response: http.IncomingMessage, options: any, callback: (err: any, payload: any) => void) => void;
+
+        get: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+        post: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+        patch: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+        put: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+        delete: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+
+        toReadableStream: (payload: any, encoding?: string) => stream.Readable;
+
+        parseCacheControl: (field: string) => any;
+
+        agents: {
+            http: http.Agent,
+            https: http.Agent
+        };
+    }
+
+    var wreck: WreckObject;
+
+    export = wreck;
+}
diff --git a/youtube/youtube.d.ts b/youtube/youtube.d.ts
index f3f5c3b52..a90ab4c88 100644
--- a/youtube/youtube.d.ts
+++ b/youtube/youtube.d.ts
@@ -17,6 +17,7 @@ declare module YT {
         onReady?: EventHandler;
         onPlayback?: EventHandler;
         onStateChange?: EventHandler;
+        onError?: EventHandler;
     }
 
 	export enum ListType {
@@ -43,6 +44,7 @@ declare module YT {
 		origin?: string;
         playerpiid?: string;
 		playlist?: string[];
+        playsinline?: number;
 		rel?: number;
         showinfo?: number;
 		start?: number;
diff --git a/z-schema/z-schema-tests.ts b/z-schema/z-schema-tests.ts
new file mode 100644
index 000000000..90fdc4cd3
--- /dev/null
+++ b/z-schema/z-schema-tests.ts
@@ -0,0 +1,34 @@
+/// <reference path="z-schema.d.ts" />
+
+import ZSchema = require('z-schema');
+
+var options: ZSchema.Options = {
+  noTypeless: true,
+  forceItems: true,
+};
+
+var validator: ZSchema.Validator = new ZSchema(options);
+var json: any = {
+    foo: 'bar',
+};
+
+var schema: any = {
+    'type': 'object',
+    properties: {
+        foo: {
+            'type': 'string',
+        },
+    },
+};
+
+validator.validate(json, schema);
+validator.validate(json, schema, function (err: any, valid: boolean) {
+    if (err) {
+        console.log(err);
+    } else {
+        console.log('valid = ' + valid);
+    }
+});
+
+var error: ZSchema.SchemaError = validator.getLastError();
+var errors: ZSchema.SchemaError[] = validator.getLastErrors();
diff --git a/z-schema/z-schema.d.ts b/z-schema/z-schema.d.ts
new file mode 100644
index 000000000..4e8d673c5
--- /dev/null
+++ b/z-schema/z-schema.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for z-schema v3.16.0
+// Project: https://github.com/zaggino/z-schema
+// Definitions by: Adam Meadows <https://github.com/job13er>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module ZSchema {
+
+    export interface Options {
+        asyncTimeout?: number;
+        forceAdditional?: boolean;
+        assumeAdditional?: boolean;
+        forceItems?: boolean;
+        forceMinItems?: boolean;
+        forceMaxItems?: boolean;
+        forceMinLength?: boolean;
+        forceMaxLength?: boolean;
+        forceProperties?: boolean;
+        ignoreUnresolvableReferences?: boolean;
+        noExtraKeywords?: boolean;
+        noTypeless?: boolean;
+        noEmptyStrings?: boolean;
+        noEmptyArrays?: boolean;
+        strictUris?: boolean;
+        strictMode?: boolean;
+        reportPathAsArray?: boolean;
+        breakOnFirstError?: boolean;
+        pedanticCheck?: boolean;
+        ignoreUnknownFormats?: boolean;
+    }
+
+    export interface SchemaError {
+        code: string;
+        description: string;
+        message: string;
+        params: string[];
+        path: string;
+    }
+
+    export class Validator {
+        constructor(options: Options);
+
+        /**
+         * @param json - either a JSON string or a parsed JSON object
+         * @param schema - the JSON object representing the schema
+         * @returns true if json matches schema
+         */
+        validate(json: any, schema: any): boolean;
+
+        /**
+         * @param json - either a JSON string or a parsed JSON object
+         * @param schema - the JSON object representing the schema
+         */
+        validate(json: any, schema: any, callback: (err: any, valid: boolean) => void): void;
+
+        getLastError(): SchemaError;
+        getLastErrors(): SchemaError[];
+    }
+}
+
+declare module "z-schema" {
+    export = ZSchema.Validator;
+}